diff --git a/code/_onclick/hud/minihud_rigmech.dm b/code/_onclick/hud/minihud_rigmech.dm index 305f7d1fa6..0b9649efd8 100644 --- a/code/_onclick/hud/minihud_rigmech.dm +++ b/code/_onclick/hud/minihud_rigmech.dm @@ -36,8 +36,8 @@ if(!owner_rig) qdel(src) return - - var/obj/item/cell/rigcell = owner_rig.cell + + var/obj/item/stock_parts/cell/rigcell = owner_rig.cell var/obj/item/tank/rigtank = owner_rig.air_supply var/charge_percentage = rigcell ? rigcell.charge / rigcell.maxcharge : 0 @@ -86,8 +86,8 @@ if(!owner_mech) qdel(src) return - - var/obj/item/cell/mechcell = owner_mech.cell + + var/obj/item/stock_parts/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 @@ -99,7 +99,7 @@ air.icon_state = "air[round(air_percentage / 0.2, 1)]" health.icon_state = "health[round(health_percentage / 0.2, 1)]" airtoggle.icon_state = "airon[air_on]" - + // Screen objects /obj/screen/rig icon = 'icons/mob/screen_rigmech.dmi' @@ -211,7 +211,7 @@ var/list/adding = list() HUD.adding = adding - + var/obj/screen/using using = new /obj/screen/ghost/jumptomob() using.screen_loc = ui_ghost_jumptomob @@ -227,4 +227,4 @@ using.screen_loc = ui_ghost_reenter_corpse using.hud = src adding += using -*/ \ No newline at end of file +*/ diff --git a/code/datums/supplypacks/engineering.dm b/code/datums/supplypacks/engineering.dm index 0012b29b9a..e6fe221aaf 100644 --- a/code/datums/supplypacks/engineering.dm +++ b/code/datums/supplypacks/engineering.dm @@ -96,8 +96,8 @@ contains = list( /obj/item/storage/toolbox/electrical = 2, /obj/item/clothing/gloves/yellow = 2, - /obj/item/cell = 2, - /obj/item/cell/high = 2 + /obj/item/stock_parts/cell = 2, + /obj/item/stock_parts/cell/high = 2 ) cost = 10 containertype = /obj/structure/closet/crate/ward diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm index daa7a7cc66..5e01d9457e 100644 --- a/code/datums/supplypacks/munitions.dm +++ b/code/datums/supplypacks/munitions.dm @@ -74,7 +74,7 @@ containertype = /obj/structure/closet/crate/secure/weapon containername = "Shotgun crate" access = access_armory - + /datum/supply_pack/munitions/shotgunsemi name = "Weapons - Semi-Automatic Shotgun crate" contains = list( @@ -244,8 +244,8 @@ /datum/supply_pack/munitions/pcellammo name = "Ammunition - Power cell" - contains = list(/obj/item/cell/device/weapon = 3) + contains = list(/obj/item/stock_parts/cell/device/weapon = 3) cost = 50 containertype = /obj/structure/closet/crate/secure/weapon containername = "Energy ammunition crate" - access = access_security \ No newline at end of file + access = access_security diff --git a/code/datums/supplypacks/robotics.dm b/code/datums/supplypacks/robotics.dm index d99e7dc6d3..c7dbaac32f 100644 --- a/code/datums/supplypacks/robotics.dm +++ b/code/datums/supplypacks/robotics.dm @@ -17,7 +17,7 @@ /obj/item/assembly/prox_sensor = 3, /obj/item/storage/toolbox/electrical, /obj/item/flash = 4, - /obj/item/cell/high = 2 + /obj/item/stock_parts/cell/high = 2 ) cost = 10 containertype = /obj/structure/closet/crate/secure/nanotrasen diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index e82763671e..b1c928a295 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -134,4 +134,4 @@ /datum/uplink_item/item/ammo/cell name = "weapon cell" - path = /obj/item/cell/device/weapon + path = /obj/item/stock_parts/cell/device/weapon diff --git a/code/datums/uplink/tools.dm b/code/datums/uplink/tools.dm index 388db9269b..c1a598aa11 100644 --- a/code/datums/uplink/tools.dm +++ b/code/datums/uplink/tools.dm @@ -89,7 +89,7 @@ /datum/uplink_item/item/tools/wall_elecrtifier name = "Wall Electrifier" item_cost = 5 - path = /obj/item/cell/spike + path = /obj/item/stock_parts/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 diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 98ccebc47c..e760069a6f 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -291,7 +291,7 @@ icon_state = "power_mod" item_state = "std_mod" desc = "Heavy-duty switching circuits for power control." - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /obj/item/module/id_auth name = "\improper ID authentication module" @@ -456,14 +456,14 @@ desc = "Used in the construction of computers and other devices with a interactive console." icon_state = "screen" origin_tech = list(TECH_MATERIAL = 1) - matter = list("glass" = 200) + matter = list(MAT_GLASS = 200) /obj/item/stock_parts/capacitor name = "capacitor" desc = "A basic capacitor used in the construction of a variety of devices." icon_state = "capacitor" origin_tech = list(TECH_POWER = 1) - matter = list(MAT_STEEL = 50,"glass" = 50) + matter = list(MAT_STEEL = 50,MAT_GLASS = 50) var/charge = 0 var/max_charge = 1000 @@ -488,7 +488,7 @@ 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,"glass" = 20) + matter = list(MAT_STEEL = 50,MAT_GLASS = 20) /obj/item/stock_parts/manipulator name = "micro-manipulator" @@ -502,7 +502,7 @@ desc = "A tiny laser used in certain devices." icon_state = "micro_laser" origin_tech = list(TECH_MAGNET = 1) - matter = list(MAT_STEEL = 10,"glass" = 20) + matter = list(MAT_STEEL = 10,MAT_GLASS = 20) /obj/item/stock_parts/matter_bin name = "matter bin" @@ -519,7 +519,7 @@ icon_state = "capacitor_adv" origin_tech = list(TECH_POWER = 3) rating = 2 - matter = list(MAT_STEEL = 50,"glass" = 50) + matter = list(MAT_STEEL = 50,MAT_GLASS = 50) /obj/item/stock_parts/scanning_module/adv name = "advanced scanning module" @@ -527,7 +527,7 @@ icon_state = "scan_module_adv" origin_tech = list(TECH_MAGNET = 3) rating = 2 - matter = list(MAT_STEEL = 50,"glass" = 20) + matter = list(MAT_STEEL = 50,MAT_GLASS = 20) /obj/item/stock_parts/manipulator/nano name = "nano-manipulator" @@ -543,7 +543,7 @@ icon_state = "high_micro_laser" origin_tech = list(TECH_MAGNET = 3) rating = 2 - matter = list(MAT_STEEL = 10,"glass" = 20) + matter = list(MAT_STEEL = 10,MAT_GLASS = 20) /obj/item/stock_parts/matter_bin/adv name = "advanced matter bin" @@ -561,7 +561,7 @@ icon_state = "capacitor_super" origin_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4) rating = 3 - matter = list(MAT_STEEL = 50,"glass" = 50) + matter = list(MAT_STEEL = 50,MAT_GLASS = 50) /obj/item/stock_parts/scanning_module/phasic name = "phasic scanning module" @@ -569,7 +569,7 @@ icon_state = "scan_module_phasic" origin_tech = list(TECH_MAGNET = 5) rating = 3 - matter = list(MAT_STEEL = 50,"glass" = 20) + matter = list(MAT_STEEL = 50,MAT_GLASS = 20) /obj/item/stock_parts/manipulator/pico name = "pico-manipulator" @@ -585,7 +585,7 @@ desc = "A tiny laser used in certain devices." origin_tech = list(TECH_MAGNET = 5) rating = 3 - matter = list(MAT_STEEL = 10,"glass" = 20) + matter = list(MAT_STEEL = 10,MAT_GLASS = 20) /obj/item/stock_parts/matter_bin/super name = "super matter bin" @@ -611,7 +611,7 @@ icon_state = "scan_module_hyper" origin_tech = list(TECH_MAGNET = 6, TECH_BLUESPACE = 1, TECH_ARCANE = 1) rating = 4 - matter = list(MAT_STEEL = 100,"glass" = 40) + matter = list(MAT_STEEL = 100,MAT_GLASS = 40) /obj/item/stock_parts/manipulator/hyper name = "planck-manipulator" @@ -653,7 +653,7 @@ icon_state = "scan_module_omni" origin_tech = list(TECH_MAGNET = 7, TECH_BLUESPACE = 3, TECH_PRECURSOR = 1) rating = 5 - matter = list(MAT_STEEL = 100,"glass" = 40) + matter = list(MAT_STEEL = 100,MAT_GLASS = 40) /obj/item/stock_parts/manipulator/omni name = "omni-manipulator" @@ -687,42 +687,42 @@ 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,"glass" = 10) + matter = list(MAT_STEEL = 30,MAT_GLASS = 10) /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,"glass" = 10) + matter = list(MAT_STEEL = 30,MAT_GLASS = 10) /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,"glass" = 10) + matter = list(MAT_STEEL = 30,MAT_GLASS = 10) /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,"glass" = 10) + matter = list(MAT_STEEL = 30,MAT_GLASS = 10) /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,"glass" = 10) + matter = list(MAT_STEEL = 30,MAT_GLASS = 10) /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("glass" = 50) + matter = list(MAT_GLASS = 50) /obj/item/stock_parts/subspace/transmitter name = "subspace transmitter" @@ -761,7 +761,7 @@ icon = 'icons/obj/stock_parts.dmi' icon_state = "motor" origin_tech = list(TECH_ENGINEERING = 1) - matter = list(MAT_STEEL = 60, "glass" = 10) + matter = list(MAT_STEEL = 60, MAT_GLASS = 10) /obj/item/stock_parts/spring name = "spring" diff --git a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm index bfec227803..7626ddf846 100644 --- a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm +++ b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm @@ -66,15 +66,15 @@ var/list/L = new() //We make a new list to avoid copypasta. //Check our hand. - if(istype(held_item,/obj/item/cell)) + if(istype(held_item,/obj/item/stock_parts/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/cell/cell in held_item.contents) + for(var/obj/item/stock_parts/cell/cell in held_item.contents) L.Add(cell) //Now for the actual recharging. - for(var/obj/item/cell/cell in L) + for(var/obj/item/stock_parts/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!") @@ -185,7 +185,7 @@ var/success = 0 var/obj/T = target //We can also recharge things we touch, such as APCs or hardsuits. - for(var/obj/item/cell/cell in T.contents) + for(var/obj/item/stock_parts/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!") @@ -210,4 +210,4 @@ to_chat(src, "We are unable to affect \the [target].") else qdel(src) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index eb57f1d71a..91e3759931 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -450,7 +450,7 @@ var/global/list/all_objectives = list() "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, + "hyper-capacity cell" = /obj/item/stock_parts/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, @@ -896,4 +896,3 @@ var/global/list/all_objectives = list() rval = 2 return 0 return rval - diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 7a8761c891..66b8fe6f9b 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -138,7 +138,7 @@ var/power_rating var/power_losses var/last_power_draw = 0 - var/obj/item/cell/cell + var/obj/item/stock_parts/cell/cell var/use_cell = TRUE var/removeable_cell = TRUE @@ -150,12 +150,12 @@ return 0 /obj/machinery/portable_atmospherics/powered/attackby(obj/item/I, mob/user) - if(use_cell && istype(I, /obj/item/cell)) + if(use_cell && istype(I, /obj/item/stock_parts/cell)) if(cell) to_chat(user, "There is already a power cell installed.") return - var/obj/item/cell/C = I + var/obj/item/stock_parts/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 0bb62f6713..310d0397ad 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/Initialize() . = ..() - cell = new/obj/item/cell/apc(src) + cell = new/obj/item/stock_parts/cell/apc(src) var/list/air_mix = StandardAirMix() src.air_contents.adjust_multi("oxygen", air_mix["oxygen"], "nitrogen", air_mix["nitrogen"]) @@ -141,7 +141,7 @@ data["default_pressure"] = round(initial(target_pressure)) data["min_pressure"] = round(pressuremin) data["max_pressure"] = round(pressuremax) - + data["powerDraw"] = round(last_power_draw) data["cellCharge"] = cell ? cell.charge : 0 data["cellMaxCharge"] = cell ? cell.maxcharge : 1 @@ -152,7 +152,7 @@ data["holding"]["pressure"] = round(holding.air_contents.return_pressure() > 0 ? holding.air_contents.return_pressure() : 0) else data["holding"] = null - + return data /obj/machinery/portable_atmospherics/powered/pump/tgui_act(action, params) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 33c15921bf..077244912a 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/Initialize() . = ..() - cell = new/obj/item/cell/apc(src) + cell = new/obj/item/stock_parts/cell/apc(src) /obj/machinery/portable_atmospherics/powered/scrubber/emp_act(severity) if(stat & (BROKEN|NOPOWER)) @@ -109,7 +109,7 @@ data["on"] = on ? 1 : 0 data["connected"] = connected_port ? 1 : 0 data["pressure"] = round(air_contents.return_pressure() > 0 ? air_contents.return_pressure() : 0) - + data["rate"] = round(volume_rate) data["minrate"] = round(minrate) data["maxrate"] = round(maxrate) @@ -199,7 +199,7 @@ update_use_power(new_use_power) if(!on) return - + var/power_draw = -1 var/datum/gas_mixture/environment = loc.return_air() @@ -228,7 +228,7 @@ return //doesn't use power cells - if(istype(I, /obj/item/cell)) + if(istype(I, /obj/item/stock_parts/cell)) return if(I.is_screwdriver()) return diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 68f31b749d..d755a2edac 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -6,7 +6,7 @@ w_class = ITEMSIZE_SMALL anchored = 0 - matter = list(MAT_STEEL = 700,"glass" = 300) + matter = list(MAT_STEEL = 700,MAT_GLASS = 300) // Motion, EMP-Proof, X-Ray var/list/obj/item/possible_upgrades = list(/obj/item/assembly/prox_sensor, /obj/item/stack/material/osmium, /obj/item/stock_parts/scanning_module) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 3cf16e808e..7afc7e26a9 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -9,7 +9,7 @@ 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/cell/charging = null + var/obj/item/stock_parts/cell/charging = null var/chargelevel = -1 circuit = /obj/item/circuitboard/cell_charger @@ -45,8 +45,8 @@ if(stat & BROKEN) return - if(istype(W, /obj/item/cell) && anchored) - if(istype(W, /obj/item/cell/device)) + if(istype(W, /obj/item/stock_parts/cell) && anchored) + if(istype(W, /obj/item/stock_parts/cell/device)) to_chat(user, "\The [src] isn't fitted for that type of cell.") return if(charging) @@ -128,4 +128,4 @@ var/E = 0 for(var/obj/item/stock_parts/capacitor/C in component_parts) E += C.rating - efficiency = active_power_usage * (1+ (E - 1)*0.5) \ No newline at end of file + efficiency = active_power_usage * (1+ (E - 1)*0.5) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index c010974974..106a05ec03 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -4,7 +4,7 @@ icon_state = "door_electronics" w_class = ITEMSIZE_SMALL //It should be tiny! -Agouri - matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50) + matter = list(DEFAULT_WALL_MATERIAL = 50,MAT_GLASS = 50) req_one_access = list(access_engine) // Access to unlock the device, ignored if emagged var/list/apply_any_access = list(access_engine) // Can apply any access, not just their own @@ -133,11 +133,11 @@ // Nothing if(!id || !id.access) return list() - + // Has engineer access, can put any access else if(has_access(null, apply_any_access, id.access)) return get_all_station_access() - + // Not an engineer, can only pick your own accesses to program else return id.access diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm index 908abef4bd..198830f9d7 100644 --- a/code/game/machinery/fire_alarm.dm +++ b/code/game/machinery/fire_alarm.dm @@ -173,7 +173,7 @@ Just a object used in constructing fire alarms icon_state = "door_electronics" desc = "A circuit. It has a label on it, it says \"Can handle heat levels up to 40 degrees celsius!\"" w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) */ /obj/machinery/partyalarm name = "\improper PARTY BUTTON" diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index f3c5e33ae5..fdbe602dda 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -5,7 +5,7 @@ icon_state = "flood00" density = 1 var/on = 0 - var/obj/item/cell/cell = null + var/obj/item/stock_parts/cell/cell = null var/use = 200 // 200W light var/unlocked = 0 var/open = 0 @@ -116,7 +116,7 @@ open = 1 to_chat(user, "You remove the battery panel.") - if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/stock_parts/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 fe6929fba6..a09f0f4710 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -11,7 +11,7 @@ var/global/list/floor_light_cache = list() idle_power_usage = 2 active_power_usage = 20 power_channel = LIGHT - matter = list(DEFAULT_WALL_MATERIAL = 2500, "glass" = 2750) + matter = list(DEFAULT_WALL_MATERIAL = 2500, MAT_GLASS = 2750) required_dexterity = MOB_DEXTERITY_SIMPLE_MACHINES diff --git a/code/game/machinery/frame.dm b/code/game/machinery/frame.dm index 8aa94aa01f..03b6edea27 100644 --- a/code/game/machinery/frame.dm +++ b/code/game/machinery/frame.dm @@ -555,7 +555,7 @@ state = FRAME_FASTENED new /obj/item/stack/cable_coil(src.loc, 5) - else if(istype(P, /obj/item/stack/material) && P.get_material_name() == "glass") + else if(istype(P, /obj/item/stack/material) && P.get_material_name() == MAT_GLASS) if(state == FRAME_WIRED) if(frame_type.frame_class == FRAME_CLASS_COMPUTER) var/obj/item/stack/G = P diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 268692ce8d..6245e5b063 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -308,11 +308,11 @@ Class Procs: RefreshParts() /obj/machinery/proc/default_use_hicell() - var/obj/item/cell/C = locate(/obj/item/cell) in component_parts + var/obj/item/stock_parts/cell/C = locate(/obj/item/stock_parts/cell) in component_parts if(C) component_parts -= C qdel(C) - C = new /obj/item/cell/high(src) + C = new /obj/item/stock_parts/cell/high(src) component_parts += C return C diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 87a993afd4..7486998df4 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -10,7 +10,7 @@ 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/gun/energy, /obj/item/melee/baton, /obj/item/modular_computer, /obj/item/computer_hardware/battery_module, /obj/item/cell, /obj/item/flashlight, /obj/item/electronic_assembly, /obj/item/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/flash, /obj/item/defib_kit) + 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/stock_parts/cell, /obj/item/flashlight, /obj/item/electronic_assembly, /obj/item/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/flash, /obj/item/defib_kit) var/icon_state_charged = "recharger2" var/icon_state_charging = "recharger1" var/icon_state_idle = "recharger0" //also when unpowered @@ -27,7 +27,7 @@ if(get_dist(user, src) <= 5) . += "[charging ? "[charging]" : "Nothing"] is in [src]." if(charging) - var/obj/item/cell/C = charging.get_cell() + var/obj/item/stock_parts/cell/C = charging.get_cell() . += "Current charge: [C.charge] / [C.maxcharge]" /obj/machinery/recharger/attackby(obj/item/G as obj, mob/user as mob) @@ -123,7 +123,7 @@ update_use_power(USE_POWER_IDLE) icon_state = icon_state_idle else - var/obj/item/cell/C = charging.get_cell() + var/obj/item/stock_parts/cell/C = charging.get_cell() if(istype(C)) if(!C.fully_charged()) icon_state = icon_state_charging @@ -139,7 +139,7 @@ return if(charging) - var/obj/item/cell/C = charging.get_cell() + var/obj/item/stock_parts/cell/C = charging.get_cell() if(istype(C)) C.emp_act(severity) @@ -166,9 +166,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/gun/energy, /obj/item/gun/magnetic, /obj/item/melee/baton, /obj/item/flashlight, /obj/item/cell/device) + allowed_devices = list(/obj/item/gun/energy, /obj/item/gun/magnetic, /obj/item/melee/baton, /obj/item/flashlight, /obj/item/stock_parts/cell/device) icon_state_charged = "wrecharger2" icon_state_charging = "wrecharger1" icon_state_idle = "wrecharger0" portable = 0 - circuit = /obj/item/circuitboard/recharger/wrecharger \ No newline at end of file + circuit = /obj/item/circuitboard/recharger/wrecharger diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 18287be44c..2415693d17 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -9,7 +9,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 50 var/mob/occupant = null - var/obj/item/cell/cell = null + var/obj/item/stock_parts/cell/cell = null var/icon_update_tick = 0 // Used to rebuild the overlay only once every 10 ticks var/charging = 0 @@ -120,7 +120,7 @@ rigchest.calc_breach_damage() to_chat(H, "[rigchest] is repaired!") if(wornrig.cell) - var/obj/item/cell/rigcell = wornrig.cell + var/obj/item/stock_parts/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) @@ -181,7 +181,7 @@ cap_rating += P.rating if(istype(P, /obj/item/stock_parts/manipulator)) man_rating += P.rating - cell = locate(/obj/item/cell) in component_parts + cell = locate(/obj/item/stock_parts/cell) in component_parts charging_power = 40000 + 40000 * cap_rating restore_power_active = 10000 + 15000 * cap_rating @@ -322,4 +322,4 @@ icon_state = "borg_pod_opened" if(icon_update_tick == 0) - build_overlays() \ No newline at end of file + build_overlays() diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 975a67a015..17185e8753 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -5,8 +5,8 @@ icon_state = "sheater0" name = "space heater" desc = "Made by Space Amish using traditional space techniques, this heater is guaranteed not to set the station on fire." - var/obj/item/cell/cell - var/cell_type = /obj/item/cell/high + var/obj/item/stock_parts/cell/cell + var/cell_type = /obj/item/stock_parts/cell/high var/on = 0 var/set_temperature = T0C + 20 //K var/active = 0 @@ -64,14 +64,14 @@ ..(severity) /obj/machinery/space_heater/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/cell)) + if(istype(I, /obj/item/stock_parts/cell)) if(panel_open) if(cell) to_chat(user, "There is already a power cell inside.") return else // insert cell - var/obj/item/cell/C = usr.get_active_hand() + var/obj/item/stock_parts/cell/C = usr.get_active_hand() if(istype(C)) user.drop_item() cell = C @@ -159,7 +159,7 @@ if("cellinstall") if(!cell) - var/obj/item/cell/C = usr.get_active_hand() + var/obj/item/stock_parts/cell/C = usr.get_active_hand() if(istype(C)) usr.drop_item() cell = C diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 3c89991af8..0504118b0c 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/cell/C=null) +/obj/mecha/combat/gygax/dark/add_cell(var/obj/item/stock_parts/cell/C=null) if(C) C.forceMove(src) cell = C return - cell = new /obj/item/cell/hyper(src) + cell = new /obj/item/stock_parts/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/mech_bay.dm b/code/game/mecha/mech_bay.dm index d1822f88ab..d112c101fd 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -57,8 +57,8 @@ var/done = FALSE var/obj/mecha/mech = charging - var/obj/item/cell/cell = charging.get_cell() - if(cell) + var/obj/item/stock_parts/cell/cell = charging.get_cell() + if(cell) var/t = min(charge, cell.maxcharge - cell.charge) if(t > 0) if(istype(mech)) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 5082f66373..a6242621a2 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -13,7 +13,7 @@ var/speed = 1 var/mat_efficiency = 1 - var/list/materials = list(MAT_STEEL = 0, "glass" = 0, "plastic" = 0, MAT_GRAPHITE = 0, MAT_PLASTEEL = 0, "gold" = 0, "silver" = 0, MAT_LEAD = 0, "osmium" = 0, "diamond" = 0, MAT_DURASTEEL = 0, "phoron" = 0, "uranium" = 0, MAT_VERDANTIUM = 0, MAT_MORPHIUM = 0, MAT_METALHYDROGEN = 0, MAT_SUPERMATTER = 0) + var/list/materials = list(MAT_STEEL = 0, MAT_GLASS = 0, MAT_PLASTIC = 0, MAT_GRAPHITE = 0, MAT_PLASTEEL = 0, MAT_GOLD = 0, MAT_SILVER = 0, MAT_LEAD = 0, MAT_OSMIUM = 0, MAT_DIAMOND = 0, MAT_DURASTEEL = 0, MAT_PHORON = 0, MAT_URANIUM = 0, MAT_VERDANTIUM = 0, MAT_MORPHIUM = 0, MAT_METALHYDROGEN = 0, MAT_SUPERMATTER = 0) var/list/hidden_materials = list(MAT_PLASTEEL, MAT_DURASTEEL, MAT_GRAPHITE, MAT_VERDANTIUM, MAT_MORPHIUM, MAT_METALHYDROGEN, MAT_SUPERMATTER) var/res_max_amount = 200000 diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index 14e30b5b19..2b884dc957 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -13,7 +13,7 @@ var/speed = 1 var/mat_efficiency = 1 - var/list/materials = list(MAT_STEEL = 0, "glass" = 0, "plastic" = 0, MAT_GRAPHITE = 0, MAT_PLASTEEL = 0, "gold" = 0, "silver" = 0, MAT_LEAD = 0, "osmium" = 0, "diamond" = 0, MAT_DURASTEEL = 0, "phoron" = 0, "uranium" = 0, MAT_VERDANTIUM = 0, MAT_MORPHIUM = 0) + var/list/materials = list(MAT_STEEL = 0, MAT_GLASS = 0, MAT_PLASTIC = 0, MAT_GRAPHITE = 0, MAT_PLASTEEL = 0, MAT_GOLD = 0, MAT_SILVER = 0, MAT_LEAD = 0, MAT_OSMIUM = 0, MAT_DIAMOND = 0, MAT_DURASTEEL = 0, MAT_PHORON = 0, MAT_URANIUM = 0, MAT_VERDANTIUM = 0, MAT_MORPHIUM = 0) var/list/hidden_materials = list(MAT_DURASTEEL, MAT_GRAPHITE, MAT_VERDANTIUM, MAT_MORPHIUM) var/res_max_amount = 200000 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 4cfd286d0b..d9dbbb9795 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -49,7 +49,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/cell/cell + var/obj/item/stock_parts/cell/cell var/state = MECHA_OPERATING var/list/log = new var/last_message = 0 @@ -449,12 +449,12 @@ internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src) return internal_tank -/obj/mecha/proc/add_cell(var/obj/item/cell/C=null) +/obj/mecha/proc/add_cell(var/obj/item/stock_parts/cell/C=null) if(C) C.forceMove(src) cell = C return - cell = new /obj/item/cell/mech(src) + cell = new /obj/item/stock_parts/cell/mech(src) /obj/mecha/get_cell() return cell @@ -1496,7 +1496,7 @@ src.log_message("Eject attempt made using maintenance controls - rejected.") return - else if(istype(W, /obj/item/cell)) + else if(istype(W, /obj/item/stock_parts/cell)) if(state==MECHA_CELL_OUT) if(!src.cell) to_chat(user, "You install the powercell") diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 2cb775b07d..276d429538 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -211,14 +211,14 @@ name="Phazon Torso" icon_state = "phazon_harness" //construction_time = 300 - //construction_cost = list(MAT_STEEL=35000,"glass"=10000,"phoron"=20000) + //construction_cost = list(MAT_STEEL=35000,MAT_GLASS=10000,"phoron"=20000) origin_tech = list(TECH_DATA = 5, TECH_MATERIAL = 7, TECH_BLUESPACE = 6, TECH_POWER = 6) /obj/item/mecha_parts/part/phazon_head name="Phazon Head" icon_state = "phazon_head" //construction_time = 200 - //construction_cost = list(MAT_STEEL=15000,"glass"=5000,"phoron"=10000) + //construction_cost = list(MAT_STEEL=15000,MAT_GLASS=5000,"phoron"=10000) origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 5, TECH_MAGNET = 6) /obj/item/mecha_parts/part/phazon_left_arm diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index 44fbeb78d7..2677e3a5e9 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -28,7 +28,7 @@ var/global/list/obj/item/communicator/all_communicators = list() show_messages = 1 origin_tech = list(TECH_ENGINEERING = 2, TECH_MAGNET = 2, TECH_BLUESPACE = 2, TECH_DATA = 2) - matter = list(MAT_STEEL = 30,"glass" = 10) + matter = list(MAT_STEEL = 30,MAT_GLASS = 10) var/video_range = 4 var/obj/machinery/camera/communicator/video_source // Their camera @@ -363,4 +363,4 @@ var/global/list/obj/item/communicator/all_communicators = list() /obj/item/communicator/rugged desc = "The RB-65, voted most robust communicator 2566!" icon_state = "commrugged" - note = "Thank you for choosing the RB-65 Communicator, this is your notepad!" //Current note in the notepad function \ No newline at end of file + note = "Thank you for choosing the RB-65 Communicator, this is your notepad!" //Current note in the notepad function diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 8ec705fb08..505f9f3d1f 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -16,7 +16,7 @@ throw_speed = 3 desc = "You can use this on airlocks or APCs to try to hack them without cutting wires." - matter = list(MAT_STEEL = 50,"glass" = 20) + matter = list(MAT_STEEL = 50,MAT_GLASS = 20) origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index 24b0608023..ddce72a3dc 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -17,7 +17,7 @@ action_button_name = "Remove/Replace Paddles" var/obj/item/shockpaddles/linked/paddles - var/obj/item/cell/bcell = null + var/obj/item/stock_parts/cell/bcell = null /obj/item/defib_kit/get_cell() return bcell @@ -39,7 +39,7 @@ QDEL_NULL(bcell) /obj/item/defib_kit/loaded //starts with a cell - bcell = /obj/item/cell/apc + bcell = /obj/item/stock_parts/cell/apc /obj/item/defib_kit/update_icon() @@ -84,7 +84,7 @@ /obj/item/defib_kit/attackby(obj/item/W, mob/user, params) if(W == paddles) reattach_paddles(user) - else if(istype(W, /obj/item/cell)) + else if(istype(W, /obj/item/stock_parts/cell)) if(bcell) to_chat(user, "\the [src] already has a cell.") else @@ -176,7 +176,7 @@ origin_tech = list(TECH_BIO = 5, TECH_POWER = 3) /obj/item/defib_kit/compact/loaded - bcell = /obj/item/cell/high + bcell = /obj/item/stock_parts/cell/high /obj/item/defib_kit/compact/combat @@ -185,7 +185,7 @@ paddles = /obj/item/shockpaddles/linked/combat /obj/item/defib_kit/compact/combat/loaded - bcell = /obj/item/cell/high + bcell = /obj/item/stock_parts/cell/high /obj/item/shockpaddles/linked/combat combat = 1 @@ -673,7 +673,7 @@ paddles = /obj/item/shockpaddles/linked/jumper /obj/item/defib_kit/jumper_kit/loaded - bcell = /obj/item/cell/high + bcell = /obj/item/stock_parts/cell/high /obj/item/shockpaddles/linked/jumper name = "jumper cables" diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 50323e55bd..e2ecf6e1da 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -29,11 +29,11 @@ var/base_icon = "flash" - var/obj/item/cell/power_supply //What type of power cell this uses + var/obj/item/stock_parts/cell/power_supply //What type of power cell this uses var/charge_cost = 30 //How much energy is needed to flash. var/use_external_power = FALSE // Do we use charge from an external source? - var/cell_type = /obj/item/cell/device + var/cell_type = /obj/item/stock_parts/cell/device /obj/item/flash/Initialize() . = ..() @@ -59,7 +59,7 @@ ..() /obj/item/flash/update_icon() - var/obj/item/cell/battery = power_supply + var/obj/item/stock_parts/cell/battery = power_supply if(use_external_power) battery = get_external_power_supply() @@ -102,7 +102,7 @@ break else if(use_external_power) - var/obj/item/cell/external = get_external_power_supply() + var/obj/item/stock_parts/cell/external = get_external_power_supply() if(!external || !external.use(charge_cost)) //Take power from the borg or rig! break @@ -120,7 +120,7 @@ /obj/item/flash/proc/check_capacitor(var/mob/user) //spamming the flash before it's fully charged (60 seconds) increases the chance of it breaking //It will never break on the first use. - var/obj/item/cell/battery = power_supply + var/obj/item/stock_parts/cell/battery = power_supply if(use_external_power) battery = get_external_power_supply() diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index a2a6b4b88e..94ba3e3442 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -5,14 +5,14 @@ icon_state = "flashlight" w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT - matter = list(MAT_STEEL = 50,"glass" = 20) + matter = list(MAT_STEEL = 50,MAT_GLASS = 20) action_button_name = "Toggle Flashlight" var/on = 0 var/brightness_on = 4 //luminosity when on var/flashlight_power = 0.8 //lighting power when on var/flashlight_colour = LIGHT_COLOR_INCANDESCENT_FLASHLIGHT //lighting colour when on - var/obj/item/cell/cell - var/cell_type = /obj/item/cell/device + var/obj/item/stock_parts/cell/cell + var/cell_type = /obj/item/stock_parts/cell/device var/list/brightness_levels var/brightness_level = "medium" var/power_usage @@ -27,7 +27,7 @@ power_usage = brightness_levels[brightness_level] else verbs -= /obj/item/flashlight/verb/toggle - + update_icon() /obj/item/flashlight/Destroy() @@ -217,8 +217,8 @@ /obj/item/flashlight/attackby(obj/item/W, mob/user as mob) if(power_use) - if(istype(W, /obj/item/cell)) - if(istype(W, /obj/item/cell/device)) + if(istype(W, /obj/item/stock_parts/cell)) + if(istype(W, /obj/item/stock_parts/cell/device)) if(!cell) user.drop_item() W.loc = src @@ -275,7 +275,7 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL attack_verb = list ("smacked", "thwacked", "thunked") - matter = list(MAT_STEEL = 200,"glass" = 50) + matter = list(MAT_STEEL = 200,MAT_GLASS = 50) hitsound = "swing_hit" /obj/item/flashlight/drone diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index d575ba7310..9ccc22866c 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -8,7 +8,7 @@ item_state = "pen" var/pointer_icon_state slot_flags = SLOT_BELT - matter = list("glass" = 500,"metal" = 500) + matter = list(MAT_GLASS = 500,"metal" = 500) w_class = 2 //Increased to 2, because diodes are w_class 2. Conservation of matter. origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1) var/turf/pointer_loc @@ -220,4 +220,4 @@ energy = max_energy recharging = 0 recharge_locked = 0 - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 3f1ce0128c..9e9065b360 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -69,7 +69,7 @@ . += "It has [uses] lights remaining." /obj/item/lightreplacer/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/stack/material) && W.get_material_name() == "glass") + if(istype(W, /obj/item/stack/material) && W.get_material_name() == MAT_GLASS) var/obj/item/stack/G = W if(uses >= max_uses) to_chat(user, "[src.name] is full.") @@ -228,4 +228,4 @@ #undef LIGHT_OK #undef LIGHT_EMPTY #undef LIGHT_BROKEN -#undef LIGHT_BURNED \ No newline at end of file +#undef LIGHT_BURNED diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 747e69af04..2dbf2e6363 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -20,7 +20,7 @@ drop_sound = 'sound/items/drop/multitool.ogg' pickup_sound = 'sound/items/pickup/multitool.ogg' - matter = list(MAT_STEEL = 50,"glass" = 20) + matter = list(MAT_STEEL = 50,MAT_GLASS = 20) var/mode_index = 1 var/toolmode = MULTITOOL_MODE_STANDARD diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index c67bc02ff5..a30db01097 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -11,7 +11,7 @@ slot_flags = SLOT_BACK w_class = ITEMSIZE_HUGE - matter = list(MAT_STEEL = 10000,"glass" = 2500) + matter = list(MAT_STEEL = 10000,MAT_GLASS = 2500) var/code = 2 diff --git a/code/game/objects/items/devices/radio/jammer.dm b/code/game/objects/items/devices/radio/jammer.dm index 7943ab9265..39c58d8291 100644 --- a/code/game/objects/items/devices/radio/jammer.dm +++ b/code/game/objects/items/devices/radio/jammer.dm @@ -25,7 +25,7 @@ var/global/list/active_radio_jammers = list() var/on = 0 var/jam_range = 7 - var/obj/item/cell/device/weapon/power_source + var/obj/item/stock_parts/cell/device/weapon/power_source var/tick_cost = 8 // Will last for roughly ten minutes, as process() ticks every 2 seconds. origin_tech = list(TECH_ILLEGAL = 7, TECH_BLUESPACE = 5) //Such technology! Subspace jamming! @@ -90,7 +90,7 @@ var/global/list/active_radio_jammers = list() to_chat(user,"\The [src] has no power source!") /obj/item/radio_jammer/attackby(obj/W, mob/user) - if(istype(W,/obj/item/cell/device/weapon) && !power_source) + if(istype(W,/obj/item/stock_parts/cell/device/weapon) && !power_source) power_source = W power_source.update_icon() //Why doesn't a cell do this already? :| user.unEquip(power_source) @@ -115,4 +115,3 @@ var/global/list/active_radio_jammers = list() cut_overlays() add_overlay("jammer_overlay_[overlay_percent]") last_overlay_percent = overlay_percent - diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index c97dd02078..40acdd9eea 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -58,7 +58,7 @@ var/global/list/default_medbay_channels = list( var/bs_tx_preload_id var/bs_rx_preload_id - matter = list("glass" = 25,MAT_STEEL = 75) + matter = list(MAT_GLASS = 25,MAT_STEEL = 75) var/const/FREQ_LISTENING = 1 var/list/internal_channels diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 29dd13c263..fbec8d8371 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -346,7 +346,7 @@ HALOGEN COUNTER - Radcount on mobs throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 30,"glass" = 20) + matter = list(MAT_STEEL = 30,MAT_GLASS = 20) origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) @@ -387,7 +387,7 @@ HALOGEN COUNTER - Radcount on mobs throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 30,"glass" = 20) + matter = list(MAT_STEEL = 30,MAT_GLASS = 20) origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) var/details = 0 @@ -450,7 +450,7 @@ HALOGEN COUNTER - Radcount on mobs throwforce = 5 throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 30,"glass" = 20) + matter = list(MAT_STEEL = 30,MAT_GLASS = 20) origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) var/details = 0 @@ -499,7 +499,7 @@ HALOGEN COUNTER - Radcount on mobs throwforce = 0 throw_speed = 3 throw_range = 7 - matter = list(MAT_STEEL = 30,"glass" = 20) + matter = list(MAT_STEEL = 30,MAT_GLASS = 20) /obj/item/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob) if(!istype(M, /mob/living/simple_mob/slime/xenobio)) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 2b08731098..94b8099298 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -15,12 +15,12 @@ throw_range = 4 action_button_name = "Toggle Heatsink" - matter = list("steel" = 15000, "glass" = 3500) + matter = list("steel" = 15000, MAT_GLASS = 3500) origin_tech = list(TECH_MAGNET = 2, TECH_MATERIAL = 2) var/on = 0 //is it turned on? var/cover_open = 0 //is the cover open? - var/obj/item/cell/cell + var/obj/item/stock_parts/cell/cell var/max_cooling = 15 // in degrees per second - probably don't need to mess with heat capacity here var/charge_consumption = 3 // charge per second at max_cooling var/thermostat = T20C @@ -32,7 +32,7 @@ /obj/item/suit_cooling_unit/Initialize() . = ..() - cell = new/obj/item/cell/high(src) //comes not with the crappy default power cell - because this is dedicated EVA equipment + cell = new/obj/item/stock_parts/cell/high(src) //comes not with the crappy default power cell - because this is dedicated EVA equipment /obj/item/suit_cooling_unit/Destroy() QDEL_NULL(cell) @@ -157,7 +157,7 @@ updateicon() return - if (istype(W, /obj/item/cell)) + if (istype(W, /obj/item/stock_parts/cell)) if(cover_open) if(cell) to_chat(user, "There is a [cell] already installed here.") diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 080df242a5..de457dff5f 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -8,7 +8,7 @@ item_state = "analyzer" w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 60,"glass" = 30) + matter = list(MAT_STEEL = 60,MAT_GLASS = 30) var/emagged = 0.0 var/recording = 0.0 @@ -367,7 +367,7 @@ icon_state = "tape_white" item_state = "analyzer" w_class = ITEMSIZE_TINY - matter = list(MAT_STEEL=20, "glass"=5) + matter = list(MAT_STEEL=20, MAT_GLASS=5) force = 1 throwforce = 0 var/max_capacity = 1800 diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index 9dcc56157f..122ac29cef 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -10,7 +10,7 @@ icon = 'icons/obj/items.dmi' icon_state = "jar" w_class = ITEMSIZE_SMALL - matter = list("glass" = 200) + matter = list(MAT_GLASS = 200) item_flags = NOBLUDGEON var/list/accept_mobs = list(/mob/living/simple_mob/animal/passive/lizard, /mob/living/simple_mob/animal/passive/mouse, /mob/living/simple_mob/animal/sif/leech, /mob/living/simple_mob/animal/sif/frostfly, /mob/living/simple_mob/animal/sif/glitterfly) var/contains = 0 // 0 = nothing, 1 = money, 2 = animal, 3 = spiderling @@ -134,7 +134,7 @@ /obj/item/glass_jar/fish/plastic name = "plastic tank" desc = "A large plastic tank." - matter = list("plastic" = 4000) + matter = list(MAT_PLASTIC = 4000) /obj/item/glass_jar/fish/update_icon() // Also updates name and desc underlays.Cut() diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 2230808bab..2797a81d05 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -46,7 +46,7 @@ icon_state = "chest" part = list(BP_GROIN,BP_TORSO) var/wires = 0.0 - var/obj/item/cell/cell = null + var/obj/item/stock_parts/cell/cell = null /obj/item/robot_parts/head name = "cyborg head" @@ -238,7 +238,7 @@ /obj/item/robot_parts/chest/attackby(obj/item/W as obj, mob/user as mob) ..() - if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/stock_parts/cell)) if(src.cell) to_chat(user, "You have already inserted a cell!") return diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 930d9d1424..2a1534203f 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -187,21 +187,21 @@ name = "steel floor tile" singular_name = "steel floor tile" icon_state = "tile_steel" - matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4) + matter = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT / 4) no_variants = FALSE /obj/item/stack/tile/floor/steel name = "steel floor tile" singular_name = "steel floor tile" icon_state = "tile_steel" - matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4) + matter = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT / 4) no_variants = FALSE /obj/item/stack/tile/floor/white name = "white floor tile" singular_name = "white floor tile" icon_state = "tile_white" - matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4) + matter = list(MAT_PLASTIC = SHEET_MATERIAL_AMOUNT / 4) no_variants = FALSE /obj/item/stack/tile/floor/yellow @@ -215,14 +215,14 @@ name = "dark floor tile" singular_name = "dark floor tile" icon_state = "tile_steel" - matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4) + matter = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT / 4) no_variants = FALSE /obj/item/stack/tile/floor/freezer name = "freezer floor tile" singular_name = "freezer floor tile" icon_state = "tile_freezer" - matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4) + matter = list(MAT_PLASTIC = SHEET_MATERIAL_AMOUNT / 4) no_variants = FALSE /obj/item/stack/tile/floor/cyborg diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm index 1dfb398bc1..4052e81bc0 100644 --- a/code/game/objects/items/uav.dm +++ b/code/game/objects/items/uav.dm @@ -9,7 +9,7 @@ icon = 'icons/obj/uav.dmi' icon_state = "uav" - var/obj/item/cell/cell + var/obj/item/stock_parts/cell/cell var/cell_type = null //Can put a starting cell here density = 1 //Is dense, but not anchored, so you can swap with it @@ -39,7 +39,7 @@ var/no_masters_time = 0 /obj/item/uav/loaded - cell_type = /obj/item/cell/high + cell_type = /obj/item/stock_parts/cell/high /obj/item/uav/Initialize() . = ..() @@ -107,7 +107,7 @@ cell.forceMove(get_turf(src)) cell = null - else if(istype(I, /obj/item/cell) && !cell) + else if(istype(I, /obj/item/stock_parts/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) @@ -346,4 +346,4 @@ #undef UAV_OFF #undef UAV_ON -#undef UAV_PACKED \ No newline at end of file +#undef UAV_PACKED diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 2bf345a16d..7fa58f29a2 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -177,13 +177,13 @@ 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/cell/cell = null + var/obj/item/stock_parts/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/rcd/electric/Initialize() if(make_cell) - cell = new /obj/item/cell/high(src) + cell = new /obj/item/stock_parts/cell/high(src) return ..() /obj/item/rcd/electric/Destroy() @@ -195,7 +195,7 @@ return 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() + var/obj/item/stock_parts/cell/cell = get_cell() if(cell) return cell.check_charge(amount * electric_cost_coefficent) return FALSE @@ -203,11 +203,11 @@ /obj/item/rcd/electric/consume_resources(amount) if(!can_afford(amount)) return FALSE - var/obj/item/cell/cell = get_cell() + var/obj/item/stock_parts/cell/cell = get_cell() return cell.checked_use(amount * electric_cost_coefficent) /obj/item/rcd/electric/display_resources() - var/obj/item/cell/cell = get_cell() + var/obj/item/stock_parts/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." @@ -303,12 +303,12 @@ item_state = "rcdammo" w_class = ITEMSIZE_SMALL origin_tech = list(TECH_MATERIAL = 2) - matter = list(DEFAULT_WALL_MATERIAL = 30000,"glass" = 15000) + matter = list(DEFAULT_WALL_MATERIAL = 30000,MAT_GLASS = 15000) var/remaining = RCD_MAX_CAPACITY / 3 /obj/item/rcd_ammo/large name = "high-capacity matter cartridge" desc = "Do not ingest." - matter = list(DEFAULT_WALL_MATERIAL = 45000,"glass" = 22500) + matter = list(DEFAULT_WALL_MATERIAL = 45000,MAT_GLASS = 22500) origin_tech = list(TECH_MATERIAL = 4) remaining = RCD_MAX_CAPACITY 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 5bdd07b602..dec4510a56 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm @@ -36,7 +36,7 @@ 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, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /obj/item/circuitboard/security/telescreen/entertainment/Initialize() . = ..() diff --git a/code/game/objects/items/weapons/circuitboards/frame.dm b/code/game/objects/items/weapons/circuitboards/frame.dm index b919932d37..212ce062ca 100644 --- a/code/game/objects/items/weapons/circuitboards/frame.dm +++ b/code/game/objects/items/weapons/circuitboards/frame.dm @@ -10,37 +10,37 @@ 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, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /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, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /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, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /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, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /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, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /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 - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) //Alarm @@ -48,31 +48,31 @@ name = T_BOARD("fire alarm") build_path = /obj/machinery/firealarm board_type = new /datum/frame/frame_types/fire_alarm - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /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, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /obj/item/circuitboard/intercom name = T_BOARD("intercom") build_path = /obj/item/radio/intercom board_type = new /datum/frame/frame_types/intercom - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /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, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /obj/item/circuitboard/geiger name = T_BOARD("geiger counter") build_path = /obj/item/geiger/wall board_type = new /datum/frame/frame_types/geiger - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) //Computer @@ -80,7 +80,7 @@ name = T_BOARD("holopad") build_path = /obj/machinery/hologram/holopad board_type = new /datum/frame/frame_types/holopad - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) /obj/item/circuitboard/scanner_console name = T_BOARD("body scanner console") @@ -100,7 +100,7 @@ name = T_BOARD("photocopier") build_path = /obj/machinery/photocopier board_type = new /datum/frame/frame_types/photocopier - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stock_parts/motor = 1, @@ -111,7 +111,7 @@ name = T_BOARD("fax") build_path = /obj/machinery/photocopier/faxmachine board_type = new /datum/frame/frame_types/fax - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stock_parts/motor = 1, @@ -152,7 +152,7 @@ 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, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( /obj/item/stock_parts/motor = 1, /obj/item/stock_parts/gear = 2) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm b/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm index cee8907b24..c31faab2a3 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/engineering.dm @@ -6,7 +6,7 @@ name = T_BOARD("pipe layer") build_path = /obj/machinery/pipelayer board_type = new /datum/frame/frame_types/machine - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( /obj/item/stock_parts/motor = 1, /obj/item/stock_parts/gear = 1, 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 7cb2da823f..97c239f763 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/kitchen_appliances.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/kitchen_appliances.dm @@ -4,7 +4,7 @@ build_path = /obj/machinery/microwave board_type = new /datum/frame/frame_types/microwave contain_parts = 0 - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( /obj/item/stock_parts/console_screen = 1, /obj/item/stock_parts/capacitor = 3, // Original Capacitor count was 1 @@ -17,7 +17,7 @@ desc = "The circuitboard for an oven." build_path = /obj/machinery/appliance/cooker/oven board_type = new /datum/frame/frame_types/oven - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( /obj/item/stock_parts/capacitor = 3, /obj/item/stock_parts/scanning_module = 1, @@ -32,7 +32,7 @@ /obj/item/stock_parts/capacitor = 3, /obj/item/stock_parts/scanning_module = 1, /obj/item/stock_parts/matter_bin = 2) - + /obj/item/circuitboard/grill name = T_BOARD("grill") desc = "The circuitboard for an industrial grill." @@ -67,8 +67,8 @@ name = T_BOARD("deluxe microwave") build_path = /obj/machinery/microwave/advanced board_type = new /datum/frame/frame_types/microwave - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( /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 + /obj/item/stock_parts/capacitor = 1) 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 d811dd4e8f..69a9b16a0b 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm @@ -9,7 +9,7 @@ origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) req_components = list( /obj/item/stock_parts/capacitor = 1, - /obj/item/cell = 1, + /obj/item/stock_parts/cell = 1, /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/micro_laser = 1) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/papershredder.dm b/code/game/objects/items/weapons/circuitboards/machinery/papershredder.dm index 28632f13c0..ddb45b0247 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/papershredder.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/papershredder.dm @@ -6,7 +6,7 @@ name = T_BOARD("papershredder") build_path = /obj/machinery/papershredder board_type = new /datum/frame/frame_types/machine - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list( /obj/item/stock_parts/motor = 1, /obj/item/stock_parts/gear = 2, 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 fe54eb4432..5eb3dd171e 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm @@ -11,4 +11,4 @@ /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/manipulator = 2, - /obj/item/cell = 1) \ No newline at end of file + /obj/item/stock_parts/cell = 1) diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm index d40442d206..57e220bc83 100644 --- a/code/game/objects/items/weapons/ecigs.dm +++ b/code/game/objects/items/weapons/ecigs.dm @@ -3,7 +3,7 @@ desc = "For the modern approach to smoking." icon = 'icons/obj/ecig.dmi' var/active = 0 - //var/obj/item/cell/ec_cell = /obj/item/cell/device + //var/obj/item/stock_parts/cell/ec_cell = /obj/item/stock_parts/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 @@ -151,7 +151,7 @@ w_class = ITEMSIZE_TINY icon = 'icons/obj/ecig.dmi' icon_state = "ecartridge" - matter = list("metal" = 50, "glass" = 10) + matter = list("metal" = 50, MAT_GLASS = 10) volume = 20 atom_flags = ATOM_REAGENTS_IS_OPEN diff --git a/code/game/objects/items/weapons/implants/implantcircuits.dm b/code/game/objects/items/weapons/implants/implantcircuits.dm index 734f970cf9..fb2971d2b3 100644 --- a/code/game/objects/items/weapons/implants/implantcircuits.dm +++ b/code/game/objects/items/weapons/implants/implantcircuits.dm @@ -39,7 +39,7 @@ return IC.examine(user) /obj/item/implant/integrated_circuit/attackby(var/obj/item/O, var/mob/user) - if(O.is_crowbar() || istype(O, /obj/item/integrated_electronics) || istype(O, /obj/item/integrated_circuit) || O.is_screwdriver() || istype(O, /obj/item/cell/device) ) + if(O.is_crowbar() || istype(O, /obj/item/integrated_electronics) || istype(O, /obj/item/integrated_circuit) || O.is_screwdriver() || istype(O, /obj/item/stock_parts/cell/device) ) IC.attackby(O, user) else ..() diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 5d8aa1569e..0bffb4486e 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -6,7 +6,7 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 1000, "glass" = 1000) + matter = list(MAT_STEEL = 1000, MAT_GLASS = 1000) var/obj/item/implant/imp = null var/active = 1 diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm index 3e42dec29c..6132f65ecd 100644 --- a/code/game/objects/items/weapons/material/material_armor.dm +++ b/code/game/objects/items/weapons/material/material_armor.dm @@ -304,7 +304,7 @@ Protectiveness | Armor % default_material = "durasteel" /obj/item/clothing/suit/armor/material/makeshift/glass - default_material = "glass" + default_material = MAT_GLASS // Used to craft sheet armor, and possibly other things in the Future(tm). /obj/item/material/armor_plating diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 3288a1f247..9e5d8cc0c0 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -13,7 +13,7 @@ thrown_force_divisor = 0.5 item_state = "shard-glass" attack_verb = list("stabbed", "slashed", "sliced", "cut") - default_material = "glass" + default_material = MAT_GLASS unbreakable = 1 //It's already broken. drops_debris = 0 diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index e1e1cb043d..208a8f193a 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -158,7 +158,7 @@ hitsound = 'sound/weapons/bladeslice.ogg' mob_throw_hit_sound = 'sound/weapons/pierce.ogg' attack_verb = list("attacked", "poked", "jabbed", "torn", "gored") - default_material = "glass" + default_material = MAT_GLASS applies_material_colour = 0 fragile = 1 //It's a haphazard thing of glass, wire, and steel reach = 2 // Spears are long. diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index e8fb351219..7422500510 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -17,8 +17,8 @@ // If it uses energy. var/use_cell = FALSE var/hitcost = 120 - var/obj/item/cell/bcell = null - var/cell_type = /obj/item/cell/device + var/obj/item/stock_parts/cell/bcell = null + var/cell_type = /obj/item/stock_parts/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', @@ -249,7 +249,7 @@ /obj/item/melee/energy/axe/charge/loaded/Initialize() . = ..() - bcell = new/obj/item/cell/device/weapon(src) + bcell = new/obj/item/stock_parts/cell/device/weapon(src) /* * Energy Sword @@ -409,7 +409,7 @@ /obj/item/melee/energy/sword/charge/loaded/Initialize() . = ..() - bcell = new/obj/item/cell/device/weapon(src) + bcell = new/obj/item/stock_parts/cell/device/weapon(src) //Energy Blade (ninja uses this) diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index e742fa96fc..4a76a96f18 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -68,7 +68,7 @@ throw_range = 4 w_class = ITEMSIZE_LARGE origin_tech = list(TECH_MATERIAL = 2) - matter = list("glass" = 7500, MAT_STEEL = 1000) + matter = list(MAT_GLASS = 7500, MAT_STEEL = 1000) attack_verb = list("shoved", "bashed") var/cooldown = 0 //shield bash cooldown. based on world.time diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 91d14affe7..5358b39acc 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -53,7 +53,7 @@ /obj/item/tool/wrench, /obj/item/multitool, /obj/item/flashlight, - /obj/item/cell/device, + /obj/item/stock_parts/cell/device, /obj/item/stack/cable_coil, /obj/item/t_scanner, /obj/item/analyzer, @@ -146,7 +146,7 @@ /obj/item/clothing/glasses, /obj/item/tool/crowbar, /obj/item/flashlight, - /obj/item/cell/device, + /obj/item/stock_parts/cell/device, /obj/item/extinguisher/mini, /obj/item/storage/quickdraw/syringe_case ) @@ -169,7 +169,7 @@ /obj/item/clothing/glasses, /obj/item/ammo_casing/a12g, /obj/item/ammo_magazine, - /obj/item/cell/device, + /obj/item/stock_parts/cell/device, /obj/item/reagent_containers/food/snacks/donut/, /obj/item/melee/baton, /obj/item/gun/energy/taser, @@ -206,7 +206,7 @@ /obj/item/cassette_tape, /obj/item/clothing/glasses, /obj/item/flashlight, - /obj/item/cell/device, + /obj/item/stock_parts/cell/device, /obj/item/reagent_containers/spray/luminol, /obj/item/sample, /obj/item/forensics/sample_kit/powder, @@ -299,7 +299,7 @@ /obj/item/clothing/glasses, /obj/item/tool/crowbar, /obj/item/flashlight, - /obj/item/cell/device, + /obj/item/stock_parts/cell/device, /obj/item/extinguisher/mini, /obj/item/surgical ) @@ -347,7 +347,7 @@ can_hold = list( /obj/item/clothing/glasses, /obj/item/flashlight, - /obj/item/cell/device, + /obj/item/stock_parts/cell/device, /obj/item/grenade, /obj/item/pda, /obj/item/radio/headset, @@ -375,7 +375,7 @@ /obj/item/gps, /obj/item/measuring_tape, /obj/item/flashlight, - /obj/item/cell/device, + /obj/item/stock_parts/cell/device, /obj/item/pickaxe, /obj/item/depth_scanner, /obj/item/camera, diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 522280ed5a..c1befed730 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -128,7 +128,7 @@ /obj/item/storage/box/syndie_kit/imp_aug/sprinter case_type = /obj/item/implantcase/sprinter - + /obj/item/storage/box/syndie_kit/imp_aug/armblade case_type = /obj/item/implantcase/armblade @@ -316,7 +316,7 @@ name = "secure briefcase" starts_with = list( /obj/item/gun/magnetic/gasthrower, - /obj/item/cell/super, + /obj/item/stock_parts/cell/super, /obj/item/stock_parts/capacitor/adv, /obj/item/tank/phoron/pressurized = 2 ) @@ -327,7 +327,7 @@ 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/gun/magnetic/fuelrod, /obj/item/fuel_assembly, /obj/item/cell, /obj/item/stock_parts, /obj/item/tool/screwdriver) + can_hold = list(/obj/item/gun/magnetic/fuelrod, /obj/item/fuel_assembly, /obj/item/stock_parts/cell, /obj/item/stock_parts, /obj/item/tool/screwdriver) cant_hold = list(/obj/item/tool/screwdriver/power) starts_with = list( /obj/item/gun/magnetic/fuelrod, diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 4a249df5cb..11900fc3b5 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -19,7 +19,7 @@ var/stunforce = 0 var/agonyforce = 60 var/status = 0 //whether the thing is on or not - var/obj/item/cell/bcell = null + var/obj/item/stock_parts/cell/bcell = null var/hitcost = 240 var/use_external_power = FALSE //only used to determine if it's a cyborg baton @@ -65,7 +65,7 @@ /obj/item/melee/baton/loaded/Initialize() //this one starts with a cell pre-installed. . = ..() - bcell = new/obj/item/cell/device/weapon(src) + bcell = new/obj/item/stock_parts/cell/device/weapon(src) update_icon() /obj/item/melee/baton/proc/deductcharge(var/chrgdeductamt) @@ -102,8 +102,8 @@ /obj/item/melee/baton/attackby(obj/item/W, mob/user) if(use_external_power) return - if(istype(W, /obj/item/cell)) - if(istype(W, /obj/item/cell/device)) + if(istype(W, /obj/item/stock_parts/cell)) + if(istype(W, /obj/item/stock_parts/cell/device)) if(!bcell) user.drop_item() W.loc = src @@ -220,8 +220,8 @@ slot_flags = null /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(istype(W, /obj/item/stock_parts/cell)) + if(!istype(W, /obj/item/stock_parts/cell/device)) if(!bcell) user.drop_item() W.loc = src diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 7543c5b898..878a265f5d 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -30,7 +30,7 @@ name = "retractor" desc = "Retracts stuff." icon_state = "retractor" - matter = list(MAT_STEEL = 10000, "glass" = 5000) + matter = list(MAT_STEEL = 10000, MAT_GLASS = 5000) origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) drop_sound = 'sound/items/drop/scrap.ogg' @@ -41,7 +41,7 @@ name = "hemostat" desc = "You think you have seen this before." icon_state = "hemostat" - matter = list(MAT_STEEL = 5000, "glass" = 2500) + matter = list(MAT_STEEL = 5000, MAT_GLASS = 2500) origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) attack_verb = list("attacked", "pinched") drop_sound = 'sound/items/drop/scrap.ogg' @@ -53,7 +53,7 @@ name = "cautery" desc = "This stops bleeding." icon_state = "cautery" - matter = list(MAT_STEEL = 5000, "glass" = 2500) + matter = list(MAT_STEEL = 5000, MAT_GLASS = 2500) origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) attack_verb = list("burnt") drop_sound = 'sound/items/drop/scrap.ogg' @@ -66,7 +66,7 @@ desc = "You can drill using this item. You dig?" icon_state = "drill" hitsound = 'sound/weapons/circsawhit.ogg' - matter = list(MAT_STEEL = 15000, "glass" = 10000) + matter = list(MAT_STEEL = 15000, MAT_GLASS = 10000) force = 15.0 w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) @@ -89,7 +89,7 @@ throw_speed = 3 throw_range = 5 origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) - matter = list(MAT_STEEL = 10000, "glass" = 5000) + matter = list(MAT_STEEL = 10000, MAT_GLASS = 5000) attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") drop_sound = 'sound/items/drop/knife.ogg' @@ -146,7 +146,7 @@ throw_speed = 3 throw_range = 5 origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) - matter = list(MAT_STEEL = 20000,"glass" = 10000) + matter = list(MAT_STEEL = 20000,MAT_GLASS = 10000) attack_verb = list("attacked", "slashed", "sawed", "cut") sharp = 1 edge = 1 diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index 283cf59104..56d010e4b8 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -17,7 +17,7 @@ w_class = ITEMSIZE_SMALL //Cost to make in the autolathe - matter = list(MAT_STEEL = 70, "glass" = 30) + matter = list(MAT_STEEL = 70, MAT_GLASS = 30) //R&D tech level origin_tech = list(TECH_ENGINEERING = 1) @@ -359,7 +359,7 @@ icon_state = "indwelder" max_fuel = 40 origin_tech = list(TECH_ENGINEERING = 2, TECH_PHORON = 2) - matter = list(MAT_STEEL = 70, "glass" = 60) + matter = list(MAT_STEEL = 70, MAT_GLASS = 60) /obj/item/weldingtool/largetank/cyborg name = "integrated welding tool" @@ -373,7 +373,7 @@ max_fuel = 80 w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_ENGINEERING = 3) - matter = list(MAT_STEEL = 70, "glass" = 120) + matter = list(MAT_STEEL = 70, MAT_GLASS = 120) /obj/item/weldingtool/mini name = "emergency welding tool" @@ -435,7 +435,7 @@ max_fuel = 40 w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_ENGINEERING = 4, TECH_PHORON = 3) - matter = list(MAT_STEEL = 70, "glass" = 120) + matter = list(MAT_STEEL = 70, MAT_GLASS = 120) toolspeed = 0.5 change_icons = 0 flame_intensity = 3 @@ -532,9 +532,9 @@ icon_state = "arcwelder" max_fuel = 0 //We'll handle the consumption later. item_state = "ewelder" - var/obj/item/cell/power_supply //What type of power cell this uses + var/obj/item/stock_parts/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/cell/device + var/cell_type = /obj/item/stock_parts/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' @@ -550,7 +550,7 @@ else if(cell_type) power_supply = new cell_type(src) else - power_supply = new /obj/item/cell/device(src) + power_supply = new /obj/item/stock_parts/cell/device(src) update_icon() /obj/item/weldingtool/electric/get_cell() @@ -566,7 +566,7 @@ /obj/item/weldingtool/electric/get_fuel() if(use_external_power) - var/obj/item/cell/external = get_external_power_supply() + var/obj/item/stock_parts/cell/external = get_external_power_supply() if(external) return external.charge else if(power_supply) @@ -576,7 +576,7 @@ /obj/item/weldingtool/electric/get_max_fuel() if(use_external_power) - var/obj/item/cell/external = get_external_power_supply() + var/obj/item/stock_parts/cell/external = get_external_power_supply() if(external) return external.maxcharge else if(power_supply) @@ -589,7 +589,7 @@ if(get_fuel() >= amount) power_supply.checked_use(charge_cost) if(use_external_power) - var/obj/item/cell/external = get_external_power_supply() + var/obj/item/stock_parts/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) @@ -617,8 +617,8 @@ return ..() /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(istype(W, /obj/item/stock_parts/cell)) + if(istype(W, /obj/item/stock_parts/cell/device)) if(!power_supply) user.drop_item() W.loc = src diff --git a/code/game/objects/random/maintenance.dm b/code/game/objects/random/maintenance.dm index d7092c323f..8dc2187ef0 100644 --- a/code/game/objects/random/maintenance.dm +++ b/code/game/objects/random/maintenance.dm @@ -33,10 +33,10 @@ something, make sure it's not in one of the other lists.*/ 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(4);/obj/item/stock_parts/cell, + prob(4);/obj/item/stock_parts/cell/device, + prob(3);/obj/item/stock_parts/cell/high, + prob(2);/obj/item/stock_parts/cell/super, prob(5);/obj/random/cigarettes, prob(3);/obj/item/clothing/mask/gas, prob(2);/obj/item/clothing/mask/gas/half, @@ -114,7 +114,7 @@ something, make sure it's not in one of the other lists.*/ return pick(prob(320);/obj/random/maintenance/clean, prob(2);/obj/item/flashlight/maglight, prob(2);/obj/item/flash, - prob(1);/obj/item/cell/device/weapon, + prob(1);/obj/item/stock_parts/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, @@ -247,7 +247,7 @@ something, make sure it's not in one of the other lists.*/ 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(1);/obj/item/stock_parts/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, diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index 6319964104..64a7cd1657 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -289,8 +289,8 @@ prob(2);list( /obj/item/melee/baton/cattleprod, /obj/item/melee/baton/cattleprod, - /obj/item/cell/high, - /obj/item/cell/high, + /obj/item/stock_parts/cell/high, + /obj/item/stock_parts/cell/high, /obj/structure/closet/crate ), prob(2);list( @@ -723,7 +723,7 @@ /obj/item/module/power_control, /obj/item/stack/cable_coil, /obj/item/frame/apc, - /obj/item/cell/apc, + /obj/item/stock_parts/cell/apc, /obj/structure/closet/crate/focalpoint //FOCAL APC ), prob(5);list( @@ -760,10 +760,10 @@ prob(2);list( /obj/random/energy, /obj/random/energy, - /obj/item/cell/device/weapon, - /obj/item/cell/device/weapon, - /obj/item/cell/device/weapon, - /obj/item/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, /obj/structure/closet/crate/secure/heph //HEPHAESTUS ENERGY ), prob(1);list( @@ -1020,7 +1020,7 @@ /obj/item/module/power_control, /obj/item/stack/cable_coil, /obj/item/frame/apc, - /obj/item/cell/apc, + /obj/item/stock_parts/cell/apc, /obj/structure/closet/crate/focalpoint //FOCAL APC ), prob(5);list( @@ -1256,16 +1256,16 @@ prob(2);list( /obj/random/energy, /obj/random/energy, - /obj/item/cell/device/weapon, - /obj/item/cell/device/weapon, - /obj/item/cell/device/weapon, - /obj/item/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, /obj/random/energy, /obj/random/energy, - /obj/item/cell/device/weapon, - /obj/item/cell/device/weapon, - /obj/item/cell/device/weapon, - /obj/item/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, /obj/structure/closet/crate/large/secure/heph //HEPH ENERGY ), prob(2);list( diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 7d8a9a1154..67f451b11b 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -71,11 +71,11 @@ icon_state = "cell" /obj/random/powercell/item_to_spawn() - 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) + return pick(prob(40);/obj/item/stock_parts/cell, + prob(25);/obj/item/stock_parts/cell/device, + prob(25);/obj/item/stock_parts/cell/high, + prob(9);/obj/item/stock_parts/cell/super, + prob(1);/obj/item/stock_parts/cell/hyper) /obj/random/bomb_supply diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm index 52bb07c9dd..692525fd1c 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm @@ -1364,7 +1364,7 @@ color = COLOR_LIGHT_CYAN decals = null extra_decals = list( - "glass" = COLOR_WHITE + MAT_GLASS = COLOR_WHITE ) /decl/closet_appearance/wall/medical @@ -1381,7 +1381,7 @@ decals = null extra_decals = list( "stripes" = COLOR_BEASTY_BROWN, - "glass" = COLOR_WHITE + MAT_GLASS = COLOR_WHITE ) /decl/closet_appearance/wall/hydrant @@ -1389,7 +1389,7 @@ decals = null extra_decals = list( "stripes" = COLOR_OFF_WHITE, - "glass" = COLOR_WHITE + MAT_GLASS = COLOR_WHITE ) // Wall cabinets @@ -1419,7 +1419,7 @@ decals = null extra_decals = list( "stripes" = COLOR_OFF_WHITE, - "glass" = COLOR_WHITE + MAT_GLASS = COLOR_WHITE ) // Carts @@ -1640,4 +1640,4 @@ "stripe_vertical_left_full" = COLOR_BEASTY_BROWN, "stripe_vertical_right_full" = COLOR_BEASTY_BROWN, "cargo_upper" = COLOR_CLOSET_GOLD - ) \ No newline at end of file + ) diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm index 7741095131..634e649867 100644 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm @@ -8,5 +8,5 @@ /obj/item/clothing/head/helmet/space/void, /obj/item/clothing/suit/space/void, /obj/item/tool/crowbar, - /obj/item/cell, + /obj/item/stock_parts/cell, /obj/item/multitool) 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 da117f28a0..d61401f707 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -93,7 +93,7 @@ /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/stock_parts/cell/device/weapon, /obj/item/clothing/accessory/holster/waist, /obj/item/melee/telebaton, /obj/item/clothing/head/beret/sec/corporate/hos, @@ -140,7 +140,7 @@ /obj/item/reagent_containers/spray/pepper, /obj/item/melee/baton/loaded, /obj/item/gun/energy/gun, - /obj/item/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, /obj/item/storage/box/holobadge, /obj/item/clothing/head/beret/sec/corporate/warden, /obj/item/clothing/suit/storage/hooded/wintercoat/security, @@ -184,7 +184,7 @@ /obj/item/clothing/under/rank/security/corp, /obj/item/ammo_magazine/m45/rubber, /obj/item/gun/energy/taser, - /obj/item/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, /obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/clothing/shoes/boots/winter/security, /obj/item/flashlight/maglight) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 469be21ec2..ac58b0ef9a 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -13,7 +13,7 @@ /obj/item/clothing/head/helmet/space/void/merc, /obj/item/clothing/suit/space/void/merc, /obj/item/tool/crowbar/red, - /obj/item/cell/high, + /obj/item/stock_parts/cell/high, /obj/item/card/id/syndicate, /obj/item/multitool, /obj/item/shield/energy, diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index 2470bdeef3..67d0c30431 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -138,8 +138,8 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/flashlight/glowstick/red, /obj/item/flashlight/glowstick/yellow, /obj/item/flashlight/pen, - /obj/item/cell, - /obj/item/cell/device, + /obj/item/stock_parts/cell, + /obj/item/stock_parts/cell/device, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/breath, @@ -348,9 +348,9 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/frame, /obj/item/broken_device/random, /obj/item/borg/upgrade/restart, - /obj/item/cell, - /obj/item/cell/high, - /obj/item/cell/device, + /obj/item/stock_parts/cell, + /obj/item/stock_parts/cell/high, + /obj/item/stock_parts/cell/device, /obj/item/circuitboard/broken, /obj/item/circuitboard/arcade, /obj/item/circuitboard/autolathe, @@ -393,8 +393,8 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) uncommon_loot = list( - /obj/item/cell/super, - /obj/item/cell/device/weapon, + /obj/item/stock_parts/cell/super, + /obj/item/stock_parts/cell/device/weapon, /obj/item/circuitboard/security, /obj/item/circuitboard/crew, /obj/item/aiModule/reset, @@ -424,7 +424,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) rare_loot = list( - /obj/item/cell/hyper, + /obj/item/stock_parts/cell/hyper, /obj/item/aiModule/freeform, /obj/item/aiModule/asimov, /obj/item/aiModule/paladin, @@ -487,7 +487,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh // May contain powercells or alien weaponry. /obj/structure/loot_pile/surface/alien/security uncommon_loot = list( - /obj/item/cell/device/weapon/recharge/alien, + /obj/item/stock_parts/cell/device/weapon/recharge/alien, /obj/item/clothing/suit/armor/alien, /obj/item/clothing/head/helmet/alien ) @@ -517,7 +517,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/surgical/retractor/alien, /obj/item/surgical/scalpel/alien, /obj/item/surgical/surgicaldrill/alien, - /obj/item/cell/device/weapon/recharge/alien, + /obj/item/stock_parts/cell/device/weapon/recharge/alien, /obj/item/clothing/suit/armor/alien, /obj/item/clothing/head/helmet/alien, /obj/item/gun/energy/alien @@ -899,12 +899,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/cell, + /obj/item/stock_parts/cell, /obj/item/material/shard ) uncommon_loot = list( - /obj/item/cell/high, + /obj/item/stock_parts/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, @@ -914,7 +914,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) rare_loot = list( - /obj/item/cell/super, + /obj/item/stock_parts/cell/super, /obj/item/borg/upgrade/restart, /obj/item/borg/upgrade/jetpack, /obj/item/borg/upgrade/tasercooler, diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 09dab969f7..276f822314 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -121,7 +121,7 @@ /datum/gear/utility/battery display_name = "cell, device" - path = /obj/item/cell/device + path = /obj/item/stock_parts/cell/device /datum/gear/utility/pen display_name = "fountain pen" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 74b7c466aa..9bb1e511f6 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -280,7 +280,7 @@ siemens_coefficient = 0.9 blood_sprite_state = "bloodyhands" var/wired = 0 - var/obj/item/cell/cell = 0 + var/obj/item/stock_parts/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 diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 4b95f8d161..0016f4c36f 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -342,7 +342,7 @@ BLIND // can't see anything icon_state = "welding-g" item_state_slots = list(slot_r_hand_str = "welding-g", slot_l_hand_str = "welding-g") action_button_name = "Flip Welding Goggles" - matter = list(MAT_STEEL = 1500, "glass" = 1000) + matter = list(MAT_STEEL = 1500, MAT_GLASS = 1000) item_flags = AIRTIGHT var/up = 0 flash_protection = FLASH_PROTECTION_MAJOR diff --git a/code/modules/clothing/gloves/antagonist.dm b/code/modules/clothing/gloves/antagonist.dm index 23451d6ea2..efd9588e56 100644 --- a/code/modules/clothing/gloves/antagonist.dm +++ b/code/modules/clothing/gloves/antagonist.dm @@ -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/cell/device/weapon/recharge - var/obj/item/cell/battery = null + var/battery_type = /obj/item/stock_parts/cell/device/weapon/recharge + var/obj/item/stock_parts/cell/battery = null /obj/item/clothing/gloves/ring/buzzer/get_cell() return battery diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 887aa4558b..24530081a7 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -18,7 +18,7 @@ desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye." icon_state = "welding" item_state_slots = list(slot_r_hand_str = "welding", slot_l_hand_str = "welding") - matter = list(MAT_STEEL = 3000, "glass" = 1000) + matter = list(MAT_STEEL = 3000, MAT_GLASS = 1000) var/up = 0 armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index 524e050793..55447a6d9e 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -13,7 +13,7 @@ desc = "It looks pretty sciency." icon = 'icons/obj/rig_modules.dmi' icon_state = "module" - matter = list(MAT_STEEL = 20000, "plastic" = 30000, "glass" = 5000) + matter = list(MAT_STEEL = 20000, MAT_PLASTIC = 30000, MAT_GLASS = 5000) var/damage = 0 var/obj/item/rig/holder diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index c179e988e6..3ede879164 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -42,7 +42,7 @@ 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/cell/high + var/cell_type = /obj/item/stock_parts/cell/high var/air_type = /obj/item/tank/oxygen //Component/device holders. @@ -51,7 +51,7 @@ 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/cell/cell // Power supply, if any. + var/obj/item/stock_parts/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. diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm index b974613057..8ab5d25a6e 100644 --- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm +++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm @@ -93,7 +93,7 @@ update_icon() return 1 - else if(!cell && istype(W,/obj/item/cell)) + else if(!cell && istype(W,/obj/item/stock_parts/cell)) if(!user.unEquip(W)) return diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index a2cc6ddca2..59f1e05512 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -94,7 +94,7 @@ req_access = list(access_syndicate) - cell_type = /obj/item/cell/hyper + cell_type = /obj/item/stock_parts/cell/hyper initial_modules = list( /obj/item/rig_module/mounted/energy_blade, @@ -114,7 +114,7 @@ req_access = list(access_syndicate) - cell_type = /obj/item/cell/hyper + cell_type = /obj/item/stock_parts/cell/hyper initial_modules = list( /obj/item/rig_module/stealth_field, diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index a8127e3784..48d8df2c5b 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -12,7 +12,7 @@ /obj/item/handcuffs, /obj/item/tank, /obj/item/suit_cooling_unit, - /obj/item/cell, + /obj/item/stock_parts/cell, /obj/item/storage ) armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) @@ -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/cell/hyper + cell_type = /obj/item/stock_parts/cell/hyper req_access = list(access_syndicate) diff --git a/code/modules/clothing/spacesuits/void/event.dm b/code/modules/clothing/spacesuits/void/event.dm index 7b36d9e889..2dd8bcec56 100644 --- a/code/modules/clothing/spacesuits/void/event.dm +++ b/code/modules/clothing/spacesuits/void/event.dm @@ -66,7 +66,7 @@ /obj/item/geiger, /obj/item/tool, /obj/item/weldingtool, - /obj/item/cell, + /obj/item/stock_parts/cell, /obj/item/pickaxe, /obj/item/measuring_tape, /obj/item/lightreplacer, @@ -105,7 +105,7 @@ /obj/item/stack/medical, /obj/item/gps, /obj/item/radio/beacon, - /obj/item/cell + /obj/item/stock_parts/cell ) //Marine Crewsuit (BLUE, SHIELD) @@ -142,7 +142,7 @@ /obj/item/holowarrant, /obj/item/megaphone, /obj/item/ammo_magazine, - /obj/item/cell + /obj/item/stock_parts/cell ) //Officer Crewsuit (GOLD, X) @@ -180,7 +180,7 @@ /obj/item/holowarrant, /obj/item/megaphone, /obj/item/ammo_magazine, - /obj/item/cell + /obj/item/stock_parts/cell ) //Pilot Crewsuit (ROYAL BLUE, I) @@ -257,7 +257,7 @@ /obj/item/stack/marker_beacon, /obj/item/stack/flag, /obj/item/clipboard, - /obj/item/cell + /obj/item/stock_parts/cell ) //Mercenary Crewsuit (RED, CROSS) @@ -297,5 +297,5 @@ /obj/item/spaceflare, /obj/item/powersink, /obj/item/radio_jammer, - /obj/item/cell - ) \ No newline at end of file + /obj/item/stock_parts/cell + ) diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm index 844471d484..719e1a0866 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -36,7 +36,7 @@ /obj/item/holowarrant, /obj/item/megaphone, /obj/item/ammo_magazine, - /obj/item/cell + /obj/item/stock_parts/cell ) //Tajaran Pearlshield Coalition Spacesuit @@ -101,4 +101,4 @@ icon_state = "hedberg_helmet" armor = list(melee = 70, bullet = 80, laser = 60, energy = 25, bomb = 40, bio = 100, rad = 0) siemens_coefficient = 0.8 - no_cycle = TRUE \ No newline at end of file + no_cycle = TRUE diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index a52279eab2..a68c053ae6 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -633,7 +633,7 @@ products = list(/obj/item/geiger = 4, /obj/item/clothing/glasses/meson = 2, /obj/item/multitool = 4, - /obj/item/cell/high = 10, + /obj/item/stock_parts/cell/high = 10, /obj/item/airlock_electronics = 10, /obj/item/module/power_control = 10, /obj/item/circuitboard/airalarm = 10, @@ -661,7 +661,7 @@ /obj/item/circuitboard/body_scanner, /obj/item/circuitboard/sleeper, /obj/item/circuitboard/dna_analyzer) - contraband = list(/obj/item/cell/potato = 3) + contraband = list(/obj/item/stock_parts/cell/potato = 3) premium = list(/obj/item/storage/belt/utility = 3) product_records = list() req_log_access = access_ce @@ -686,7 +686,7 @@ /obj/item/tool/wrench = 12, /obj/item/t_scanner = 12, /obj/item/stack/cable_coil/heavyduty = 8, - /obj/item/cell = 8, + /obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10, @@ -708,7 +708,7 @@ /obj/item/clothing/under/rank/roboticist = 4, /obj/item/stack/cable_coil = 4, /obj/item/flash = 4, - /obj/item/cell/high = 12, + /obj/item/stock_parts/cell/high = 12, /obj/item/assembly/prox_sensor = 3, /obj/item/assembly/signaler = 3, /obj/item/healthanalyzer = 3, diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm index d50d50aaef..c116ecb444 100644 --- a/code/modules/food/drinkingglass/drinkingglass.dm +++ b/code/modules/food/drinkingglass/drinkingglass.dm @@ -25,7 +25,7 @@ var/global/const/DRINK_ICON_NOISY = "_noise" possible_transfer_amounts = list(5,10,15,30) atom_flags = ATOM_REAGENTS_IS_OPEN - matter = list("glass" = 60) + matter = list(MAT_GLASS = 60) /obj/item/reagent_containers/food/drinks/glass2/examine(mob/M as mob) . = ..() diff --git a/code/modules/food/drinkingglass/glass_types.dm b/code/modules/food/drinkingglass/glass_types.dm index e26085b330..a95981f13a 100644 --- a/code/modules/food/drinkingglass/glass_types.dm +++ b/code/modules/food/drinkingglass/glass_types.dm @@ -7,7 +7,7 @@ volume = 30 possible_transfer_amounts = list(5,10,15,30) rim_pos = list(23,13,20) // y, x0, x1 - matter = list("glass" = 60) + matter = list(MAT_GLASS = 60) /obj/item/reagent_containers/food/drinks/glass2/rocks name = "rocks glass" @@ -17,7 +17,7 @@ volume = 20 possible_transfer_amounts = list(5,10,20) rim_pos = list(21, 10, 23) - matter = list("glass" = 40) + matter = list(MAT_GLASS = 40) /obj/item/reagent_containers/food/drinks/glass2/shake name = "milkshake glass" @@ -27,7 +27,7 @@ volume = 30 possible_transfer_amounts = list(5,10,15,30) rim_pos = list(25, 13, 21) - matter = list("glass" = 30) + matter = list(MAT_GLASS = 30) /obj/item/reagent_containers/food/drinks/glass2/cocktail name = "cocktail glass" @@ -37,7 +37,7 @@ volume = 15 possible_transfer_amounts = list(5,10,15) rim_pos = list(22, 13, 21) - matter = list("glass" = 30) + matter = list(MAT_GLASS = 30) /obj/item/reagent_containers/food/drinks/glass2/shot name = "shot glass" @@ -47,7 +47,7 @@ volume = 5 possible_transfer_amounts = list(1,2,5) rim_pos = list(17, 13, 21) - matter = list("glass" = 10) + matter = list(MAT_GLASS = 10) /obj/item/reagent_containers/food/drinks/glass2/pint name = "pint glass" @@ -57,7 +57,7 @@ volume = 60 possible_transfer_amounts = list(5,10,15,30,60) rim_pos = list(25, 12, 21) - matter = list("glass" = 120) + matter = list(MAT_GLASS = 120) /obj/item/reagent_containers/food/drinks/glass2/mug name = "glass mug" @@ -67,7 +67,7 @@ volume = 40 possible_transfer_amounts = list(5,10,20,40) rim_pos = list(22, 12, 20) - matter = list("glass" = 80) + matter = list(MAT_GLASS = 80) /obj/item/reagent_containers/food/drinks/glass2/wine name = "wine glass" @@ -77,4 +77,4 @@ volume = 25 possible_transfer_amounts = list(5, 10, 15, 25) rim_pos = list(25, 12, 21) - matter = list("glass" = 50) \ No newline at end of file + matter = list(MAT_GLASS = 50) diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm index 0563618931..0457bee762 100644 --- a/code/modules/food/drinkingglass/metaglass.dm +++ b/code/modules/food/drinkingglass/metaglass.dm @@ -6,7 +6,7 @@ volume = 30 unacidable = 1 //glass center_of_mass = list("x"=16, "y"=10) - matter = list("glass" = 500) + matter = list(MAT_GLASS = 500) icon = 'icons/obj/drinks.dmi' /obj/item/reagent_containers/food/drinks/metaglass/metapint @@ -683,4 +683,4 @@ Drinks Data glass_icon_state = "dynhot" /datum/reagent/drink/tea/icetea/dyn - glass_icon_state = "dyncold" \ No newline at end of file + glass_icon_state = "dyncold" diff --git a/code/modules/food/drinkingglass/shaker.dm b/code/modules/food/drinkingglass/shaker.dm index 756936b165..ec44080a2b 100644 --- a/code/modules/food/drinkingglass/shaker.dm +++ b/code/modules/food/drinkingglass/shaker.dm @@ -5,7 +5,7 @@ icon_state = "fitness-cup_black" base_icon = "fitness-cup" volume = 100 - matter = list("plastic" = 2000) + matter = list(MAT_PLASTIC = 2000) filling_states = list(10,20,30,40,50,60,70,80,90,100) possible_transfer_amounts = list(5, 10, 15, 25) rim_pos = null // no fruit slices @@ -34,4 +34,4 @@ ..() // And now set half the stuff back because our name shouldn't change name = initial(name) - desc = initial(desc) \ No newline at end of file + desc = initial(desc) diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/food/drinks/drinkingglass.dm index e9485ce24a..5da5b0c8ec 100644 --- a/code/modules/food/food/drinks/drinkingglass.dm +++ b/code/modules/food/food/drinks/drinkingglass.dm @@ -8,7 +8,7 @@ volume = 30 unacidable = 1 //glass center_of_mass = list("x"=16, "y"=10) - matter = list("glass" = 500) + matter = list(MAT_GLASS = 500) /obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change() if (!length(reagents?.reagent_list)) @@ -101,7 +101,7 @@ icon_state = "shotglass" amount_per_transfer_from_this = 10 volume = 10 - matter = list("glass" = 175) + matter = list(MAT_GLASS = 175) /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change() cut_overlays() @@ -125,7 +125,7 @@ desc = "Big enough to contain enough protein to get perfectly swole. Don't mind the bits." icon_state = "fitness-cup_black" volume = 100 - matter = list("plastic" = 2000) + matter = list(MAT_PLASTIC = 2000) /obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/Initialize() . = ..() diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index e31ebf8ee8..758e425399 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -4053,7 +4053,7 @@ icon_state = "rosesalad" filling_color = "#FF3867" nutriment_amt = 10 - nutriment_desc = list("bittersweet" = 10, "iron" = 5) + nutriment_desc = list("bittersweet" = 10, MAT_IRON = 5) bitesize = 4 /obj/item/reagent_containers/food/snacks/rosesalad/Initialize() @@ -7815,4 +7815,4 @@ icon_state = "kirani_jellypuff" nutriment_amt = 8 bitesize = 2 - nutriment_desc = list("puffed minty qa'zal bread" = 1, "super-sweet kirani jelly" = 1) \ No newline at end of file + nutriment_desc = list("puffed minty qa'zal bread" = 1, "super-sweet kirani jelly" = 1) diff --git a/code/modules/holomap/mapper.dm b/code/modules/holomap/mapper.dm index 00558059aa..25af780707 100644 --- a/code/modules/holomap/mapper.dm +++ b/code/modules/holomap/mapper.dm @@ -31,8 +31,8 @@ var/datum/mini_hud/mapper/hud_datum var/obj/screen/movable/mapper_holder/hud_item - var/obj/item/cell/cell - var/cell_type = /obj/item/cell/device + var/obj/item/stock_parts/cell/cell + var/cell_type = /obj/item/stock_parts/cell/device var/power_usage = 0.5 // Usage per map scan (doubled for ping mode) var/uses_power = 1 // If it uses power at all @@ -69,7 +69,7 @@ "/obj/item/clothing/head/helmet/ert/engineer" = "erte", "/obj/item/clothing/head/helmet/ert/medical" = "ertm", ) - + prefix_update_rig = list( "/obj/item/rig/ert" = "ertc", "/obj/item/rig/ert/security" = "erts", @@ -83,9 +83,9 @@ if(!mask_icon) mask_icon = icon('icons/effects/64x64.dmi', "mapper_mask") - + extras_holder = new() - + var/obj/screen/mapper/marker/mark = new() mark.icon = 'icons/effects/64x64.dmi' mark.icon_state = "mapper_none" @@ -109,7 +109,7 @@ mapping_units -= src last_run() - + map_image_cache.Cut() icon_image_cache.Cut() QDEL_NULL(extras_holder) @@ -132,7 +132,7 @@ if(!ishuman(loc) || user != loc) to_chat(H, "This device needs to be on your person.") - + if(hud_datum?.main_hud) hide_device() to_chat(H, "You put \the [src] away.") @@ -199,7 +199,7 @@ if(!updating || (uses_power && !cell)) stop_updates() return - + if(uses_power) var/power_to_use = pinging ? power_usage*2 : power_usage if(cell.use(power_to_use) != power_to_use) // we weren't able to use our full power_usage amount! @@ -289,11 +289,11 @@ // Mapper not on a turf or elsewhere if(!TU || (TU.z != T_z)) continue - + // We're the marker if(HC == src) mob_indicator = HOLOMAP_YOU - + // The marker is held by a borg else if(isrobot(HC.loc)) var/mob/living/silicon/robot/R = HC.loc @@ -301,7 +301,7 @@ mob_indicator = HOLOMAP_DEAD else mob_indicator = HOLOMAP_OTHER - + // The marker is worn by a human else if(ishuman(loc)) var/mob/living/carbon/human/H = loc @@ -309,11 +309,11 @@ mob_indicator = HOLOMAP_DEAD else mob_indicator = HOLOMAP_OTHER - + // It's not attached to anything useful else mob_indicator = HOLOMAP_DEAD - + // Ask it to update it's icon based on helmet (or whatever) HC.update_marker() @@ -344,19 +344,19 @@ var/obj/item/holomap_beacon/HB = hb if(HB.mapper_filter != mapper_filter) continue - + var/turf/TB = get_turf(HB) // Marker beacon not on a turf or elsewhere if(!TB || (TB.z != T_z)) continue - + var/marker_cache_key = "\ref[HB]_marker" if(!(marker_cache_key in icon_image_cache)) var/obj/screen/mapper/marker/mark = new() mark.icon_state = "beacon" mark.layer = 1 icon_image_cache[marker_cache_key] = mark - + var/obj/screen/mapper/marker/mark = icon_image_cache[marker_cache_key] handle_marker(mark,TB.x,TB.y) extras += mark @@ -371,7 +371,7 @@ extras_holder.vis_contents = extras hud_item.update(bgmap, extras_holder, badmap ? FALSE : pinging) - + /obj/item/mapping_unit/proc/update_marker() marker_prefix = base_prefix if (prefix_update_head) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 06595bfa16..86b7c81c46 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -182,7 +182,7 @@ if(C.use(5)) //TODO: generalize this. to_chat(user, "You add some cable to the [src.name] and slide it inside the battery casing.") - var/obj/item/cell/potato/pocell = new /obj/item/cell/potato(get_turf(user)) + var/obj/item/stock_parts/cell/potato/pocell = new /obj/item/stock_parts/cell/potato(get_turf(user)) if(src.loc == user && istype(user,/mob/living/carbon/human)) user.put_in_hands(pocell) pocell.maxcharge = src.potency * 10 diff --git a/code/modules/hydroponics/seedtypes/apples.dm b/code/modules/hydroponics/seedtypes/apples.dm index 4bd8a0bade..520874ecc0 100644 --- a/code/modules/hydroponics/seedtypes/apples.dm +++ b/code/modules/hydroponics/seedtypes/apples.dm @@ -31,7 +31,7 @@ display_name = "gold apple tree" kitchen_tag = "goldapple" mutants = null - chems = list("nutriment" = list(1,10), "gold" = list(1,5)) + chems = list("nutriment" = list(1,10), MAT_GOLD = list(1,5)) /datum/seed/apple/gold/New() ..() @@ -59,4 +59,4 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#0720c3") set_trait(TRAIT_PLANT_ICON,"tree5") set_trait(TRAIT_FLESH_COLOUR,"#05157d") - set_trait(TRAIT_IDEAL_LIGHT, 1) \ No newline at end of file + set_trait(TRAIT_IDEAL_LIGHT, 1) diff --git a/code/modules/hydroponics/seedtypes/berries.dm b/code/modules/hydroponics/seedtypes/berries.dm index 2ad36353fe..3b34638244 100644 --- a/code/modules/hydroponics/seedtypes/berries.dm +++ b/code/modules/hydroponics/seedtypes/berries.dm @@ -26,7 +26,7 @@ seed_name = "glowberry" display_name = "glowberry bush" mutants = null - chems = list("nutriment" = list(1,10), "uranium" = list(3,5)) + chems = list("nutriment" = list(1,10), MAT_URANIUM = list(3,5)) /datum/seed/berry/glow/New() ..() @@ -67,4 +67,4 @@ set_trait(TRAIT_YIELD,3) set_trait(TRAIT_POTENCY,50) set_trait(TRAIT_PRODUCT_COLOUR,"#7A5454") - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.35) \ No newline at end of file + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.35) diff --git a/code/modules/hydroponics/seedtypes/xeno.dm b/code/modules/hydroponics/seedtypes/xeno.dm index 2b1acd76b0..94ce35a694 100644 --- a/code/modules/hydroponics/seedtypes/xeno.dm +++ b/code/modules/hydroponics/seedtypes/xeno.dm @@ -4,7 +4,7 @@ seed_name = "alien weed" display_name = "alien weeds" force_layer = 3 - chems = list("phoron" = list(1,3)) + chems = list(MAT_PHORON = list(1,3)) /datum/seed/xenomorph/New() ..() @@ -16,4 +16,4 @@ set_trait(TRAIT_PRODUCTION,1) set_trait(TRAIT_YIELD,-1) set_trait(TRAIT_SPREAD,2) - set_trait(TRAIT_POTENCY,50) \ No newline at end of file + set_trait(TRAIT_POTENCY,50) diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 9ed6db8f66..cbab72d7da 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -15,7 +15,7 @@ var/max_complexity = IC_COMPLEXITY_BASE var/opened = FALSE var/can_anchor = FALSE // If true, wrenching it will anchor it. - var/obj/item/cell/device/battery = null // Internal cell which most circuits need to work. + var/obj/item/stock_parts/cell/device/battery = null // Internal cell which most circuits need to work. var/net_power = 0 // Set every tick, to display how much power is being drawn in total. var/detail_color = COLOR_ASSEMBLY_BLACK @@ -273,14 +273,14 @@ detail_color = D.detail_color update_icon() - else if(istype(I, /obj/item/cell/device)) + else if(istype(I, /obj/item/stock_parts/cell/device)) if(!opened) to_chat(user, "\The [src] isn't opened, so you can't put anything inside. Try using a crowbar.") return FALSE if(battery) to_chat(user, "\The [src] already has \a [battery] inside. Remove it first if you want to replace it.") return FALSE - var/obj/item/cell/device/cell = I + var/obj/item/stock_parts/cell/device/cell = I user.drop_item(cell) cell.forceMove(src) battery = cell @@ -359,4 +359,4 @@ // Returns TRUE if I is something that could/should have a valid interaction. Used to tell circuitclothes to hit the circuit with something instead of the clothes /obj/item/electronic_assembly/proc/is_valid_tool(var/obj/item/I) - return I.is_crowbar() || I.is_screwdriver() || istype(I, /obj/item/integrated_circuit) || istype(I, /obj/item/cell/device) || istype(I, /obj/item/integrated_electronics) \ No newline at end of file + return I.is_crowbar() || I.is_screwdriver() || istype(I, /obj/item/integrated_circuit) || istype(I, /obj/item/stock_parts/cell/device) || istype(I, /obj/item/integrated_electronics) diff --git a/code/modules/integrated_electronics/core/detailer.dm b/code/modules/integrated_electronics/core/detailer.dm index b6ea84540c..a680839764 100644 --- a/code/modules/integrated_electronics/core/detailer.dm +++ b/code/modules/integrated_electronics/core/detailer.dm @@ -14,7 +14,7 @@ "orange" = COLOR_ASSEMBLY_ORANGE, "beige" = COLOR_ASSEMBLY_BEIGE, "brown" = COLOR_ASSEMBLY_BROWN, - "gold" = COLOR_ASSEMBLY_GOLD, + MAT_GOLD = COLOR_ASSEMBLY_GOLD, "yellow" = COLOR_ASSEMBLY_YELLOW, "gurkha" = COLOR_ASSEMBLY_GURKHA, "light green" = COLOR_ASSEMBLY_LGREEN, diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm index bf486a21b8..e1c0e4372e 100644 --- a/code/modules/integrated_electronics/passive/power.dm +++ b/code/modules/integrated_electronics/passive/power.dm @@ -118,7 +118,7 @@ spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) var/volume = 60 - var/list/fuel = list("phoron" = 50000, "slimejelly" = 25000, "fuel" = 15000, "carbon" = 10000, "ethanol"= 10000, "nutriment" =8000, "blood" = 5000) + var/list/fuel = list(MAT_PHORON = 50000, "slimejelly" = 25000, "fuel" = 15000, "carbon" = 10000, "ethanol"= 10000, "nutriment" =8000, "blood" = 5000) /obj/item/integrated_circuit/passive/power/chemical_cell/Initialize() . = ..() diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index 80a5d3de8f..9d8848e457 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -700,11 +700,11 @@ if(AM) - var/obj/item/cell/cell = null - if(istype(AM, /obj/item/cell)) // Is this already a cell? + var/obj/item/stock_parts/cell/cell = null + if(istype(AM, /obj/item/stock_parts/cell)) // Is this already a cell? cell = AM else // If not, maybe there's a cell inside it? - for(var/obj/item/cell/C in AM.contents) + for(var/obj/item/stock_parts/cell/C in AM.contents) if(C) // Find one cell to charge. cell = C break diff --git a/code/modules/integrated_electronics/subtypes/power.dm b/code/modules/integrated_electronics/subtypes/power.dm index c9708bac4f..c709714b0e 100644 --- a/code/modules/integrated_electronics/subtypes/power.dm +++ b/code/modules/integrated_electronics/subtypes/power.dm @@ -43,11 +43,11 @@ if(!assembly) return FALSE // Pointless to do everything else if there's no battery to draw from. - var/obj/item/cell/cell = null - if(istype(AM, /obj/item/cell)) // Is this already a cell? + var/obj/item/stock_parts/cell/cell = null + if(istype(AM, /obj/item/stock_parts/cell)) // Is this already a cell? cell = AM else // If not, maybe there's a cell inside it? - for(var/obj/item/cell/C in AM.contents) + for(var/obj/item/stock_parts/cell/C in AM.contents) if(C) // Find one cell to charge. cell = C break @@ -88,4 +88,4 @@ sparks.set_up(3, 0, get_turf(src)) sparks.start() visible_message("\The [assembly] makes some sparks!") - qdel(sparks) \ No newline at end of file + qdel(sparks) diff --git a/code/modules/materials/materials/glass.dm b/code/modules/materials/materials/glass.dm index 2e1ed498ff..826cf152be 100644 --- a/code/modules/materials/materials/glass.dm +++ b/code/modules/materials/materials/glass.dm @@ -106,7 +106,7 @@ hardness = 40 weight = 30 stack_origin_tech = list(TECH_MATERIAL = 2) - composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT / 2, "glass" = SHEET_MATERIAL_AMOUNT) + composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT / 2, MAT_GLASS = SHEET_MATERIAL_AMOUNT) window_options = list("One Direction" = 1, "Full Window" = 4, "Windoor" = 2) created_window = /obj/structure/window/reinforced created_fulltile_window = /obj/structure/window/reinforced/full @@ -139,5 +139,5 @@ hardness = 40 weight = 30 stack_origin_tech = list(TECH_MATERIAL = 2) - composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT / 2, "borosilicate glass" = SHEET_MATERIAL_AMOUNT) + composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT / 2, MAT_BOROSILICATE = SHEET_MATERIAL_AMOUNT) rod_product = null diff --git a/code/modules/materials/materials/metals/metals.dm b/code/modules/materials/materials/metals/metals.dm index a36ffef5c1..5e3c1dbb1c 100644 --- a/code/modules/materials/materials/metals/metals.dm +++ b/code/modules/materials/materials/metals/metals.dm @@ -17,7 +17,7 @@ protectiveness = 60 // 75% reflectivity = 0.7 // Not a perfect mirror, but close. stack_origin_tech = list(TECH_MATERIAL = 8) - composite_material = list("plasteel" = SHEET_MATERIAL_AMOUNT, "diamond" = SHEET_MATERIAL_AMOUNT) //shrug + composite_material = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT, MAT_DIAMOND = SHEET_MATERIAL_AMOUNT) //shrug supply_conversion_value = 9 /datum/material/titanium @@ -196,4 +196,4 @@ sheet_singular_name = "ingot" sheet_plural_name = "ingots" supply_conversion_value = 2 - weight = 10 \ No newline at end of file + weight = 10 diff --git a/code/modules/materials/materials/metals/plasteel.dm b/code/modules/materials/materials/metals/plasteel.dm index 55f972f24f..da37d2110a 100644 --- a/code/modules/materials/materials/metals/plasteel.dm +++ b/code/modules/materials/materials/metals/plasteel.dm @@ -12,7 +12,7 @@ protectiveness = 20 // 50% conductivity = 13 // For the purposes of balance. stack_origin_tech = list(TECH_MATERIAL = 2) - composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT, "platinum" = SHEET_MATERIAL_AMOUNT) //todo + composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT, MAT_PLATINUM = SHEET_MATERIAL_AMOUNT) //todo supply_conversion_value = 6 /datum/material/plasteel/generate_recipes() diff --git a/code/modules/mining/alloys.dm b/code/modules/mining/alloys.dm index 219a2becdb..3fe32e1054 100644 --- a/code/modules/mining/alloys.dm +++ b/code/modules/mining/alloys.dm @@ -11,8 +11,8 @@ /datum/alloy/durasteel metaltag = "durasteel" requires = list( - "diamond" = 1, - "platinum" = 1, + MAT_DIAMOND = 1, + MAT_PLATINUM = 1, "carbon" = 2, "hematite" = 2 ) @@ -22,7 +22,7 @@ /datum/alloy/plasteel metaltag = "plasteel" requires = list( - "platinum" = 1, + MAT_PLATINUM = 1, "carbon" = 2, "hematite" = 2 ) @@ -40,7 +40,7 @@ /datum/alloy/borosilicate metaltag = "borosilicate glass" requires = list( - "platinum" = 1, + MAT_PLATINUM = 1, "sand" = 2 ) product = /obj/item/stack/material/glass/phoronglass @@ -48,7 +48,7 @@ /datum/alloy/bronze metaltag = "bronze" requires = list( - "copper" = 2, - "tin" = 1 + MAT_COPPER = 2, + MAT_TIN = 1 ) product = /obj/item/stack/material/bronze diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 3501c3034f..55ad49c6ca 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -19,17 +19,17 @@ var/list/ore_types = list( "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, - "osmium" = /obj/item/ore/osmium, + MAT_URANIUM = /obj/item/ore/uranium, + MAT_GOLD = /obj/item/ore/gold, + MAT_SILVER = /obj/item/ore/silver, + MAT_DIAMOND = /obj/item/ore/diamond, + MAT_PHORON = /obj/item/ore/phoron, + MAT_OSMIUM = /obj/item/ore/osmium, "hydrogen" = /obj/item/ore/hydrogen, "silicates" = /obj/item/ore/glass, "carbon" = /obj/item/ore/coal, - "copper" = /obj/item/ore/copper, - // "tin" = /obj/item/ore/tin, + MAT_COPPER = /obj/item/ore/copper, + // MAT_TIN = /obj/item/ore/tin, "bauxite" = /obj/item/ore/bauxite, "rutile" = /obj/item/ore/rutile ) @@ -39,19 +39,19 @@ var/capacity var/charge_use var/exotic_drilling - var/obj/item/cell/cell = null + var/obj/item/stock_parts/cell/cell = null // Found with an advanced laser. exotic_drilling >= 1 var/list/ore_types_uncommon = list( MAT_MARBLE = /obj/item/ore/marble, - "painite" = /obj/item/ore/painite, - "quartz" = /obj/item/ore/quartz, + MAT_PAINITE = /obj/item/ore/painite, + MAT_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( - "magmellite" = /obj/item/ore/magmellite, + MAT_MAGMELLITE = /obj/item/ore/magmellite, MAT_VERDANTIUM = /obj/item/ore/verdantium ) @@ -68,7 +68,7 @@ return cell /obj/machinery/mining/drill/loaded - cell = /obj/item/cell/high + cell = /obj/item/stock_parts/cell/high /obj/machinery/mining/drill/process() @@ -175,7 +175,7 @@ return if(!panel_open || active) return ..() - if(istype(O, /obj/item/cell)) + if(istype(O, /obj/item/stock_parts/cell)) if(cell) to_chat(user, "The drill already has a cell installed.") else @@ -250,7 +250,7 @@ capacity = 200 * P.rating if(istype(P, /obj/item/stock_parts/capacitor)) charge_use -= 10 * P.rating - cell = locate(/obj/item/cell) in component_parts + cell = locate(/obj/item/stock_parts/cell) in component_parts /obj/machinery/mining/drill/proc/check_supports() @@ -402,4 +402,4 @@ return 0 src.set_dir(turn(src.dir, 270)) - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/mining/machinery/machine_processing.dm b/code/modules/mining/machinery/machine_processing.dm index eaa11c3acd..71c5cdaebb 100644 --- a/code/modules/mining/machinery/machine_processing.dm +++ b/code/modules/mining/machinery/machine_processing.dm @@ -175,21 +175,21 @@ "carbon" = 1, "raw copper" = 1, "raw tin" = 1, - "magmellite" = 3, - "painite" = 3, - "quartz" = 3, + MAT_MAGMELLITE = 3, + MAT_PAINITE = 3, + MAT_QUARTZ = 3, "raw bauxite" = 5, - "phoron" = 15, - "silver" = 16, - "gold" = 18, - "marble" = 20, + MAT_PHORON = 15, + MAT_SILVER = 16, + MAT_GOLD = 18, + MAT_MARBLE = 20, "rutile" = 20, - "uranium" = 30, - "diamond" = 50, - "platinum" = 40, - "lead" = 40, - "mhydrogen" = 40, - "verdantium" = 60) + MAT_URANIUM = 30, + MAT_DIAMOND = 50, + MAT_PLATINUM = 40, + MAT_LEAD = 40, + MAT_METALHYDROGEN = 40, + MAT_VERDANTIUM = 60) /obj/machinery/mineral/processing_unit/Initialize() . = ..() @@ -338,4 +338,3 @@ #undef PROCESS_SMELT #undef PROCESS_COMPRESS #undef PROCESS_ALLOY - diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index a9f1046f3d..06a7469d8c 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -46,24 +46,24 @@ var/global/list/mining_overlay_cache = list() var/static/list/ore_types = list( "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, - "osmium" = /obj/item/ore/osmium, + MAT_URANIUM = /obj/item/ore/uranium, + MAT_GOLD = /obj/item/ore/gold, + MAT_SILVER = /obj/item/ore/silver, + MAT_DIAMOND = /obj/item/ore/diamond, + MAT_PHORON = /obj/item/ore/phoron, + MAT_OSMIUM = /obj/item/ore/osmium, "hydrogen" = /obj/item/ore/hydrogen, "silicates" = /obj/item/ore/glass, "carbon" = /obj/item/ore/coal, - "verdantium" = /obj/item/ore/verdantium, - "marble" = /obj/item/ore/marble, - "lead" = /obj/item/ore/lead, - "copper" = /obj/item/ore/copper, -// "tin" = /obj/item/ore/tin, + MAT_VERDANTIUM = /obj/item/ore/verdantium, + MAT_MARBLE = /obj/item/ore/marble, + MAT_LEAD = /obj/item/ore/lead, + MAT_COPPER = /obj/item/ore/copper, +// MAT_TIN = /obj/item/ore/tin, "bauxite" = /obj/item/ore/bauxite, - "magmellite" = /obj/item/ore/magmellite, -// "painite" = /obj/item/ore/painite, -// "quartz" = /obj/item/ore/quartz, + MAT_MAGMELLITE = /obj/item/ore/magmellite, +// MAT_PAINITE = /obj/item/ore/painite, +// MAT_QUARTZ = /obj/item/ore/quartz, "rutile" = /obj/item/ore/rutile ) @@ -744,10 +744,10 @@ var/global/list/mining_overlay_cache = list() var/mineral_name if(rare_ore) - mineral_name = pickweight(list("marble" = 5,/* "quartz" = 15,*/ "copper" = 10, /*"tin" = 5,*/ "bauxite" = 5, "uranium" = 15, "platinum" = 20, "hematite" = 15, "rutile" = 20, "carbon" = 15, "diamond" = 3, "gold" = 15, "silver" = 15, "phoron" = 25, "lead" = 5, "magmellite" = 1, "verdantium" = 2/*, "painite" = 1*/)) + mineral_name = pickweight(list(MAT_MARBLE = 5,/* MAT_QUARTZ = 15,*/ MAT_COPPER = 10, /*MAT_TIN = 5,*/ "bauxite" = 5, MAT_URANIUM = 15, MAT_PLATINUM = 20, "hematite" = 15, "rutile" = 20, "carbon" = 15, MAT_DIAMOND = 3, MAT_GOLD = 15, MAT_SILVER = 15, MAT_PHORON = 25, MAT_LEAD = 5, MAT_MAGMELLITE = 1, MAT_VERDANTIUM = 2/*, MAT_PAINITE = 1*/)) else - mineral_name = pickweight(list("marble" = 3,/* "quartz" = 10,*/ "copper" = 20, /*"tin" = 15,*/ "bauxite" = 15, "uranium" = 10, "platinum" = 10, "hematite" = 70, "rutile" = 15, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 3, "magmellite" = 1, "verdantium" = 1/*, "painite" = 1*/)) + mineral_name = pickweight(list(MAT_MARBLE = 3,/* MAT_QUARTZ = 10,*/ MAT_COPPER = 20, /*MAT_TIN = 15,*/ "bauxite" = 15, MAT_URANIUM = 10, MAT_PLATINUM = 10, "hematite" = 70, "rutile" = 15, "carbon" = 70, MAT_DIAMOND = 2, MAT_GOLD = 10, MAT_SILVER = 10, MAT_PHORON = 20, MAT_LEAD = 3, MAT_MAGMELLITE = 1, MAT_VERDANTIUM = 1/*, MAT_PAINITE = 1*/)) if(mineral_name && (mineral_name in GLOB.ore_data)) mineral = GLOB.ore_data[mineral_name] diff --git a/code/modules/mob/living/bot/SLed209bot.dm b/code/modules/mob/living/bot/SLed209bot.dm index 8eb8909008..887759929f 100644 --- a/code/modules/mob/living/bot/SLed209bot.dm +++ b/code/modules/mob/living/bot/SLed209bot.dm @@ -161,7 +161,7 @@ to_chat(user, "Taser gun attached.") if(9) - if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/stock_parts/cell)) build_step++ to_chat(user, "You complete the ED-209.") var/turf/T = get_turf(src) @@ -170,4 +170,3 @@ qdel(W) user.drop_from_inventory(src) qdel(src) - diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm index 6bfecf4aef..9caa0c713d 100644 --- a/code/modules/mob/living/bot/ed209bot.dm +++ b/code/modules/mob/living/bot/ed209bot.dm @@ -199,7 +199,7 @@ to_chat(user, "Taser gun attached.") if(9) - if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/stock_parts/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 d72bfc716f..cc8357da89 100644 --- a/code/modules/mob/living/bot/edCLNbot.dm +++ b/code/modules/mob/living/bot/edCLNbot.dm @@ -203,7 +203,7 @@ to_chat(user, "Mop attached.") if(8) - if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/stock_parts/cell)) build_step++ to_chat(user, "You complete the ED-CLN.") var/turf/T = get_turf(src) @@ -212,4 +212,4 @@ user.drop_item() qdel(W) user.drop_from_inventory(src) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index 91d79e794e..d7bfe2af0b 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -15,7 +15,7 @@ throw_speed = 5 throw_range = 10 origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 1, TECH_ENGINEERING = 2) - matter = list(MAT_STEEL = 500, "glass" = 200) + matter = list(MAT_STEEL = 500, MAT_GLASS = 200) var/mode = 1; /obj/item/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob) 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 84c770f46e..d046a6eb95 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -14,7 +14,7 @@ //Has a list of items that it can hold. var/list/can_hold = list( - /obj/item/cell, + /obj/item/stock_parts/cell, /obj/item/airlock_electronics, /obj/item/tracker_electronics, /obj/item/module/power_control, @@ -58,7 +58,7 @@ icon_state = "gripper-mining" can_hold = list( - /obj/item/cell, + /obj/item/stock_parts/cell, /obj/item/stock_parts ) @@ -109,7 +109,7 @@ desc = "A simple grasping tool suited to assist in a wide array of research applications." can_hold = list( - /obj/item/cell, + /obj/item/stock_parts/cell, /obj/item/stock_parts, /obj/item/mmi, /obj/item/robot_parts, @@ -135,7 +135,7 @@ desc = "A complex grasping tool used for working with circuitry." can_hold = list( - /obj/item/cell/device, + /obj/item/stock_parts/cell/device, /obj/item/electronic_assembly, /obj/item/assembly/electronic_assembly, /obj/item/clothing/under/circuitry, diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index c0c05b9964..58e6a59dc3 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -322,7 +322,7 @@ if(client) client.screen -= contents for(var/obj/I in contents) - if(I && !(istype(I,/obj/item/cell) || istype(I,/obj/item/radio) || istype(I,/obj/machinery/camera) || istype(I,/obj/item/mmi))) + if(I && !(istype(I,/obj/item/stock_parts/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/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 3d8f63efb7..34137fea2e 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -51,7 +51,7 @@ 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/cell/cell = null + var/obj/item/stock_parts/cell/cell = null var/obj/machinery/camera/camera = null var/cell_emp_mult = 2 @@ -139,7 +139,7 @@ C.wrapped = new C.external_type if(!cell) - cell = new /obj/item/cell(src) + cell = new /obj/item/stock_parts/cell(src) cell.maxcharge = 7500 cell.charge = 7500 else if(ispath(cell)) @@ -596,7 +596,7 @@ opened = 1 updateicon() - else if (istype(W, /obj/item/cell) && opened) // trying to put a cell inside + else if (istype(W, /obj/item/stock_parts/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.") diff --git a/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm b/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm index 3706f212c9..47ba6676d8 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm @@ -20,7 +20,7 @@ updatename("Gravekeeper") if(!cell) - cell = new /obj/item/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface. + cell = new /obj/item/stock_parts/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 41a750332f..25cc360daf 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm @@ -19,7 +19,7 @@ updatename("Lost") if(!cell) - cell = new /obj/item/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface. + cell = new /obj/item/stock_parts/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface. playsound(src, 'sound/mecha/nominalsyndi.ogg', 75, 0) diff --git a/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm b/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm index 9c6652f815..4706103e6b 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/syndicate.dm @@ -18,7 +18,7 @@ updatename("Syndicate") if(!cell) - cell = new /obj/item/cell/high(src) // 15k cell, because Antag. + cell = new /obj/item/stock_parts/cell/high(src) // 15k cell, because Antag. laws = new /datum/ai_laws/syndicate_override() 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 57c76909b9..7aacded6a0 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm @@ -1,5 +1,5 @@ // Spawner landmarks are used because platforms that are mapped during -// SSatoms init try to Initialize() twice. I have no idea why and I am +// SSatoms init try to Initialize() twice. I have no idea why and I am // not paid enough to spend more time trying to debug it. /obj/effect/landmark/robot_platform name = "recon platform spawner" @@ -20,7 +20,7 @@ icon_state = "tachi" color = "#68a2f2" - cell = /obj/item/cell/mech + cell = /obj/item/stock_parts/cell/mech idcard_type = /obj/item/card/id/platform module = /obj/item/robot_module/robot/platform @@ -99,7 +99,7 @@ if(distance <= 3) if(recharging) - var/obj/item/cell/recharging_atom = recharging.resolve() + var/obj/item/stock_parts/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." @@ -152,7 +152,7 @@ if(recharging) - var/obj/item/cell/recharging_atom = recharging.resolve() + var/obj/item/stock_parts/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_interactions.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm index f728e3bfd0..5a1b06f7dc 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/cell) && !opened) + if(istype(W, /obj/item/stock_parts/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)) @@ -43,7 +43,7 @@ if(jobban_isbanned(user, "Robot")) to_chat(user, SPAN_WARNING("You are banned from synthetic roles and cannot take control of \the [src].")) - return + return // Boilerplate from drone fabs, unsure if there's a shared proc to use instead. var/deathtime = world.time - user.timeofdeath diff --git a/code/modules/mob/living/silicon/robot/syndicate.dm b/code/modules/mob/living/silicon/robot/syndicate.dm index b164b332ea..6fc0be8603 100644 --- a/code/modules/mob/living/silicon/robot/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/syndicate.dm @@ -8,7 +8,7 @@ /mob/living/silicon/robot/syndicate/Initialize() if(!cell) - cell = new /obj/item/cell(src) + cell = new /obj/item/stock_parts/cell(src) cell.maxcharge = 25000 cell.charge = 25000 . = ..() diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm index 85e909465c..4eb7bef596 100644 --- a/code/modules/modular_computers/hardware/battery_module.dm +++ b/code/modules/modular_computers/hardware/battery_module.dm @@ -8,7 +8,7 @@ malfunction_probability = 1 origin_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1) var/battery_rating = 750 - var/obj/item/cell/battery = null + var/obj/item/stock_parts/cell/battery = null /obj/item/computer_hardware/battery_module/advanced name = "advanced battery" @@ -58,14 +58,14 @@ /obj/item/computer_hardware/battery_module/lambda/Initialize() . = ..() - battery = new/obj/item/cell/infinite(src) + battery = new/obj/item/stock_parts/cell/infinite(src) /obj/item/computer_hardware/battery_module/diagnostics(var/mob/user) ..() to_chat(user, "Internal battery charge: [battery.charge]/[battery.maxcharge] CU") /obj/item/computer_hardware/battery_module/Initialize() - battery = new/obj/item/cell(src) + battery = new/obj/item/stock_parts/cell(src) battery.maxcharge = battery_rating battery.charge = 0 . = ..() @@ -79,4 +79,4 @@ battery.charge = battery.maxcharge /obj/item/computer_hardware/battery_module/get_cell() - return battery \ No newline at end of file + return battery diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 4d53f04f56..074c30a905 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -276,7 +276,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) name = "Promethean Revival" id = "prom_revival" result = null - required_reagents = list("phoron" = 40) + required_reagents = list(MAT_PHORON = 40) result_amount = 1 /decl/chemical_reaction/instant/promethean_brain_revival/can_happen(var/datum/reagents/holder) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 32b3c678b6..f2bb06da06 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/cell/high + cell_type = /obj/item/stock_parts/cell/high /obj/machinery/power/apc/super - cell_type = /obj/item/cell/super + cell_type = /obj/item/stock_parts/cell/super /obj/machinery/power/apc/super/critical is_critical = 1 /obj/machinery/power/apc/hyper - cell_type = /obj/item/cell/hyper + cell_type = /obj/item/stock_parts/cell/hyper /obj/machinery/power/apc/alarms_hidden alarms_hidden = TRUE @@ -87,10 +87,10 @@ GLOBAL_LIST_EMPTY(apcs) req_access = list(access_engine_equip) var/area/area var/areastring = null - var/obj/item/cell/cell + var/obj/item/stock_parts/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/cell/apc + var/cell_type = /obj/item/stock_parts/cell/apc var/opened = 0 //0=closed, 1=opened, 2=cover removed var/shorted = 0 var/grid_check = FALSE @@ -134,7 +134,7 @@ GLOBAL_LIST_EMPTY(apcs) var/static/list/status_overlays_lighting var/static/list/status_overlays_environ var/alarms_hidden = FALSE //If power alarms from this APC are visible on consoles - + var/nightshift_lights = FALSE var/nightshift_setting = NIGHTSHIFT_AUTO var/last_nightshift_switch = 0 @@ -514,7 +514,7 @@ GLOBAL_LIST_EMPTY(apcs) else opened = 1 update_icon() - else if (istype(W, /obj/item/cell) && opened) // trying to put a cell inside + else if (istype(W, /obj/item/stock_parts/cell) && opened) // trying to put a cell inside if(cell) to_chat(user, "The [name] already has a power cell installed.") return @@ -1387,4 +1387,4 @@ GLOBAL_LIST_EMPTY(apcs) #undef APC_HAS_ELECTRONICS_NONE #undef APC_HAS_ELECTRONICS_WIRED -#undef APC_HAS_ELECTRONICS_SECURED \ No newline at end of file +#undef APC_HAS_ELECTRONICS_SECURED diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index 97f97be915..625b72dda9 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -55,7 +55,7 @@ output_level = max_transfer_rate /obj/machinery/power/smes/batteryrack/Destroy() - for(var/obj/item/cell/C in internal_cells) + for(var/obj/item/stock_parts/cell/C in internal_cells) qdel(C) internal_cells = null return ..() @@ -70,7 +70,7 @@ add_overlay("charge[charge_level]") - for(var/obj/item/cell/C in internal_cells) + for(var/obj/item/stock_parts/cell/C in internal_cells) cellcount++ add_overlay("cell[cellcount]") if(C.fully_charged()) @@ -81,7 +81,7 @@ // Recalculate maxcharge and similar variables. /obj/machinery/power/smes/batteryrack/proc/update_maxcharge() var/newmaxcharge = 0 - for(var/obj/item/cell/C in internal_cells) + for(var/obj/item/stock_parts/cell/C in internal_cells) newmaxcharge += C.maxcharge newmaxcharge /= CELLRATE // Convert to Joules @@ -112,12 +112,12 @@ amount *= CELLRATE // Convert to CELLRATE first. if(equalise) // Now try to get least charged cell and use the power from it. - var/obj/item/cell/CL = get_least_charged_cell() + var/obj/item/stock_parts/cell/CL = get_least_charged_cell() 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/cell/C in internal_cells) + for(var/obj/item/stock_parts/cell/C in internal_cells) amount -= C.give(amount) // No more power to input so return. if(!amount) @@ -128,12 +128,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/cell/CL = get_most_charged_cell() + var/obj/item/stock_parts/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/cell/C in internal_cells) + for(var/obj/item/stock_parts/cell/C in internal_cells) amount -= C.use(amount) // No more power to output so return. if(!amount) @@ -141,23 +141,23 @@ // Helper procs to get most/least charged cells. /obj/machinery/power/smes/batteryrack/proc/get_most_charged_cell() - var/obj/item/cell/CL = null - for(var/obj/item/cell/C in internal_cells) + var/obj/item/stock_parts/cell/CL = null + for(var/obj/item/stock_parts/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/cell/CL = null - for(var/obj/item/cell/C in internal_cells) + var/obj/item/stock_parts/cell/CL = null + for(var/obj/item/stock_parts/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/cell/C, var/mob/user) +/obj/machinery/power/smes/batteryrack/proc/insert_cell(var/obj/item/stock_parts/cell/C, var/mob/user) if(!istype(C)) return 0 @@ -176,7 +176,7 @@ /obj/machinery/power/smes/batteryrack/process() charge = 0 - for(var/obj/item/cell/C in internal_cells) + for(var/obj/item/stock_parts/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) @@ -192,8 +192,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/cell/least = get_least_charged_cell() - var/obj/item/cell/most = get_most_charged_cell() + var/obj/item/stock_parts/cell/least = get_least_charged_cell() + var/obj/item/stock_parts/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 @@ -222,7 +222,7 @@ data["cells_cur"] = internal_cells.len var/list/cells = list() var/cell_index = 0 - for(var/obj/item/cell/C in internal_cells) + for(var/obj/item/stock_parts/cell/C in internal_cells) var/list/cell[0] cell["slot"] = cell_index + 1 cell["used"] = 1 @@ -246,7 +246,7 @@ ui.set_auto_update(1) /obj/machinery/power/smes/batteryrack/dismantle() - for(var/obj/item/cell/C in internal_cells) + for(var/obj/item/stock_parts/cell/C in internal_cells) C.forceMove(get_turf(src)) internal_cells -= C return ..() @@ -258,7 +258,7 @@ return if(default_part_replacement(user, W)) return - if(istype(W, /obj/item/cell)) // ID Card, try to insert it. + if(istype(W, /obj/item/stock_parts/cell)) // ID Card, try to insert it. if(insert_cell(W, user)) to_chat(user, "You insert \the [W] into \the [src].") else @@ -295,8 +295,8 @@ equalise = 0 return 1 else if( href_list["ejectcell"] ) - var/obj/item/cell/C - for(var/obj/item/cell/CL in internal_cells) + var/obj/item/stock_parts/cell/C + for(var/obj/item/stock_parts/cell/CL in internal_cells) if(CL.c_uid == text2num(href_list["ejectcell"])) C = CL break @@ -309,4 +309,4 @@ update_icon() RefreshParts() update_maxcharge() - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 94d94f9434..89afeec5fe 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -23,7 +23,7 @@ By design, d1 is the smallest direction and d2 is the highest */ var/global/list/possible_cable_coil_colours = list( "White" = COLOR_WHITE, - "Silver" = COLOR_SILVER, + MAT_SILVER = COLOR_SILVER, "Gray" = COLOR_GRAY, "Black" = COLOR_BLACK, "Red" = COLOR_RED, @@ -503,7 +503,7 @@ var/global/list/possible_cable_coil_colours = list( w_class = ITEMSIZE_SMALL throw_speed = 2 throw_range = 5 - matter = list(MAT_STEEL = 50, "glass" = 20) + matter = list(MAT_STEEL = 50, MAT_GLASS = 20) slot_flags = SLOT_BELT item_state = "coil" attack_verb = list("whipped", "lashed", "disciplined", "flogged") @@ -943,7 +943,7 @@ var/global/list/possible_cable_coil_colours = list( w_class = ITEMSIZE_SMALL throw_speed = 2 throw_range = 5 - matter = list(MAT_STEEL = 50, "glass" = 20) + matter = list(MAT_STEEL = 50, MAT_GLASS = 20) slot_flags = SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined", "flogged") stacktype = null diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 90d528a484..2301ce6aa5 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/cell +/obj/item/stock_parts/cell name = "power cell" desc = "A rechargable electrochemical power cell." icon = 'icons/obj/power.dmi' @@ -24,7 +24,7 @@ var/charge_amount = 25 // How much power to give, if self_recharge is true. The number is in absolute cell charge, as it gets divided by CELLRATE later. var/last_use = 0 // A tracker for use in self-charging var/charge_delay = 0 // How long it takes for the cell to start recharging after last use - matter = list(MAT_STEEL = 700, "glass" = 50) + matter = list(MAT_STEEL = 700, MAT_GLASS = 50) drop_sound = 'sound/items/drop/component.ogg' pickup_sound = 'sound/items/pickup/component.ogg' @@ -33,7 +33,7 @@ var/overlay_full_state = "cell-o2" // Overlay used when fully charged. var/last_overlay_state = null // Used to optimize update_icon() calls. -/obj/item/cell/Initialize() +/obj/item/stock_parts/cell/Initialize() . = ..() c_uid = cell_uid++ charge = maxcharge @@ -41,15 +41,15 @@ if(self_recharge) START_PROCESSING(SSobj, src) -/obj/item/cell/Destroy() +/obj/item/stock_parts/cell/Destroy() if(self_recharge) STOP_PROCESSING(SSobj, src) return ..() -/obj/item/cell/get_cell() +/obj/item/stock_parts/cell/get_cell() return src -/obj/item/cell/process() +/obj/item/stock_parts/cell/process() if(self_recharge) if(world.time >= last_use + charge_delay) give(charge_amount) @@ -62,7 +62,7 @@ else return PROCESS_KILL -/obj/item/cell/drain_power(var/drain_check, var/surge, var/power = 0) +/obj/item/stock_parts/cell/drain_power(var/drain_check, var/surge, var/power = 0) if(drain_check) return 1 @@ -78,7 +78,7 @@ #define OVERLAY_PARTIAL 1 #define OVERLAY_EMPTY 0 -/obj/item/cell/update_icon() +/obj/item/stock_parts/cell/update_icon() var/new_overlay = null // The overlay that is needed. // If it's different than the current overlay, then it'll get changed. // Otherwise nothing happens, to save on CPU. @@ -107,22 +107,22 @@ #undef OVERLAY_PARTIAL #undef OVERLAY_EMPTY -/obj/item/cell/proc/percent() // return % charge of cell +/obj/item/stock_parts/cell/proc/percent() // return % charge of cell return 100.0*charge/maxcharge -/obj/item/cell/proc/fully_charged() +/obj/item/stock_parts/cell/proc/fully_charged() return (charge == maxcharge) // checks if the power cell is able to provide the specified amount of charge -/obj/item/cell/proc/check_charge(var/amount) +/obj/item/stock_parts/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/cell/proc/amount_missing() +/obj/item/stock_parts/cell/proc/amount_missing() return max(maxcharge - charge, 0) // use power from a cell, returns the amount actually used -/obj/item/cell/proc/use(var/amount) +/obj/item/stock_parts/cell/proc/use(var/amount) if(rigged && amount > 0) explode() return 0 @@ -134,14 +134,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/cell/proc/checked_use(var/amount) +/obj/item/stock_parts/cell/proc/checked_use(var/amount) if(!check_charge(amount)) return 0 use(amount) return 1 // recharge the cell -/obj/item/cell/proc/give(var/amount) +/obj/item/stock_parts/cell/proc/give(var/amount) if(rigged && amount > 0) explode() return 0 @@ -155,13 +155,13 @@ return amount_used -/obj/item/cell/examine(mob/user) +/obj/item/stock_parts/cell/examine(mob/user) . = ..() if(Adjacent(user)) . += "It has a power rating of [maxcharge]." . += "The charge meter reads [round(src.percent() )]%." -/obj/item/cell/attackby(obj/item/W, mob/user) +/obj/item/stock_parts/cell/attackby(obj/item/W, mob/user) ..() if(istype(W, /obj/item/reagent_containers/syringe)) var/obj/item/reagent_containers/syringe/S = W @@ -177,7 +177,7 @@ S.reagents.clear_reagents() -/obj/item/cell/proc/explode() +/obj/item/stock_parts/cell/proc/explode() var/turf/T = get_turf(src.loc) /* * 1000-cell explosion(T, -1, 0, 1, 1) @@ -204,13 +204,13 @@ qdel(src) -/obj/item/cell/proc/corrupt() +/obj/item/stock_parts/cell/proc/corrupt() charge /= 2 maxcharge /= 2 if (prob(10)) rigged = 1 //broken batterys are dangerous -/obj/item/cell/emp_act(severity) +/obj/item/stock_parts/cell/emp_act(severity) //remove this once emp changes on dev are merged in if(isrobot(loc)) var/mob/living/silicon/robot/R = loc @@ -223,7 +223,7 @@ update_icon() ..() -/obj/item/cell/ex_act(severity) +/obj/item/stock_parts/cell/ex_act(severity) switch(severity) if(1.0) @@ -243,7 +243,7 @@ corrupt() return -/obj/item/cell/proc/get_electrocute_damage() +/obj/item/stock_parts/cell/proc/get_electrocute_damage() switch (charge) /* if (9000 to INFINITY) return min(rand(90,150),rand(90,150)) @@ -270,4 +270,4 @@ if (1000 to 50000-1) return min(rand(10,20),rand(10,20)) else - return 0 \ No newline at end of file + return 0 diff --git a/code/modules/power/cells/device_cells.dm b/code/modules/power/cells/device_cells.dm index 50db6938e2..00345df3a4 100644 --- a/code/modules/power/cells/device_cells.dm +++ b/code/modules/power/cells/device_cells.dm @@ -1,5 +1,5 @@ //currently only used by energy-type guns, that may change in the future. -/obj/item/cell/device +/obj/item/stock_parts/cell/device name = "device power cell" desc = "A small power cell designed to power handheld devices." icon_state = "dcell" @@ -10,22 +10,22 @@ throw_range = 7 maxcharge = 480 charge_amount = 5 - matter = list("metal" = 350, "glass" = 50) + matter = list("metal" = 350, MAT_GLASS = 50) preserve_item = 1 -/obj/item/cell/device/weapon +/obj/item/stock_parts/cell/device/weapon name = "weapon power cell" desc = "A small power cell designed to power handheld weaponry." icon_state = "wcell" maxcharge = 2400 charge_amount = 20 -/obj/item/cell/device/weapon/empty/Initialize() +/obj/item/stock_parts/cell/device/weapon/empty/Initialize() . = ..() charge = 0 update_icon() -/obj/item/cell/device/weapon/recharge +/obj/item/stock_parts/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 = "wcell" //TODO: Different sprite @@ -33,7 +33,7 @@ charge_amount = 120 charge_delay = 75 -/obj/item/cell/device/weapon/recharge/captain +/obj/item/stock_parts/cell/device/weapon/recharge/captain charge_amount = 160 //Recharges a lot more quickly... charge_delay = 100 //... but it takes a while to get started @@ -52,7 +52,7 @@ Scanning similar objects may yield more information." value = CATALOGUER_REWARD_EASY -/obj/item/cell/device/weapon/recharge/alien +/obj/item/stock_parts/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) @@ -62,5 +62,5 @@ charge_delay = 50 // Every five seconds, bit faster than the default. origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6) -/obj/item/cell/device/weapon/recharge/alien/update_icon() - return // No overlays please. \ No newline at end of file +/obj/item/stock_parts/cell/device/weapon/recharge/alien/update_icon() + return // No overlays please. diff --git a/code/modules/power/cells/esoteric_cells.dm b/code/modules/power/cells/esoteric_cells.dm index daaa81f71c..5cfe60f5c5 100644 --- a/code/modules/power/cells/esoteric_cells.dm +++ b/code/modules/power/cells/esoteric_cells.dm @@ -1,5 +1,5 @@ -/obj/item/cell/spike +/obj/item/stock_parts/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/cell/spike/process() +/obj/item/stock_parts/cell/spike/process() ..() var/turf/Center = get_turf(src) diff --git a/code/modules/power/cells/power_cells.dm b/code/modules/power/cells/power_cells.dm index 51046d5e6d..0d0cadce0e 100644 --- a/code/modules/power/cells/power_cells.dm +++ b/code/modules/power/cells/power_cells.dm @@ -1,86 +1,86 @@ -/obj/item/cell/crap +/obj/item/stock_parts/cell/crap name = "\improper rechargable AA battery" desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT origin_tech = list(TECH_POWER = 0) maxcharge = 500 - matter = list(MAT_STEEL = 700, "glass" = 40) + matter = list(MAT_STEEL = 700, MAT_GLASS = 40) -/obj/item/cell/crap/empty/Initialize() +/obj/item/stock_parts/cell/crap/empty/Initialize() . = ..() charge = 0 -/obj/item/cell/secborg +/obj/item/stock_parts/cell/secborg name = "security borg rechargable D battery" origin_tech = list(TECH_POWER = 0) maxcharge = 600 //600 max charge / 100 charge per shot = six shots - matter = list(MAT_STEEL = 700, "glass" = 40) + matter = list(MAT_STEEL = 700, MAT_GLASS = 40) -/obj/item/cell/secborg/empty/Initialize() +/obj/item/stock_parts/cell/secborg/empty/Initialize() . = ..() charge = 0 update_icon() -/obj/item/cell/apc +/obj/item/stock_parts/cell/apc name = "heavy-duty power cell" origin_tech = list(TECH_POWER = 1) maxcharge = 5000 - matter = list(MAT_STEEL = 700, "glass" = 50) + matter = list(MAT_STEEL = 700, MAT_GLASS = 50) -/obj/item/cell/high +/obj/item/stock_parts/cell/high name = "high-capacity power cell" origin_tech = list(TECH_POWER = 2) icon_state = "hcell" maxcharge = 10000 - matter = list(MAT_STEEL = 700, "glass" = 60) + matter = list(MAT_STEEL = 700, MAT_GLASS = 60) -/obj/item/cell/high/empty/Initialize() +/obj/item/stock_parts/cell/high/empty/Initialize() . = ..() charge = 0 update_icon() -/obj/item/cell/super +/obj/item/stock_parts/cell/super name = "super-capacity power cell" origin_tech = list(TECH_POWER = 5) icon_state = "scell" maxcharge = 20000 - matter = list(MAT_STEEL = 700, "glass" = 70) + matter = list(MAT_STEEL = 700, MAT_GLASS = 70) -/obj/item/cell/super/empty/Initialize() +/obj/item/stock_parts/cell/super/empty/Initialize() . = ..() charge = 0 update_icon() -/obj/item/cell/hyper +/obj/item/stock_parts/cell/hyper name = "hyper-capacity power cell" origin_tech = list(TECH_POWER = 6) icon_state = "hpcell" maxcharge = 30000 - matter = list(MAT_STEEL = 700, "glass" = 80) + matter = list(MAT_STEEL = 700, MAT_GLASS = 80) -/obj/item/cell/hyper/empty/Initialize() +/obj/item/stock_parts/cell/hyper/empty/Initialize() . = ..() charge = 0 update_icon() -/obj/item/cell/mech +/obj/item/stock_parts/cell/mech name = "mecha power cell" charge = 15000 maxcharge = 15000 -/obj/item/cell/infinite +/obj/item/stock_parts/cell/infinite name = "infinite-capacity power cell!" icon_state = "icell" origin_tech = null maxcharge = 30000 //determines how badly mobs get shocked - matter = list(MAT_STEEL = 700, "glass" = 80) + matter = list(MAT_STEEL = 700, MAT_GLASS = 80) -/obj/item/cell/infinite/check_charge() +/obj/item/stock_parts/cell/infinite/check_charge() return 1 -/obj/item/cell/infinite/use() +/obj/item/stock_parts/cell/infinite/use() return 1 -/obj/item/cell/potato +/obj/item/stock_parts/cell/potato name = "potato battery" desc = "A rechargable starch based power cell." origin_tech = list(TECH_POWER = 1) @@ -90,7 +90,7 @@ maxcharge = 300 minor_fault = 1 -/obj/item/cell/slime +/obj/item/stock_parts/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) @@ -139,15 +139,15 @@ target.adjust_nutrition(amount) user.custom_emote(message = "connects \the [src] to [user == target ? "their" : "[target]'s"] charging port, expending it.") -/obj/item/cell/emergency_light +/obj/item/stock_parts/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 - matter = list("glass" = 20) + matter = list(MAT_GLASS = 20) w_class = ITEMSIZE_TINY -/obj/item/cell/emergency_light/Initialize() +/obj/item/stock_parts/cell/emergency_light/Initialize() . = ..() var/area/A = get_area(src) if(!A.lightswitch || !A.light_power) - charge = 0 //For naturally depowered areas, we start with no power \ No newline at end of file + charge = 0 //For naturally depowered areas, we start with no power diff --git a/code/modules/power/fusion/fusion_reactions.dm b/code/modules/power/fusion/fusion_reactions.dm index a4d3303f3d..1fd5415fd9 100644 --- a/code/modules/power/fusion/fusion_reactions.dm +++ b/code/modules/power/fusion/fusion_reactions.dm @@ -86,7 +86,7 @@ var/global/list/fusion_reactions /decl/fusion_reaction/iron_iron p_react = "iron" s_react = "iron" - products = list("silver" = 1, "gold" = 1, "platinum" = 1) // Not realistic but w/e + products = list(MAT_SILVER = 1, MAT_GOLD = 1, MAT_PLATINUM = 1) // Not realistic but w/e energy_consumption = 10 energy_production = 0 instability = 2 diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 3f0f298c33..9e10181bdb 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -31,7 +31,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/cell/cell = null + var/obj/item/stock_parts/cell/cell = null var/cell_connectors = TRUE @@ -85,7 +85,7 @@ var/global/list/light_type_cache = list() /obj/machinery/light_construct/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) - if(istype(W, /obj/item/cell/emergency_light)) + if(istype(W, /obj/item/stock_parts/cell/emergency_light)) if(!cell_connectors) to_chat(user, "This [name] can't support a power cell!") return @@ -230,7 +230,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/cell/emergency_light/cell + var/obj/item/stock_parts/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 @@ -290,7 +290,7 @@ var/global/list/light_type_cache = list() lamp_shade = 0 update_icon() else if(start_with_cell && !no_emergency) - cell = new/obj/item/cell/emergency_light(src) + cell = new/obj/item/stock_parts/cell/emergency_light(src) /obj/machinery/light/flamp/flicker @@ -323,7 +323,7 @@ var/global/list/light_type_cache = list() set_dir(construct.dir) else if(start_with_cell && !no_emergency) - cell = new/obj/item/cell/emergency_light(src) + cell = new/obj/item/stock_parts/cell/emergency_light(src) var/obj/item/light/L = get_light_type_instance(light_type) update_from_bulb(L) if(prob(L.broken_chance)) @@ -865,7 +865,7 @@ var/global/list/light_type_cache = list() icon_state = "ltube" base_state = "ltube" item_state = "c_tube" - matter = list("glass" = 100) + matter = list(MAT_GLASS = 100) brightness_range = 7 // luminosity when on, also used in power calculation brightness_power = 6 @@ -884,7 +884,7 @@ var/global/list/light_type_cache = list() icon_state = "lbulb" base_state = "lbulb" item_state = "contvapour" - matter = list("glass" = 100) + matter = list(MAT_GLASS = 100) brightness_range = 5 brightness_power = 4 brightness_color = LIGHT_COLOR_INCANDESCENT_BULB @@ -907,7 +907,7 @@ var/global/list/light_type_cache = list() icon_state = "fbulb" base_state = "fbulb" item_state = "egg4" - matter = list("glass" = 100) + matter = list(MAT_GLASS = 100) // update the icon state and description of the light /obj/item/light/update_icon() diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index fcd8eb86fa..062c62f4d6 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -282,11 +282,11 @@ power_source = Cable.powernet var/datum/powernet/PN - var/obj/item/cell/cell + var/obj/item/stock_parts/cell/cell if(istype(power_source,/datum/powernet)) PN = power_source - else if(istype(power_source,/obj/item/cell)) + else if(istype(power_source,/obj/item/stock_parts/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/cell)) + else if (istype(power_source, /obj/item/stock_parts/cell)) cell.use(drained_energy) return drained_energy diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm index 122251cf44..2076a09a4a 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm @@ -355,7 +355,7 @@ probability = 50 /datum/particle_smasher_recipe/phoron_valhollide - reagents = list("phoron" = 10, "pacid" = 10) + reagents = list(MAT_PHORON = 10, "pacid" = 10) result = /obj/item/stack/material/valhollide required_material = /obj/item/stack/material/phoron @@ -368,7 +368,7 @@ probability = 10 /datum/particle_smasher_recipe/valhollide_supermatter - reagents = list("phoron" = 300) + reagents = list(MAT_PHORON = 300) result = /obj/item/stack/material/supermatter required_material = /obj/item/stack/material/valhollide @@ -378,4 +378,4 @@ required_atmos_temp_min = 3000 required_atmos_temp_max = 10000 - probability = 1 \ No newline at end of file + probability = 1 diff --git a/code/modules/power/tesla/telsa_construction.dm b/code/modules/power/tesla/telsa_construction.dm index 2431d3a5f5..ab29a5ac60 100644 --- a/code/modules/power/tesla/telsa_construction.dm +++ b/code/modules/power/tesla/telsa_construction.dm @@ -23,7 +23,7 @@ name = T_BOARD("grounding rod") build_path = /obj/machinery/power/grounding_rod board_type = new /datum/frame/frame_types/machine - matter = list(MAT_STEEL = 50, "glass" = 50) + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) req_components = list() /datum/category_item/autolathe/engineering/grounding_rod diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm index 196ff70651..50d3d04483 100644 --- a/code/modules/projectiles/ammunition/rounds.dm +++ b/code/modules/projectiles/ammunition/rounds.dm @@ -69,7 +69,7 @@ desc = "A .38 bullet casing fitted with a single-use ion pulse generator." icon_state = "empcasing" projectile_type = /obj/item/projectile/ion/small - matter = list(MAT_STEEL = 130, "uranium" = 100) + matter = list(MAT_STEEL = 130, MAT_URANIUM = 100) /obj/item/ammo_casing/a38/bb desc = "A .38 BB." @@ -193,7 +193,7 @@ desc = "A .45 bullet casing fitted with a single-use ion pulse generator." projectile_type = /obj/item/projectile/ion/small icon_state = "empcasing" - matter = list(MAT_STEEL = 130, "uranium" = 100) + matter = list(MAT_STEEL = 130, MAT_URANIUM = 100) /obj/item/ammo_casing/a45/hp desc = "A .45 hollow-point bullet casing." @@ -221,7 +221,7 @@ desc = "A 10mm bullet casing fitted with a single-use ion pulse generator." projectile_type = /obj/item/projectile/ion/small icon_state = "empcasing" - matter = list(MAT_STEEL = 130, "uranium" = 100) + matter = list(MAT_STEEL = 130, MAT_URANIUM = 100) /obj/item/ammo_casing/a10mm/bb desc = "A 10mm BB." @@ -275,7 +275,7 @@ desc = "A 12 gauge taser cartridge." icon_state = "stunshell" projectile_type = /obj/item/projectile/energy/electrode/stunshot - matter = list(MAT_STEEL = 360, "glass" = 720) + matter = list(MAT_STEEL = 360, MAT_GLASS = 720) /obj/item/ammo_casing/a12g/stunshell/emp_act(severity) if(prob(100/severity)) BB = null @@ -287,7 +287,7 @@ desc = "A chemical shell used to signal distress or provide illumination." icon_state = "fshell" projectile_type = /obj/item/projectile/energy/flash/flare - matter = list(MAT_STEEL = 90, "glass" = 90) + matter = list(MAT_STEEL = 90, MAT_GLASS = 90) /obj/item/ammo_casing/a12g/emp name = "ion shell" @@ -295,7 +295,7 @@ icon_state = "empshell" projectile_type = /obj/item/projectile/ion // projectile_type = /obj/item/projectile/bullet/shotgun/ion - matter = list(MAT_STEEL = 360, "uranium" = 240) + matter = list(MAT_STEEL = 360, MAT_URANIUM = 240) /obj/item/ammo_casing/a12g/flechette name = "shotgun flechette" @@ -365,7 +365,7 @@ /obj/item/ammo_casing/a145/highvel desc = "A 14.5mm sabot shell." projectile_type = /obj/item/projectile/bullet/rifle/a145 - + /obj/item/ammo_casing/a145/bb desc = "A 14.5mm BB. That'll take someone's eye out." projectile_type = /obj/item/projectile/bullet/bb diff --git a/code/modules/projectiles/ammunition/smartmag.dm b/code/modules/projectiles/ammunition/smartmag.dm index ee3f3a00df..530f840c1c 100644 --- a/code/modules/projectiles/ammunition/smartmag.dm +++ b/code/modules/projectiles/ammunition/smartmag.dm @@ -22,7 +22,7 @@ var/obj/item/gun/holding_gun = null // What gun are we in, if any? - var/obj/item/cell/device/attached_cell = null // What cell are we using, if any? + var/obj/item/stock_parts/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 @@ -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/cell/device)) + if(istype(I, /obj/item/stock_parts/cell/device)) if(attached_cell) to_chat(user, "\The [src] already has a [attached_cell.name] attached.") return @@ -223,4 +223,4 @@ ammo_type = null production_cost = null - return \ No newline at end of file + return diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 759dc12552..0e89efe3e6 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -4,11 +4,11 @@ icon_state = "energy" fire_sound_text = "laser blast" - var/obj/item/cell/power_supply //What type of power cell this uses + var/obj/item/stock_parts/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/cell/device - var/cell_type = /obj/item/cell/device/weapon + var/accept_cell_type = /obj/item/stock_parts/cell/device + var/cell_type = /obj/item/stock_parts/cell/device/weapon projectile_type = /obj/item/projectile/beam/practice var/modifystate @@ -27,7 +27,7 @@ /obj/item/gun/energy/Initialize() . = ..() if(self_recharge) - power_supply = new /obj/item/cell/device/weapon(src) + power_supply = new /obj/item/stock_parts/cell/device/weapon(src) START_PROCESSING(SSobj, src) else if(cell_type) @@ -58,7 +58,7 @@ var/rechargeamt = power_supply.maxcharge*0.2 if(use_external_power) - var/obj/item/cell/external = get_external_power_supply() + var/obj/item/stock_parts/cell/external = get_external_power_supply() if(!external || !external.use(rechargeamt)) //Take power from the borg... return 0 @@ -112,18 +112,18 @@ if(!power_supply) return null if(!ispath(projectile_type)) return null if(!power_supply.checked_use(charge_cost)) return null - var/mob/living/M = loc // TGMC Ammo HUD - if(istype(M)) // TGMC Ammo HUD + var/mob/living/M = loc // TGMC Ammo HUD + if(istype(M)) // TGMC Ammo HUD M?.hud_used.update_ammo_hud(M, src) return new projectile_type(src) /obj/item/gun/energy/proc/load_ammo(var/obj/item/C, mob/user) - if(istype(C, /obj/item/cell)) + if(istype(C, /obj/item/stock_parts/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/cell/P = C + var/obj/item/stock_parts/cell/P = C if(power_supply) to_chat(user, "[src] already has a power cell.") else @@ -223,7 +223,7 @@ /obj/item/gun/energy/proc/start_recharge() if(power_supply == null) - power_supply = new /obj/item/cell/device/weapon(src) + power_supply = new /obj/item/stock_parts/cell/device/weapon(src) self_recharge = 1 START_PROCESSING(SSobj, src) update_icon() @@ -256,4 +256,4 @@ if(!power_supply) return 0 else - return FLOOR(power_supply.charge / max(charge_cost, 1), 1) \ No newline at end of file + return FLOOR(power_supply.charge / max(charge_cost, 1), 1) diff --git a/code/modules/projectiles/guns/energy/hooklauncher.dm b/code/modules/projectiles/guns/energy/hooklauncher.dm index bfd573b509..5232cd0025 100644 --- a/code/modules/projectiles/guns/energy/hooklauncher.dm +++ b/code/modules/projectiles/guns/energy/hooklauncher.dm @@ -14,7 +14,7 @@ charge_cost = 300 charge_meter = FALSE - cell_type = /obj/item/cell/device/weapon + cell_type = /obj/item/stock_parts/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. @@ -28,7 +28,7 @@ w_class = ITEMSIZE_TINY - cell_type = /obj/item/cell/device/weapon/recharge/alien + cell_type = /obj/item/stock_parts/cell/device/weapon/recharge/alien battery_lock = TRUE charge_cost = 400 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 10f5ac03d7..69a840b466 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -46,7 +46,7 @@ projectile_type = /obj/item/projectile/beam/practice charge_cost = 48 - cell_type = /obj/item/cell/device + cell_type = /obj/item/stock_parts/cell/device firemodes = list( list(mode_name="normal", projectile_type=/obj/item/projectile/beam/practice, charge_cost = 48), @@ -143,7 +143,7 @@ charge_cost = 480 // Five shots. projectile_type = /obj/item/projectile/beam/cyan - cell_type = /obj/item/cell/device/weapon/recharge/alien // Self charges. + cell_type = /obj/item/stock_parts/cell/device/weapon/recharge/alien // Self charges. origin_tech = list(TECH_COMBAT = 8, TECH_MAGNET = 7) modifystate = "alienpistol" @@ -163,7 +163,7 @@ origin_tech = null fire_delay = 10 //Old pistol charge_cost = 480 //to compensate a bit for self-recharging - cell_type = /obj/item/cell/device/weapon/recharge/captain + cell_type = /obj/item/stock_parts/cell/device/weapon/recharge/captain battery_lock = 1 /obj/item/gun/energy/lasercannon @@ -285,7 +285,7 @@ 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/cell/device/weapon/recharge + cell_type = /obj/item/stock_parts/cell/device/weapon/recharge battery_lock = 1 var/required_vest diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 0af15366f7..098af1d1f8 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -56,7 +56,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/cell/device/weapon/recharge + cell_type = /obj/item/stock_parts/cell/device/weapon/recharge battery_lock = 1 modifystate = null diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 7f6536d120..3cc5d88b99 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -45,7 +45,7 @@ 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/cell/device/weapon/recharge + cell_type = /obj/item/stock_parts/cell/device/weapon/recharge battery_lock = 1 var/decl/plantgene/gene = null @@ -93,7 +93,7 @@ slot_flags = SLOT_BELT|SLOT_BACK w_class = ITEMSIZE_LARGE projectile_type = /obj/item/projectile/meteor - cell_type = /obj/item/cell/potato + cell_type = /obj/item/stock_parts/cell/potato charge_cost = 100 self_recharge = 1 recharge_time = 5 //Time it takes for shots to recharge (in ticks) @@ -136,7 +136,7 @@ charge_cost = 480 projectile_type = /obj/item/projectile/change origin_tech = null - cell_type = /obj/item/cell/device/weapon/recharge + cell_type = /obj/item/stock_parts/cell/device/weapon/recharge battery_lock = 1 charge_meter = 0 @@ -188,7 +188,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/cell/device/weapon/recharge + cell_type = /obj/item/stock_parts/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. @@ -212,8 +212,8 @@ charge_cost = 10000 // Uses large cells, can at max have 3 shots. projectile_type = /obj/item/projectile/beam/tungsten - cell_type = /obj/item/cell/high - accept_cell_type = /obj/item/cell + cell_type = /obj/item/stock_parts/cell/high + accept_cell_type = /obj/item/stock_parts/cell accuracy = 75 charge_meter = 0 diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 677c9e6ded..c956c6554e 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -49,7 +49,7 @@ silenced = 1 projectile_type = /obj/item/projectile/energy/bolt charge_cost = 480 - cell_type = /obj/item/cell/device/weapon/recharge + cell_type = /obj/item/stock_parts/cell/device/weapon/recharge battery_lock = 1 charge_meter = 0 diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm index bfd5c4d858..f80514ab92 100644 --- a/code/modules/projectiles/guns/launcher/crossbow.dm +++ b/code/modules/projectiles/guns/launcher/crossbow.dm @@ -73,7 +73,7 @@ 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/cell/cell = null // Used for firing superheated rods. + var/obj/item/stock_parts/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/gun/launcher/crossbow/update_release_force() @@ -165,7 +165,7 @@ superheat_rod(user) return - if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/stock_parts/cell)) if(!cell) user.drop_item() cell = W diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 86036bb132..884746d2df 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/ammo.dmi' icon_state = "syringe-cartridge" var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot - matter = list(MAT_STEEL = 125, "glass" = 375) + matter = list(MAT_STEEL = 125, MAT_GLASS = 375) slot_flags = SLOT_BELT | SLOT_EARS throwforce = 3 force = 3 diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm index 41ebae01d8..963af08f9c 100644 --- a/code/modules/projectiles/guns/magnetic/bore.dm +++ b/code/modules/projectiles/guns/magnetic/bore.dm @@ -82,7 +82,7 @@ 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/gun/magnetic/matfed/attackby(var/obj/item/thing, var/mob/user) if(removable_components) @@ -267,5 +267,5 @@ generator_state = GEN_OFF /obj/item/gun/magnetic/matfed/phoronbore/loaded - cell = /obj/item/cell/apc + cell = /obj/item/stock_parts/cell/apc capacitor = /obj/item/stock_parts/capacitor diff --git a/code/modules/projectiles/guns/magnetic/magnetic.dm b/code/modules/projectiles/guns/magnetic/magnetic.dm index 4c71a41c49..99c2432bf7 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic.dm @@ -15,7 +15,7 @@ origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4, TECH_ILLEGAL = 2, TECH_MAGNET = 4) w_class = ITEMSIZE_LARGE - var/obj/item/cell/cell // Currently installed powercell. + var/obj/item/stock_parts/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. @@ -144,7 +144,7 @@ /obj/item/gun/magnetic/attackby(var/obj/item/thing, var/mob/user) if(removable_components) - if(istype(thing, /obj/item/cell)) + if(istype(thing, /obj/item/stock_parts/cell)) if(cell) to_chat(user, "\The [src] already has \a [cell] installed.") return @@ -304,7 +304,7 @@ return new projectile_type(src) /obj/item/gun/magnetic/fuelrod/Initialize() - cell = new /obj/item/cell/high + cell = new /obj/item/stock_parts/cell/high capacitor = new /obj/item/stock_parts/capacitor . = ..() @@ -313,4 +313,4 @@ #undef ICON_BAD #undef ICON_CHARGE #undef ICON_READY -#undef ICON_LOADED \ No newline at end of file +#undef ICON_LOADED diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm index 5f676852ae..848aee412a 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm @@ -15,7 +15,7 @@ load_type = /obj/item/rcd_ammo projectile_type = /obj/item/projectile/bullet/magnetic/slug - cell = /obj/item/cell/hyper + cell = /obj/item/stock_parts/cell/hyper capacitor = /obj/item/stock_parts/capacitor/adv loaded = /obj/item/rcd_ammo/large removable_components = FALSE @@ -55,7 +55,7 @@ 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/cell/infinite + cell = /obj/item/stock_parts/cell/infinite capacitor = /obj/item/stock_parts/capacitor/super fire_delay = 0 @@ -83,7 +83,7 @@ icon_state = "flechette_gun" item_state = "z8carbine" - cell = /obj/item/cell/hyper + cell = /obj/item/stock_parts/cell/hyper capacitor = /obj/item/stock_parts/capacitor/adv fire_delay = 0 @@ -114,7 +114,7 @@ item_state = "combatrevolver" w_class = ITEMSIZE_SMALL - cell = /obj/item/cell/super + cell = /obj/item/stock_parts/cell/super capacitor = /obj/item/stock_parts/capacitor fire_delay = 0 @@ -147,7 +147,7 @@ removable_components = TRUE - cell = /obj/item/cell/device/weapon + cell = /obj/item/stock_parts/cell/device/weapon capacitor = /obj/item/stock_parts/capacitor fire_delay = 8 @@ -180,7 +180,7 @@ slowdown_held = 0.1 - cell = /obj/item/cell/device/weapon + cell = /obj/item/stock_parts/cell/device/weapon capacitor = /obj/item/stock_parts/capacitor slot_flags = SLOT_BELT|SLOT_HOLSTER @@ -209,7 +209,7 @@ icon_state = "railgun_sifguard" item_state = "z8carbine" - cell = /obj/item/cell/high + cell = /obj/item/stock_parts/cell/high capacitor = /obj/item/stock_parts/capacitor/adv slot_flags = SLOT_BACK diff --git a/code/modules/projectiles/guns/modular_guns.dm b/code/modules/projectiles/guns/modular_guns.dm index 0999f59d62..c0d34895eb 100644 --- a/code/modules/projectiles/guns/modular_guns.dm +++ b/code/modules/projectiles/guns/modular_guns.dm @@ -4,7 +4,7 @@ name = "modular weapon" desc = "You shouldn't be seeing this. Contact your local time-police station." icon_state = "mod_pistol" - cell_type = /obj/item/cell/device/weapon + cell_type = /obj/item/stock_parts/cell/device/weapon charge_cost = 120 var/max_components = 3 //How many components we can hold. @@ -133,7 +133,7 @@ if(self_recharge || battery_lock) to_chat(user, "[src] does not have a battery port.") return - var/obj/item/cell/P = C + var/obj/item/stock_parts/cell/P = C if(power_supply) to_chat(user, "[src] already has a power cell.") else @@ -170,6 +170,6 @@ max_components = 14 desc = "Say hello, to my little friend!" one_handed_penalty = 4 //dual wielding = no. - cell_type = /obj/item/cell //We're bigger. We can use much larger power cells. + cell_type = /obj/item/stock_parts/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 + burst_delay = 4 //preventing extreme silliness. diff --git a/code/modules/projectiles/guns/vox.dm b/code/modules/projectiles/guns/vox.dm index 65f4a980ff..4d1395e740 100644 --- a/code/modules/projectiles/guns/vox.dm +++ b/code/modules/projectiles/guns/vox.dm @@ -84,7 +84,7 @@ w_class = ITEMSIZE_HUGE charge_cost = 300 projectile_type = /obj/item/projectile/beam/stun/darkmatter - cell_type = /obj/item/cell/device/weapon/recharge + cell_type = /obj/item/stock_parts/cell/device/weapon/recharge battery_lock = 1 accuracy = 30 @@ -145,7 +145,7 @@ icon_state = "noise" item_state = "noise" w_class = ITEMSIZE_HUGE - cell_type = /obj/item/cell/device/weapon/recharge + cell_type = /obj/item/stock_parts/cell/device/weapon/recharge battery_lock = 1 charge_cost = 400 diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm index a872f8574c..382eaebe92 100644 --- a/code/modules/reagents/machinery/pump.dm +++ b/code/modules/reagents/machinery/pump.dm @@ -16,7 +16,7 @@ circuit = /obj/item/circuitboard/fluidpump active_power_usage = 200 * CELLRATE - var/obj/item/cell/cell = null + var/obj/item/stock_parts/cell/cell = null var/obj/item/hose_connector/output/Output = null var/reagents_per_cycle = 40 var/on = 0 @@ -57,7 +57,7 @@ src.reagents.trans_to_holder(R, src.reagents.total_volume) qdel(src.reagents) src.reagents = R - + /obj/machinery/pump/update_icon() ..() cut_overlays() @@ -81,7 +81,7 @@ /obj/machinery/pump/process() if(!on) return - + if(!anchored || !(cell?.use(active_power_usage))) set_state(FALSE) return @@ -151,14 +151,14 @@ "You remove the battery panel." \ ) open = !open - + else if(W.is_wrench()) if(on) to_chat(user, "\The [src] is active. Turn it off before trying to move it!") return FALSE default_unfasten_wrench(user, W, 2 SECONDS) - else if(istype(W, /obj/item/cell) && open) + else if(istype(W, /obj/item/stock_parts/cell) && open) if(istype(cell)) to_chat(user, "There is a power cell already installed.") return FALSE @@ -202,4 +202,4 @@ /turf/simulated/floor/water/contaminated/pump_reagents(var/datum/reagents/R, var/volume) . = ..() - R.add_reagent("vatstabilizer", round(volume / 2, 0.1)) \ No newline at end of file + R.add_reagent("vatstabilizer", round(volume / 2, 0.1)) diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm index 86fd674e51..0031c5eef9 100644 --- a/code/modules/reagents/reactions/distilling/distilling.dm +++ b/code/modules/reagents/reactions/distilling/distilling.dm @@ -53,7 +53,7 @@ name = "Distilling Biomass" id = "distill_biomass" result = "biomass" - required_reagents = list("blood" = 1, "sugar" = 1, "phoron" = 0.5) + required_reagents = list("blood" = 1, "sugar" = 1, MAT_PHORON = 0.5) result_amount = 1 // 40 units per sheet, requires actually using the machine, and having blood to spare. temp_range = list(T20C + 80, T20C + 130) @@ -156,7 +156,7 @@ name = "Distilling Brute Juice" id = "distill_brutejuice" result = "berserkmed" - required_reagents = list("biomass" = 1, "hyperzine" = 3, "synaptizine" = 2, "phoron" = 1) + required_reagents = list("biomass" = 1, "hyperzine" = 3, "synaptizine" = 2, MAT_PHORON = 1) result_amount = 3 temp_range = list(T0C + 600, T0C + 700) @@ -209,7 +209,7 @@ required_reagents = list("lichpowder" = 1, "cryoxadone" = 1, "carthatoline" = 1) result_amount = 2 - catalysts = list("phoron" = 5) + catalysts = list(MAT_PHORON = 5) reaction_rate = HALF_LIFE(20) diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index f73785ba64..a8f7255ce4 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -51,14 +51,14 @@ name = "Goldschlager" id = "goldschlager" result = "goldschlager" - required_reagents = list("vodka" = 10, "gold" = 1) + required_reagents = list("vodka" = 10, MAT_GOLD = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/patron name = "Patron" id = "patron" result = "patron" - required_reagents = list("tequilla" = 10, "silver" = 1) + required_reagents = list("tequilla" = 10, MAT_SILVER = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/bilk @@ -86,7 +86,7 @@ name = "Nuclear Cola" id = "nuka_cola" result = "nuka_cola" - required_reagents = list("uranium" = 1, "cola" = 5) + required_reagents = list(MAT_URANIUM = 1, "cola" = 5) result_amount = 5 /decl/chemical_reaction/instant/drinks/moonshine @@ -267,14 +267,14 @@ name = "Toxins Special" id = "phoronspecial" result = "phoronspecial" - required_reagents = list("rum" = 2, "vermouth" = 2, "phoron" = 2) + required_reagents = list("rum" = 2, "vermouth" = 2, MAT_PHORON = 2) result_amount = 6 /decl/chemical_reaction/instant/drinks/beepsky_smash name = "Beepksy Smash" id = "beepksysmash" result = "beepskysmash" - required_reagents = list("limejuice" = 1, "whiskey" = 1, "iron" = 1) + required_reagents = list("limejuice" = 1, "whiskey" = 1, MAT_IRON = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/doctor_delight @@ -323,7 +323,7 @@ name = "Atomic Bomb" id = "atomicbomb" result = "atomicbomb" - required_reagents = list("b52" = 10, "uranium" = 1) + required_reagents = list("b52" = 10, MAT_URANIUM = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/margarita @@ -344,7 +344,7 @@ name = "Three Mile Island Iced Tea" id = "threemileisland" result = "threemileisland" - required_reagents = list("longislandicedtea" = 10, "uranium" = 1) + required_reagents = list("longislandicedtea" = 10, MAT_URANIUM = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/whiskeysoda @@ -372,7 +372,7 @@ name = "Manhattan Project" id = "manhattan_proj" result = "manhattan_proj" - required_reagents = list("manhattan" = 10, "uranium" = 1) + required_reagents = list("manhattan" = 10, MAT_URANIUM = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/vodka_tonic @@ -513,7 +513,7 @@ name = "Amasec" id = "amasec" result = "amasec" - required_reagents = list("iron" = 1, "redwine" = 5, "vodka" = 5) + required_reagents = list(MAT_IRON = 1, "redwine" = 5, "vodka" = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/changelingsting @@ -1022,7 +1022,7 @@ name = "Robustin" id = "robustin" result = "robustin" - required_reagents = list("antifreeze" = 1, "phoron" = 1, "fuel" = 1, "vodka" = 1) + required_reagents = list("antifreeze" = 1, MAT_PHORON = 1, "fuel" = 1, "vodka" = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/virginsip @@ -1163,7 +1163,7 @@ name = "Angel Ichor" id = "holywine" result = "holywine" - required_reagents = list("grapejuice" = 5, "gold" = 5) + required_reagents = list("grapejuice" = 5, MAT_GOLD = 5) catalysts = list("holywater" = 5) result_amount = 10 @@ -1241,7 +1241,7 @@ name = "Nuclear Waste" id = "nuclearwasteuran" result = "nuclearwaste" - required_reagents = list("oilslick" = 2, "uranium" = 1) + required_reagents = list("oilslick" = 2, MAT_URANIUM = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/sodaoil @@ -1277,4 +1277,4 @@ id = "dyncold" result = "dyncold" required_reagents = list("dynjuice" = 1, "ice" = 2, "sodawater" = 2) - result_amount = 5 \ No newline at end of file + result_amount = 5 diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index b07d8bd5ca..d64d35bd2f 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -21,8 +21,8 @@ name = "Carthatoline" id = "carthatoline" result = "carthatoline" - required_reagents = list("anti_toxin" = 1, "carbon" = 2, "phoron" = 0.1) - catalysts = list("phoron" = 1) + required_reagents = list("anti_toxin" = 1, "carbon" = 2, MAT_PHORON = 0.1) + catalysts = list(MAT_PHORON = 1) result_amount = 2 /decl/chemical_reaction/instant/paracetamol @@ -44,7 +44,7 @@ id = "oxycodone" result = "oxycodone" required_reagents = list("ethanol" = 1, "tramadol" = 1) - catalysts = list("phoron" = 5) + catalysts = list(MAT_PHORON = 5) result_amount = 1 /decl/chemical_reaction/instant/sterilizine @@ -79,7 +79,7 @@ name = "Thermite" id = "thermite" result = "thermite" - required_reagents = list("aluminum" = 1, "iron" = 1, "oxygen" = 1) + required_reagents = list("aluminum" = 1, MAT_IRON = 1, "oxygen" = 1) result_amount = 3 /decl/chemical_reaction/instant/bliss @@ -144,15 +144,15 @@ id = "peridaxon" result = "peridaxon" required_reagents = list("bicaridine" = 2, "clonexadone" = 2) - catalysts = list("phoron" = 5) + catalysts = list(MAT_PHORON = 5) result_amount = 2 /decl/chemical_reaction/instant/osteodaxon name = "Osteodaxon" id = "osteodaxon" result = "osteodaxon" - required_reagents = list("bicaridine" = 2, "phoron" = 0.1, "carpotoxin" = 1) - catalysts = list("phoron" = 5) + required_reagents = list("bicaridine" = 2, MAT_PHORON = 0.1, "carpotoxin" = 1) + catalysts = list(MAT_PHORON = 5) inhibitors = list("clonexadone" = 1) // Messes with cryox result_amount = 2 @@ -160,8 +160,8 @@ name = "Respirodaxon" id = "respirodaxon" result = "respirodaxon" - required_reagents = list("dexalinp" = 2, "biomass" = 2, "phoron" = 1) - catalysts = list("phoron" = 5) + required_reagents = list("dexalinp" = 2, "biomass" = 2, MAT_PHORON = 1) + catalysts = list(MAT_PHORON = 5) inhibitors = list("dexalin" = 1) result_amount = 2 @@ -170,7 +170,7 @@ id = "gastirodaxon" result = "gastirodaxon" required_reagents = list("carthatoline" = 1, "biomass" = 2, "tungsten" = 2) - catalysts = list("phoron" = 5) + catalysts = list(MAT_PHORON = 5) inhibitors = list("lithium" = 1) result_amount = 3 @@ -179,7 +179,7 @@ id = "hepanephrodaxon" result = "hepanephrodaxon" required_reagents = list("carthatoline" = 2, "biomass" = 2, "lithium" = 1) - catalysts = list("phoron" = 5) + catalysts = list(MAT_PHORON = 5) inhibitors = list("tungsten" = 1) result_amount = 2 @@ -188,7 +188,7 @@ id = "cordradaxon" result = "cordradaxon" required_reagents = list("potassium_chlorophoride" = 1, "biomass" = 2, "bicaridine" = 2) - catalysts = list("phoron" = 5) + catalysts = list(MAT_PHORON = 5) inhibitors = list("clonexadone" = 1) result_amount = 2 @@ -203,8 +203,8 @@ name = "Leporazine" id = "leporazine" result = "leporazine" - required_reagents = list("silicon" = 1, "copper" = 1) - catalysts = list("phoron" = 5) + required_reagents = list("silicon" = 1, MAT_COPPER = 1) + catalysts = list(MAT_PHORON = 5) result_amount = 2 /decl/chemical_reaction/instant/cryptobiolin @@ -232,8 +232,8 @@ name = "Dexalin" id = "dexalin" result = "dexalin" - required_reagents = list("oxygen" = 2, "phoron" = 0.1) - catalysts = list("phoron" = 1) + required_reagents = list("oxygen" = 2, MAT_PHORON = 0.1) + catalysts = list(MAT_PHORON = 1) inhibitors = list("water" = 1) // Messes with cryox result_amount = 1 @@ -248,7 +248,7 @@ name = "Dexalin Plus" id = "dexalinp" result = "dexalinp" - required_reagents = list("dexalin" = 1, "carbon" = 1, "iron" = 1) + required_reagents = list("dexalin" = 1, "carbon" = 1, MAT_IRON = 1) result_amount = 3 /decl/chemical_reaction/instant/bicaridine @@ -263,14 +263,14 @@ name = "Myelamine" id = "myelamine" result = "myelamine" - required_reagents = list("bicaridine" = 1, "iron" = 2, "spidertoxin" = 1) + required_reagents = list("bicaridine" = 1, MAT_IRON = 2, "spidertoxin" = 1) result_amount = 2 /decl/chemical_reaction/instant/royale name = "Royale" id = "royale" result = "royale" - required_reagents = list("copper" = 1, "phosphorus" = 1, "sulfur" = 1) + required_reagents = list(MAT_COPPER = 1, "phosphorus" = 1, "sulfur" = 1) result_amount = 3 /decl/chemical_reaction/instant/hyperzine @@ -306,8 +306,8 @@ name = "Clonexadone" id = "clonexadone" result = "clonexadone" - required_reagents = list("cryoxadone" = 1, "sodium" = 1, "phoron" = 0.1) - catalysts = list("phoron" = 5) + required_reagents = list("cryoxadone" = 1, "sodium" = 1, MAT_PHORON = 0.1) + catalysts = list(MAT_PHORON = 5) result_amount = 2 /decl/chemical_reaction/instant/mortiferin @@ -316,7 +316,7 @@ result = "mortiferin" required_reagents = list("cryptobiolin" = 1, "clonexadone" = 1, "corophizine" = 1) result_amount = 2 - catalysts = list("phoron" = 5) + catalysts = list(MAT_PHORON = 5) /decl/chemical_reaction/instant/spaceacillin name = "Spaceacillin" @@ -329,8 +329,8 @@ name = "Corophizine" id = "corophizine" result = "corophizine" - required_reagents = list("spaceacillin" = 1, "carbon" = 1, "phoron" = 0.1) - catalysts = list("phoron" = 5) + required_reagents = list("spaceacillin" = 1, "carbon" = 1, MAT_PHORON = 0.1) + catalysts = list(MAT_PHORON = 5) result_amount = 2 /decl/chemical_reaction/instant/immunosuprizine @@ -338,7 +338,7 @@ id = "immunosuprizine" result = "immunosuprizine" required_reagents = list("corophizine" = 1, "tungsten" = 1, "sacid" = 1) - catalysts = list("phoron" = 5) + catalysts = list(MAT_PHORON = 5) result_amount = 2 /decl/chemical_reaction/instant/imidazoline @@ -388,14 +388,14 @@ name = "Potassium Chlorophoride" id = "potassium_chlorophoride" result = "potassium_chlorophoride" - required_reagents = list("potassium_chloride" = 1, "phoron" = 1, "chloralhydrate" = 1) + required_reagents = list("potassium_chloride" = 1, MAT_PHORON = 1, "chloralhydrate" = 1) result_amount = 4 /decl/chemical_reaction/instant/zombiepowder name = "Zombie Powder" id = "zombiepowder" result = "zombiepowder" - required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5) + required_reagents = list("carpotoxin" = 5, "stoxin" = 5, MAT_COPPER = 5) result_amount = 2 /decl/chemical_reaction/instant/carpotoxin @@ -433,7 +433,7 @@ id = "ammonia" result = "ammonia" required_reagents = list("hydrogen" = 3, "nitrogen" = 1) - inhibitors = list("phoron" = 1) // Messes with lexorin + inhibitors = list(MAT_PHORON = 1) // Messes with lexorin result_amount = 3 /decl/chemical_reaction/instant/diethylamine @@ -497,7 +497,7 @@ id = "condensedcapsaicin" result = "condensedcapsaicin" required_reagents = list("capsaicin" = 2) - catalysts = list("phoron" = 5) + catalysts = list(MAT_PHORON = 5) result_amount = 1 /decl/chemical_reaction/instant/coolant @@ -512,14 +512,14 @@ name = "Rezadone" id = "rezadone" result = "rezadone" - required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1) + required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, MAT_COPPER = 1) result_amount = 3 /decl/chemical_reaction/instant/lexorin name = "Lexorin" id = "lexorin" result = "lexorin" - required_reagents = list("phoron" = 1, "hydrogen" = 1, "nitrogen" = 1) + required_reagents = list(MAT_PHORON = 1, "hydrogen" = 1, "nitrogen" = 1) result_amount = 3 /decl/chemical_reaction/instant/methylphenidate @@ -591,7 +591,7 @@ name = "Solid Iron" id = "solidiron" result = null - required_reagents = list("frostoil" = 5, "iron" = REAGENTS_PER_SHEET) + required_reagents = list("frostoil" = 5, MAT_IRON = REAGENTS_PER_SHEET) result_amount = 1 var/sheet_to_give = /obj/item/stack/material/iron @@ -603,35 +603,35 @@ /decl/chemical_reaction/instant/solidification/phoron name = "Solid Phoron" id = "solidphoron" - required_reagents = list("frostoil" = 5, "phoron" = REAGENTS_PER_SHEET) + required_reagents = list("frostoil" = 5, MAT_PHORON = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/phoron /decl/chemical_reaction/instant/solidification/silver name = "Solid Silver" id = "solidsilver" - required_reagents = list("frostoil" = 5, "silver" = REAGENTS_PER_SHEET) + required_reagents = list("frostoil" = 5, MAT_SILVER = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/silver /decl/chemical_reaction/instant/solidification/gold name = "Solid Gold" id = "solidgold" - required_reagents = list("frostoil" = 5, "gold" = REAGENTS_PER_SHEET) + required_reagents = list("frostoil" = 5, MAT_GOLD = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/gold /decl/chemical_reaction/instant/solidification/platinum name = "Solid Platinum" id = "solidplatinum" - required_reagents = list("frostoil" = 5, "platinum" = REAGENTS_PER_SHEET) + required_reagents = list("frostoil" = 5, MAT_PLATINUM = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/platinum /decl/chemical_reaction/instant/solidification/uranium name = "Solid Uranium" id = "soliduranium" - required_reagents = list("frostoil" = 5, "uranium" = REAGENTS_PER_SHEET) + required_reagents = list("frostoil" = 5, MAT_URANIUM = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/uranium @@ -653,7 +653,7 @@ /decl/chemical_reaction/instant/solidification/plasteel name = "Solid Plasteel" id = "solidplasteel" - required_reagents = list("frostoil" = 10, "plasteel" = REAGENTS_PER_SHEET) + required_reagents = list("frostoil" = 10, MAT_PLASTEEL = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/plasteel @@ -734,7 +734,7 @@ name = "EMP Pulse" id = "emp_pulse" result = null - required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense + required_reagents = list(MAT_URANIUM = 1, MAT_IRON = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense result_amount = 2 /decl/chemical_reaction/instant/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -770,7 +770,7 @@ name = "Napalm" id = "napalm" result = null - required_reagents = list("aluminum" = 1, "phoron" = 1, "sacid" = 1 ) + required_reagents = list("aluminum" = 1, MAT_PHORON = 1, "sacid" = 1 ) result_amount = 1 /decl/chemical_reaction/instant/napalm/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -841,7 +841,7 @@ name = "Iron Foam" id = "ironlfoam" result = null - required_reagents = list("iron" = 3, "foaming_agent" = 1, "pacid" = 1) + required_reagents = list(MAT_IRON = 3, "foaming_agent" = 1, "pacid" = 1) result_amount = 5 /decl/chemical_reaction/instant/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -1095,7 +1095,7 @@ name = "Hydrophoron" id = "hydrophoron" result = "hydrophoron" - required_reagents = list("hydrogen" = 1, "phoron" = 1) + required_reagents = list("hydrogen" = 1, MAT_PHORON = 1) inhibitors = list("nitrogen" = 1) //So it doesn't mess with lexorin result_amount = 2 @@ -1126,7 +1126,7 @@ id = "malish-qualem" result = "malish-qualem" required_reagents = list("immunosuprizine" = 1, "qerr_quem" = 1, "inaprovaline" = 1) - catalysts = list("phoron" = 5) + catalysts = list(MAT_PHORON = 5) result_amount = 2 // Biomass, for cloning and bioprinters @@ -1134,7 +1134,7 @@ name = "Biomass" id = "biomass" result = "biomass" - required_reagents = list("protein" = 1, "sugar" = 1, "phoron" = 1) + required_reagents = list("protein" = 1, "sugar" = 1, MAT_PHORON = 1) result_amount = 1 // Roughly 20u per phoron sheet //Cube Food Colonies @@ -1173,4 +1173,4 @@ id = "spidertoxin_neutral" result = "protein" required_reagents = list("enzyme" = 1, "spidertoxin" = 1, "sifsap" = 1) - result_amount = 1 \ No newline at end of file + result_amount = 1 diff --git a/code/modules/reagents/reactions/instant/vox.dm b/code/modules/reagents/reactions/instant/vox.dm index 17f17a3788..e136f33ab0 100644 --- a/code/modules/reagents/reactions/instant/vox.dm +++ b/code/modules/reagents/reactions/instant/vox.dm @@ -4,7 +4,7 @@ result = "protoslurry" result_amount = 4 required_reagents = list( - "iron" = 1, + MAT_IRON = 1, "carbon" = 1, "protein" = 2 ) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index ad6877fd37..0391981bfd 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -155,7 +155,7 @@ icon_state = "beaker" item_state = "beaker" center_of_mass = list("x" = 15,"y" = 11) - matter = list("glass" = 500) + matter = list(MAT_GLASS = 500) drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' @@ -205,7 +205,7 @@ desc = "A large beaker." icon_state = "beakerlarge" center_of_mass = list("x" = 16,"y" = 11) - matter = list("glass" = 5000) + matter = list(MAT_GLASS = 5000) volume = 120 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,60,120) @@ -216,7 +216,7 @@ desc = "A cryostasis beaker that allows for chemical storage without reactions." icon_state = "beakernoreact" center_of_mass = list("x" = 16,"y" = 13) - matter = list("glass" = 500) + matter = list(MAT_GLASS = 500) volume = 60 amount_per_transfer_from_this = 10 atom_flags = ATOM_REAGENTS_IS_OPEN | ATOM_REAGENTS_SKIP_REACTIONS @@ -226,7 +226,7 @@ desc = "A bluespace beaker, powered by experimental bluespace technology." icon_state = "beakerbluespace" center_of_mass = list("x" = 16,"y" = 11) - matter = list("glass" = 5000) + matter = list(MAT_GLASS = 5000) volume = 300 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,60,120,300) @@ -237,7 +237,7 @@ desc = "A small glass vial." icon_state = "vial" center_of_mass = list("x" = 15,"y" = 9) - matter = list("glass" = 250) + matter = list(MAT_GLASS = 250) volume = 30 w_class = ITEMSIZE_TINY amount_per_transfer_from_this = 10 @@ -387,7 +387,7 @@ icon_state = "woodbucket" item_state = "woodbucket" center_of_mass = list("x" = 16,"y" = 8) - matter = list("wood" = 50) + matter = list(MAT_WOOD = 50) w_class = ITEMSIZE_LARGE amount_per_transfer_from_this = 20 possible_transfer_amounts = list(10,20,30,60,120) @@ -408,7 +408,7 @@ name = "water-cooler bottle" icon = 'icons/obj/vending.dmi' icon_state = "water_cooler_bottle" - matter = list("glass" = 2000) + matter = list(MAT_GLASS = 2000) w_class = ITEMSIZE_NORMAL amount_per_transfer_from_this = 20 possible_transfer_amounts = list(10,20,30,60,120) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index f9fdd0963e..cc92f9a74d 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -7,7 +7,7 @@ center_of_mass = list("x" = 16,"y" = 10) atom_flags = ATOM_REAGENTS_IS_OPEN item_flags = NOBLUDGEON - matter = list("glass" = 300, MAT_STEEL = 300) + matter = list(MAT_GLASS = 300, MAT_STEEL = 300) slot_flags = SLOT_BELT throwforce = 3 w_class = ITEMSIZE_SMALL diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index abe757b16a..68e906b65b 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -12,7 +12,7 @@ item_state = "syringe_0" icon_state = "0" center_of_mass = list("x" = 16,"y" = 14) - matter = list("glass" = 150) + matter = list(MAT_GLASS = 150) amount_per_transfer_from_this = 5 possible_transfer_amounts = null volume = 15 diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 2a4c14c2d6..a4268e28a2 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -16,7 +16,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). var/mat_efficiency = 1 var/speed = 1 - materials = list(MAT_STEEL = 0, "glass" = 0, MAT_PLASTEEL = 0, "plastic" = 0, MAT_GRAPHITE = 0, "gold" = 0, "silver" = 0, "osmium" = 0, MAT_LEAD = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0, MAT_DURASTEEL = 0, MAT_VERDANTIUM = 0, MAT_MORPHIUM = 0, MAT_METALHYDROGEN = 0, MAT_SUPERMATTER = 0) + materials = list(MAT_STEEL = 0, MAT_GLASS = 0, MAT_PLASTEEL = 0, MAT_PLASTIC = 0, MAT_GRAPHITE = 0, MAT_GOLD = 0, MAT_SILVER = 0, MAT_OSMIUM = 0, MAT_LEAD = 0, MAT_PHORON = 0, MAT_URANIUM = 0, MAT_DIAMOND = 0, MAT_DURASTEEL = 0, MAT_VERDANTIUM = 0, MAT_MORPHIUM = 0, MAT_METALHYDROGEN = 0, MAT_SUPERMATTER = 0) hidden_materials = list(MAT_PLASTEEL, MAT_DURASTEEL, MAT_GRAPHITE, MAT_VERDANTIUM, MAT_MORPHIUM, MAT_METALHYDROGEN, MAT_SUPERMATTER) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 011e74ddc1..2fc75759d6 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -76,8 +76,8 @@ other types of metals and chemistry for reagents). for(var/matname in materials) I.matter[matname] = materials[matname] - var/obj/item/cell/C = I.get_cell() + var/obj/item/stock_parts/cell/C = I.get_cell() if(C) C.charge = 0 I.update_icon() - return I \ No newline at end of file + return I diff --git a/code/modules/research/designs/HUDs.dm b/code/modules/research/designs/HUDs.dm index 4c2377335a..7c2735f1f0 100644 --- a/code/modules/research/designs/HUDs.dm +++ b/code/modules/research/designs/HUDs.dm @@ -1,7 +1,7 @@ // HUDs /datum/design/item/hud - materials = list(MAT_STEEL = 50, "glass" = 50) + materials = list(MAT_STEEL = 50, MAT_GLASS = 50) /datum/design/item/hud/AssembleDesignName() ..() @@ -42,6 +42,6 @@ name = "graviton visor" id = "graviton_goggles" req_tech = list(TECH_MAGNET = 5, TECH_ENGINEERING = 3, TECH_BLUESPACE = 3, TECH_PHORON = 3) - materials = list(MAT_PLASTEEL = 2000, "glass" = 3000, MAT_PHORON = 1500) + materials = list(MAT_PLASTEEL = 2000, MAT_GLASS = 3000, MAT_PHORON = 1500) build_path = /obj/item/clothing/glasses/graviton - sort_string = "EAAAE" \ No newline at end of file + sort_string = "EAAAE" diff --git a/code/modules/research/designs/ai_holders.dm b/code/modules/research/designs/ai_holders.dm index e459537de7..db4b71eb8b 100644 --- a/code/modules/research/designs/ai_holders.dm +++ b/code/modules/research/designs/ai_holders.dm @@ -8,7 +8,7 @@ id = "mmi" req_tech = list(TECH_DATA = 2, TECH_BIO = 3) build_type = PROTOLATHE | PROSFAB - materials = list(MAT_STEEL = 1000, "glass" = 500) + materials = list(MAT_STEEL = 1000, MAT_GLASS = 500) build_path = /obj/item/mmi category = "Misc" sort_string = "SAAAA" @@ -18,7 +18,7 @@ id = "posibrain" req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 6, TECH_BLUESPACE = 2, TECH_DATA = 4) build_type = PROTOLATHE | PROSFAB - materials = list(MAT_STEEL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 500, "phoron" = 500, "diamond" = 100) + materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_SILVER = 1000, MAT_GOLD = 500, MAT_PHORON = 500, MAT_DIAMOND = 100) build_path = /obj/item/mmi/digital/posibrain category = "Misc" sort_string = "SAAAB" @@ -28,7 +28,7 @@ id = "dronebrain" req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 5, TECH_DATA = 4) build_type = PROTOLATHE | PROSFAB - materials = list(MAT_STEEL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 500) + materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_SILVER = 1000, MAT_GOLD = 500) build_path = /obj/item/mmi/digital/robot category = "Misc" sort_string = "SAAAC" @@ -37,7 +37,7 @@ name = "'pAI', personal artificial intelligence device" id = "paicard" req_tech = list(TECH_DATA = 2) - materials = list("glass" = 500, MAT_STEEL = 500) + materials = list(MAT_GLASS = 500, MAT_STEEL = 500) build_path = /obj/item/paicard sort_string = "SBAAA" @@ -46,6 +46,6 @@ desc = "Allows for the construction of an intelliCore." id = "intellicore" req_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4) - materials = list("glass" = 1000, "gold" = 200) + materials = list(MAT_GLASS = 1000, MAT_GOLD = 200) build_path = /obj/item/aicard - sort_string = "SCAAA" \ No newline at end of file + sort_string = "SCAAA" diff --git a/code/modules/research/designs/bag_of_holding.dm b/code/modules/research/designs/bag_of_holding.dm index 1116344494..c0625907b8 100644 --- a/code/modules/research/designs/bag_of_holding.dm +++ b/code/modules/research/designs/bag_of_holding.dm @@ -9,7 +9,7 @@ desc = "Using localized pockets of bluespace this bag prototype offers incredible storage capacity with the contents weighting nothing. It's a shame the bag itself is pretty heavy." id = "bag_holding" req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) - materials = list("gold" = 3000, "diamond" = 1500, "uranium" = 250) + materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250) build_path = /obj/item/storage/backpack/holding sort_string = "QAAAA" @@ -18,6 +18,6 @@ desc = "A minaturized prototype of the popular Bag of Holding, the Dufflebag of Holding is, functionally, identical to the bag of holding, but comes in a more stylish and compact form." id = "dufflebag_holding" req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6) - materials = list("gold" = 3000, "diamond" = 1500, "uranium" = 250) + materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250) build_path = /obj/item/storage/backpack/holding/duffle - sort_string = "QAAAB" \ No newline at end of file + sort_string = "QAAAB" diff --git a/code/modules/research/designs/beakers.dm b/code/modules/research/designs/beakers.dm index 91a2df49b7..c3929d2d3f 100644 --- a/code/modules/research/designs/beakers.dm +++ b/code/modules/research/designs/beakers.dm @@ -17,6 +17,6 @@ desc = "A bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 300 units." id = "bluespacebeaker" req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 6) - materials = list(MAT_STEEL = 3000, "phoron" = 3000, "diamond" = 500) + materials = list(MAT_STEEL = 3000, MAT_PHORON = 3000, MAT_DIAMOND = 500) build_path = /obj/item/reagent_containers/glass/beaker/bluespace - sort_string = "IAAAB" \ No newline at end of file + sort_string = "IAAAB" diff --git a/code/modules/research/designs/bio_devices.dm b/code/modules/research/designs/bio_devices.dm index f3aa33845f..1e05471fb2 100644 --- a/code/modules/research/designs/bio_devices.dm +++ b/code/modules/research/designs/bio_devices.dm @@ -1,5 +1,5 @@ /datum/design/item/biotech - materials = list(MAT_STEEL = 30, "glass" = 20) + materials = list(MAT_STEEL = 30, MAT_GLASS = 20) /datum/design/item/biotech/AssembleDesignName() ..() @@ -39,7 +39,7 @@ desc = "A hand-held scanner able to diagnose robotic injuries." id = "robot_scanner" req_tech = list(TECH_MAGNET = 3, TECH_BIO = 2, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 500, "glass" = 200) + materials = list(MAT_STEEL = 500, MAT_GLASS = 200) build_path = /obj/item/robotanalyzer sort_string = "JAACA" @@ -47,7 +47,7 @@ desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." id = "nanopaste" req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 7000, "glass" = 7000) + materials = list(MAT_STEEL = 7000, MAT_GLASS = 7000) build_path = /obj/item/stack/nanopaste sort_string = "JAACB" @@ -55,7 +55,6 @@ desc = "A device capable of quickly scanning all relevant data about a plant." id = "plant_analyzer" req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) - materials = list(MAT_STEEL = 500, "glass" = 500) + materials = list(MAT_STEEL = 500, MAT_GLASS = 500) build_path = /obj/item/analyzer/plant_analyzer sort_string = "JAADA" - diff --git a/code/modules/research/designs/circuit_assembly.dm b/code/modules/research/designs/circuit_assembly.dm index 834245cc04..48641d0420 100644 --- a/code/modules/research/designs/circuit_assembly.dm +++ b/code/modules/research/designs/circuit_assembly.dm @@ -26,7 +26,7 @@ name = "Custom wirer tool" id = "wirer" req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 5000, "glass" = 2500) + materials = list(MAT_STEEL = 5000, MAT_GLASS = 2500) build_path = /obj/item/integrated_electronics/wirer sort_string = "UCAAA" @@ -34,7 +34,7 @@ name = "Custom circuit debugger tool" id = "debugger" req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 5000, "glass" = 2500) + materials = list(MAT_STEEL = 5000, MAT_GLASS = 2500) build_path = /obj/item/integrated_electronics/debugger sort_string = "UCBBB" @@ -96,4 +96,4 @@ req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_POWER = 3, TECH_BIO = 5) materials = list(MAT_STEEL = 2000) build_path = /obj/item/implant/integrated_circuit - sort_string = "UDAAF" \ No newline at end of file + sort_string = "UDAAF" diff --git a/code/modules/research/designs/circuits/ai_modules.dm b/code/modules/research/designs/circuits/ai_modules.dm index 5305ee0bea..9320253c93 100644 --- a/code/modules/research/designs/circuits/ai_modules.dm +++ b/code/modules/research/designs/circuits/ai_modules.dm @@ -1,6 +1,6 @@ /datum/design/aimodule build_type = IMPRINTER - materials = list("glass" = 2000, "gold" = 100) + materials = list(MAT_GLASS = 2000, MAT_GOLD = 100) /datum/design/aimodule/AssembleDesignName() name = "AI module design ([name])" @@ -104,4 +104,4 @@ id = "tyrant" req_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) build_path = /obj/item/aiModule/tyrant - sort_string = "XACAD" \ No newline at end of file + sort_string = "XACAD" diff --git a/code/modules/research/designs/circuits/circuits.dm b/code/modules/research/designs/circuits/circuits.dm index a56f10dff7..b4e55ec365 100644 --- a/code/modules/research/designs/circuits/circuits.dm +++ b/code/modules/research/designs/circuits/circuits.dm @@ -5,7 +5,7 @@ CIRCUITS BELOW /datum/design/circuit build_type = IMPRINTER req_tech = list(TECH_DATA = 2) - materials = list("glass" = 2000) + materials = list(MAT_GLASS = 2000) chemicals = list("sacid" = 20) time = 5 @@ -500,7 +500,7 @@ CIRCUITS BELOW name = "'Durand' central control" id = "durand_main" req_tech = list(TECH_DATA = 4) - materials = list("glass" = 2000, MAT_GRAPHITE = 1250) + materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) chemicals = list("sacid" = 20) build_path = /obj/item/circuitboard/mecha/durand/main sort_string = "NAADA" @@ -509,7 +509,7 @@ CIRCUITS BELOW name = "'Durand' peripherals control" id = "durand_peri" req_tech = list(TECH_DATA = 4) - materials = list("glass" = 2000, MAT_GRAPHITE = 1250) + materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) chemicals = list("sacid" = 20) build_path = /obj/item/circuitboard/mecha/durand/peripherals sort_string = "NAADB" @@ -518,7 +518,7 @@ CIRCUITS BELOW name = "'Durand' weapon control and targeting" id = "durand_targ" req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2) - materials = list("glass" = 2000, MAT_GRAPHITE = 1250) + materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) chemicals = list("sacid" = 20) build_path = /obj/item/circuitboard/mecha/durand/targeting sort_string = "NAADC" @@ -585,7 +585,7 @@ CIRCUITS BELOW /datum/design/circuit/shield req_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3) - materials = list("glass" = 2000, "gold" = 1000) + materials = list(MAT_GLASS = 2000, MAT_GOLD = 1000) /datum/design/circuit/shield/AssembleDesignName() name = "Shield generator circuit design ([name])" @@ -677,4 +677,4 @@ CIRCUITS BELOW /datum/design/circuit/shield req_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3) materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000) -*/ \ No newline at end of file +*/ diff --git a/code/modules/research/designs/engineering.dm b/code/modules/research/designs/engineering.dm index da4ce1f6c1..fe8651feea 100644 --- a/code/modules/research/designs/engineering.dm +++ b/code/modules/research/designs/engineering.dm @@ -9,7 +9,7 @@ desc = "A welding tool that generate fuel for itself." id = "expwelder" req_tech = list(TECH_ENGINEERING = 4, TECH_PHORON = 3, TECH_MATERIAL = 4) - materials = list(MAT_STEEL = 70, "glass" = 120, "phoron" = 100) + materials = list(MAT_STEEL = 70, MAT_GLASS = 120, MAT_PHORON = 100) build_path = /obj/item/weldingtool/experimental sort_string = "NAAAA" @@ -18,7 +18,7 @@ desc = "A simple powered hand drill." id = "handdrill" req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2) - materials = list(MAT_STEEL = 300, "silver" = 100) + materials = list(MAT_STEEL = 300, MAT_SILVER = 100) build_path = /obj/item/tool/screwdriver/power sort_string = "NAAAB" @@ -27,7 +27,7 @@ desc = "A set of jaws of life, compressed through the magic of science." id = "jawslife" req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2) - materials = list(MAT_STEEL = 300, "silver" = 100) + materials = list(MAT_STEEL = 300, MAT_SILVER = 100) build_path = /obj/item/tool/crowbar/power sort_string = "NAAAC" @@ -51,7 +51,7 @@ desc = "An upgraded version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." id = "upgradedtscanner" req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 4, TECH_MATERIAL = 2) - materials = list(MAT_STEEL = 500, "phoron" = 150) + materials = list(MAT_STEEL = 500, MAT_PHORON = 150) build_path = /obj/item/t_scanner/upgraded sort_string = "NBAAB" @@ -60,7 +60,7 @@ desc = "An advanced version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." id = "advancedtscanner" req_tech = list(TECH_MAGNET = 6, TECH_ENGINEERING = 6, TECH_MATERIAL = 6) - materials = list(MAT_STEEL = 1250, "phoron" = 500, "silver" = 50) + materials = list(MAT_STEEL = 1250, MAT_PHORON = 500, MAT_SILVER = 50) build_path = /obj/item/t_scanner/advanced sort_string = "NBAAC" @@ -69,6 +69,6 @@ desc = "A hand-held environmental scanner which reports current gas levels." id = "atmosanalyzer" req_tech = list(TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 200, "glass" = 100) + materials = list(MAT_STEEL = 200, MAT_GLASS = 100) build_path = /obj/item/analyzer - sort_string = "NBABA" \ No newline at end of file + sort_string = "NBABA" diff --git a/code/modules/research/designs/implants.dm b/code/modules/research/designs/implants.dm index 66921d45f8..130f1188a2 100644 --- a/code/modules/research/designs/implants.dm +++ b/code/modules/research/designs/implants.dm @@ -1,7 +1,7 @@ // Implants /datum/design/item/implant - materials = list(MAT_STEEL = 50, "glass" = 50) + materials = list(MAT_STEEL = 50, MAT_GLASS = 50) /datum/design/item/implant/AssembleDesignName() ..() @@ -19,4 +19,4 @@ id = "implant_free" req_tech = list(TECH_ILLEGAL = 2, TECH_BIO = 3) build_path = /obj/item/implantcase/freedom - sort_string = "MFAAB" \ No newline at end of file + sort_string = "MFAAB" diff --git a/code/modules/research/designs/locator_devices.dm b/code/modules/research/designs/locator_devices.dm index e802a5920f..823f89a357 100644 --- a/code/modules/research/designs/locator_devices.dm +++ b/code/modules/research/designs/locator_devices.dm @@ -67,7 +67,7 @@ desc = "Used to scan and locate signals on a particular frequency." id = "beacon_locator" req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3) - materials = list(MAT_STEEL = 1000,"glass" = 500) + materials = list(MAT_STEEL = 1000,MAT_GLASS = 500) build_path = /obj/item/beacon_locator sort_string = "DBAAA" @@ -75,6 +75,6 @@ name = "Bluespace tracking beacon" id = "beacon" req_tech = list(TECH_BLUESPACE = 1) - materials = list (MAT_STEEL = 20, "glass" = 10) + materials = list (MAT_STEEL = 20, MAT_GLASS = 10) build_path = /obj/item/radio/beacon - sort_string = "DBABA" \ No newline at end of file + sort_string = "DBABA" diff --git a/code/modules/research/designs/medical.dm b/code/modules/research/designs/medical.dm index 96c6a3eb34..0d19ca0bae 100644 --- a/code/modules/research/designs/medical.dm +++ b/code/modules/research/designs/medical.dm @@ -1,5 +1,5 @@ /datum/design/item/medical - materials = list(MAT_STEEL = 30, "glass" = 20) + materials = list(MAT_STEEL = 30, MAT_GLASS = 20) /datum/design/item/medical/AssembleDesignName() ..() @@ -12,7 +12,7 @@ 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." id = "scalpel_laser1" req_tech = list(TECH_BIO = 2, TECH_MATERIAL = 2, TECH_MAGNET = 2) - materials = list(MAT_STEEL = 12500, "glass" = 7500) + materials = list(MAT_STEEL = 12500, MAT_GLASS = 7500) build_path = /obj/item/surgical/scalpel/laser1 sort_string = "KAAAA" @@ -21,7 +21,7 @@ desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks somewhat advanced." id = "scalpel_laser2" req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 4, TECH_MAGNET = 4) - materials = list(MAT_STEEL = 12500, "glass" = 7500, "silver" = 2500) + materials = list(MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 2500) build_path = /obj/item/surgical/scalpel/laser2 sort_string = "KAAAB" @@ -30,7 +30,7 @@ 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!" id = "scalpel_laser3" req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 6, TECH_MAGNET = 5) - materials = list(MAT_STEEL = 12500, "glass" = 7500, "silver" = 2000, "gold" = 1500) + materials = list(MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 2000, MAT_GOLD = 1500) build_path = /obj/item/surgical/scalpel/laser3 sort_string = "KAAAC" @@ -39,7 +39,7 @@ 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." id = "scalpel_manager" req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 7, TECH_MAGNET = 5, TECH_DATA = 4) - materials = list (MAT_STEEL = 12500, "glass" = 7500, "silver" = 1500, "gold" = 1500, "diamond" = 750) + materials = list (MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 1500, MAT_GOLD = 1500, MAT_DIAMOND = 750) build_path = /obj/item/surgical/scalpel/manager sort_string = "KAAAD" @@ -48,7 +48,7 @@ desc = "A strange development following the I.M.S., this heavy tool can split and open, or close and shut, intentional holes in bones." 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, "silver" = 1500, "gold" = 1500, MAT_OSMIUM = 1000) + materials = list (MAT_STEEL = 12500, MAT_PLASTIC = 800, MAT_SILVER = 1500, MAT_GOLD = 1500, MAT_OSMIUM = 1000) build_path = /obj/item/surgical/circular_saw/manager sort_string = "KAAAE" @@ -66,7 +66,7 @@ desc = "A miracle of modern science, this tool rapidly knits together bone, without the need for bone gel." id = "bone_clamp" req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 5, TECH_MAGNET = 4, TECH_DATA = 4) - materials = list (MAT_STEEL = 12500, "glass" = 7500, "silver" = 2500) + materials = list (MAT_STEEL = 12500, MAT_GLASS = 7500, MAT_SILVER = 2500) build_path = /obj/item/surgical/bone_clamp sort_string = "KAABA" @@ -75,7 +75,7 @@ desc = "A hand-held body scanner able to distinguish vital signs of the subject." id = "medical_analyzer" req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) - materials = list(MAT_STEEL = 500, "glass" = 500) + materials = list(MAT_STEEL = 500, MAT_GLASS = 500) build_path = /obj/item/healthanalyzer sort_string = "KBAAA" @@ -84,7 +84,7 @@ desc = "A prototype version of the regular health analyzer, able to distinguish the location of more serious injuries as well as accurately determine radiation levels." id = "improved_analyzer" req_tech = list(TECH_MAGNET = 5, TECH_BIO = 6) - materials = list(MAT_STEEL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 1500) + materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_SILVER = 1000, MAT_GOLD = 1500) build_path = /obj/item/healthanalyzer/improved sort_string = "KBAAB" @@ -93,6 +93,6 @@ desc = "A more advanced version of the regular roller bed, with inbuilt surgical stabilisers and an improved folding system." id = "roller_bed" req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 3, TECH_MAGNET = 3) - materials = list(MAT_STEEL = 4000, "glass" = 2000, "phoron" = 2000) + materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_PHORON = 2000) build_path = /obj/item/roller/adv - sort_string = "KCAAA" \ No newline at end of file + sort_string = "KCAAA" diff --git a/code/modules/research/designs/mining_toys.dm b/code/modules/research/designs/mining_toys.dm index e6c1a7b3cd..a0c0bc6b88 100644 --- a/code/modules/research/designs/mining_toys.dm +++ b/code/modules/research/designs/mining_toys.dm @@ -7,35 +7,35 @@ /datum/design/item/weapon/mining/drill id = "drill" req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 6000, "glass" = 1000) //expensive, but no need for miners. + materials = list(MAT_STEEL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners. build_path = /obj/item/pickaxe/drill sort_string = "FAAAA" /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, "glass" = 500, "silver" = 500) + materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_SILVER = 500) build_path = /obj/item/pickaxe/jackhammer sort_string = "FAAAB" /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, "glass" = 500, "gold" = 500, "phoron" = 500) + materials = list(MAT_STEEL = 1500, MAT_GLASS = 500, MAT_GOLD = 500, MAT_PHORON = 500) build_path = /obj/item/pickaxe/plasmacutter sort_string = "FAAAC" /datum/design/item/weapon/mining/pick_diamond id = "pick_diamond" req_tech = list(TECH_MATERIAL = 6) - materials = list("diamond" = 3000) + materials = list(MAT_DIAMOND = 3000) build_path = /obj/item/pickaxe/diamond sort_string = "FAAAD" /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, "glass" = 1000, "diamond" = 2000) + materials = list(MAT_STEEL = 3000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) build_path = /obj/item/pickaxe/diamonddrill sort_string = "FAAAE" @@ -45,7 +45,7 @@ desc = "Used to check spatial depth and density of rock outcroppings." id = "depth_scanner" req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2) - materials = list(MAT_STEEL = 1000,"glass" = 1000) + materials = list(MAT_STEEL = 1000,MAT_GLASS = 1000) build_path = /obj/item/depth_scanner sort_string = "FBAAA" @@ -53,6 +53,6 @@ desc = "A rugged case containing a set of standardized picks used in archaeological digs." id = "pick_set" req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2) - materials = list(MAT_STEEL = 1700,"glass" = 200) + materials = list(MAT_STEEL = 1700,MAT_GLASS = 200) build_path = /obj/item/storage/excavation - sort_string = "FBAAB" \ No newline at end of file + sort_string = "FBAAB" diff --git a/code/modules/research/designs/misc.dm b/code/modules/research/designs/misc.dm index 1b4f8ba93b..a3bc8cd9ef 100644 --- a/code/modules/research/designs/misc.dm +++ b/code/modules/research/designs/misc.dm @@ -8,7 +8,7 @@ name = "Communicator" id = "communicator" req_tech = list(TECH_DATA = 2, TECH_MAGNET = 2) - materials = list(MAT_STEEL = 500, "glass" = 500) + materials = list(MAT_STEEL = 500, MAT_GLASS = 500) build_path = /obj/item/communicator sort_string = "TAAAA" @@ -17,7 +17,7 @@ desc = "Don't shine it in your eyes!" id = "laser_pointer" req_tech = list(TECH_MAGNET = 3) - materials = list(MAT_STEEL = 100, "glass" = 50) + materials = list(MAT_STEEL = 100, MAT_GLASS = 50) build_path = /obj/item/laser_pointer sort_string = "TAABA" @@ -25,7 +25,7 @@ name = "handheld translator" id = "translator" req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 3000, "glass" = 3000) + materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000) build_path = /obj/item/universal_translator sort_string = "TAACA" @@ -33,7 +33,7 @@ name = "earpiece translator" id = "ear_translator" req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5) //It's been hella miniaturized. - materials = list(MAT_STEEL = 2000, "glass" = 2000, "gold" = 1000) + materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000, MAT_GOLD = 1000) build_path = /obj/item/universal_translator/ear sort_string = "TAACB" @@ -42,7 +42,7 @@ desc = "A device to automatically replace lights. Refill with working lightbulbs." id = "light_replacer" req_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 4) - materials = list(MAT_STEEL = 1500, "silver" = 150, "glass" = 3000) + materials = list(MAT_STEEL = 1500, MAT_SILVER = 150, MAT_GLASS = 3000) build_path = /obj/item/lightreplacer sort_string = "TAADA" @@ -51,7 +51,7 @@ desc = "Allows for deciphering the binary channel on-the-fly." id = "binaryencrypt" req_tech = list(TECH_ILLEGAL = 2) - materials = list(MAT_STEEL = 300, "glass" = 300) + materials = list(MAT_STEEL = 300, MAT_GLASS = 300) build_path = /obj/item/encryptionkey/binary sort_string = "TBAAA" diff --git a/code/modules/research/designs/modular_computer.dm b/code/modules/research/designs/modular_computer.dm index 6bdb27c334..4fb8b2ce3c 100644 --- a/code/modules/research/designs/modular_computer.dm +++ b/code/modules/research/designs/modular_computer.dm @@ -9,14 +9,14 @@ name = "basic hard drive" id = "hdd_basic" req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) - materials = list(MAT_STEEL = 2000, "glass" = 100) + materials = list(MAT_STEEL = 2000, MAT_GLASS = 100) 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, "glass" = 200) + materials = list(MAT_STEEL = 4000, MAT_GLASS = 200) build_path = /obj/item/computer_hardware/hard_drive/advanced sort_string = "VAAAB" @@ -24,7 +24,7 @@ name = "super hard drive" id = "hdd_super" req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 8000, "glass" = 400) + materials = list(MAT_STEEL = 8000, MAT_GLASS = 400) build_path = /obj/item/computer_hardware/hard_drive/super sort_string = "VAAAC" @@ -32,7 +32,7 @@ name = "cluster hard drive" id = "hdd_cluster" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) - materials = list(MAT_STEEL = 16000, "glass" = 800) + materials = list(MAT_STEEL = 16000, MAT_GLASS = 800) build_path = /obj/item/computer_hardware/hard_drive/cluster sort_string = "VAAAD" @@ -40,7 +40,7 @@ name = "small hard drive" id = "hdd_small" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 4000, "glass" = 200) + materials = list(MAT_STEEL = 4000, MAT_GLASS = 200) build_path = /obj/item/computer_hardware/hard_drive/small sort_string = "VAAAE" @@ -48,7 +48,7 @@ name = "micro hard drive" id = "hdd_micro" req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) - materials = list(MAT_STEEL = 2000, "glass" = 100) + materials = list(MAT_STEEL = 2000, MAT_GLASS = 100) build_path = /obj/item/computer_hardware/hard_drive/micro sort_string = "VAAAF" @@ -58,7 +58,7 @@ name = "basic network card" id = "netcard_basic" req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 1) - materials = list(MAT_STEEL = 500, "glass" = 100) + materials = list(MAT_STEEL = 500, MAT_GLASS = 100) build_path = /obj/item/computer_hardware/network_card sort_string = "VBAAA" @@ -66,7 +66,7 @@ name = "advanced network card" id = "netcard_advanced" req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 1000, "glass" = 200) + materials = list(MAT_STEEL = 1000, MAT_GLASS = 200) build_path = /obj/item/computer_hardware/network_card/advanced sort_string = "VBAAB" @@ -74,7 +74,7 @@ name = "wired network card" id = "netcard_wired" req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 3) - materials = list(MAT_STEEL = 5000, "glass" = 400) + materials = list(MAT_STEEL = 5000, MAT_GLASS = 400) build_path = /obj/item/computer_hardware/network_card/wired sort_string = "VBAAC" @@ -198,7 +198,7 @@ name = "basic data crystal" id = "portadrive_basic" req_tech = list(TECH_DATA = 1) - materials = list("glass" = 8000) + materials = list(MAT_GLASS = 8000) build_path = /obj/item/computer_hardware/hard_drive/portable sort_string = "VFAAA" @@ -206,7 +206,7 @@ name = "advanced data crystal" id = "portadrive_advanced" req_tech = list(TECH_DATA = 2) - materials = list("glass" = 16000) + materials = list(MAT_GLASS = 16000) build_path = /obj/item/computer_hardware/hard_drive/portable/advanced sort_string = "VFAAB" @@ -214,6 +214,6 @@ name = "super data crystal" id = "portadrive_super" req_tech = list(TECH_DATA = 4) - materials = list("glass" = 32000) + materials = list(MAT_GLASS = 32000) 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 dec68e8897..97d44ef119 100644 --- a/code/modules/research/designs/pdas.dm +++ b/code/modules/research/designs/pdas.dm @@ -5,7 +5,7 @@ desc = "Cheaper than whiny non-digital assistants." id = "pda" req_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 3) - materials = list(MAT_STEEL = 50, "glass" = 50) + materials = list(MAT_STEEL = 50, MAT_GLASS = 50) build_path = /obj/item/pda sort_string = "WAAAA" @@ -13,7 +13,7 @@ /datum/design/item/pda_cartridge req_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 3) - materials = list(MAT_STEEL = 50, "glass" = 50) + materials = list(MAT_STEEL = 50, MAT_GLASS = 50) /datum/design/item/pda_cartridge/AssembleDesignName() ..() @@ -97,4 +97,4 @@ /datum/design/item/pda_cartridge/captain id = "cart_captain" build_path = /obj/item/cartridge/captain - sort_string = "WBAAP" \ No newline at end of file + sort_string = "WBAAP" diff --git a/code/modules/research/designs/power_cells.dm b/code/modules/research/designs/power_cells.dm index e6f4737b69..65a54c29f4 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/cell/C = build_path + var/obj/item/stock_parts/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/cell/C = ..() + var/obj/item/stock_parts/cell/C = ..() C.charge = 0 //shouldn't produce power out of thin air. C.update_icon() return C @@ -20,8 +20,8 @@ build_type = PROTOLATHE | MECHFAB id = "basic_cell" req_tech = list(TECH_POWER = 1) - materials = list(MAT_STEEL = 700, "glass" = 50) - build_path = /obj/item/cell + materials = list(MAT_STEEL = 700, MAT_GLASS = 50) + build_path = /obj/item/stock_parts/cell category = "Misc" sort_string = "BAAAA" @@ -30,8 +30,8 @@ build_type = PROTOLATHE | MECHFAB id = "high_cell" req_tech = list(TECH_POWER = 2) - materials = list(MAT_STEEL = 700, "glass" = 60) - build_path = /obj/item/cell/high + materials = list(MAT_STEEL = 700, MAT_GLASS = 60) + build_path = /obj/item/stock_parts/cell/high category = "Misc" sort_string = "BAAAB" @@ -39,8 +39,8 @@ name = "super-capacity" id = "super_cell" req_tech = list(TECH_POWER = 3, TECH_MATERIAL = 2) - materials = list(MAT_STEEL = 700, "glass" = 70) - build_path = /obj/item/cell/super + materials = list(MAT_STEEL = 700, MAT_GLASS = 70) + build_path = /obj/item/stock_parts/cell/super category = "Misc" sort_string = "BAAAC" @@ -48,8 +48,8 @@ name = "hyper-capacity" id = "hyper_cell" req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4) - materials = list(MAT_STEEL = 400, "gold" = 150, "silver" = 150, "glass" = 70) - build_path = /obj/item/cell/hyper + materials = list(MAT_STEEL = 400, MAT_GOLD = 150, MAT_SILVER = 150, MAT_GLASS = 70) + build_path = /obj/item/stock_parts/cell/hyper category = "Misc" sort_string = "BAAAD" @@ -57,8 +57,8 @@ name = "device" build_type = PROTOLATHE id = "device" - materials = list(MAT_STEEL = 350, "glass" = 25) - build_path = /obj/item/cell/device + materials = list(MAT_STEEL = 350, MAT_GLASS = 25) + build_path = /obj/item/stock_parts/cell/device category = "Misc" sort_string = "BAABA" @@ -66,7 +66,7 @@ name = "weapon" build_type = PROTOLATHE id = "weapon" - materials = list(MAT_STEEL = 700, "glass" = 50) - build_path = /obj/item/cell/device/weapon + materials = list(MAT_STEEL = 700, MAT_GLASS = 50) + build_path = /obj/item/stock_parts/cell/device/weapon category = "Misc" - sort_string = "BAABB" \ No newline at end of file + sort_string = "BAABB" diff --git a/code/modules/research/designs/stock_parts.dm b/code/modules/research/designs/stock_parts.dm index 18ca93b7c2..483b7d1695 100644 --- a/code/modules/research/designs/stock_parts.dm +++ b/code/modules/research/designs/stock_parts.dm @@ -93,21 +93,21 @@ /datum/design/item/stock_part/basic_capacitor id = "basic_capacitor" req_tech = list(TECH_POWER = 1) - materials = list(MAT_STEEL = 50, "glass" = 50) + materials = list(MAT_STEEL = 50, MAT_GLASS = 50) 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, "glass" = 50) + materials = list(MAT_STEEL = 50, MAT_GLASS = 50) 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, "glass" = 50, "gold" = 20) + materials = list(MAT_STEEL = 50, MAT_GLASS = 50, MAT_GOLD = 20) build_path = /obj/item/stock_parts/capacitor/super sort_string = "AAACC" @@ -130,21 +130,21 @@ /datum/design/item/stock_part/basic_sensor id = "basic_sensor" req_tech = list(TECH_MAGNET = 1) - materials = list(MAT_STEEL = 50, "glass" = 20) + materials = list(MAT_STEEL = 50, MAT_GLASS = 20) 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, "glass" = 20) + materials = list(MAT_STEEL = 50, MAT_GLASS = 20) 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, "glass" = 20, "silver" = 10) + materials = list(MAT_STEEL = 50, MAT_GLASS = 20, MAT_SILVER = 10) build_path = /obj/item/stock_parts/scanning_module/phasic sort_string = "AAADC" @@ -167,21 +167,21 @@ /datum/design/item/stock_part/basic_micro_laser id = "basic_micro_laser" req_tech = list(TECH_MAGNET = 1) - materials = list(MAT_STEEL = 10, "glass" = 20) + materials = list(MAT_STEEL = 10, MAT_GLASS = 20) 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, "glass" = 20) + materials = list(MAT_STEEL = 10, MAT_GLASS = 20) 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, "glass" = 20, "uranium" = 10) + materials = list(MAT_STEEL = 10, MAT_GLASS = 20, MAT_URANIUM = 10) build_path = /obj/item/stock_parts/micro_laser/ultra sort_string = "AAAEC" @@ -207,7 +207,7 @@ desc = "Special mechanical module made to store, sort, and apply standard machine parts." id = "rped" req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 3) - materials = list(MAT_STEEL = 15000, "glass" = 5000) + materials = list(MAT_STEEL = 15000, MAT_GLASS = 5000) build_path = /obj/item/storage/part_replacer sort_string = "ABAAA" @@ -216,6 +216,6 @@ desc = "Special mechanical module made to store, sort, and apply standard machine parts. This one has a greatly upgraded storage capacity." id = "arped" req_tech = list(TECH_ENGINEERING = 5, TECH_MATERIAL = 5) - materials = list(MAT_STEEL = 30000, "glass" = 10000) + materials = list(MAT_STEEL = 30000, MAT_GLASS = 10000) build_path = /obj/item/storage/part_replacer/adv - sort_string = "ABAAB" \ No newline at end of file + sort_string = "ABAAB" diff --git a/code/modules/research/designs/subspace_parts.dm b/code/modules/research/designs/subspace_parts.dm index ee5102d1a3..28daad82a2 100644 --- a/code/modules/research/designs/subspace_parts.dm +++ b/code/modules/research/designs/subspace_parts.dm @@ -7,48 +7,48 @@ /datum/design/item/stock_part/subspace/subspace_ansible id = "s-ansible" req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - materials = list(MAT_STEEL = 80, "silver" = 20) + materials = list(MAT_STEEL = 80, MAT_SILVER = 20) 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, "silver" = 10) + materials = list(MAT_STEEL = 40, MAT_SILVER = 10) 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, "gold" = 30, "uranium" = 15) + materials = list(MAT_STEEL = 10, MAT_GOLD = 30, MAT_URANIUM = 15) 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, "silver" = 20) + materials = list(MAT_STEEL = 10, MAT_SILVER = 20) 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, "gold" = 15) + materials = list(MAT_STEEL = 10, MAT_GOLD = 15) 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("glass" = 1000, "silver" = 20, "gold" = 20) + materials = list(MAT_GLASS = 1000, MAT_SILVER = 20, MAT_GOLD = 20) 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("glass" = 100, "silver" = 10, "uranium" = 15) + materials = list(MAT_GLASS = 100, MAT_SILVER = 10, MAT_URANIUM = 15) build_path = /obj/item/stock_parts/subspace/transmitter - sort_string = "RAAAG" \ No newline at end of file + sort_string = "RAAAG" diff --git a/code/modules/research/designs/tech_disks.dm b/code/modules/research/designs/tech_disks.dm index bf287bbfcf..399d898e65 100644 --- a/code/modules/research/designs/tech_disks.dm +++ b/code/modules/research/designs/tech_disks.dm @@ -7,7 +7,7 @@ desc = "Produce additional disks for storing device designs." id = "design_disk" req_tech = list(TECH_DATA = 1) - materials = list(MAT_STEEL = 30, "glass" = 10) + materials = list(MAT_STEEL = 30, MAT_GLASS = 10) build_path = /obj/item/disk/design_disk sort_string = "CAAAA" @@ -16,6 +16,6 @@ desc = "Produce additional disks for storing technology data." id = "tech_disk" req_tech = list(TECH_DATA = 1) - materials = list(MAT_STEEL = 30, "glass" = 10) + materials = list(MAT_STEEL = 30, MAT_GLASS = 10) build_path = /obj/item/disk/tech_disk - sort_string = "CAAAB" \ No newline at end of file + sort_string = "CAAAB" diff --git a/code/modules/research/designs/weapons.dm b/code/modules/research/designs/weapons.dm index 38143c79fc..1d00293aef 100644 --- a/code/modules/research/designs/weapons.dm +++ b/code/modules/research/designs/weapons.dm @@ -29,14 +29,14 @@ /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, "glass" = 1000, "uranium" = 500) + materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_URANIUM = 500) 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, "glass" = 1000, "phoron" = 3000) + materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_PHORON = 3000) build_path = /obj/item/gun/energy/toxgun sort_string = "MAAAC" @@ -44,14 +44,14 @@ desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core." id = "lasercannon" req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3) - materials = list(MAT_STEEL = 10000, "glass" = 1000, "diamond" = 2000) + materials = list(MAT_STEEL = 10000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) 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("gold" = 5000,"uranium" = 10000) + materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000) build_path = /obj/item/gun/energy/decloner sort_string = "MAAAE" @@ -59,14 +59,14 @@ desc = "A gun that shoots high-powered glass-encased energy temperature bullets." id = "temp_gun" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_POWER = 3, TECH_MAGNET = 2) - materials = list(MAT_STEEL = 5000, "glass" = 500, "silver" = 3000) + materials = list(MAT_STEEL = 5000, MAT_GLASS = 500, MAT_SILVER = 3000) 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, "glass" = 500, "uranium" = 500) + materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_URANIUM = 500) build_path = /obj/item/gun/energy/floragun sort_string = "MAAAG" @@ -87,7 +87,7 @@ id = "smg" desc = "An advanced 9mm SMG with a reflective laser optic." req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3) - materials = list(MAT_STEEL = 8000, "silver" = 2000, "diamond" = 1000) + materials = list(MAT_STEEL = 8000, MAT_SILVER = 2000, MAT_DIAMOND = 1000) build_path = /obj/item/gun/projectile/automatic/advanced_smg sort_string = "MABAA" @@ -102,7 +102,7 @@ id = "ammo_9mm" desc = "A 21 round magazine for an advanced 9mm SMG." req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3) - materials = list(MAT_STEEL = 3750, "silver" = 100) // Requires silver for proprietary magazines! Or something. + materials = list(MAT_STEEL = 3750, MAT_SILVER = 100) // Requires silver for proprietary magazines! Or something. build_path = /obj/item/ammo_magazine/m9mmAdvanced sort_string = "MABBA" @@ -140,21 +140,21 @@ /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, "glass" = 1500) + materials = list(MAT_STEEL = 6000, MAT_GLASS = 1500) 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, "glass" = 2000, "silver" = 500) + materials = list(MAT_STEEL = 7000, MAT_GLASS = 2000, MAT_SILVER = 500) 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, "glass" = 2000, "silver" = 1000, "diamond" = 750) + materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, MAT_SILVER = 1000, MAT_DIAMOND = 750) build_path = /obj/item/gun/energy/phasegun/cannon sort_string = "MACAD" @@ -163,7 +163,7 @@ /datum/design/item/weapon/rapidsyringe id = "rapidsyringe" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2) - materials = list(MAT_STEEL = 5000, "glass" = 1000) + materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000) build_path = /obj/item/gun/launcher/syringe/rapid sort_string = "MADAA" @@ -171,7 +171,7 @@ desc = "A gun that fires small hollow chemical-payload darts." 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, "gold" = 5000, "silver" = 2500, "glass" = 750) + materials = list(MAT_STEEL = 5000, MAT_GOLD = 5000, MAT_SILVER = 2500, MAT_GLASS = 750) build_path = /obj/item/gun/projectile/dartgun/research sort_string = "MADAB" @@ -179,14 +179,14 @@ desc = "An advanced chem spraying device." id = "chemsprayer" req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2) - materials = list(MAT_STEEL = 5000, "glass" = 1000) + materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000) 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, "glass" = 2000, "gold" = 500, "silver" = 500, "uranium" = 1000, "phoron" = 3000, "diamond" = 1000) + 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/gun/magnetic/fuelrod sort_string = "MADAD" @@ -195,35 +195,35 @@ /datum/design/item/weapon/ammo/dartgunmag_small id = "dartgun_mag_s" req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) - materials = list(MAT_STEEL = 300, "gold" = 100, "silver" = 100, "glass" = 300) + materials = list(MAT_STEEL = 300, MAT_GOLD = 100, MAT_SILVER = 100, MAT_GLASS = 300) build_path = /obj/item/ammo_magazine/chemdart/small sort_string = "MADBA" /datum/design/item/weapon/ammo/dartgun_ammo_small id = "dartgun_ammo_s" req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) - materials = list(MAT_STEEL = 50, "gold" = 30, "silver" = 30, "glass" = 50) + materials = list(MAT_STEEL = 50, MAT_GOLD = 30, MAT_SILVER = 30, MAT_GLASS = 50) build_path = /obj/item/ammo_casing/chemdart/small sort_string = "MADBB" /datum/design/item/weapon/ammo/dartgunmag_med id = "dartgun_mag_m" req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) - materials = list(MAT_STEEL = 500, "gold" = 150, "silver" = 150, "diamond" = 200, "glass" = 400) + materials = list(MAT_STEEL = 500, MAT_GOLD = 150, MAT_SILVER = 150, MAT_DIAMOND = 200, MAT_GLASS = 400) build_path = /obj/item/ammo_magazine/chemdart sort_string = "MADBC" /datum/design/item/weapon/ammo/dartgun_ammo_med id = "dartgun_ammo_m" req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) - materials = list(MAT_STEEL = 80, "gold" = 40, "silver" = 40, "glass" = 60) + materials = list(MAT_STEEL = 80, MAT_GOLD = 40, MAT_SILVER = 40, MAT_GLASS = 60) build_path = /obj/item/ammo_casing/chemdart sort_string = "MADBD" /datum/design/item/weapon/ammo/flechette id = "magnetic_ammo" req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_MAGNET = 4) - materials = list(MAT_STEEL = 500, "gold" = 300, "glass" = 150, MAT_PHORON = 100) + materials = list(MAT_STEEL = 500, MAT_GOLD = 300, MAT_GLASS = 150, MAT_PHORON = 100) build_path = /obj/item/magnetic_ammo sort_string = "MADBE" @@ -237,7 +237,7 @@ name = "Portable Energy Blade" 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, "glass" = 1000, MAT_LEAD = 2250, MAT_METALHYDROGEN = 500) + materials = list(MAT_PLASTEEL = 3500, MAT_GLASS = 1000, MAT_LEAD = 2250, MAT_METALHYDROGEN = 500) build_path = /obj/item/melee/energy/sword/charge sort_string = "MBAAA" @@ -259,4 +259,4 @@ req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) materials = list(MAT_STEEL = 3000) build_path = /obj/item/grenade/chem_grenade/large - sort_string = "MCAAA" \ No newline at end of file + sort_string = "MCAAA" diff --git a/code/modules/research/designs/xenoarch_toys.dm b/code/modules/research/designs/xenoarch_toys.dm index 0c14fa6f89..5ce5ff8915 100644 --- a/code/modules/research/designs/xenoarch_toys.dm +++ b/code/modules/research/designs/xenoarch_toys.dm @@ -9,7 +9,7 @@ id = "ano_scanner" desc = "Aids in triangulation of exotic particles." req_tech = list(TECH_BLUESPACE = 3, TECH_MAGNET = 3) - materials = list(MAT_STEEL = 10000,"glass" = 5000) + materials = list(MAT_STEEL = 10000,MAT_GLASS = 5000) build_path = /obj/item/ano_scanner sort_string = "GAAAA" @@ -18,7 +18,7 @@ id = "xenoarch_multitool" req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3, TECH_BLUESPACE = 3) build_path = /obj/item/xenoarch_multi_tool - materials = list(MAT_STEEL = 2000, "glass" = 1000, "uranium" = 500, "phoron" = 500) + materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000, MAT_URANIUM = 500, MAT_PHORON = 500) sort_string = "GAAAB" /datum/design/item/weapon/xenoarch/excavationdrill @@ -26,6 +26,6 @@ id = "excavationdrill" req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3) build_type = PROTOLATHE - materials = list(MAT_STEEL = 4000, "glass" = 4000) + materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) build_path = /obj/item/pickaxe/excavationdrill - sort_string = "GAAAC" \ No newline at end of file + sort_string = "GAAAC" diff --git a/code/modules/research/designs/xenobio_toys.dm b/code/modules/research/designs/xenobio_toys.dm index 198216d01d..ebd3cd49b6 100644 --- a/code/modules/research/designs/xenobio_toys.dm +++ b/code/modules/research/designs/xenobio_toys.dm @@ -25,6 +25,6 @@ desc = "A hand-held body scanner able to learn information about slimes." id = "slime_scanner" req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) - materials = list(MAT_STEEL = 500, "glass" = 500) + materials = list(MAT_STEEL = 500, MAT_GLASS = 500) build_path = /obj/item/slime_scanner - sort_string = "HBAAA" \ No newline at end of file + sort_string = "HBAAA" diff --git a/code/modules/research/prosfab_designs.dm b/code/modules/research/prosfab_designs.dm index 7597d01ecc..4346faedb8 100644 --- a/code/modules/research/prosfab_designs.dm +++ b/code/modules/research/prosfab_designs.dm @@ -415,7 +415,7 @@ name = "Jetpack Module" desc = "A carbon dioxide jetpack suitable for low-gravity mining operations." id = "borg_jetpack_module" - materials = list(MAT_STEEL = 7500, "phoron" = 11250, "uranium" = 15000) + materials = list(MAT_STEEL = 7500, MAT_PHORON = 11250, MAT_URANIUM = 15000) build_path = /obj/item/borg/upgrade/jetpack /datum/design/item/prosfab/robot_upgrade/advhealth diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 0039bd8fe8..5cbccc664c 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -15,7 +15,7 @@ var/mat_efficiency = 1 var/speed = 1 - materials = list(MAT_STEEL = 0, "glass" = 0, MAT_PLASTEEL = 0, "plastic" = 0, MAT_GRAPHITE = 0, "gold" = 0, "silver" = 0, "osmium" = 0, MAT_LEAD = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0, MAT_DURASTEEL = 0, MAT_VERDANTIUM = 0, MAT_MORPHIUM = 0, MAT_METALHYDROGEN = 0, MAT_SUPERMATTER = 0) + materials = list(MAT_STEEL = 0, MAT_GLASS = 0, MAT_PLASTEEL = 0, MAT_PLASTIC = 0, MAT_GRAPHITE = 0, MAT_GOLD = 0, MAT_SILVER = 0, MAT_OSMIUM = 0, MAT_LEAD = 0, MAT_PHORON = 0, MAT_URANIUM = 0, MAT_DIAMOND = 0, MAT_DURASTEEL = 0, MAT_VERDANTIUM = 0, MAT_MORPHIUM = 0, MAT_METALHYDROGEN = 0, MAT_SUPERMATTER = 0) hidden_materials = list(MAT_PLASTEEL, MAT_DURASTEEL, MAT_GRAPHITE, MAT_VERDANTIUM, MAT_MORPHIUM, MAT_METALHYDROGEN, MAT_SUPERMATTER) diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index c9c7e29b3f..30ba91aab3 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -227,7 +227,7 @@ research holder datum. item_state = "card-id" randpixel = 5 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 30, "glass" = 10) + matter = list(MAT_STEEL = 30, MAT_GLASS = 10) var/datum/tech/stored /obj/item/disk/tech_disk/Initialize() @@ -242,7 +242,7 @@ research holder datum. item_state = "card-id" randpixel = 5 w_class = ITEMSIZE_SMALL - matter = list(MAT_STEEL = 30, "glass" = 10) + matter = list(MAT_STEEL = 30, MAT_GLASS = 10) var/datum/design/blueprint /obj/item/disk/design_disk/Initialize() diff --git a/code/modules/shieldgen/handheld_defuser.dm b/code/modules/shieldgen/handheld_defuser.dm index 1e8204953d..0f5f9b19fc 100644 --- a/code/modules/shieldgen/handheld_defuser.dm +++ b/code/modules/shieldgen/handheld_defuser.dm @@ -4,7 +4,7 @@ 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" - var/obj/item/cell/device/cell + var/obj/item/stock_parts/cell/device/cell var/enabled = 0 @@ -50,4 +50,4 @@ /obj/item/shield_diffuser/examine(mob/user) . = ..() . += "The charge meter reads [cell ? cell.percent() : 0]%" - . += "It is [enabled ? "enabled" : "disabled"]." \ No newline at end of file + . += "It is [enabled ? "enabled" : "disabled"]." diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm index fd13abe266..1e9e2bd037 100644 --- a/code/modules/shuttles/shuttles_web.dm +++ b/code/modules/shuttles/shuttles_web.dm @@ -561,7 +561,7 @@ "nitrogen" = "[round(n2_level*100,0.1)]",\ "oxygen" = "[round(o2_level*100,0.1)]",\ "carbon_dioxide" = "[round(co2_level*100,0.1)]",\ - "phoron" = "[round(phoron_level*100,0.01)]",\ + MAT_PHORON = "[round(phoron_level*100,0.01)]",\ "other" = "[round(unknown_level, 0.01)]",\ "temp" = "[round(environment.temperature-T0C,0.1)]",\ "reading" = TRUE\ diff --git a/code/modules/spells/aoe_turf/charge.dm b/code/modules/spells/aoe_turf/charge.dm index 490046125d..6ac1ab273c 100644 --- a/code/modules/spells/aoe_turf/charge.dm +++ b/code/modules/spells/aoe_turf/charge.dm @@ -53,8 +53,8 @@ I.used = 0 charged_item = I - if(istype(target, /obj/item/cell/)) - var/obj/item/cell/C = target + if(istype(target, /obj/item/stock_parts/cell/)) + var/obj/item/stock_parts/cell/C = target if(prob(80)) C.maxcharge -= 200 if(C.maxcharge <= 1) //Div by 0 protection @@ -66,4 +66,4 @@ return 0 else charged_item.visible_message("[charged_item] suddenly sparks with energy!") - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index e8ad3e5e6c..9b1a20240f 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/cell/high(src) + cell = new /obj/item/stock_parts/cell/high(src) ion = new /datum/effect_system/ion_trail_follow() ion.set_up(src) turn_off() diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index f2dcbd0001..cdeb507a7f 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -44,7 +44,7 @@ //------------------------------------------- /obj/vehicle/train/engine/Initialize() . = ..() - cell = new /obj/item/cell/high(src) + cell = new /obj/item/stock_parts/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) @@ -100,10 +100,10 @@ icon_state = initial(icon_state) */ -/obj/vehicle/train/trolley/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H) +/obj/vehicle/train/trolley/insert_cell(var/obj/item/stock_parts/cell/C, var/mob/living/carbon/human/H) return -/obj/vehicle/train/engine/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H) +/obj/vehicle/train/engine/insert_cell(var/obj/item/stock_parts/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 62665e0155..053739f218 100644 --- a/code/modules/vehicles/construction.dm +++ b/code/modules/vehicles/construction.dm @@ -14,7 +14,7 @@ w_class = 5 var/build_stage = 0 - var/obj/item/cell/cell = null + var/obj/item/stock_parts/cell/cell = null /obj/item/vehicle_assembly/Initialize() . = ..() @@ -98,7 +98,7 @@ return if(4) - if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/stock_parts/cell)) user.drop_item() W.forceMove(src) cell = W @@ -250,7 +250,7 @@ return if(5) - if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/stock_parts/cell)) user.drop_item() W.forceMove(src) cell = W @@ -329,7 +329,7 @@ return if(4) - if(istype(W, /obj/item/cell)) + if(istype(W, /obj/item/stock_parts/cell)) user.drop_item() W.forceMove(src) cell = W diff --git a/code/modules/vehicles/quad.dm b/code/modules/vehicles/quad.dm index 9fc72f07a7..08c97820d4 100644 --- a/code/modules/vehicles/quad.dm +++ b/code/modules/vehicles/quad.dm @@ -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/Initialize() - cell = new /obj/item/cell/high(src) + cell = new /obj/item/stock_parts/cell/high(src) key = new key_type(src) soundloop = new(list(src), FALSE) . = ..() diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 9bece57fbc..26d7eb7230 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/cell/cell + var/obj/item/stock_parts/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. @@ -101,7 +101,7 @@ else if(W.is_crowbar() && cell && open) remove_cell(user) - else if(istype(W, /obj/item/cell) && !cell && open) + else if(istype(W, /obj/item/stock_parts/cell) && !cell && open) insert_cell(W, user) else if(istype(W, /obj/item/weldingtool)) var/obj/item/weldingtool/T = W @@ -273,7 +273,7 @@ turn_on() return -/obj/vehicle/proc/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H) +/obj/vehicle/proc/insert_cell(var/obj/item/stock_parts/cell/C, var/mob/living/carbon/human/H) if(!mechanical) return if(cell) diff --git a/code/modules/xenoarcheaology/artifacts/replicator.dm b/code/modules/xenoarcheaology/artifacts/replicator.dm index 615b9c0507..599036e3d4 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator.dm @@ -46,7 +46,7 @@ /obj/item/clothing/head/cone, /obj/item/tool/crowbar, /obj/item/clipboard, - /obj/item/cell, + /obj/item/stock_parts/cell, /obj/item/surgical/circular_saw, /obj/item/material/knife/machete/hatchet, /obj/item/handcuffs, diff --git a/code/modules/xenoarcheaology/effects/cellcharge.dm b/code/modules/xenoarcheaology/effects/cellcharge.dm index a57485c06b..84c996061c 100644 --- a/code/modules/xenoarcheaology/effects/cellcharge.dm +++ b/code/modules/xenoarcheaology/effects/cellcharge.dm @@ -9,7 +9,7 @@ if (user) if (istype(user, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user - for (var/obj/item/cell/D in R.contents) + for (var/obj/item/stock_parts/cell/D in R.contents) D.charge += rand() * 100 + 50 to_chat(R, "SYSTEM ALERT: Large energy boost detected!") @@ -23,7 +23,7 @@ return for (var/obj/machinery/power/apc/apc as anything in GLOB.apcs) if (get_dist(turf, apc) <= 200) - for (var/obj/item/cell/cell in apc.contents) + for (var/obj/item/stock_parts/cell/cell in apc.contents) cell.charge += 25 for (var/obj/machinery/power/smes/smes as anything in GLOB.smeses) if (get_dist(turf, smes) <= effectrange) @@ -32,7 +32,7 @@ for (var/mob/living/silicon/robot/robot as anything in global.silicon_mob_list) if (get_dist(turf, robot) < 50) var/charged_cells - for (var/obj/item/cell/cell in robot.contents) + for (var/obj/item/stock_parts/cell/cell in robot.contents) cell.charge += 25 charged_cells = TRUE if (charged_cells) @@ -47,12 +47,12 @@ if (holder) var/turf/T = get_turf(holder) for (var/obj/machinery/power/apc/C in range(200, T)) - for (var/obj/item/cell/B in C.contents) + for (var/obj/item/stock_parts/cell/B in C.contents) B.charge += rand() * 100 for (var/obj/machinery/power/smes/S in range (src.effectrange,src)) S.charge += 250 for (var/mob/living/silicon/robot/M in range(100, T)) - for (var/obj/item/cell/D in M.contents) + for (var/obj/item/stock_parts/cell/D in M.contents) D.charge += rand() * 100 if (world.time - last_message > 200) to_chat(M, "SYSTEM ALERT: Energy boost detected!") diff --git a/code/modules/xenoarcheaology/effects/celldrain.dm b/code/modules/xenoarcheaology/effects/celldrain.dm index 0af99f1c84..be82382b5a 100644 --- a/code/modules/xenoarcheaology/effects/celldrain.dm +++ b/code/modules/xenoarcheaology/effects/celldrain.dm @@ -10,7 +10,7 @@ if (user) if (istype(user, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user - for (var/obj/item/cell/D in R.contents) + for (var/obj/item/stock_parts/cell/D in R.contents) D.charge = max(D.charge - rand() * 100, 0) to_chat(R, "SYSTEM ALERT: Energy drain detected!") @@ -20,12 +20,12 @@ if (holder) var/turf/T = get_turf(holder) for (var/obj/machinery/power/apc/C in range(200, T)) - for (var/obj/item/cell/B in C.contents) + for (var/obj/item/stock_parts/cell/B in C.contents) B.charge = max(B.charge - 50,0) for (var/obj/machinery/power/smes/S in range (src.effectrange,src)) S.charge = max(S.charge - 100,0) for (var/mob/living/silicon/robot/M in range(50, T)) - for (var/obj/item/cell/D in M.contents) + for (var/obj/item/stock_parts/cell/D in M.contents) D.charge = max(D.charge - 50,0) if (world.time - last_message > 200) to_chat(M, "SYSTEM ALERT: Energy drain detected!") @@ -37,12 +37,12 @@ if (holder) var/turf/T = get_turf(holder) for (var/obj/machinery/power/apc/C in range(200, T)) - for (var/obj/item/cell/B in C.contents) + for (var/obj/item/stock_parts/cell/B in C.contents) B.charge = max(B.charge - rand() * 150,0) for (var/obj/machinery/power/smes/S in range (src.effectrange,src)) S.charge = max(S.charge - 250,0) for (var/mob/living/silicon/robot/M in range(100, T)) - for (var/obj/item/cell/D in M.contents) + for (var/obj/item/stock_parts/cell/D in M.contents) D.charge = max(D.charge - rand() * 150,0) if (world.time - last_message > 200) to_chat(M, "SYSTEM ALERT: Energy drain detected!") diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index 134fcd6243..cc767a8f79 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -481,7 +481,7 @@ /obj/item/surgical/retractor/alien, /obj/item/surgical/scalpel/alien, /obj/item/surgical/surgicaldrill/alien, - /obj/item/cell/device/weapon/recharge/alien, + /obj/item/stock_parts/cell/device/weapon/recharge/alien, /obj/item/clothing/suit/armor/alien, /obj/item/clothing/head/helmet/alien, /obj/item/clothing/head/psy_crown/wrath @@ -548,7 +548,7 @@ if(ARCHAEO_BATTERY) // Battery! - var/new_path = pick(subtypesof(/obj/item/cell)) + var/new_path = pick(subtypesof(/obj/item/stock_parts/cell)) new_item = new new_path(src.loc) new_item.name = pick("cell", "battery", "device") diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index 399561d05d..69bec83645 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -5,7 +5,7 @@ icon_state = "suspension" density = 1 req_access = list(access_research) - var/obj/item/cell/cell + var/obj/item/stock_parts/cell/cell var/obj/item/card/id/auth_card var/locked = 1 var/power_use = 5 @@ -13,7 +13,7 @@ /obj/machinery/suspension_gen/Initialize() . = ..() - src.cell = new /obj/item/cell/high(src) + src.cell = new /obj/item/stock_parts/cell/high(src) /obj/machinery/suspension_gen/process() if(suspension_field) @@ -145,7 +145,7 @@ update_icon() else to_chat(user, "You are unable to secure [src] while it is active!") - else if (istype(W, /obj/item/cell)) + else if (istype(W, /obj/item/stock_parts/cell)) if(panel_open) if(cell) to_chat(user, "There is a power cell already installed.") diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index 9e7aedde93..a6b7e4f652 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -37,7 +37,7 @@ icon_state = "xenoarch_scanner" item_state = "analyzer" origin_tech = list(TECH_BLUESPACE = 3, TECH_MAGNET = 3) - matter = list(MAT_STEEL = 10000,"glass" = 5000) + matter = list(MAT_STEEL = 10000,MAT_GLASS = 5000) w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT @@ -96,7 +96,7 @@ icon_state = "depth_scanner" item_state = "xenoarch_device" origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2) - matter = list(MAT_STEEL = 1000,"glass" = 1000) + matter = list(MAT_STEEL = 1000,MAT_GLASS = 1000) w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT var/list/positive_locations = list() @@ -227,7 +227,7 @@ icon_state = "pinoff" //pinonfar, pinonmedium, pinonclose, pinondirect, pinonnull item_state = "electronic" origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3) - matter = list(MAT_STEEL = 1000,"glass" = 500) + matter = list(MAT_STEEL = 1000,MAT_GLASS = 500) var/frequency = PUB_FREQ var/scan_ticks = 0 var/obj/item/radio/target_radio @@ -323,7 +323,7 @@ item_state = "lampgreen" icon = 'icons/obj/xenoarchaeology.dmi' origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3, TECH_BLUESPACE = 2) - matter = list(MAT_STEEL = 10000,"glass" = 5000) + matter = list(MAT_STEEL = 10000,MAT_GLASS = 5000) w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT var/mode = 1 //Start off scanning. 1 = scanning, 0 = measuring @@ -351,4 +351,3 @@ set name = "Scan for Anomalies" set desc = "Scan for artifacts and anomalies within your vicinity." anomaly_scanner.interact(user) - diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index 832f206894..c369ea80db 100644 --- a/code/modules/xenobio/items/extracts.dm +++ b/code/modules/xenobio/items/extracts.dm @@ -71,7 +71,7 @@ name = "Slime Spawn" id = "m_spawn" result = null - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/grey @@ -126,7 +126,7 @@ /decl/chemical_reaction/instant/slime/metal_metamorphic name = "Slime Metal" id = "m_metal" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result = "metamorphic" result_amount = REAGENTS_PER_SHEET // Makes enough to make one sheet of any metal. required = /obj/item/slime_extract/metal @@ -148,42 +148,42 @@ /decl/chemical_reaction/instant/metamorphic/iron name = "Morph into Iron" id = "morph_iron" - required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "iron" = REAGENTS_PER_SHEET) + required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, MAT_IRON = REAGENTS_PER_SHEET) result = "iron" /decl/chemical_reaction/instant/metamorphic/silver name = "Morph into Silver" id = "morph_silver" - required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "silver" = REAGENTS_PER_SHEET) + required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, MAT_SILVER = REAGENTS_PER_SHEET) result = "silver" /decl/chemical_reaction/instant/metamorphic/gold name = "Morph into Gold" id = "morph_gold" - required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "gold" = REAGENTS_PER_SHEET) + required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, MAT_GOLD = REAGENTS_PER_SHEET) result = "gold" /decl/chemical_reaction/instant/metamorphic/platinum name = "Morph into Platinum" id = "morph_platinum" - required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "platinum" = REAGENTS_PER_SHEET) + required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, MAT_PLATINUM = REAGENTS_PER_SHEET) result = "platinum" /decl/chemical_reaction/instant/metamorphic/uranium name = "Morph into Uranium" id = "morph_uranium" - required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "uranium" = REAGENTS_PER_SHEET) + required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, MAT_URANIUM = REAGENTS_PER_SHEET) result = "uranium" /decl/chemical_reaction/instant/metamorphic/phoron name = "Morph into Phoron" id = "morph_phoron" - required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "phoron" = REAGENTS_PER_SHEET) + required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, MAT_PHORON = REAGENTS_PER_SHEET) result = "phoron" @@ -219,7 +219,7 @@ name = "Bind into Steel" id = "bind_steel" result = "steel" - required_reagents = list("binding" = REAGENTS_PER_SHEET, "iron" = REAGENTS_PER_SHEET, "carbon" = REAGENTS_PER_SHEET) + required_reagents = list("binding" = REAGENTS_PER_SHEET, MAT_IRON = REAGENTS_PER_SHEET, "carbon" = REAGENTS_PER_SHEET) result_amount = REAGENTS_PER_SHEET /datum/reagent/steel @@ -234,7 +234,7 @@ /decl/chemical_reaction/instant/binding/plasteel // Two parts 'steel', one part platnium matches the smelter alloy recipe. name = "Bind into Plasteel" id = "bind_plasteel" - required_reagents = list("binding" = REAGENTS_PER_SHEET, "steel" = REAGENTS_PER_SHEET * 2, "platinum" = REAGENTS_PER_SHEET) + required_reagents = list("binding" = REAGENTS_PER_SHEET, "steel" = REAGENTS_PER_SHEET * 2, MAT_PLATINUM = REAGENTS_PER_SHEET) result = "plasteel" /datum/reagent/plasteel @@ -262,7 +262,7 @@ name = "Slime Frost Oil" id = "m_frostoil" result = "frostoil" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 20 required = /obj/item/slime_extract/blue @@ -294,7 +294,7 @@ /decl/chemical_reaction/instant/slime/purple_steroid name = "Slime Steroid" id = "m_steroid" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/purple @@ -316,7 +316,7 @@ /decl/chemical_reaction/instant/slime/orange_fire name = "Slime Fire" id = "m_fire" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/orange @@ -371,12 +371,12 @@ /decl/chemical_reaction/instant/slime/yellow_battery name = "Slime Cell" id = "m_cell" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/yellow /decl/chemical_reaction/instant/slime/yellow_battery/on_reaction(var/datum/reagents/holder) - new /obj/item/cell/slime(get_turf(holder.my_atom)) + new /obj/item/stock_parts/cell/slime(get_turf(holder.my_atom)) ..() @@ -405,7 +405,7 @@ name = "Slime Gold" id = "m_gold" result = "gold" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 5 required = /obj/item/slime_extract/gold @@ -424,7 +424,7 @@ name = "Slime Silver" id = "m_silver" result = "silver" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 5 required = /obj/item/slime_extract/silver @@ -465,7 +465,7 @@ /decl/chemical_reaction/instant/slime/dark_blue_cold_snap name = "Slime Cold Snap" id = "m_cold_snap" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/dark_blue @@ -583,7 +583,7 @@ /decl/chemical_reaction/instant/slime/red_mutation name = "Slime Mutation" id = "m_mutation" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/red @@ -604,7 +604,7 @@ name = "Slime Uranium" id = "m_uranium" result = "uranium" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 5 required = /obj/item/slime_extract/green @@ -633,7 +633,7 @@ name = "Slime Bone Med" id = "m_bone_fixer" result = "slime_bone_fixer" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 30 required = /obj/item/slime_extract/pink @@ -733,7 +733,7 @@ /decl/chemical_reaction/instant/slime/bluespace_greater name = "Slime Greater Tele" id = "m_tele_lesser" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/bluespace @@ -755,7 +755,7 @@ /decl/chemical_reaction/instant/slime/cerulean_enhancer name = "Slime Enhancer" id = "m_enhancer" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/cerulean @@ -777,7 +777,7 @@ /decl/chemical_reaction/instant/slime/amber_slimefood name = "Slime Feeding" id = "m_slime_food" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/amber @@ -812,7 +812,7 @@ /decl/chemical_reaction/instant/slime/sapphire_promethean name = "Slime Promethean" id = "m_promethean" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/sapphire @@ -833,7 +833,7 @@ /decl/chemical_reaction/instant/slime/ruby_swole name = "Slime Strength" id = "m_strength" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/ruby @@ -882,7 +882,7 @@ /decl/chemical_reaction/instant/slime/emerald_fast name = "Slime Agility" id = "m_agility" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/emerald @@ -931,7 +931,7 @@ /decl/chemical_reaction/instant/slime/light_pink_friendship name = "Slime Friendship" id = "m_friendship" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/light_pink @@ -955,7 +955,7 @@ /decl/chemical_reaction/instant/slime/rainbow_random_slime name = "Slime Random Slime" id = "m_rng_slime" - required_reagents = list("phoron" = 5) + required_reagents = list(MAT_PHORON = 5) result_amount = 1 required = /obj/item/slime_extract/rainbow diff --git a/code/modules/xenobio/items/weapons.dm b/code/modules/xenobio/items/weapons.dm index e91bbd7ae8..534c935f52 100644 --- a/code/modules/xenobio/items/weapons.dm +++ b/code/modules/xenobio/items/weapons.dm @@ -30,7 +30,7 @@ ..() /obj/item/melee/baton/slime/loaded/Initialize() - bcell = new/obj/item/cell/device(src) + bcell = new/obj/item/stock_parts/cell/device(src) update_icon() return ..() diff --git a/maps/cynosure/cynosure-1.dmm b/maps/cynosure/cynosure-1.dmm index 18a981131b..be857101da 100644 --- a/maps/cynosure/cynosure-1.dmm +++ b/maps/cynosure/cynosure-1.dmm @@ -2527,7 +2527,7 @@ }, /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/tool/screwdriver, /obj/item/tool/wrench, /obj/item/tool/crowbar, @@ -2744,7 +2744,7 @@ }, /obj/machinery/cell_charger, /obj/structure/table/steel_reinforced, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/storage/belt/utility, /obj/item/pickaxe, /turf/simulated/floor/tiled, @@ -7814,7 +7814,7 @@ /obj/effect/catwalk_plated/dark, /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /turf/simulated/floor/plating, /area/surface/station/maintenance/substation/medbay/bmt) "qs" = ( @@ -11435,7 +11435,7 @@ "xQ" = ( /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /obj/effect/floor_decal/industrial/warning, /obj/machinery/alarm{ dir = 4; @@ -11695,7 +11695,7 @@ }, /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/alarm{ dir = 8; pixel_x = 22 @@ -12742,7 +12742,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central7{ dir = 1 }, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /turf/simulated/floor/tiled/techmaint, /area/surface/station/mining_main) "Az" = ( @@ -17973,8 +17973,8 @@ }, /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/obj/item/cell/high, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high{ pixel_y = -4 }, /turf/simulated/floor/tiled/steel/sif/planetuse{ @@ -19690,7 +19690,7 @@ /obj/structure/table/steel, /obj/machinery/cell_charger, /obj/item/multitool, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/stack/cable_coil{ pixel_x = 2; pixel_y = 2 diff --git a/maps/cynosure/cynosure-2.dmm b/maps/cynosure/cynosure-2.dmm index b6b56857b5..439b4526bd 100644 --- a/maps/cynosure/cynosure-2.dmm +++ b/maps/cynosure/cynosure-2.dmm @@ -19288,8 +19288,8 @@ "iWF" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, -/obj/item/cell/high, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high{ pixel_y = -4 }, /turf/simulated/floor/reinforced, @@ -28986,7 +28986,7 @@ "nic" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/tool/wrench, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil{ diff --git a/maps/cynosure/cynosure-3.dmm b/maps/cynosure/cynosure-3.dmm index 6d58ef411a..e2a6fb2da8 100644 --- a/maps/cynosure/cynosure-3.dmm +++ b/maps/cynosure/cynosure-3.dmm @@ -82,10 +82,10 @@ dir = 1 }, /obj/machinery/cell_charger, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_y = -4 }, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /obj/effect/floor_decal/corner/purple/border{ dir = 1 }, @@ -1853,16 +1853,16 @@ /area/surface/station/engineering/engi_restroom) "bpv" = ( /obj/structure/table/standard, -/obj/item/cell/device/weapon{ +/obj/item/stock_parts/cell/device/weapon{ pixel_x = 2; pixel_y = 2 }, -/obj/item/cell/device/weapon, -/obj/item/cell/device/weapon{ +/obj/item/stock_parts/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, -/obj/item/cell/device/weapon{ +/obj/item/stock_parts/cell/device/weapon{ pixel_x = -3; pixel_y = -4 }, @@ -6692,8 +6692,8 @@ pixel_y = 4 }, /obj/item/rcd, -/obj/item/cell/high, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/effect/floor_decal/steeldecal/steel_decals_central7, /turf/simulated/floor/tiled/techmaint, /area/surface/station/crew_quarters/heads/chief) @@ -22133,8 +22133,8 @@ }, /obj/structure/table/standard, /obj/machinery/cell_charger, -/obj/item/cell/high, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high{ pixel_y = -4 }, /obj/item/stack/cable_coil, @@ -29744,10 +29744,10 @@ /obj/structure/closet{ name = "robotics parts" }, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/assembly/prox_sensor, /obj/item/assembly/prox_sensor, /obj/item/storage/firstaid/regular{ diff --git a/maps/cynosure/cynosure-4.dmm b/maps/cynosure/cynosure-4.dmm index 37b44ccc01..c67995cc00 100644 --- a/maps/cynosure/cynosure-4.dmm +++ b/maps/cynosure/cynosure-4.dmm @@ -180,7 +180,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 9 }, -/obj/item/cell, +/obj/item/stock_parts/cell, /turf/simulated/floor/tiled/techmaint, /area/tcommsat/cynosure/teleporter) "cw" = ( diff --git a/maps/cynosure/cynosure-6.dmm b/maps/cynosure/cynosure-6.dmm index eec25733fb..e74aca5a5d 100644 --- a/maps/cynosure/cynosure-6.dmm +++ b/maps/cynosure/cynosure-6.dmm @@ -2124,9 +2124,9 @@ /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/stock_parts/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -4270,10 +4270,10 @@ /area/centcom/suppy) "eWA" = ( /obj/structure/table/steel_reinforced, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/hyper, -/obj/item/cell/potato, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/hyper, +/obj/item/stock_parts/cell/potato, /obj/structure/window/reinforced, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) @@ -4523,8 +4523,8 @@ "fjf" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/obj/item/cell/high, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" @@ -8947,13 +8947,13 @@ /obj/machinery/cell_charger, /obj/structure/table/reinforced, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/cell/high, -/obj/item/cell/high, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high{ pixel_x = 2; pixel_y = 2 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = 4; pixel_y = 4 }, @@ -16677,10 +16677,10 @@ pixel_x = 2; pixel_y = 2 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_y = -4 }, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/defib_kit/compact/combat/loaded{ pixel_x = -2; pixel_y = -2 @@ -21711,12 +21711,12 @@ /area/centcom/terminal) "xrA" = ( /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, +/obj/item/stock_parts/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/techfloor.dmi'; icon_state = "techfloor_gray" @@ -21873,7 +21873,7 @@ /obj/item/tank/emergency/oxygen/double, /obj/item/tank/emergency/oxygen/double, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark" diff --git a/maps/cynosure/structures/closets/misc.dm b/maps/cynosure/structures/closets/misc.dm index e0324bf654..0193532ab5 100644 --- a/maps/cynosure/structures/closets/misc.dm +++ b/maps/cynosure/structures/closets/misc.dm @@ -30,7 +30,7 @@ starts_with = list( /obj/item/gun/energy/phasegun = 2, /obj/item/gun/energy/phasegun/pistol, - /obj/item/cell/device/weapon = 2, + /obj/item/stock_parts/cell/device/weapon = 2, /obj/item/clothing/accessory/permit/gun/planetside) //Explorer Lockers @@ -52,7 +52,7 @@ /obj/item/gps/explorer, /obj/item/storage/box/flare, /obj/item/geiger, - /obj/item/cell/device, + /obj/item/stock_parts/cell/device, /obj/item/radio, /obj/item/stack/marker_beacon/thirty, /obj/item/cataloguer @@ -142,7 +142,7 @@ /obj/item/gps/medical, /obj/item/geiger, /obj/item/gun/energy/phasegun/pistol, - /obj/item/cell/device/weapon + /obj/item/stock_parts/cell/device/weapon ) //Pilot Locker @@ -165,7 +165,7 @@ /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/stock_parts/cell/device, /obj/item/radio) /obj/structure/closet/secure_closet/pilot/Initialize() diff --git a/maps/cynosure/structures/closets/security.dm b/maps/cynosure/structures/closets/security.dm index 1033b05533..7a3bfd8f97 100644 --- a/maps/cynosure/structures/closets/security.dm +++ b/maps/cynosure/structures/closets/security.dm @@ -28,7 +28,7 @@ /obj/item/storage/belt/security, /obj/item/flash, /obj/item/melee/baton/loaded, - /obj/item/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, /obj/item/clothing/accessory/holster/waist, /obj/item/melee/telebaton, /obj/item/clothing/head/beret/sec/corporate/hos, @@ -74,7 +74,7 @@ /obj/item/reagent_containers/spray/pepper, /obj/item/melee/baton/loaded, /obj/item/gun/energy/gun, - /obj/item/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, /obj/item/storage/box/holobadge, /obj/item/clothing/head/beret/sec/corporate/warden, /obj/item/clothing/suit/storage/hooded/wintercoat/security, @@ -118,7 +118,7 @@ /obj/item/clothing/under/rank/security/corp, /obj/item/ammo_magazine/m45/rubber, /obj/item/gun/energy/taser, - /obj/item/cell/device/weapon, + /obj/item/stock_parts/cell/device/weapon, /obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/clothing/shoes/boots/winter/security, /obj/item/flashlight/maglight) diff --git a/maps/cynosure/submaps/10x9/Warehouse1.dmm b/maps/cynosure/submaps/10x9/Warehouse1.dmm index 0ac3db03ea..3d3169a3aa 100644 --- a/maps/cynosure/submaps/10x9/Warehouse1.dmm +++ b/maps/cynosure/submaps/10x9/Warehouse1.dmm @@ -101,10 +101,10 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /obj/structure/closet/crate/large/einstein, -/obj/item/cell, -/obj/item/cell, -/obj/item/cell/high, -/obj/item/cell/high, +/obj/item/stock_parts/cell, +/obj/item/stock_parts/cell, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/random/powercell, /obj/random/powercell, /obj/machinery/alarm{ @@ -189,7 +189,7 @@ /obj/structure/closet/crate/focalpoint, /obj/item/module/power_control, /obj/item/stack/cable_coil/random, -/obj/item/cell/apc, +/obj/item/stock_parts/cell/apc, /turf/simulated/floor/plating, /area/template_noop) "w" = ( diff --git a/maps/cynosure/submaps/10x9/Warehouse2.dmm b/maps/cynosure/submaps/10x9/Warehouse2.dmm index 6a31f454c4..7ebbb4ca27 100644 --- a/maps/cynosure/submaps/10x9/Warehouse2.dmm +++ b/maps/cynosure/submaps/10x9/Warehouse2.dmm @@ -322,8 +322,8 @@ dir = 8 }, /obj/random/powercell, -/obj/item/cell, -/obj/item/cell/high, +/obj/item/stock_parts/cell, +/obj/item/stock_parts/cell/high, /obj/machinery/alarm{ dir = 1; pixel_y = -22 diff --git a/maps/cynosure/submaps/10x9/Warehouse3.dmm b/maps/cynosure/submaps/10x9/Warehouse3.dmm index 7d82729952..d7681d5768 100644 --- a/maps/cynosure/submaps/10x9/Warehouse3.dmm +++ b/maps/cynosure/submaps/10x9/Warehouse3.dmm @@ -204,8 +204,8 @@ dir = 6 }, /obj/structure/closet/crate/einstein, -/obj/item/cell, -/obj/item/cell, +/obj/item/stock_parts/cell, +/obj/item/stock_parts/cell, /obj/random/powercell, /obj/random/powercell, /turf/simulated/floor/tiled/steel_dirty, @@ -252,9 +252,9 @@ dir = 8 }, /obj/structure/closet/crate/large/secure/heph, -/obj/item/cell/device/weapon/empty, -/obj/item/cell/device/weapon/empty, -/obj/item/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon/empty, +/obj/item/stock_parts/cell/device/weapon/empty, +/obj/item/stock_parts/cell/device/weapon, /turf/simulated/floor/tiled/steel_dirty, /area/template_noop) "H" = ( diff --git a/maps/cynosure/submaps/7x7/FightClub.dmm b/maps/cynosure/submaps/7x7/FightClub.dmm index fe5c10bb47..2e4695ac84 100644 --- a/maps/cynosure/submaps/7x7/FightClub.dmm +++ b/maps/cynosure/submaps/7x7/FightClub.dmm @@ -15,7 +15,7 @@ operating = 0; pixel_y = -24 }, -/obj/item/cell/high/empty, +/obj/item/stock_parts/cell/high/empty, /turf/simulated/floor/plating, /area/template_noop) "m" = ( diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm index ba71c6bd3e..11638031c0 100644 --- a/maps/northern_star/polaris-1.dmm +++ b/maps/northern_star/polaris-1.dmm @@ -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/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) +"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/stock_parts/cell/device/weapon{pixel_x = 4; pixel_y = 4},/obj/item/stock_parts/cell/device/weapon{pixel_x = 2; pixel_y = 2},/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/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) @@ -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/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/stock_parts/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) @@ -2732,7 +2732,7 @@ "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/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) +"baE" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stock_parts/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/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) @@ -3816,7 +3816,7 @@ "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/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) +"bvw" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/item/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/stock_parts/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) @@ -4316,7 +4316,7 @@ "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/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/stock_parts/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) @@ -4496,7 +4496,7 @@ "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/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) +"bIA" = (/obj/structure/table/standard,/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/multitool,/obj/machinery/cell_charger,/obj/item/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/stock_parts/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) @@ -4510,7 +4510,7 @@ "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/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{name = "First-Aid (empty)"; starts_with = null},/obj/item/storage/firstaid/regular{name = "First-Aid (empty)"; starts_with = null},/obj/item/storage/firstaid/regular{name = "First-Aid (empty)"; starts_with = null},/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) +"bIO" = (/obj/structure/closet{name = "robotics parts"},/obj/item/stock_parts/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/stock_parts/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/item/stock_parts/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/item/stock_parts/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/obj/item/storage/firstaid/regular{name = "First-Aid (empty)"; starts_with = null},/obj/item/storage/firstaid/regular{name = "First-Aid (empty)"; starts_with = null},/obj/item/storage/firstaid/regular{name = "First-Aid (empty)"; starts_with = null},/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) @@ -6275,7 +6275,7 @@ "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/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) +"cqL" = (/obj/machinery/light/small,/obj/structure/table/steel,/obj/item/stock_parts/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) @@ -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/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/tiled,/area/vacant/vacant_shop) +"cyV" = (/obj/item/frame,/obj/item/stock_parts/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) @@ -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/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) +"cGK" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/module/power_control,/obj/item/stock_parts/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) @@ -7369,7 +7369,7 @@ "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/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) +"cLN" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/stock_parts/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/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor/tiled,/area/security/checkpoint2) @@ -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/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) +"cSI" = (/obj/structure/table/reinforced,/obj/item/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/stock_parts/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) @@ -8894,9 +8894,9 @@ "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/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/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) +"dpe" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/stock_parts/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) +"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/stock_parts/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) diff --git a/maps/northern_star/polaris-2.dmm b/maps/northern_star/polaris-2.dmm index 1c76e07af1..cce55ace7b 100644 --- a/maps/northern_star/polaris-2.dmm +++ b/maps/northern_star/polaris-2.dmm @@ -403,7 +403,7 @@ "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/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/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) +"hP" = (/obj/structure/table/steel_reinforced,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/hyper,/obj/item/stock_parts/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/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) @@ -659,7 +659,7 @@ "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/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) +"mL" = (/obj/structure/table/reinforced,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/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) @@ -794,7 +794,7 @@ "pn" = (/obj/machinery/chem_master,/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/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) +"pq" = (/obj/structure/table/reinforced,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/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) @@ -910,7 +910,7 @@ "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/cell{charge = 100; maxcharge = 15000},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"rC" = (/obj/structure/table/standard,/obj/item/stack/material/glass{amount = 15},/obj/item/stock_parts/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) @@ -1070,7 +1070,7 @@ "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) +"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/stock_parts/cell/device/weapon,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/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/storage/box/syndie_kit/chameleon,/obj/item/stamp/chameleon,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) diff --git a/maps/northern_star/polaris-3.dmm b/maps/northern_star/polaris-3.dmm index a485982abc..170a4a8792 100644 --- a/maps/northern_star/polaris-3.dmm +++ b/maps/northern_star/polaris-3.dmm @@ -12,7 +12,7 @@ "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/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) +"ao" = (/obj/item/stock_parts/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) @@ -370,7 +370,7 @@ "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/cell,/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) +"hE" = (/obj/item/stock_parts/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/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/tcommsat/entrance) @@ -381,7 +381,7 @@ "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/cell,/turf/simulated/floor/airless,/area/AIsattele) +"hV" = (/obj/item/stock_parts/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) @@ -654,4 +654,3 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "} - diff --git a/maps/northern_star/polaris-5.dmm b/maps/northern_star/polaris-5.dmm index b9e912fc14..caee705b3d 100644 --- a/maps/northern_star/polaris-5.dmm +++ b/maps/northern_star/polaris-5.dmm @@ -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/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/stock_parts/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) @@ -1359,7 +1359,7 @@ "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/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/stock_parts/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) @@ -1485,7 +1485,7 @@ "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/cell/high,/turf/simulated/floor/tiled/asteroid_steel/airless,/area/outpost/mining_main/refinery) +"CF" = (/obj/structure/table/steel,/obj/item/stock_parts/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) @@ -1627,7 +1627,7 @@ "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/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) +"Fr" = (/obj/item/stock_parts/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) diff --git a/maps/overmap/bearcat/bearcat.dmm b/maps/overmap/bearcat/bearcat.dmm index cd69db0be2..4c5aba1ff0 100644 --- a/maps/overmap/bearcat/bearcat.dmm +++ b/maps/overmap/bearcat/bearcat.dmm @@ -263,7 +263,7 @@ "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/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) +"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/stock_parts/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) diff --git a/maps/overmap/example_sector1.dmm b/maps/overmap/example_sector1.dmm index 6cbf083ee3..e80bdf244c 100644 --- a/maps/overmap/example_sector1.dmm +++ b/maps/overmap/example_sector1.dmm @@ -258,7 +258,7 @@ "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/cell,/turf/simulated/floor,/area/tcommsat/entrance) +"fa" = (/obj/item/stock_parts/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) diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index a6aa89f53d..44c856cc78 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -13296,7 +13296,7 @@ /area/tcomm/entrance) "aAw" = ( /obj/structure/table/standard, -/obj/item/cell, +/obj/item/stock_parts/cell, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, @@ -13552,11 +13552,11 @@ "aAU" = ( /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -21047,7 +21047,7 @@ pixel_y = 5 }, /obj/item/multitool, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -25159,16 +25159,16 @@ pixel_x = -24 }, /obj/structure/table/steel, -/obj/item/cell/device/weapon{ +/obj/item/stock_parts/cell/device/weapon{ pixel_x = 4; pixel_y = 4 }, -/obj/item/cell/device/weapon{ +/obj/item/stock_parts/cell/device/weapon{ pixel_x = 2; pixel_y = 2 }, -/obj/item/cell/device/weapon, -/obj/item/cell/device/weapon{ +/obj/item/stock_parts/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon{ pixel_x = -2; pixel_y = -2 }, @@ -37624,11 +37624,11 @@ "bsh" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -45254,7 +45254,7 @@ /obj/structure/table/steel, /obj/machinery/cell_charger, /obj/item/stack/cable_coil, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -51587,11 +51587,11 @@ "bRe" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -51961,11 +51961,11 @@ /obj/item/stack/cable_coil, /obj/item/multitool, /obj/machinery/cell_charger, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -55689,7 +55689,7 @@ "bZk" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -56490,7 +56490,7 @@ }, /obj/item/airlock_electronics, /obj/item/airlock_electronics, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/stack/material/glass/phoronrglass{ amount = 20 }, @@ -56583,11 +56583,11 @@ pixel_x = -12; pixel_y = -24 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -67823,11 +67823,11 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -76111,7 +76111,7 @@ }, /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -76630,7 +76630,7 @@ layer = 2.9 }, /obj/item/module/power_control, -/obj/item/cell{ +/obj/item/stock_parts/cell{ maxcharge = 2000 }, /obj/effect/floor_decal/borderfloor{ @@ -92898,7 +92898,7 @@ name = "Station Intercom (General)"; pixel_y = 21 }, -/obj/item/cell/apc, +/obj/item/stock_parts/cell/apc, /turf/simulated/floor/plating, /area/construction/seconddeck/construction2) "dqV" = ( @@ -112944,25 +112944,25 @@ /turf/simulated/floor/plating, /area/maintenance/substation/central) "ebQ" = ( -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5 }, -/obj/item/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000; pixel_x = 5; diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index 34f37af002..993a32bfc7 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -263,7 +263,7 @@ "aU" = ( /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /obj/effect/floor_decal/corner/brown{ dir = 5 }, @@ -9967,7 +9967,7 @@ }, /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/weldpack, /obj/structure/cable/green{ d1 = 1; diff --git a/maps/southern_cross/southern_cross-4.dmm b/maps/southern_cross/southern_cross-4.dmm index 079c685356..37697314ca 100644 --- a/maps/southern_cross/southern_cross-4.dmm +++ b/maps/southern_cross/southern_cross-4.dmm @@ -1845,7 +1845,7 @@ icon_state = "warning_dust" }, /obj/machinery/cell_charger, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /turf/simulated/floor/tiled/asteroid_steel, /area/surface/outpost/mining_main/cave) "dK" = ( @@ -1985,7 +1985,7 @@ dir = 1; icon_state = "warning_dust" }, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /turf/simulated/floor/tiled/asteroid_steel, /area/surface/outpost/mining_main/cave) "dW" = ( diff --git a/maps/southern_cross/southern_cross-5.dmm b/maps/southern_cross/southern_cross-5.dmm index 5f88b256b9..34b62e6a27 100644 --- a/maps/southern_cross/southern_cross-5.dmm +++ b/maps/southern_cross/southern_cross-5.dmm @@ -18,7 +18,7 @@ "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/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) +"au" = (/obj/item/stock_parts/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) @@ -134,7 +134,7 @@ "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/cell/super,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship) +"cK" = (/obj/item/stock_parts/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) @@ -416,4 +416,3 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "} - diff --git a/maps/southern_cross/southern_cross-6.dmm b/maps/southern_cross/southern_cross-6.dmm index 44129553e4..6b44e74e0a 100644 --- a/maps/southern_cross/southern_cross-6.dmm +++ b/maps/southern_cross/southern_cross-6.dmm @@ -238,7 +238,7 @@ "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/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) +"eG" = (/obj/structure/table/reinforced,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/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) @@ -359,7 +359,7 @@ "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/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) +"gX" = (/obj/structure/table/reinforced,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/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/rig/ert/engineer,/obj/item/rig/ert/engineer,/obj/item/rig/ert/engineer,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) @@ -390,11 +390,11 @@ "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/cell/high,/obj/item/cell/high,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"hC" = (/obj/structure/table/steel_reinforced,/obj/machinery/cell_charger,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/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/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) +"hG" = (/obj/structure/table/reinforced,/obj/item/defib_kit,/obj/item/defib_kit,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/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/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) @@ -1203,7 +1203,7 @@ "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/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/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) +"xj" = (/obj/structure/table/steel_reinforced,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/hyper,/obj/item/stock_parts/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/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) @@ -1780,7 +1780,7 @@ "Il" = (/obj/effect/landmark{name = "prisonwarp"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/prison/solitary) "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/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) +"Io" = (/obj/structure/table/rack,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/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) diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index 9e733d471a..52f1d6c08e 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -30,7 +30,7 @@ starts_with = list( /obj/item/gun/energy/phasegun = 2, /obj/item/gun/energy/phasegun/pistol, - /obj/item/cell/device/weapon = 2, + /obj/item/stock_parts/cell/device/weapon = 2, /obj/item/clothing/accessory/permit/gun/planetside) //Explorer Lockers @@ -52,7 +52,7 @@ /obj/item/gps/explorer, /obj/item/storage/box/flare, /obj/item/geiger, - /obj/item/cell/device, + /obj/item/stock_parts/cell/device, /obj/item/radio, /obj/item/stack/marker_beacon/thirty, /obj/item/cataloguer @@ -124,7 +124,7 @@ /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/stock_parts/cell/device, /obj/item/radio) /obj/structure/closet/secure_closet/pilot/Initialize() diff --git a/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm b/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm index fe4b0c0b94..b07a2460b2 100644 --- a/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm +++ b/maps/submaps/surface_submaps/mountains/Mineshaft1.dmm @@ -8,8 +8,8 @@ /area/submap/cave/AMine1) "bd" = ( /obj/structure/table/standard, -/obj/item/cell/high, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/simulated/floor/concrete, /area/submap/cave/AMine1) "cv" = ( diff --git a/maps/submaps/surface_submaps/mountains/crashed_ufo.dmm b/maps/submaps/surface_submaps/mountains/crashed_ufo.dmm index 902851e9bb..3ab7e2e379 100644 --- a/maps/submaps/surface_submaps/mountains/crashed_ufo.dmm +++ b/maps/submaps/surface_submaps/mountains/crashed_ufo.dmm @@ -60,7 +60,7 @@ "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/cell/device/weapon/empty,/turf/simulated/shuttle/floor/alienplating,/area/submap/cave/crashed_ufo) +"bk" = (/obj/item/stock_parts/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/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) diff --git a/maps/submaps/surface_submaps/mountains/lost_explorer.dmm b/maps/submaps/surface_submaps/mountains/lost_explorer.dmm index 717d1e8f4b..9de41ccd2c 100644 --- a/maps/submaps/surface_submaps/mountains/lost_explorer.dmm +++ b/maps/submaps/surface_submaps/mountains/lost_explorer.dmm @@ -4,7 +4,7 @@ "d" = (/obj/item/material/knife/tacknife/survival,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) "e" = (/obj/item/clothing/shoes/boots/winter/explorer,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) "f" = (/obj/item/clothing/under/explorer,/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) -"g" = (/obj/item/clothing/suit/storage/hooded/explorer,/obj/item/cell/device,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) +"g" = (/obj/item/clothing/suit/storage/hooded/explorer,/obj/item/stock_parts/cell/device,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) "h" = (/obj/item/gps/explorer,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) "i" = (/obj/item/flashlight/lantern,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) diff --git a/maps/submaps/surface_submaps/plains/Diner.dmm b/maps/submaps/surface_submaps/plains/Diner.dmm index 801f57a705..34450fc086 100644 --- a/maps/submaps/surface_submaps/plains/Diner.dmm +++ b/maps/submaps/surface_submaps/plains/Diner.dmm @@ -374,7 +374,7 @@ /area/submap/Diner) "bl" = ( /obj/structure/table/woodentable, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, /turf/simulated/floor/lino, /area/submap/Diner) "bm" = ( diff --git a/maps/submaps/surface_submaps/plains/Mechpt.dmm b/maps/submaps/surface_submaps/plains/Mechpt.dmm index 80b69105b7..49a292a4be 100644 --- a/maps/submaps/surface_submaps/plains/Mechpt.dmm +++ b/maps/submaps/surface_submaps/plains/Mechpt.dmm @@ -22,8 +22,8 @@ "f" = ( /obj/structure/railing, /obj/structure/table/woodentable, -/obj/item/cell/high, -/obj/item/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/template_noop, /area/submap/Mechpt) "g" = ( @@ -111,8 +111,8 @@ icon_state = "railing0" }, /obj/structure/table/woodentable, -/obj/item/cell/high, -/obj/item/cell/device/weapon, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/device/weapon, /turf/template_noop, /area/submap/Mechpt) "v" = ( diff --git a/maps/submaps/surface_submaps/plains/Peninsula.dmm b/maps/submaps/surface_submaps/plains/Peninsula.dmm index 58fa992355..b1202bb574 100644 --- a/maps/submaps/surface_submaps/plains/Peninsula.dmm +++ b/maps/submaps/surface_submaps/plains/Peninsula.dmm @@ -5,7 +5,7 @@ "e" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/Peninsula) "f" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/Peninsula) "g" = (/obj/structure/table/woodentable,/obj/item/flashlight,/turf/template_noop,/area/submap/Peninsula) -"h" = (/obj/structure/table/woodentable,/obj/item/cell/device,/obj/item/cell/device,/obj/random/tech_supply/anom,/turf/template_noop,/area/submap/Peninsula) +"h" = (/obj/structure/table/woodentable,/obj/item/stock_parts/cell/device,/obj/item/stock_parts/cell/device,/obj/random/tech_supply/anom,/turf/template_noop,/area/submap/Peninsula) "i" = (/obj/structure/bonfire,/turf/template_noop,/area/submap/Peninsula) "j" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/template_noop) diff --git a/maps/submaps/surface_submaps/plains/PooledR.dmm b/maps/submaps/surface_submaps/plains/PooledR.dmm index 3fb5a8df75..838cb0341b 100644 --- a/maps/submaps/surface_submaps/plains/PooledR.dmm +++ b/maps/submaps/surface_submaps/plains/PooledR.dmm @@ -5,7 +5,7 @@ "e" = (/obj/structure/table/woodentable,/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/gun/energy/retro{cell_type = /obj/item/cell/device/weapon/empty},/turf/template_noop,/area/submap/PooledR) +"h" = (/obj/structure/table/woodentable,/obj/item/gun/energy/retro{cell_type = /obj/item/stock_parts/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/SupplyDrop2.dmm b/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm index e12b8a2af4..b0b0dc1e80 100644 --- a/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm +++ b/maps/submaps/surface_submaps/plains/SupplyDrop2.dmm @@ -6,7 +6,7 @@ "f" = (/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2) "g" = (/obj/structure/loot_pile/maint/junk,/obj/random/maintenance/anom,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2) "h" = (/obj/item/flashlight,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2) -"i" = (/obj/structure/loot_pile/maint/technical,/obj/item/gps/internal/poi,/obj/item/cell/device/weapon/empty,/obj/item/cell/device/weapon/empty,/obj/random/ammo,/turf/simulated/floor/plating,/area/submap/SupplyDrop2) +"i" = (/obj/structure/loot_pile/maint/technical,/obj/item/gps/internal/poi,/obj/item/stock_parts/cell/device/weapon/empty,/obj/item/stock_parts/cell/device/weapon/empty,/obj/random/ammo,/turf/simulated/floor/plating,/area/submap/SupplyDrop2) "j" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2) "k" = (/obj/structure/girder,/turf/template_noop,/area/submap/SupplyDrop2) "l" = (/obj/structure/loot_pile/maint/trash,/obj/random/energy/sec,/turf/simulated/floor/reinforced,/area/submap/SupplyDrop2) diff --git a/maps/submaps/surface_submaps/plains/Thiefc.dmm b/maps/submaps/surface_submaps/plains/Thiefc.dmm index 3e73ae1080..93739b465c 100644 --- a/maps/submaps/surface_submaps/plains/Thiefc.dmm +++ b/maps/submaps/surface_submaps/plains/Thiefc.dmm @@ -12,7 +12,7 @@ "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/cell/device/weapon,/obj/item/cell/device/weapon,/obj/random/ammo,/obj/random/ammo,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) +"o" = (/obj/structure/closet/crate,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/cell/device/weapon,/obj/random/ammo,/obj/random/ammo,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) "p" = (/obj/structure/closet/crate,/obj/item/storage/box/shotgunammo,/obj/item/storage/box/practiceshells,/obj/random/projectile/scrapped_gun,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) "D" = (/obj/random/multiple/corp_crate,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) "U" = (/obj/random/contraband,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/Thiefc) diff --git a/maps/submaps/surface_submaps/plains/house1.dmm b/maps/submaps/surface_submaps/plains/house1.dmm index 6280f10a48..11e5f11a21 100644 --- a/maps/submaps/surface_submaps/plains/house1.dmm +++ b/maps/submaps/surface_submaps/plains/house1.dmm @@ -44,7 +44,7 @@ "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/cell/device,/obj/item/cell/device,/obj/item/cell/device,/obj/item/clothing/under/explorer/armored,/obj/item/clothing/accessory/armor/armorplate/tactical,/turf/simulated/floor/wood,/area/submap/house1) +"aU" = (/obj/structure/table/rack,/obj/item/stock_parts/cell/device,/obj/item/stock_parts/cell/device,/obj/item/stock_parts/cell/device,/obj/item/clothing/under/explorer/armored,/obj/item/clothing/accessory/armor/armorplate/tactical,/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) diff --git a/maps/submaps/surface_submaps/plains/house1_arealess.dmm b/maps/submaps/surface_submaps/plains/house1_arealess.dmm index 72fa8bce8a..9765570589 100644 --- a/maps/submaps/surface_submaps/plains/house1_arealess.dmm +++ b/maps/submaps/surface_submaps/plains/house1_arealess.dmm @@ -44,7 +44,7 @@ "aR" = (/obj/structure/simple_door/wood,/turf/simulated/floor/carpet/sblucarpet,/area/template_noop) "aS" = (/turf/simulated/floor/carpet/sblucarpet,/area/template_noop) "aT" = (/obj/machinery/space_heater,/turf/simulated/floor/carpet/sblucarpet,/area/template_noop) -"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/template_noop) +"aU" = (/obj/structure/table/rack,/obj/item/clothing/under/explorer,/obj/item/stock_parts/cell/device,/obj/item/stock_parts/cell/device,/obj/item/stock_parts/cell/device,/turf/simulated/floor/wood,/area/template_noop) "aV" = (/obj/item/flashlight/lantern,/turf/simulated/floor/wood,/area/template_noop) "aW" = (/obj/machinery/space_heater,/turf/simulated/floor/wood,/area/template_noop) "aX" = (/obj/structure/coatrack,/turf/simulated/floor/wood,/area/template_noop) diff --git a/maps/submaps/surface_submaps/plains/lonehome.dmm b/maps/submaps/surface_submaps/plains/lonehome.dmm index a6074d7808..f83e88316a 100644 --- a/maps/submaps/surface_submaps/plains/lonehome.dmm +++ b/maps/submaps/surface_submaps/plains/lonehome.dmm @@ -136,7 +136,7 @@ "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/spawner/gibs/human,/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) +"Tw" = (/obj/item/stock_parts/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/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) diff --git a/maps/submaps/surface_submaps/plains/methlab.dmm b/maps/submaps/surface_submaps/plains/methlab.dmm index 0ba1fa0214..058ed25962 100644 --- a/maps/submaps/surface_submaps/plains/methlab.dmm +++ b/maps/submaps/surface_submaps/plains/methlab.dmm @@ -24,7 +24,7 @@ /turf/template_noop, /area/submap/methlab) "bA" = ( -/obj/item/cell/hyper, +/obj/item/stock_parts/cell/hyper, /turf/simulated/floor/tiled/steel_dirty, /area/submap/methlab) "bJ" = ( diff --git a/maps/submaps/surface_submaps/plains/oldhotel.dmm b/maps/submaps/surface_submaps/plains/oldhotel.dmm index cb31c1aeec..268798c371 100644 --- a/maps/submaps/surface_submaps/plains/oldhotel.dmm +++ b/maps/submaps/surface_submaps/plains/oldhotel.dmm @@ -31,7 +31,7 @@ "lj" = (/obj/structure/table/wooden_reinforced,/obj/item/material/kitchen/rollingpin,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/oldhotel) "ly" = (/obj/structure/bed/double/padded,/obj/item/bedsheet/mimedouble,/turf/simulated/floor/wood,/area/submap/oldhotel) "lZ" = (/obj/structure/table/woodentable,/obj/item/trash/tray,/turf/simulated/floor/carpet/blue,/area/submap/oldhotel) -"mr" = (/obj/structure/table/woodentable,/obj/item/cell/hyper,/turf/simulated/floor/wood,/area/submap/oldhotel) +"mr" = (/obj/structure/table/woodentable,/obj/item/stock_parts/cell/hyper,/turf/simulated/floor/wood,/area/submap/oldhotel) "mR" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/submap/oldhotel) "nD" = (/turf/simulated/floor,/area/submap/oldhotel) "nG" = (/obj/item/material/shard,/turf/simulated/floor/outdoors/dirt,/area/submap/oldhotel) diff --git a/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm b/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm index da3a284840..d1f6bcdafe 100644 --- a/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm +++ b/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm @@ -25,7 +25,7 @@ "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{start_anomalous = 1},/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) +"B" = (/obj/structure/table/steel_reinforced,/obj/item/radio,/obj/machinery/power/apc{cell_type = /obj/item/stock_parts/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/gps/internal/poi,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "E" = (/obj/machinery/biogenerator,/turf/simulated/floor/wood,/area/submap/DJOutpost1) diff --git a/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm b/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm index 2064e1a907..8772651b0a 100644 --- a/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm +++ b/maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm @@ -26,7 +26,7 @@ "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) +"aC" = (/obj/structure/table/steel_reinforced,/obj/item/radio,/obj/machinery/power/apc{cell_type = /obj/item/stock_parts/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/gun/energy/ionrifle/pistol,/obj/item/bone/skull/unknown,/obj/item/bone,/obj/item/bone/ribs,/turf/simulated/floor/tiled/techfloor,/area/submap/DJOutpost1) diff --git a/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm b/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm index 330a147800..9cf2703979 100644 --- a/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm +++ b/maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm @@ -34,7 +34,7 @@ "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) +"aK" = (/obj/structure/table/steel_reinforced,/obj/item/radio,/obj/machinery/power/apc{cell_type = /obj/item/stock_parts/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/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) diff --git a/maps/submaps/surface_submaps/wilderness/DoomP.dmm b/maps/submaps/surface_submaps/wilderness/DoomP.dmm index e7fbc58034..3e49fc25f4 100644 --- a/maps/submaps/surface_submaps/wilderness/DoomP.dmm +++ b/maps/submaps/surface_submaps/wilderness/DoomP.dmm @@ -375,8 +375,8 @@ /area/submap/DoomP) "bq" = ( /obj/structure/table/rack, -/obj/item/cell/device/weapon, -/obj/item/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon, /obj/random/multiple/gun/projectile/handgun, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) diff --git a/maps/submaps/surface_submaps/wilderness/Lab1.dmm b/maps/submaps/surface_submaps/wilderness/Lab1.dmm index 55c1c58aab..ffb89a4467 100644 --- a/maps/submaps/surface_submaps/wilderness/Lab1.dmm +++ b/maps/submaps/surface_submaps/wilderness/Lab1.dmm @@ -14,11 +14,11 @@ "n" = (/obj/machinery/vending/tool,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "o" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/shoes/boots/winter,/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "p" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/clothing/shoes/boots/winter,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) -"q" = (/obj/structure/table/standard,/obj/random/toolbox,/obj/item/cell/super,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) +"q" = (/obj/structure/table/standard,/obj/random/toolbox,/obj/item/stock_parts/cell/super,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "r" = (/obj/structure/closet/toolcloset,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "s" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "t" = (/obj/structure/bed,/obj/item/bedsheet/brown,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) -"u" = (/obj/machinery/power/apc{cell_type = /obj/item/cell/hyper; dir = 8; name = "Unknown APC"; operating = 0; pixel_x = -24},/obj/structure/cable{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) +"u" = (/obj/machinery/power/apc{cell_type = /obj/item/stock_parts/cell/hyper; dir = 8; name = "Unknown APC"; operating = 0; pixel_x = -24},/obj/structure/cable{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "v" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "w" = (/obj/machinery/power/smes/buildable/point_of_interest,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "x" = (/obj/structure/table/standard,/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) @@ -33,7 +33,7 @@ "G" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "H" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "I" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) -"J" = (/obj/item/cell/super,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) +"J" = (/obj/item/stock_parts/cell/super,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "K" = (/obj/machinery/pros_fabricator,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "L" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "M" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/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 0a181efc90..6d774dc943 100644 --- a/maps/submaps/surface_submaps/wilderness/MCamp1.dmm +++ b/maps/submaps/surface_submaps/wilderness/MCamp1.dmm @@ -168,7 +168,7 @@ /turf/simulated/floor/concrete, /area/submap/MilitaryCamp1) "P" = ( -/obj/item/cell/device/weapon/empty, +/obj/item/stock_parts/cell/device/weapon/empty, /turf/simulated/floor/concrete, /area/submap/MilitaryCamp1) "V" = ( @@ -176,7 +176,7 @@ /area/submap/MilitaryCamp1) "Z" = ( /mob/living/simple_mob/mechanical/viscerator, -/obj/item/cell/device/weapon/empty, +/obj/item/stock_parts/cell/device/weapon/empty, /turf/simulated/floor/concrete, /area/submap/MilitaryCamp1) diff --git a/maps/submaps/surface_submaps/wilderness/Manor1.dmm b/maps/submaps/surface_submaps/wilderness/Manor1.dmm index c1cfdd8c1b..acea4133fd 100644 --- a/maps/submaps/surface_submaps/wilderness/Manor1.dmm +++ b/maps/submaps/surface_submaps/wilderness/Manor1.dmm @@ -104,7 +104,7 @@ "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/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/cell/device/weapon,/obj/item/cell/device/weapon,/obj/random/medical,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1) +"cc" = (/obj/structure/closet/cabinet,/obj/item/stock_parts/cell/device/weapon,/obj/item/stock_parts/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) diff --git a/maps/submaps/surface_submaps/wilderness/Rockybase.dmm b/maps/submaps/surface_submaps/wilderness/Rockybase.dmm index 3deccb98ea..f648dde979 100644 --- a/maps/submaps/surface_submaps/wilderness/Rockybase.dmm +++ b/maps/submaps/surface_submaps/wilderness/Rockybase.dmm @@ -336,7 +336,7 @@ /obj/structure/table/rack, /obj/item/storage/box/shotgunshells, /obj/item/storage/box/shotgunshells, -/obj/item/cell/device/weapon, +/obj/item/stock_parts/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/submap/Rockybase) "bi" = ( @@ -943,7 +943,7 @@ /area/submap/Rockybase) "de" = ( /obj/machinery/power/apc{ - cell_type = /obj/item/cell/super; + cell_type = /obj/item/stock_parts/cell/super; dir = 8; name = "Unknown APC"; pixel_x = -24 diff --git a/maps/submaps/surface_submaps/wilderness/borglab.dmm b/maps/submaps/surface_submaps/wilderness/borglab.dmm index aebe856e70..4bc99d6474 100644 --- a/maps/submaps/surface_submaps/wilderness/borglab.dmm +++ b/maps/submaps/surface_submaps/wilderness/borglab.dmm @@ -242,7 +242,7 @@ /obj/item/reagent_containers/food/snacks/burrito_cheese, /obj/effect/floor_decal/rust, /obj/effect/floor_decal/rust, -/obj/item/cell/super/empty, +/obj/item/stock_parts/cell/super/empty, /turf/simulated/floor/tiled, /area/submap/BorgLab) "gh" = ( diff --git a/maps/submaps/surface_submaps/wilderness/derelictengine.dmm b/maps/submaps/surface_submaps/wilderness/derelictengine.dmm index 508bc29f70..6d3f40e517 100644 --- a/maps/submaps/surface_submaps/wilderness/derelictengine.dmm +++ b/maps/submaps/surface_submaps/wilderness/derelictengine.dmm @@ -58,7 +58,7 @@ "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/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]"; start_anomalous = 1},/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) +"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/stock_parts/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) @@ -215,7 +215,7 @@ "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/paper/alien,/obj/item/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/stock_parts/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) diff --git a/maps/submaps/surface_submaps/wilderness/kururakden.dmm b/maps/submaps/surface_submaps/wilderness/kururakden.dmm index eb8c532984..e145cc2c3b 100644 --- a/maps/submaps/surface_submaps/wilderness/kururakden.dmm +++ b/maps/submaps/surface_submaps/wilderness/kururakden.dmm @@ -8,7 +8,7 @@ "h" = (/obj/random/junk,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/KururakDen) "i" = (/obj/random/powercell,/obj/random/unidentified_medicine/old_medicine,/obj/random/trash,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/KururakDen) "j" = (/obj/random/humanoidremains,/obj/random/coin,/obj/random/contraband,/obj/random/projectile/random,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/KururakDen) -"P" = (/obj/random/mob/sif/kururak,/obj/item/cell/device/weapon/recharge,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/KururakDen) +"P" = (/obj/random/mob/sif/kururak,/obj/item/stock_parts/cell/device/weapon/recharge,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/KururakDen) (1,1,1) = {" aaaaaaaaaa