| [I.registered_name] ([I.assignment]) | " //ijob does not get displayed, nor does it take up space, it's just used for the positioning of an entry
else
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index bb16ba4c47c..c1fa0980810 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -22,6 +22,15 @@ Buildable meters
#define PIPE_HEAT_EXCHANGE 17
#define PIPE_DVALVE 18
#define PIPE_4WAYMANIFOLD 19
+//Disposal piping numbers - do NOT hardcode these, use the defines
+#define DISP_PIPE_STRAIGHT 0
+#define DISP_PIPE_BENT 1
+#define DISP_JUNCTION 2
+#define DISP_YJUNCTION 3
+#define DISP_END_TRUNK 4
+#define DISP_END_BIN 5
+#define DISP_END_OUTLET 6
+#define DISP_END_CHUTE 7
/obj/item/pipe
name = "pipe"
@@ -95,6 +104,28 @@ Buildable meters
src.pixel_y = rand(-5, 5)
//update the name and icon of the pipe item depending on the type
+var/global/list/pipeID2State = list(
+ "simple", \
+ "simple", \
+ "he", \
+ "he", \
+ "connector", \
+ "manifold", \
+ "junction", \
+ "uvent", \
+ "mvalve", \
+ "pump", \
+ "scrubber", \
+ "insulated", \
+ "insulated", \
+ "filter", \
+ "mixer", \
+ "passivegate", \
+ "volumepump", \
+ "heunary", \
+ "dvalve", \
+ "manifold4w", \
+)
/obj/item/pipe/proc/update()
var/list/nlist = list( \
@@ -120,29 +151,7 @@ Buildable meters
"4-way manifold", \
)
name = nlist[pipe_type+1] + " fitting"
- var/list/islist = list( \
- "simple", \
- "simple", \
- "he", \
- "he", \
- "connector", \
- "manifold", \
- "junction", \
- "uvent", \
- "mvalve", \
- "pump", \
- "scrubber", \
- "insulated", \
- "insulated", \
- "filter", \
- "mixer", \
- "passivegate", \
- "volumepump", \
- "heunary", \
- "dvalve", \
- "manifold4w", \
- )
- icon_state = islist[pipe_type + 1]
+ icon_state = pipeID2State[pipe_type + 1]
//called when a turf is attacked with a pipe item
// place the pipe on the turf, setting pipe level to 1 (underfloor) if the turf is not intact
@@ -423,24 +432,3 @@ Buildable meters
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user << "You have fastened the meter to the pipe."
qdel(src)
-
-#undef PIPE_SIMPLE_STRAIGHT
-#undef PIPE_SIMPLE_BENT
-#undef PIPE_HE_STRAIGHT
-#undef PIPE_HE_BENT
-#undef PIPE_CONNECTOR
-#undef PIPE_MANIFOLD
-#undef PIPE_JUNCTION
-#undef PIPE_UVENT
-#undef PIPE_MVALVE
-#undef PIPE_PUMP
-#undef PIPE_SCRUBBER
-#undef PIPE_INSULATED_STRAIGHT
-#undef PIPE_INSULATED_BENT
-#undef PIPE_GAS_FILTER
-#undef PIPE_GAS_MIXER
-#undef PIPE_PASSIVE_GATE
-#undef PIPE_VOLUME_PUMP
-#undef PIPE_OUTLET_INJECT
-#undef PIPE_DVALVE
-#undef PIPE_4WAYMANIFOLD
\ No newline at end of file
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index e409a1bc686..5c3b993beec 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -119,7 +119,7 @@
if(/obj/item/weapon/gun/energy/lasercannon)
iconholder = 1
- if(/obj/item/weapon/gun/energy/taser)
+ if(/obj/item/weapon/gun/energy/gun/advtaser)
eprojectile = /obj/item/projectile/beam
eshot_sound = 'sound/weapons/Laser.ogg'
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 62c7846c807..743da789536 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -168,7 +168,7 @@
O:icon_state = "flash"
// Engineering
// Security
- if(istype(O,/obj/item/weapon/gun/energy/taser/cyborg))
+ if(istype(O,/obj/item/weapon/gun/energy/gun/advtaser/cyborg))
if(O:power_supply.charge < O:power_supply.maxcharge)
var/obj/item/weapon/gun/energy/G = O
var/obj/item/ammo_casing/energy/S = G.ammo_type[G.select]
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index e1b0d3ef1e4..1021962de57 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -767,7 +767,7 @@
products = list(/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 4,
/obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4,
/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12,/obj/item/weapon/reagent_containers/hypospray/medipen = 5,
- /obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2)
+ /obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2, /obj/item/device/sensor_device = 2)
contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/antitox = 6)
@@ -877,7 +877,8 @@
/obj/item/clothing/suit/wizrobe/fake = 1,/obj/item/clothing/head/wizard/fake = 1,/obj/item/weapon/staff = 3,/obj/item/clothing/mask/gas/sexyclown = 1,
/obj/item/clothing/under/sexyclown = 1,/obj/item/clothing/mask/gas/sexymime = 1,/obj/item/clothing/under/sexymime = 1,/obj/item/clothing/suit/apron/overalls = 1,
/obj/item/clothing/head/rabbitears =1, /obj/item/clothing/head/sombrero = 1, /obj/item/clothing/head/sombrero/green = 1, /obj/item/clothing/suit/poncho = 1,
- /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1, /obj/item/clothing/tie/blue = 1, /obj/item/clothing/tie/red = 1, /obj/item/clothing/tie/black = 1, /obj/item/clothing/tie/horrible = 1)
+ /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1, /obj/item/clothing/tie/blue = 1, /obj/item/clothing/tie/red = 1, /obj/item/clothing/tie/black = 1, /obj/item/clothing/tie/horrible = 1,
+ /obj/item/clothing/under/maid = 1, /obj/item/clothing/under/janimaid = 1)
contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1)
premium = list(/obj/item/clothing/suit/hgpirate = 1, /obj/item/clothing/head/hgpiratecap = 1, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/weapon/shield/riot/roman = 1)
refill_canister = /obj/item/weapon/vending_refill/autodrobe
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 73b14346a40..5d4b86c77da 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -26,7 +26,7 @@
/obj/item/weapon/gun/projectile/automatic/pistol = 8,
/obj/item/weapon/gun/projectile/shotgun/combat = 5,
/obj/item/weapon/gun/projectile/revolver/mateba,
- /obj/item/weapon/gun/projectile/automatic/deagle
+ /obj/item/weapon/gun/projectile/automatic/pistol/deagle
)
/obj/effect/spawner/lootdrop/maintenance
diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
index 96d2f3ff66d..f6369e0c1af 100644
--- a/code/game/objects/effects/step_triggers.dm
+++ b/code/game/objects/effects/step_triggers.dm
@@ -3,6 +3,7 @@
/obj/effect/step_trigger
var/affect_ghosts = 0
var/stopper = 1 // stops throwers
+ var/mobs_only = 0
invisibility = 101 // nope cant see this shit
anchored = 1
@@ -15,10 +16,11 @@
return
if(istype(H, /mob/dead/observer) && !affect_ghosts)
return
+ if(!istype(H, /mob) && mobs_only)
+ return
Trigger(H)
-
/* Tosses things in a certain direction */
/obj/effect/step_trigger/thrower
@@ -114,3 +116,30 @@
A.x = rand(teleport_x, teleport_x_offset)
A.y = rand(teleport_y, teleport_y_offset)
A.z = rand(teleport_z, teleport_z_offset)
+
+
+/* Simple sound player, Mapper friendly! */
+
+/obj/effect/step_trigger/sound_effect
+ var/sound //eg. path to the sound, inside '' eg: 'growl.ogg'
+ var/volume = 100
+ var/freq_vary = 1 //Should the frequency of the sound vary?
+ var/extra_range = 0 // eg World.view = 7, extra_range = 1, 7+1 = 8, 8 turfs radius
+ var/happens_once = 0
+ var/triggerer_only = 0 //Whether the triggerer is the only person who hears this
+
+
+/obj/effect/step_trigger/sound_effect/Trigger(var/atom/movable/A)
+ var/turf/T = get_turf(A)
+
+ if(!T)
+ return
+
+ if(triggerer_only)
+ A.playsound_local(T, sound, volume, freq_vary)
+ else
+ playsound(T, sound, volume, freq_vary, extra_range)
+
+ if(happens_once)
+ qdel(src)
+
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index ab970a7db47..83face5668a 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -170,8 +170,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition with a transparent case."
note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition!"
-/obj/item/device/pda/chef
- icon_state = "pda-chef"
+/obj/item/device/pda/cook
+ icon_state = "pda-cook"
/obj/item/device/pda/bar
icon_state = "pda-bartender"
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
new file mode 100644
index 00000000000..2bcddf5de79
--- /dev/null
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -0,0 +1,11 @@
+/obj/item/device/sensor_device
+ name = "handheld crew monitor" //Thanks to Gun Hog for the name!
+ desc = "A miniature machine that tracks suit sensors across the station."
+ icon = 'icons/obj/device.dmi'
+ icon_state = "scanner"
+ w_class = 2.0
+ slot_flags = SLOT_BELT
+ origin_tech = "programming=3;materials=3;magnets=3"
+
+/obj/item/device/sensor_device/attack_self(mob/user as mob)
+ crewmonitor(user,src) //Proc already exists, just had to call it
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 64951705275..00ea33f28ef 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -10,8 +10,6 @@
var/valve_open = 0
var/toggle = 1
-/obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D)
-
/obj/item/device/transfer_valve/IsAssemblyHolder()
return 1
@@ -44,7 +42,7 @@
user << "The device is secured."
return
if(attached_device)
- user << "There is already an device attached to the valve, remove it first."
+ user << "There is already a device attached to the valve, remove it first."
return
user.remove_from_mob(item)
attached_device = A
@@ -114,7 +112,7 @@
return
return
-/obj/item/device/transfer_valve/process_activation(var/obj/item/device/D)
+/obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D)
if(toggle)
toggle = 0
toggle_valve()
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index a3fb7b85c82..10adc58768c 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -113,7 +113,7 @@
usr << "There's no mounting point for the module!"
return 0
- var/obj/item/weapon/gun/energy/taser/cyborg/T = locate() in R.module
+ var/obj/item/weapon/gun/energy/gun/advtaser/cyborg/T = locate() in R.module
if(!T)
T = locate() in R.module.contents
if(!T)
diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm
new file mode 100644
index 00000000000..799f1e823ae
--- /dev/null
+++ b/code/game/objects/items/weapons/RPD.dm
@@ -0,0 +1,553 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
+/*
+CONTAINS:
+RPD
+*/
+#define PIPE_BINARY 0
+#define PIPE_BENT 1
+#define PIPE_TRINARY 2
+#define PIPE_TRIN_M 3
+#define PIPE_UNARY 4
+
+#define PAINT_MODE -2
+#define EATING_MODE -1
+#define ATMOS_MODE 0
+#define METER_MODE 1
+#define DISPOSALS_MODE 2
+
+/datum/pipe_info
+ var/id=-1
+ var/dir=SOUTH
+ var/dirtype=PIPE_BINARY
+ var/icon = 'icons/obj/pipe-item.dmi'
+ var/icon_state=""
+ var/selected=0
+
+/datum/pipe_info/New(var/pid,var/direction,var/dt)
+ src.id=pid
+ src.icon_state=pipeID2State[pid+1]
+ src.dir=direction
+ src.dirtype=dt
+
+/datum/pipe_info/proc/Render(var/dispenser,var/label)
+ return "[label]"
+
+/datum/pipe_info/meter
+ icon = 'icons/obj/pipes.dmi'
+ icon_state = "meterX"
+
+/datum/pipe_info/meter/New()
+ return
+
+/datum/pipe_info/meter/Render(var/dispenser,var/label)
+ return "[label]" //hardcoding is no
+
+var/global/list/disposalpipeID2State=list(
+ "pipe-s",
+ "pipe-c",
+ "pipe-j1",
+ "pipe-j2",
+ "pipe-y",
+ "pipe-t",
+ "condisposal",
+ "outlet",
+ "intake",
+ "pipe-j1s",
+ "pipe-j2s"
+)
+
+/datum/pipe_info/disposal
+ icon = 'icons/obj/pipes/disposal.dmi'
+ icon_state = "meterX"
+
+/datum/pipe_info/disposal/New(var/pid,var/dt)
+ src.id=pid
+ src.icon_state=disposalpipeID2State[pid+1]
+ src.dir=2
+ src.dirtype=dt
+ if(pid<6 || pid>8)
+ icon_state = "con[icon_state]"
+
+/datum/pipe_info/disposal/Render(var/dispenser,var/label)
+ return "[label]" //avoid hardcoding.
+
+//find these defines in code\game\machinery\pipe\consruction.dm
+var/global/list/RPD_recipes=list(
+ "Regular Pipes" = list(
+ "Pipe" = new /datum/pipe_info(PIPE_SIMPLE_STRAIGHT, 1, PIPE_BINARY),
+ "Bent Pipe" = new /datum/pipe_info(PIPE_SIMPLE_BENT, 5, PIPE_BENT),
+ "Manifold" = new /datum/pipe_info(PIPE_MANIFOLD, 1, PIPE_TRINARY),
+ "Manual Valve" = new /datum/pipe_info(PIPE_MVALVE, 1, PIPE_BINARY),
+ "Digital Valve" = new /datum/pipe_info(PIPE_DVALVE, 1, PIPE_BINARY),
+ "4-Way Manifold" = new /datum/pipe_info(PIPE_4WAYMANIFOLD, 1, PIPE_BINARY),
+ ),
+ "Devices"=list(
+ "Connector" = new /datum/pipe_info(PIPE_CONNECTOR, 1, PIPE_UNARY),
+ "Unary Vent" = new /datum/pipe_info(PIPE_UVENT, 1, PIPE_UNARY),
+ "Gas Pump" = new /datum/pipe_info(PIPE_PUMP, 1, PIPE_UNARY),
+ "Passive Gate" = new /datum/pipe_info(PIPE_PASSIVE_GATE, 1, PIPE_UNARY),
+ "Volume Pump" = new /datum/pipe_info(PIPE_VOLUME_PUMP, 1, PIPE_UNARY),
+ "Scrubber" = new /datum/pipe_info(PIPE_SCRUBBER, 1, PIPE_UNARY),
+ "Meter" = new /datum/pipe_info/meter(),
+ "Gas Filter" = new /datum/pipe_info(PIPE_GAS_FILTER, 1, PIPE_TRIN_M),
+ "Gas Mixer" = new /datum/pipe_info(PIPE_GAS_MIXER, 1, PIPE_TRIN_M),
+// "Injector" = new /datum/pipe_info(PIPE_INJECTOR, 1, PIPE_UNARY),
+ ),
+ "Heat Exchange" = list(
+ "Pipe" = new /datum/pipe_info(PIPE_HE_STRAIGHT, 1, PIPE_BINARY),
+ "Bent Pipe" = new /datum/pipe_info(PIPE_HE_BENT, 5, PIPE_BENT),
+ "Junction" = new /datum/pipe_info(PIPE_JUNCTION, 1, PIPE_UNARY),
+ "Heat Exchanger" = new /datum/pipe_info(PIPE_HEAT_EXCHANGE, 1, PIPE_UNARY),
+ ),
+ "Insulated Pipes" = list(
+ "Pipe" = new /datum/pipe_info(PIPE_INSULATED_STRAIGHT,1, PIPE_BINARY),
+ "Bent Pipe" = new /datum/pipe_info(PIPE_INSULATED_BENT, 5, PIPE_BENT),
+ ),
+ "Disposal Pipes" = list(
+ "Pipe" = new /datum/pipe_info/disposal(DISP_PIPE_STRAIGHT, PIPE_BINARY),
+ "Bent Pipe" = new /datum/pipe_info/disposal(DISP_PIPE_BENT, PIPE_BENT),
+ "Junction" = new /datum/pipe_info/disposal(DISP_JUNCTION, PIPE_TRINARY),
+ "Y-Junction" = new /datum/pipe_info/disposal(DISP_YJUNCTION, PIPE_TRINARY),
+ "Trunk" = new /datum/pipe_info/disposal(DISP_END_TRUNK, PIPE_TRINARY),
+ "Bin" = new /datum/pipe_info/disposal(DISP_END_BIN, PIPE_UNARY),
+ "Outlet" = new /datum/pipe_info/disposal(DISP_END_OUTLET, PIPE_UNARY),
+ "Chute" = new /datum/pipe_info/disposal(DISP_END_CHUTE, PIPE_UNARY),
+ )
+)
+/obj/item/weapon/pipe_dispenser
+ name = "Rapid Piping Device (RPD)"
+ desc = "A device used to rapidly pipe things."
+ icon = 'icons/obj/items.dmi'
+ icon_state = "rpd"
+ opacity = 0
+ density = 0
+ anchored = 0.0
+ flags = CONDUCT
+ force = 10.0
+ throwforce = 10.0
+ throw_speed = 1
+ throw_range = 5
+ w_class = 3.0
+ m_amt = 75000
+ g_amt = 37500
+ origin_tech = "engineering=4;materials=2"
+ var/datum/effect/effect/system/spark_spread/spark_system
+ var/working = 0
+ var/p_type = 0
+ var/p_conntype = 0
+ var/p_dir = 1
+ var/p_class = ATMOS_MODE
+ var/p_disposal = 0
+ var/list/paint_colors = list(
+ "grey" = "#cccccc",
+ "red" = "#800000",
+ "blue" = "#000080",
+ "cyan" = "#1C94C4",
+ "green" = "#00CC00",
+ "yellow" = "#FFCC00",
+ "purple" = "#822BFF"
+ )
+ var/paint_color="grey"
+
+/obj/item/weapon/pipe_dispenser/New()
+ . = ..()
+ spark_system = new /datum/effect/effect/system/spark_spread
+ spark_system.set_up(5, 0, src)
+ spark_system.attach(src)
+
+/obj/item/weapon/pipe_dispenser/attack_self(mob/user as mob)
+ show_menu(user)
+
+/obj/item/weapon/pipe_dispenser/proc/render_dir_img(var/_dir,var/pic,var/title)
+ var/selected=""
+ if(_dir == p_dir)
+ selected=" class=\"selected\""
+ return "![](\"[pic]\")
"
+
+/obj/item/weapon/pipe_dispenser/proc/show_menu(mob/user as mob)
+ if(!user || !src) return 0
+ var/dat = {"Type
+Utilities:
+"}
+ var/icon/preview=null
+ for(var/category in RPD_recipes)
+ dat += "[category]:"
+ var/list/cat=RPD_recipes[category]
+ for(var/label in cat)
+ var/datum/pipe_info/I = cat[label]
+ var/found=0
+ if(I.id == p_type)
+ if(p_class==ATMOS_MODE && I.type==/datum/pipe_info)
+ found=1
+ else if(p_class==DISPOSALS_MODE && I.type==/datum/pipe_info/disposal)
+ found=1
+ if(found)
+ preview=new /icon(I.icon,I.icon_state)
+ dat += I.Render(src,label)
+ dat += "
"
+
+ var/color_css=""
+ var/color_picker=""
+ for(var/color_name in paint_colors)
+ var/color=paint_colors[color_name]
+ color_css += {"
+ a.color.[color_name] {
+ color: [color];
+ }
+ a.color.[color_name]:hover {
+ border:1px solid [color];
+ }
+ a.color.[color_name].selected {
+ background-color: [color];
+ }
+ "}
+ var/selected=""
+ if(color_name==paint_color)
+ selected = " selected"
+ color_picker += {"•"}
+
+ var/dirsel="Direction
"
+ switch(p_conntype)
+ if(-1)
+ if(p_class==PAINT_MODE)
+ dirsel = "Direction
[color_picker]"
+
+ if(PIPE_BINARY) // Straight, N-S, W-E
+ if(preview)
+ user << browse_rsc(new /icon(preview, dir=NORTH), "vertical.png")
+ user << browse_rsc(new /icon(preview, dir=EAST), "horizontal.png")
+
+ dirsel += ""
+ dirsel += render_dir_img(1,"vertical.png","Vertical")
+ dirsel += render_dir_img(4,"horizontal.png","Horizontal")
+ dirsel += "
"
+ else
+ dirsel+={"
+
+ ↕
+ ↔
+
+ "}
+ if(PIPE_BENT) // Bent, N-W, N-E etc
+ if(preview)
+ user << browse_rsc(new /icon(preview, dir=NORTHWEST), "nw.png")
+ user << browse_rsc(new /icon(preview, dir=NORTHEAST), "ne.png")
+ user << browse_rsc(new /icon(preview, dir=SOUTHWEST), "sw.png")
+ user << browse_rsc(new /icon(preview, dir=SOUTHEAST), "se.png")
+
+ dirsel += ""
+ dirsel += render_dir_img(9,"nw.png","West to North")
+ dirsel += render_dir_img(5,"ne.png","North to East")
+ dirsel += "
"
+ dirsel += render_dir_img(10,"sw.png","South to West")
+ dirsel += render_dir_img(6,"se.png","East to South")
+ dirsel += "
"
+ else
+ dirsel+={"
+
+ ╝
+ ╚
+
+ ╗
+ ╔
+
+ "}
+ if(PIPE_TRINARY) // Manifold
+ if(preview)
+ user << browse_rsc(new /icon(preview, dir=NORTH), "s.png")
+ user << browse_rsc(new /icon(preview, dir=EAST), "w.png")
+ user << browse_rsc(new /icon(preview, dir=SOUTH), "n.png")
+ user << browse_rsc(new /icon(preview, dir=WEST), "e.png")
+
+ dirsel += ""
+ dirsel += render_dir_img(1,"s.png","West South East")
+ dirsel += render_dir_img(4,"w.png","North West South")
+ dirsel += "
"
+ dirsel += render_dir_img(2,"n.png","East North West")
+ dirsel += render_dir_img(8,"e.png","South East North")
+ dirsel += "
"
+ else
+ dirsel+={"
+
+ ╦
+ ╣
+
+ ╩
+ ╠
+
+ "}
+ if(PIPE_TRIN_M) // Mirrored ones
+ if(preview)
+ user << browse_rsc(new /icon(preview, dir=NORTH), "s.png")
+ user << browse_rsc(new /icon(preview, dir=EAST), "w.png")
+ user << browse_rsc(new /icon(preview, dir=SOUTH), "n.png")
+ user << browse_rsc(new /icon(preview, dir=WEST), "e.png")
+ user << browse_rsc(new /icon(preview, dir=SOUTHEAST), "sm.png") //each mirror icon is 45 anticlockwise from it's real direction
+ user << browse_rsc(new /icon(preview, dir=NORTHEAST), "wm.png")
+ user << browse_rsc(new /icon(preview, dir=NORTHWEST), "nm.png")
+ user << browse_rsc(new /icon(preview, dir=SOUTHWEST), "em.png")
+
+ dirsel += ""
+ dirsel += render_dir_img(1,"s.png","West South East")
+ dirsel += render_dir_img(4,"w.png","North West South")
+ dirsel += "
"
+ dirsel += render_dir_img(2,"n.png","East North West")
+ dirsel += render_dir_img(8,"e.png","South East North")
+ dirsel += "
"
+ dirsel += render_dir_img(6,"sm.png","West South East")
+ dirsel += render_dir_img(5,"wm.png","North West South")
+ dirsel += "
"
+ dirsel += render_dir_img(9,"nm.png","East North West")
+ dirsel += render_dir_img(10,"em.png","South East North")
+ dirsel += "
"
+ else
+ dirsel+={"
+
+ ╦
+ ╣
+
+ ╩
+ ╠
+
+ ╦
+ ╣
+
+ ╩
+ ╠
+
+ "}
+ if(PIPE_UNARY) // Unary
+ if(preview)
+ user << browse_rsc(new /icon(preview, dir=NORTH), "n.png")
+ user << browse_rsc(new /icon(preview, dir=EAST), "e.png")
+ user << browse_rsc(new /icon(preview, dir=SOUTH), "s.png")
+ user << browse_rsc(new /icon(preview, dir=WEST), "w.png")
+
+ dirsel += ""
+ dirsel += render_dir_img(NORTH,"n.png","North")
+ dirsel += render_dir_img(EAST, "e.png","East")
+ dirsel += render_dir_img(SOUTH,"s.png","South")
+ dirsel += render_dir_img(WEST, "w.png","West")
+ dirsel += "
"
+ else
+ dirsel+={"
+
+ ↑
+ →
+ ↓
+ ←
+
+ "}
+
+ dat = {"
+
+
+ [name]
+
+
+
+[dirsel][dat]
+
+
+"}
+ user << browse(dat, "window=pipedispenser")
+ onclose(user, "pipedispenser")
+ return
+
+/obj/item/weapon/pipe_dispenser/Topic(href, href_list)
+ if(usr.stat || usr.restrained())
+ usr << browse(null, "window=pipedispenser")
+ return
+ usr.set_machine(src)
+ src.add_fingerprint(usr)
+ if(href_list["setdir"])
+ p_dir= text2num(href_list["setdir"])
+ show_menu(usr)
+
+ if(href_list["eatpipes"])
+ p_class = EATING_MODE
+ p_conntype=-1
+ p_dir=1
+ src.spark_system.start()
+ playsound(get_turf(src), 'sound/effects/pop.ogg', 50, 0)
+ show_menu(usr)
+
+ if(href_list["paintpipes"])
+ p_class = PAINT_MODE
+ p_conntype=-1
+ p_dir=1
+ src.spark_system.start()
+ playsound(get_turf(src), 'sound/effects/pop.ogg', 50, 0)
+ show_menu(usr)
+
+ if(href_list["set_color"])
+ paint_color=href_list["set_color"]
+ src.spark_system.start()
+ playsound(get_turf(src), 'sound/effects/pop.ogg', 50, 0)
+ show_menu(usr)
+
+ if(href_list["makepipe"])
+ p_type = text2num(href_list["makepipe"])
+ p_dir = text2num(href_list["dir"])
+ p_conntype = text2num(href_list["type"])
+ p_class = ATMOS_MODE
+ src.spark_system.start()
+ playsound(get_turf(src), 'sound/effects/pop.ogg', 50, 0)
+ show_menu(usr)
+
+ if(href_list["makemeter"])
+ p_class = METER_MODE
+ p_conntype=-1
+ p_dir=1
+ src.spark_system.start()
+ playsound(get_turf(src), 'sound/effects/pop.ogg', 50, 0)
+ show_menu(usr)
+
+ if(href_list["dmake"])
+ p_type = text2num(href_list["dmake"])
+ p_conntype = text2num(href_list["type"])
+ p_dir = 1
+ p_class = DISPOSALS_MODE
+ src.spark_system.start()
+ playsound(get_turf(src), 'sound/effects/pop.ogg', 50, 0)
+ show_menu(usr)
+
+
+/obj/item/weapon/pipe_dispenser/afterattack(atom/A, mob/user)
+ if(!in_range(A,user))
+ return
+ if(loc != user)
+ return
+ if(!isrobot(user) && !ishuman(user))
+ return 0
+ if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))
+ return 0
+
+ switch(p_class)
+ if(PAINT_MODE) // Paint pipes
+ if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated))
+ // Avoid spewing errors about invalid mode -2 when clicking on stuff that aren't pipes.
+ user << "\The [src]'s error light flickers. Perhaps you need to only use it on pipes and pipe meters?"
+ return 0
+ var/obj/machinery/atmospherics/pipe/P = A
+ playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
+ P.pipe_color = paint_color
+ user.visible_message("[user] paints \the [P] [paint_color].","You paint \the [P] [paint_color].")
+ P.update_icon()
+ return 1
+ if(EATING_MODE) // Eating pipes
+ // Must click on an actual pipe or meter.
+ if(istype(A,/obj/item/pipe) || istype(A,/obj/item/pipe_meter) || istype(A,/obj/structure/disposalconstruct))
+ user << "Destroying Pipe..."
+ playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
+ if(do_after(user, 5))
+ activate()
+ del(A)
+ return 1
+ return 0
+
+ // Avoid spewing errors about invalid mode -1 when clicking on stuff that aren't pipes.
+ user << "The [src]'s error light flickers. Perhaps you need to only use it on pipes and pipe meters?"
+ return 0
+ if(ATMOS_MODE)
+ if(!(istype(A, /turf)))
+ user << "The [src]'s error light flickers."
+ return 0
+ user << "Building Pipes ..."
+ playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
+ if(do_after(user, 20))
+ activate()
+ var/obj/item/pipe/P = new (A, pipe_type=p_type, dir=p_dir)
+ P.update()
+ P.add_fingerprint(usr)
+ return 1
+ return 0
+
+ if(METER_MODE)
+ if(!(istype(A, /turf)))
+ user << "The [src]'s error light flickers."
+ return 0
+ user << "Building Meter..."
+ playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
+ if(do_after(user, 20))
+ activate()
+ new /obj/item/pipe_meter(A)
+ return 1
+ return 0
+
+ if(DISPOSALS_MODE)
+ if(!(istype(A, /turf)))
+ user << "The [src]'s error light flickers."
+ return 0
+ user << "Building Pipes..."
+ playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
+ if(do_after(user, 20))
+ activate()
+ var/obj/structure/disposalconstruct/C = new (A)
+ // This may still produce runtimes, but I checked and /obj/structure/disposalconstruct
+ // DOES have a dir property, inherited from /obj/structure. - N3X
+ C.dir=p_dir
+ switch(p_type)
+ if(0)
+ C.ptype = 0
+ if(1)
+ C.ptype = 1
+ if(2)
+ C.ptype = 2
+ if(3)
+ C.ptype = 4
+ if(4)
+ C.ptype = 5
+ if(5)
+ C.ptype = 6
+ C.density = 1
+ if(6)
+ C.ptype = 7
+ C.density = 1
+ if(7)
+ C.ptype = 8
+ C.density = 1
+ C.add_fingerprint(usr)
+ C.update()
+ return 1
+ return 0
+ else
+ ..()
+ return 0
+
+
+/obj/item/weapon/pipe_dispenser/proc/activate()
+ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
+
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 3d5cebfd920..f28044bff28 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -76,8 +76,6 @@
else if(stage == EMPTY && istype(I, /obj/item/device/assembly_holder))
var/obj/item/device/assembly_holder/A = I
- if(!A.secured)
- return
if(isigniter(A.a_left) == isigniter(A.a_right)) //Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
return
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index f261c0aeb09..6bb7562f847 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -41,6 +41,7 @@
icon_state = initial(icon_state)
// item_state = initial(item_state)
ion_trail.stop()
+ usr << "You toggle the jetpack [on? "on":"off"]."
return
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index daca863af4f..c88351ffb13 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -56,7 +56,7 @@
/obj/item/weapon/vending_refill/autodrobe
machine_name = "AutoDrobe"
icon_state = "refill_costume"
- charges = 19// of 58
+ charges = 20// of 60
/obj/item/weapon/vending_refill/clothing
machine_name = "ClothesMate"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 439fb0a86ff..ae268783c38 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -125,8 +125,8 @@
/obj/structure/closet/secure_closet/atmospherics/New()
..()
- sleep(2)
new /obj/item/device/radio/headset/headset_eng(src)
+ new /obj/item/weapon/pipe_dispenser(src)
new /obj/item/weapon/storage/toolbox/mechanical(src)
new /obj/item/weapon/storage/backpack/satchel_norm(src)
new /obj/item/weapon/tank/emergency_oxygen/engi(src)
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 1406b2f5630..325757eef6d 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -82,7 +82,7 @@
new /obj/item/clothing/mask/gas/sechailer/swat(src)
new /obj/item/weapon/shield/riot/tele(src)
new /obj/item/weapon/melee/baton/loaded(src)
- new /obj/item/weapon/gun/energy/gun(src)
+ new /obj/item/weapon/gun/energy/gun/advtaser(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/clothing/suit/toggle/wintercoat/security(src)
return
@@ -112,7 +112,7 @@
new /obj/item/weapon/storage/box/zipties(src)
new /obj/item/weapon/reagent_containers/spray/pepper(src)
new /obj/item/weapon/melee/baton/loaded(src)
- new /obj/item/weapon/gun/energy/taser(src)
+ new /obj/item/weapon/gun/energy/gun/advtaser(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/clothing/suit/toggle/wintercoat/security(src)
return
@@ -137,7 +137,6 @@
new /obj/item/weapon/reagent_containers/spray/pepper(src)
new /obj/item/device/flash/handheld(src)
new /obj/item/weapon/grenade/flashbang(src)
- new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/suit/toggle/wintercoat/security(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index ae31fa0fdec..50bb98b94ed 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -33,11 +33,11 @@
new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/box/teargas(src)
- new /obj/item/weapon/gun/projectile/automatic/bulldog(src)
- new /obj/item/weapon/gun/projectile/automatic/bulldog(src)
- new /obj/item/weapon/gun/projectile/automatic/bulldog(src)
- new /obj/item/weapon/gun/projectile/automatic/bulldog(src)
- new /obj/item/weapon/gun/projectile/automatic/bulldog(src)
+ new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
+ new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
+ new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
+ new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
+ new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/weapon/pinpointer/nukeop(src)
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index e4e7803f259..6425ed5da9b 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -95,16 +95,21 @@
desc = "A catwalk for easier EVA manuevering and cable placement."
icon_state = "catwalkfull"
+/obj/structure/lattice/catwalk/New()
+ var/turf/T = loc
+ T.cancable = 1
+ ..()
+
/obj/structure/lattice/catwalk/Destroy()
var/turf/T = loc
- T.intact = 1
+ T.cancable = 0
for(var/obj/structure/cable/C in T)
C.Destroy()
..()
/obj/structure/lattice/catwalk/Deconstruct()
var/turf/T = loc
- T.intact = 1
+ T.cancable = 0
for(var/obj/structure/cable/C in T)
C.Deconstruct()
..()
diff --git a/code/game/sound.dm b/code/game/sound.dm
index b1a7042b8b3..14aace39369 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -20,8 +20,7 @@
M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, surround)
-/mob/proc/playsound_local(var/turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1)
- if(!src.client || ear_deaf > 0) return
+/atom/proc/playsound_local(var/turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1)
soundin = get_sfx(soundin)
var/sound/S = sound(soundin)
@@ -74,6 +73,11 @@
src << S
+/mob/playsound_local(var/turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1)
+ if(!client || ear_deaf > 0)
+ return
+ ..()
+
/client/proc/playtitlemusic()
if(!ticker || !ticker.login_music) return
if(prefs.toggles & SOUND_LOBBY)
@@ -96,4 +100,4 @@
if ("hiss") soundin = pick('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
if ("pageturn") soundin = pick('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg')
if ("gunshot") soundin = pick('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg')
- return soundin
\ No newline at end of file
+ return soundin
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index b05b410e30a..6955c0a429d 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -12,6 +12,7 @@
name = "plating"
icon_state = "plating"
intact = 0
+ cancable = 1
broken_states = list("platingdmg1", "platingdmg2", "platingdmg3")
burnt_states = list("panelscorched")
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index e87334f5b01..3f422108c16 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -2,6 +2,7 @@
icon = 'icons/turf/space.dmi'
name = "\proper space"
icon_state = "0"
+ intact = 0
temperature = TCMB
thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index cd434a4fbb5..a02822d11b2 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -3,6 +3,7 @@
level = 1.0
var/intact = 1
+ var/cancable = 0
//Properties for open tiles (/floor)
var/oxygen = 0
@@ -177,7 +178,7 @@
/turf/proc/ReplaceWithCatwalk()
src.ChangeTurf(/turf/space)
- src.intact = 0 //so cables can be laid
+ src.cancable = 1//so cables can be laid
new /obj/structure/lattice/catwalk(locate(src.x, src.y, src.z) )
/turf/proc/phase_damage_creatures(damage,mob/U = null)//>Ninja Code. Hurts and knocks out creatures on this turf
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 2cd0c18a2ae..d7572a1353f 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1872,11 +1872,25 @@
if("guns")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","SG")
- rightandwrong(0, usr)
+ var/survivor_probability = 0
+ switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!"))
+ if("Some Antags")
+ survivor_probability = 25
+ if("All Antags!")
+ survivor_probability = 100
+
+ rightandwrong(0, usr, survivor_probability)
if("magic")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","SM")
- rightandwrong(1, usr)
+ var/survivor_probability = 0
+ switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!"))
+ if("Some Antags")
+ survivor_probability = 25
+ if("All Antags!")
+ survivor_probability = 100
+
+ rightandwrong(1, usr, survivor_probability)
if("events")
if(events && !events.wizardmode)
if(alert("Do you want to toggle summon events on?",,"Yes","No") == "Yes")
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 5c76dc8b1f1..f2c1e93930a 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -24,30 +24,9 @@
var/const/WIRE_RADIO_RECEIVE = 8 //Allows Pulsed(1) to call Activate()
var/const/WIRE_RADIO_PULSE = 16 //Allows Pulse(1) to send a radio message
-/obj/item/device/assembly/proc/activate() //What the device does when turned on
- return
-
-/obj/item/device/assembly/proc/pulsed(var/radio = 0) //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
- return
-
-/obj/item/device/assembly/proc/pulse(var/radio = 0) //Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
- return
-
-/obj/item/device/assembly/proc/toggle_secure() //Code that has to happen when the assembly is un\secured goes here
- return
-
-/obj/item/device/assembly/proc/attach_assembly(var/obj/A, var/mob/user) //Called when an assembly is attacked by another
- return
-
-/obj/item/device/assembly/proc/process_cooldown() //Called via spawn(10) to have it count down the cooldown var
- return
-
/obj/item/device/assembly/proc/holder_movement() //Called when the holder is moved
return
-/obj/item/device/assembly/interact(mob/user as mob) //Called when attack_self is called
- return
-
/obj/item/device/assembly/proc/describe() // Called by grenades to describe the state of the trigger (time left, etc)
return "The trigger assembly looks broken!"
@@ -59,16 +38,18 @@
return 1
-
-/obj/item/device/assembly/process_cooldown()
+//Called via spawn(10) to have it count down the cooldown var
+/obj/item/device/assembly/proc/process_cooldown()
cooldown--
- if(cooldown <= 0) return 0
+ if(cooldown <= 0)
+ return 0
spawn(10)
process_cooldown()
return 1
-/obj/item/device/assembly/pulsed(var/radio = 0)
+//Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
+/obj/item/device/assembly/proc/pulsed(var/radio = 0)
if(holder && (wires & WIRE_RECEIVE))
activate()
if(radio && (wires & WIRE_RADIO_RECEIVE))
@@ -76,48 +57,41 @@
return 1
-/obj/item/device/assembly/pulse(var/radio = 0)
+//Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
+/obj/item/device/assembly/proc/pulse(var/radio = 0)
if(holder && (wires & WIRE_PULSE))
holder.process_activation(src, 1, 0)
if(holder && (wires & WIRE_PULSE_SPECIAL))
holder.process_activation(src, 0, 1)
-
- if(istype(loc,/obj/item/weapon/grenade)) // This is a hack. Todo: Manage this better -Sayu
- var/obj/item/weapon/grenade/G = loc
- G.prime() // Adios, muchachos
-// if(radio && (wires & WIRE_RADIO_PULSE))
- //Not sure what goes here quite yet send signal?
return 1
-/obj/item/device/assembly/activate()
- if(!secured || (cooldown > 0)) return 0
+// What the device does when turned on
+/obj/item/device/assembly/proc/activate()
+ if(!secured || (cooldown > 0))
+ return 0
cooldown = 2
spawn(10)
process_cooldown()
return 1
-/obj/item/device/assembly/toggle_secure()
+/obj/item/device/assembly/proc/toggle_secure()
secured = !secured
update_icon()
return secured
-/obj/item/device/assembly/attach_assembly(var/obj/item/device/assembly/A, var/mob/user)
- holder = new/obj/item/device/assembly_holder(get_turf(src))
- if(holder.attach(A,src,user))
- user << "You attach \the [A] to \the [src]!"
- return 1
- return 0
-
-
/obj/item/device/assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(isassembly(W))
var/obj/item/device/assembly/A = W
if((!A.secured) && (!secured))
- attach_assembly(A,user)
- return
+ holder = new/obj/item/device/assembly_holder(get_turf(src))
+ holder.assemble(src,A,user)
+ user << "You attach and secure \the [A] to \the [src]!"
+ else
+ user << "Both devices must be in attachable mode to be attached together."
+ return
if(istype(W, /obj/item/weapon/screwdriver))
if(toggle_secure())
user << "\The [src] is ready!"
@@ -142,7 +116,8 @@
/obj/item/device/assembly/attack_self(mob/user as mob)
- if(!user) return 0
+ if(!user)
+ return 0
user.set_machine(src)
interact(user)
return 1
@@ -151,40 +126,3 @@
/obj/item/device/assembly/interact(mob/user as mob)
return //HTML MENU FOR WIRES GOES HERE
-/*
- var/small_icon_state = null//If this obj will go inside the assembly use this for icons
- var/list/small_icon_state_overlays = null//Same here
- var/obj/holder = null
- var/cooldown = 0//To prevent spam
-
- proc
- Activate()//Called when this assembly is pulsed by another one
- Process_cooldown()//Call this via spawn(10) to have it count down the cooldown var
- Attach_Holder(var/obj/H, var/mob/user)//Called when an assembly holder attempts to attach, sets src's loc in here
-
-
- Activate()
- if(cooldown > 0)
- return 0
- cooldown = 2
- spawn(10)
- Process_cooldown()
- //Rest of code here
- return 0
-
-
- Process_cooldown()
- cooldown--
- if(cooldown <= 0) return 0
- spawn(10)
- Process_cooldown()
- return 1
-
-
- Attach_Holder(var/obj/H, var/mob/user)
- if(!H) return 0
- if(!H.IsAssemblyHolder()) return 0
- //Remember to have it set its loc somewhere in here
-
-
-*/
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 9cbf195ef97..755074c2855 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -87,8 +87,6 @@
/obj/item/weapon/tank/proc/bomb_assemble(W,user) //Bomb assembly proc. This turns assembly+tank into a bomb
var/obj/item/device/assembly_holder/S = W
var/mob/M = user
- if(!S.secured) //Check if the assembly is secured
- return
if(isigniter(S.a_left) == isigniter(S.a_right)) //Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
return
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 3bd27af3549..1ef63734a9f 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -9,37 +9,29 @@
throw_speed = 2
throw_range = 7
- var/secured = 0
var/obj/item/device/assembly/a_left = null
var/obj/item/device/assembly/a_right = null
-/obj/item/device/assembly_holder/proc/attach(var/obj/item/device/D, var/obj/item/device/D2, var/mob/user)
- return
-
-/obj/item/device/assembly_holder/proc/process_activation(var/obj/item/device/D)
- return
-
/obj/item/device/assembly_holder/IsAssemblyHolder()
return 1
-/obj/item/device/assembly_holder/attach(var/obj/item/device/D, var/obj/item/device/D2, var/mob/user)
- if((!D)||(!D2)) return 0
- if((!isassembly(D))||(!isassembly(D2))) return 0
- if((D:secured)||(D2:secured)) return 0
- if(user)
- user.remove_from_mob(D)
- user.remove_from_mob(D2)
- D:holder = src
- D2:holder = src
- D.loc = src
- D2.loc = src
- a_left = D
- a_right = D2
- name = "[D.name]-[D2.name] assembly"
+/obj/item/device/assembly_holder/proc/assemble(var/obj/item/device/assembly/A, var/obj/item/device/assembly/A2, var/mob/user)
+ attach(A,user)
+ attach(A2,user)
+ name = "[A.name]-[A2.name] assembly"
update_icon()
- return 1
+/obj/item/device/assembly_holder/proc/attach(var/obj/item/device/assembly/A, var/mob/user)
+ if(user)
+ user.remove_from_mob(A)
+ A.holder = src
+ A.loc = src
+ A.toggle_secure()
+ if(!a_left)
+ a_left = A
+ else
+ a_right = A
/obj/item/device/assembly_holder/update_icon()
overlays.Cut()
@@ -54,16 +46,6 @@
if(master)
master.update_icon()
-
-/obj/item/device/assembly_holder/examine(mob/user)
- ..()
- if(secured)
- user << "\The [src] is secured and ready to be used."
- else
- user << "\The [src] can be attached to other things."
-
-
-
/obj/item/device/assembly_holder/HasProximity(atom/movable/AM as mob|obj)
if(a_left)
a_left.HasProximity(AM)
@@ -88,7 +70,7 @@
if(a_left && a_right)
a_left.holder_movement()
a_right.holder_movement()
- return
+ return
/obj/item/device/assembly_holder/attack_hand()//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess
if(a_left && a_right)
@@ -97,55 +79,39 @@
..()
return
-
/obj/item/device/assembly_holder/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/screwdriver))
- if(!a_left || !a_right)
- user << "BUG:Assembly part missing, please report this!"
- return
- a_left.toggle_secure()
- a_right.toggle_secure()
- secured = !secured
- if(secured)
- user << "\The [src] is ready!"
- else
- user << "\The [src] can now be taken apart!"
- update_icon()
- return
+ var/turf/T = get_turf(src)
+ if(!T)
+ return 0
+ if(a_left)
+ a_left.holder = null
+ a_left.loc = T
+ if(a_right)
+ a_right.holder = null
+ a_right.loc = T
+ qdel(src)
else
..()
- return
-
/obj/item/device/assembly_holder/attack_self(mob/user as mob)
src.add_fingerprint(user)
- if(src.secured)
- if(!a_left || !a_right)
- user << "Assembly part missing!"
- return
- if(istype(a_left,a_right.type))//If they are the same type it causes issues due to window code
- switch(alert("Which side would you like to use?",,"Left","Right"))
- if("Left") a_left.attack_self(user)
- if("Right") a_right.attack_self(user)
- return
- else
- a_left.attack_self(user)
- a_right.attack_self(user)
+ if(!a_left || !a_right)
+ user << "Assembly part missing!"
+ return
+ if(istype(a_left,a_right.type))//If they are the same type it causes issues due to window code
+ switch(alert("Which side would you like to use?",,"Left","Right"))
+ if("Left") a_left.attack_self(user)
+ if("Right") a_right.attack_self(user)
+ return
else
- var/turf/T = get_turf(src)
- if(!T) return 0
- if(a_left)
- a_left:holder = null
- a_left.loc = T
- if(a_right)
- a_right:holder = null
- a_right.loc = T
- qdel(src)
- return
+ a_left.attack_self(user)
+ a_right.attack_self(user)
-/obj/item/device/assembly_holder/process_activation(var/obj/D, var/normal = 1, var/special = 1)
- if(!D) return 0
+/obj/item/device/assembly_holder/proc/process_activation(var/obj/D, var/normal = 1, var/special = 1)
+ if(!D)
+ return 0
if((normal) && (a_right) && (a_left))
if(a_right != D)
a_right.pulsed(0)
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 841c66b5e3a..be721b81b07 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -157,8 +157,8 @@
///////////Civilians//////////////////////
-/obj/effect/landmark/corpse/chef
- name = "Chef"
+/obj/effect/landmark/corpse/cook
+ name = "Cook"
corpseuniform = /obj/item/clothing/under/rank/chef
corpsesuit = /obj/item/clothing/suit/chef/classic
corpseshoes = /obj/item/clothing/shoes/sneakers/black
@@ -166,8 +166,8 @@
corpseback = /obj/item/weapon/storage/backpack
corpseradio = /obj/item/device/radio/headset
corpseid = 1
- corpseidjob = "Chef"
- corpseidaccess = "Chef"
+ corpseidjob = "Cook"
+ corpseidaccess = "Cook"
/obj/effect/landmark/corpse/doctor
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 31c9d545afd..04cb1330169 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -274,22 +274,24 @@ atom/proc/generate_female_clothing(index,t_color,icon)
if(src.has_sensor <= 0)
usr << "This suit does not have any sensors."
return 0
- src.sensor_mode += 1
- if(src.sensor_mode > 3)
- src.sensor_mode = 0
- switch(src.sensor_mode)
- if(0)
- M << "You disable your suit's remote sensing equipment."
- if(1)
- M << "Your suit will now report whether you are live or dead."
- if(2)
- M << "Your suit will now report your vital lifesigns."
- if(3)
- M << "Your suit will now report your vital lifesigns as well as your coordinate position."
- if(istype(loc,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = loc
- if(H.w_uniform == src)
- H.update_suit_sensors()
+
+ var/list/modes = list("Off", "Binary vitals", "Exact vitals", "Tracking beacon")
+ var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes
+ if(get_dist(usr, src) > 1)
+ usr << "You have moved too far away."
+ return
+ sensor_mode = modes.Find(switchMode) - 1
+
+ if (src.loc == usr)
+ switch(sensor_mode)
+ if(0)
+ usr << "You disable your suit's remote sensing equipment."
+ if(1)
+ usr << "Your suit will now only report whether you are alive or dead."
+ if(2)
+ usr << "Your suit will now only report your exact vital lifesigns."
+ if(3)
+ usr << "Your suit will now report your exact vital lifesigns as well as your coordinate position."
..()
/obj/item/clothing/under/verb/rolldown()
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 8343d2aca31..b0872270f6a 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -41,7 +41,7 @@
item_state = "eng_hardsuit"
slowdown = 2
armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
- allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/t_scanner, /obj/item/weapon/rcd)
+ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/t_scanner, /obj/item/weapon/rcd)
//Atmospherics
@@ -102,7 +102,7 @@
desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters."
item_state = "mining_hardsuit"
armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50)
- allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/pickaxe)
+ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/pickaxe)
@@ -169,7 +169,7 @@
desc = "A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement."
item_state = "medical_hardsuit"
slowdown = 1
- allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical)
+ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical)
armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50)
@@ -187,5 +187,5 @@
name = "security hardsuit"
desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor."
item_state = "sec_hardsuit"
- allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank, /obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs)
+ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs)
armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 50)
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index de919a9be17..10aa34f3771 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -73,7 +73,7 @@
item_state = "void"
desc = "An old, NASA Centcom branch designed, dark red space suit."
slowdown = 1
- allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/multitool)
+ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/multitool)
//Space santa outfit suit
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 254b1c3ad20..88cc52f77bd 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -401,4 +401,24 @@
item_state = "redeveninggown"
item_color = "red_evening_gown"
fitted = 0
- can_adjust = 0
\ No newline at end of file
+ can_adjust = 0
+
+/obj/item/clothing/under/maid
+ name = "maid costume"
+ desc = "Maid in China."
+ icon_state = "maid"
+ item_state = "maid"
+ item_color = "maid"
+ body_parts_covered = CHEST|GROIN
+ fitted = 0
+ can_adjust = 0
+
+/obj/item/clothing/under/janimaid
+ name = "maid uniform"
+ desc = "A simple maid uniform for housekeeping."
+ icon_state = "janimaid"
+ item_state = "janimaid"
+ item_color = "janimaid"
+ body_parts_covered = CHEST|GROIN
+ fitted = 0
+ can_adjust = 0
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 51287eaf20b..c1eb8f03c3b 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -38,7 +38,7 @@
/obj/item/robot_parts/r_leg = 1,
/obj/item/stack/sheet/metal = 5,
/obj/item/stack/cable_coil = 5,
- /obj/item/weapon/gun/energy/taser = 1,
+ /obj/item/weapon/gun/energy/gun/advtaser = 1,
/obj/item/weapon/stock_parts/cell = 1,
/obj/item/device/assembly/prox_sensor = 1,
/obj/item/robot_parts/r_arm = 1)
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index 63c52779fa7..8bc253eaaad 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -99,8 +99,8 @@
var/response = alert(M, "Santa is coming to town! Do you want to be santa?", "Ho ho ho!", "Yes", "No")
if(response == "Yes" && M && M.client && M.stat == DEAD && !santa)
santa = new /mob/living/carbon/human(pick(blobstart))
- M.mind.transfer_to(santa)
santa.key = M.key
+ qdel(M)
santa.real_name = "Santa Claus"
santa.name = "Santa Claus"
@@ -148,4 +148,4 @@
telespell.clothes_req = 0 //santa robes aren't actually magical.
santa.mind.spell_list += telespell //does the station have chimneys? WHO KNOWS!
- M << "You are Santa! Your objective is to bring joy to the people on this station. You can conjure more presents using a spell, and there are several presents in your bag."
+ santa << "You are Santa! Your objective is to bring joy to the people on this station. You can conjure more presents using a spell, and there are several presents in your bag."
diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm
index 68c9d68e430..59707297095 100644
--- a/code/modules/events/wizard/departmentrevolt.dm
+++ b/code/modules/events/wizard/departmentrevolt.dm
@@ -30,7 +30,7 @@
jobs_to_revolt = list("Quartermaster", "Cargo Technician", "Shaft Miner")
nation = pick("Cargo", "Guna", "Suppli", "Mule", "Crate", "Ore", "Mini", "Shaf")
if("whatevercolorrepresentstheservicepeople") //the few, the proud, the technically aligned
- jobs_to_revolt = list("Bartender", "Chef", "Botanist", "Clown", "Mime", "Janitor", "Chaplain")
+ jobs_to_revolt = list("Bartender", "Cook", "Botanist", "Clown", "Mime", "Janitor", "Chaplain")
nation = pick("Honka", "Boozo", "Fatu", "Danka", "Mimi", "Libra", "Jani", "Religi")
nation += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co", "taoide", "slavia", "stotzka")
diff --git a/code/modules/events/wizard/summons.dm b/code/modules/events/wizard/summons.dm
index b6ea39cef65..afe85bad448 100644
--- a/code/modules/events/wizard/summons.dm
+++ b/code/modules/events/wizard/summons.dm
@@ -6,7 +6,7 @@
earliest_start = 0
/datum/round_event/wizard/summonguns/start()
- rightandwrong(0)
+ rightandwrong(0,,10)
/datum/round_event_control/wizard/summonmagic //The Somewhat Less Classic
name = "Summon Magic"
@@ -16,4 +16,4 @@
earliest_start = 0
/datum/round_event/wizard/summonmagic/start()
- rightandwrong(1)
\ No newline at end of file
+ rightandwrong(1,,10)
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/food&drinks/food/snacks_other.dm
index e2a19d059ce..df65352f4dc 100644
--- a/code/modules/food&drinks/food/snacks_other.dm
+++ b/code/modules/food&drinks/food/snacks_other.dm
@@ -122,7 +122,7 @@
/obj/item/weapon/reagent_containers/food/snacks/badrecipe
name = "burned mess"
- desc = "Someone should be demoted from chef for this."
+ desc = "Someone should be demoted from cook for this."
icon_state = "badrecipe"
/obj/item/weapon/reagent_containers/food/snacks/badrecipe/New()
@@ -202,8 +202,6 @@
reagents.add_reagent("minttoxin", 1)
bitesize = 1
-////////////////////////////////FOOD ADDITIONS////////////////////////////////////////////
-
/obj/item/weapon/reagent_containers/food/snacks/wrap
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
@@ -234,3 +232,26 @@
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("toxin", 3)
bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/chococoin
+ name = "chocolate coin"
+ desc = "A completely edible but nonflippable festive coin."
+ icon_state = "chococoin"
+
+/obj/item/weapon/reagent_containers/food/snacks/chococoin/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("coco", 2)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/chocoorange
+ name = "chocolate orange"
+ desc = "A festive chocolate orange"
+ icon_state = "chocoorange"
+
+/obj/item/weapon/reagent_containers/food/snacks/chocoorange/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("coco", 2)
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/food&drinks/food/snacks_pastry.dm
index af97eab4323..4860f4fd103 100644
--- a/code/modules/food&drinks/food/snacks_pastry.dm
+++ b/code/modules/food&drinks/food/snacks_pastry.dm
@@ -308,4 +308,15 @@
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sugar", 3)
- bitesize = 2
\ No newline at end of file
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/chococornet/
+ name = "chocolate cornet"
+ desc = "Which side's the head, the fat end or the thin end?"
+ icon_state = "chococornet"
+
+/obj/item/weapon/reagent_containers/food/snacks/chococornet/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent("vitamin", 1)
\ No newline at end of file
diff --git a/code/modules/food&drinks/recipes/microwave/recipes.dm b/code/modules/food&drinks/recipes/microwave/recipes.dm
index 4bf797f5bf7..7e4ec7c1cdb 100644
--- a/code/modules/food&drinks/recipes/microwave/recipes.dm
+++ b/code/modules/food&drinks/recipes/microwave/recipes.dm
@@ -69,3 +69,17 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple
)
result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple
+
+/datum/recipe/chococoin
+ items = list(
+ /obj/item/weapon/coin,
+ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/chococoin
+
+/datum/recipe/chocoorange
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange,
+ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/chocoorange
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm
index b7621899467..96a202c12ac 100644
--- a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm
+++ b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm
@@ -177,3 +177,10 @@
/datum/recipe/cracker
reagents = list("flour" = 5, "sodiumchloride" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/cracker
+
+/datum/recipe/chococornet
+ reagents = list("flour" = 10, "sodiumchloride" = 1)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/chococornet
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index ca793492cc4..49e25cf646d 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -53,6 +53,8 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
switch(stage)
if(2, 3)
+ if(affected_mob == DEAD)
+ return
if(prob(1))
affected_mob.emote("sneeze")
if(prob(1))
@@ -62,6 +64,8 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
if(prob(1))
affected_mob << "Mucous runs down the back of your throat."
if(4)
+ if(affected_mob == DEAD)
+ return
if(prob(1))
affected_mob.emote("sneeze")
if(prob(1))
@@ -76,9 +80,10 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
affected_mob.adjustToxLoss(1)
affected_mob.updatehealth()
if(5)
- affected_mob << "You feel something tearing its way out of your stomach..."
- affected_mob.adjustToxLoss(10)
- affected_mob.updatehealth()
+ if(affected_mob != DEAD)
+ affected_mob << "You feel something tearing its way out of your stomach..."
+ affected_mob.adjustToxLoss(10)
+ affected_mob.updatehealth()
if(prob(50))
AttemptGrow()
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 10cb6ac53d6..7b15852969e 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -60,11 +60,13 @@
eye_blurry = max(eye_blurry,(effect * blocked))
if(DROWSY)
drowsyness = max(drowsyness,(effect * blocked))
+ if(JITTER)
+ jitteriness = max(jitteriness,(effect * blocked))
updatehealth()
return 1
-/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/blocked = 0)
+/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/blocked = 0, var/stamina = 0, var/jitter = 0)
if(blocked >= 100) return 0
if(stun) apply_effect(stun, STUN, blocked)
if(weaken) apply_effect(weaken, WEAKEN, blocked)
@@ -73,4 +75,6 @@
if(stutter) apply_effect(stutter, STUTTER, blocked)
if(eyeblur) apply_effect(eyeblur, EYE_BLUR, blocked)
if(drowsy) apply_effect(drowsy, DROWSY, blocked)
+ if(stamina) apply_effect(stamina, STAMINA, blocked)
+ if(jitter) apply_effect(jitter, JITTER, blocked)
return 1
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 6461355f0b9..77be370abf8 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -109,6 +109,7 @@
modules += new /obj/item/borg/sight/meson(src)
emag = new /obj/item/borg/stun(src)
modules += new /obj/item/weapon/rcd/borg(src)
+ modules += new /obj/item/weapon/pipe_dispenser(src) //What could possibly go wrong?
modules += new /obj/item/weapon/extinguisher(src)
modules += new /obj/item/weapon/weldingtool/largetank/cyborg(src)
modules += new /obj/item/weapon/screwdriver(src)
@@ -161,7 +162,7 @@
modules += new /obj/item/device/flashlight/seclite(src)
modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src)
modules += new /obj/item/weapon/melee/baton/loaded(src)
- modules += new /obj/item/weapon/gun/energy/taser/cyborg(src)
+ modules += new /obj/item/weapon/gun/energy/gun/advtaser/cyborg(src)
modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src)
emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)
fix_modules()
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index debdf749a93..9546b077482 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -131,7 +131,7 @@
switch(add_to)
if("head")
- place_on_head(usr.get_active_hand())
+ place_on_head(usr.get_active_hand(),usr)
if("back")
if(inventory_back)
@@ -183,17 +183,17 @@
//Corgis are supposed to be simpler, so only a select few objects can actually be put
//to be compatible with them. The objects are below.
//Many hats added, Some will probably be removed, just want to see which ones are popular.
-/mob/living/simple_animal/corgi/proc/place_on_head(obj/item/item_to_add)
+/mob/living/simple_animal/corgi/proc/place_on_head(obj/item/item_to_add, var/mob/user as mob)
if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess
- item_to_add.afterattack(src,usr,1)
+ item_to_add.afterattack(src,user,1)
return
if(inventory_head)
- if(usr) usr << "You can't put more than one hat on [src]!"
+ if(user) user << "You can't put more than one hat on [src]!"
return
if(!item_to_add)
- usr.visible_message("[usr] pets [src]","You rest your hand on [src]'s head for a moment.")
+ user.visible_message("[user] pets [src]","You rest your hand on [src]'s head for a moment.")
return
@@ -326,13 +326,13 @@
valid = 1
if(valid)
- if(!usr.drop_item())
- usr << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!"
+ if(user && !user.drop_item())
+ user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!"
return 0
if(health <= 0)
- usr << "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on \him."
- else if(usr)
- usr.visible_message("[usr] puts [item_to_add] on [real_name]'s head. [src] looks at [usr] and barks once.",
+ user << "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on \him."
+ else if(user)
+ user.visible_message("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once.",
"You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags \his tail once and barks.",
"You hear a friendly-sounding bark.")
item_to_add.loc = src
@@ -340,10 +340,10 @@
regenerate_icons()
else
- if(!usr.drop_item())
- usr << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!"
+ if(user && !user.drop_item())
+ user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!"
return 0
- usr << "You set [item_to_add] on [src]'s head, but \he shakes it off!"
+ user << "You set [item_to_add] on [src]'s head, but \he shakes it off!"
item_to_add.loc = loc
if(prob(25))
step_rand(item_to_add)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index c3822358c05..0c26dc9a84b 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -96,13 +96,14 @@
return Move_object(direct)
if(world.time < move_delay)
return 0
- if(isAI(mob))
- return AIMove(n,direct,mob)
if(!isliving(mob))
return mob.Move(n,direct)
- if(moving)
- return 0
if(mob.stat == DEAD)
+ mob.ghostize()
+ return 0
+ if(isAI(mob))
+ return AIMove(n,direct,mob)
+ if(moving)
return 0
if(isliving(mob))
var/mob/living/L = mob
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 72c56c7f554..28907d096ec 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -58,7 +58,7 @@
output += ""
//src << browse(output,"window=playersetup;size=210x240;can_close=0")
- var/datum/browser/popup = new(src, "playersetup", "New Player Options
", 210, 240)
+ var/datum/browser/popup = new(src, "playersetup", "New Player Options
", 220, 250)
popup.set_window_options("can_close=0")
popup.set_content(output)
popup.open(0)
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 6742c29bf6d..e8bb527e779 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -95,7 +95,7 @@
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
else if(backbag == 3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(CHEF)
+ if(COOK)
clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/head.dmi', "chef"), ICON_OVERLAY)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index e3057322b46..c03819fdd88 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -627,6 +627,10 @@ obj/structure/cable/proc/avail()
if(!isturf(user.loc))
return
+ if(!T.cancable)
+ user << "You can only lay cables on catwalks and plating!"
+ return
+
if(get_amount() < 1) // Out of cable
user << "There is no cable left."
return
@@ -636,7 +640,7 @@ obj/structure/cable/proc/avail()
return
if(T.intact) // Ff floor is intact, complain
- user << "You can only lay cables on catwalks and plating!"
+ user << "You can't lay cable there unless the floor tiles are removed."
return
else
@@ -702,9 +706,12 @@ obj/structure/cable/proc/avail()
// one end of the clicked cable is pointing towards us
if(C.d1 == dirn || C.d2 == dirn)
- if(U.intact) // can't place a cable if the floor is complete
+ if(!U.cancable) //checking if it's a plating or catwalk
user << "You can only lay cables on catwalks and plating!"
return
+ if(U.intact) //can't place a cable if it's a plating with a tile on it
+ user << "You can't lay cable there unless the floor tiles are removed."
+ return
else
// cable is pointing at us, we're standing on an open tile
// so create a stub pointing at the clicked cable on our tile
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index b08ad2edf4d..45794e4ea66 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -76,7 +76,7 @@
/obj/machinery/power/supermatter_shard/proc/explode()
investigate_log("has exploded.", "supermatter")
- explosion(get_turf(src), explosion_power, explosion_power * 2, explosion_power * 3, explosion_power * 4, 1, 1)
+ explosion(get_turf(src), explosion_power, explosion_power * 2, explosion_power * 3, explosion_power * 4, 1)
qdel(src)
return
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 05c5f172788..a20e00aae51 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -117,7 +117,7 @@
fire_sound = 'sound/weapons/Kenetic_accel.ogg'
/obj/item/ammo_casing/energy/disabler
- projectile_type = /obj/item/projectile/energy/disabler
+ projectile_type = /obj/item/projectile/beam/disabler
select_name = "disable"
e_cost = 50
fire_sound = "sound/weapons/taser.ogg"
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 240b2378209..9ede9c8e8e1 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -28,6 +28,8 @@
var/trigger_guard = 1
var/sawn_desc = null
var/sawn_state = SAWN_INTACT
+ var/burst_size = 1
+ var/fire_delay = 0
/obj/item/weapon/gun/proc/process_chamber()
return 0
@@ -113,18 +115,26 @@
if(!special_check(user))
return
- if(chambered)
- if(!chambered.fire(target, user, params, , suppressed))
- shoot_with_empty_chamber(user)
- else
- if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
- shoot_live_shot(user, 1, target,message)
+ for(var/i = 1 to burst_size)
+ if(!(src in get_both_hands(user))) //for burst firing
+ break
+ if(chambered)
+ if(!chambered.fire(target, user, params, , suppressed))
+ shoot_with_empty_chamber(user)
+ break
else
- shoot_live_shot(user,message)
- else
- shoot_with_empty_chamber(user)
- process_chamber()
- update_icon()
+ if(!special_check(user))
+ return
+ if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
+ shoot_live_shot(user, 1, target)
+ else
+ shoot_live_shot(user)
+ else
+ shoot_with_empty_chamber(user)
+ break
+ process_chamber()
+ update_icon()
+ sleep(fire_delay)
if(user.hand)
user.update_inv_l_hand(0)
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 7074c8102b1..6ca4a48924e 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -3,7 +3,7 @@
desc = "A basic hybrid energy gun with two settings: Stun and kill."
icon_state = "energy"
item_state = null //so the human update icon uses the icon_state instead.
- ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
+ ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
origin_tech = "combat=3;magnets=2"
modifystate = 2
@@ -12,7 +12,6 @@
select_fire(user)
update_icon()
-
/obj/item/weapon/gun/energy/gun/nuclear
name = "advanced energy gun"
desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
@@ -21,6 +20,7 @@
var/lightfail = 0
var/charge_tick = 0
modifystate = 0
+ ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
/obj/item/weapon/gun/energy/gun/nuclear/New()
..()
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 2c79a769a35..432594d9c8a 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -7,25 +7,37 @@
ammo_type = list(/obj/item/ammo_casing/energy/electrode)
cell_type = "/obj/item/weapon/stock_parts/cell/crap"
-/obj/item/weapon/gun/energy/taser/cyborg
- name = "taser gun"
- desc = "An integrated taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating."
- icon_state = "taser"
- fire_sound = 'sound/weapons/Taser.ogg'
+/obj/item/weapon/gun/energy/stunrevolver
+ name = "stun revolver"
+ desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder."
+ icon_state = "stunrevolver"
+ origin_tech = "combat=3;materials=3;powerstorage=2"
+ ammo_type = list(/obj/item/ammo_casing/energy/electrode/gun)
+ cell_type = "/obj/item/weapon/stock_parts/cell"
+
+/obj/item/weapon/gun/energy/gun/advtaser
+ name = "advanced taser"
+ desc = "A hybrid taser designed to fire both short-range high-power electrodes and long-range disabler beams."
+ icon_state = "advtaser"
+ ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
+
+/obj/item/weapon/gun/energy/gun/advtaser/cyborg
+ name = "advanced taser"
+ desc = "An integrated advanced taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating."
cell_type = "/obj/item/weapon/stock_parts/cell/secborg"
var/charge_tick = 0
- var/recharge_time = 10 //Time it takes for shots to recharge (in ticks)
+ var/recharge_time = 10
-/obj/item/weapon/gun/energy/taser/cyborg/New()
+/obj/item/weapon/gun/energy/gun/advtaser/cyborg/New()
..()
processing_objects.Add(src)
-/obj/item/weapon/gun/energy/taser/cyborg/Destroy()
+/obj/item/weapon/gun/energy/gun/advtaser/cyborg/Destroy()
processing_objects.Remove(src)
..()
-/obj/item/weapon/gun/energy/taser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
+/obj/item/weapon/gun/energy/gun/advtaser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
charge_tick++
if(charge_tick < recharge_time) return 0
charge_tick = 0
@@ -42,16 +54,6 @@
return 1
-/obj/item/weapon/gun/energy/stunrevolver
- name = "stun revolver"
- desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder."
- icon_state = "stunrevolver"
- origin_tech = "combat=3;materials=3;powerstorage=2"
- ammo_type = list(/obj/item/ammo_casing/energy/electrode/gun)
- cell_type = "/obj/item/weapon/stock_parts/cell"
-
-
-
/obj/item/weapon/gun/energy/crossbow
name = "mini energy crossbow"
desc = "A weapon favored by syndicate stealth specialists."
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 10763b224d3..b5f2c3033c1 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -1,15 +1,24 @@
-/obj/item/weapon/gun/projectile/automatic //Hopefully someone will find a way to make these fire in bursts or something. --Superxpdude
+/obj/item/weapon/gun/projectile/automatic
name = "prototype SMG"
- desc = "A lightweight, prototype 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
+ desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
icon_state = "saber"
w_class = 3
origin_tech = "combat=4;materials=2"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
var/alarmed = 0
can_suppress = 1
+ burst_size = 3
+ fire_delay = 1
+ var/select = 0
+ action_button_name = "Toggle Fire Mode"
/obj/item/weapon/gun/projectile/automatic/update_icon()
..()
+ overlays.Cut()
+ if(!select)
+ overlays += "[initial(icon_state)]semi"
+ if(select == 1)
+ overlays += "[initial(icon_state)]burst"
icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
return
@@ -17,6 +26,28 @@
if(..() && chambered)
alarmed = 0
+/obj/item/weapon/gun/projectile/automatic/ui_action_click()
+ burst_select()
+
+/obj/item/weapon/gun/projectile/automatic/verb/burst_select()
+ set name = "Toggle Fire Mode"
+ set category = "Object"
+ set desc = "Click to switch fire modes."
+ var/mob/living/carbon/human/user = usr
+ if(select)
+ select = 0
+ burst_size = 1
+ fire_delay = 0
+ user << "You switch to semi-automatic."
+ else
+ select = 1
+ burst_size = initial(burst_size)
+ fire_delay = initial(fire_delay)
+ user << "You switch to [burst_size]-rnd burst."
+
+ update_icon()
+ return
+
/obj/item/weapon/gun/projectile/automatic/can_shoot()
return get_ammo()
@@ -29,12 +60,14 @@
/obj/item/weapon/gun/projectile/automatic/c20r
name = "syndicate SMG"
- desc = "A lightweight, bullpup .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
+ desc = "A bullpup two-round burst .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
icon_state = "c20r"
item_state = "c20r"
origin_tech = "combat=5;materials=2;syndicate=8"
mag_type = /obj/item/ammo_box/magazine/smgm45
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+ fire_delay = 2
+ burst_size = 2
/obj/item/weapon/gun/projectile/automatic/c20r/New()
..()
@@ -65,6 +98,12 @@
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
var/cover_open = 0
can_suppress = 0
+ burst_size = 1
+ fire_delay = 0
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/burst_select()
+ return
+
/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob)
cover_open = !cover_open
@@ -106,43 +145,9 @@
return
..()
-/obj/item/weapon/gun/projectile/automatic/bulldog
- name = "syndicate shotgun"
- desc = "A compact, mag-fed semi-automatic shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
- icon_state = "bulldog"
- item_state = "bulldog"
- w_class = 3.0
- origin_tech = "combat=5;materials=4;syndicate=6"
- mag_type = /obj/item/ammo_box/magazine/m12g
- fire_sound = 'sound/weapons/Gunshot.ogg'
- can_suppress = 0
-
-/obj/item/weapon/gun/projectile/automatic/bulldog/New()
- ..()
- update_icon()
- return
-
-/obj/item/weapon/gun/projectile/automatic/bulldog/proc/update_magazine()
- if(magazine)
- src.overlays = 0
- overlays += "[magazine.icon_state]"
- return
-
-/obj/item/weapon/gun/projectile/automatic/bulldog/update_icon()
- src.overlays = 0
- update_magazine()
- icon_state = "bulldog[chambered ? "" : "-e"]"
- return
-
-/obj/item/weapon/gun/projectile/automatic/bulldog/afterattack()
- ..()
- empty_alarm()
- return
-
-
/obj/item/weapon/gun/projectile/automatic/c90gl
name = "syndicate assault rifle"
- desc = "A bullpup and compact 5.45x39 assault rifle with a unique toploading design, designated 'C-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
+ desc = "A bullpup three-round burst 5.45x39 assault rifle with a unique toploading design, designated 'C-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
icon_state = "c90gl"
item_state = "c90gl"
origin_tech = "combat=5;materials=2;syndicate=8"
@@ -150,8 +155,9 @@
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
action_button_name = "Toggle Grenade Launcher"
can_suppress = 0
- var/select = 1 //1 for boolets, 0 for explosions.
var/obj/item/weapon/gun/projectile/revolver/grenadelauncher/underbarrel
+ burst_size = 3
+ fire_delay = 2
/obj/item/weapon/gun/projectile/automatic/c90gl/New()
..()
@@ -160,54 +166,53 @@
return
/obj/item/weapon/gun/projectile/automatic/c90gl/afterattack(var/atom/target, var/mob/living/user, flag, params)
- if(select)
+ if(select == 2)
+ underbarrel.afterattack(target, user, flag, params)
+ else
..()
empty_alarm()
return
- else
- underbarrel.afterattack(target, user, flag, params)
-
/obj/item/weapon/gun/projectile/automatic/c90gl/attackby(var/obj/item/A, mob/user)
- if(select)
- ..()
- else
+ if(select == 2)
underbarrel.attackby(A, user)
-
-/obj/item/weapon/gun/projectile/automatic/c90gl/attack_self(var/mob/living/user)
- if(select)
- ..()
else
+ ..()
+/obj/item/weapon/gun/projectile/automatic/c90gl/attack_self(var/mob/living/user)
+ if(select == 2)
underbarrel.attack_self(user)
-
-
+ else
+ ..()
/obj/item/weapon/gun/projectile/automatic/c90gl/update_icon()
..()
overlays.Cut()
- if(select)
- overlays += "c90prim"
- else
- overlays += "c90gren"
+ if(!select)
+ overlays += "[initial(icon_state)]semi"
+ if(select == 1)
+ overlays += "[initial(icon_state)]burst"
+ if(select == 2)
+ overlays += "[initial(icon_state)]gren"
icon_state = "c90gl[magazine ? "-[Ceiling(get_ammo(0)/6)*6]" : ""][chambered ? "" : "-e"]"
return
-/obj/item/weapon/gun/projectile/automatic/c90gl/proc/underbarrel_swap()
+/obj/item/weapon/gun/projectile/automatic/c90gl/burst_select()
var/mob/living/carbon/human/user = usr
- if(select)
- select = 0
- user << "You switch to grenades."
- else
+ if(!select)
select = 1
- user << "You switch to bullets."
-
+ burst_size = initial(burst_size)
+ fire_delay = initial(fire_delay)
+ user << "You switch to [burst_size]-rnd burst."
+ if(select == 1)
+ select = 2
+ user << "You switch to grenades."
+ if(select == 2)
+ select = 0
+ burst_size = 1
+ fire_delay = 0
+ user << "You switch to semi-auto."
update_icon()
return
-/obj/item/weapon/gun/projectile/automatic/c90gl/ui_action_click()
- underbarrel_swap()
-
-
-
/obj/item/weapon/gun/projectile/automatic/tommygun
name = "tommy gun"
desc = "A genuine 'Chicago Typewriter'."
@@ -218,3 +223,4 @@
mag_type = /obj/item/ammo_box/magazine/tommygunm45
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
can_suppress = 0
+ burst_size = 4
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index 1ef80e2a3f9..31773285919 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -28,6 +28,8 @@
fire_sound = 'sound/effects/Explosion1.ogg'
origin_tech = "combat=3"
mag_type = /obj/item/ammo_box/magazine/m75
+ burst_size = 1
+ fire_delay = 0
/obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(var/eject_casing = 0, var/empty_chamber = 1)
..()
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 7e29cfbf8bc..4ed58eba2c9 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -6,42 +6,38 @@
origin_tech = "combat=2;materials=2;syndicate=2"
mag_type = /obj/item/ammo_box/magazine/m10mm
can_suppress = 1
+ burst_size = 1
+ fire_delay = 0
/obj/item/weapon/gun/projectile/automatic/pistol/update_icon()
..()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
return
-/obj/item/weapon/gun/projectile/automatic/m1911
+/obj/item/weapon/gun/projectile/automatic/pistol/m1911
name = "M1911 pistol"
desc = "A classic .45 handgun with a small magazine capacity."
- icon_state = "pistol"
+ icon_state = "m1911"
w_class = 3
mag_type = /obj/item/ammo_box/magazine/m45
-/obj/item/weapon/gun/projectile/automatic/pistol45/update_icon()
- ..()
- icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
- return
-
-
-/obj/item/weapon/gun/projectile/automatic/deagle
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle
name = "desert eagle"
desc = "A robust .50 AE handgun."
icon_state = "deagle"
force = 14
mag_type = /obj/item/ammo_box/magazine/m50
-/obj/item/weapon/gun/projectile/automatic/deagle/update_icon()
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/update_icon()
..()
icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
-/obj/item/weapon/gun/projectile/automatic/deagle/gold
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/gold
desc = "A gold plated desert eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
icon_state = "deagleg"
item_state = "deagleg"
-/obj/item/weapon/gun/projectile/automatic/deagle/camo
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/camo
desc = "A Deagle brand Deagle for operators operating operationally. Uses .50 AE ammo."
icon_state = "deaglecamo"
item_state = "deagleg"
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 9683e458354..f07dde7e94f 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -196,4 +196,36 @@
update_icon()
return
else
- sawn_state = SAWN_INTACT
\ No newline at end of file
+ sawn_state = SAWN_INTACT
+
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog
+ name = "syndicate shotgun"
+ desc = "A compact, mag-fed burst-fire shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
+ icon_state = "bulldog"
+ item_state = "bulldog"
+ w_class = 3.0
+ origin_tech = "combat=5;materials=4;syndicate=6"
+ mag_type = /obj/item/ammo_box/magazine/m12g
+ fire_sound = 'sound/weapons/Gunshot.ogg'
+ can_suppress = 0
+ burst_size = 2
+ fire_delay = 1
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/New()
+ ..()
+ update_icon()
+ return
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/proc/update_magazine()
+ if(magazine)
+ src.overlays = 0
+ overlays += "[magazine.icon_state]"
+ return
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/update_icon()
+ src.overlays = 0
+ update_magazine()
+ icon_state = "bulldog[chambered ? "" : "-e"]"
+ return
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/afterattack()
+ ..()
+ empty_alarm()
+ return
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index d2dc5b61e67..8fa9b8b795d 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -35,14 +35,31 @@
var/stutter = 0
var/eyeblur = 0
var/drowsy = 0
+ var/stamina = 0
+ var/jitter = 0
var/forcedodge = 0
+ var/range = 0
+ var/proj_hit = 0
+
+/obj/item/projectile/proc/Range()
+ if(range)
+ range--
+ if(range <= 0)
+ on_range()
+ else
+ return
+
+/obj/item/projectile/proc/on_range() //if we want there to be effects when they reach the end of their range
+ proj_hit = 1
+ qdel(src)
+
/obj/item/projectile/proc/on_hit(atom/target, blocked = 0, hit_zone)
if(!isliving(target)) return 0
if(isanimal(target)) return 0
var/mob/living/L = target
L.on_hit(type)
- return L.apply_effects(stun, weaken, paralyze, irradiate, stutter, eyeblur, drowsy, blocked)
+ return L.apply_effects(stun, weaken, paralyze, irradiate, stutter, eyeblur, drowsy, blocked, stamina, jitter)
/obj/item/projectile/proc/vol_by_damage()
if(src.damage)
@@ -115,6 +132,3 @@
Bump(original)
Range()
sleep(1)
-
-/obj/item/projectile/proc/Range()
- return
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index d6bfe72329a..d9bba99275d 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -36,6 +36,13 @@
irradiate = 30
forcedodge = 1
+/obj/item/projectile/beam/disabler
+ name = "disabler beam"
+ icon_state = "omnilaser"
+ damage = 33
+ damage_type = STAMINA
+ eyeblur = 0
+
/obj/item/projectile/beam/pulse
name = "pulse"
icon_state = "u_laser"
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index a3634a488f6..8b9d357efe8 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -9,14 +9,12 @@
/obj/item/projectile/bullet/weakbullet
damage = 5
- stun = 5
- weaken = 5
+ stamina = 33
/obj/item/projectile/bullet/weakbullet2
damage = 15
- stun = 5
- weaken = 5
+ stamina = 75 //the detective can't shoot in bursts and will get yelled at if he sinks 50 rounds into perps to stun 'em
/obj/item/projectile/bullet/weakbullet3
damage = 20
@@ -30,8 +28,7 @@
/obj/item/projectile/bullet/midbullet
damage = 20
- stun = 5
- weaken = 5
+ stamina = 50 //two round bursts from the c20r
/obj/item/projectile/bullet/midbullet2
damage = 25
@@ -46,11 +43,7 @@
/obj/item/projectile/bullet/stunshot
name = "stunshot"
damage = 5
- stun = 5
- weaken = 5
- stutter = 5
-
-/obj/item/projectile/bullet/incendiary
+ stamina = 50 //two round bursts from the bulldog
/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0)
..()
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index 2f64825d1fd..f89f265115f 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -14,14 +14,26 @@
stun = 5
weaken = 5
stutter = 5
+ jitter = 20
hitsound = "sparks"
+ range = 7
- on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/energy/electrode/on_hit(var/atom/target, var/blocked = 0)
+ if(!proj_hit)
if(!ismob(target) || blocked >= 2) //Fully blocked by mob or collided with dense object - burst into sparks!
var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread
sparks.set_up(1, 1, src)
sparks.start()
- ..()
+ proj_hit = 1
+ ..()
+
+/obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
+ if(!proj_hit)
+ var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread
+ sparks.set_up(1, 1, src)
+ sparks.start()
+ proj_hit = 1
+ ..()
/obj/item/projectile/energy/declone
name = "radiation beam"
@@ -31,39 +43,24 @@
irradiate = 40
-/obj/item/projectile/energy/dart
+/obj/item/projectile/energy/dart //ninja throwing dart
name = "dart"
icon_state = "toxin"
damage = 5
damage_type = TOX
weaken = 5
+ range = 7
-
-/obj/item/projectile/energy/bolt
+/obj/item/projectile/energy/bolt //ebow bolts
name = "bolt"
icon_state = "cbbolt"
- damage = 10
+ damage = 15
damage_type = TOX
nodamage = 0
weaken = 5
stutter = 5
-
+ range = 10
/obj/item/projectile/energy/bolt/large
name = "largebolt"
damage = 20
-
-/obj/item/projectile/energy/disabler
- name = "disabler beam"
- icon_state = "omnilaser"
- damage = 34
- damage_type = STAMINA
- var/range = 7
-
-/obj/item/projectile/energy/disabler/Range()
- range--
- if(range <= 0)
- qdel(src)
-
-
-
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 337ccb32d8c..65a0c7c1451 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -18,7 +18,6 @@
damage = 50
flag = "bullet"
-
/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0)
explosion(target, -1, 0, 2)
return 1
@@ -29,6 +28,7 @@
icon_state= "bolter"
damage = 60
flag = "bullet"
+ range = 7
/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0)
explosion(target, -1, 0, 2, 1, 0, flame_range = 3)
@@ -105,7 +105,7 @@
damage = 15
damage_type = BRUTE
flag = "bomb"
- var/range = 3
+ range = 3
obj/item/projectile/kinetic/New()
var/turf/proj_turf = get_turf(src)
@@ -178,4 +178,4 @@ obj/item/projectile/kinetic/New()
/obj/item/projectile/bullet/frag12
name ="explosive slug"
damage = 25
- weaken = 5
\ No newline at end of file
+ weaken = 5
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index a19eaff4eb4..958ed65f986 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -17,6 +17,19 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
var/efficiency_coeff
reagents = new()
+ var/list/categories = list(
+ "AI Modules",
+ "Computer Boards",
+ "Teleportation Machinery",
+ "Medical Machinery",
+ "Engineering Machinery",
+ "Exosuit Modules",
+ "Hydroponics Machinery",
+ "Subspace Telecomms",
+ "Research Machinery",
+ "Misc. Machinery"
+ )
+
/obj/machinery/r_n_d/circuit_imprinter/New()
..()
component_parts = list()
diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm
index d91e8efb90a..9915b0eb92c 100644
--- a/code/modules/research/designs/AI_module_designs.dm
+++ b/code/modules/research/designs/AI_module_designs.dm
@@ -2,79 +2,89 @@
//////////AI Module Disks//////////
///////////////////////////////////
-datum/design/safeguard_module
- name = "AI Module(Safeguard)"
+
+/datum/design/safeguard_module
+ name = "Module Design (Safeguard)"
desc = "Allows for the construction of a Safeguard AI Module."
id = "safeguard_module"
req_tech = list("programming" = 3, "materials" = 4)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/supplied/safeguard
+ category = list("AI Modules")
-datum/design/onehuman_module
- name = "AI Module (OneHuman)"
+/datum/design/onehuman_module
+ name = "Module Design (OneHuman)"
desc = "Allows for the construction of a OneHuman AI Module."
id = "onehuman_module"
req_tech = list("programming" = 4, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/zeroth/oneHuman
+ category = list("AI Modules")
-datum/design/protectstation_module
- name = "AI Module (ProtectStation)"
+/datum/design/protectstation_module
+ name = "Module Design (ProtectStation)"
desc = "Allows for the construction of a ProtectStation AI Module."
id = "protectstation_module"
req_tech = list("programming" = 3, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/supplied/protectStation
+ category = list("AI Modules")
-datum/design/quarantine_module
- name = "AI Module (Quarantine)"
+/datum/design/quarantine_module
+ name = "Module Design (Quarantine)"
desc = "Allows for the construction of a Quarantine AI Module."
id = "quarantine_module"
req_tech = list("programming" = 3, "biotech" = 2, "materials" = 4)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/supplied/quarantine
+ category = list("AI Modules")
-datum/design/oxygen_module
- name = "AI Module (OxygenIsToxicToHumans)"
+
+/datum/design/oxygen_module
+ name = "Module Design (OxygenIsToxicToHumans)"
desc = "Allows for the construction of a Safeguard AI Module."
id = "oxygen_module"
req_tech = list("programming" = 3, "biotech" = 2, "materials" = 4)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/supplied/oxygen
+ category = list("AI Modules")
-datum/design/freeform_module
- name = "AI Module (Freeform)"
+/datum/design/freeform_module
+ name = "Module Design (Freeform)"
desc = "Allows for the construction of a Freeform AI Module."
id = "freeform_module"
req_tech = list("programming" = 4, "materials" = 4)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/supplied/freeform
+ category = list("AI Modules")
-datum/design/reset_module
- name = "AI Module (Reset)"
+/datum/design/reset_module
+ name = "Module Design (Reset)"
desc = "Allows for the construction of a Reset AI Module."
id = "reset_module"
req_tech = list("programming" = 3, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100)
build_path = /obj/item/weapon/aiModule/reset
+ category = list("AI Modules")
-datum/design/purge_module
- name = "AI Module (Purge)"
+/datum/design/purge_module
+ name = "Module Design (Purge)"
desc = "Allows for the construction of a Purge AI Module."
id = "purge_module"
req_tech = list("programming" = 4, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/reset/purge
+ category = list("AI Modules")
-datum/design/freeformcore_module
+/datum/design/freeformcore_module
name = "AI Core Module (Freeform)"
desc = "Allows for the construction of a Freeform AI Core Module."
id = "freeformcore_module"
@@ -82,48 +92,54 @@ datum/design/freeformcore_module
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/core/freeformcore
+ category = list("AI Modules")
-datum/design/asimov
- name = "AI Core Module (Asimov)"
+/datum/design/asimov
+ name = "Core Module Design (Asimov)"
desc = "Allows for the construction of a Asimov AI Core Module."
id = "asimov_module"
req_tech = list("programming" = 3, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/core/full/asimov
+ category = list("AI Modules")
-datum/design/paladin_module
- name = "AI Core Module (P.A.L.A.D.I.N.)"
+/datum/design/paladin_module
+ name = "Core Module Design (P.A.L.A.D.I.N.)"
desc = "Allows for the construction of a P.A.L.A.D.I.N. AI Core Module."
id = "paladin_module"
req_tech = list("programming" = 4, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/core/full/paladin
+ category = list("AI Modules")
-datum/design/tyrant_module
- name = "AI Core Module (T.Y.R.A.N.T.)"
+/datum/design/tyrant_module
+ name = "Core Module Design (T.Y.R.A.N.T.)"
desc = "Allows for the construction of a T.Y.R.A.N.T. AI Module."
id = "tyrant_module"
req_tech = list("programming" = 4, "syndicate" = 2, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/core/full/tyrant
+ category = list("AI Modules")
-datum/design/corporate_module
- name = "AI Core Module (Corporate)"
+/datum/design/corporate_module
+ name = "Core Module Design (Corporate)"
desc = "Allows for the construction of a Corporate AI Core Module."
id = "corporate_module"
req_tech = list("programming" = 4, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
build_path = /obj/item/weapon/aiModule/core/full/corp
+ category = list("AI Modules")
-datum/design/custom_module
- name = "AI Core Module (Custom)"
+/datum/design/custom_module
+ name = "Core Module Design (Custom)"
desc = "Allows for the construction of a Custom AI Core Module."
id = "custom_module"
req_tech = list("programming" = 4, "materials" = 6)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100)
- build_path = /obj/item/weapon/aiModule/core/full/custom
\ No newline at end of file
+ build_path = /obj/item/weapon/aiModule/core/full/custom
+ category = list("AI Modules")
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
new file mode 100644
index 00000000000..71868e610c9
--- /dev/null
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -0,0 +1,500 @@
+///////////////////////////////////
+//////////Autolathe Designs ///////
+///////////////////////////////////
+
+/datum/design/bucket
+ name = "Bucket"
+ id = "bucket"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 200)
+ build_path = /obj/item/weapon/reagent_containers/glass/bucket
+ category = list("initial","Tools")
+
+/datum/design/crowbar
+ name = "Pocket crowbar"
+ id = "crowbar"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50)
+ build_path = /obj/item/weapon/crowbar
+ category = list("initial","Tools")
+
+/datum/design/flashlight
+ name = "Flashlight"
+ id = "flashlight"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 20)
+ build_path = /obj/item/device/flashlight
+ category = list("initial","Tools")
+
+/datum/design/extinguisher
+ name = "Fire extinguisher"
+ id = "extinguisher"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 90)
+ build_path = /obj/item/weapon/extinguisher
+ category = list("initial","Tools")
+
+/datum/design/multitool
+ name = "Multitool"
+ id = "multitool"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 20)
+ build_path = /obj/item/device/multitool
+ category = list("initial","Tools")
+
+/datum/design/analyzer
+ name = "Analyzer"
+ id = "analyzer"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30, "$glass" = 20)
+ build_path = /obj/item/device/analyzer
+ category = list("initial","Tools")
+
+/datum/design/tscanner
+ name = "T-ray scanner"
+ id = "tscanner"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 150)
+ build_path = /obj/item/device/t_scanner
+ category = list("initial","Tools")
+
+/datum/design/weldingtool
+ name = "Welding tool"
+ id = "welding_tool"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 70, "$glass" = 20)
+ build_path = /obj/item/weapon/weldingtool
+ category = list("initial","Tools")
+
+/datum/design/screwdriver
+ name = "Screwdriver"
+ id = "screwdriver"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 75)
+ build_path = /obj/item/weapon/screwdriver
+ category = list("initial","Tools")
+
+/datum/design/wirecutters
+ name = "Wirecutters"
+ id = "wirecutters"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 80)
+ build_path = /obj/item/weapon/wirecutters
+ category = list("initial","Tools")
+
+/datum/design/wrench
+ name = "Wrench"
+ id = "wrench"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 150)
+ build_path = /obj/item/weapon/wrench
+ category = list("initial","Tools")
+
+/datum/design/welding_helmet
+ name = "Welding helmet"
+ id = "welding_helmet"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 1750, "$glass" = 400)
+ build_path = /obj/item/clothing/head/welding
+ category = list("initial","Tools")
+
+/datum/design/console_screen
+ name = "Console screen"
+ id = "console_screen"
+ build_type = AUTOLATHE
+ materials = list("$glass" = 200)
+ build_path = /obj/item/weapon/stock_parts/console_screen
+ category = list("initial", "Electronics")
+
+/datum/design/airlock_board
+ name = "Airlock electronics"
+ id = "airlock_board"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/weapon/airlock_electronics
+ category = list("initial", "Electronics")
+
+/datum/design/airalarm_electronics
+ name = "Air alarm electronics"
+ id = "airalarm_electronics"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/weapon/airalarm_electronics
+ category = list("initial", "Electronics")
+
+/datum/design/firealarm_electronics
+ name = "Fire alarm electronics"
+ id = "firealarm_electronics"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/weapon/firealarm_electronics
+ category = list("initial", "Electronics")
+
+/datum/design/pipe_painter
+ name = "Pipe painter"
+ id = "pipe_painter"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 5000, "$glass" = 2000)
+ build_path = /obj/item/device/pipe_painter
+ category = list("initial", "Misc")
+
+/datum/design/metal
+ name = "Metal"
+ id = "metal"
+ build_type = AUTOLATHE
+ materials = list("$metal" = MINERAL_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/metal
+ category = list("initial","Construction")
+
+/datum/design/glass
+ name = "Glass"
+ id = "glass"
+ build_type = AUTOLATHE
+ materials = list("$glass" = MINERAL_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/glass
+ category = list("initial","Construction")
+
+/datum/design/rglass
+ name = "Reinforced glass"
+ id = "rglass"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 1000, "$glass" = MINERAL_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/rglass
+ category = list("initial","Construction")
+
+/datum/design/rods
+ name = "Metal rod"
+ id = "rods"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 1000)
+ build_path = /obj/item/stack/rods
+ category = list("initial","Construction")
+
+/datum/design/rcd_ammo
+ name = "Compressed matter cardridge"
+ id = "rcd_ammo"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 16000, "$glass"=8000)
+ build_path = /obj/item/weapon/rcd_ammo
+ category = list("initial","Construction")
+
+/datum/design/kitchen_knife
+ name = "Kitchen knife"
+ id = "kitchen_knife"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 12000)
+ build_path = /obj/item/weapon/kitchenknife
+ category = list("initial","Misc")
+
+/datum/design/scalpel
+ name = "Scalpel"
+ id = "scalpel"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 4000, "$glass" = 1000)
+ build_path = /obj/item/weapon/scalpel
+ category = list("initial", "Medical")
+
+/datum/design/circular_saw
+ name = "Circular saw"
+ id = "circular_saw"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 10000, "$glass" = 6000)
+ build_path = /obj/item/weapon/circular_saw
+ category = list("initial", "Medical")
+
+/datum/design/surgicaldrill
+ name = "Surgical drill"
+ id = "surgicaldrill"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 10000, "$glass" = 6000)
+ build_path = /obj/item/weapon/surgicaldrill
+ category = list("initial", "Medical")
+
+/datum/design/retractor
+ name = "Retractor"
+ id = "retractor"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 6000, "$glass" = 3000)
+ build_path = /obj/item/weapon/
+ category = list("initial", "Medical")
+
+/datum/design/cautery
+ name = "Cautery"
+ id = "cautery"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 2500, "$glass" = 750)
+ build_path = /obj/item/weapon/cautery
+ category = list("initial", "Medical")
+
+/datum/design/hemostat
+ name = "Hemostat"
+ id = "hemostat"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 5000, "$glass" = 2500)
+ build_path = /obj/item/weapon/hemostat
+ category = list("initial", "Medical")
+
+/datum/design/beaker
+ name = "Beaker"
+ id = "beaker"
+ build_type = AUTOLATHE
+ materials = list("$glass" = 500)
+ build_path = /obj/item/weapon/reagent_containers/glass/beaker
+ category = list("initial", "Medical")
+
+/datum/design/large_beaker
+ name = "Large beaker"
+ id = "large_beaker"
+ build_type = AUTOLATHE
+ materials = list("$glass" = 2500)
+ build_path = /obj/item/weapon/reagent_containers/glass/beaker/large
+ category = list("initial", "Medical")
+
+/datum/design/beanbag_slug
+ name = "Beanbag slug"
+ id = "beanbag_slug"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 250)
+ build_path = /obj/item/ammo_casing/shotgun/beanbag
+ category = list("initial", "Security")
+
+/datum/design/c38
+ name = "Speed loader (.38)"
+ id = "c38"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/ammo_box/c38
+ category = list("initial", "Security")
+
+/datum/design/recorder
+ name = "Universal recorder"
+ id = "recorder"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 60, "$glass" = 30)
+ build_path = /obj/item/device/taperecorder/empty
+ category = list("initial", "Misc")
+
+/datum/design/tape
+ name = "Tape"
+ id = "tape"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 20, "$glass" = 5)
+ build_path = /obj/item/device/tape
+ category = list("initial", "Misc")
+
+/datum/design/igniter
+ name = "Igniter"
+ id = "igniter"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 500, "$glass" = 50)
+ build_path = /obj/item/device/assembly/igniter
+ category = list("initial", "Misc")
+
+/datum/design/signaler
+ name = "Remote signaling device"
+ id = "signaler"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 400, "$glass" = 120)
+ build_path = /obj/item/device/assembly/signaler
+ category = list("initial", "T-Comm")
+
+/datum/design/radio_headset
+ name = "Radio headset"
+ id = "radio_headset"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 75)
+ build_path = /obj/item/device/radio/headset
+ category = list("initial", "T-Comm")
+
+/datum/design/bounced_radio
+ name = "Station bounced radio"
+ id = "bounced_radio"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 75, "$glass" = 25)
+ build_path = /obj/item/device/radio/off
+ category = list("initial", "T-Comm")
+
+/datum/design/infrared_emitter
+ name = "Infrared emitter"
+ id = "infrared_emitter"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 1000, "$glass" = 500)
+ build_path = /obj/item/device/assembly/infra
+ category = list("initial", "Misc")
+
+/datum/design/timer
+ name = "Timer"
+ id = "timer"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 500, "$glass" = 50)
+ build_path = /obj/item/device/assembly/timer
+ category = list("initial", "Misc")
+
+/datum/design/voice_analyser
+ name = "Voice analyser"
+ id = "voice_analyser"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 500, "$glass" = 50)
+ build_path = /obj/item/device/assembly/voice
+ category = list("initial", "Misc")
+
+/datum/design/light_tube
+ name = "Light tube"
+ id = "light_tube"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 60, "$glass" = 100)
+ build_path = /obj/item/weapon/light/tube
+ category = list("initial", "Construction")
+
+/datum/design/light_bulb
+ name = "Light bulb"
+ id = "light_bulb"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 60, "$glass" = 100)
+ build_path = /obj/item/weapon/light/bulb
+ category = list("initial", "Construction")
+
+/datum/design/camera_assembly
+ name = "Camera assembly"
+ id = "camera_assembly"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 400, "$glass" = 250)
+ build_path = /obj/item/weapon/camera_assembly
+ category = list("initial", "Construction")
+
+/datum/design/newscaster_frame
+ name = "Newscaster frame"
+ id = "newscaster_frame"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 14000, "$glass" = 8000)
+ build_path = /obj/item/newscaster_frame
+ category = list("initial", "Construction")
+
+/datum/design/syringe
+ name = "Syringe"
+ id = "syringe"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 10, "$glass" = 20)
+ build_path = /obj/item/weapon/reagent_containers/syringe
+ category = list("initial", "Medical")
+
+/datum/design/prox_sensor
+ name = "Proximity sensor"
+ id = "prox_sensor"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 800, "$glass" = 200)
+ build_path = /obj/item/device/assembly/prox_sensor
+ category = list("initial", "Misc")
+
+//hacked autolathe recipes
+/datum/design/flamethrower
+ name = "Flamethrower"
+ id = "flamethrower"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 500)
+ build_path = /obj/item/weapon/flamethrower/full
+ category = list("hacked", "Weapons and ammo")
+
+/datum/design/rcd
+ name = "Rapid construction device (RCD)"
+ id = "rcd"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/weapon/rcd
+ category = list("hacked", "Construction")
+
+/datum/design/rpd
+ name = "Rapid pipe dispenser (RPD)"
+ id = "rpd"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 75000, "$glass" = 37500)
+ build_path = /obj/item/weapon/pipe_dispenser
+ category = list("hacked", "Construction")
+
+/datum/design/electropack
+ name = "Electropack"
+ id = "electropack"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 10000, "$glass" = 2500)
+ build_path = /obj/item/device/electropack
+ category = list("hacked", "Tools")
+
+/datum/design/large_welding_tool
+ name = "Industrial welding tool"
+ id = "large_welding_tool"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 70, "$glass" = 60)
+ build_path = /obj/item/weapon/weldingtool/largetank
+ category = list("hacked", "Tools")
+
+/datum/design/handcuffs
+ name = "Handcuffs"
+ id = "handcuffs"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 500)
+ build_path = /obj/item/weapon/restraints/handcuffs
+ category = list("hacked", "Security")
+
+/datum/design/shotgun_slug
+ name = "Shotgun slug"
+ id = "shotgun_slug"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 4000)
+ build_path = /obj/item/ammo_casing/shotgun
+ category = list("hacked", "Security")
+
+/datum/design/buckshot_shell
+ name = "Buckshot shell"
+ id = "buckshot_shell"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 4000)
+ build_path = /obj/item/ammo_casing/shotgun/buckshot
+ category = list("hacked", "Security")
+
+/datum/design/shotgun_dart
+ name = "Shotgun dart"
+ id = "shotgun_dart"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 4000)
+ build_path = /obj/item/ammo_casing/shotgun/dart
+ category = list("hacked", "Security")
+
+/datum/design/incendiary_slug
+ name = "Incendiary slug"
+ id = "incendiary_slug"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 4000)
+ build_path = /obj/item/ammo_casing/shotgun/incendiary
+ category = list("hacked", "Security")
+
+/datum/design/a357
+ name = "Ammo box (.357)"
+ id = "a357"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/ammo_box/a357
+ category = list("hacked", "Security")
+
+/datum/design/c10mm
+ name = "Ammo box (10mm)"
+ id = "c10mm"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/ammo_box/c10mm
+ category = list("hacked", "Security")
+
+/datum/design/c45
+ name = "Ammo box (.45)"
+ id = "c45"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/ammo_box/c45
+ category = list("hacked", "Security")
+
+/datum/design/c9mm
+ name = "Ammo box (9mm)"
+ id = "c9mm"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 30000)
+ build_path = /obj/item/ammo_box/c9mm
+ category = list("hacked", "Security")
diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 599e9700966..297a1eaa353 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -1,6 +1,6 @@
///////////////////Computer Boards///////////////////////////////////
-datum/design/seccamera
+/datum/design/seccamera
name = "Computer Design (Security)"
desc = "Allows for the construction of circuit boards used to build security camera computers."
id = "seccamera"
@@ -8,8 +8,9 @@ datum/design/seccamera
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/security
+ category = list("Computer Boards")
-datum/design/aicore
+/datum/design/aicore
name = "AI Design (AI Core)"
desc = "Allows for the construction of circuit boards used to build new AI cores."
id = "aicore"
@@ -17,8 +18,9 @@ datum/design/aicore
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/aicore
+ category = list("Computer Boards")
-datum/design/aiupload
+/datum/design/aiupload
name = "Computer Design (AI Upload)"
desc = "Allows for the construction of circuit boards used to build an AI Upload Console."
id = "aiupload"
@@ -26,8 +28,9 @@ datum/design/aiupload
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/aiupload
+ category = list("Computer Boards")
-datum/design/borgupload
+/datum/design/borgupload
name = "Computer Design (Cyborg Upload)"
desc = "Allows for the construction of circuit boards used to build a Cyborg Upload Console."
id = "borgupload"
@@ -35,8 +38,9 @@ datum/design/borgupload
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/borgupload
+ category = list("Computer Boards")
-datum/design/med_data
+/datum/design/med_data
name = "Computer Design (Medical Records)"
desc = "Allows for the construction of circuit boards used to build a medical records console."
id = "med_data"
@@ -44,8 +48,9 @@ datum/design/med_data
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/med_data
+ category = list("Computer Boards")
-datum/design/operating
+/datum/design/operating
name = "Computer Design (Operating Computer)"
desc = "Allows for the construction of circuit boards used to build an operating computer console."
id = "operating"
@@ -53,8 +58,9 @@ datum/design/operating
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/operating
+ category = list("Computer Boards")
-datum/design/pandemic
+/datum/design/pandemic
name = "Computer Design (PanD.E.M.I.C. 2200)"
desc = "Allows for the construction of circuit boards used to build a PanD.E.M.I.C. 2200 console."
id = "pandemic"
@@ -62,8 +68,9 @@ datum/design/pandemic
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/pandemic
+ category = list("Computer Boards")
-datum/design/scan_console
+/datum/design/scan_console
name = "Computer Design (DNA Machine)"
desc = "Allows for the construction of circuit boards used to build a new DNA scanning console."
id = "scan_console"
@@ -71,8 +78,9 @@ datum/design/scan_console
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/scan_consolenew
+ category = list("Computer Boards")
-datum/design/comconsole
+/datum/design/comconsole
name = "Computer Design (Communications)"
desc = "Allows for the construction of circuit boards used to build a communications console."
id = "comconsole"
@@ -80,8 +88,9 @@ datum/design/comconsole
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/communications
+ category = list("Computer Boards")
-datum/design/idcardconsole
+/datum/design/idcardconsole
name = "Computer Design (ID Console)"
desc = "Allows for the construction of circuit boards used to build an ID computer."
id = "idcardconsole"
@@ -89,8 +98,9 @@ datum/design/idcardconsole
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/card
+ category = list("Computer Boards")
-datum/design/crewconsole
+/datum/design/crewconsole
name = "Computer Design (Crew monitoring computer)"
desc = "Allows for the construction of circuit boards used to build a Crew monitoring computer."
id = "crewconsole"
@@ -98,8 +108,9 @@ datum/design/crewconsole
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/crew
+ category = list("Computer Boards")
-datum/design/teleconsole
+/datum/design/teleconsole
name = "Computer Design (Teleporter Console)"
desc = "Allows for the construction of circuit boards used to build a teleporter control console."
id = "teleconsole"
@@ -107,8 +118,9 @@ datum/design/teleconsole
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/teleporter
+ category = list("Computer Boards")
-datum/design/secdata
+/datum/design/secdata
name = "Computer Design (Security Records Console)"
desc = "Allows for the construction of circuit boards used to build a security records console."
id = "secdata"
@@ -116,8 +128,9 @@ datum/design/secdata
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/secure_data
+ category = list("Computer Boards")
-datum/design/atmosalerts
+/datum/design/atmosalerts
name = "Computer Design (Atmosphere Alert)"
desc = "Allows for the construction of circuit boards used to build an atmosphere alert console."
id = "atmosalerts"
@@ -125,8 +138,9 @@ datum/design/atmosalerts
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/atmos_alert
+ category = list("Computer Boards")
-datum/design/air_management
+/datum/design/air_management
name = "Computer Design (Atmospheric Monitor)"
desc = "Allows for the construction of circuit boards used to build an Atmospheric Monitor."
id = "air_management"
@@ -134,8 +148,9 @@ datum/design/air_management
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/air_management
+ category = list("Computer Boards")
-datum/design/robocontrol
+/datum/design/robocontrol
name = "Computer Design (Robotics Control Console)"
desc = "Allows for the construction of circuit boards used to build a Robotics Control console."
id = "robocontrol"
@@ -143,8 +158,9 @@ datum/design/robocontrol
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/robotics
+ category = list("Computer Boards")
-datum/design/clonecontrol
+/datum/design/clonecontrol
name = "Computer Design (Cloning Machine Console)"
desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console."
id = "clonecontrol"
@@ -152,8 +168,9 @@ datum/design/clonecontrol
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/cloning
+ category = list("Computer Boards")
-datum/design/clonepod
+/datum/design/clonepod
name = "Machine Design (Clone Pod)"
desc = "Allows for the construction of circuit boards used to build a Cloning Pod."
id = "clonepod"
@@ -161,8 +178,9 @@ datum/design/clonepod
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/clonepod
+ category = list("Computer Boards")
-datum/design/clonescanner
+/datum/design/clonescanner
name = "Machine Design (Cloning Scanner)"
desc = "Allows for the construction of circuit boards used to build a Cloning Scanner."
id = "clonescanner"
@@ -170,8 +188,9 @@ datum/design/clonescanner
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/clonescanner
+ category = list("Computer Boards")
-datum/design/arcadebattle
+/datum/design/arcadebattle
name = "Computer Design (Battle Arcade Machine)"
desc = "Allows for the construction of circuit boards used to build a new arcade machine."
id = "arcademachine"
@@ -179,8 +198,9 @@ datum/design/arcadebattle
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/arcade/battle
+ category = list("Computer Boards")
-datum/design/orion_trail
+/datum/design/orion_trail
name = "Computer Design (Orion Trail Arcade Machine)"
desc = "Allows for the construction of circuit boards used to build a new Orion Trail machine."
id = "arcademachine"
@@ -188,8 +208,9 @@ datum/design/orion_trail
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/arcade/orion_trail
+ category = list("Computer Boards")
-datum/design/orion_trail
+/datum/design/orion_trail
name = "Computer Design (Slot Machine)"
desc = "Allows for the construction of circuit boards used to build a new slot machine."
id = "slotmachine"
@@ -197,8 +218,9 @@ datum/design/orion_trail
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/slot_machine
+ category = list("Computer Boards")
-datum/design/powermonitor
+/datum/design/powermonitor
name = "Computer Design (Power Monitor)"
desc = "Allows for the construction of circuit boards used to build a new power monitor."
id = "powermonitor"
@@ -206,8 +228,9 @@ datum/design/powermonitor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/powermonitor
+ category = list("Computer Boards")
-datum/design/solarcontrol
+/datum/design/solarcontrol
name = "Computer Design (Solar Control)"
desc = "Allows for the construction of circuit boards used to build a solar control console."
id = "solarcontrol"
@@ -215,8 +238,9 @@ datum/design/solarcontrol
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/solar_control
+ category = list("Computer Boards")
-datum/design/prisonmanage
+/datum/design/prisonmanage
name = "Computer Design (Prisoner Management Console)"
desc = "Allows for the construction of circuit boards used to build a prisoner management console."
id = "prisonmanage"
@@ -224,8 +248,9 @@ datum/design/prisonmanage
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/prisoner
+ category = list("Computer Boards")
-datum/design/mechacontrol
+/datum/design/mechacontrol
name = "Computer Design (Exosuit Control Console)"
desc = "Allows for the construction of circuit boards used to build an exosuit control console."
id = "mechacontrol"
@@ -233,8 +258,9 @@ datum/design/mechacontrol
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha_control
+ category = list("Computer Boards")
-datum/design/mechapower
+/datum/design/mechapower
name = "Computer Design (Mech Bay Power Control Console)"
desc = "Allows for the construction of circuit boards used to build a mech bay power control console."
id = "mechapower"
@@ -242,8 +268,9 @@ datum/design/mechapower
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mech_bay_power_console
+ category = list("Computer Boards")
-datum/design/rdconsole
+/datum/design/rdconsole
name = "Computer Design (R&D Console)"
desc = "Allows for the construction of circuit boards used to build a new R&D console."
id = "rdconsole"
@@ -251,8 +278,9 @@ datum/design/rdconsole
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/rdconsole
+ category = list("Computer Boards")
-datum/design/ordercomp
+/datum/design/ordercomp
name = "Computer Design (Supply ordering console)"
desc = "Allows for the construction of circuit boards used to build a Supply ordering console."
id = "ordercomp"
@@ -260,8 +288,9 @@ datum/design/ordercomp
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/ordercomp
+ category = list("Computer Boards")
-datum/design/supplycomp
+/datum/design/supplycomp
name = "Computer Design (Supply shuttle console)"
desc = "Allows for the construction of circuit boards used to build a Supply shuttle console."
id = "supplycomp"
@@ -269,8 +298,9 @@ datum/design/supplycomp
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/supplycomp
+ category = list("Computer Boards")
-datum/design/mining
+/datum/design/mining
name = "Computer Design (Outpost Status Display)"
desc = "Allows for the construction of circuit boards used to build an outpost status display console."
id = "mining"
@@ -278,8 +308,9 @@ datum/design/mining
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mining
+ category = list("Computer Boards")
-datum/design/comm_monitor
+/datum/design/comm_monitor
name = "Computer Design (Telecommunications Monitoring Console)"
desc = "Allows for the construction of circuit boards used to build a telecommunications monitor."
id = "comm_monitor"
@@ -287,8 +318,9 @@ datum/design/comm_monitor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/comm_monitor
+ category = list("Computer Boards")
-datum/design/comm_server
+/datum/design/comm_server
name = "Computer Design (Telecommunications Server Monitoring Console)"
desc = "Allows for the construction of circuit boards used to build a telecommunication server browser and monitor."
id = "comm_server"
@@ -296,8 +328,9 @@ datum/design/comm_server
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/comm_server
+ category = list("Computer Boards")
-datum/design/message_monitor
+/datum/design/message_monitor
name = "Computer Design (Messaging Monitor Console)"
desc = "Allows for the construction of circuit boards used to build a messaging monitor console."
id = "message_monitor"
@@ -305,8 +338,9 @@ datum/design/message_monitor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/message_monitor
+ category = list("Computer Boards")
-datum/design/comm_traffic
+/datum/design/comm_traffic
name = "Computer Design (Telecommunications Traffic Control Console)"
desc = "Allows for the construction of circuit boards used to build a telecommunications traffic control console."
id = "comm_traffic"
@@ -314,8 +348,9 @@ datum/design/comm_traffic
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/comm_traffic
+ category = list("Computer Boards")
-datum/design/telesci_console
+/datum/design/telesci_console
name = "Computer Design (Telepad Control Console Board)"
desc = "Allows for the construction of circuit boards used to build a telescience console."
id = "telesci_console"
@@ -323,12 +358,14 @@ datum/design/telesci_console
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telesci_console
+ category = list("Computer Boards")
-datum/design/aifixer
+/datum/design/aifixer
name = "Computer Design (AI Integrity Restorer)"
desc = "Allows for the construction of circuit boards used to build an AI Integrity Restorer."
id = "aifixer"
req_tech = list("programming" = 3, "biotech" = 2)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/aifixer
\ No newline at end of file
+ build_path = /obj/item/weapon/circuitboard/aifixer
+ category = list("Computer Boards")
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index bc0d01dd8fb..bcd39b203e3 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -2,7 +2,7 @@
//////////////MISC Boards///////////////
////////////////////////////////////////
-datum/design/smes
+/datum/design/smes
name = "Machine Design (SMES Board)"
desc = "The circuit board for a SMES."
id = "smes"
@@ -10,8 +10,9 @@ datum/design/smes
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/smes
+ category = list ("Engineering Machinery")
-datum/design/turbine_computer
+/datum/design/turbine_computer
name = "Computer Design (Power Turbine Console Board)"
desc = "The circuit board for a power turbine console."
id = "power_turbine_console"
@@ -19,8 +20,9 @@ datum/design/turbine_computer
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/turbine_computer
+ category = list ("Engineering Machinery")
-datum/design/power_compressor
+/datum/design/power_compressor
name = "Machine Design (Power Compressor Board)"
desc = "The circuit board for a power compressor."
id = "power_compressor"
@@ -28,8 +30,9 @@ datum/design/power_compressor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/power_compressor
+ category = list ("Engineering Machinery")
-datum/design/power_turbine
+/datum/design/power_turbine
name = "Machine Design (Power Turbine Board)"
desc = "The circuit board for a power turbine."
id = "power_turbine"
@@ -37,53 +40,9 @@ datum/design/power_turbine
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/power_turbine
+ category = list ("Engineering Machinery")
-datum/design/teleport_station
- name = "Machine Design (Teleportation Station Board)"
- desc = "The circuit board for a teleportation station."
- id = "tele_station"
- req_tech = list("programming" = 4, "bluespace" = 4, "engineering" = 4)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/teleporter_station
-
-datum/design/teleport_hub
- name = "Machine Design (Teleportation Hub Board)"
- desc = "The circuit board for a teleportation hub."
- id = "tele_hub"
- req_tech = list("programming" = 3, "bluespace" = 5, "materials" = 4, "engineering" = 5)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/teleporter_hub
-
-datum/design/telepad
- name = "Machine Design (Telepad Board)"
- desc = "The circuit board for a telescience telepad."
- id = "telepad"
- req_tech = list("programming" = 4, "bluespace" = 4, "materials" = 3, "engineering" = 3)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/telesci_pad
-
-datum/design/sleeper
- name = "Machine Design (Sleeper Board)"
- desc = "The circuit board for a sleeper."
- id = "sleeper"
- req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3, "engineering" = 3)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/sleeper
-
-datum/design/cryotube
- name = "Machine Design (Cryotube Board)"
- desc = "The circuit board for a cryotube."
- id = "cryotube"
- req_tech = list("programming" = 4, "biotech" = 3, "engineering" = 4)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/cryo_tube
-
-datum/design/thermomachine
+/datum/design/thermomachine
name = "Machine Design (Freezer/Heater Board)"
desc = "The circuit board for a freezer/heater."
id = "thermomachine"
@@ -91,35 +50,59 @@ datum/design/thermomachine
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/thermomachine
+ category = list ("Engineering Machinery")
-datum/design/biogenerator
- name = "Machine Design (Biogenerator Board)"
- desc = "The circuit board for a biogenerator."
- id = "biogenerator"
- req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3)
+/datum/design/teleport_station
+ name = "Machine Design (Teleportation Station Board)"
+ desc = "The circuit board for a teleportation station."
+ id = "tele_station"
+ req_tech = list("programming" = 4, "bluespace" = 4, "engineering" = 4)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/biogenerator
+ build_path = /obj/item/weapon/circuitboard/teleporter_station
+ category = list ("Teleportation Machinery")
-datum/design/hydroponics
- name = "Machine Design (Hydroponics Tray Board)"
- desc = "The circuit board for a hydroponics tray."
- id = "hydro_tray"
- req_tech = list("programming" = 1, "biotech" = 1)
+/datum/design/teleport_hub
+ name = "Machine Design (Teleportation Hub Board)"
+ desc = "The circuit board for a teleportation hub."
+ id = "tele_hub"
+ req_tech = list("programming" = 3, "bluespace" = 5, "materials" = 4, "engineering" = 5)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/hydroponics
+ build_path = /obj/item/weapon/circuitboard/teleporter_hub
+ category = list ("Teleportation Machinery")
-datum/design/microwave
- name = "Machine Design (Microwave Board)"
- desc = "The circuit board for a microwave."
- id = "microwave"
- req_tech = list("programming" = 1)
+/datum/design/telepad
+ name = "Machine Design (Telepad Board)"
+ desc = "The circuit board for a telescience telepad."
+ id = "telepad"
+ req_tech = list("programming" = 4, "bluespace" = 4, "materials" = 3, "engineering" = 3)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/microwave
+ build_path = /obj/item/weapon/circuitboard/telesci_pad
+ category = list ("Teleportation Machinery")
-datum/design/chem_dispenser
+/datum/design/sleeper
+ name = "Machine Design (Sleeper Board)"
+ desc = "The circuit board for a sleeper."
+ id = "sleeper"
+ req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3, "engineering" = 3)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/sleeper
+ category = list ("Medical Machinery")
+
+/datum/design/cryotube
+ name = "Machine Design (Cryotube Board)"
+ desc = "The circuit board for a cryotube."
+ id = "cryotube"
+ req_tech = list("programming" = 4, "biotech" = 3, "engineering" = 4)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/cryo_tube
+ category = list ("Medical Machinery")
+
+/datum/design/chem_dispenser
name = "Machine Design (Portable Chem Dispenser Board)"
desc = "The circuit board for a portable chem dispenser."
id = "chem_dispenser"
@@ -127,8 +110,29 @@ datum/design/chem_dispenser
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/chem_dispenser
+ category = list ("Medical Machinery")
-datum/design/destructive_analyzer
+/datum/design/biogenerator
+ name = "Machine Design (Biogenerator Board)"
+ desc = "The circuit board for a biogenerator."
+ id = "biogenerator"
+ req_tech = list("programming" = 3, "biotech" = 2, "materials" = 3)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/biogenerator
+ category = list ("Hydroponics Machinery")
+
+/datum/design/hydroponics
+ name = "Machine Design (Hydroponics Tray Board)"
+ desc = "The circuit board for a hydroponics tray."
+ id = "hydro_tray"
+ req_tech = list("programming" = 1, "biotech" = 1)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/hydroponics
+ category = list ("Hydroponics Machinery")
+
+/datum/design/destructive_analyzer
name = "Machine Design (Destructive Analyzer Board)"
desc = "The circuit board for a destructive analyzer."
id = "destructive_analyzer"
@@ -136,8 +140,9 @@ datum/design/destructive_analyzer
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/destructive_analyzer
+ category = list("Research Machinery")
-datum/design/protolathe
+/datum/design/protolathe
name = "Machine Design (Protolathe Board)"
desc = "The circuit board for a protolathe."
id = "protolathe"
@@ -145,8 +150,9 @@ datum/design/protolathe
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/protolathe
+ category = list("Research Machinery")
-datum/design/circuit_imprinter
+/datum/design/circuit_imprinter
name = "Machine Design (Circuit Imprinter Board)"
desc = "The circuit board for a circuit imprinter."
id = "circuit_imprinter"
@@ -154,17 +160,9 @@ datum/design/circuit_imprinter
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/circuit_imprinter
+ category = list("Research Machinery")
-datum/design/autolathe
- name = "Machine Design (Autolathe Board)"
- desc = "The circuit board for an autolathe."
- id = "autolathe"
- req_tech = list("programming" = 2, "engineering" = 2)
- build_type = IMPRINTER
- materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/autolathe
-
-datum/design/rdservercontrol
+/datum/design/rdservercontrol
name = "Computer Design (R&D Server Control Console Board)"
desc = "The circuit board for an R&D Server Control Console."
id = "rdservercontrol"
@@ -172,8 +170,9 @@ datum/design/rdservercontrol
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/rdservercontrol
+ category = list("Research Machinery")
-datum/design/rdserver
+/datum/design/rdserver
name = "Machine Design (R&D Server Board)"
desc = "The circuit board for an R&D Server."
id = "rdserver"
@@ -181,8 +180,9 @@ datum/design/rdserver
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/rdserver
+ category = list("Research Machinery")
-datum/design/mechfab
+/datum/design/mechfab
name = "Machine Design (Exosuit Fabricator Board)"
desc = "The circuit board for an Exosuit Fabricator."
id = "mechfab"
@@ -190,8 +190,9 @@ datum/design/mechfab
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mechfab
+ category = list("Research Machinery")
-datum/design/cyborgrecharger
+/datum/design/cyborgrecharger
name = "Machine Design (Cyborg Recharger Board)"
desc = "The circuit board for a Cyborg Recharger."
id = "cyborgrecharger"
@@ -199,8 +200,9 @@ datum/design/cyborgrecharger
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/cyborgrecharger
+ category = list("Research Machinery")
-datum/design/mech_recharger
+/datum/design/mech_recharger
name = "Machine Design (Mechbay Recharger Board)"
desc = "The circuit board for a Mechbay Recharger."
id = "mech_recharger"
@@ -208,8 +210,29 @@ datum/design/mech_recharger
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mech_recharger
+ category = list("Research Machinery")
-datum/design/vendor
+/datum/design/microwave
+ name = "Machine Design (Microwave Board)"
+ desc = "The circuit board for a microwave."
+ id = "microwave"
+ req_tech = list("programming" = 1)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/microwave
+ category = list ("Misc. Machinery")
+
+/datum/design/autolathe
+ name = "Machine Design (Autolathe Board)"
+ desc = "The circuit board for an autolathe."
+ id = "autolathe"
+ req_tech = list("programming" = 2, "engineering" = 2)
+ build_type = IMPRINTER
+ materials = list("$glass" = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/autolathe
+ category = list ("Misc. Machinery")
+
+/datum/design/vendor
name = "Machine Design (Vendor Board)"
desc = "The circuit board for a Vendor."
id = "vendor"
@@ -217,8 +240,9 @@ datum/design/vendor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/vendor
+ category = list ("Misc. Machinery")
-datum/design/ore_redemption
+/datum/design/ore_redemption
name = "Machine Design (Ore Redemption Board)"
desc = "The circuit board for an Ore Redemption machine."
id = "ore_redemption"
@@ -226,13 +250,15 @@ datum/design/ore_redemption
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/ore_redemption
+ category = list ("Misc. Machinery")
-datum/design/mining_equipment_vendor
+/datum/design/mining_equipment_vendor
name = "Machine Design (Mining Rewards Vender Board)"
desc = "The circuit board for a Mining Rewards Vender."
id = "mining_equipment_vendor"
req_tech = list("programming" = 1, "engineering" = 2)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/mining_equipment_vendor
\ No newline at end of file
+ build_path = /obj/item/weapon/circuitboard/mining_equipment_vendor
+ category = list ("Misc. Machinery")
\ No newline at end of file
diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm
index 08d65a3a975..479c91de938 100644
--- a/code/modules/research/designs/mecha_designs.dm
+++ b/code/modules/research/designs/mecha_designs.dm
@@ -10,6 +10,7 @@ datum/design/ripley_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/ripley/main
+ category = list("Exosuit Modules")
datum/design/ripley_peri
name = "Exosuit Module (APLU \"Ripley\" Peripherals Control module)"
@@ -19,6 +20,7 @@ datum/design/ripley_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/ripley/peripherals
+ category = list("Exosuit Modules")
datum/design/odysseus_main
name = "Exosuit Module (\"Odysseus\" Central Control module)"
@@ -28,6 +30,7 @@ datum/design/odysseus_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/odysseus/main
+ category = list("Exosuit Modules")
datum/design/odysseus_peri
name = "Exosuit Module (\"Odysseus\" Peripherals Control module)"
@@ -37,6 +40,7 @@ datum/design/odysseus_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/odysseus/peripherals
+ category = list("Exosuit Modules")
datum/design/gygax_main
name = "Exosuit Module (\"Gygax\" Central Control module)"
@@ -46,6 +50,7 @@ datum/design/gygax_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/gygax/main
+ category = list("Exosuit Modules")
datum/design/gygax_peri
name = "Exosuit Module (\"Gygax\" Peripherals Control module)"
@@ -55,6 +60,7 @@ datum/design/gygax_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/gygax/peripherals
+ category = list("Exosuit Modules")
datum/design/gygax_targ
name = "Exosuit Module (\"Gygax\" Weapons & Targeting Control module)"
@@ -64,6 +70,7 @@ datum/design/gygax_targ
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/gygax/targeting
+ category = list("Exosuit Modules")
datum/design/durand_main
name = "Exosuit Module (\"Durand\" Central Control module)"
@@ -73,6 +80,7 @@ datum/design/durand_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/main
+ category = list("Exosuit Modules")
datum/design/durand_peri
name = "Exosuit Module (\"Durand\" Peripherals Control module)"
@@ -82,6 +90,7 @@ datum/design/durand_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals
+ category = list("Exosuit Modules")
datum/design/durand_targ
name = "Exosuit Module (\"Durand\" Weapons & Targeting Control module)"
@@ -91,6 +100,7 @@ datum/design/durand_targ
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting
+ category = list("Exosuit Modules")
datum/design/honker_main
name = "Exosuit Module (\"H.O.N.K\" Central Control module)"
@@ -100,6 +110,7 @@ datum/design/honker_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/honker/main
+ category = list("Exosuit Modules")
datum/design/honker_peri
name = "Exosuit Module (\"H.O.N.K\" Peripherals Control module)"
@@ -109,6 +120,7 @@ datum/design/honker_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/honker/peripherals
+ category = list("Exosuit Modules")
datum/design/honker_targ
name = "Exosuit Module (\"H.O.N.K\" Weapons & Targeting Control module)"
@@ -118,6 +130,7 @@ datum/design/honker_targ
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting
+ category = list("Exosuit Modules")
datum/design/phazon_main
name = "Exosuit Module (\"Phazon\" Central Control module)"
@@ -127,6 +140,7 @@ datum/design/phazon_main
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/phazon/main
+ category = list("Exosuit Modules")
datum/design/phazon_peri
name = "Exosuit Module (\"Phazon\" Peripherals Control module)"
@@ -136,6 +150,7 @@ datum/design/phazon_peri
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/phazon/peripherals
+ category = list("Exosuit Modules")
datum/design/phazon_targ
name = "Exosuit Module (\"Phazon\" Weapons & Targeting Control module)"
@@ -145,6 +160,7 @@ datum/design/phazon_targ
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/phazon/targeting
+ category = list("Exosuit Modules")
////////////////////////////////////////
/////////// Mecha Equpment /////////////
@@ -346,4 +362,4 @@ datum/design/mech_generator_nuclear
build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear
materials = list("$metal"=10000,"$glass"=1000,"$silver"=500)
construction_time = 100
- category = list("Exosuit Equipment")
\ No newline at end of file
+ category = list("Exosuit Equipment")
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 6e5143a5e07..013841c43c9 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -11,6 +11,7 @@ datum/design/mass_spectrometer
materials = list("$metal" = 30, "$glass" = 20)
reliability = 76
build_path = /obj/item/device/mass_spectrometer
+ category = list("Medical Designs")
datum/design/adv_mass_spectrometer
name = "Advanced Mass-Spectrometer"
@@ -21,6 +22,7 @@ datum/design/adv_mass_spectrometer
materials = list("$metal" = 30, "$glass" = 20)
reliability = 74
build_path = /obj/item/device/mass_spectrometer/adv
+ category = list("Medical Designs")
datum/design/mmi
name = "Man-Machine Interface"
@@ -32,7 +34,7 @@ datum/design/mmi
construction_time = 75
reliability = 76
build_path = /obj/item/device/mmi
- category = list("Misc")
+ category = list("Misc","Medical Designs")
datum/design/mmi_radio
name = "Radio-enabled Man-Machine Interface"
@@ -44,7 +46,7 @@ datum/design/mmi_radio
construction_time = 75
reliability = 74
build_path = /obj/item/device/mmi/radio_enabled
- category = list("Misc")
+ category = list("Misc","Medical Designs")
datum/design/synthetic_flash
name = "Flash"
@@ -67,7 +69,7 @@ datum/design/bluespacebeaker
materials = list("$metal" = 3000, "$plasma" = 3000, "$diamond" = 500)
reliability = 76
build_path = /obj/item/weapon/reagent_containers/glass/beaker/bluespace
- category = list("Misc")
+ category = list("Misc","Medical Designs")
datum/design/noreactbeaker
name = "Cryostasis Beaker"
@@ -78,7 +80,7 @@ datum/design/noreactbeaker
materials = list("$metal" = 3000)
reliability = 76
build_path = /obj/item/weapon/reagent_containers/glass/beaker/noreact
- category = list("Misc")
+ category = list("Medical Designs")
datum/design/bluespacebodybag
name = "Bluespace body bag"
@@ -89,7 +91,7 @@ datum/design/bluespacebodybag
materials = list("$metal" = 3000, "$plasma" = 2000, "$diamond" = 500)
reliability = 76
build_path = /obj/item/bodybag/bluespace
- category = list("Misc")
+ category = list("Medical Designs")
datum/design/defib
name = "Defibrillator"
@@ -100,4 +102,4 @@ datum/design/defib
materials = list("$metal" = 5000, "$glass" = 2000, "$silver" = 1000)
reliability = 76
build_path = /obj/item/weapon/defibrillator
- category = list("Misc")
\ No newline at end of file
+ category = list("Medical Designs")
diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
index 7e83426acfc..73cb40dc456 100644
--- a/code/modules/research/designs/power_designs.dm
+++ b/code/modules/research/designs/power_designs.dm
@@ -9,9 +9,9 @@ datum/design/basic_cell
req_tech = list("powerstorage" = 1)
build_type = PROTOLATHE | AUTOLATHE |MECHFAB
materials = list("$metal" = 700, "$glass" = 50)
- build_path = /obj/item/weapon/stock_parts/cell
construction_time=100
- category = list("Misc")
+ build_path = /obj/item/weapon/stock_parts/cell
+ category = list("Misc","Power Designs")
datum/design/high_cell
name = "High-Capacity Power Cell"
@@ -22,7 +22,7 @@ datum/design/high_cell
materials = list("$metal" = 700, "$glass" = 60)
construction_time=100
build_path = /obj/item/weapon/stock_parts/cell/high
- category = list("Misc")
+ category = list("Misc","Power Designs")
datum/design/super_cell
name = "Super-Capacity Power Cell"
@@ -34,7 +34,7 @@ datum/design/super_cell
materials = list("$metal" = 700, "$glass" = 70)
construction_time=100
build_path = /obj/item/weapon/stock_parts/cell/super
- category = list("Misc")
+ category = list("Misc","Power Designs")
datum/design/hyper_cell
name = "Hyper-Capacity Power Cell"
@@ -46,7 +46,7 @@ datum/design/hyper_cell
materials = list("$metal" = 400, "$gold" = 150, "$silver" = 150, "$glass" = 80)
construction_time=100
build_path = /obj/item/weapon/stock_parts/cell/hyper
- category = list("Misc")
+ category = list("Misc","Power Designs")
datum/design/light_replacer
name = "Light Replacer"
@@ -56,6 +56,7 @@ datum/design/light_replacer
build_type = PROTOLATHE
materials = list("$metal" = 1500, "$silver" = 150, "$glass" = 3000)
build_path = /obj/item/device/lightreplacer
+ category = list("Power Designs")
datum/design/pacman
name = "Machine Design (PACMAN-type Generator Board)"
@@ -85,4 +86,4 @@ datum/design/mrspacman
build_type = IMPRINTER
reliability = 74
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/pacman/mrs
\ No newline at end of file
+ build_path = /obj/item/weapon/circuitboard/pacman/mrs
diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm
index 1268e86079a..638ef2d97ab 100644
--- a/code/modules/research/designs/stock_parts_designs.dm
+++ b/code/modules/research/designs/stock_parts_designs.dm
@@ -2,7 +2,7 @@
/////////////Stock Parts////////////////
////////////////////////////////////////
-datum/design/RPED
+/datum/design/RPED
name = "Rapid Part Exchange Device"
desc = "Special mechanical module made to store, sort, and apply standard machine parts."
id = "rped"
@@ -11,8 +11,10 @@ datum/design/RPED
build_type = PROTOLATHE
materials = list("$metal" = 15000, "$glass" = 5000) //hardcore
build_path = /obj/item/weapon/storage/part_replacer
+ category = list("Stock Parts")
-datum/design/basic_capacitor
+//Capacitors
+/datum/design/basic_capacitor
name = "Basic Capacitor"
desc = "A stock part used in the construction of various devices."
id = "basic_capacitor"
@@ -20,44 +22,9 @@ datum/design/basic_capacitor
build_type = PROTOLATHE | AUTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
build_path = /obj/item/weapon/stock_parts/capacitor
+ category = list("Stock Parts")
-datum/design/basic_scanning
- name = "Basic Scanning Module"
- desc = "A stock part used in the construction of various devices."
- id = "basic_scanning"
- req_tech = list("magnets" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 50, "$glass" = 20)
- build_path = /obj/item/weapon/stock_parts/scanning_module
-
-datum/design/micro_mani
- name = "Micro Manipulator"
- desc = "A stock part used in the construction of various devices."
- id = "micro_mani"
- req_tech = list("materials" = 1, "programming" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 30)
- build_path = /obj/item/weapon/stock_parts/manipulator
-
-datum/design/basic_micro_laser
- name = "Basic Micro-Laser"
- desc = "A stock part used in the construction of various devices."
- id = "basic_micro_laser"
- req_tech = list("magnets" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 10, "$glass" = 20)
- build_path = /obj/item/weapon/stock_parts/micro_laser
-
-datum/design/basic_matter_bin
- name = "Basic Matter Bin"
- desc = "A stock part used in the construction of various devices."
- id = "basic_matter_bin"
- req_tech = list("materials" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 80)
- build_path = /obj/item/weapon/stock_parts/matter_bin
-
-datum/design/adv_capacitor
+/datum/design/adv_capacitor
name = "Advanced Capacitor"
desc = "A stock part used in the construction of various devices."
id = "adv_capacitor"
@@ -65,8 +32,31 @@ datum/design/adv_capacitor
build_type = PROTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
build_path = /obj/item/weapon/stock_parts/capacitor/adv
+ category = list("Stock Parts")
-datum/design/adv_scanning
+/datum/design/super_capacitor
+ name = "Super Capacitor"
+ desc = "A stock part used in the construction of various devices."
+ id = "super_capacitor"
+ req_tech = list("powerstorage" = 5, "materials" = 4)
+ build_type = PROTOLATHE
+ reliability = 71
+ materials = list("$metal" = 50, "$glass" = 50, "$gold" = 20)
+ build_path = /obj/item/weapon/stock_parts/capacitor/super
+ category = list("Stock Parts")
+
+//Scanning modules
+/datum/design/basic_scanning
+ name = "Basic Scanning Module"
+ desc = "A stock part used in the construction of various devices."
+ id = "basic_scanning"
+ req_tech = list("magnets" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 50, "$glass" = 20)
+ build_path = /obj/item/weapon/stock_parts/scanning_module
+ category = list("Stock Parts")
+
+/datum/design/adv_scanning
name = "Advanced Scanning Module"
desc = "A stock part used in the construction of various devices."
id = "adv_scanning"
@@ -74,8 +64,31 @@ datum/design/adv_scanning
build_type = PROTOLATHE
materials = list("$metal" = 50, "$glass" = 20)
build_path = /obj/item/weapon/stock_parts/scanning_module/adv
+ category = list("Stock Parts")
-datum/design/nano_mani
+/datum/design/phasic_scanning
+ name = "Phasic Scanning Module"
+ desc = "A stock part used in the construction of various devices."
+ id = "phasic_scanning"
+ req_tech = list("magnets" = 5, "materials" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 50, "$glass" = 20, "$silver" = 10)
+ reliability = 72
+ build_path = /obj/item/weapon/stock_parts/scanning_module/phasic
+ category = list("Stock Parts")
+
+//Maipulators
+/datum/design/micro_mani
+ name = "Micro Manipulator"
+ desc = "A stock part used in the construction of various devices."
+ id = "micro_mani"
+ req_tech = list("materials" = 1, "programming" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 30)
+ build_path = /obj/item/weapon/stock_parts/manipulator
+ category = list("Stock Parts")
+
+/datum/design/nano_mani
name = "Nano Manipulator"
desc = "A stock part used in the construction of various devices."
id = "nano_mani"
@@ -83,6 +96,29 @@ datum/design/nano_mani
build_type = PROTOLATHE
materials = list("$metal" = 30)
build_path = /obj/item/weapon/stock_parts/manipulator/nano
+ category = list("Stock Parts")
+
+/datum/design/pico_mani
+ name = "Pico Manipulator"
+ desc = "A stock part used in the construction of various devices."
+ id = "pico_mani"
+ req_tech = list("materials" = 5, "programming" = 2)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 30)
+ reliability = 73
+ build_path = /obj/item/weapon/stock_parts/manipulator/pico
+ category = list("Stock Parts")
+
+//Micro-lasers
+/datum/design/basic_micro_laser
+ name = "Basic Micro-Laser"
+ desc = "A stock part used in the construction of various devices."
+ id = "basic_micro_laser"
+ req_tech = list("magnets" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 10, "$glass" = 20)
+ build_path = /obj/item/weapon/stock_parts/micro_laser
+ category = list("Stock Parts")
datum/design/high_micro_laser
name = "High-Power Micro-Laser"
@@ -92,45 +128,7 @@ datum/design/high_micro_laser
build_type = PROTOLATHE
materials = list("$metal" = 10, "$glass" = 20)
build_path = /obj/item/weapon/stock_parts/micro_laser/high
-
-datum/design/adv_matter_bin
- name = "Advanced Matter Bin"
- desc = "A stock part used in the construction of various devices."
- id = "adv_matter_bin"
- req_tech = list("materials" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 80)
- build_path = /obj/item/weapon/stock_parts/matter_bin/adv
-
-datum/design/super_capacitor
- name = "Super Capacitor"
- desc = "A stock part used in the construction of various devices."
- id = "super_capacitor"
- req_tech = list("powerstorage" = 5, "materials" = 4)
- build_type = PROTOLATHE
- reliability = 71
- materials = list("$metal" = 50, "$glass" = 50, "$gold" = 20)
- build_path = /obj/item/weapon/stock_parts/capacitor/super
-
-datum/design/phasic_scanning
- name = "Phasic Scanning Module"
- desc = "A stock part used in the construction of various devices."
- id = "phasic_scanning"
- req_tech = list("magnets" = 5, "materials" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 20, "$silver" = 10)
- reliability = 72
- build_path = /obj/item/weapon/stock_parts/scanning_module/phasic
-
-datum/design/pico_mani
- name = "Pico Manipulator"
- desc = "A stock part used in the construction of various devices."
- id = "pico_mani"
- req_tech = list("materials" = 5, "programming" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 30)
- reliability = 73
- build_path = /obj/item/weapon/stock_parts/manipulator/pico
+ category = list("Stock Parts")
datum/design/ultra_micro_laser
name = "Ultra-High-Power Micro-Laser"
@@ -141,6 +139,27 @@ datum/design/ultra_micro_laser
materials = list("$metal" = 10, "$glass" = 20, "$uranium" = 10)
reliability = 70
build_path = /obj/item/weapon/stock_parts/micro_laser/ultra
+ category = list("Stock Parts")
+
+datum/design/basic_matter_bin
+ name = "Basic Matter Bin"
+ desc = "A stock part used in the construction of various devices."
+ id = "basic_matter_bin"
+ req_tech = list("materials" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 80)
+ build_path = /obj/item/weapon/stock_parts/matter_bin
+ category = list("Stock Parts")
+
+datum/design/adv_matter_bin
+ name = "Advanced Matter Bin"
+ desc = "A stock part used in the construction of various devices."
+ id = "adv_matter_bin"
+ req_tech = list("materials" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 80)
+ build_path = /obj/item/weapon/stock_parts/matter_bin/adv
+ category = list("Stock Parts")
datum/design/super_matter_bin
name = "Super Matter Bin"
@@ -151,7 +170,9 @@ datum/design/super_matter_bin
materials = list("$metal" = 80)
reliability = 75
build_path = /obj/item/weapon/stock_parts/matter_bin/super
+ category = list("Stock Parts")
+//T-Comms devices
datum/design/subspace_ansible
name = "Subspace Ansible"
desc = "A compact module capable of sensing extradimensional activity."
@@ -160,6 +181,7 @@ datum/design/subspace_ansible
build_type = PROTOLATHE
materials = list("$metal" = 80, "$silver" = 20)
build_path = /obj/item/weapon/stock_parts/subspace/ansible
+ category = list("Stock Parts")
datum/design/hyperwave_filter
name = "Hyperwave Filter"
@@ -169,6 +191,7 @@ datum/design/hyperwave_filter
build_type = PROTOLATHE
materials = list("$metal" = 40, "$silver" = 10)
build_path = /obj/item/weapon/stock_parts/subspace/filter
+ category = list("Stock Parts")
datum/design/subspace_amplifier
name = "Subspace Amplifier"
@@ -178,6 +201,7 @@ datum/design/subspace_amplifier
build_type = PROTOLATHE
materials = list("$metal" = 10, "$gold" = 30, "$uranium" = 15)
build_path = /obj/item/weapon/stock_parts/subspace/amplifier
+ category = list("Stock Parts")
datum/design/subspace_treatment
name = "Subspace Treatment Disk"
@@ -187,6 +211,7 @@ datum/design/subspace_treatment
build_type = PROTOLATHE
materials = list("$metal" = 10, "$silver" = 20)
build_path = /obj/item/weapon/stock_parts/subspace/treatment
+ category = list("Stock Parts")
datum/design/subspace_analyzer
name = "Subspace Analyzer"
@@ -196,6 +221,7 @@ datum/design/subspace_analyzer
build_type = PROTOLATHE
materials = list("$metal" = 10, "$gold" = 15)
build_path = /obj/item/weapon/stock_parts/subspace/analyzer
+ category = list("Stock Parts")
datum/design/subspace_crystal
name = "Ansible Crystal"
@@ -205,6 +231,7 @@ datum/design/subspace_crystal
build_type = PROTOLATHE
materials = list("$glass" = 1000, "$silver" = 20, "$gold" = 20)
build_path = /obj/item/weapon/stock_parts/subspace/crystal
+ category = list("Stock Parts")
datum/design/subspace_transmitter
name = "Subspace Transmitter"
@@ -213,4 +240,5 @@ datum/design/subspace_transmitter
req_tech = list("magnets" = 3, "materials" = 3, "bluespace" = 2)
build_type = PROTOLATHE
materials = list("$glass" = 100, "$silver" = 10, "$uranium" = 15)
- build_path = /obj/item/weapon/stock_parts/subspace/transmitter
\ No newline at end of file
+ build_path = /obj/item/weapon/stock_parts/subspace/transmitter
+ category = list("Stock Parts")
\ No newline at end of file
diff --git a/code/modules/research/designs/telecomms_designs.dm b/code/modules/research/designs/telecomms_designs.dm
index e4de22f4fdd..d43f9c6cdde 100644
--- a/code/modules/research/designs/telecomms_designs.dm
+++ b/code/modules/research/designs/telecomms_designs.dm
@@ -2,7 +2,7 @@
/////Subspace Telecomms////////////
///////////////////////////////////
-datum/design/subspace_receiver
+/datum/design/subspace_receiver
name = "Machine Design (Subspace Receiver)"
desc = "Allows for the construction of Subspace Receiver equipment."
id = "s-receiver"
@@ -10,8 +10,9 @@ datum/design/subspace_receiver
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/receiver
+ category = list("Subspace Telecomms")
-datum/design/telecomms_bus
+/datum/design/telecomms_bus
name = "Machine Design (Bus Mainframe)"
desc = "Allows for the construction of Telecommunications Bus Mainframes."
id = "s-bus"
@@ -19,8 +20,9 @@ datum/design/telecomms_bus
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/bus
+ category = list("Subspace Telecomms")
-datum/design/telecomms_hub
+/datum/design/telecomms_hub
name = "Machine Design (Hub Mainframe)"
desc = "Allows for the construction of Telecommunications Hub Mainframes."
id = "s-hub"
@@ -28,8 +30,9 @@ datum/design/telecomms_hub
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/hub
+ category = list("Subspace Telecomms")
-datum/design/telecomms_relay
+/datum/design/telecomms_relay
name = "Machine Design (Relay Mainframe)"
desc = "Allows for the construction of Telecommunications Relay Mainframes."
id = "s-relay"
@@ -37,8 +40,9 @@ datum/design/telecomms_relay
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/relay
+ category = list("Subspace Telecomms")
-datum/design/telecomms_processor
+/datum/design/telecomms_processor
name = "Machine Design (Processor Unit)"
desc = "Allows for the construction of Telecommunications Processor equipment."
id = "s-processor"
@@ -46,8 +50,9 @@ datum/design/telecomms_processor
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/processor
+ category = list("Subspace Telecomms")
-datum/design/telecomms_server
+/datum/design/telecomms_server
name = "Machine Design (Server Mainframe)"
desc = "Allows for the construction of Telecommunications Servers."
id = "s-server"
@@ -55,12 +60,14 @@ datum/design/telecomms_server
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/telecomms/server
+ category = list("Subspace Telecomms")
-datum/design/subspace_broadcaster
+/datum/design/subspace_broadcaster
name = "Machine Design (Subspace Broadcaster)"
desc = "Allows for the construction of Subspace Broadcasting equipment."
id = "s-broadcaster"
req_tech = list("programming" = 2, "engineering" = 2, "bluespace" = 1)
build_type = IMPRINTER
materials = list("$glass" = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/telecomms/broadcaster
\ No newline at end of file
+ build_path = /obj/item/weapon/circuitboard/telecomms/broadcaster
+ category = list("Subspace Telecomms")
\ No newline at end of file
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 71830875577..fa35c34bacf 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -2,7 +2,7 @@
/////////////////Weapons/////////////////
/////////////////////////////////////////
-datum/design/nuclear_gun
+/datum/design/nuclear_gun
name = "Advanced Energy Gun"
desc = "An energy gun with an experimental miniaturized reactor."
id = "nuclear_gun"
@@ -12,8 +12,9 @@ datum/design/nuclear_gun
reliability = 76
build_path = /obj/item/weapon/gun/energy/gun/nuclear
locked = 1
+ category = list("Weapons")
-datum/design/stunrevolver
+/datum/design/stunrevolver
name = "Stun Revolver"
desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder. The stun cartridges can be recharged using a conventional energy weapon recharger."
id = "stunrevolver"
@@ -22,8 +23,9 @@ datum/design/stunrevolver
materials = list("$metal" = 4000)
build_path = /obj/item/weapon/gun/energy/stunrevolver
locked = 1
+ category = list("Weapons")
-datum/design/tele_shield
+/datum/design/tele_shield
name = "Telescopic Riot Shield"
desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."
id = "tele_shield"
@@ -32,8 +34,9 @@ datum/design/tele_shield
materials = list("$metal" = 4000, "$glass" = 5000, "$silver" = 300)
build_path = /obj/item/weapon/shield/riot/tele
locked = 1
+ category = list("Weapons")
-datum/design/lasercannon
+/datum/design/lasercannon
name = "Laser Cannon"
desc = "A heavy duty laser cannon."
id = "lasercannon"
@@ -42,8 +45,9 @@ datum/design/lasercannon
materials = list("$metal" = 10000, "$glass" = 2000, "$diamond" = 2000)
build_path = /obj/item/weapon/gun/energy/lasercannon
locked = 1
+ category = list("Weapons")
-datum/design/decloner
+/datum/design/decloner
name = "Decloner"
desc = "Your opponent will bubble into a messy pile of goop."
id = "decloner"
@@ -52,18 +56,9 @@ datum/design/decloner
materials = list("$gold" = 5000,"$uranium" = 10000, "mutagen" = 40)
build_path = /obj/item/weapon/gun/energy/decloner
locked = 1
-/*
-datum/design/chemsprayer
- name = "Chem Sprayer"
- desc = "An advanced chem spraying device."
- id = "chemsprayer"
- req_tech = list("combat" = 3, "materials" = 3, "engineering" = 3, "biotech" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 5000, "$glass" = 1000)
- reliability = 100
- build_path = /obj/item/weapon/chemsprayer"
-*/
-datum/design/rapidsyringe
+ category = list("Weapons")
+
+/datum/design/rapidsyringe
name = "Rapid Syringe Gun"
desc = "A gun that fires many syringes."
id = "rapidsyringe"
@@ -71,8 +66,9 @@ datum/design/rapidsyringe
build_type = PROTOLATHE
materials = list("$metal" = 5000, "$glass" = 1000)
build_path = /obj/item/weapon/gun/syringe/rapidsyringe
+ category = list("Weapons")
-datum/design/largecrossbow
+/datum/design/largecrossbow
name = "Energy Crossbow"
desc = "A reverse-engineered energy crossbow favored by syndicate infiltration teams and carp hunters."
id = "largecrossbow"
@@ -81,8 +77,9 @@ datum/design/largecrossbow
materials = list("$metal" = 5000, "$glass" = 1500, "$uranium" = 1500, "$silver" = 1500)
build_path = /obj/item/weapon/gun/energy/crossbow/largecrossbow
locked = 1
+ category = list("Weapons")
-datum/design/temp_gun
+/datum/design/temp_gun
name = "Temperature Gun"
desc = "A gun that shoots temperature bullet energythings to change temperature."//Change it if you want
id = "temp_gun"
@@ -91,8 +88,9 @@ datum/design/temp_gun
materials = list("$metal" = 5000, "$glass" = 500, "$silver" = 3000)
build_path = /obj/item/weapon/gun/energy/temperature
locked = 1
+ category = list("Weapons")
-datum/design/flora_gun
+/datum/design/flora_gun
name = "Floral Somatoray"
desc = "A tool that discharges controlled radiation which induces mutation in plant cells. Harmless to other organic life."
id = "flora_gun"
@@ -100,8 +98,9 @@ datum/design/flora_gun
build_type = PROTOLATHE
materials = list("$metal" = 2000, "$glass" = 500, "radium" = 20)
build_path = /obj/item/weapon/gun/energy/floragun
+ category = list("Weapons")
-datum/design/large_grenade
+/datum/design/large_grenade
name = "Large Grenade"
desc = "A grenade that affects a larger area and use larger containers."
id = "large_Grenade"
@@ -110,8 +109,9 @@ datum/design/large_grenade
materials = list("$metal" = 3000)
reliability = 79
build_path = /obj/item/weapon/grenade/chem_grenade/large
+ category = list("Weapons")
-datum/design/smg
+/datum/design/smg
name = "Prototype Submachine Gun"
desc = "A prototype weapon made using lightweight materials on a traditional frame, designed to fire standard 9mm rounds."
id = "smg"
@@ -120,17 +120,9 @@ datum/design/smg
materials = list("$metal" = 8000, "$silver" = 2000, "$diamond" = 1000)
build_path = /obj/item/weapon/gun/projectile/automatic
locked = 1
+ category = list("Weapons")
-datum/design/mag_smg
- name = "Submachine Gun Magazine (9mm)"
- desc = "A 20-round magazine for the prototype submachine gun."
- id = "mag_smg"
- req_tech = list("combat" = 4, "materials" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 2000)
- build_path = /obj/item/ammo_box/magazine/smgm9mm
-
-datum/design/xray
+/datum/design/xray
name = "Xray Laser Gun"
desc = "Not quite as menacing as it sounds"
id = "xray"
@@ -139,8 +131,9 @@ datum/design/xray
materials = list("$gold" = 5000,"$uranium" = 10000, "$metal" = 4000)
build_path = /obj/item/weapon/gun/energy/xray
locked = 1
+ category = list("Weapons")
-datum/design/ionrifle
+/datum/design/ionrifle
name = "Ion Rifle"
desc = "How to dismantle a cyborg : The gun."
id = "ionrifle"
@@ -149,8 +142,9 @@ datum/design/ionrifle
materials = list("$silver" = 4000, "$metal" = 6000, "$uranium" = 1000)
build_path = /obj/item/weapon/gun/energy/ionrifle
locked = 1
+ category = list("Weapons")
-datum/design/wormhole_projector
+/datum/design/wormhole_projector
name = "Bluespace Wormhole Projector"
desc = "A projector that emits high density quantum-coupled bluespace beams."
id = "wormholeprojector"
@@ -159,8 +153,9 @@ datum/design/wormhole_projector
materials = list("$silver" = 1000, "$metal" = 5000, "$diamond" = 3000)
build_path = /obj/item/weapon/gun/energy/wormhole_projector
locked = 1
+ category = list("Weapons")
-datum/design/reciever
+/datum/design/reciever
name = "Modular Reciever"
desc = "A prototype modular reciever and trigger assembly for a variety of firearms."
id = "reciever"
@@ -168,8 +163,19 @@ datum/design/reciever
build_type = PROTOLATHE
materials = list("$metal" = 6500, "$silver" = 500)
build_path = /obj/item/weaponcrafting/reciever
+ category = list("Weapons")
-datum/design/stunshell
+/datum/design/mag_smg
+ name = "Submachine Gun Magazine (9mm)"
+ desc = "A 20-round magazine for the prototype submachine gun."
+ id = "mag_smg"
+ req_tech = list("combat" = 4, "materials" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 2000)
+ build_path = /obj/item/ammo_box/magazine/smgm9mm
+ category = list("Ammo")
+
+/datum/design/stunshell
name = "Stun Shell"
desc = "A stunning shell for a shotgun."
id = "stunshell"
@@ -177,8 +183,9 @@ datum/design/stunshell
build_type = PROTOLATHE
materials = list("$metal" = 200)
build_path = /obj/item/ammo_casing/shotgun/stunslug
+ category = list("Ammo")
-datum/design/techshell
+/datum/design/techshell
name = "Unloaded Technological Shotshell"
desc = "A high-tech shotgun shell which can be loaded with materials to produce unique effects."
id = "techshotshell"
@@ -186,12 +193,14 @@ datum/design/techshell
build_type = PROTOLATHE
materials = list("$metal" = 1000, "$glass" = 200, "$silver" = 300)
build_path = /obj/item/ammo_casing/shotgun/techshell
+ category = list("Ammo")
-datum/design/suppressor
+/datum/design/suppressor
name = "Universal Suppressor"
desc = "A reverse-engineered universal suppressor that fits on most small arms with threaded barrels."
id = "suppressor"
req_tech = list("combat" = 6, "engineering" = 5, "syndicate" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 2000, "$silver" = 500)
- build_path = /obj/item/weapon/suppressor
\ No newline at end of file
+ build_path = /obj/item/weapon/suppressor
+ category = list("Weapons")
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index d4affb8af14..771d53cd16e 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -25,6 +25,14 @@ Note: Must be placed west/left of and R&D console to function.
var/adamantine_amount = 0.0
var/efficiency_coeff
+ var/list/categories = list(
+ "Power Designs",
+ "Stock Parts",
+ "Medical Designs",
+ "Weapons",
+ "Ammo",
+ )
+
reagents = new()
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 124bbf8599c..7c695ffe718 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -49,6 +49,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
req_access = list(access_tox) //Data and setting manipulation requires scientist access.
+ var/selected_category
+
/obj/machinery/computer/rdconsole/proc/CallTechName(var/ID) //A simple helper proc to find the name of a tech with a given ID.
var/datum/tech/check_tech
@@ -179,6 +181,9 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/temp_screen = text2num(href_list["menu"])
screen = temp_screen
+ if(href_list["category"])
+ selected_category = href_list["category"]
+
else if(href_list["updt_tech"]) //Update the research holder with information from the technology disk.
screen = 0.0
spawn(50)
@@ -413,7 +418,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
else
new_item.loc = linked_lathe.loc
linked_lathe.busy = 0
- screen = 3.1
+ screen = 3.15
updateUsrDialog()
else if(href_list["imprint"]) //Causes the Circuit Imprinter to build something.
@@ -778,31 +783,42 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Protolathe Menu:
"
dat += "Material Amount: [linked_lathe.TotalMaterials()] / [linked_lathe.max_material_storage]
"
dat += "Chemical Volume: [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]
"
+
+ dat += list_categories(linked_lathe.categories, 3.15)
+
+ //Grouping designs by categories, to improve readability
+ if(3.15)
+ dat += "Main Menu"
+ dat += "Protolathe Menu"
+ dat += "Browsing [selected_category]:
"
+ dat += "
Material Amount: [linked_lathe.TotalMaterials()] / [linked_lathe.max_material_storage]
"
+ dat += "
Chemical Volume: [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume]
"
+
var/coeff = linked_lathe.efficiency_coeff
for(var/datum/design/D in files.known_designs)
- if(!(D.build_type & PROTOLATHE))
+ if(!(selected_category in D.category)|| !(D.build_type & PROTOLATHE))
continue
- var/temp_dat = "[D.name]"
var/temp_material
var/c = 50
var/t
for(var/M in D.materials)
t = linked_lathe.check_mat(D, M)
+ temp_material += " | "
if (!t)
- temp_material += "
[D.materials[M]/coeff] [CallMaterialName(M)]"
+ temp_material += "
[D.materials[M]/coeff] [CallMaterialName(M)]"
else
temp_material += " [D.materials[M]/coeff] [CallMaterialName(M)]"
c = min(c,t)
if (c)
- dat += "*
[temp_dat]"
+ dat += "
[D.name]"
if(c >= 5.0)
dat += "
x5"
if(c >= 10.0)
dat += "
x10"
dat += "[temp_material]"
else
- dat += "*
[temp_dat][temp_material]"
+ dat += "
[D.name][temp_material]"
dat += "
"
dat += "
Circuit Imprinter Menu:
"
dat += "Material Amount: [linked_imprinter.TotalMaterials()]
"
dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
"
+
+ dat += list_categories(linked_imprinter.categories, 4.15)
+
+ if(4.15)
+ dat += "Main Menu"
+ dat += "Circuit Imprinter Menu"
+ dat += "Browsing [selected_category]:
"
+ dat += "Material Amount: [linked_imprinter.TotalMaterials()]
"
+ dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
"
+
var/coeff = linked_imprinter.efficiency_coeff
for(var/datum/design/D in files.known_designs)
- if(!(D.build_type & IMPRINTER))
+ if(!(selected_category in D.category) || !(D.build_type & IMPRINTER))
continue
- var/temp_dat = "[D.name]"
var/temp_materials
var/check_materials = 1
for(var/M in D.materials)
+ temp_materials += " | "
if (!linked_imprinter.check_mat(D, M))
check_materials = 0
- temp_materials += "
[D.materials[M]/coeff] [CallMaterialName(M)]"
+ temp_materials += "
[D.materials[M]/coeff] [CallMaterialName(M)]"
else
temp_materials += " [D.materials[M]/coeff] [CallMaterialName(M)]"
if (check_materials)
- dat += "*
[temp_dat][temp_materials]
"
+ dat += "
[D.name][temp_materials]
"
else
- dat += "*
[temp_dat][temp_materials]
"
+ dat += "
[D.name][temp_materials]
"
dat += "
"
+
+ for(var/C in categories)
+ if(line_length > 2)
+ dat += "
"
+ line_length = 1
+
+ dat += "| [C] | "
+ line_length++
+
+ dat += "
"
+ return dat
+
/obj/machinery/computer/rdconsole/robotics
name = "Robotics R&D Console"
desc = "A console used to interface with R&D tools."
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index ef765b17f9e..6fa8bb0536a 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -159,6 +159,26 @@ research holder datum.
if(I.crit_fail)
D.reliability = min(100, D.reliability + rand(3, 5))
+/datum/research/proc/FindDesignByID(var/id)
+ for(var/datum/design/D in known_designs)
+ if(D.id == id)
+ return D
+
+
+//Autolathe files
+/datum/research/autolathe/New()
+ for(var/T in (typesof(/datum/tech) - /datum/tech))
+ possible_tech += new T(src)
+ for(var/path in typesof(/datum/design) - /datum/design)
+ var/datum/design/D = new path(src)
+ possible_designs += D
+ if((D.build_type & AUTOLATHE) && ("initial" in D.category)) //autolathe starts without hacked designs
+ AddDesign2Known(D)
+
+/datum/research/autolathe/AddDesign2Known(var/datum/design/D)
+ if(!(D.build_type & AUTOLATHE))
+ return
+ ..()
/***************************************************************
** Technology Datums **
diff --git a/html/changelogs/Paprika - stuntweaks.yml b/html/changelogs/Paprika - stuntweaks.yml
new file mode 100644
index 00000000000..a37a27e1fc8
--- /dev/null
+++ b/html/changelogs/Paprika - stuntweaks.yml
@@ -0,0 +1,13 @@
+author: Paprika
+delete-after: True
+
+
+changes:
+
+ - experiment: "Taser electrodes now have a limited range of 7 tiles."
+ - experiment: "The energy gun's stun mode has been replaced with a disable mode."
+ - experiment: "Security officers will now spawn with tasers."
+ - tweak: "Disabler beams now go through windows and grilles."
+ - tweak: "Disabler beams now do 33 stamina damage instead of 34. This means they will only stun in 3 hits on someone that is NOT 100% healthy."
+ - tweak: "Most ballistic projectiles now do stamina damage in addition to their regular damage instead of stunning. This includes nuke op c-20r .45, detective's revolver, etc. They are effectively better than disablers at stunning people, as well as do significant damage, but they do not stun instantly like a taser. Expect engagements to be a little longer and plan ahead for this."
+ - rscadd: "Added an advanced taser for RnD, the child of a disabler and a taser."
\ No newline at end of file
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index 012f9616097..bb4f4121a2a 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index a0985007ed0..32316ec15f2 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 3513601fede..30334b16415 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index efe92414824..9cee4e8a3bb 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index e68aa0b2318..819d09b6313 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index b54a3b38536..29b3bd9e767 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index 319de920834..e73f17598ab 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 9107f227f89..ac7af348b0f 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index cf23e987632..848647eae2d 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi
index 91d42d5ec4e..01e5983da03 100644
Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index ccf56de608c..810fa7af430 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -526,6 +526,7 @@
#include "code\game\objects\items\devices\powersink.dm"
#include "code\game\objects\items\devices\recaller.dm"
#include "code\game\objects\items\devices\scanners.dm"
+#include "code\game\objects\items\devices\sensor_device.dm"
#include "code\game\objects\items\devices\taperecorder.dm"
#include "code\game\objects\items\devices\traitordevices.dm"
#include "code\game\objects\items\devices\transfer_valve.dm"
@@ -579,6 +580,7 @@
#include "code\game\objects\items\weapons\paiwire.dm"
#include "code\game\objects\items\weapons\power_cells.dm"
#include "code\game\objects\items\weapons\RCD.dm"
+#include "code\game\objects\items\weapons\RPD.dm"
#include "code\game\objects\items\weapons\RSF.dm"
#include "code\game\objects\items\weapons\scrolls.dm"
#include "code\game\objects\items\weapons\shields.dm"
@@ -1285,6 +1287,7 @@
#include "code\modules\research\research.dm"
#include "code\modules\research\server.dm"
#include "code\modules\research\designs\AI_module_designs.dm"
+#include "code\modules\research\designs\autolathe_designs.dm"
#include "code\modules\research\designs\comp_board_designs.dm"
#include "code\modules\research\designs\machine_designs.dm"
#include "code\modules\research\designs\mecha_designs.dm"