| [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/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index d7bde33688d..8441647f791 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -130,6 +130,7 @@
if(component_check)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
var/obj/machinery/new_machine = new src.circuit.build_path(src.loc)
+ new_machine.construction()
for(var/obj/O in new_machine.component_parts)
qdel(O)
new_machine.component_parts = list()
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index eb5faffcafd..24312770103 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -18,7 +18,6 @@
/obj/machinery/atmospherics/unary/cryo_cell/New()
..()
initialize_directions = dir
- initialize()
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/cryo_tube(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
@@ -29,6 +28,9 @@
component_parts += new /obj/item/stack/cable_coil(null, 1)
RefreshParts()
+/obj/machinery/atmospherics/unary/cryo_cell/construction()
+ ..(dir,dir)
+
/obj/machinery/atmospherics/unary/cryo_cell/RefreshParts()
var/C
for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index e95d705c247..aa6b6139e21 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -67,11 +67,11 @@ for reference:
user.changeNext_move(CLICK_CD_MELEE)
if (istype(W, /obj/item/stack/sheet/mineral/wood))
if (src.health < src.maxhealth)
- visible_message("[user] begins to repair the [src]!")
+ visible_message("[user] begins to repair \the [src]!")
if(do_after(user,20))
src.health = src.maxhealth
W:use(1)
- visible_message("[user] repairs the [src]!")
+ visible_message("[user] repairs \the [src]!")
return
else
return
@@ -173,12 +173,12 @@ for reference:
src.health = src.maxhealth
src.emagged = 0
src.req_access = list(access_security)
- visible_message("[user] repairs the [src]!")
+ visible_message("[user] repairs \the [src]!")
return
else if (src.emagged > 0)
src.emagged = 0
src.req_access = list(access_security)
- visible_message("[user] repairs the [src]!")
+ visible_message("[user] repairs \the [src]!")
return
return
else
@@ -196,7 +196,7 @@ for reference:
if (src.emagged == 0)
src.emagged = 1
src.req_access = null
- user << "You break the ID authentication lock on the [src]."
+ user << "You break the ID authentication lock on \the [src]."
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(2, 1, src)
s.start()
@@ -204,7 +204,7 @@ for reference:
return
else if (src.emagged == 1)
src.emagged = 2
- user << "You short out the anchoring mechanism on the [src]."
+ user << "You short out the anchoring mechanism on \the [src]."
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(2, 1, src)
s.start()
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index da3d9d80101..c775105c5b6 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -36,7 +36,7 @@
var/obj/item/weapon/weldingtool/W = C
if(W.remove_fuel(0, user))
blocked = !blocked
- user << text("You [blocked?"welded":"unwelded"] the [src]")
+ user << text("You [blocked?"welded":"unwelded"] \the [src]")
update_icon()
return
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index f35c1c7a38e..a0cb59823f5 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -200,7 +200,6 @@
/obj/machinery/door/window/mech_melee_attack(obj/mecha/M)
if(M.damtype == "brute")
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
- M.occupant_message("You hit [src].")
visible_message("[M.name] has hit [src].")
take_damage(M.force)
return
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index 959767107ae..410f092e2a6 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -76,10 +76,10 @@
add_fingerprint(user)
src.disable = !src.disable
if (src.disable)
- user.visible_message("[user] has disabled the [src]!", "You disable the connection to the [src].")
+ user.visible_message("[user] has disabled \the [src]!", "You disable the connection to \the [src].")
icon_state = "[base_state]-d"
if (!src.disable)
- user.visible_message("[user] has reconnected the [src]!", "You fix the connection to the [src].")
+ user.visible_message("[user] has reconnected \the [src]!", "You fix the connection to \the [src].")
if(src.powered())
icon_state = "[base_state]"
else
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 857008e4edf..18c4ac4205a 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -242,7 +242,8 @@ Class Procs:
return
//stop AIs from leaving windows open and using then after they lose vision
//apc_override is needed here because AIs use their own APC when powerless
- if(cameranet && !cameranet.checkTurfVis(get_turf(M)) && !apc_override)
+ //get_turf_pixel() is because APCs in maint aren't actually in view of the inner camera
+ if(cameranet && !cameranet.checkTurfVis(get_turf_pixel(M)) && !apc_override)
return
return 1
@@ -334,8 +335,8 @@ Class Procs:
/obj/machinery/proc/default_change_direction_wrench(var/mob/user, var/obj/item/weapon/wrench/W)
if(panel_open && istype(W))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- dir = pick(WEST,EAST,SOUTH,NORTH)
- user << "You clumsily rotate [src]."
+ dir = turn(dir,-90)
+ user << "You rotate [src]."
return 1
return 0
@@ -381,3 +382,7 @@ Class Procs:
W.play_rped_sound()
return 1
return 0
+
+//called on machinery construction (i.e from frame to machinery) but not on initialization
+/obj/machinery/proc/construction()
+ return
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index f63ea425196..85fc2a42869 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -517,6 +517,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
return
if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
usr.set_machine(src)
+ scan_user(usr)
if(href_list["set_channel_name"])
src.channel_name = stripped_input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "", MAX_NAME_LEN)
while (findtext(src.channel_name," ") == 1)
@@ -547,6 +548,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
else
var/choice = alert("Please confirm Feed channel creation","Network Channel Handler","Confirm","Cancel")
if(choice=="Confirm")
+ scan_user(usr)
news_network.CreateFeedChannel(src.channel_name, src.scanned_user, c_locked)
feedback_inc("newscaster_channels",1)
src.screen=5
@@ -632,6 +634,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
else
var/choice = alert("Please confirm Wanted Issue [(input_param==1) ? ("creation.") : ("edit.")]","Network Security Handler","Confirm","Cancel")
if(choice=="Confirm")
+ scan_user(usr)
if(input_param==1) //If input_param == 1 we're submitting a new wanted issue. At 2 we're just editing an existing one. See the else below
var/datum/feed_message/WANTED = new /datum/feed_message
WANTED.author = src.channel_name
@@ -752,6 +755,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
var/datum/feed_message/FM = locate(href_list["new_comment"])
var/cominput = copytext(stripped_input(usr, "Write your message:", "New comment", null),1,141)
if(cominput)
+ scan_user(usr)
var/datum/feed_comment/FC = new/datum/feed_comment
FC.author = scanned_user
FC.body = cominput
@@ -1054,9 +1058,11 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob)
src.scanned_user ="Unknown"
else
src.scanned_user ="Unknown"
- else
+ else if(istype(user,/mob/living/silicon))
var/mob/living/silicon/ai_user = user
src.scanned_user = "[ai_user.name] ([ai_user.job])"
+ else
+ ERROR("Newscaster used by non-human/silicon mob: [user.type]")
/obj/machinery/newscaster/proc/print_paper()
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index d36763e98e8..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
@@ -391,8 +400,8 @@ Buildable meters
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user.visible_message( \
- "[user] fastens the [src].", \
- "You have fastened the [src].", \
+ "[user] fastens \the [src].", \
+ "You have fastened \the [src].", \
"You hear ratchet.")
qdel(src) // remove the pipe item
@@ -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..12bec635546 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -24,7 +24,7 @@
var/locked = 1 //if the turret's behaviour control access is locked
var/controllock = 0 //if the turret responds to control panels
- var/installation = /obj/item/weapon/gun/energy/gun //the type of weapon installed
+ var/installation = /obj/item/weapon/gun/energy/gun/turret //the type of weapon installed
var/gun_charge = 0 //the charge of the gun inserted
var/projectile = null //holder for bullettype
var/eprojectile = null //holder for the shot when emagged
@@ -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'
@@ -137,6 +137,10 @@
eshot_sound = 'sound/weapons/Laser.ogg'
egun = 1
+ if(/obj/item/weapon/gun/energy/gun/turret)
+ eprojectile = /obj/item/projectile/beam //If it has, going to copypaste mode
+ eshot_sound = 'sound/weapons/Laser.ogg'
+ egun = 1
/obj/machinery/porta_turret/Destroy()
//deletes its own cover with it
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/requests_console.dm b/code/game/machinery/requests_console.dm
index 9c1b8ee09cd..97d1777c00b 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -282,6 +282,8 @@ var/list/obj/machinery/requests_console/allConsoles = list()
if(!announcementConsole) return
minor_announce(message, "[department] Announcement:")
news_network.SubmitArticle(message, department, "Station Announcements", null)
+ log_say("[key_name(usr)] has made a station announcement: [message]")
+ message_admins("[key_name_admin(usr)] has made a station announcement.")
announceAuth = 0
message = ""
screen = 0
@@ -308,7 +310,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
for (var/obj/machinery/requests_console/Console in allConsoles)
if (ckey(Console.department) == ckey(href_list["department"]))
switch(priority)
- if(2) //High priority
+ if(2) //High priority
Console.createmessage(src, "PRIORITY Alert in [department]", sending, 2, 1)
if(3) // Extreme Priority
Console.createmessage(src, "EXTREME PRIORITY Alert in [department]", sending, 3, 1)
@@ -366,14 +368,14 @@ var/list/obj/machinery/requests_console/allConsoles = list()
updateUsrDialog()
return
-
+
/obj/machinery/say_quote(var/text)
var/ending = copytext(text, length(text) - 2)
if (ending == "!!!")
return "blares, \"[text]\""
return "beeps, \"[text]\""
-
+
/obj/machinery/requests_console/proc/createmessage(source, title, message, priority, paper)
var/linkedsender
var/unlinkedsender
@@ -429,7 +431,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
var/obj/item/weapon/paper/slip = new /obj/item/weapon/paper(src.loc)
slip.info = "From: [unlinkedsender]
[message]"
slip.name = "Message - [unlinkedsender]"
- src.luminosity = 2
+ src.luminosity = 2
/obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob)
if (istype(O, /obj/item/weapon/crowbar))
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 3c33b98904f..ec9bd835142 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -253,7 +253,7 @@
coil.use(1)
health = max_health
malfunction = 0
- user << "You repair the [src]!"
+ user << "You repair \the [src]!"
update_icon()
else if(istype(W, /obj/item/weapon/wrench))
@@ -262,13 +262,13 @@
return
if(!anchored && !isinspace())
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << " You secure the [src] to the floor!"
+ user << " You secure \the [src] to the floor!"
anchored = 1
else if(anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << " You unsecure the [src] from the floor!"
+ user << " You unsecure \the [src] from the floor!"
if(active)
- user << " The [src] shuts off!"
+ user << " \The [src] shuts off!"
src.shields_down()
anchored = 0
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 08ee0a278b8..58d4ba0cf8f 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -65,7 +65,7 @@
return
else if(istype(I, /obj/item/weapon/screwdriver))
open = !open
- user.visible_message("[user] [open ? "opens" : "closes"] the hatch on the [src].", "You [open ? "open" : "close"] the hatch on the [src].")
+ user.visible_message("[user] [open ? "opens" : "closes"] the hatch on \the [src].", "You [open ? "open" : "close"] the hatch on \the [src].")
update_icon()
if(!open && user.machine == src)
user << browse(null, "window=spaceheater")
@@ -103,7 +103,7 @@
else
on = !on
- user.visible_message("[user] switches [on ? "on" : "off"] the [src].","You switch [on ? "on" : "off"] the [src].")
+ user.visible_message("[user] switches [on ? "on" : "off"] \the [src].","You switch [on ? "on" : "off"] \the [src].")
update_icon()
return
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 5bf69e5fcad..58d962377aa 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -431,7 +431,7 @@
user.last_special = world.time + CLICK_CD_BREAKOUT
var/breakout_time = 2
user << "You start kicking against the doors to escape! (This will take about [breakout_time] minutes.)"
- visible_message("You see [user] kicking against the doors of the [src]!")
+ visible_message("You see [user] kicking against the doors of \the [src]!")
if(do_after(user,(breakout_time*60*10)))
if(!user || user.stat != CONSCIOUS || user.loc != src || isopen || !islocked)
return
@@ -491,7 +491,7 @@
if(istype(I, /obj/item/weapon/crowbar) && !isopen)
if(toggle_open(user))
dump_everything()
- user << text("You pry the [src] open.")
+ user << text("You pry \the [src] open.")
update_icon()
return
if(istype(I, /obj/item/weapon/screwdriver))
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index eee59dd82b2..30e11d25386 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -354,12 +354,16 @@
var/atom/cur_target = null
var/scan_range = 9 //You will never see them coming
var/health = 200 //Because it lacks a cover, and is mostly to keep people from touching the syndie shuttle.
+ var/base_icon_state = "syndieturret"
+ var/projectile_type = /obj/item/projectile/bullet
+ var/fire_sound = 'sound/weapons/Gunshot.ogg'
icon = 'icons/obj/turrets.dmi'
icon_state = "syndieturret0"
/obj/machinery/gun_turret/New()
..()
take_damage(0) //check your health
+ icon_state = "[base_icon_state]" + "0"
/obj/machinery/gun_turret/ex_act(severity, target)
switch(severity)
@@ -377,7 +381,7 @@
/obj/machinery/gun_turret/update_icon()
if(state > 2 || state < 0) //someone fucked up the vars so fix them
take_damage(0)
- icon_state = "syndieturret" + "[state]"
+ icon_state = "[base_icon_state]" + "[state]"
return
@@ -479,8 +483,8 @@
return
if (targloc == curloc)
return
- playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1)
- var/obj/item/projectile/A = new /obj/item/projectile/bullet(curloc)
+ playsound(src, fire_sound, 50, 1)
+ var/obj/item/projectile/A = new projectile_type(curloc)
A.current = curloc
A.yo = targloc.y - curloc.y
A.xo = targloc.x - curloc.x
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 85c9856ad68..dbed600f9d3 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
@@ -916,8 +917,8 @@
//req_access_txt = "12" //Maintenance access
products = list(/obj/item/stack/cable_coil/random = 10,/obj/item/weapon/crowbar = 5,/obj/item/weapon/weldingtool = 3,/obj/item/weapon/wirecutters = 5,
/obj/item/weapon/wrench = 5,/obj/item/device/analyzer = 5,/obj/item/device/t_scanner = 5,/obj/item/weapon/screwdriver = 5)
- contraband = list(/obj/item/weapon/weldingtool/hugetank = 2,/obj/item/clothing/gloves/fyellow = 2)
- premium = list(/obj/item/clothing/gloves/yellow = 1)
+ contraband = list(/obj/item/weapon/weldingtool/hugetank = 2,/obj/item/clothing/gloves/color/fyellow = 2)
+ premium = list(/obj/item/clothing/gloves/color/yellow = 1)
/obj/machinery/vending/engivend
name = "\improper Engi-Vend"
@@ -937,7 +938,7 @@
icon_deny = "engi-deny"
req_access_txt = "11"
products = list(/obj/item/clothing/under/rank/chief_engineer = 4,/obj/item/clothing/under/rank/engineer = 4,/obj/item/clothing/shoes/sneakers/orange = 4,/obj/item/clothing/head/hardhat = 4,
- /obj/item/weapon/storage/belt/utility = 4,/obj/item/clothing/glasses/meson = 4,/obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/screwdriver = 12,
+ /obj/item/weapon/storage/belt/utility = 4,/obj/item/clothing/glasses/meson = 4,/obj/item/clothing/gloves/color/yellow = 4, /obj/item/weapon/screwdriver = 12,
/obj/item/weapon/crowbar = 12,/obj/item/weapon/wirecutters = 12,/obj/item/device/multitool = 12,/obj/item/weapon/wrench = 12,/obj/item/device/t_scanner = 12,
/obj/item/weapon/stock_parts/cell = 8, /obj/item/weapon/weldingtool = 8,/obj/item/clothing/head/welding = 8,
/obj/item/weapon/light/tube = 10,/obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5,/obj/item/weapon/stock_parts/micro_laser = 5,
@@ -970,10 +971,15 @@
/obj/item/clothing/under/pants/camo = 1,/obj/item/clothing/under/pants/blackjeans=2,/obj/item/clothing/under/pants/khaki=2,
/obj/item/clothing/under/pants/white=2,/obj/item/clothing/under/pants/red=1,/obj/item/clothing/under/pants/black=2,
/obj/item/clothing/under/pants/tan=2,/obj/item/clothing/under/pants/blue=1,/obj/item/clothing/under/pants/track=1,
- /obj/item/clothing/tie/waistcoat=1,/obj/item/clothing/under/sundress=2,/obj/item/clothing/under/blacktango=1,
- /obj/item/clothing/suit/jacket=3,/obj/item/clothing/glasses/regular=2,/obj/item/clothing/head/sombrero=1,
- /obj/item/clothing/suit/poncho=1,/obj/item/clothing/suit/ianshirt=1,/obj/item/clothing/shoes/laceup=2,
- /obj/item/clothing/shoes/sneakers/black=4,/obj/item/clothing/shoes/sandal=1)
+ /obj/item/clothing/tie/scarf/red=1,/obj/item/clothing/tie/scarf/green=1,/obj/item/clothing/tie/scarf/darkblue=1,
+ /obj/item/clothing/tie/scarf/purple=1,/obj/item/clothing/tie/scarf/yellow=1,/obj/item/clothing/tie/scarf/orange=1,
+ /obj/item/clothing/tie/scarf/lightblue=1,/obj/item/clothing/tie/scarf/white=1,/obj/item/clothing/tie/scarf/black=1,
+ /obj/item/clothing/tie/scarf/zebra=1,/obj/item/clothing/tie/scarf/christmas=1,/obj/item/clothing/tie/stripedredscarf=1,
+ /obj/item/clothing/tie/stripedbluescarf=1,/obj/item/clothing/tie/stripedgreenscarf=1,/obj/item/clothing/tie/waistcoat=1,
+ /obj/item/clothing/under/sundress=2,/obj/item/clothing/under/stripeddress = 1, /obj/item/clothing/under/sailordress = 1, /obj/item/clothing/under/redeveninggown = 1, /obj/item/clothing/under/blacktango=1,/obj/item/clothing/suit/jacket=3,
+ /obj/item/clothing/glasses/regular=2,/obj/item/clothing/head/sombrero=1,/obj/item/clothing/suit/poncho=1,
+ /obj/item/clothing/suit/ianshirt=1,/obj/item/clothing/shoes/laceup=2,/obj/item/clothing/shoes/sneakers/black=4,
+ /obj/item/clothing/shoes/sandal=1)
contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1)
premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/under/pants/mustangjeans=1)
refill_canister = /obj/item/weapon/vending_refill/clothing
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 1a45add5d88..cc5b028658b 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -82,53 +82,43 @@
new_jumpsuit_item_state = J.item_state
new_jumpsuit_name = J.name
qdel(J)
- //world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
qdel(J)
- for(var/T in typesof(/obj/item/clothing/gloves))
- var/obj/item/clothing/gloves/G = new T
- //world << "DEBUG: [wash_color] == [J.item_color]"
+ for(var/T in typesof(/obj/item/clothing/gloves/color))
+ var/obj/item/clothing/gloves/color/G = new T
if(wash_color == G.item_color)
new_glove_icon_state = G.icon_state
new_glove_item_state = G.item_state
new_glove_name = G.name
qdel(G)
- //world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
qdel(G)
for(var/T in typesof(/obj/item/clothing/shoes/sneakers))
var/obj/item/clothing/shoes/sneakers/S = new T
- //world << "DEBUG: [wash_color] == [J.item_color]"
if(wash_color == S.item_color)
new_shoe_icon_state = S.icon_state
new_shoe_name = S.name
qdel(S)
- //world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
qdel(S)
for(var/T in typesof(/obj/item/weapon/bedsheet))
var/obj/item/weapon/bedsheet/B = new T
- //world << "DEBUG: [wash_color] == [J.item_color]"
if(wash_color == B.item_color)
new_sheet_icon_state = B.icon_state
new_sheet_name = B.name
qdel(B)
- //world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
qdel(B)
for(var/T in typesof(/obj/item/clothing/head/soft))
var/obj/item/clothing/head/soft/H = new T
- //world << "DEBUG: [wash_color] == [J.item_color]"
if(wash_color == H.item_color)
new_softcap_icon_state = H.icon_state
new_softcap_name = H.name
qdel(H)
- //world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
qdel(H)
if(new_jumpsuit_icon_state && new_jumpsuit_item_state && new_jumpsuit_name)
for(var/obj/item/clothing/under/color/J in contents)
- //world << "DEBUG: YUP! FOUND IT!"
J.item_state = new_jumpsuit_item_state
J.icon_state = new_jumpsuit_icon_state
J.item_color = wash_color
@@ -136,8 +126,7 @@
J.desc = new_desc
J.suit_color = wash_color
if(new_glove_icon_state && new_glove_item_state && new_glove_name)
- for(var/obj/item/clothing/gloves/G in contents)
- //world << "DEBUG: YUP! FOUND IT!"
+ for(var/obj/item/clothing/gloves/color/G in contents)
G.item_state = new_glove_item_state
G.icon_state = new_glove_icon_state
G.item_color = wash_color
@@ -145,7 +134,6 @@
G.desc = new_desc
if(new_shoe_icon_state && new_shoe_name)
for(var/obj/item/clothing/shoes/sneakers/S in contents)
- //world << "DEBUG: YUP! FOUND IT!"
if (S.chained == 1)
S.chained = 0
S.slowdown = SHOES_SLOWDOWN
@@ -156,14 +144,12 @@
S.desc = new_desc
if(new_sheet_icon_state && new_sheet_name)
for(var/obj/item/weapon/bedsheet/B in contents)
- //world << "DEBUG: YUP! FOUND IT!"
B.icon_state = new_sheet_icon_state
B.item_color = wash_color
B.name = new_sheet_name
B.desc = new_desc
if(new_softcap_icon_state && new_softcap_name)
for(var/obj/item/clothing/head/soft/H in contents)
- //world << "DEBUG: YUP! FOUND IT!"
H.icon_state = new_softcap_icon_state
H.item_color = wash_color
H.name = new_softcap_name
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 3ebb4eb7c52..5208671d792 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -52,7 +52,7 @@
occupant_message("[target] will not fit into the sleeper because they have a slime latched onto their head.")
return
occupant_message("You start putting [target] into [src].")
- chassis.visible_message("[chassis] starts putting [target] into the [src].")
+ chassis.visible_message("[chassis] starts putting [target] into \the [src].")
var/C = chassis.loc
var/T = target.loc
if(do_after_cooldown(target))
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index dc711bb3874..7105b6d5234 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -26,13 +26,14 @@
cargo_holder = null
/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp/action(atom/target)
- if(!action_checks(target)) return
- if(!cargo_holder) return
+ if(!action_checks(target))
+ return
+ if(!cargo_holder)
+ return
if(istype(target,/obj))
var/obj/O = target
if(!O.anchored)
if(cargo_holder.cargo.len < cargo_holder.cargo_capacity)
- occupant_message("You lift [target] and start to load it into cargo compartment.")
chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.")
set_ready_state(0)
chassis.use_power(energy_drain)
@@ -46,12 +47,12 @@
occupant_message("[target] successfully loaded.")
log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")
else
- occupant_message("You must hold still while handling objects.")
+ occupant_message("You must hold still while handling objects.")
O.anchored = initial(O.anchored)
else
- occupant_message("Not enough room in cargo compartment.")
+ occupant_message("Not enough room in cargo compartment.")
else
- occupant_message("[target] is firmly secured.")
+ occupant_message("[target] is firmly secured.")
else if(istype(target,/mob/living))
var/mob/living/M = target
@@ -62,8 +63,9 @@
return
M.adjustOxyLoss(round(dam_force/2))
M.updatehealth()
- occupant_message("You squeeze [target] with [src.name]. Something cracks.")
- chassis.visible_message("[chassis] squeezes [target].")
+ target.visible_message("[chassis] squeezes [target].", \
+ "[chassis] squeezes [target].",\
+ "You hear something crack")
add_logs(chassis.occupant, M, "attacked", object="[name]", addition="(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])")
else
step_away(M,chassis)
@@ -83,20 +85,28 @@
force = 15
/obj/item/mecha_parts/mecha_equipment/tool/drill/action(atom/target)
- if(!action_checks(target)) return
+ if(!action_checks(target))
+ return
if(isobj(target))
var/obj/target_obj = target
- if(!target_obj.vars.Find("unacidable") || target_obj.unacidable) return
+ if(target_obj.unacidable)
+ return
set_ready_state(0)
chassis.use_power(energy_drain)
- chassis.visible_message("[chassis] starts to drill [target]", "You hear the drill.")
- occupant_message("You start to drill [target]")
+ target.visible_message("[chassis] starts to drill [target]", \
+ "[chassis] starts to drill [target]", \
+ "You hear drilling.")
var/T = chassis.loc
var/C = target.loc //why are these backwards? we may never know -Pete
if(do_after_cooldown(target))
if(T == chassis.loc && src == chassis.selected)
if(istype(target, /turf/simulated/wall/r_wall))
- occupant_message("[target] is too durable to drill through.")
+ if(istype(src , /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill))
+ if(do_after_cooldown(target))//To slow down how fast mechs can drill through the station
+ log_message("Drilled through [target]")
+ target.ex_act(3)
+ else
+ occupant_message("[target] is too durable to drill through.")
else if(istype(target, /turf/simulated/mineral))
for(var/turf/simulated/mineral/M in range(chassis,1))
if(get_dir(chassis,M)&chassis.dir)
@@ -122,7 +132,10 @@
else if(target.loc == C)
log_message("Drilled through [target]")
if(isliving(target))
- drill_mob(target, chassis.occupant)
+ if(istype(src , /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill))
+ drill_mob(target, chassis.occupant, 120)
+ else
+ drill_mob(target, chassis.occupant)
else
target.ex_act(2)
return 1
@@ -156,50 +169,6 @@
equip_cooldown = 20
force = 15
-/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill/action(atom/target)
- if(!action_checks(target)) return
- if(isobj(target))
- var/obj/target_obj = target
- if(target_obj.unacidable) return
- set_ready_state(0)
- chassis.use_power(energy_drain)
- chassis.visible_message("[chassis] starts to drill [target]", "You hear the drill.")
- occupant_message("You start to drill [target]")
- var/T = chassis.loc
- var/C = target.loc //why are these backwards? we may never know -Pete
- if(do_after_cooldown(target))
- if(T == chassis.loc && src == chassis.selected)
- if(istype(target, /turf/simulated/wall/r_wall))
- if(do_after_cooldown(target))//To slow down how fast mechs can drill through the station
- log_message("Drilled through [target]")
- target.ex_act(3)
- else if(istype(target, /turf/simulated/mineral))
- for(var/turf/simulated/mineral/M in range(chassis,1))
- if(get_dir(chassis,M)&chassis.dir)
- M.gets_drilled()
- log_message("Drilled through [target]")
- if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment)
- var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo
- if(ore_box)
- for(var/obj/item/weapon/ore/ore in range(chassis,1))
- if(get_dir(chassis,ore)&chassis.dir)
- ore.Move(ore_box)
- else if(istype(target,/turf/simulated/floor/plating/asteroid))
- for(var/turf/simulated/floor/plating/asteroid/M in range(target,1))
- M.gets_dug()
- log_message("Drilled through [target]")
- if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment)
- var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo
- if(ore_box)
- for(var/obj/item/weapon/ore/ore in range(target,1))
- ore.Move(ore_box)
- else if(target.loc == C)
- log_message("Drilled through [target]")
- if(isliving(target))
- drill_mob(target, chassis.occupant, 120)
- else
- target.ex_act(2)
- return 1
/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill/can_attach(obj/mecha/M as obj)
if(..())
@@ -756,7 +725,6 @@
if(!action_checks(src))
return chassis.dynbulletdamage(Proj)
if(prob(chassis.deflect_chance*deflect_coeff))
- chassis.occupant_message("The armor deflects incoming projectile.")
chassis.visible_message("The [chassis.name] armor deflects the projectile")
chassis.log_append_to_last("Armor saved.")
else
@@ -772,7 +740,6 @@
if(!action_checks(A))
return chassis.dynhitby(A)
if(prob(chassis.deflect_chance*deflect_coeff) || istype(A, /mob/living) || istype(A, /obj/item/mecha_parts/mecha_tracking))
- chassis.occupant_message("The [A] bounces off the armor.")
chassis.visible_message("The [A] bounces off the [chassis] armor")
chassis.log_append_to_last("Armor saved.")
if(istype(A, /mob/living))
@@ -1206,7 +1173,6 @@
var/obj/O = target
if(!O.anchored)
if(cargo_holder.cargo.len < cargo_holder.cargo_capacity)
- chassis.occupant_message("You lift [target] and start to load it into cargo compartment.")
chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.")
set_ready_state(0)
chassis.use_power(energy_drain)
@@ -1220,26 +1186,25 @@
chassis.occupant_message("[target] successfully loaded.")
chassis.log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")
else
- chassis.occupant_message("You must hold still while handling objects.")
+ chassis.occupant_message("You must hold still while handling objects.")
O.anchored = initial(O.anchored)
else
- chassis.occupant_message("Not enough room in cargo compartment.")
+ chassis.occupant_message("Not enough room in cargo compartment.")
else
- chassis.occupant_message("[target] is firmly secured.")
+ chassis.occupant_message("[target] is firmly secured.")
else if(istype(target,/mob/living))
var/mob/living/M = target
if(M.stat>1) return
if(chassis.occupant.a_intent == "harm")
- chassis.occupant_message("You obliterate [target] with [src.name], leaving blood and guts everywhere.")
- chassis.visible_message("[chassis] destroys [target] in an unholy fury.")
+ target.visible_message("[chassis] destroys [target] in an unholy fury.", \
+ "[chassis] destroys [target] in an unholy fury.")
if(chassis.occupant.a_intent == "disarm")
- chassis.occupant_message("You tear [target]'s limbs off with [src.name].")
- chassis.visible_message("[chassis] rips [target]'s arms off.")
+ target.visible_message("[chassis] rips [target]'s arms off.", \
+ "[chassis] rips [target]'s arms off.")
else
step_away(M,chassis)
- chassis.occupant_message("You smash into [target], sending them flying.")
- chassis.visible_message("[chassis] tosses [target] like a piece of paper.")
+ target.visible_message("[chassis] tosses [target] like a piece of paper.")
set_ready_state(0)
chassis.use_power(energy_drain)
do_after_cooldown()
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 6bd0982060b..757cf90e8da 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -320,7 +320,6 @@ obj/mecha/proc/can_use(mob/user)
playsound(src, 'sound/items/Welder.ogg', 50, 1)
else
return
- M.occupant_message("You hit [src].")
visible_message("[M.name] has hit [src].")
take_damage(M.force, damtype)
add_logs(M.occupant, src, "attacked", object=M, addition="(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
@@ -475,6 +474,7 @@ obj/mecha/proc/can_use(mob/user)
var/damage = absorbDamage(amount,type)
health -= damage
update_health()
+ occupant_message("Taking damage!")
log_append_to_last("Took [damage] points of damage. Damage type: \"[type]\".",1)
/obj/mecha/proc/absorbDamage(damage,damage_type)
@@ -499,7 +499,6 @@ obj/mecha/proc/can_use(mob/user)
src.take_damage(15)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
user.visible_message("[user] hits [src.name], doing some damage.", "You hit [src.name] with all your might. The metal creaks and bends.")
- src.occupant_message("[user] hits [src.name], doing some damage.")
else
user.visible_message("[user] hits [src.name]. Nothing happens","You hit [src.name] with no visible effect.")
src.log_append_to_last("Armor saved.")
@@ -517,14 +516,11 @@ obj/mecha/proc/can_use(mob/user)
src.take_damage(15)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
- user << "You slash at the armored suit!"
visible_message("The [user] slashes at [src.name]'s armor!")
- src.occupant_message("The [user] slashes at [src.name]'s armor!")
else
src.log_append_to_last("Armor saved.")
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
user << "\green Your claws had no effect!"
- src.occupant_message("The [user]'s claws are stopped by the armor.")
visible_message("The [user] rebounds off [src.name]'s armor!")
return
@@ -541,12 +537,10 @@ obj/mecha/proc/can_use(mob/user)
src.take_damage(damage)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
visible_message("[user] [user.attacktext] [src]!")
- src.occupant_message("[user] [user.attacktext] [src]!")
add_logs(user, src, "attacked", admin=0)
else
src.log_append_to_last("Armor saved.")
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
- src.occupant_message("[user]'s attack is stopped by the armor.")
visible_message("The [user] rebounds off [src.name]'s armor!")
add_logs(user, src, "attacked", admin=0)
return
@@ -565,7 +559,6 @@ obj/mecha/proc/can_use(mob/user)
src.visible_message("The [A] fastens firmly to [src].")
return
if(prob(src.deflect_chance) || istype(A, /mob))
- src.occupant_message("[A] bounces off the armor.")
src.visible_message("[A] bounces off the [src.name] armor")
src.log_append_to_last("Armor saved.")
if(istype(A, /mob/living))
@@ -574,7 +567,6 @@ obj/mecha/proc/can_use(mob/user)
else if(istype(A, /obj))
var/obj/O = A
if(O.throwforce)
- src.occupant_message("[src.name] is hit by [A].")
src.visible_message("[src.name] is hit by [A].")
src.take_damage(O.throwforce)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
@@ -589,7 +581,6 @@ obj/mecha/proc/can_use(mob/user)
/obj/mecha/proc/dynbulletdamage(var/obj/item/projectile/Proj)
if(prob(src.deflect_chance))
- src.occupant_message("The armor deflects incoming projectile.")
src.visible_message("The [src.name] armor deflects the projectile")
src.log_append_to_last("Armor saved.")
return
@@ -601,7 +592,6 @@ obj/mecha/proc/can_use(mob/user)
ignore_threshold = 1
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
src.take_damage(Proj.damage,Proj.flag)
- src.occupant_message("[src.name] is hit by [Proj]!")
src.visible_message("[src.name] is hit by [Proj].")
src.check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),ignore_threshold)
Proj.on_hit(src)
@@ -677,14 +667,8 @@ obj/mecha/proc/can_use(mob/user)
if(prob(src.deflect_chance))
user << "The [W] bounces off [src.name] armor."
src.log_append_to_last("Armor saved.")
-/*
- for (var/mob/V in viewers(src))
- if(V.client && !(V.blinded))
- V.show_message("The [W] bounces off [src.name] armor.", 1)
-*/
return 0
else
- src.occupant_message("[user] hits [src] with [W].")
user.visible_message("[user] hits [src] with [W].", "You hit [src] with [W].")
src.take_damage(W.force,W.damtype)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 5ff59260334..7ee61a9d6ec 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -346,11 +346,11 @@
//10
list("key"=/obj/item/weapon/stock_parts/scanning_module/adv,
"backkey"=/obj/item/weapon/screwdriver,
- "desc"="Scanning module is secured."),
+ "desc"="Weapon control module is secured."),
//11
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
- "desc"="Scanning module is installed."),
+ "desc"="Weapon control module is installed."),
//12
list("key"=/obj/item/weapon/circuitboard/mecha/gygax/targeting,
"backkey"=/obj/item/weapon/screwdriver,
@@ -924,11 +924,11 @@
//10
list("key"=/obj/item/weapon/stock_parts/scanning_module/phasic,
"backkey"=/obj/item/weapon/screwdriver,
- "desc"="Scanning module is secured."),
+ "desc"="Weapon control module is secured."),
//11
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
- "desc"="Scanning module is installed."),
+ "desc"="Weapon control module is installed."),
//12
list("key"=/obj/item/weapon/circuitboard/mecha/durand/targeting,
"backkey"=/obj/item/weapon/screwdriver,
@@ -1218,11 +1218,11 @@
//13
list("key"=/obj/item/weapon/stock_parts/scanning_module/phasic,
"backkey"=/obj/item/weapon/screwdriver,
- "desc"="Scanning module is secured."),
+ "desc"="Weapon control module is secured."),
//14
list("key"=/obj/item/weapon/screwdriver,
"backkey"=/obj/item/weapon/crowbar,
- "desc"="Scanning module is installed."),
+ "desc"="Weapon control is installed."),
//15
list("key"=/obj/item/weapon/circuitboard/mecha/phazon/targeting,
"backkey"=/obj/item/weapon/screwdriver,
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 73b14346a40..4c21191bc6f 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
@@ -61,7 +61,7 @@
/obj/item/bodybag = 1,
/obj/item/clothing/glasses/meson = 2,
/obj/item/clothing/glasses/sunglasses = 1,
- /obj/item/clothing/gloves/white{color = "yellow"; desc = "The colors are a bit dodgy."; icon_state = "yellow"; item_color = "yellow"; item_state = "ygloves"; name = "insulated gloves"} = 1,
+ /obj/item/clothing/gloves/color/white{color = "yellow"; desc = "The colors are a bit dodgy."; icon_state = "yellow"; item_color = "yellow"; item_state = "ygloves"; name = "insulated gloves"} = 1,
/obj/item/clothing/head/hardhat = 1,
/obj/item/clothing/head/hardhat/red = 1,
/obj/item/clothing/head/that{throwforce = 1; throwing = 1} = 1,
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index d7102b10cf4..cf8854b4bcd 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -212,7 +212,7 @@
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + CLICK_CD_BREAKOUT
user << "You struggle against the tight bonds! (This will take about [breakout_time] minutes.)"
- visible_message("You see something struggling and writhing in the [src]!")
+ visible_message("You see something struggling and writhing in \the [src]!")
if(do_after(user,(breakout_time*60*10)))
if(!user || user.stat != CONSCIOUS || user.loc != src)
return
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.dm b/code/game/objects/items.dm
index df3c30675bd..82cf59a988e 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -119,7 +119,7 @@
if (istype(src.loc, /obj/item/weapon/storage))
//If the item is in a storage item, take it out
var/obj/item/weapon/storage/S = src.loc
- S.remove_from_storage(src)
+ S.remove_from_storage(src, user.loc)
src.throwing = 0
if (loc == user)
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index d10eec6fed3..4ba21eaa553 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -57,7 +57,7 @@
. = ..()
var/area/A = get_area()
if(get_area_type() == AREA_STATION)
- . += "According to the [src], you are now in \"[strip_html_properly(A.name)]\".
"
+ . += "According to \the [src], you are now in \"[strip_html_properly(A.name)]\".
"
var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500)
popup.set_content(.)
popup.open()
@@ -82,7 +82,7 @@
. = ..()
var/area/A = get_area()
if(get_area_type() == AREA_STATION)
- . += "According to the [src], you are now in \"[strip_html_properly(A.name)]\".
"
+ . += "According to \the [src], you are now in \"[strip_html_properly(A.name)]\".
"
. += "You may move an amendment to the drawing.
"
var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500)
popup.set_content(.)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index ab970a7db47..296b2a2d6dd 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -161,6 +161,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/librarian
icon_state = "pda-library"
+ default_cartridge = /obj/item/weapon/cartridge/librarian
desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader."
note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
silent = 1 //Quiet in the library!
@@ -170,8 +171,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"
@@ -343,6 +344,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
dat += "
Cleanbot Access"
if (istype(cartridge.radio, /obj/item/radio/integrated/signal))
dat += "
Signaler System"
+ if (cartridge.access_newscaster)
+ dat += "
Newscaster Access "
if (cartridge.access_reagent_scanner)
dat += "
[scanmode == 3 ? "Disable" : "Enable"] Reagent Scanner"
if (cartridge.access_engine)
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index e42c3cf453a..c38f0e68912 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -17,6 +17,7 @@
var/access_janitor = 0
// var/access_flora = 0
var/access_reagent_scanner = 0
+ var/access_newscaster = 0
var/access_remote_door = 0 //Control some blast doors remotely!!
var/remote_door_id = ""
var/access_status_display = 0
@@ -32,6 +33,7 @@
var/message1 // used for status_displays
var/message2
var/list/stored_data = list()
+ var/current_channel
/obj/item/weapon/cartridge/engineering
name = "\improper Power-ON cartridge"
@@ -115,6 +117,12 @@
icon_state = "cart-mi"
access_mime = 1
var/mime_charges = 5
+
+/obj/item/weapon/cartridge/librarian
+ name = "\improper Lib-Tweet cartridge"
+ icon_state = "cart-s"
+ access_newscaster = 1
+
/*
/obj/item/weapon/cartridge/botanist
name = "\improper Green Thumb v4.20 cartridge"
@@ -700,6 +708,20 @@ Code:
var/obj/item/radio/integrated/medbot/SC = radio
bot_control(SC)
+ if (53) // Newscaster
+ menu = " Newscaster Access
"
+ menu += "
Current Newsfeed: [current_channel ? current_channel : "None"]
"
+ var/datum/feed_channel/current
+ for(var/datum/feed_channel/chan in news_network.network_channels)
+ if (chan.channel_name == current_channel)
+ current = chan
+ if(!current)
+ menu += " ERROR : NO CHANNEL FOUND
"
+ return
+ for(var/datum/feed_message/msg in current.messages)
+ menu +="-[msg.body]
\[Story by [msg.author]\]
"
+ menu += "
Post Message"
+
/obj/item/weapon/cartridge/Topic(href, href_list)
..()
@@ -762,5 +784,32 @@ Code:
loc:mode = 433
mode = 433
+ if("Newscaster Access")
+ mode = 53
+
+ if("Newscaster Message")
+ var/obj/item/device/pda/pda = loc
+ var/pda_owner_name = pda.id ? "[pda.id.registered_name] ([pda.id.assignment])" : "Unknown"
+ var/message = pda.msg_input()
+ var/datum/feed_channel/current
+ for(var/datum/feed_channel/chan in news_network.network_channels)
+ if (chan.channel_name == current_channel)
+ current = chan
+ if(current.locked && current.author != pda_owner_name)
+ pda.cart += " ERROR : NOT AUTHORIZED [pda.id ? "" : "- ID SLOT EMPTY"]
"
+ pda.Topic(null,list("choice"="Refresh"))
+ return
+ news_network.SubmitArticle(message,pda.owner,current_channel)
+ pda.Topic(null,list("choice"=num2text(mode)))
+ return
+
+ if("Newscaster Switch Channel")
+ var/obj/item/device/pda/pda = loc
+ current_channel = pda.msg_input()
+ pda.Topic(null,list("choice"=num2text(mode)))
+ return
+
+
+
generate_menu()
print_to_host(menu)
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index 94c273e62e3..40a78956230 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -1,5 +1,5 @@
/obj/item/device/aicard
- name = "inteliCard"
+ name = "intelliCard"
desc = "A storage device for AIs. Patent pending."
icon = 'icons/obj/aicards.dmi'
icon_state = "aicard" // aicard-full
@@ -23,7 +23,7 @@
if (!in_range(src, user))
return
user.set_machine(src)
- var/dat = "Intelicard
"
+ var/dat = "Intellicard
"
var/laws
for(var/mob/living/silicon/ai/A in src)
dat += "Stored AI: [A.name]
System integrity: [(A.health+100)/2]%
"
@@ -107,7 +107,7 @@
if ("Wireless")
for(var/mob/living/silicon/ai/A in src)
A.control_disabled = !A.control_disabled
- A << "The intelicard's wireless port has been [A.control_disabled ? "disabled" : "enabled"]!"
+ A << "The intellicard's wireless port has been [A.control_disabled ? "disabled" : "enabled"]!"
if (A.control_disabled)
overlays -= image('icons/obj/aicards.dmi', "aicard-on")
else
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 9b141cacdc3..2ed698dd029 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -45,7 +45,7 @@
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
qdel(active_dummy)
active_dummy = null
- usr << "You deactivate the [src]."
+ usr << "You deactivate \the [src]."
var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
T.icon = 'icons/effects/effects.dmi'
flick("emppulse",T)
@@ -57,7 +57,7 @@
var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc)
C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, saved_underlays, src)
qdel(O)
- usr << "You activate the [src]."
+ usr << "You activate \the [src]."
var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
T.icon = 'icons/effects/effects.dmi'
flick("emppulse",T)
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 5735a6af412..71959e986ae 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -2,7 +2,7 @@
name = "flash"
desc = "A powerful and versatile flashbulb device, with applications ranging from disorienting attackers to acting as visual receptors in robot production."
icon_state = "flash"
- item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang)
+ item_state = "flashtool"
throwforce = 0
w_class = 1
throw_speed = 3
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index bea19e11fbe..587837fab45 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -212,7 +212,7 @@ obj/item/device/flashlight/lamp/bananalamp
. = ..()
// All good, turn it on.
if(.)
- user.visible_message("[user] lights the [src].", "You light the [src]!")
+ user.visible_message("[user] lights \the [src].", "You light \the [src]!")
force = on_damage
damtype = "fire"
processing_objects += src
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 4e0804e76cf..27e4dd6631a 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -57,7 +57,7 @@
else if(istype(W, /obj/item/weapon/screwdriver))
if(diode)
- user << "You remove the [diode.name] from the [src]."
+ user << "You remove the [diode.name] from \the [src]."
diode.loc = get_turf(src.loc)
diode = null
return
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 4adb60e3655..dbb1d9a4b29 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -137,7 +137,7 @@
if(target.status != LIGHT_OK)
if(CanUse(U))
if(!Use(U)) return
- U << "You replace the [target.fitting] with the [src]."
+ U << "You replace the [target.fitting] with \the [src]."
if(target.status != LIGHT_EMPTY)
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 4c41d33541d..4ff44ecbb84 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -22,6 +22,8 @@
syndie = 1//Signifies that it de-crypts Syndicate transmissions
/obj/item/device/encryptionkey/binary
+ name = "binary translator key"
+ desc = "An encryption key for a radio headset. To access the binary channel, use :b."
icon_state = "cypherkey"
translate_binary = 1
origin_tech = "syndicate=3"
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 432e6f4bc3d..6cf2b1b36ac 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -14,7 +14,6 @@
/obj/item/device/radio/headset/New()
..()
- keyslot = new /obj/item/device/encryptionkey/
recalculateChannels()
/obj/item/device/radio/headset/Destroy()
@@ -66,7 +65,7 @@
desc = "This is used by your elite security force. \nTo access the security channel, use :s."
icon_state = "sec_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/headset_sec
+ keyslot = new /obj/item/device/encryptionkey/headset_sec
/obj/item/device/radio/headset/headset_sec/alt
name = "security bowman headset"
@@ -80,49 +79,49 @@
desc = "When the engineers wish to chat like girls. \nTo access the engineering channel, use :e. "
icon_state = "eng_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/headset_eng
+ keyslot = new /obj/item/device/encryptionkey/headset_eng
/obj/item/device/radio/headset/headset_rob
name = "robotics radio headset"
desc = "Made specifically for the roboticists, who cannot decide between departments. \nTo access the engineering channel, use :e. For research, use :n."
icon_state = "rob_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/headset_rob
+ keyslot = new /obj/item/device/encryptionkey/headset_rob
/obj/item/device/radio/headset/headset_med
name = "medical radio headset"
desc = "A headset for the trained staff of the medbay. \nTo access the medical channel, use :m."
icon_state = "med_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/headset_med
+ keyslot = new /obj/item/device/encryptionkey/headset_med
/obj/item/device/radio/headset/headset_sci
name = "science radio headset"
desc = "A sciency headset. Like usual. \nTo access the science channel, use :n."
icon_state = "sci_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/headset_sci
+ keyslot = new /obj/item/device/encryptionkey/headset_sci
/obj/item/device/radio/headset/headset_medsci
name = "medical research radio headset"
desc = "A headset that is a result of the mating between medical and science. \nTo access the medical channel, use :m. For science, use :n."
icon_state = "medsci_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/headset_medsci
+ keyslot = new /obj/item/device/encryptionkey/headset_medsci
/obj/item/device/radio/headset/headset_com
name = "command radio headset"
desc = "A headset with a commanding channel. \nTo access the command channel, use :c."
icon_state = "com_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/headset_com
+ keyslot = new /obj/item/device/encryptionkey/headset_com
/obj/item/device/radio/headset/heads/captain
name = "\proper the captain's headset"
desc = "The headset of the king. \nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
icon_state = "com_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/heads/captain
+ keyslot = new /obj/item/device/encryptionkey/heads/captain
/obj/item/device/radio/headset/heads/captain/alt
name = "\proper the captain's bowman headset"
@@ -136,14 +135,14 @@
desc = "Headset of the fellow who keeps society marching towards technological singularity. \nTo access the science channel, use :n. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/heads/rd
+ keyslot = new /obj/item/device/encryptionkey/heads/rd
/obj/item/device/radio/headset/heads/hos
name = "\proper the head of security's headset"
desc = "The headset of the man in charge of keeping order and protecting the station. \nTo access the security channel, use :s. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/heads/hos
+ keyslot = new /obj/item/device/encryptionkey/heads/hos
/obj/item/device/radio/headset/heads/hos/alt
name = "\proper the head of security's bowman headset"
@@ -157,46 +156,46 @@
desc = "The headset of the guy in charge of keeping the station powered and undamaged. \nTo access the engineering channel, use :e. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/heads/ce
+ keyslot = new /obj/item/device/encryptionkey/heads/ce
/obj/item/device/radio/headset/heads/cmo
name = "\proper the chief medical officer's headset"
desc = "The headset of the highly trained medical chief. \nTo access the medical channel, use :m. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/heads/cmo
+ keyslot = new /obj/item/device/encryptionkey/heads/cmo
/obj/item/device/radio/headset/heads/hop
name = "\proper the head of personnel's headset"
desc = "The headset of the guy who will one day be captain. \nChannels are as follows: :u - supply, :v - service, :c - command."
icon_state = "com_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/heads/hop
+ keyslot = new /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/headset_cargo
name = "supply radio headset"
desc = "A headset used by the QM and his slaves. \nTo access the supply channel, use :u."
icon_state = "cargo_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
+ keyslot = new /obj/item/device/encryptionkey/headset_cargo
/obj/item/device/radio/headset/headset_srv
name = "service radio headset"
desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean. \nTo access the service channel, use :v."
icon_state = "srv_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/headset_service
+ keyslot = new /obj/item/device/encryptionkey/headset_service
/obj/item/device/radio/headset/headset_cent
name = "\improper Centcom headset"
desc = "A headset used by the upper echelons of Nanotrasen. \nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
icon_state = "cent_headset"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/heads/captain
+ keyslot = new /obj/item/device/encryptionkey/heads/captain
/obj/item/device/radio/headset/ai
name = "\proper Integrated Subspace Transceiver "
- keyslot2 = new /obj/item/device/encryptionkey/ai
+ keyslot = new /obj/item/device/encryptionkey/ai
/obj/item/device/radio/headset/ai/receive_range(freq, level)
return ..(freq, level, 1)
@@ -234,7 +233,7 @@
user << "You pop out the encryption keys in the headset!"
else
- user << "This headset doesn't have any encryption keys! How useless..."
+ user << "This headset doesn't have any unique encryption keys! How useless..."
if(istype(W, /obj/item/device/encryptionkey/))
if(keyslot && keyslot2)
@@ -277,15 +276,6 @@
for(var/ch_name in channels)
- //this is the most hilarious piece of code i have seen this week, so im not going to remove it
- /*
- if(!radio_controller)
- sleep(30) // Waiting for the radio_controller to be created.
- if(!radio_controller)
- src.name = "broken radio headset"
- return
- */
-
secure_radio_connections[ch_name] = add_radio(src, radiochannels[ch_name])
return
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/toys.dm b/code/game/objects/items/toys.dm
index 9b91799d00e..7fd57e7f9cb 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -67,7 +67,7 @@
/obj/item/toy/balloon/throw_impact(atom/hit_atom)
if(src.reagents.total_volume >= 1)
- src.visible_message("The [src] bursts!","You hear a pop and a splash.")
+ src.visible_message("\The [src] bursts!","You hear a pop and a splash.")
src.reagents.reaction(get_turf(hit_atom))
for(var/atom/A in get_turf(hit_atom))
src.reagents.reaction(A)
@@ -166,17 +166,17 @@
" You hear a gunshot.")
/obj/item/toy/ammo/gun
- name = "ammo-caps"
+ name = "capgun ammo"
desc = "Make sure to recyle the box in an autolathe when it gets empty."
icon = 'icons/obj/ammo.dmi'
- icon_state = "357-7"
+ icon_state = "357OLD-7"
w_class = 1.0
g_amt = 10
m_amt = 10
var/amount_left = 7.0
/obj/item/toy/ammo/gun/update_icon()
- src.icon_state = text("357-[]", src.amount_left)
+ src.icon_state = text("357OLD-[]", src.amount_left)
/obj/item/toy/ammo/gun/examine(mob/user)
..()
@@ -735,7 +735,7 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob)
src.cards -= choice
H.pickup(user)
user.put_in_active_hand(H)
- src.visible_message("[user] draws a card from the deck.", "You draw a card from the deck.")
+ user.visible_message("[user] draws a card from the deck.", "You draw a card from the deck.")
if(cards.len > 26)
src.icon_state = "deck_[deckstyle]_full"
else if(cards.len > 10)
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/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 966256487df..b58c54799bb 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -74,10 +74,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(!isliving(M))
return
M.IgniteMob()
- if(!istype(M,/mob/living/carbon))
- return
- if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_sel.selecting == "mouth" && lit)
- var/obj/item/clothing/mask/cigarette/cig = M.wear_mask
+ var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M,user)
+ if(lit && cig)
if(M == user)
cig.attackby(src, user)
else
@@ -85,6 +83,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
else
..()
+/obj/item/proc/help_light_cig(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+ if(!iscarbon(M))
+ return
+ if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_sel.selecting == "mouth")
+ var/obj/item/clothing/mask/cigarette/cig = M.wear_mask
+ return cig
//////////////////
//FINE SMOKABLES//
@@ -113,46 +117,21 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
+ var/lighting_text = "[user] lights their [name] with [W]."
if(istype(W, /obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/WT = W
- if(WT.isOn())//Badasses dont get blinded while lighting their cig with a welding tool
- light("[user] casually lights the [name] with [W], what a badass.")
-
+ lighting_text = "[user] casually lights the [name] with [W], what a badass."
else if(istype(W, /obj/item/weapon/lighter/zippo))
- var/obj/item/weapon/lighter/zippo/Z = W
- if(Z.lit)
- light("With a single flick of their wrist, [user] smoothly lights their [name] with [W]. Damn they're cool.")
-
+ lighting_text = "With a single flick of their wrist, [user] smoothly lights their [name] with [W]. Damn they're cool."
else if(istype(W, /obj/item/weapon/lighter))
- var/obj/item/weapon/lighter/L = W
- if(L.lit)
- light("After some fiddling, [user] manages to light their [name] with [W].")
-
- else if(istype(W, /obj/item/weapon/match))
- var/obj/item/weapon/match/M = W
- if(M.lit == 1) //checking for lit = 1 instead of just lit prevents cigarettes being lit by used matches
- light("[user] lights their [name] with [W].")
-
- else if(istype(W, /obj/item/weapon/melee/energy/sword))
- var/obj/item/weapon/melee/energy/sword/S = W
- if(S.active)
- light("[user] swings their [W], barely missing their nose. They light their [name] in the process.")
-
+ lighting_text = "After some fiddling, [user] manages to light their [name] with [W]."
+ else if(istype(W, /obj/item/weapon/melee/energy))
+ lighting_text = "[user] swings their [W], barely missing their nose. They light their [name] in the process."
else if(istype(W, /obj/item/device/assembly/igniter))
- light("[user] fiddles with [W], and manages to light their [name].")
-
- else if(istype(W, /obj/item/clothing/mask/cigarette))
- var/obj/item/clothing/mask/cigarette/M = W
- if(M.lit)
- light("[user] lights their [name] with [W].")
- else if(istype(W, /obj/item/candle))
- var/obj/item/candle/C = W
- if(C.lit)
- light("[user] lights their [name] with [W].")
+ lighting_text = "[user] fiddles with [W], and manages to light their [name]."
else if(istype(W, /obj/item/device/flashlight/flare))
- var/obj/item/device/flashlight/flare/F = W
- if(F.on)
- light("[user] lights their [name] with [W] like a real badass.")
+ lighting_text = "[user] lights their [name] with [W] like a real badass."
+ if(is_hot(W))
+ light(lighting_text)
return
/obj/item/clothing/mask/cigarette/afterattack(obj/item/weapon/reagent_containers/glass/glass, mob/user as mob, proximity)
@@ -256,8 +235,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/attack(mob/living/carbon/M, mob/living/carbon/user)
if(!istype(M))
return ..()
- if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_sel && user.zone_sel.selecting == "mouth" && lit)
- var/obj/item/clothing/mask/cigarette/cig = M.wear_mask
+ var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M,user)
+ if(lit && cig)
if(M == user)
cig.attackby(src, user)
else
@@ -514,10 +493,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(!isliving(M))
return
M.IgniteMob()
- if(!istype(M,/mob/living/carbon))
- return
- if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_sel.selecting == "mouth" && lit)
- var/obj/item/clothing/mask/cigarette/cig = M.wear_mask
+ var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M,user)
+ if(lit && cig)
if(M == user)
cig.attackby(src, user)
else
@@ -534,7 +511,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
location.hotspot_expose(700, 5)
return
-
/obj/item/weapon/lighter/pickup(mob/user)
if(lit)
SetLuminosity(0)
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 6321c651172..df21b3dc5dd 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -122,7 +122,7 @@
bcell.updateicon()
bcell.loc = get_turf(src.loc)
bcell = null
- user << "You remove the cell from the [src]."
+ user << "You remove the cell from [src]."
update_icon()
return
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 2ff4fc4e0e4..f1b1ad4dc09 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -83,14 +83,15 @@
spawn(timer*10)
if(target && !target.gc_destroyed)
explode(get_turf(target))
- qdel(src)
-
+ else
+ qdel(src)
/obj/item/weapon/c4/proc/explode(var/turf/location)
location.ex_act(2, target)
explosion(location,0,0,3)
if(target)
target.overlays -= image_overlay
+ qdel(src)
/obj/item/weapon/c4/attack(mob/M as mob, mob/user as mob, def_zone)
return
\ No newline at end of file
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/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 32acca5e4b4..9de94916d1e 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -88,7 +88,7 @@
/obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
if ((CLUMSY in user.mutations) && prob(50))
- user << " You accidentally cut yourself with the [src]."
+ user << " You accidentally cut yourself with \the [src]."
user.take_organ_damage(20)
return
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index d6b446dea03..7fe5bad8667 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -1,5 +1,11 @@
/obj/item/weapon/melee/energy
var/active = 0
+ var/force_on = 30 //force when active
+ var/throwforce_on = 20
+ var/icon_state_on = "axe1"
+ var/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ w_class = 2
+ var/w_class_on = 4
/obj/item/weapon/melee/energy/suicide_act(mob/user)
user.visible_message(pick("[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \
@@ -14,34 +20,22 @@
desc = "An energised battle axe."
icon_state = "axe0"
force = 40.0
- throwforce = 25.0
+ force_on = 150
+ throwforce = 25
+ throwforce_on = 30
hitsound = 'sound/weapons/bladeslice.ogg'
throw_speed = 3
throw_range = 5
- w_class = 3.0
+ w_class = 3
+ w_class_on = 5
flags = CONDUCT | NOSHIELD
origin_tech = "combat=3"
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
+ attack_verb_on = null
/obj/item/weapon/melee/energy/axe/suicide_act(mob/user)
- user.visible_message("[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.")
- return (BRUTELOSS|FIRELOSS)
-
-/obj/item/weapon/melee/energy/axe/attack_self(mob/user)
- active = !active
- if(active)
- user << "[src] is now energised."
- force = 150 //these are the drugs, friend
- hitsound = 'sound/weapons/blade1.ogg'
- icon_state = "axe1"
- w_class = 5
- else
- user << "[src] can now be concealed."
- force = 40
- hitsound = 'sound/weapons/bladeslice.ogg'
- icon_state = "axe0"
- w_class = 3 //it goes back to three you goose
- add_fingerprint(user)
+ user.visible_message("[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.")
+ return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/melee/energy/sword
name = "energy sword"
@@ -52,11 +46,10 @@
hitsound = "swing_hit" //it starts deactivated
throw_speed = 3
throw_range = 5
- w_class = 2.0
flags = NOSHIELD
+ attack_verb = null
origin_tech = "magnets=3;syndicate=4"
var/hacked = 0
- item_color = null
/obj/item/weapon/melee/energy/sword/New()
if(item_color == null)
@@ -67,33 +60,31 @@
return 1
return 0
-/obj/item/weapon/melee/energy/sword/attack_self(mob/living/user)
+/obj/item/weapon/melee/energy/attack_self(mob/living/user)
if ((CLUMSY in user.mutations) && prob(50))
user << "You accidentally cut yourself with [src], like a doofus!"
user.take_organ_damage(5,5)
active = !active
if (active)
- force = 30
- throwforce = 20
+ force = force_on
+ throwforce = throwforce_on
hitsound = 'sound/weapons/blade1.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- if(istype(src,/obj/item/weapon/melee/energy/sword/pirate))
- icon_state = "cutlass1"
+ if(attack_verb_on)
+ attack_verb = attack_verb_on
+ if(!item_color)
+ icon_state = icon_state_on
else
icon_state = "sword[item_color]"
- w_class = 4
+ w_class = w_class_on
playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
user << "[src] is now active."
else
- force = 3
- throwforce = 5.0
- hitsound = "swing_hit"
- attack_verb = null
- if(istype(src,/obj/item/weapon/melee/energy/sword/pirate))
- icon_state = "cutlass0"
- else
- icon_state = "sword0"
- w_class = 2
+ force = initial(force)
+ throwforce = initial(throwforce)
+ hitsound = initial(hitsound)
+ attack_verb = initial(attack_verb)
+ icon_state = initial(icon_state)
+ w_class = initial(w_class)
playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
user << "[src] can now be concealed."
add_fingerprint(user)
@@ -166,6 +157,10 @@
name = "energy cutlass"
desc = "Arrrr matey."
icon_state = "cutlass0"
+ icon_state_on = "cutlass1"
+
+/obj/item/weapon/melee/energy/sword/pirate/New()
+ return
/obj/item/weapon/melee/energy/blade
name = "energy blade"
@@ -173,12 +168,12 @@
icon_state = "blade"
force = 30 //Normal attacks deal esword damage
hitsound = 'sound/weapons/blade1.ogg'
+ active = 1
throwforce = 1//Throwing or dropping the item deletes it.
throw_speed = 3
throw_range = 1
w_class = 4.0//So you can't hide it in your pocket or some such.
flags = NOSHIELD
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
var/datum/effect/effect/system/spark_spread/spark_system
//Most of the other special functions are handled in their own files. aka special snowflake code so kewl
@@ -192,3 +187,6 @@
/obj/item/weapon/melee/energy/blade/proc/throw()
qdel(src)
+
+/obj/item/weapon/melee/energy/blade/attack_self(mob/user)
+ return
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 6f47027cbdd..b0d9d00fd5e 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -21,7 +21,8 @@
obj/item/weapon/mop/proc/clean(turf/simulated/A)
if(reagents.has_reagent("water", 1) || reagents.has_reagent("holywater", 1))
A.clean_blood()
- A.dirt = 0
+ var/turf/simulated/floor/F = A
+ F.dirt = 0
for(var/obj/effect/O in A)
if(istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay))
qdel(O)
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index aa2cb519a56..97a8d47e844 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -108,7 +108,7 @@
throw_speed = 2
w_class = 4
slot_flags = SLOT_BACK
- user << "You extend the [src]."
+ user << "You extend \the [src]."
else
force = 3
throwforce = 3
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index db9ae7d2eb6..f205aa88ef5 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -51,6 +51,7 @@
message_admins("[key_name_admin(user)] detonated a bag of holding")
log_game("[key_name(user)] detonated a bag of holding")
qdel(src)
+ singulo.process()
return
..()
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 1d58269c6dd..3995d527137 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -83,13 +83,13 @@
/obj/item/weapon/storage/box/gloves/New()
..()
- new /obj/item/clothing/gloves/latex(src)
- new /obj/item/clothing/gloves/latex(src)
- new /obj/item/clothing/gloves/latex(src)
- new /obj/item/clothing/gloves/latex(src)
- new /obj/item/clothing/gloves/latex(src)
- new /obj/item/clothing/gloves/latex(src)
- new /obj/item/clothing/gloves/latex(src)
+ new /obj/item/clothing/gloves/color/latex(src)
+ new /obj/item/clothing/gloves/color/latex(src)
+ new /obj/item/clothing/gloves/color/latex(src)
+ new /obj/item/clothing/gloves/color/latex(src)
+ new /obj/item/clothing/gloves/color/latex(src)
+ new /obj/item/clothing/gloves/color/latex(src)
+ new /obj/item/clothing/gloves/color/latex(src)
/obj/item/weapon/storage/box/masks
name = "box of sterile masks"
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 8ef7199f100..f7cd722f7d4 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -304,16 +304,10 @@
if(M.client)
M.client.screen -= W
- if(new_location)
- if(ismob(loc))
- W.dropped(usr)
- if(ismob(new_location))
- W.layer = 20
- else
- W.layer = initial(W.layer)
- W.loc = new_location
- else
- W.loc = get_turf(src)
+ if(ismob(loc))
+ W.dropped(usr)
+ W.layer = initial(W.layer)
+ W.loc = new_location
if(usr)
orient2hud(usr)
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index b894effd228..19b664e2c4f 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -61,7 +61,7 @@
new /obj/item/stack/cable_coil(src,30,color)
new /obj/item/stack/cable_coil(src,30,color)
if(prob(5))
- new /obj/item/clothing/gloves/yellow(src)
+ new /obj/item/clothing/gloves/color/yellow(src)
else
new /obj/item/stack/cable_coil(src,30,color)
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index c21bb64f252..7c7b9857c5c 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -79,7 +79,7 @@
bcell.updateicon()
bcell.loc = get_turf(src.loc)
bcell = null
- user << "You remove the cell from the [src]."
+ user << "You remove the cell from [src]."
status = 0
update_icon()
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/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index be5bc7c9402..7dd2aa930d7 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -138,7 +138,7 @@ Frequency:
/obj/item/weapon/hand_tele/attack_self(mob/user as mob)
var/turf/current_location = get_turf(user)//What turf is the user on?
- if(!current_location||current_location.z==2||current_location.z>=7)//If turf was not found or they're on z level 2 or >7 which does not currently exist.
+ if(!current_location||current_location.z==2||current_location.z>=7 || !istype(user.loc, /turf))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
user << "\The [src] is malfunctioning."
return
var/list/L = list( )
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index fc4b26368f2..6c9ba5f5d96 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -210,9 +210,9 @@
if(1)
force = 15
damtype = "fire"
- update_icon()
if(prob(5))
remove_fuel(1)
+ update_icon()
//This is to start fires. process() is only called if the welder is on.
var/turf/location = loc
@@ -283,14 +283,12 @@
/obj/item/weapon/weldingtool/proc/check_fuel(mob/user)
if(get_fuel() <= 0 && welding)
toggle(user, 1)
-
+ update_icon()
//mob icon update
if(ismob(loc))
var/mob/M = loc
- if(M.r_hand == src)
- M.update_inv_r_hand(0)
- else if(M.l_hand == src)
- M.update_inv_l_hand(0)
+ M.update_inv_r_hand(0)
+ M.update_inv_l_hand(0)
return 0
return 1
@@ -321,7 +319,7 @@
damtype = "brute"
hitsound = "swing_hit"
icon_state = "welder"
- welding = 0
+
//Decides whether or not to damage a player's eyes based on what they're wearing as protection
@@ -416,7 +414,6 @@
m_amt = 70
g_amt = 120
origin_tech = "engineering=4;plasmatech=3"
- icon_state = "ewelder"
var/last_gen = 0
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 3b0ba69ed11..ec56c0adf0c 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -224,7 +224,7 @@ obj/item/weapon/twohanded/
sleep(1)
/obj/item/weapon/twohanded/dualsaber/proc/impale(mob/living/user as mob)
- user << "You twirl around a bit before losing your balance and impaling yourself on the [src]."
+ user << "You twirl around a bit before losing your balance and impaling yourself on \the [src]."
if (force_wielded)
user.take_organ_damage(20,25)
else
@@ -242,7 +242,7 @@ obj/item/weapon/twohanded/
if(istype(loc, /mob/living))
if (HULK in M.mutations)
loc << "You lack the grace to wield this to its full extent."
- hitsound = 'sound/weapons/blade1.ogg'
+ hitsound = 'sound/weapons/blade1.ogg'
/obj/item/weapon/twohanded/dualsaber/unwield() //Specific unwield () to switch hitsounds.
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index 7b14099d374..c88351ffb13 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -56,9 +56,9 @@
/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"
icon_state = "refill_clothes"
- charges = 16// of 48
+ charges = 20// of 62
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index eadb7c6d32d..ac90c38347b 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -12,7 +12,6 @@
/obj/structure/mech_melee_attack(obj/mecha/M)
if(M.damtype == "brute")
- M.occupant_message("You hit [src].")
visible_message("[M.name] has hit [src].")
return 1
return 0
diff --git a/code/game/objects/structures/crates_lockers/bins.dm b/code/game/objects/structures/crates_lockers/bins.dm
index d18db0702c4..275eccc890f 100644
--- a/code/game/objects/structures/crates_lockers/bins.dm
+++ b/code/game/objects/structures/crates_lockers/bins.dm
@@ -51,15 +51,15 @@
. = ..(O, user, 0, 0, 0)
if(.)
if(O != user)
- user.visible_message("[user] tries to stuff [O] into the [src].", \
- "You try to stuff [O] into the [src].", \
+ user.visible_message("[user] tries to stuff [O] into [src].", \
+ "You try to stuff [O] into [src].", \
"You hear clanging.")
if (!do_after(user, 40))
return
if(!..(O, user, 0, 0))
return
- user.visible_message("[user] stuffs [O] into the [src].", \
- "You stuff [O] into the [src].", \
+ user.visible_message("[user] stuffs [O] into[src].", \
+ "You stuff [O] into [src].", \
"You hear a loud metal bang.")
insert(O, 1, !opened)
if(opened)
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index e43c8e3203d..54ed6539c1b 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -144,7 +144,7 @@
/obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob)
if(user.environment_smash)
user.do_attack_animation(src)
- visible_message("[user] destroys the [src].")
+ visible_message("[user] destroys \the [src].")
dump_contents()
qdel(src)
@@ -170,7 +170,7 @@
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0,user))
- user << "You begin cutting the [src] apart..."
+ user << "You begin cutting \the [src] apart..."
playsound(loc, 'sound/items/Welder.ogg', 40, 1)
if(do_after(user,40,5,1))
if( !src.opened || !istype(src, /obj/structure/closet) || !user || !WT || !WT.isOn() || !user.loc )
@@ -192,7 +192,7 @@
else if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0,user))
- user << "You begin [welded ? "unwelding":"welding"] the [src]..."
+ user << "You begin [welded ? "unwelding":"welding"] \the [src]..."
playsound(loc, 'sound/items/Welder2.ogg', 40, 1)
if(do_after(user,40,5,1))
if(src.opened || !istype(src, /obj/structure/closet) || !user || !WT || !WT.isOn() || !user.loc )
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index d3ffa71fe14..1068afe8657 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -68,7 +68,7 @@
..()
new /obj/item/clothing/under/rank/janitor(src)
new /obj/item/weapon/cartridge/janitor(src)
- new /obj/item/clothing/gloves/black(src)
+ new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/head/soft/purple(src)
new /obj/item/device/flashlight(src)
new /obj/item/weapon/caution(src)
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..8a3aad19172 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -20,7 +20,7 @@
new /obj/item/clothing/under/rank/chief_engineer(src)
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/head/welding(src)
- new /obj/item/clothing/gloves/yellow(src)
+ new /obj/item/clothing/gloves/color/yellow(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/weapon/cartridge/ce(src)
new /obj/item/device/radio/headset/heads/ce(src)
@@ -46,8 +46,8 @@
/obj/structure/closet/secure_closet/engineering_electrical/New()
..()
- new /obj/item/clothing/gloves/yellow(src)
- new /obj/item/clothing/gloves/yellow(src)
+ new /obj/item/clothing/gloves/color/yellow(src)
+ new /obj/item/clothing/gloves/color/yellow(src)
new /obj/item/weapon/storage/toolbox/electrical(src)
new /obj/item/weapon/storage/toolbox/electrical(src)
new /obj/item/weapon/storage/toolbox/electrical(src)
@@ -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/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 7bb382d60a7..235a9ce9081 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -69,7 +69,7 @@
new /obj/item/clothing/suit/toggle/labcoat(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/device/radio/headset/headset_med(src)
- new /obj/item/clothing/gloves/latex(src)
+ new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/weapon/defibrillator/loaded(src)
new /obj/item/weapon/storage/belt/medical(src)
new /obj/item/clothing/glasses/hud/health(src)
@@ -101,7 +101,7 @@
new /obj/item/clothing/shoes/sneakers/brown (src)
new /obj/item/weapon/cartridge/cmo(src)
new /obj/item/device/radio/headset/heads/cmo(src)
- new /obj/item/clothing/gloves/latex(src)
+ new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/weapon/defibrillator/loaded(src)
new /obj/item/weapon/storage/belt/medical(src)
new /obj/item/device/flash/handheld(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 4146accd389..174f2e748c9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -42,7 +42,7 @@
new /obj/item/clothing/under/rank/research_director/turtleneck(src)
new /obj/item/weapon/cartridge/rd(src)
new /obj/item/clothing/shoes/sneakers/white(src)
- new /obj/item/clothing/gloves/latex(src)
+ new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/device/radio/headset/heads/rd(src)
new /obj/item/weapon/tank/air(src)
new /obj/item/clothing/mask/gas(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 ed8584da142..f45405202f9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -22,7 +22,7 @@
new /obj/item/weapon/cartridge/captain(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/device/radio/headset/heads/captain/alt(src)
- new /obj/item/clothing/gloves/captain(src)
+ new /obj/item/clothing/gloves/color/captain(src)
new /obj/item/clothing/suit/toggle/wintercoat/captain(src)
new /obj/item/clothing/head/santa(src)
new /obj/item/weapon/gun/energy/gun(src)
@@ -47,7 +47,7 @@
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/weapon/storage/box/ids(src)
new /obj/item/weapon/storage/box/ids(src)
- new /obj/item/clothing/suit/armor/vest(src)
+ new /obj/item/clothing/suit/armor/vest/alt(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/device/flash/handheld(src)
new /obj/item/clothing/glasses/sunglasses(src)
@@ -74,16 +74,15 @@
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/clothing/under/hosparadefem(src)
new /obj/item/clothing/under/hosparademale(src)
- new /obj/item/clothing/suit/armor/hos/trenchcoat(src)
- new /obj/item/clothing/under/rank/head_of_security/formal(src)
- new /obj/item/clothing/head/HoS/beret(src)
+ new /obj/item/clothing/suit/armor/hos(src)
+ new /obj/item/clothing/head/HoS(src)
new /obj/item/clothing/glasses/hud/security/eyepatch(src)
new /obj/item/weapon/storage/lockbox/loyalty(src)
new /obj/item/weapon/storage/box/flashbangs(src)
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
@@ -103,18 +102,17 @@
/obj/structure/closet/secure_closet/warden/New()
..()
new /obj/item/device/radio/headset/headset_sec(src)
- new /obj/item/clothing/suit/armor/vest/warden(src)
+ new /obj/item/clothing/suit/armor/vest/warden/(src)
new /obj/item/clothing/head/warden(src)
- new /obj/item/clothing/suit/armor/vest(src)
- new /obj/item/clothing/under/rank/warden/formal(src)
- new /obj/item/clothing/head/warden/drill(src)
+ new /obj/item/clothing/suit/armor/vest/warden/alt(src)
+ new /obj/item/clothing/head/beret/sec/navywarden(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/mask/gas/sechailer(src)
new /obj/item/weapon/storage/box/flashbangs(src)
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
@@ -134,13 +132,11 @@
/obj/structure/closet/secure_closet/security/New()
..()
new /obj/item/clothing/suit/armor/vest(src)
- new /obj/item/clothing/head/helmet(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
+ new /obj/item/clothing/head/soft/sec(src)
new /obj/item/weapon/reagent_containers/spray/pepper(src)
- new /obj/item/clothing/mask/gas/sechailer(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)
@@ -202,7 +198,7 @@
new /obj/item/clothing/under/rank/det(src)
new /obj/item/clothing/suit/det_suit(src)
new /obj/item/clothing/head/det_hat(src)
- new /obj/item/clothing/gloves/black(src)
+ new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/under/rank/det/grey(src)
new /obj/item/clothing/suit/det_suit/grey(src)
new /obj/item/clothing/head/fedora(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..4522ee5f51e 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -12,10 +12,9 @@
/obj/structure/closet/syndicate/personal/New()
..()
new /obj/item/clothing/under/syndicate(src)
- new /obj/item/clothing/suit/armor/vest(src)
- new /obj/item/clothing/head/helmet/swat/syndicate(src)
- new /obj/item/ammo_box/magazine/m10mm(src)
+ new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/device/radio/headset/syndicate(src)
+ new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/weapon/storage/belt/military(src)
new /obj/item/weapon/crowbar/red(src)
new /obj/item/clothing/glasses/night(src)
@@ -33,11 +32,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/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index ee80b8ea7ff..27c2655da50 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -132,7 +132,7 @@
if(prob(20))
new /obj/item/device/multitool(src)
if(prob(5))
- new /obj/item/clothing/gloves/yellow(src)
+ new /obj/item/clothing/gloves/color/yellow(src)
if(prob(40))
new /obj/item/clothing/head/hardhat(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index e5726239a9c..92128cf4bef 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -28,12 +28,12 @@
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/jackboots(src)
- new /obj/item/clothing/head/soft/sec(src)
- new /obj/item/clothing/head/soft/sec(src)
- new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/beret/sec(src)
new /obj/item/clothing/head/beret/sec(src)
new /obj/item/clothing/head/beret/sec(src)
+ new /obj/item/clothing/head/soft/sec(src)
+ new /obj/item/clothing/head/soft/sec(src)
+ new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/santa(src)
new /obj/item/clothing/head/santa(src)
new /obj/item/clothing/head/santa(src)
@@ -195,15 +195,18 @@
/obj/structure/closet/wardrobe/white/medical/New()
new /obj/item/clothing/under/rank/nursesuit (src)
new /obj/item/clothing/head/nursehat (src)
- new /obj/item/clothing/suit/toggle/labcoat/emt(src)
- new /obj/item/clothing/suit/toggle/labcoat/emt(src)
- new /obj/item/clothing/suit/toggle/labcoat/emt(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/purple(src)
+ new /obj/item/clothing/suit/toggle/labcoat/emt(src)
+ new /obj/item/clothing/suit/toggle/labcoat/emt(src)
+ new /obj/item/clothing/suit/toggle/labcoat/emt(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/shoes/sneakers/black(src)
+ new /obj/item/clothing/head/soft/emt(src)
+ new /obj/item/clothing/head/soft/emt(src)
+ new /obj/item/clothing/head/soft/emt(src)
return
/obj/structure/closet/wardrobe/pjs
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 5d4f5dc9b18..4768a2941a2 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -177,7 +177,7 @@
if (P.pipe_type in list(0, 1, 5)) //simple pipes, simple bends, and simple manifolds.
user.drop_item()
P.loc = src.loc
- user << "You fit the pipe into the [src]!"
+ user << "You fit the pipe into \the [src]!"
else
..()
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 25128f564a9..fdb8eea13d1 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -138,8 +138,8 @@
if(!shock(user, 90))
playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
anchored = !anchored
- user.visible_message("[user] [anchored ? "fastens" : "unfastens"] the [src].", \
- "You have [anchored ? "fastened the [src] to" : "unfastened the [src] from"] the floor.")
+ user.visible_message("[user] [anchored ? "fastens" : "unfastens"] [src].", \
+ "You have [anchored ? "fastened [src] to" : "unfastened [src] from"] the floor.")
return
else if(istype(W, /obj/item/stack/rods) && destroyed)
var/obj/item/stack/rods/R = W
diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
index 29126839d37..24614a6849e 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
@@ -39,7 +39,7 @@
else
M.visible_message(\
"[user.name] secretes a thick vile goo, securing [M.name] into [src]!",\
- "[user.name] drenches you in a foul-smelling resin, trapping you in the [src]!",\
+ "[user.name] drenches you in a foul-smelling resin, trapping you in [src]!",\
"You hear squelching...")
M.buckled = src
M.loc = src.loc
diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm
index d26f0183ac0..5e4e26cbabd 100644
--- a/code/game/objects/structures/table_frames.dm
+++ b/code/game/objects/structures/table_frames.dm
@@ -29,7 +29,7 @@
return
if(istype(I, /obj/item/stack/sheet/plasteel))
var/obj/item/stack/sheet/plasteel/P = I
- user << "Now adding the [P] to the [src]."
+ user << "Now adding [P] to [src]."
if(do_after(user, 50))
new /obj/structure/table/reinforced(src.loc)
qdel(src)
@@ -37,7 +37,7 @@
return
if(istype(I, /obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = I
- user << "Now adding the [M] to the [src]."
+ user << "Now adding [M] to [src]."
if(do_after(user, 20))
new /obj/structure/table(src.loc)
qdel(src)
@@ -45,7 +45,7 @@
return
if(istype(I, /obj/item/stack/sheet/glass))
var/obj/item/stack/sheet/glass/G = I
- user << "Now adding the [G] to the [src]."
+ user << "Now adding [G] to [src]."
if(do_after(user, 20))
new /obj/structure/table/glass(src.loc)
qdel(src)
@@ -72,7 +72,7 @@
return
if(istype(I, /obj/item/stack/sheet/mineral/wood))
var/obj/item/stack/sheet/mineral/wood/W = I
- user << "Now adding the [W] to the [src]."
+ user << "Now adding [W] to [src]."
if(do_after(user, 20))
new /obj/structure/table/wood(src.loc)
qdel(src)
@@ -80,7 +80,7 @@
return
if(istype(I, /obj/item/stack/tile/carpet))
var/obj/item/stack/tile/carpet/C = I
- user << "Now adding the [C] to the [src]."
+ user << "Now adding [C] to [src]."
if(do_after(user, 20))
new /obj/structure/table/wood/poker(src.loc)
qdel(src)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 3b7ab8924b7..7111ef392aa 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -184,12 +184,11 @@
..()
if(severity == 3)
if(prob(25))
- density = 0
+ table_destroy(1)
/obj/structure/table/blob_act()
if(prob(75))
table_destroy(1)
- qdel(src)
return
/obj/structure/table/attack_alien(mob/living/user)
@@ -231,8 +230,11 @@
else
return 0
-
-/obj/structure/table/MouseDrop_T(obj/O, mob/user)
+/obj/structure/table/MouseDrop_T(atom/movable/O, mob/user)
+ if(ismob(O) && user == O && ishuman(user))
+ if(user.canmove)
+ climb_table(user)
+ return
if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
return
if(isrobot(user))
@@ -358,10 +360,6 @@
* TABLE CLIMBING
*/
-/obj/structure/table/MouseDrop_T(mob/target, mob/living/carbon/human/user)
- if(istype(target) && user == target && istype(user))
- if(user.canmove)
- climb_table(user)
/obj/structure/table/proc/climb_table(mob/user)
src.add_fingerprint(user)
@@ -494,21 +492,20 @@
if(1.0)
qdel(src)
if(2.0)
- qdel(src)
if(prob(50))
- new /obj/item/weapon/rack_parts(src.loc)
+ rack_destroy()
+ else
+ qdel(src)
if(3.0)
if(prob(25))
- qdel(src)
- new /obj/item/weapon/rack_parts(src.loc)
+ rack_destroy()
/obj/structure/rack/blob_act()
if(prob(75))
qdel(src)
return
else if(prob(50))
- new /obj/item/weapon/rack_parts(src.loc)
- qdel(src)
+ rack_destroy()
return
/obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0)
@@ -534,9 +531,8 @@
/obj/structure/rack/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/wrench))
- new /obj/item/weapon/rack_parts( src.loc )
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- qdel(src)
+ rack_destroy()
return
if(isrobot(user))
@@ -559,38 +555,42 @@
"You kick [src].")
if(HULK in user.mutations)
- health -= 5
+ rack_destroy()
else
health -= rand(1,2)
- healthcheck()
+ healthcheck()
/obj/structure/rack/attack_alien(mob/living/user)
user.do_attack_animation(src)
visible_message("[user] slices [src] apart!")
- new /obj/item/weapon/rack_parts(loc)
- density = 0
- qdel(src)
+ rack_destroy()
/obj/structure/rack/attack_animal(mob/living/simple_animal/user)
if(user.environment_smash)
user.do_attack_animation(src)
visible_message("[user] smashes [src] apart!")
- new /obj/item/weapon/rack_parts(loc)
- density = 0
- qdel(src)
+ rack_destroy()
/obj/structure/rack/attack_tk() // no telehulk sorry
return
/obj/structure/rack/proc/healthcheck()
if(health <= 0)
- density = 0
- var/obj/item/weapon/rack_parts/newparts = new(loc)
- transfer_fingerprints_to(newparts)
- qdel(src)
+ rack_destroy()
return
+/*
+ * Rack destruction
+ */
+
+/obj/structure/rack/proc/rack_destroy()
+ density = 0
+ var/obj/item/weapon/rack_parts/newparts = new(loc)
+ transfer_fingerprints_to(newparts)
+ qdel(src)
+
+
/*
* Rack Parts
*/
diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm
index 12bfc62e84d..871ffe59b0f 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube.dm
@@ -44,7 +44,7 @@ obj/structure/transit_tube/ex_act(severity, target)
for(var/obj/structure/transit_tube_pod/pod in src.loc)
user << "Remove the pod first."
return
- user.visible_message("[user] starts to deattach the [src]!", "You start deattaching the [name]...")
+ user.visible_message("[user] starts to deattach \the [src]!", "You start deattaching the [name]...")
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 35))
user << "You deattach the [name]!"
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
index 9e9afcc61dc..eeaa29e8a85 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
@@ -31,11 +31,11 @@
for(var/obj/structure/transit_tube/station/T in loc)
return
if(src.contents.len)
- user.visible_message("[user] empties the [src].", "You empty the [src].")
+ user.visible_message("[user] empties \the [src].", "You empty \the [src].")
src.empty()
return
else
- user << "You free the [src]."
+ user << "You free \the [src]."
var/obj/structure/c_transit_tube_pod/R = new/obj/structure/c_transit_tube_pod(src.loc)
src.transfer_fingerprints_to(R)
R.add_fingerprint(user)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 62b181272f2..775656ead7d 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -18,8 +18,10 @@
/obj/structure/toilet/attack_hand(mob/living/user)
if(swirlie)
- user.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "You slam the toilet seat onto [swirlie]'s head!", "You hear reverberating porcelain.")
- swirlie.adjustBruteLoss(8)
+ user.changeNext_move(CLICK_CD_MELEE)
+ playsound(src.loc, "swing_hit", 25, 1)
+ swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto [swirlie]'s head!", "You hear reverberating porcelain.")
+ swirlie.adjustBruteLoss(5)
return
if(cistern && !open)
@@ -55,6 +57,7 @@
return
if(istype(I, /obj/item/weapon/grab))
+ user.changeNext_move(CLICK_CD_MELEE)
var/obj/item/weapon/grab/G = I
if(!G.confirm())
return
@@ -64,21 +67,23 @@
if(GM.loc != get_turf(src))
user << "[GM] needs to be on [src]."
return
- if(open && !swirlie)
- user.visible_message("[user] starts to give [GM] a swirlie!", "You start to give [GM] a swirlie!")
- swirlie = GM
- if(do_after(user, 30, 5, 0))
- user.visible_message("[user] gives [GM] a swirlie!", "You give [GM] a swirlie!", "You hear a toilet flushing.")
- if(iscarbon(GM))
- var/mob/living/carbon/C = GM
- if(!C.internal)
- C.adjustOxyLoss(5)
- else
- GM.adjustOxyLoss(5)
- swirlie = null
- else
- user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM] into [src]!")
- GM.adjustBruteLoss(8)
+ if(!swirlie)
+ if(open)
+ GM.visible_message("[user] starts to give [GM] a swirlie!", "[user] starts to give [GM] a swirlie!")
+ swirlie = GM
+ if(do_after(user, 30, 5, 0))
+ GM.visible_message("[user] gives [GM] a swirlie!", "[user] gives [GM] a swirlie!", "You hear a toilet flushing.")
+ if(iscarbon(GM))
+ var/mob/living/carbon/C = GM
+ if(!C.internal)
+ C.adjustOxyLoss(5)
+ else
+ GM.adjustOxyLoss(5)
+ swirlie = null
+ else
+ playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
+ GM.visible_message("[user] slams [GM.name] into [src]!", "[user] slams [GM.name] into [src]!")
+ GM.adjustBruteLoss(5)
else
user << "You need a tighter grip."
@@ -167,7 +172,7 @@
if(I.type == /obj/item/device/analyzer)
user << "The water temperature seems to be [watertemp]."
if(istype(I, /obj/item/weapon/wrench))
- user << "You begin to adjust the temperature valve with the [I]."
+ user << "You begin to adjust the temperature valve with \the [I]."
if(do_after(user, 50))
switch(watertemp)
if("normal")
@@ -176,7 +181,7 @@
watertemp = "boiling"
if("boiling")
watertemp = "normal"
- user.visible_message("[user] adjusts the shower with the [I].", "You adjust the shower with the [I] to [watertemp] temperature.")
+ user.visible_message("[user] adjusts the shower with \the [I].", "You adjust the shower with \the [I] to [watertemp] temperature.")
log_game("[key_name(user)] has wrenched a shower to [watertemp] at ([x],[y],[z])")
add_hiddenprint(user)
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.dm b/code/game/turfs/simulated/floor.dm
index 87e1fc86b4a..94bf8673290 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -161,7 +161,11 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
else if(prob(50))
ReplaceWithLattice()
-/turf/simulated/floor/Entered()
+/turf/simulated/floor/narsie_act()
+ if(prob(20))
+ ChangeTurf(/turf/simulated/floor/engine/cult)
+
+/turf/simulated/floor/Entered(atom/A, atom/OL)
..()
if(!ignoredirt)
if(has_gravity(src))
diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm
index f1033633551..51f52b5de4c 100644
--- a/code/game/turfs/simulated/floor/light_floor.dm
+++ b/code/game/turfs/simulated/floor/light_floor.dm
@@ -8,7 +8,7 @@
luminosity = 5
icon_state = "light_on"
floor_tile = /obj/item/stack/tile/light
- broken_states = list("light-broken")
+ broken_states = list("light_broken")
var/on = 1
var/state //0 = fine, 1 = flickering, 2 = breaking, 3 = broken
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 7a11314a50a..bd74639bd6d 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -110,6 +110,9 @@
name = "engraved floor"
icon_state = "cult"
+/turf/simulated/floor/engine/cult/narsie_act()
+ return
+
/turf/simulated/floor/engine/n20/New()
..()
var/datum/gas_mixture/adding = new
@@ -137,8 +140,7 @@
nitrogen = 0
temperature = TCMB
-/turf/simulated/floor/airless
- icon_state = "floor"
+/turf/simulated/floor/plasteel/airless
oxygen = 0
nitrogen = 0
temperature = TCMB
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index fed36f77b71..d519784cd61 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -76,11 +76,9 @@
/turf/simulated/wall/mech_melee_attack(obj/mecha/M)
if(M.damtype == "brute")
playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
- M.occupant_message("You hit [src].")
visible_message("[M.name] has hit [src]!")
if(prob(5) && M.force > 20)
dismantle_wall(1)
- M.occupant_message("You smash through the wall.")
visible_message("[src.name] smashes through the wall!")
playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
@@ -286,4 +284,8 @@
return
if(current_size == STAGE_FOUR)
if(prob(30))
- dismantle_wall()
\ No newline at end of file
+ dismantle_wall()
+
+/turf/simulated/wall/narsie_act()
+ if(prob(20))
+ ChangeTurf(/turf/simulated/wall/cult)
\ No newline at end of file
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index 2f773d52b04..9c6b1529172 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -13,6 +13,9 @@
new /obj/effect/decal/cleanable/blood(src)
new /obj/effect/decal/remains/human(src)
+/turf/simulated/wall/cult/narsie_act()
+ return
+
/turf/simulated/wall/vault
icon_state = "rockvault"
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 2eb21269c60..77a5b65105e 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -43,6 +43,8 @@
if(prefs.toggles & MEMBER_PUBLIC)
keyname = "
[keyname]"
+ msg = emoji_parse(msg)
+
for(var/client/C in clients)
if(C.prefs.toggles & CHAT_OOC)
if(holder)
@@ -109,3 +111,14 @@ var/global/normal_ooc_colour = "#002eb8"
src << "[join_motd]
"
else
src << "The Message of the Day has not been set."
+
+/client/proc/self_notes()
+ set name = "View Admin Notes"
+ set category = "OOC"
+ set desc = "View the notes that admins have written about you"
+
+ if(!config.see_own_notes)
+ usr << "Sorry, that function is not enabled on this server."
+ return
+
+ see_own_notes()
diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm
index b9e4b830b69..7b128727942 100644
--- a/code/modules/admin/admin_investigate.dm
+++ b/code/modules/admin/admin_investigate.dm
@@ -22,12 +22,12 @@
F << "[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z]) || [src] [message]
"
//ADMINVERBS
-/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity", "records", "cargo") )
+/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter") )
set name = "Investigate"
set category = "Admin"
if(!holder) return
switch(subject)
- if("singulo", "ntsl", "wires", "telesci", "gravity", "records", "cargo") //general one-round-only stuff
+ if("singulo", "ntsl", "wires", "telesci", "gravity", "records", "cargo", "supermatter") //general one-round-only stuff
var/F = investigate_subject2file(subject)
if(!F)
src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed."
diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm
index c906cd1b778..26c5719eddf 100644
--- a/code/modules/admin/player_notes.dm
+++ b/code/modules/admin/player_notes.dm
@@ -4,13 +4,35 @@
#define NOTESFILE "data/player_notes.sav" //where the player notes are saved
+/proc/see_own_notes()
+ if(!config.see_own_notes)
+ return
+ var/ckey = usr.client.ckey
+ if(!ckey)
+ usr << "Error: No ckey found."
+ return
+ var/savefile/notesfile = new(NOTESFILE)
+ if(!notesfile)
+ usr << "Error: Cannot access [NOTESFILE]"
+ return
+ notesfile.cd = "/[ckey]"
+ var/dat = "Notes for [ckey]:
"
+ while(!notesfile.eof)
+ var/note
+ notesfile >> note
+ dat += note
+ var/datum/browser/popup = new(usr, "player_notes", "Player Notes", 700, 400)
+ popup.set_content(dat)
+ popup.open()
+
+
datum/admins/proc/notes_show(var/ckey)
usr << browse("Player Notes[notes_gethtml(ckey)]","window=player_notes;size=700x400")
datum/admins/proc/notes_gethtml(var/ckey)
var/savefile/notesfile = new(NOTESFILE)
- if(!notesfile) return "Error: Cannot access [NOTESFILE]"
+ if(!notesfile) return "Error: Cannot access [NOTESFILE]"
if(ckey)
. = "Notes for [ckey]: \[+\]
"
notesfile.cd = "/[ckey]"
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/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 038d9d88553..39b8899c4b2 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -68,6 +68,8 @@
msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
if(!msg) return
+ msg = emoji_parse(msg)
+
if(C.holder)
if(holder) //both are admins
C << "Admin PM from-[key_name(src, C, 1)]: [msg]"
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 914fbef7c0d..19729a99342 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -705,7 +705,7 @@ var/global/list/g_fancy_list_of_types = null
if ("laser tag red")
M.equip_to_slot_or_del(new /obj/item/clothing/under/color/red(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/red(M), slot_shoes)
- M.equip_to_slot_or_del(new /obj/item/clothing/gloves/red(M), slot_gloves)
+ M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/red(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/redtaghelm(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/redtag(M), slot_wear_suit)
@@ -716,7 +716,7 @@ var/global/list/g_fancy_list_of_types = null
if ("laser tag blue")
M.equip_to_slot_or_del(new /obj/item/clothing/under/color/blue(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/blue(M), slot_shoes)
- M.equip_to_slot_or_del(new /obj/item/clothing/gloves/blue(M), slot_gloves)
+ M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/blue(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/bluetaghelm(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/bluetag(M), slot_wear_suit)
@@ -743,7 +743,7 @@ var/global/list/g_fancy_list_of_types = null
if("tunnel clown")//Tunnel clowns rule!
M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes)
- M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves)
+ M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses)
@@ -764,7 +764,7 @@ var/global/list/g_fancy_list_of_types = null
if("masked killer")
M.equip_to_slot_or_del(new /obj/item/clothing/under/overalls(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/white(M), slot_shoes)
- M.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(M), slot_gloves)
+ M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_wear_mask)
M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears)
@@ -785,7 +785,7 @@ var/global/list/g_fancy_list_of_types = null
M.equip_to_slot_or_del(U, slot_w_uniform)
U.attachTie(new /obj/item/clothing/tie/waistcoat(M))
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(M), slot_shoes)
- M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves)
+ M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword/saber(M), slot_l_store)
@@ -821,7 +821,7 @@ var/global/list/g_fancy_list_of_types = null
if("centcom official")
M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(M), slot_shoes)
- M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves)
+ M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_com(M), slot_ears)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_belt)
@@ -951,7 +951,7 @@ var/global/list/g_fancy_list_of_types = null
if("mobster")
M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), slot_shoes)
- M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves)
+ M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/tommygun(M), slot_r_hand)
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..cbc3d644c76 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -130,7 +130,7 @@
corpsegloves = /obj/item/clothing/gloves/combat
corpseradio = /obj/item/device/radio/headset
corpsemask = /obj/item/clothing/mask/gas
- corpsehelmet = /obj/item/clothing/head/helmet/swat/syndicate
+ corpsehelmet = /obj/item/clothing/head/helmet/swat
corpseback = /obj/item/weapon/storage/backpack
corpseid = 1
corpseidjob = "Operative"
@@ -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
@@ -189,7 +189,7 @@
corpseback = /obj/item/weapon/storage/backpack/industrial
corpseshoes = /obj/item/clothing/shoes/sneakers/orange
corpsebelt = /obj/item/weapon/storage/belt/utility/full
- corpsegloves = /obj/item/clothing/gloves/yellow
+ corpsegloves = /obj/item/clothing/gloves/color/yellow
corpsehelmet = /obj/item/clothing/head/hardhat
corpseid = 1
corpseidjob = "Station Engineer"
diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm
index 7ef70f87ae2..381b167fb6e 100644
--- a/code/modules/awaymissions/maploader/reader.dm
+++ b/code/modules/awaymissions/maploader/reader.dm
@@ -2,6 +2,9 @@
//SS13 Optimized Map loader
//////////////////////////////////////////////////////////////
+//global datum that will preload variables on atoms instanciation
+var/global/dmm_suite/preloader/_preloader = null
+
/**
* Construct the model map and control the loading process
@@ -163,7 +166,7 @@
//first instance the /area and remove it from the members list
index = members.len
var/atom/instance
- var/dmm_suite/preloader/_preloader = new(members_attributes[index])//preloader for assigning set variables on atom creation
+ _preloader = new(members_attributes[index])//preloader for assigning set variables on atom creation
instance = locate(members[index])
instance.contents.Add(locate(xcrd,ycrd,zcrd))
@@ -191,34 +194,6 @@
T = UT
index++
-
- //Replace the previous part of the code with this if it's unsafe to assume tiles have ALWAYS an /area AND a /turf
- /*while(members.len > 0)
- var/length = members.len
- var/member = members[length]
-
- if(ispath(member,/area))
- var/atom/instance
- var/dmm_suite/preloader/_preloader = new(members_attributes[length])
-
- instance = locate(member)
- instance.contents.Add(locate(xcrd,ycrd,zcrd))
-
- if(_preloader && instance)
- _preloader.load(instance)
-
- members.Remove(member)
- continue
-
- else if(ispath(member,/turf))
- instance_atom(member,members_attributes[length],xcrd,ycrd,zcrd)
- members.Remove(member)
- continue
-
- else
- break
- */
-
//finally instance all remainings objects/mobs
for(index=1,index < first_turf_index,index++)
instance_atom(members[index],members_attributes[index],xcrd,ycrd,zcrd)
@@ -230,11 +205,11 @@
//Instance an atom at (x,y,z) and gives it the variables in attributes
/dmm_suite/proc/instance_atom(var/path,var/list/attributes, var/x, var/y, var/z)
var/atom/instance
- var/dmm_suite/preloader/_preloader = new(attributes)
+ _preloader = new(attributes, path)
- instance = new path (locate(x,y,z), _preloader)//first preloader pass
+ instance = new path (locate(x,y,z))//first preloader pass
- if(_preloader && instance)//second preloader pass, as some variables may have been reset/changed by New()
+ if(_preloader && instance)//second preloader pass, for those atoms that don't ..() in New()
_preloader.load(instance)
return instance
@@ -242,9 +217,9 @@
//text trimming (both directions) helper proc
//optionally removes quotes before and after the text (for variable name)
/dmm_suite/proc/trim_text(var/what as text,var/trim_quotes=0)
- while(length(what) && (findtext(what," ",1,2)))// || findtext(what,quote,1,2)))
+ while(length(what) && (findtext(what," ",1,2)))
what=copytext(what,2,0)
- while(length(what) && (findtext(what," ",length(what),0)))// || findtext(what,quote,length(what),0)))
+ while(length(what) && (findtext(what," ",length(what),0)))
what=copytext(what,1,length(what))
if(trim_quotes)
while(length(what) && (findtext(what,quote,1,2)))
@@ -298,14 +273,18 @@
else if(isnum(text2num(trim_right)))
trim_right = text2num(trim_right)
- //Check for file
- else if(copytext(trim_right,1,2) == "'")
- trim_right = file(copytext(trim_right,2,length(trim_right)))
+ //Check for null
+ else if(trim_right == "null")
+ trim_right = null
//Check for list
else if(copytext(trim_right,1,5) == "list")
trim_right = text2list(copytext(trim_right,6,length(trim_right)))
+ //Check for file
+ else if(copytext(trim_right,1,2) == "'")
+ trim_right = file(copytext(trim_right,2,length(trim_right)))
+
to_return[trim_left] = trim_right
else//simple var
@@ -323,10 +302,11 @@
placed.opacity = 1
placed.underlays += turfs_underlays
-//atom creation method that preloads variables before creation
-/atom/New(atom/loc, dmm_suite/preloader/_dmm_preloader)
- if(istype(_dmm_preloader, /dmm_suite/preloader))
- _dmm_preloader.load(src)
+//atom creation method that preloads variables at creation
+/atom/New()
+ if(_preloader && (src.type == _preloader.target_path))//in case the instanciated atom is creating other atoms in New()
+ _preloader.load(src)
+
. = ..()
//////////////////
@@ -336,12 +316,15 @@
/dmm_suite/preloader
parent_type = /datum
var/list/attributes
+ var/target_path
-/dmm_suite/preloader/New(list/the_attributes)
+/dmm_suite/preloader/New(var/list/the_attributes, var/path)
.=..()
if(!the_attributes.len)
Del()
+ return
attributes = the_attributes
+ target_path = path
/dmm_suite/preloader/proc/load(atom/what)
for(var/attribute in attributes)
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index a97d1f13f30..b8cfb519a50 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -163,7 +163,7 @@ var/sc_safecode5 = "[rand(0,9)]"
desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
move_self = 0 //Contianed narsie does not move!
grav_pull = 0 //Contained narsie does not pull stuff in!
-
+ var/uneatable = list(/turf/space, /obj/effect/overlay, /mob/living/simple_animal/construct)
//Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
/obj/singularity/narsie/sc_Narsie/admin_investigate_setup()
return
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index ae95989af85..324096d42af 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -133,6 +133,7 @@ var/next_external_rsc = 0
if((global.comms_key == "default_pwd" || length(global.comms_key) <= 6) && global.comms_allowed) //It's the default value or less than 6 characters long, but it somehow didn't disable comms.
src << "The server's API key is either too short or is the default value! Consider changing it immediately!"
+ add_verbs_from_config()
set_client_age_from_db()
if (!ticker || ticker.current_state == GAME_STATE_PREGAME)
@@ -218,6 +219,10 @@ var/next_external_rsc = 0
var/DBQuery/query_accesslog = dbcon.NewQuery("INSERT INTO `[format_table_name("connection_log")]` (`id`,`datetime`,`serverip`,`ckey`,`ip`,`computerid`) VALUES(null,Now(),'[serverip]','[sql_ckey]','[sql_ip]','[sql_computerid]');")
query_accesslog.Execute()
+/client/proc/add_verbs_from_config()
+ if(config.see_own_notes)
+ verbs += /client/proc/self_notes
+
#undef TOPIC_SPAM_DELAY
#undef UPLOAD_LIMIT
@@ -306,4 +311,4 @@ var/next_external_rsc = 0
'icons/stamp_icons/large_stamp-cap.png',
'icons/stamp_icons/large_stamp-qm.png',
'icons/stamp_icons/large_stamp-law.png'
- )
+ )
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 3c54a472e40..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()
@@ -348,7 +350,7 @@ atom/proc/generate_female_clothing(index,t_color,icon)
flags |= (visor_flags)
flags_inv |= (visor_flags_inv)
icon_state = initial(icon_state)
- usr << "You pull the [src] down."
+ usr << "You pull \the [src] down."
flash_protect = initial(flash_protect)
tint = initial(tint)
else
@@ -356,7 +358,7 @@ atom/proc/generate_female_clothing(index,t_color,icon)
flags &= ~(visor_flags)
flags_inv &= ~(visor_flags_inv)
icon_state = "[initial(icon_state)]up"
- usr << "You push the [src] up."
+ usr << "You push \the [src] up."
flash_protect = 0
tint = 0
diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm
index e8fb6f0cadb..367abe770af 100644
--- a/code/modules/clothing/gloves/boxing.dm
+++ b/code/modules/clothing/gloves/boxing.dm
@@ -17,13 +17,3 @@
/obj/item/clothing/gloves/boxing/yellow
icon_state = "boxingyellow"
item_state = "boxingyellow"
-
-/obj/item/clothing/gloves/white
- name = "white gloves"
- desc = "These look pretty fancy."
- icon_state = "latex"
- item_state = "lgloves"
- item_color="mime"
-
- redcoat
- item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way.
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index bc224be8552..6904b2c1ded 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -1,4 +1,4 @@
-/obj/item/clothing/gloves/yellow
+/obj/item/clothing/gloves/color/yellow
desc = "These gloves will protect the wearer from electric shock."
name = "insulated gloves"
icon_state = "yellow"
@@ -7,118 +7,153 @@
permeability_coefficient = 0.05
item_color="yellow"
-/obj/item/clothing/gloves/fyellow //Cheap Chinese Crap
+/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap
desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly."
name = "budget insulated gloves"
icon_state = "yellow"
item_state = "ygloves"
siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
permeability_coefficient = 0.05
-
item_color="yellow"
- New()
- siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5)
+/obj/item/clothing/gloves/color/fyellow/New()
+ siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5)
-/obj/item/clothing/gloves/black
+/obj/item/clothing/gloves/color/black
desc = "These gloves are fire-resistant."
name = "black gloves"
icon_state = "black"
item_state = "bgloves"
item_color="brown"
-
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- hos
- item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way.
+/obj/item/clothing/gloves/color/black/hos
+ item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way.
- ce
- item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way.
+/obj/item/clothing/gloves/color/black/ce
+ item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way.
-/obj/item/clothing/gloves/black/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/clothing/gloves/color/black/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/wirecutters))
- user << "You snip the fingertips off of [src]."
- playsound(user.loc,'sound/items/Wirecutter.ogg', rand(10,50), 1)
- var/obj/item/clothing/gloves/fingerless/fingerless_gloves = new /obj/item/clothing/gloves/fingerless(user.loc)
- fingerless_gloves.icon_state = icon_state
- qdel(src)
+ if(icon_state == initial(icon_state)) //only if not dyed
+ user << "You snip the fingertips off of [src]."
+ playsound(user.loc,'sound/items/Wirecutter.ogg', rand(10,50), 1)
+ new /obj/item/clothing/gloves/fingerless(user.loc)
+ qdel(src)
..()
-/obj/item/clothing/gloves/orange
+/obj/item/clothing/gloves/color/orange
name = "orange gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "orange"
item_state = "orangegloves"
item_color="orange"
-/obj/item/clothing/gloves/red
+/obj/item/clothing/gloves/color/red
name = "red gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "red"
item_state = "redgloves"
item_color = "red"
-/obj/item/clothing/gloves/rainbow
+/obj/item/clothing/gloves/color/rainbow
name = "rainbow gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "rainbow"
item_state = "rainbowgloves"
item_color = "rainbow"
- clown
- item_color = "clown"
+/obj/item/clothing/gloves/color/rainbow/clown
+ item_color = "clown"
-/obj/item/clothing/gloves/blue
+/obj/item/clothing/gloves/color/blue
name = "blue gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "blue"
item_state = "bluegloves"
item_color="blue"
-/obj/item/clothing/gloves/purple
+/obj/item/clothing/gloves/color/purple
name = "purple gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "purple"
item_state = "purplegloves"
item_color="purple"
-/obj/item/clothing/gloves/green
+/obj/item/clothing/gloves/color/green
name = "green gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "green"
item_state = "greengloves"
item_color="green"
-/obj/item/clothing/gloves/grey
+/obj/item/clothing/gloves/color/grey
name = "grey gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "gray"
item_state = "graygloves"
item_color="grey"
- rd
- item_color = "director" //Exists for washing machines. Is not different from gray gloves in any way.
+/obj/item/clothing/gloves/color/grey/rd
+ item_color = "director" //Exists for washing machines. Is not different from gray gloves in any way.
- hop
- item_color = "hop" //Exists for washing machines. Is not different from gray gloves in any way.
+/obj/item/clothing/gloves/color/grey/hop
+ item_color = "hop" //Exists for washing machines. Is not different from gray gloves in any way.
-/obj/item/clothing/gloves/light_brown
+/obj/item/clothing/gloves/color/light_brown
name = "light brown gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "lightbrown"
item_state = "lightbrowngloves"
item_color="light brown"
-/obj/item/clothing/gloves/brown
+/obj/item/clothing/gloves/color/brown
name = "brown gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "brown"
item_state = "browngloves"
item_color="brown"
- cargo
- item_color = "cargo" //Exists for washing machines. Is not different from brown gloves in any way.
\ No newline at end of file
+/obj/item/clothing/gloves/color/brown/cargo
+ item_color = "cargo" //Exists for washing machines. Is not different from brown gloves in any way.
+
+/obj/item/clothing/gloves/color/captain
+ desc = "Regal blue gloves, with a nice gold trim. Swanky."
+ name = "captain's gloves"
+ icon_state = "captain"
+ item_state = "egloves"
+ item_color = "captain"
+ siemens_coefficient = 0
+ permeability_coefficient = 0.05
+ cold_protection = HANDS
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ heat_protection = HANDS
+ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+ strip_delay = 60
+
+/obj/item/clothing/gloves/color/latex
+ name = "latex gloves"
+ desc = "Sterile latex gloves."
+ icon_state = "latex"
+ item_state = "lgloves"
+ siemens_coefficient = 0.30
+ permeability_coefficient = 0.01
+ item_color="white"
+ transfer_prints = TRUE
+
+/obj/item/clothing/gloves/color/latex/cmo
+ item_color = "medical" //Exists for washing machines. Is not different from latex gloves in any way.
+
+/obj/item/clothing/gloves/color/white
+ name = "white gloves"
+ desc = "These look pretty fancy."
+ icon_state = "latex"
+ item_state = "lgloves"
+ item_color="mime"
+
+/obj/item/clothing/gloves/color/white/redcoat
+ item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way.
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index fc0d2172662..317ae88ac81 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -1,42 +1,15 @@
-/obj/item/clothing/gloves/captain
- desc = "Regal blue gloves, with a nice gold trim. Swanky."
- name = "captain's gloves"
- icon_state = "captain"
- item_state = "egloves"
- item_color = "captain"
- siemens_coefficient = 0
- permeability_coefficient = 0.05
- cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
- heat_protection = HANDS
- max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- strip_delay = 60
-/obj/item/clothing/gloves/combat
- name = "combat gloves"
- desc = "These tactical gloves are fireproof and shock resistant."
- icon_state = "black"
- item_state = "bgloves"
- siemens_coefficient = 0
- permeability_coefficient = 0.05
- strip_delay = 80
- cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
- heat_protection = HANDS
- max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
-
-/obj/item/clothing/gloves/latex
- name = "latex gloves"
- desc = "Sterile latex gloves."
- icon_state = "latex"
- item_state = "lgloves"
- siemens_coefficient = 0.30
- permeability_coefficient = 0.01
- item_color="white"
+/obj/item/clothing/gloves/fingerless
+ name = "fingerless gloves"
+ desc = "Plain black gloves without fingertips for the hard working."
+ icon_state = "fingerless"
+ item_state = "fingerless"
+ item_color = null //So they don't wash.
transfer_prints = TRUE
-
- cmo
- item_color = "medical" //Exists for washing machines. Is not different from latex gloves in any way.
+ strip_delay = 40
+ put_on_delay = 20
+ cold_protection = HANDS
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
/obj/item/clothing/gloves/botanic_leather
name = "botanist's leather gloves"
@@ -49,14 +22,15 @@
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
-/obj/item/clothing/gloves/fingerless
- name = "fingerless gloves"
- desc = "Plain black gloves without fingertips for the hard working."
- icon_state = "fingerless"
- item_state = "fingerless"
- item_color = null //So they don't wash.
- transfer_prints = TRUE
- strip_delay = 40
- put_on_delay = 20
+/obj/item/clothing/gloves/combat
+ name = "combat gloves"
+ desc = "These tactical gloves are fireproof and shock resistant."
+ icon_state = "black"
+ item_state = "bgloves"
+ siemens_coefficient = 0
+ permeability_coefficient = 0.05
+ strip_delay = 80
cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
\ No newline at end of file
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ heat_protection = HANDS
+ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
\ No newline at end of file
diff --git a/code/modules/clothing/gloves/ninja.dm b/code/modules/clothing/gloves/ninja.dm
index 3ec928c9e29..0b05f32fb8d 100644
--- a/code/modules/clothing/gloves/ninja.dm
+++ b/code/modules/clothing/gloves/ninja.dm
@@ -46,65 +46,39 @@
if(!proximity) // todo: you could add ninja stars or computer hacking here
return 0
- // Move an AI into and out of things
- if(istype(A,/mob/living/silicon/ai))
- if(suit.s_control)
- A.add_fingerprint(H)
- suit.transfer_ai("AICORE", "NINJASUIT", A, H)
- return 1
- else
- H << "ERROR: \black Remote access channel disabled."
- return 0
-
- if(istype(A,/obj/structure/AIcore/deactivated))
- if(suit.s_control)
- A.add_fingerprint(H)
- suit.transfer_ai("INACTIVE","NINJASUIT",A, H)
- return 1
- else
- H << "ERROR: \black Remote access channel disabled."
- return 0
- if(istype(A,/obj/machinery/computer/aifixer))
- if(suit.s_control)
- A.add_fingerprint(H)
- suit.transfer_ai("AIFIXER","NINJASUIT",A, H)
- return 1
- else
- H << "ERROR: \black Remote access channel disabled."
- return 0
+ A.add_fingerprint(H)
// steal energy from powered things
if(istype(A,/mob/living/silicon/robot))
- A.add_fingerprint(H)
drain("CYBORG",A,suit)
return 1
+
if(istype(A,/obj/machinery/power/apc))
- A.add_fingerprint(H)
drain("APC",A,suit)
return 1
+
if(istype(A,/obj/structure/cable))
- A.add_fingerprint(H)
drain("WIRE",A,suit)
return 1
+
if(istype(A,/obj/structure/grille))
var/obj/structure/cable/C = locate() in A.loc
if(C)
drain("WIRE",C,suit)
return 1
+
if(istype(A,/obj/machinery/power/smes))
- A.add_fingerprint(H)
drain("SMES",A,suit)
return 1
+
if(istype(A,/obj/mecha))
- A.add_fingerprint(H)
drain("MECHA",A,suit)
return 1
- // download research
- if(istype(A,/obj/machinery/computer/rdconsole))
- A.add_fingerprint(H)
+ if(istype(A,/obj/machinery/computer/rdconsole)) // download research
drain("RESEARCH",A,suit)
return 1
+
if(istype(A,/obj/machinery/r_n_d/server))
A.add_fingerprint(H)
var/obj/machinery/r_n_d/server/S = A
@@ -116,3 +90,15 @@
drain("RESEARCH",A,suit)
return 1
+ //do AI transfers
+ if(istype(A,/mob/living/silicon/ai))
+ suit.NAI.transfer_ai("AICORE", "AICARD", A, H)
+ return 1
+
+ if(istype(A,/obj/structure/AIcore/deactivated))
+ suit.NAI.transfer_ai("INACTIVE","AICARD",A, H)
+ return 1
+
+ if(istype(A,/obj/machinery/computer/aifixer))
+ suit.NAI.transfer_ai("AIFIXER","AICARD",A, H)
+ return 1
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index de811f2cbae..1ff1a32b9d0 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -32,14 +32,14 @@
flags |= (visor_flags)
flags_inv |= (visor_flags_inv)
icon_state = initial(icon_state)
- usr << "You pull the [src] down."
+ usr << "You pull \the [src] down."
usr.update_inv_head(0)
else
up = !up
flags &= ~(visor_flags)
flags_inv &= ~(visor_flags_inv)
icon_state = "[initial(icon_state)]up"
- usr << "You push the [src] up."
+ usr << "You push \the [src] up."
usr.update_inv_head(0)
/obj/item/clothing/head/helmet/swat
@@ -54,19 +54,6 @@
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
strip_delay = 80
-/obj/item/clothing/head/helmet/bulletproof
- name = "tactical helmet"
- desc = "An advanced helmet designed to protect against traditional projectile weaponry and explosives."
- icon_state = "bulletproof"
- armor = list(melee = 25, bullet = 60, laser = 25, energy = 10, bomb = 40, bio = 0, rad = 0)
- strip_delay = 70
-
-/obj/item/clothing/head/helmet/swat/syndicate
- name = "blood-red helmet"
- desc = "An extremely robust, space-worthy helmet that lacks a visor to allow for goggle usage underneath. Property of Gorlex Marauders."
- icon_state = "helmetsyndi"
- item_state = "helmet"
-
/obj/item/clothing/head/helmet/thunderdome
name = "\improper Thunderdome helmet"
desc = "'Let the battle commence!'"
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 1a25b642c24..256138f8beb 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -44,7 +44,6 @@
name = "detective's fedora"
desc = "There's only one man who can sniff out the dirty stench of crime, and he's likely wearing this hat."
icon_state = "detective"
- allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen)
armor = list(melee = 50, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
//Mime
@@ -74,16 +73,11 @@
armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
strip_delay = 60
-/obj/item/clothing/head/warden/drill
- name = "warden's drill hat"
- desc = "A robust drill hat for the Warden. For keeping the officers and prisoners in line."
- icon_state = "wardendrill"
-
/obj/item/clothing/head/beret/sec
name = "security beret"
- desc = "A robust beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
+ desc = "A robust beret with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficent protection."
icon_state = "beret_badge"
- armor = list(melee = 30, bullet = 5, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
+ armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
strip_delay = 60
/obj/item/clothing/head/beret/sec/navyhos
@@ -95,6 +89,8 @@
name = "warden's beret"
desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
icon_state = "wardenberet"
+ armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
+ strip_delay = 60
/obj/item/clothing/head/beret/sec/navyofficer
desc = "A special beret with the security insignia emblazoned on it. For officers with class."
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 54e63a1f1d3..56423b8cf80 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -90,5 +90,11 @@
desc = "It's a robust baseball hat in tasteful red colour."
icon_state = "secsoft"
item_color = "sec"
- armor = list(melee = 30, bullet = 5, laser = 5, energy = 15, bomb = 0, bio = 0, rad = 0)
- strip_delay = 60
\ No newline at end of file
+ armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
+ strip_delay = 60
+
+/obj/item/clothing/head/soft/emt
+ name = "EMT cap"
+ desc = "It's a baseball hat with a dark turquoise color and a reflective cross on the top."
+ icon_state = "emtsoft"
+ item_color = "emtsoft"
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 8343d2aca31..92f23576991 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,29 +102,89 @@
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)
//Syndicate hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/syndi
name = "blood-red hardsuit helmet"
- desc = "An advanced helmet designed for work in special operations. Property of Gorlex Marauders."
- icon_state = "hardsuit0-syndi"
+ desc = "A dual-mode advanced helmet designed for work in special operations. It is in travel mode. Property of Gorlex Marauders."
+ icon_state = "hardsuit1-syndi"
item_state = "syndie_helm"
item_color = "syndi"
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
+ on = 1
+ action_button_name = "Toggle Helmet Mode"
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon()
+ icon_state = "hardsuit[on]-[item_color]"
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/attack_self(mob/user)
+ if(!isturf(user.loc))
+ user << "You cannot toggle your helmet while in this [user.loc]" //To prevent some lighting anomalities.
+ return
+ on = !on
+ if(on)
+ user << "You switch your helmet to travel mode."
+ name = "blood-red hardsuit helmet"
+ desc = "A dual-mode advanced helmet designed for work in special operations. It is in travel mode. Property of Gorlex Marauders."
+ flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL
+ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+ cold_protection = HEAD
+ user.AddLuminosity(brightness_on)
+ else
+ user << "You switch your helmet to combat mode."
+ name = "blood-red hardsuit helmet (combat)"
+ desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders."
+ flags = BLOCKHAIR
+ flags_inv = HIDEEARS
+ cold_protection = null
+ user.AddLuminosity(-brightness_on)
+
+ update_icon()
+ playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
+ user.update_inv_head()
/obj/item/clothing/suit/space/hardsuit/syndi
- icon_state = "hardsuit-syndi"
name = "blood-red hardsuit"
- desc = "An advanced suit that protects against injuries during special operations. Property of Gorlex Marauders."
+ desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in travel mode. Property of Gorlex Marauders."
+ icon_state = "hardsuit1-syndi"
item_state = "syndie_hardsuit"
+ item_color = "syndi"
slowdown = 1
w_class = 3
+ var/on = 1
+ action_button_name = "Toggle Hardsuit Mode"
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
+/obj/item/clothing/suit/space/hardsuit/syndi/update_icon()
+ icon_state = "hardsuit[on]-[item_color]"
+
+/obj/item/clothing/suit/space/hardsuit/syndi/attack_self(mob/user)
+ on = !on
+ if(on)
+ user << "You switch your hardsuit to travel mode."
+ name = "blood-red hardsuit helmet"
+ desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in travel mode. Property of Gorlex Marauders."
+ slowdown = 1
+ flags = STOPSPRESSUREDMAGE | THICKMATERIAL
+ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+ cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
+ else
+ user << "You switch your hardsuit to combat mode."
+ name = "blood-red hardsuit helmet (combat)"
+ desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in combat mode. Property of Gorlex Marauders."
+ slowdown = 0
+ flags = BLOCKHAIR
+ flags_inv = null
+ cold_protection = null
+
+ update_icon()
+ playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
+ user.update_inv_wear_suit()
+ user.update_inv_w_uniform()
//Wizard hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/wizard
@@ -169,7 +229,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 +247,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/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm
index 5aa48fa2b6f..47d2d3aede6 100644
--- a/code/modules/clothing/spacesuits/ninja.dm
+++ b/code/modules/clothing/spacesuits/ninja.dm
@@ -3,7 +3,6 @@
name = "ninja hood"
icon_state = "s-ninja"
item_state = "s-ninja_mask"
- allowed = list(/obj/item/weapon/stock_parts/cell)
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 25)
strip_delay = 12
unacidable = 1
@@ -56,8 +55,11 @@
var/a_boost = 3.0//Number of adrenaline boosters.
//Onboard AI related variables.
- var/mob/living/silicon/ai/AI//If there is an AI inside the suit.
+
+ var/obj/item/device/aicard/NAI //Integrated intellicard.
+
var/obj/item/device/paicard/pai//A slot for a pAI device
+
var/obj/effect/overlay/hologram//Is the AI hologram on or off? Visible only to the wearer of the suit. This works by attaching an image to a blank overlay.
- var/flush = 0//If an AI purge is in progress.
+
var/s_control = 1//If user in control of the suit.
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 79eeb774dcc..a665e594809 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -10,12 +10,20 @@
/obj/item/clothing/suit/armor/vest
name = "armor"
- desc = "An armored vest that protects against most types of damage."
+ desc = "A slim armored vest that protects against most types of damage."
icon_state = "armor"
item_state = "armor"
blood_overlay_type = "armor"
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+/obj/item/clothing/suit/armor/vest/alt
+ name = "armor"
+ desc = "An armored vest that protects against most types of damage. This is a civilian variant."
+ icon_state = "armoralt"
+ item_state = "armoralt"
+ blood_overlay_type = "armor"
+ armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+
/obj/item/clothing/suit/armor/hos
name = "armored greatcoat"
desc = "A greatcoat enchanced with a special alloy for some protection and style for those with a commanding presence."
@@ -38,7 +46,7 @@
/obj/item/clothing/suit/armor/vest/warden
name = "warden's jacket"
- desc = "An armored jacket with silver rank pips and livery."
+ desc = "A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets."
icon_state = "warden_jacket"
item_state = "armor"
body_parts_covered = CHEST|GROIN|ARMS
@@ -46,6 +54,11 @@
heat_protection = CHEST|GROIN|ARMS|HANDS
strip_delay = 70
+/obj/item/clothing/suit/armor/vest/warden/alt
+ name = "warden's armored jacket"
+ desc = "A red jacket with silver rank pips and body armor strapped on top."
+ icon_state = "warden_alt"
+
/obj/item/clothing/suit/armor/vest/capcarapace
name = "captain's carapace"
desc = "An armored vest reinforced with ceramic plates and pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."
@@ -70,12 +83,12 @@
put_on_delay = 60
/obj/item/clothing/suit/armor/bulletproof
- name = "tactical armor"
- desc = "A kevlar vest that excels in protecting the wearer against traditional projectile weaponry and explosives."
+ name = "bulletproof armor"
+ desc = "A bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
icon_state = "bulletproof"
item_state = "armor"
blood_overlay_type = "armor"
- armor = list(melee = 25, bullet = 60, laser = 25, energy = 10, bomb = 40, bio = 0, rad = 0)
+ armor = list(melee = 25, bullet = 80, laser = 10, energy = 10, bomb = 40, bio = 0, rad = 0)
strip_delay = 70
put_on_delay = 50
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 2440011164f..bb6be40c422 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -10,29 +10,23 @@
*/
/obj/item/clothing/under/rank/security
- name = "security jumpsuit"
- desc = "A security jumpsuit for officers complete with nanotrasen waistbuckle."
+ name = "security suit"
+ desc = "A formal security suit for officers complete with nanotrasen belt buckle."
icon_state = "security"
- item_state = "r_suit"
+ item_state = "gy_suit"
item_color = "security"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
strip_delay = 50
/obj/item/clothing/under/rank/warden
- name = "warden's jumpsuit"
- desc = "A security jumpsuit suit with decorative silver pips and 'warden' written on the shoulders."
- icon_state = "wardenformal"
- item_state = "r_suit"
+ name = "warden's suit"
+ desc = "A formal security suit for the warden with blue desginations and '/Warden/' stiched into the shoulders."
+ icon_state = "warden"
+ item_state = "gy_suit"
item_color = "warden"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
strip_delay = 50
-/obj/item/clothing/under/rank/warden/formal
- name = "warden's formal suit"
- desc = "A security formal suit with silver shoulder pips, a striped red tie, and tan slacks - the universal sign of bureaucracy.="
- icon_state = "wardenformal"
- item_color = "wardenformal"
-
/*
* Detective
*/
@@ -57,19 +51,13 @@
*/
/obj/item/clothing/under/rank/head_of_security
name = "head of security's suit"
- desc = "The jumpsuit worn by those few with the dedication to achieve the position of Head of Security."
+ desc = "A security suit decorated for those few with the dedication to achieve the position of Head of Security."
icon_state = "hos"
- item_state = "r_suit"
+ item_state = "gy_suit"
item_color = "hos"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
strip_delay = 60
-/obj/item/clothing/under/rank/head_of_security/formal
- name = "head of security's formal suit"
- desc = "The formal suit for a Head of Security with a superior sense of style."
- icon_state = "hosformal"
- item_color = "hosformal"
-
/*
* Navy uniforms
*/
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 5c90623466a..88cc52f77bd 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -374,4 +374,51 @@
item_state = "wcoat"
item_color = "black_tango"
fitted = 0
- can_adjust = 0
\ No newline at end of file
+ can_adjust = 0
+
+/obj/item/clothing/under/stripeddress
+ name = "striped dress"
+ desc = "Fashion in space."
+ icon_state = "striped_dress"
+ item_state = "stripeddress"
+ item_color = "striped_dress"
+ fitted = 0
+ can_adjust = 0
+
+/obj/item/clothing/under/sailordress
+ name = "sailor dress"
+ desc = "Formal wear for a leading lady."
+ icon_state = "sailor_dress"
+ item_state = "sailordress"
+ item_color = "sailor_dress"
+ fitted = 0
+ can_adjust = 0
+
+/obj/item/clothing/under/redeveninggown
+ name = "red evening gown"
+ desc = "Fancy dress for space bar singers."
+ icon_state = "red_evening_gown"
+ item_state = "redeveninggown"
+ item_color = "red_evening_gown"
+ fitted = 0
+ 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/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
index 75cd9b7f17b..1520f2cfcf7 100644
--- a/code/modules/clothing/under/ties.dm
+++ b/code/modules/clothing/under/ties.dm
@@ -195,4 +195,85 @@
name = "medical guard armband"
desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white and blue."
icon_state = "medblueband"
- item_color = "medblueband"
\ No newline at end of file
+ item_color = "medblueband"
+
+///////////
+//SCARVES//
+///////////
+
+/obj/item/clothing/tie/scarf
+ name = "scarf"
+ desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks."
+
+/obj/item/clothing/tie/scarf/red
+ name = "red scarf"
+ icon_state = "redscarf"
+ item_color = "redscarf"
+
+/obj/item/clothing/tie/scarf/green
+ name = "green scarf"
+ icon_state = "greenscarf"
+ item_color = "greenscarf"
+
+/obj/item/clothing/tie/scarf/darkblue
+ name = "dark blue scarf"
+ icon_state = "darkbluescarf"
+ item_color = "darkbluescarf"
+
+/obj/item/clothing/tie/scarf/purple
+ name = "purple scarf"
+ icon_state = "purplescarf"
+ item_color = "purplescarf"
+
+/obj/item/clothing/tie/scarf/yellow
+ name = "yellow scarf"
+ icon_state = "yellowscarf"
+ item_color = "yellowscarf"
+
+/obj/item/clothing/tie/scarf/orange
+ name = "orange scarf"
+ icon_state = "orangescarf"
+ item_color = "orangescarf"
+
+/obj/item/clothing/tie/scarf/lightblue
+ name = "light blue scarf"
+ icon_state = "lightbluescarf"
+ item_color = "lightbluescarf"
+
+/obj/item/clothing/tie/scarf/white
+ name = "white scarf"
+ icon_state = "whitescarf"
+ item_color = "whitescarf"
+
+/obj/item/clothing/tie/scarf/black
+ name = "black scarf"
+ icon_state = "blackscarf"
+ item_color = "blackscarf"
+
+/obj/item/clothing/tie/scarf/zebra
+ name = "zebra scarf"
+ icon_state = "zebrascarf"
+ item_color = "zebrascarf"
+
+/obj/item/clothing/tie/scarf/christmas
+ name = "christmas scarf"
+ icon_state = "christmasscarf"
+ item_color = "christmasscarf"
+
+//The three following scarves don't have the scarf subtype
+//This is because Ian can equip anything from that subtype
+//However, these 3 don't have corgi versions of their sprites
+/obj/item/clothing/tie/stripedredscarf
+ name = "striped red scarf"
+ icon_state = "stripedredscarf"
+ item_color = "stripedredscarf"
+
+/obj/item/clothing/tie/stripedgreenscarf
+ name = "striped green scarf"
+ icon_state = "stripedgreenscarf"
+ item_color = "stripedgreenscarf"
+
+/obj/item/clothing/tie/stripedbluescarf
+ name = "striped blue scarf"
+ icon_state = "stripedbluescarf"
+ item_color = "stripedbluescarf"
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/emoji/emoji_parse.dm b/code/modules/emoji/emoji_parse.dm
new file mode 100644
index 00000000000..aab9947c89e
--- /dev/null
+++ b/code/modules/emoji/emoji_parse.dm
@@ -0,0 +1,32 @@
+var/list/emojis
+
+/proc/emoji_parse(text)
+ if(!config.emojis)
+ return text
+ if(!emojis)
+ emojis = icon_states(icon('icons/emoji.dmi'))
+ var/parsed = ""
+ var/pos = 1
+ var/search = 0
+ var/emoji = ""
+ while(1)
+ search = findtext(text, ":", pos)
+ parsed += copytext(text, pos, search)
+ if(search)
+ pos = search
+ search = findtext(text, ":", pos+1)
+ if(search)
+ emoji = lowertext(copytext(text, pos+1, search))
+ if(emoji in emojis)
+ parsed += "
"
+ pos = search + 1
+ else
+ parsed += copytext(text, pos, search)
+ pos = search
+ emoji = ""
+ continue
+ else
+ parsed += copytext(text, pos, search)
+ break
+ return parsed
+
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index 63c52779fa7..ed41e80ee0a 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"
@@ -117,13 +117,13 @@
santa.equip_to_slot_or_del(new /obj/item/clothing/suit/space/santa, slot_wear_suit)
santa.equip_to_slot_or_del(new /obj/item/clothing/head/santa, slot_head)
santa.equip_to_slot_or_del(new /obj/item/clothing/mask/breath, slot_wear_mask)
- santa.equip_to_slot_or_del(new /obj/item/clothing/gloves/red, slot_gloves)
+ santa.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/red, slot_gloves)
santa.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/red, slot_shoes)
santa.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double, slot_belt)
santa.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain, slot_ears)
santa.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/santabag, slot_back)
santa.equip_to_slot_or_del(new /obj/item/device/flashlight, slot_r_store) //most blob spawn locations are really dark.
-
+
var/obj/item/weapon/card/id/gold/santacard = new(santa)
santacard.update_label("Santa Claus", "Santa")
var/datum/job/captain/J = new/datum/job/captain
@@ -147,5 +147,5 @@
var/obj/effect/proc_holder/spell/targeted/area_teleport/teleport/telespell = new(santa)
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/ninja.dm b/code/modules/events/ninja.dm
index 961a2d771d9..725cf620a18 100644
--- a/code/modules/events/ninja.dm
+++ b/code/modules/events/ninja.dm
@@ -172,7 +172,7 @@
Ninja.internals.icon_state = "internal1"
if(Ninja.mind != Mind) //something has gone wrong!
- ERROR("The ninja wasn't assigned the right mind. ;ç;")
+ ERROR("The ninja wasn't assigned the right mind. ;ç;")
Ninja << sound('sound/effects/ninja_greeting.ogg') //so ninja you probably wouldn't even know if you were made one
@@ -404,17 +404,17 @@ ________________________________________________________________________________
U:gloves.item_state = "s-ninjan"
else
if(U.mind.special_role!="Space Ninja")
- U << "\red fÄTaL ÈÈRRoR: 382200-*#00CÖDE RED\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR..."
+ U << "\red fÄTaL ÈÈRRoR: 382200-*#00CÖDE RED\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR..."
U.gib()
return 0
if(!istype(U:head, /obj/item/clothing/head/helmet/space/space_ninja))
- U << "ERROR: 100113 \black UNABLE TO LOCATE HEAD GEAR\nABORTING..."
+ U << "ERROR: 100113 UNABLE TO LOCATE HEAD GEAR\nABORTING..."
return 0
if(!istype(U:shoes, /obj/item/clothing/shoes/space_ninja))
- U << "ERROR: 122011 \black UNABLE TO LOCATE FOOT GEAR\nABORTING..."
+ U << "ERROR: 122011 UNABLE TO LOCATE FOOT GEAR\nABORTING..."
return 0
if(!istype(U:gloves, /obj/item/clothing/gloves/space_ninja))
- U << "ERROR: 110223 \black UNABLE TO LOCATE HAND GEAR\nABORTING..."
+ U << "ERROR: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING..."
return 0
affecting = U
@@ -570,7 +570,7 @@ ________________________________________________________________________________
U.incorporeal_move = 0
kamikaze = 0
k_unlock = 0
- U << "Disengaging mode...\n\blackCODE NAME: KAMIKAZE"
+ U << "Disengaging mode...\nCODE NAME: KAMIKAZE"
//=======//AI VERBS//=======//
@@ -587,295 +587,6 @@ ________________________________________________________________________________
s_control = 1
-//=======//OLD & UNUSED//=======//
-
-/*
-
-Deprecated. get_dir() does the same thing. Still a nice proc.
-Returns direction that the mob or whomever should be facing in relation to the target.
-This proc does not grant absolute direction and is mostly useful for 8dir sprite positioning.
-I personally used it with getline() to great effect.
-/proc/get_dir_to(turf/start,turf/end)//N
- var/xdiff = start.x - end.x//The sign is important.
- var/ydiff = start.y - end.y
-
- var/direction_x = xdiff<1 ? 4:8//East - west
- var/direction_y = ydiff<1 ? 1:2//North - south
- var/direction_xy = xdiff==0 ? -4:0//If x is the same, subtract 4.
- var/direction_yx = ydiff==0 ? -1:0//If y is the same, subtract 1.
- var/direction_f = direction_x+direction_y+direction_xy+direction_yx//Finally direction tally.
- direction_f = direction_f==0 ? 1:direction_f//If direction is 0(same spot), return north. Otherwise, direction.
-
- return direction_f
-
-Alternative and inferior method of calculating spideros.
-var/temp = num2text(spideros)
-var/return_to = copytext(temp, 1, (length(temp)))//length has to be to the length of the thing because by default it's length+1
-spideros = text2num(return_to)//Maximum length here is 6. Use (return_to, X) to specify larger strings if needed.
-
-//Old way of draining from wire.
-/obj/item/clothing/gloves/space_ninja/proc/drain_wire()
- set name = "Drain From Wire"
- set desc = "Drain energy directly from an exposed wire."
- set category = "Ninja Equip"
-
- var/obj/structure/cable/attached
- var/mob/living/carbon/human/U = loc
- if(candrain&&!draining)
- var/turf/T = U.loc
- if(isturf(T) && istype(T, /turf/simulated/floor/plating)
- attached = locate() in T
- if(!attached)
- U << "\red Warning: no exposed cable available."
- else
- U << "\blue Connecting to wire, stand still..."
- if(do_after(U,50)&&!isnull(attached))
- drain("WIRE",attached,U:wear_suit,src)
- else
- U << "\red Procedure interrupted. Protocol terminated."
- return
-
-I've tried a lot of stuff but adding verbs to the AI while inside an object, inside another object, did not want to work properly.
-This was the best work-around I could come up with at the time. Uses objects to then display to panel, based on the object spell system.
-Can be added on to pretty easily.
-
-BYOND fixed the verb bugs so this is no longer necessary. I prefer verb panels.
-
-/obj/item/clothing/suit/space/space_ninja/proc/grant_AI_verbs()
- var/obj/effect/proc_holder/ai_return_control/A_C = new(AI)
- var/obj/effect/proc_holder/ai_hack_ninja/B_C = new(AI)
- var/obj/effect/proc_holder/ai_instruction/C_C = new(AI)
- new/obj/effect/proc_holder/ai_holo_clear(AI)
- AI.proc_holder_list += A_C
- AI.proc_holder_list += B_C
- AI.proc_holder_list += C_C
-
- s_control = 0
-
-/obj/item/clothing/suit/space/space_ninja/proc/remove_AI_verbs()
- var/obj/effect/proc_holder/ai_return_control/A_C = locate() in AI
- var/obj/effect/proc_holder/ai_hack_ninja/B_C = locate() in AI
- var/obj/effect/proc_holder/ai_instruction/C_C = locate() in AI
- var/obj/effect/proc_holder/ai_holo_clear/D_C = locate() in AI
- qdel(A_C)
- qdel(B_C)
- qdel(C_C)
- qdel(D_C)
- AI.proc_holder_list = list()
- verbs += /obj/item/clothing/suit/space/space_ninja/proc/deinit
- verbs += /obj/item/clothing/suit/space/space_ninja/proc/spideros
- verbs += /obj/item/clothing/suit/space/space_ninja/proc/stealth
-
- s_control = 1
-
-//Workaround
-/obj/effect/proc_holder/ai_holo_clear
- name = "Clear Hologram"
- desc = "Stops projecting the current holographic image."
- panel = "AI Ninja Equip"
- density = 0
- opacity = 0
-
-
-/obj/effect/proc_holder/ai_holo_clear/Click()
- var/obj/item/clothing/suit/space/space_ninja/S = loc.loc//This is so stupid but makes sure certain things work. AI.SUIT
- qdel(S.hologram.i_attached)
- qdel(S.hologram)
- var/obj/effect/proc_holder/ai_holo_clear/D_C = locate() in S.AI
- S.AI.proc_holder_list -= D_C
- return
-
-/obj/effect/proc_holder/ai_instruction//Let's the AI know what they can do.
- name = "Instructions"
- desc = "Displays a list of helpful information."
- panel = "AI Ninja Equip"
- density = 0
- opacity = 0
-
-/obj/effect/proc_holder/ai_instruction/Click()
- loc << "The menu you are seeing will contain other commands if they become available.\nRight click a nearby turf to display an AI Hologram. It will only be visible to you and your host. You can move it freely using normal movement keys--it will disappear if placed too far away."
-
-/obj/effect/proc_holder/ai_hack_ninja//Generic proc holder to make sure the two verbs below work propely.
- name = "Hack SpiderOS"
- desc = "Hack directly into the Black Widow(tm) neuro-interface."
- panel = "AI Ninja Equip"
- density = 0
- opacity = 0
-
-/obj/effect/proc_holder/ai_hack_ninja/Click()//When you click on it.
- var/obj/item/clothing/suit/space/space_ninja/S = loc.loc
- S.hack_spideros()
- return
-
-/obj/effect/proc_holder/ai_return_control
- name = "Relinquish Control"
- desc = "Return control to the user."
- panel = "AI Ninja Equip"
- density = 0
- opacity = 0
-
-/obj/effect/proc_holder/ai_return_control/Click()
- var/mob/living/silicon/ai/A = loc
- var/obj/item/clothing/suit/space/space_ninja/S = A.loc
- A << browse(null, "window=hack spideros")//Close window
- A << "You have seized your hacking attempt. [S.affecting] has regained control."
- S.affecting << "UPDATE: [A.real_name] has ceased hacking attempt. All systems clear."
- S.remove_AI_verbs()
- return
-*/
-
-//=======//DEBUG//=======//
-/*
-/obj/item/clothing/suit/space/space_ninja/proc/display_verb_procs()
-//DEBUG
-//Does nothing at the moment. I am trying to see if it's possible to mess around with verbs as variables.
- //for(var/P in verbs)
-// if(P.set.name)
-// usr << "[P.set.name], path: [P]"
- return
-
-
-Most of these are at various points of incomplete.
-
-/mob/verb/grant_object_panel()
- set name = "Grant AI Ninja Verbs Debug"
- set category = "Ninja Debug"
- var/obj/effect/proc_holder/ai_return_control/A_C = new(src)
- var/obj/effect/proc_holder/ai_hack_ninja/B_C = new(src)
- usr:proc_holder_list += A_C
- usr:proc_holder_list += B_C
-
-mob/verb/remove_object_panel()
- set name = "Remove AI Ninja Verbs Debug"
- set category = "Ninja Debug"
- var/obj/effect/proc_holder/ai_return_control/A = locate() in src
- var/obj/effect/proc_holder/ai_hack_ninja/B = locate() in src
- usr:proc_holder_list -= A
- usr:proc_holder_list -= B
- qdel(A)//First.
- qdel(B)//Second, to keep the proc going.
- return
-
-/client/verb/grant_verb_ninja_debug1(var/mob/M in view())
- set name = "Grant AI Ninja Verbs Debug"
- set category = "Ninja Debug"
-
- M.verbs += /mob/living/silicon/ai/verb/ninja_return_control
- M.verbs += /mob/living/silicon/ai/verb/ninja_spideros
- return
-
-/client/verb/grant_verb_ninja_debug2(var/mob/living/carbon/human/M in view())
- set name = "Grant Back Ninja Verbs"
- set category = "Ninja Debug"
-
- M.wear_suit.verbs += /obj/item/clothing/suit/space/space_ninja/proc/deinit
- M.wear_suit.verbs += /obj/item/clothing/suit/space/space_ninja/proc/spideros
- return
-
-/obj/proc/grant_verb_ninja_debug3(var/mob/living/silicon/ai/A as mob)
- set name = "Grant AI Ninja Verbs"
- set category = "null"
- set hidden = 1
- A.verbs -= /obj/item/clothing/suit/space/space_ninja/proc/deinit
- A.verbs -= /obj/item/clothing/suit/space/space_ninja/proc/spideros
- return
-
-/mob/verb/get_dir_to_target(var/mob/M in oview())
- set name = "Get Direction to Target"
- set category = "Ninja Debug"
-
- world << "DIR: [get_dir_to(src.loc,M.loc)]"
- return
-//
-/mob/verb/kill_self_debug()
- set name = "DEBUG Kill Self"
- set category = "Ninja Debug"
-
- src:death()
-
-/client/verb/switch_client_debug()
- set name = "DEBUG Switch Client"
- set category = "Ninja Debug"
-
- mob = mob:loc:loc
-
-/mob/verb/possess_mob(var/mob/M in oview())
- set name = "DEBUG Possess Mob"
- set category = "Ninja Debug"
-
- client.mob = M
-
-/client/verb/switcharoo(var/mob/M in oview())
- set name = "DEBUG Switch to AI"
- set category = "Ninja Debug"
-
- var/mob/last_mob = mob
- mob = M
- last_mob:wear_suit:AI:key = key
-//
-/client/verb/ninjaget(var/mob/M in oview())
- set name = "DEBUG Ninja GET"
- set category = "Ninja Debug"
-
- mob = M
- M.gib()
- space_ninja()
-
-/mob/verb/set_debug_ninja_target()
- set name = "Set Debug Target"
- set category = "Ninja Debug"
-
- ninja_debug_target = src//The target is you, brohime.
- world << "Target: [src]"
-
-/mob/verb/hack_spideros_debug()
- set name = "Debug Hack Spider OS"
- set category = "Ninja Debug"
-
- var/mob/living/silicon/ai/A = loc:AI
- if(A)
- if(!A.key)
- A.client.mob = loc:affecting
- else
- loc:affecting:client:mob = A
- return
-
-//Tests the net and what it does.
-/mob/verb/ninjanet_debug()
- set name = "Energy Net Debug"
- set category = "Ninja Debug"
-
- var/obj/effect/energy_net/E = new /obj/effect/energy_net(loc)
- E.layer = layer+1//To have it appear one layer above the mob.
- stunned = 10//So they are stunned initially but conscious.
- anchored = 1//Anchors them so they can't move.
- E.affecting = src
- spawn(0)//Parallel processing.
- E.process(src)
- return
-
-I made this as a test for a possible ninja ability (or perhaps more) for a certain mob to see hallucinations.
-The thing here is that these guys have to be coded to do stuff as they are simply images that you can't even click on.
-That is why you attached them to objects.
-/mob/verb/TestNinjaShadow()
- set name = "Test Ninja Ability"
- set category = "Ninja Debug"
-
- if(client)
- var/safety = 4
- for(var/turf/T in oview(5))
- if(prob(20))
- var/current_clone = image('icons/mob/mob.dmi',T,"s-ninja")
- safety--
- spawn(0)
- src << current_clone
- spawn(300)
- qdel(current_clone)
- spawn while(!isnull(current_clone))
- step_to(current_clone,src,1)
- sleep(5)
- if(safety<=0) break
- return */
//Alternate ninja speech replacement.
/*This text is hilarious but also absolutely retarded.
@@ -1377,12 +1088,13 @@ ________________________________________________________________________________
reagent_id == "radium" ? reagents.add_reagent(reagent_id, r_maxamount+(a_boost*a_transfer)) : reagents.add_reagent(reagent_id, r_maxamount)//It will take into account radium used for adrenaline boosting.
cell = new/obj/item/weapon/stock_parts/cell/high//The suit should *always* have a battery because so many things rely on it.
cell.charge = 9000//Starting charge should not be higher than maximum charge. It leads to problems with recharging.
+ NAI = new(src) //ninja intellicard
/obj/item/clothing/suit/space/space_ninja/Destroy()
if(affecting)//To make sure the window is closed.
affecting << browse(null, "window=hack spideros")
if(AI)//If there are AIs present when the ninja kicks the bucket.
- killai()
+ killai(NAI)
if(hologram)//If there is a hologram
qdel(hologram.i_attached)//Delete it and the attached image.
qdel(hologram)
@@ -1395,15 +1107,18 @@ ________________________________________________________________________________
qdel(n_shoes)
qdel(src)
-/obj/item/clothing/suit/space/space_ninja/proc/killai(mob/living/silicon/ai/A = AI)
- if(A.client)
- A << "Self-erase protocol dete-- *bzzzzz*"
- A << browse(null, "window=hack spideros")
- AI = null
- A.death(1)//Kill, deleting mob.
- qdel(A)
+
+
+/obj/item/clothing/suit/space/space_ninja/proc/killai(var/obj/item/device/aicard/NAI)
+ for(var/mob/living/silicon/ai/A in src)
+ if(A.client)
+ A << "Self-erase protocol dete-- *bzzzzz*"
+ A << browse(null, "window=hack spideros")
+ NAI.flush = 1
return
+
+
//=======//SUIT VERBS//=======//
//Verbs link to procs because verb-like procs have a bug which prevents their use if the arguments are not readily referenced.
@@ -1459,10 +1174,10 @@ ________________________________________________________________________________
//Let's check for some safeties.
if(s_initialized&&!affecting) terminate()//Kills the suit and attached objects.
if(!s_initialized) return//When turned off the proc stops.
- if(AI&&AI.stat==2)//If there is an AI and it's ded. Shouldn't happen without purging, could happen.
- if(!s_control)
- ai_return_control()//Return control to ninja if the AI was previously in control.
- killai()//Delete AI.
+ for(var/mob/living/silicon/ai/A in NAI)
+ if(A&&A.stat==2)//If there is an AI and it's ded. Shouldn't happen without purging, could happen.
+ if(!s_control)
+ ai_return_control()//Return control to ninja if the AI was previously in control.
//Now let's do the normal processing.
if(s_coold) s_coold--//Checks for ability s_cooldown first.
@@ -1504,7 +1219,7 @@ ________________________________________________________________________________
U << "Extending neural-net interface...\nNow monitoring brain wave pattern..."
if(3)
if(U.stat==2||U.health<=0)
- U << "FĆAL �Rr�R: 344--93#�&&21 BR��N |/|/aV� PATT$RN RED\nA-A-aB�rT�NG..."
+ U << "FĆAL �Rr�R: 344--93#�&&21 BR��N |/|/aV� PATT$RN RED\nA-A-aB�rT�NG..."
unlock_suit()
break
lock_suit(U,1)//Check for icons.
@@ -1525,9 +1240,9 @@ ________________________________________________________________________________
if(!U.mind||U.mind.assigned_role!="MODE")//Your run of the mill persons shouldn't know what it is. Or how to turn it on.
U << "You do not understand how this suit functions. Where the heck did it even come from?"
else if(s_initialized)
- U << "The suit is already functioning. \black Please report this bug."
+ U << "The suit is already functioning. Please report this bug."
else
- U << "ERROR: \black You cannot use this function at this time."
+ U << "ERROR: You cannot use this function at this time."
return
//=======//DEINITIALIZE//=======//
@@ -1536,12 +1251,12 @@ ________________________________________________________________________________
if(affecting==loc&&!s_busy)
var/mob/living/carbon/human/U = affecting
if(!s_initialized)
- U << "The suit is not initialized. \black Please report this bug."
+ U << "The suit is not initialized. Please report this bug."
return
if(alert("Are you certain you wish to remove the suit? This will take time and remove all abilities.",,"Yes","No")=="No")
return
- if(s_busy||flush)
- U << "ERROR: \black You cannot use this function at this time."
+ if(s_busy || NAI.flush)
+ U << "ERROR: You cannot use this function at this time."
return
s_busy = 1
for(var/i = 0,i<7,i++)
@@ -1721,7 +1436,7 @@ ________________________________________________________________________________
Voice masking generates a random name the ninja can use over the radio and in-person. Although, the former use is recommended.
Toggling vision cycles to one of the following: thermal, meson, or darkness vision. The starting mode allows one to scout the identity of those in view, revealing their role. Traitors, revolutionaries, wizards, and other such people will be made known to you.
Stealth, when activated, drains more battery charge and works similarly to a syndicate cloak. The cloak will deactivate when most Abilities are utilized.
- On-board AI: The suit is able to download an AI much like an intelicard. Check with SpiderOS for details once downloaded.
+ On-board AI: The suit is able to download an AI much like an intellicard. Check with SpiderOS for details once downloaded.
SpiderOS is a specialized, PDA-like screen that allows for a small variety of functions, such as injecting healing chemicals directly from the suit. You are using it now, if that was not already obvious. You may also download AI modules directly to the OS.
Abilities:
@@ -1742,45 +1457,12 @@ ________________________________________________________________________________
That is all you will need to know. The rest will come with practice and talent. Good luck!
Master /N
- "}//This has always bothered me but not anymore!
+ "}
if(5)
- var/laws
dat += "
AI Control:
"
- //var/mob/living/silicon/ai/A = AI
- if(AI)//If an AI exists.
- dat += "Stored AI: [A.name]
"
- dat += "System integrity: [(A.health+100)/2]%
"
+ if(NAI)
+ NAI.attack_self(display_to) //Just accesses the integrated Intellicard. If an AI is in control of the suit then I guess it can interact with its own card. How meta.
- //I personally think this makes things a little more fun. Ninjas can override all but law 0.
- //if (A.laws.zeroth)
- // laws += "0: [A.laws.zeroth]"
-
- for (var/index = 1, index <= A.laws.ion.len, index++)
- var/law = A.laws.ion[index]
- if (length(law) > 0)
- var/num = ionnum()
- laws += "[num]. [law]"
-
- var/number = 1
- for (var/index = 1, index <= A.laws.inherent.len, index++)
- var/law = A.laws.inherent[index]
- if (length(law) > 0)
- laws += "[number]: [law]"
- number++
-
- for (var/index = 1, index <= A.laws.supplied.len, index++)
- var/law = A.laws.supplied[index]
- if (length(law) > 0)
- laws += "[number]: [law]"
- number++
-
- dat += "Laws:
"
-
- if (!flush)
- dat += "Purge AI
"
- else
- dat += "Purge in progress...
"
- dat += " [A.control_disabled ? "Enable" : "Disable"] Wireless Activity"
if(6)
dat += {"
Activate Abilities:
@@ -1857,7 +1539,7 @@ ________________________________________________________________________________
U.electrocute_act(damage, src,0.1,1)//The last argument is a safety for the human proc that checks for gloves.
cell.charge -= damage
else
- A << "ERROR: \black Not enough energy remaining."
+ A << "ERROR: Not enough energy remaining."
if("Message")
var/obj/item/device/pda/P = locate(href_list["target"])
@@ -1918,7 +1600,7 @@ ________________________________________________________________________________
for(var/i, i<4, i++)
switch(i)
if(0)
- U << "Engaging mode...\n\blackCODE NAME: KAMIKAZE"
+ U << "Engaging mode...\nCODE NAME: KAMIKAZE"
if(1)
U << "Re-routing power nodes... \nUnlocking limiter..."
if(2)
@@ -1932,7 +1614,7 @@ ________________________________________________________________________________
return
sleep(s_delay)
else
- U << "ERROR: \black Unable to initiate mode."
+ U << "ERROR: Unable to initiate mode."
else
U << browse(null, "window=spideros")
s_busy = 0
@@ -1954,7 +1636,7 @@ ________________________________________________________________________________
t_disk.loc = T
t_disk = null
else
- U << "ERROR: \black Could not eject disk."
+ U << "ERROR: Could not eject disk."
if("Copy to Disk")
var/datum/tech/current_data = locate(href_list["target"])
@@ -1975,7 +1657,7 @@ ________________________________________________________________________________
pai.loc = T
pai = null
else
- U << "ERROR: \black Could not eject pAI card."
+ U << "ERROR: Could not eject pAI card."
if("Override AI Laws")
var/law_zero = A.laws.zeroth//Remembers law zero, if there is one.
@@ -1996,25 +1678,25 @@ ________________________________________________________________________________
if(AI==A)
switch(i)
if(0)
- A << "WARNING: \black purge procedure detected. \nNow hacking host..."
- U << "WARNING: HACKING AT��TEMP� IN PR0GRESs!"
+ A << "WARNING: purge procedure detected. \nNow hacking host..."
+ U << "WARNING: HACKING AT��TEMP� IN PR0GRESs!"
spideros = 0
k_unlock = 0
U << browse(null, "window=spideros")
if(1)
A << "Disconnecting neural interface..."
- U << "WAR�NING: �R�O0�Gr�--S 2&3%"
+ U << "WAR�NING: �R�O0�Gr�--S 2&3%"
if(2)
A << "Shutting down external protocol..."
- U << "WARNING: P����RֆGr�5S 677^%"
+ U << "WARNING: P����RֆGr�5S 677^%"
cancel_stealth()
if(3)
A << "Connecting to kernel..."
- U << "WARNING: �R�r�R_404"
+ U << "WARNING: �R�r�R_404"
A.control_disabled = 0
if(4)
A << "Connection established and secured. Menu updated."
- U << "W�r#nING: #%@!!WȆ|_4�54@ \nUn�B88l3 T� L�-�o-L�CaT2 ##$!�RN�0..%.."
+ U << "W�r#nING: #%@!!WȆ|_4�54@ \nUn�B88l3 T� L�-�o-L�CaT2 ##$!�RN�0..%.."
grant_AI_verbs()
return
sleep(s_delay)
@@ -2022,7 +1704,7 @@ ________________________________________________________________________________
s_busy = 0
U << "Hacking attempt disconnected. Resuming normal operation."
else
- flush = 1
+ NAI.flush = 1
A.suiciding = 1
A << "Your core files are being purged! This is the end..."
spawn(0)
@@ -2031,9 +1713,9 @@ ________________________________________________________________________________
A.adjustOxyLoss(2)
A.updatehealth()
sleep(10)
- killai()
+ killai(NAI)
U << "Artificial Intelligence was terminated. Rebooting..."
- flush = 0
+ NAI.flush = 0
if("Wireless AI")
A.control_disabled = !A.control_disabled
@@ -2058,19 +1740,21 @@ ________________________________________________________________________________
hologram.invisibility = 101//So that it doesn't show up, ever. This also means one could attach a number of images to a single obj and display them differently to differnet people.
hologram.anchored = 1//So it cannot be dragged by space wind and the like.
hologram.dir = get_dir(T,affecting.loc)
- var/image/I = image(AI.holo_icon,hologram)//Attach an image to object.
- hologram.i_attached = I//To attach the image in order to later reference.
- AI << I
- affecting << I
- affecting << "An image flicks to life nearby. It appears visible to you only."
- verbs += /obj/item/clothing/suit/space/space_ninja/proc/ai_holo_clear
+ for(var/mob/living/silicon/ai/A in NAI)
+ var/image/I = image(A.holo_icon,hologram)//Attach an image to object.
+ hologram.i_attached = I//To attach the image in order to later reference.
+ A << I
+ affecting << I
+ affecting << "An image flicks to life nearby. It appears visible to you only."
- ai_holo_process()//Move to initialize
+ verbs += /obj/item/clothing/suit/space/space_ninja/proc/ai_holo_clear
+
+ ai_holo_process()//Move to initialize
else
- AI << "ERROR: \black Image feed in progress."
+ AI << "ERROR: Image feed in progress."
else
- AI << "ERROR: \black Unable to project image."
+ AI << "ERROR: Unable to project image."
return
/obj/item/clothing/suit/space/space_ninja/proc/ai_holo_process()
@@ -2120,11 +1804,13 @@ ________________________________________________________________________________
set category = "AI Ninja Equip"
set src = usr.loc
- AI << browse(null, "window=spideros")//Close window
- AI << "You have seized your hacking attempt. [affecting.real_name] has regained control."
- affecting << "UPDATE: [AI.real_name] has ceased hacking attempt. All systems clear."
- remove_AI_verbs()
+ for(var/mob/living/silicon/ai/A in NAI)
+ AI << browse(null, "window=spideros")//Close window
+ AI << "You have seized your hacking attempt. [affecting.real_name] has regained control."
+ affecting << "UPDATE: [A.real_name] has ceased hacking attempt. All systems clear."
+
+ remove_AI_verbs()
return
//=======//GENERAL SUIT PROCS//=======//
@@ -2135,7 +1821,7 @@ ________________________________________________________________________________
if(s_control)
I:transfer_ai("NINJASUIT","AICARD",src,U)
else
- U << "ERROR: \black Remote access channel disabled."
+ U << "ERROR: Remote access channel disabled."
return//Return individually so that ..() can run properly at the end of the proc.
else if(istype(I, /obj/item/device/paicard) && !pai)//If it's a pai card.
U:drop_item()
@@ -2190,7 +1876,7 @@ ________________________________________________________________________________
TD.stored = null
U << "Data analyzed and updated. Disk erased."
else
- U << "ERROR: \black Procedure interrupted. Process terminated."
+ U << "ERROR: Procedure interrupted. Process terminated."
else
I.loc = src
t_disk = I
@@ -2256,7 +1942,7 @@ ________________________________________________________________________________
user << "There are [s_bombs] smoke bomb\s remaining."
user << "There are [a_boost] adrenaline booster\s remaining."
else
- user << "�rr�R �a��a�� No-�-� f��N� 3RR�r"
+ user << "�rr�R �a��a�� No-�-� f��N� 3RR�r"
/*
===================================================================================
@@ -2405,7 +2091,7 @@ ________________________________________________________________________________
for(var/datum/tech/analyzing_data in A:files.known_tech)
if(current_data.id==analyzing_data.id)
if(analyzing_data.level>current_data.level)
- U << "Database: \black UPDATED."
+ U << "Database: UPDATED."
current_data.level = analyzing_data.level
break//Move on to next.
else break//Otherwise, quit processing.
@@ -2617,7 +2303,7 @@ It is possible to destroy the net by the occupant or someone else.
for(var/mob/O in viewers(src, 3))
O.show_message("[M.name] was recovered from the energy net!", 1, "You hear a grunt.", 2)
if(!isnull(master))//As long as they still exist.
- master << "ERROR: \black unable to initiate transport protocol. Procedure terminated."
+ master << "ERROR: unable to initiate transport protocol. Procedure terminated."
qdel(src)
return
@@ -2631,7 +2317,7 @@ It is possible to destroy the net by the occupant or someone else.
if(isnull(M)||M.loc!=loc)//If mob is gone or not at the location.
if(!isnull(master))//As long as they still exist.
- master << "ERROR: \black unable to locate \the [mob_name]. Procedure terminated."
+ master << "ERROR: unable to locate \the [mob_name]. Procedure terminated."
qdel(src)//Get rid of the net.
return
@@ -2667,7 +2353,7 @@ It is possible to destroy the net by the occupant or someone else.
O.show_message("[M] vanished!", 1, "You hear sparks flying!", 2)
if(!isnull(master))//As long as they still exist.
- master << "SUCCESS: \black transport procedure of \the [affecting] complete."
+ master << "SUCCESS: transport procedure of \the [affecting] complete."
M.anchored = 0//Important.
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/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm
index b5ef66b0700..5b63c23a921 100644
--- a/code/modules/food&drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food&drinks/drinks/drinks/bottle.dm
@@ -101,7 +101,7 @@
//The reagents in the bottle splash all over the target, thanks for the idea Nodrak
if(src.reagents)
for(var/mob/O in viewers(user, null))
- O.show_message(text("The contents of the [src] splashes all over [target]!"), 1)
+ O.show_message(text("The contents of \the [src] splashes all over [target]!"), 1)
src.reagents.reaction(target, TOUCH)
//Finally, smash the bottle. This kills (del) the bottle.
diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm
index d2851da7ee9..948445dc33b 100644
--- a/code/modules/food&drinks/food/condiment.dm
+++ b/code/modules/food&drinks/food/condiment.dm
@@ -45,7 +45,7 @@
if(src.reagents.has_reagent("sugar") && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 )
M << "You don't feel like drinking any more sugary food at the moment."
return 0
- M << "You swallow some of contents of the [src]."
+ M << "You swallow some of contents of \the [src]."
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(5)
diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm
index ae48a397bbb..1dc37168afa 100644
--- a/code/modules/food&drinks/food/snacks.dm
+++ b/code/modules/food&drinks/food/snacks.dm
@@ -189,10 +189,10 @@
if(isanimal(M))
if(iscorgi(M))
if(bitecount == 0 || prob(50))
- M.emote("me", 1, "nibbles away at the [src]")
+ M.emote("me", 1, "nibbles away at \the [src]")
bitecount++
if(bitecount >= 5)
- var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where the [src] was")
+ var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where \the [src] was")
if(sattisfaction_text)
M.emote("me", 1, "[sattisfaction_text]")
qdel(src)
diff --git a/code/modules/food&drinks/food/snacks/food_mixtures.dm b/code/modules/food&drinks/food/snacks/food_mixtures.dm
index a2b65c55b6b..04991d76b68 100644
--- a/code/modules/food&drinks/food/snacks/food_mixtures.dm
+++ b/code/modules/food&drinks/food/snacks/food_mixtures.dm
@@ -8,6 +8,8 @@
required_reagents = list("soymilk" = 10)
required_catalysts = list("enzyme" = 5)
result_amount = 1
+ mob_react=1
+
/datum/chemical_reaction/tofu/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
@@ -20,18 +22,21 @@
result = null
required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2)
result_amount = 1
+
/datum/chemical_reaction/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
return
+
/datum/chemical_reaction/chocolate_bar2
name = "Chocolate Bar"
id = "chocolate_bar"
result = null
required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2)
result_amount = 1
+ mob_react = 1
/datum/chemical_reaction/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
@@ -73,6 +78,7 @@
required_reagents = list("milk" = 40)
required_catalysts = list("enzyme" = 5)
result_amount = 1
+
/datum/chemical_reaction/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel(location)
@@ -84,6 +90,8 @@
result = null
required_reagents = list("blood" = 5, "clonexadone" = 1)
result_amount = 1
+ mob_react = 1
+
/datum/chemical_reaction/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location)
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 319b1db0562..4860f4fd103 100644
--- a/code/modules/food&drinks/food/snacks_pastry.dm
+++ b/code/modules/food&drinks/food/snacks_pastry.dm
@@ -211,21 +211,10 @@
name = "\improper Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
- var/warm = 0
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/New()
..()
reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sugar", 5)
-
-/obj/item/weapon/reagent_containers/food/snacks/donkpocket/proc/cooltime() //Not working, derp?
- if(warm)
- spawn(4200) //ew
- warm = 0
- reagents.del_reagent("tricordrazine")
- reagents.add_reagent("sugar", 5)
- name = initial(name)
- return
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
name = "fortune cookie"
@@ -319,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 8320a99f771..96a202c12ac 100644
--- a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm
+++ b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm
@@ -71,34 +71,10 @@
/datum/recipe/donkpocket
reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/faggot,
+ /obj/item/weapon/reagent_containers/food/snacks/faggot
)
- result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
+ result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket
-/datum/recipe/donkpocket/proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
- being_cooked.warm = 1
- being_cooked.reagents.add_reagent("tricordrazine", 5)
- being_cooked.reagents.del_reagent("sugar")
- being_cooked.bitesize = 6
- being_cooked.name = "Warm " + being_cooked.name
- being_cooked.cooltime()
-
-/datum/recipe/donkpocket/make_food(var/obj/container as obj)
- var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = ..(container)
- warm_up(being_cooked)
- return being_cooked
-
-/datum/recipe/donkpocket/warm
- reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/donkpocket
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
- make_food(var/obj/container as obj)
- var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = locate() in container
- if(being_cooked && !being_cooked.warm)
- warm_up(being_cooked)
- return being_cooked
////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////
@@ -201,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/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index 168c7c15f76..02e1160db2c 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -67,7 +67,7 @@
/obj/item/weapon/grown/log/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || (istype(W, /obj/item/weapon/twohanded/fireaxe) && W:wielded) || istype(W, /obj/item/weapon/melee/energy))
- user.show_message("You make planks out of the [src]!", 1)
+ user.show_message("You make planks out of \the [src]!", 1)
for(var/i = 0,i < 2,i++)
var/obj/item/stack/sheet/mineral/wood/NG = new (user.loc)
for (var/obj/item/stack/sheet/mineral/wood/G in user.loc)
@@ -83,7 +83,7 @@
if(is_type_in_list(W,accepted))
var/obj/item/weapon/reagent_containers/food/snacks/grown/leaf = W
if(leaf.dry)
- user.show_message("You wrap the [W] around the log, turning it into a torch!")
+ user.show_message("You wrap \the [W] around the log, turning it into a torch!")
var/obj/item/device/flashlight/flare/torch/T = new /obj/item/device/flashlight/flare/torch(user.loc)
usr.unEquip(W)
usr.put_in_active_hand(T)
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 3ab6a0b24eb..09915ec30ee 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -721,12 +721,12 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(anchored == 2)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
anchored = 1
- user << "You unscrew the [src]'s hoses."
+ user << "You unscrew \the [src]'s hoses."
else if(anchored == 1)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
anchored = 2
- user << "You screw in the [src]'s hoses."
+ user << "You screw in \the [src]'s hoses."
for(var/obj/machinery/hydroponics/h in range(1,src))
spawn()
@@ -813,6 +813,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
mind.transfer_to(podman)
podman.ckey = ckey
podman.gender = blood_gender
+ podman.faction |= factions
hardset_dna(podman,null,null,podman.real_name,blood_type,/datum/species/plant/pod,"#59CE00")//Discard SE's and UI's, podman cloning is inaccurate, and always make them a podman
podman.set_cloned_appearance()
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 1b5ead39644..4bfc11fbdbf 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -80,6 +80,7 @@
var/datum/mind/mind = null
var/blood_gender = null
var/blood_type = null
+ var/factions = null
/obj/item/seeds/replicapod/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/reagent_containers/syringe))
@@ -91,6 +92,7 @@
realName = bloodSample.data["real_name"]
blood_gender = bloodSample.data["gender"]
blood_type = bloodSample.data["blood_type"]
+ factions = bloodSample.data["factions"]
W.reagents.clear_reagents()
user << "You inject the contents of the syringe into the seeds."
else
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 4874f04a838..9f4857c18af 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -471,6 +471,13 @@
force = 10
throwforce = 10
var/cooldown = 0
+ var/list/can_be_placed_into = list(
+ /obj/structure/table,
+ /obj/structure/closet,
+ /obj/item/weapon/storage,
+ /obj/structure/safe,
+ /obj/machinery/disposal
+ )
/obj/item/weapon/resonator/proc/CreateResonance(var/target, var/creator)
if(cooldown <= 0)
@@ -489,6 +496,9 @@
if(target in user.contents)
return
if(proximity_flag)
+ for(var/type in can_be_placed_into)
+ if(istype(target, type))
+ return
CreateResonance(target, user)
/obj/effect/resonance
@@ -702,7 +712,8 @@
if(istype(target, /mob/living/simple_animal/hostile))
var/mob/living/simple_animal/hostile/H = M
if(malfunctioning)
- M.faction = list("lazarus")
+ H.faction |= list("lazarus", "\ref[user]")
+ H.robust_searching = 1
H.friends += user
H.attack_same = 1
log_game("[user] has revived hostile mob [target] with a malfunctioning lazarus injector")
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index d168bb0444e..fa1b079478e 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -152,7 +152,7 @@
if(triggered_by_explosive)
log_game("An explosion has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])")
else
- user.visible_message("[user] strikes the [src], causing a chain reaction!")
+ user.visible_message("[user] strikes \the [src], causing a chain reaction!")
log_game("[key_name(usr)] has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])")
spawn(det_time)
if(primed)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index f7da665c052..703d4b577e0 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -301,3 +301,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return 0
usr.visible_message("[src] points to [A]")
return 1
+
+/mob/dead/observer/verb/view_manfiest()
+ set name = "View Crew Manifest"
+ set category = "Ghost"
+
+ var/dat
+ dat += "Crew Manifest
"
+ dat += data_core.get_manifest()
+
+ src << browse(dat, "window=manifest;size=370x420;can_close=1")
\ No newline at end of file
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/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 482079d7d61..e7fd0006859 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -83,13 +83,16 @@
//src.updatehealth()
src.visible_message(
"[src] was shocked by the [source]!", \
- "You feel a powerful shock course through your body!", \
+ "You feel a powerful shock coursing through your body!", \
"You hear a heavy electrical crack." \
)
-// if(src.stunned < shock_damage) src.stunned = shock_damage
- Stun(5)//This should work for now, more is really silly and makes you lay there forever
-// if(src.weakened < 20*siemens_coeff) src.weakened = 20*siemens_coeff
- Weaken(5)
+ src.jitteriness += 1000 //High numbers for violent convulsions
+ src.stuttering += 2
+ Stun(2)
+ spawn(20)
+ src.jitteriness -= 990 //Still jittery, but vastly less
+ Stun(3)
+ Weaken(3)
return shock_damage
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 038aedc7952..e0fb775a949 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -32,6 +32,8 @@
randomize_human(src)
..()
+ var/mob/M = src
+ faction |= "\ref[M]"
/mob/living/carbon/human/prepare_data_huds()
//Update med hud images...
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 7594938f076..b1ae7e55db6 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -441,7 +441,6 @@ emp_act
update_damage_overlays(0)
updatehealth()
- M.occupant_message("You hit [src].")
visible_message("[M.name] has hit [src]!", \
"[M.name] has hit [src]!")
add_logs(M.occupant, src, "attacked", object=M, addition="(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index b11cc7d147c..59a6387f7d5 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -15,6 +15,7 @@
H.dna.species = new /datum/species/slime()
H.regenerate_icons()
H.reagents.del_reagent(chem.type)
+ H.faction |= "slime"
return 1
/*
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index e20466b20f9..8915e2f5d4d 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -7,6 +7,7 @@
ventcrawler = 2
var/is_adult = 0
languages = SLIME | HUMAN
+ faction = list("slime")
layer = 5
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/emote.dm b/code/modules/mob/living/emote.dm
index ed75ad5e894..cb4c51e3618 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -267,7 +267,8 @@
for(var/mob/M in dead_mob_list)
if(!M.client || istype(M, /mob/new_player))
continue //skip monkeys, leavers and new players
- if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_GHOSTSIGHT) && !(M in viewers(src,null)))
+ var/T = get_turf(src)
+ if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_GHOSTSIGHT) && !(M in viewers(T,null)))
M.show_message(message)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 1a251c02cc9..b4d6f44b902 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -540,6 +540,7 @@
if(C.handcuffed)
C.handcuffed = null
C.update_inv_handcuffed(0)
+ return
else
C.legcuffed = null
C.update_inv_legcuffed(0)
@@ -571,18 +572,19 @@
C.visible_message("[C] attempts to remove [I]!")
C << "You attempt to remove [I]. (This will take around [displaytime] minutes and you need to stand still.)"
spawn(0)
- if(do_after(C, breakouttime))
+ if(do_after(C, breakouttime, 10))
if(!I || C.buckled)
return
C.visible_message("[C] manages to remove [I]!")
C << "You successfully remove [I]."
if(C.handcuffed)
- C.handcuffed.loc = usr.loc
+ C.handcuffed.loc = C.loc
C.handcuffed = null
C.update_inv_handcuffed(0)
+ return
if(C.legcuffed)
- C.legcuffed.loc = usr.loc
+ C.legcuffed.loc = C.loc
C.legcuffed = null
C.update_inv_legcuffed(0)
else
@@ -760,6 +762,13 @@
/mob/living/singularity_pull(S)
step_towards(src,S)
+/mob/living/narsie_act()
+ if(client)
+ makeNewConstruct(/mob/living/simple_animal/construct/harvester, src, null, 1)
+ spawn_dust()
+ gib()
+ return
+
/mob/living/proc/do_attack_animation(atom/A)
var/pixel_x_diff = 0
var/pixel_y_diff = 0
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 54898ef7638..8483b28876d 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -86,14 +86,12 @@ proc/vol_by_throwforce_and_or_w_class(var/obj/item/I)
else
return
updatehealth()
- M.occupant_message("You hit [src].")
visible_message("[M.name] has hit [src]!", \
"[M.name] has hit [src]!")
add_logs(M.occupant, src, "attacked", object=M, addition="(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
else
step_away(src,M)
add_logs(M.occupant, src, "pushed", object=M, admin=0)
- M.occupant_message("You push [src] out of the way.")
visible_message("[M] pushes [src] out of the way.")
return
@@ -217,7 +215,10 @@ proc/vol_by_throwforce_and_or_w_class(var/obj/item/I)
M << "No attacking people at spawn, you jackass."
return 0
- if (M.a_intent == "harm" && !M.is_muzzled())
+ if (M.a_intent == "harm")
+ if(M.is_muzzled() || (M.wear_mask && M.wear_mask.flags & MASKCOVERSMOUTH))
+ M << "You can't bite with your mouth covered!"
+ return 0
M.do_attack_animation(src)
if (prob(75))
add_logs(M, src, "attacked", admin=0)
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index fda757d8aed..31b691a9071 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -261,6 +261,8 @@ var/list/department_radio_keys = list(
if(stuttering)
message = stutter(message)
+ message = capitalize(message)
+
return message
/mob/living/proc/radio(message, message_mode, steps)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 30c30cc6e0d..4b12eb1cf13 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -548,7 +548,7 @@ var/list/ai_list = list()
cleared = 1
L -= I
if (cleared)
- queueAlarm(text("--- [] alarm in [] has been cleared.", class, A.name), class, 0)
+ queueAlarm("--- [class] alarm in [A.name] has been cleared.", class, 0)
if (viewalerts) ai_alerts()
return !cleared
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 4d7ffb41382..6bb20acc14f 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -33,7 +33,7 @@
return !config.silent_ai
/mob/living/silicon/ai/radio(message, message_mode)
- if(!radio_enabled || aiRestorePowerRoutine || stat) //AI cannot speak if radio is disabled (via intelicard) or depowered.
+ if(!radio_enabled || aiRestorePowerRoutine || stat) //AI cannot speak if radio is disabled (via intellicard) or depowered.
src << "Your radio transmitter is offline!"
return 0
..(message,message_mode)
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index f35c035b9dc..04e80299d9a 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -18,9 +18,3 @@
stat = CONSCIOUS
return
health = maxHealth - getBruteLoss() - getFireLoss()
-
-/mob/living/silicon/pai/proc/follow_pai()
- while(card)
- loc = get_turf(card)
- sleep(5)
- qdel(src) //if there's no pAI we shouldn't exist
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index a73ecc80042..193477e8dab 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -4,7 +4,6 @@
mouse_opacity = 0
density = 0
mob_size = 0
- invisibility = 101
var/network = "SS13"
var/obj/machinery/camera/current = null
@@ -51,7 +50,7 @@
/mob/living/silicon/pai/New(var/obj/item/device/paicard)
make_laws()
canmove = 0
- src.loc = get_turf(paicard)
+ src.loc = paicard
card = paicard
sradio = new(src)
if(card)
@@ -66,7 +65,6 @@
pda.owner = text("[]", src)
pda.name = pda.owner + " (" + pda.ownjob + ")"
- follow_pai()
..()
/mob/living/silicon/pai/make_laws()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 4403a6a6dca..d2fabd8f836 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -385,7 +385,7 @@
cleared = 1
L -= I
if (cleared)
- queueAlarm(text("--- [class] alarm in [A.name] has been cleared."), class, 0)
+ queueAlarm("--- [class] alarm in [A.name] has been cleared.", class, 0)
// if (viewalerts) robot_alerts()
return !cleared
@@ -846,9 +846,9 @@
var/turf/tile = loc
if(isturf(tile))
tile.clean_blood()
- if (istype(tile, /turf/simulated))
- var/turf/simulated/S = tile
- S.dirt = 0
+ if (istype(tile, /turf/simulated/floor))
+ var/turf/simulated/floor/F = tile
+ F.dirt = 0
for(var/A in tile)
if(istype(A, /obj/effect))
if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay))
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/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 6e7cf13c2bc..e34c3d3620a 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -404,5 +404,5 @@
return 1
else
visible_message("[M] punches [src], but doesn't leave a dent.", \
- "[M] punches [src], but doesn't leave a dent.!")
+ "[M] punches [src], but doesn't leave a dent!")
return 0
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index f52831f11af..2f515596d37 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -70,7 +70,8 @@
Proj.on_hit(src, 0)
return 0
-
+/mob/living/simple_animal/construct/narsie_act()
+ return
/////////////////Juggernaut///////////////
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 30f5277c4d8..405b882ea17 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -92,7 +92,7 @@
corpsegloves = /obj/item/clothing/gloves/combat
corpseradio = /obj/item/device/radio/headset
corpsemask = /obj/item/clothing/mask/gas
- corpsehelmet = /obj/item/clothing/head/helmet/swat/syndicate
+ corpsehelmet = /obj/item/clothing/head/helmet/swat
corpseback = /obj/item/weapon/storage/backpack
corpseid = 1
corpseidjob = "Operative"
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 7726038a19a..9546b077482 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -25,7 +25,15 @@
var/obj/item/inventory_back
var/facehugger
-/mob/living/simple_animal/corgi/Life()
+/mob/living/simple_animal/corgi/New()
+ ..()
+ regenerate_icons()
+
+/mob/living/simple_animal/corgi/Die()
+ ..()
+ regenerate_icons()
+
+/mob/living/simple_animal/corgi/revive()
..()
regenerate_icons()
@@ -123,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)
@@ -141,7 +149,7 @@
//The objects that corgis can wear on their backs.
var/list/allowed_types = list(
- /obj/item/clothing/suit/armor/vest,
+ /obj/item/clothing/suit/armor/vest/alt,
/obj/item/device/radio,
/obj/item/device/radio/off,
/obj/item/clothing/suit/cardborg,
@@ -175,152 +183,156 @@
//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
var/valid = 0
//Various hats and items (worn on his head) change Ian's behaviour. His attributes are reset when a hat is removed.
- switch(item_to_add.type)
- if( /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/that, /obj/item/clothing/head/collectable/paper,
- /obj/item/clothing/head/hardhat, /obj/item/clothing/head/collectable/hardhat,/obj/item/clothing/head/hardhat/white, /obj/item/weapon/paper )
- valid = 1
+ if(istype(item_to_add, /obj/item/clothing/tie/scarf))
+ valid = 1
+ else
+ switch(item_to_add.type)
+ if( /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/that, /obj/item/clothing/head/collectable/paper,
+ /obj/item/clothing/head/hardhat, /obj/item/clothing/head/collectable/hardhat, /obj/item/clothing/head/hardhat/white,
+ /obj/item/weapon/paper)
+ valid = 1
- if(/obj/item/clothing/head/helmet)
- name = "Sergeant [real_name]"
- desc = "The ever-loyal, the ever-vigilant."
- valid = 1
+ if(/obj/item/clothing/head/helmet)
+ name = "Sergeant [real_name]"
+ desc = "The ever-loyal, the ever-vigilant."
+ valid = 1
- if(/obj/item/clothing/head/chefhat, /obj/item/clothing/head/collectable/chef)
- name = "Sous chef [real_name]"
- desc = "Your food will be taste-tested. All of it."
- valid = 1
+ if(/obj/item/clothing/head/chefhat, /obj/item/clothing/head/collectable/chef)
+ name = "Sous chef [real_name]"
+ desc = "Your food will be taste-tested. All of it."
+ valid = 1
- if(/obj/item/clothing/head/caphat, /obj/item/clothing/head/collectable/captain)
- name = "Captain [real_name]"
- desc = "Probably better than the last captain."
- valid = 1
+ if(/obj/item/clothing/head/caphat, /obj/item/clothing/head/collectable/captain)
+ name = "Captain [real_name]"
+ desc = "Probably better than the last captain."
+ valid = 1
- if(/obj/item/clothing/head/kitty, /obj/item/clothing/head/collectable/kitty)
- name = "Runtime"
- emote_see = list("coughs up a furball", "stretches")
- emote_hear = list("purrs")
- speak = list("Purrr", "Meow!", "MAOOOOOW!", "HISSSSS", "MEEEEEEW")
- desc = "It's a cute little kitty-cat! ... wait ... what the hell?"
- valid = 1
+ if(/obj/item/clothing/head/kitty, /obj/item/clothing/head/collectable/kitty)
+ name = "Runtime"
+ emote_see = list("coughs up a furball", "stretches")
+ emote_hear = list("purrs")
+ speak = list("Purrr", "Meow!", "MAOOOOOW!", "HISSSSS", "MEEEEEEW")
+ desc = "It's a cute little kitty-cat! ... wait ... what the hell?"
+ valid = 1
- if(/obj/item/clothing/head/rabbitears, /obj/item/clothing/head/collectable/rabbitears)
- name = "Hoppy"
- emote_see = list("twitches its nose", "hops around a bit")
- desc = "This is Hoppy. It's a corgi-...urmm... bunny rabbit"
- valid = 1
+ if(/obj/item/clothing/head/rabbitears, /obj/item/clothing/head/collectable/rabbitears)
+ name = "Hoppy"
+ emote_see = list("twitches its nose", "hops around a bit")
+ desc = "This is Hoppy. It's a corgi-...urmm... bunny rabbit"
+ valid = 1
- if(/obj/item/clothing/head/beret, /obj/item/clothing/head/collectable/beret)
- name = "Yann"
- desc = "Mon dieu! C'est un chien!"
- speak = list("le woof!", "le bark!", "JAPPE!!")
- emote_see = list("cowers in fear.", "surrenders.", "plays dead.","looks as though there is a wall in front of him.")
- valid = 1
+ if(/obj/item/clothing/head/beret, /obj/item/clothing/head/collectable/beret)
+ name = "Yann"
+ desc = "Mon dieu! C'est un chien!"
+ speak = list("le woof!", "le bark!", "JAPPE!!")
+ emote_see = list("cowers in fear.", "surrenders.", "plays dead.","looks as though there is a wall in front of him.")
+ valid = 1
- if(/obj/item/clothing/head/det_hat)
- name = "Detective [real_name]"
- desc = "[name] sees through your lies..."
- emote_see = list("investigates the area.","sniffs around for clues.","searches for scooby snacks.")
- valid = 1
+ if(/obj/item/clothing/head/det_hat)
+ name = "Detective [real_name]"
+ desc = "[name] sees through your lies..."
+ emote_see = list("investigates the area.","sniffs around for clues.","searches for scooby snacks.")
+ valid = 1
- if(/obj/item/clothing/head/nursehat)
- name = "Nurse [real_name]"
- desc = "[name] needs 100cc of beef jerky...STAT!"
- valid = 1
+ if(/obj/item/clothing/head/nursehat)
+ name = "Nurse [real_name]"
+ desc = "[name] needs 100cc of beef jerky...STAT!"
+ valid = 1
- if(/obj/item/clothing/head/pirate, /obj/item/clothing/head/collectable/pirate)
- name = "[pick("Ol'","Scurvy","Black","Rum","Gammy","Bloody","Gangrene","Death","Long-John")] [pick("kibble","leg","beard","tooth","poop-deck","Threepwood","Le Chuck","corsair","Silver","Crusoe")]"
- desc = "Yaarghh!! Thar' be a scurvy dog!"
- emote_see = list("hunts for treasure.","stares coldly...","gnashes his tiny corgi teeth!")
- emote_hear = list("growls ferociously!", "snarls.")
- speak = list("Arrrrgh!!","Grrrrrr!")
- valid = 1
+ if(/obj/item/clothing/head/pirate, /obj/item/clothing/head/collectable/pirate)
+ name = "[pick("Ol'","Scurvy","Black","Rum","Gammy","Bloody","Gangrene","Death","Long-John")] [pick("kibble","leg","beard","tooth","poop-deck","Threepwood","Le Chuck","corsair","Silver","Crusoe")]"
+ desc = "Yaarghh!! Thar' be a scurvy dog!"
+ emote_see = list("hunts for treasure.","stares coldly...","gnashes his tiny corgi teeth!")
+ emote_hear = list("growls ferociously!", "snarls.")
+ speak = list("Arrrrgh!!","Grrrrrr!")
+ valid = 1
- if(/obj/item/clothing/head/ushanka)
- name = "[pick("Comrade","Commissar","Glorious Leader")] [real_name]"
- desc = "A follower of Karl Barx."
- emote_see = list("contemplates the failings of the capitalist economic model.", "ponders the pros and cons of vangaurdism.")
- valid = 1
+ if(/obj/item/clothing/head/ushanka)
+ name = "[pick("Comrade","Commissar","Glorious Leader")] [real_name]"
+ desc = "A follower of Karl Barx."
+ emote_see = list("contemplates the failings of the capitalist economic model.", "ponders the pros and cons of vangaurdism.")
+ valid = 1
- if(/obj/item/clothing/head/collectable/police)
- name = "Officer [real_name]"
- emote_see = list("drools.","looks for donuts.")
- desc = "Stop right there criminal scum!"
- valid = 1
+ if(/obj/item/clothing/head/collectable/police)
+ name = "Officer [real_name]"
+ emote_see = list("drools.","looks for donuts.")
+ desc = "Stop right there criminal scum!"
+ valid = 1
- if(/obj/item/clothing/head/wizard/fake, /obj/item/clothing/head/wizard, /obj/item/clothing/head/collectable/wizard)
- name = "Grandwizard [real_name]"
- speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "EI NATH!")
- valid = 1
+ if(/obj/item/clothing/head/wizard/fake, /obj/item/clothing/head/wizard, /obj/item/clothing/head/collectable/wizard)
+ name = "Grandwizard [real_name]"
+ speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "EI NATH!")
+ valid = 1
- if(/obj/item/clothing/head/cardborg)
- name = "Borgi"
- speak = list("Ping!","Beep!","Woof!")
- emote_see = list("goes rogue.", "sniffs out non-humans.")
- desc = "Result of robotics budget cuts."
- valid = 1
+ if(/obj/item/clothing/head/cardborg)
+ name = "Borgi"
+ speak = list("Ping!","Beep!","Woof!")
+ emote_see = list("goes rogue.", "sniffs out non-humans.")
+ desc = "Result of robotics budget cuts."
+ valid = 1
- if(/obj/item/weapon/bedsheet)
- name = "\improper Ghost"
- speak = list("WoooOOOooo~","AUUUUUUUUUUUUUUUUUU")
- emote_see = list("stumbles around.", "shivers.")
- emote_hear = list("howls!","groans.")
- desc = "Spooky!"
- valid = 1
+ if(/obj/item/weapon/bedsheet)
+ name = "\improper Ghost"
+ speak = list("WoooOOOooo~","AUUUUUUUUUUUUUUUUUU")
+ emote_see = list("stumbles around.", "shivers.")
+ emote_hear = list("howls!","groans.")
+ desc = "Spooky!"
+ valid = 1
- if(/obj/item/clothing/head/helmet/space/santahat)
- name = "Santa's Corgi Helper"
- emote_hear = list("barks christmas songs.", "yaps merrily!")
- emote_see = list("looks for presents.", "checks his list.")
- desc = "He's very fond of milk and cookies."
- valid = 1
+ if(/obj/item/clothing/head/helmet/space/santahat)
+ name = "Santa's Corgi Helper"
+ emote_hear = list("barks christmas songs.", "yaps merrily!")
+ emote_see = list("looks for presents.", "checks his list.")
+ desc = "He's very fond of milk and cookies."
+ valid = 1
- if(/obj/item/clothing/head/soft)
- name = "Corgi Tech [real_name]"
- desc = "The reason your yellow gloves have chew-marks."
- valid = 1
+ if(/obj/item/clothing/head/soft)
+ name = "Corgi Tech [real_name]"
+ desc = "The reason your yellow gloves have chew-marks."
+ valid = 1
- if(/obj/item/clothing/head/hardhat/reindeer)
- name = "[real_name] the red-nosed Corgi"
- emote_hear = list("lights the way!", "illuminates.", "yaps!")
- desc = "He has a very shiny nose."
- SetLuminosity(1)
- valid = 1
+ if(/obj/item/clothing/head/hardhat/reindeer)
+ name = "[real_name] the red-nosed Corgi"
+ emote_hear = list("lights the way!", "illuminates.", "yaps!")
+ desc = "He has a very shiny nose."
+ SetLuminosity(1)
+ valid = 1
- if(/obj/item/clothing/head/sombrero)
- name = "Segnor [real_name]"
- desc = "You must respect elder [real_name]"
- valid = 1
+ if(/obj/item/clothing/head/sombrero)
+ name = "Segnor [real_name]"
+ desc = "You must respect elder [real_name]"
+ valid = 1
- if(/obj/item/clothing/head/hopcap)
- name = "Lieutenant [real_name]"
- desc = "Can actually be trusted to not run off on his own."
- valid = 1
+ if(/obj/item/clothing/head/hopcap)
+ name = "Lieutenant [real_name]"
+ desc = "Can actually be trusted to not run off on his own."
+ valid = 1
if(valid)
+ 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)
- if(!usr.drop_item())
- usr << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!"
- return 0
- 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
@@ -328,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)
@@ -411,25 +423,27 @@
/mob/living/simple_animal/corgi/regenerate_icons()
- overlays = list()
+ overlays.Cut()
if(inventory_head)
- var/head_icon_state = inventory_head.icon_state
+ var/image/head_icon
if(health <= 0)
- head_icon_state += "2"
-
- var/icon/head_icon = image('icons/mob/corgi_head.dmi',head_icon_state)
- if(head_icon)
- overlays += head_icon
+ head_icon = image('icons/mob/corgi_head.dmi', icon_state = inventory_head.icon_state, dir = EAST)
+ head_icon.pixel_y = -8
+ head_icon.transform = turn(head_icon.transform, 180)
+ else
+ head_icon = image('icons/mob/corgi_head.dmi', icon_state = inventory_head.icon_state)
+ overlays += head_icon
if(inventory_back)
- var/back_icon_state = inventory_back.icon_state
+ var/image/back_icon
if(health <= 0)
- back_icon_state += "2"
-
- var/icon/back_icon = image('icons/mob/corgi_back.dmi',back_icon_state)
- if(back_icon)
- overlays += back_icon
+ back_icon = image('icons/mob/corgi_back.dmi', icon_state = inventory_back.icon_state, dir = EAST)
+ back_icon.pixel_y = -11
+ back_icon.transform = turn(back_icon.transform, 180)
+ else
+ back_icon = image('icons/mob/corgi_back.dmi', icon_state = inventory_back.icon_state)
+ overlays += back_icon
if(facehugger)
if(istype(src, /mob/living/simple_animal/corgi/puppy))
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 0f5b32b0ce5..68f8c76ed69 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -4,7 +4,6 @@
environment_smash = 1 //Set to 1 to break closets,tables,racks, etc; 2 for walls; 3 for rwalls
var/stance = HOSTILE_STANCE_IDLE //Used to determine behavior
var/atom/target
- var/attack_same = 0 //Set us to 1 to allow us to attack our own faction, or 2, to only ever attack our own faction
var/ranged = 0
var/rapid = 0
var/projectiletype
@@ -12,19 +11,24 @@
var/casingtype
var/move_to_delay = 3 //delay for the automated movement.
var/list/friends = list()
- var/vision_range = 9 //How big of an area to search for targets in, a vision of 9 attempts to find targets as soon as they walk into screen view
- var/aggro_vision_range = 9 //If a mob is aggro, we search in this radius. Defaults to 9 to keep in line with original simple mob aggro radius
- var/idle_vision_range = 9 //If a mob is just idling around, it's vision range is limited to this. Defaults to 9 to keep in line with original simple mob aggro radius
var/ranged_message = "fires" //Fluff text for ranged mobs
var/ranged_cooldown = 0 //What the starting cooldown is on ranged attacks
var/ranged_cooldown_cap = 3 //What ranged attacks, after being used are set to, to go back on cooldown, defaults to 3 life() ticks
var/retreat_distance = null //If our mob runs from players when they're too close, set in tile distance. By default, mobs do not retreat.
var/minimum_distance = 1 //Minimum approach distance, so ranged mobs chase targets down, but still keep their distance set in tiles to the target, set higher to make mobs keep distance
+
+
+//These vars are related to how mobs locate and target
+ var/robust_searching = 0 //By default, mobs have a simple searching method, set this to 1 for the more scrutinous searching (stat_attack, stat_exclusive, etc), should be disabled on most mobs
+ var/vision_range = 9 //How big of an area to search for targets in, a vision of 9 attempts to find targets as soon as they walk into screen view
+ var/aggro_vision_range = 9 //If a mob is aggro, we search in this radius. Defaults to 9 to keep in line with original simple mob aggro radius
+ var/idle_vision_range = 9 //If a mob is just idling around, it's vision range is limited to this. Defaults to 9 to keep in line with original simple mob aggro radius
var/search_objects = 0 //If we want to consider objects when searching around, set this to 1. If you want to search for objects while also ignoring mobs until hurt, set it to 2. To completely ignore mobs, even when attacked, set it to 3
var/list/wanted_objects = list() //A list of objects that will be checked against to attack, should we have search_objects enabled
var/stat_attack = 0 //Mobs with stat_attack to 1 will attempt to attack things that are unconscious, Mobs with stat_attack set to 2 will attempt to attack the dead.
var/stat_exclusive = 0 //Mobs with this set to 1 will exclusively attack things defined by stat_attack, stat_attack 2 means they will only attack corpses
+ var/attack_same = 0 //Set us to 1 to allow us to attack our own faction, or 2, to only ever attack our own faction
/mob/living/simple_animal/hostile/Life()
@@ -102,33 +106,35 @@
/mob/living/simple_animal/hostile/CanAttack(var/atom/the_target)//Can we actually attack a possible target?
if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it
return 0
- if(isliving(the_target) && search_objects < 2)
- var/mob/living/L = the_target
- if(L.stat > stat_attack || L.stat != stat_attack && stat_exclusive == 1)
- return 0
- var/faction_check = 0
- for(var/F in faction)
- if(F in L.faction)
- faction_check = 1
- break
- if(faction_check && !attack_same || !faction_check && attack_same == 2)
- return 0
- if(L in friends)
- return 0
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
- if(H.dna)
- if(src.type in H.dna.species.ignored_by)
- return 0
- return 1
- if(isobj(the_target))
- if(the_target.type in wanted_objects)
- return 1
- if(istype(the_target, /obj/mecha) && search_objects < 2)
+ if(search_objects < 2)
+ if(istype(the_target, /obj/mecha))
var/obj/mecha/M = the_target
if(M.occupant)//Just so we don't attack empty mechs
if(CanAttack(M.occupant))
return 1
+ if(isliving(the_target))
+ var/mob/living/L = the_target
+ var/faction_check = 0
+ for(var/F in faction)
+ if(F in L.faction)
+ faction_check = 1
+ break
+ if(robust_searching)
+ if(L.stat > stat_attack || L.stat != stat_attack && stat_exclusive == 1)
+ return 0
+ if(faction_check && !attack_same || !faction_check && attack_same == 2)
+ return 0
+ if(L in friends)
+ return 0
+ else
+ if(L.stat)
+ return 0
+ if(faction_check && !attack_same)
+ return 0
+ return 1
+ if(isobj(the_target))
+ if(the_target.type in wanted_objects)
+ return 1
return 0
/mob/living/simple_animal/hostile/proc/GiveTarget(var/new_target)//Step 4, give us our selected target
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index 7de2c6ff8c8..acb15e44f7c 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -334,6 +334,7 @@
mouse_opacity = 2
move_to_delay = 40
ranged = 1
+ ranged_cooldown = 2 //By default, start the Goliath with his cooldown off so that people can run away quickly on first sight
ranged_cooldown_cap = 8
friendly = "wails at"
vision_range = 4
@@ -349,6 +350,18 @@
idle_vision_range = 5
anchored = 1 //Stays anchored until death as to be unpullable
mob_size = 2
+ var/pre_attack = 0
+
+/mob/living/simple_animal/hostile/asteroid/goliath/Life()
+ ..()
+ handle_preattack()
+
+/mob/living/simple_animal/hostile/asteroid/goliath/proc/handle_preattack()
+ if(ranged_cooldown <= 2 && !pre_attack)
+ pre_attack++
+ if(!pre_attack || stat || stance == HOSTILE_STANCE_IDLE)
+ return
+ icon_state = "Goliath_preattack"
/mob/living/simple_animal/hostile/asteroid/goliath/revive()
anchored = 1
@@ -364,12 +377,22 @@
visible_message("The [src.name] digs its tentacles under [target.name]!")
new /obj/effect/goliath_tentacle/original(tturf)
ranged_cooldown = ranged_cooldown_cap
+ icon_state = icon_aggro
+ pre_attack = 0
return
/mob/living/simple_animal/hostile/asteroid/goliath/adjustBruteLoss(var/damage)
ranged_cooldown--
+ handle_preattack()
..()
+/mob/living/simple_animal/hostile/asteroid/goliath/Aggro()
+ vision_range = aggro_vision_range
+ handle_preattack()
+ if(icon_state != icon_aggro)
+ icon_state = icon_aggro
+ return
+
/obj/effect/goliath_tentacle/
name = "Goliath tentacle"
icon = 'icons/mob/animal.dmi'
@@ -386,6 +409,9 @@
/obj/effect/goliath_tentacle/original
/obj/effect/goliath_tentacle/original/New()
+ for(var/obj/effect/goliath_tentacle/original/O in loc)//No more GG NO RE from 2+ goliaths simultaneously tentacling you
+ if(O != src)
+ qdel(src)
var/list/directions = cardinal.Copy()
var/counter
for(counter = 1, counter <= 3, counter++)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index e80a4a863c3..cc57e5b0daa 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -75,28 +75,52 @@ var/next_mob_id = 0
src << msg
return
-// Show a message to all mobs in sight of this one
+// Show a message to all mobs who sees the src mob and the src mob itself
// This would be for visible actions by the src mob
// message is the message output to anyone who can see e.g. "[src] does something!"
-// self_message (optional) is what the src mob sees e.g. "You do something!"
+// self_message (optional) is what the src mob sees e.g. "You do something!"
// blind_message (optional) is what blind people will hear e.g. "You hear something!"
/mob/visible_message(var/message, var/self_message, var/blind_message)
- for(var/mob/M in viewers(src))
+ var/list/atom_viewers = list()
+ for(var/atom/movable/A in view(src))
+ atom_viewers |= recursive_hear_check(A)
+ atom_viewers |= src
+ for(var/mob/M in atom_viewers)
if(M.see_invisible < invisibility)
continue //can't view the invisible
var/msg = message
if(self_message && M==src)
msg = self_message
- M.show_message( msg, 1, blind_message, 2)
+ M.show_message( msg, 1)
+ if(blind_message)
+ var/list/atom_hearers = list()
+ for(var/atom/movable/O in get_hearers_in_view(7, src))
+ if(O in atom_viewers)
+ continue
+ atom_hearers |= O
+ for(var/mob/MOB in atom_hearers)
+ MOB.show_message(blind_message, 2)
-// Show a message to all mobs in sight of this atom
+// Show a message to all mobs who sees this atom
// Use for objects performing visible actions
// message is output to anyone who can see, e.g. "The [src] does something!"
// blind_message (optional) is what blind people will hear e.g. "You hear something!"
+
/atom/proc/visible_message(var/message, var/blind_message)
- for(var/mob/M in viewers(src))
- M.show_message( message, 1, blind_message, 2)
+ var/list/atom_viewers = list()
+ for(var/atom/movable/A in view(src))
+ atom_viewers |= recursive_hear_check(A)
+ for(var/mob/M in atom_viewers)
+ M.show_message( message, 1)
+ if(blind_message)
+ var/list/atom_hearers = list()
+ for(var/atom/movable/O in get_hearers_in_view(7, src))
+ if(O in atom_viewers)
+ continue
+ atom_hearers |= O
+ for(var/mob/MOB in atom_hearers)
+ MOB.show_message(blind_message, 2)
// Show a message to all mobs in earshot of this one
// This would be for audible actions by the src mob
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index ecdf9f9daf8..6543d5e223b 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -2,7 +2,7 @@
density = 1
layer = 4
animate_movement = 2
- flags = NOREACT | HEAR
+ flags = HEAR
hud_possible = list(ANTAG_HUD)
var/datum/mind/mind
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 fd087516a33..28907d096ec 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -25,10 +25,13 @@
var/output = "Setup Character
"
if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
- if(!ready) output += "Declare Ready
"
- else output += "You are ready Cancel
"
+ if(ready)
+ output += "\[ Ready | Not Ready \]
"
+ else
+ output += "\[ Ready | Not Ready \]
"
else
+ output += "View the Crew Manifest
"
output += "Join Game!
"
output += "Observe
"
@@ -55,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)
@@ -98,7 +101,10 @@
return 1
if(href_list["ready"])
- ready = text2num(href_list["ready"])
+ if(!ticker || ticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started
+ ready = !ready
+ else
+ ready = 0
if(href_list["refresh"])
src << browse(null, "window=playersetup") //closes the player setup window
@@ -136,6 +142,9 @@
return
LateChoices()
+ if(href_list["manifest"])
+ ViewManifest()
+
if(href_list["SelectedJob"])
if(!enter_allowed)
@@ -364,6 +373,12 @@
return new_character
+/mob/new_player/proc/ViewManifest()
+ var/dat = ""
+ dat += "Crew Manifest
"
+ dat += data_core.get_manifest(OOC = 1)
+
+ src << browse(dat, "window=manifest;size=370x420;can_close=1")
/mob/new_player/Move()
return 0
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 901fa258ca8..e8bb527e779 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -81,7 +81,7 @@
if(BARTENDER)
clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armoralt"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
else if(backbag == 3)
@@ -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)
@@ -260,12 +260,12 @@
if(backbag == 3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY)
if(HOS)
- clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "hos_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hoscap"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "hosberetblack"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/eyes.dmi', "sunhud"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hos"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hostrench"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
if(backbag == 3)
@@ -293,9 +293,10 @@
if(backbag == 3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(OFFICER)
- clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "security_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "helmet"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_badge"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY)
if(backbag == 2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 53831b9f235..a85940d0f81 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -55,7 +55,7 @@
P.loc = user.loc
user.put_in_hands(P)
- user << "You take [P] out of the [src]."
+ user << "You take [P] out of \the [src]."
else
user << "[src] is empty!"
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index dd9af7e4a73..232791722cc 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -679,7 +679,7 @@
if(istype(I, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/S = I
- user << "You inject the solution into the [src]."
+ user << "You inject the solution into \the [src]."
if(S.reagents.has_reagent("plasma", 5))
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 2d4ede128b5..8e07804317d 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -97,7 +97,7 @@ var/global/list/rad_collectors = list()
user << "The controls are now [src.locked ? "locked." : "unlocked."]"
else
src.locked = 0 //just in case it somehow gets locked
- user << "The controls can only be locked when the [src] is active."
+ user << "The controls can only be locked when \the [src] is active."
else
user << "Access denied!"
return 1
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 6da19164d8e..8e358e5a43c 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -63,13 +63,13 @@
if(!src.locked)
if(src.active==1)
src.active = 0
- user << "You turn off the [src]."
+ user << "You turn off \the [src]."
message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1)
log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])")
investigate_log("turned off by [user.key]","singulo")
else
src.active = 1
- user << "You turn on the [src]."
+ user << "You turn on \the [src]."
src.shot_number = 0
src.fire_delay = 100
investigate_log("turned on by [user.key]","singulo")
@@ -152,7 +152,7 @@
if(istype(W, /obj/item/weapon/wrench))
if(active)
- user << "Turn off the [src] first."
+ user << "Turn off \the [src] first."
return
switch(state)
if(0 && !isinspace())
@@ -176,7 +176,7 @@
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(active)
- user << "Turn off the [src] first."
+ user << "Turn off \the [src] first."
return
switch(state)
if(0)
@@ -185,23 +185,23 @@
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
- "You start to weld the [src] to the floor.", \
+ "You start to weld \the [src] to the floor.", \
"You hear welding")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 2
- user << "You weld the [src] to the floor."
+ user << "You weld \the [src] to the floor."
connect_to_network()
if(2)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
- "You start to cut the [src] free from the floor.", \
+ "You start to cut \the [src] free from the floor.", \
"You hear welding")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 1
- user << "You cut the [src] free from the floor."
+ user << "You cut \the [src] free from the floor."
disconnect_from_network()
return
@@ -215,7 +215,7 @@
user << "The controls are now [src.locked ? "locked." : "unlocked."]"
else
src.locked = 0 //just in case it somehow gets locked
- user << "The controls can only be locked when the [src] is online."
+ user << "The controls can only be locked when \the [src] is online."
else
user << "Access denied."
return
@@ -227,4 +227,4 @@
if(!emagged)
locked = 0
emagged = 1
- user.visible_message("[user.name] emags the [src.name].","You short out the lock.")
+ user.visible_message("[user.name] emags the [src.name].","You short out the lock.")
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 02112139df4..d0fdaf04d41 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -127,7 +127,7 @@ field_generator power level display
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
- "You start to weld the [src] to the floor.", \
+ "You start to weld \the [src] to the floor.", \
"You hear welding")
if (do_after(user,20))
if(!src || !WT.isOn()) return
@@ -139,12 +139,12 @@ field_generator power level display
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
- "You start to cut the [src] free from the floor.", \
+ "You start to cut \the [src] free from the floor.", \
"You hear welding")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 1
- user << "You cut the [src] free from the floor."
+ user << "You cut \the [src] free from the floor."
else
return
else
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index c33bc19bff7..1ed275131b6 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -10,7 +10,6 @@
move_self = 1 //Do we move on our own?
grav_pull = 5 //How many tiles out do we pull?
consume_range = 6 //How many tiles out do we eat
- var/uneatable = list(/turf/space, /obj/effect/overlay, /mob/living/simple_animal/construct)
/obj/singularity/narsie/large
name = "Nar-Sie"
@@ -84,25 +83,7 @@
/obj/singularity/narsie/consume(var/atom/A)
- if(is_type_in_list(A, uneatable))
- return 0
-
- if(istype(A,/mob/living/))
- var/mob/living/C = A
- if(C.client)
- makeNewConstruct(/mob/living/simple_animal/construct/harvester, C, null, 1)
- C.spawn_dust()
- C.gib()
- return
-
- if(isturf(A))
- var/turf/T = A
- if(istype(T, /turf/simulated/floor) && !istype(T, /turf/simulated/floor/engine/cult))
- if(prob(20)) T.ChangeTurf(/turf/simulated/floor/engine/cult)
-
- else if(istype(T,/turf/simulated/wall) && !istype(T, /turf/simulated/wall/cult))
- if(prob(20)) T.ChangeTurf(/turf/simulated/wall/cult)
- return
+ A.narsie_act()
/obj/singularity/narsie/ex_act() //No throwing bombs at it either. --NEO
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 062f28cb028..7c70cb2c484 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -33,9 +33,10 @@ var/list/solars_list = list()
//set the control of the panel to a given computer if closer than SOLAR_MAX_DIST
/obj/machinery/power/solar/proc/set_control(var/obj/machinery/power/solar_control/SC)
- if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST))
+ if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST))
return 0
control = SC
+ SC.connected_panels |= src
return 1
//set the control of the panel to null and removes it from the control list of the previous control computer if needed
@@ -323,12 +324,10 @@ var/list/solars_list = list()
var/obj/machinery/power/solar/S = M
if(!S.control) //i.e unconnected
S.set_control(src)
- connected_panels |= S
else if(istype(M, /obj/machinery/power/tracker))
if(!connected_tracker) //if there's already a tracker connected to the computer don't add another
var/obj/machinery/power/tracker/T = M
if(!T.control) //i.e unconnected
- connected_tracker = T
T.set_control(src)
//called by the sun controller, update the facing angle (either manually or via tracking) and rotates the panels accordingly
@@ -484,10 +483,10 @@ var/list/solars_list = list()
set_panels(targetdir)
if(href_list["search_connected"])
- src.search_for_connected()
+ search_for_connected()
if(connected_tracker && track == 2)
connected_tracker.set_angle(sun.angle)
- src.set_panels(cdir)
+ set_panels(cdir)
src.updateUsrDialog()
return
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 5c5956742cc..21caf2d40be 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -2,11 +2,11 @@
//Please do not bother them with bugs from this port, however, as it has been modified quite a bit.
//Modifications include removing the world-ending full supermatter variation, and leaving only the shard.
-#define NITROGEN_RETARDATION_FACTOR 4 //Higher == N2 slows reaction more
-#define THERMAL_RELEASE_MODIFIER 10 //Higher == less heat released during reaction
-#define PLASMA_RELEASE_MODIFIER 1500 //Higher == less plasma released by reaction
-#define OXYGEN_RELEASE_MODIFIER 750 //Higher == less oxygen released at high temperature/power
-#define REACTION_POWER_MODIFIER 1.1 //Higher == more overall power
+#define NITROGEN_RETARDATION_FACTOR 2 //Higher == N2 slows reaction more
+#define THERMAL_RELEASE_MODIFIER 5 //Higher == less heat released during reaction
+#define PLASMA_RELEASE_MODIFIER 750 //Higher == less plasma released by reaction
+#define OXYGEN_RELEASE_MODIFIER 325 //Higher == less oxygen released at high temperature/power
+#define REACTION_POWER_MODIFIER 0.55 //Higher == more overall power
//These would be what you would get at point blank, decreases with distance
@@ -58,18 +58,24 @@
var/obj/item/device/radio/radio
+ //for logging
+ var/has_been_powered = 0
+ var/has_reached_emergency = 0
/obj/machinery/power/supermatter_shard/New()
. = ..()
radio = new(src)
radio.listening = 0
+ investigate_log("has been created.", "supermatter")
/obj/machinery/power/supermatter_shard/Destroy()
+ investigate_log("has been destroyed.", "supermatter")
qdel(radio)
. = ..()
/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)
qdel(src)
return
@@ -93,6 +99,10 @@
if(damage > emergency_point)
radio.talk_into(src, "[emergency_alert] Instability: [stability]%")
lastwarning = world.timeofday
+ if(!has_reached_emergency)
+ investigate_log("has reached the emergency point for the first time.", "supermatter")
+ message_admins("[src] has reached the emergency point (JMP).")
+ has_reached_emergency = 1
else if(damage >= damage_archived) // The damage is still going up
radio.talk_into(src, "[warning_alert] Instability: [stability]%")
@@ -124,23 +134,20 @@
power = min(power, 1600)
return 1
- if (!removed)
- return 1
-
damage_archived = damage
damage = max( damage + ( (removed.temperature - 800) / 150 ) , 0 )
//Ok, 100% oxygen atmosphere = best reaction
//Maxes out at 100% oxygen pressure
oxygen = max(min((removed.oxygen - (removed.nitrogen * NITROGEN_RETARDATION_FACTOR)) / MOLES_CELLSTANDARD, 1), 0)
- var/temp_factor = 100
+ var/temp_factor = 50
if(oxygen > 0.8)
// with a perfect gas mix, make the power less based on heat
icon_state = "[base_icon_state]_glow"
else
// in normal mode, base the produced energy around the heat
- temp_factor = 60
+ temp_factor = 30
icon_state = base_icon_state
power = max( (removed.temperature * temp_factor / T0C) * oxygen + power, 0) //Total laser power plus an overload
@@ -170,10 +177,10 @@
for(var/mob/living/carbon/human/l in view(src, min(7, round(power ** 0.25)))) // If they can see it without mesons on. Bad on them.
if(!istype(l.glasses, /obj/item/clothing/glasses/meson))
- l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) )
+ l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1, get_dist(l, src)) ) ) )
for(var/mob/living/l in range(src, round((power / 100) ** 0.25)))
- var/rads = (power / 10) * sqrt( 1 / get_dist(l, src) )
+ var/rads = (power / 10) * sqrt( 1 / min(get_dist(l, src),1) )
l.apply_effect(rads, IRRADIATE)
power -= (power/500)**3
@@ -190,6 +197,10 @@
if(Proj.flag != "bullet")
power += Proj.damage * config_bullet_energy
+ if(!has_been_powered)
+ investigate_log("has been powered for the first time.", "supermatter")
+ message_admins("[src] has been powered for the first time (JMP).")
+ has_been_powered = 1
else
damage += Proj.damage * config_bullet_energy
return 0
@@ -209,7 +220,9 @@
/obj/machinery/power/supermatter_shard/attack_ai(mob/user as mob)
user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
-/obj/machinery/power/supermatter_shard/attack_hand(mob/user as mob)
+/obj/machinery/power/supermatter_shard/attack_hand(mob/living/user as mob)
+ if(!istype(user))
+ return
user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\
"You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\
"You hear an unearthly noise as a wave of heat washes over you.")
@@ -221,10 +234,12 @@
/obj/machinery/power/supermatter_shard/proc/transfer_energy()
for(var/obj/machinery/power/rad_collector/R in rad_collectors)
if(get_dist(R, src) <= 15) // Better than using orange() every process
- R.receive_pulse(power)
+ R.receive_pulse(power/10)
return
-/obj/machinery/power/supermatter_shard/attackby(obj/item/weapon/W as obj, mob/living/user as mob)
+/obj/machinery/power/supermatter_shard/attackby(obj/item/W as obj, mob/living/user as mob)
+ if(!istype(W) || (W.flags & ABSTRACT) || !istype(user))
+ return
if(user.drop_item(W))
Consume(W)
user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\
@@ -241,9 +256,11 @@
AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\
"You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
"You hear an unearthly noise as a wave of heat washes over you.")
- else
+ else if(isobj(AM) && !istype(AM, /obj/effect))
AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\
"You hear a loud crack as you are washed with a wave of heat.")
+ else
+ return
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
@@ -255,15 +272,19 @@
var/mob/living/user = AM
user.dust()
power += 200
- else
+ message_admins("[src] has consumed [key_name(user)]? (JMP).")
+ else if(isobj(AM) && !istype(AM, /obj/effect))
qdel(AM)
+ investigate_log("has consumed [AM].", "supermatter")
+
power += 200
//Some poor sod got eaten, go ahead and irradiate people nearby.
for(var/mob/living/L in range(10))
var/rads = 500 * sqrt( 1 / (get_dist(L, src) + 1) )
L.apply_effect(rads, IRRADIATE)
+ investigate_log("has irradiated [L] after consuming [AM].", "supermatter")
if(L in view())
L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\
"The unearthly ringing subsides and you notice you have new radiation burns.", 2)
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 20e8ab528c4..5cf341f9fbb 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -27,9 +27,10 @@
//set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST
/obj/machinery/power/tracker/proc/set_control(var/obj/machinery/power/solar_control/SC)
- if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST))
+ if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST))
return 0
control = SC
+ SC.connected_tracker = src
return 1
//set the control of the tracker to null and removes it from the previous control computer if needed
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 801d9b6e2e8..0f85597e0ec 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -73,21 +73,34 @@
stored_ammo.Insert(1,b)
return b
-/obj/item/ammo_box/proc/give_round(var/obj/item/ammo_casing/r)
- var/obj/item/ammo_casing/rb = r
- if (rb)
- if (stored_ammo.len < max_ammo && rb.caliber == caliber)
- stored_ammo += rb
- rb.loc = src
- return 1
+/obj/item/ammo_box/proc/give_round(var/obj/item/ammo_casing/R, var/replace_spent = 0)
+ if(!R || (R.caliber != caliber))
+ return 0
+
+ if (stored_ammo.len < max_ammo)
+ stored_ammo += R
+ R.loc = src
+ return 1
+
+ //for accessibles magazines (e.g internal ones) when full, start replacing spent ammo
+ else if(replace_spent)
+ for(var/obj/item/ammo_casing/AC in stored_ammo)
+ if(!AC.BB)//found a spent ammo
+ stored_ammo -= AC
+ AC.loc = get_turf(src.loc)
+
+ stored_ammo += R
+ R.loc = src
+ return 1
+
return 0
-/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, var/silent = 0)
+/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, var/silent = 0, var/replace_spent = 0)
var/num_loaded = 0
if(istype(A, /obj/item/ammo_box))
var/obj/item/ammo_box/AM = A
for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
- var/did_load = give_round(AC)
+ var/did_load = give_round(AC, replace_spent)
if(did_load)
AM.stored_ammo -= AC
num_loaded++
@@ -95,17 +108,18 @@
break
if(istype(A, /obj/item/ammo_casing))
var/obj/item/ammo_casing/AC = A
- if(give_round(AC))
+ if(give_round(AC, replace_spent))
user.drop_item()
AC.loc = src
num_loaded++
+
if(num_loaded)
if(!silent)
user << "You load [num_loaded] shell\s into \the [src]!"
A.update_icon()
update_icon()
- return num_loaded
- return 0
+
+ return num_loaded
/obj/item/ammo_box/attack_self(mob/user as mob)
var/obj/item/ammo_casing/A = get_round()
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 05c5f172788..e2473a521f8 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -117,10 +117,10 @@
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"
+ fire_sound = "sound/weapons/taser2.ogg"
/obj/item/ammo_casing/energy/wormhole
projectile_type = /obj/item/projectile/beam/wormhole
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index d901f87c4a9..f9d3c7410a0 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -1,4 +1,9 @@
////////////////INTERNAL MAGAZINES//////////////////////
+
+//internals magazines are accessible, so replace spent ammo if full when trying to put a live one in
+/obj/item/ammo_box/magazine/internal/give_round(var/obj/item/ammo_casing/R)
+ return ..(R,1)
+
/obj/item/ammo_box/magazine/internal/cylinder
name = "revolver cylinder"
desc = "Oh god, this shouldn't be here"
diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm
index 8abcea10af0..c5f2b3a0e7d 100644
--- a/code/modules/projectiles/firing.dm
+++ b/code/modules/projectiles/firing.dm
@@ -34,7 +34,7 @@
return 0
if(targloc == curloc) //Fire the projectile
user.bullet_act(BB)
- qdel(BB)
+ del(BB)
return 1
BB.loc = get_turf(user)
BB.starting = get_turf(user)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 97e0779a17f..d603831d60e 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -1,3 +1,7 @@
+ #define SAWN_INTACT 0
+ #define SAWN_OFF 1
+ #define SAWN_SAWING -1
+
/obj/item/weapon/gun
name = "gun"
desc = "It's a gun. It's pretty terrible, though."
@@ -23,6 +27,9 @@
var/obj/item/ammo_casing/chambered = null
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
@@ -30,12 +37,17 @@
/obj/item/weapon/gun/proc/special_check(var/mob/M) //Placeholder for any special checks, like detective's revolver.
return 1
+//check if there's enough ammo/energy/whatever to shoot one time
+//i.e if clicking would make it shoot
+/obj/item/weapon/gun/proc/can_shoot()
+ return 1
+
/obj/item/weapon/gun/proc/shoot_with_empty_chamber(mob/living/user as mob|obj)
user << "*click*"
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
return
-/obj/item/weapon/gun/proc/shoot_live_shot(mob/living/user as mob|obj, var/pointblank = 0, var/mob/pbtarget = null)
+/obj/item/weapon/gun/proc/shoot_live_shot(mob/living/user as mob|obj, var/pointblank = 0, var/mob/pbtarget = null, var/message = 1)
if(recoil)
spawn()
shake_camera(user, recoil + 1, recoil)
@@ -44,6 +56,8 @@
playsound(user, fire_sound, 10, 1)
else
playsound(user, fire_sound, 50, 1)
+ if(!message)
+ return
if(pointblank)
user.visible_message("[user] fires [src] point blank at [pbtarget]!", "You fire [src] point blank at [pbtarget]!", "You hear a [istype(src, /obj/item/weapon/gun/energy) ? "laser blast" : "gunshot"]!")
else
@@ -62,47 +76,66 @@
return
//Exclude lasertag guns from the CLUMSY check.
- if(clumsy_check)
+ if(clumsy_check && can_shoot())
if(istype(user, /mob/living))
var/mob/living/M = user
if ((CLUMSY in M.mutations) && prob(40))
- M << "You shoot yourself in the foot with \the [src]!"
- afterattack(user, user)
+ user << "You shoot yourself in the foot with \the [src]!"
+ process_fire(user,user,0,params)
M.drop_item()
return
+ if(isliving(user))
+ var/mob/living/L = user
+ if(!can_trigger_gun(L))
+ return
+
+ process_fire(target,user,flag,params)
+
+/obj/item/weapon/gun/proc/can_trigger_gun(mob/living/user)
if (!user.IsAdvancedToolUser())
user << "You don't have the dexterity to do this!"
- return
+ return 0
if(trigger_guard)
- if(istype(user, /mob/living))
- var/mob/living/M = user
- if (HULK in M.mutations)
- M << "Your meaty finger is much too large for the trigger guard!"
- return
+ if (HULK in user.mutations)
+ user << "Your meaty finger is much too large for the trigger guard!"
+ return 0
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.dna && NOGUNS in H.dna.species.specflags)
user << "Your fingers don't fit in the trigger guard!"
- return
+ return 0
+ return 1
+
+/obj/item/weapon/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, var/message = 1, params)
add_fingerprint(user)
- if(chambered)
- if(!chambered.fire(target, user, params, , suppressed))
- shoot_with_empty_chamber(user)
- else
- 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)
+ if(!special_check(user))
+ return
+
+ for(var/i = 1 to burst_size)
+ if(!issilicon(user))
+ 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)
- 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.dm b/code/modules/projectiles/guns/energy.dm
index 08351551243..4c407cd5a20 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -35,7 +35,9 @@
/obj/item/weapon/gun/energy/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
newshot() //prepare a new shot
..()
-
+/obj/item/weapon/gun/energy/can_shoot()
+ var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+ return power_supply.charge >= shot.e_cost
/obj/item/weapon/gun/energy/proc/newshot()
if (!ammo_type || !power_supply)
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index ebace57085b..75d5a076186 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -125,9 +125,11 @@ obj/item/weapon/gun/energy/laser/retro
/obj/item/weapon/gun/energy/laser/bluetag/process()
charge_tick++
- if(charge_tick < 4) return 0
+ if(charge_tick < 4)
+ return 0
charge_tick = 0
- if(!power_supply) return 0
+ if(!power_supply)
+ return 0
power_supply.give(100)
update_icon()
return 1
@@ -162,9 +164,11 @@ obj/item/weapon/gun/energy/laser/retro
/obj/item/weapon/gun/energy/laser/redtag/process()
charge_tick++
- if(charge_tick < 4) return 0
+ if(charge_tick < 4)
+ return 0
charge_tick = 0
- if(!power_supply) return 0
+ if(!power_supply)
+ return 0
power_supply.give(100)
update_icon()
return 1
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 7074c8102b1..0a4f961eb78 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -1,9 +1,9 @@
/obj/item/weapon/gun/energy/gun
name = "energy gun"
- desc = "A basic hybrid energy gun with two settings: Stun and kill."
+ desc = "A basic hybrid energy gun with two settings: Disable 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()
..()
@@ -105,3 +105,8 @@
update_charge()
update_reactor()
update_mode()
+
+/obj/item/weapon/gun/energy/gun/turret
+ name = "hybrid turret gun"
+ desc = "A basic hybrid energy gun with two settings: Stun and kill."
+ ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 2c79a769a35..8f28a53effc 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -7,25 +7,39 @@
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)
+ cell_type = "/obj/item/weapon/stock_parts/cell/crap"
+ origin_tech = null
+
+/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 +56,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/magic.dm b/code/modules/projectiles/guns/magic.dm
index f9a0be82b99..c575632c498 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -29,6 +29,9 @@
no_den_usage = 0
..()
+/obj/item/weapon/gun/magic/can_shoot()
+ return charges
+
/obj/item/weapon/gun/magic/proc/newshot()
if (charges && chambered)
chambered.newshot()
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index d2c6a9a29ba..b1540df35b9 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -40,6 +40,11 @@
chambered.loc = src
return
+/obj/item/weapon/gun/projectile/can_shoot()
+ if(!magazine || !magazine.ammo_count(0))
+ return 0
+ return 1
+
/obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob)
..()
if (istype(A, /obj/item/ammo_box/magazine))
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 6cfa117be6a..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,31 @@
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()
+
/obj/item/weapon/gun/projectile/automatic/proc/empty_alarm()
if(!chambered && !get_ammo() && !alarmed)
playsound(src.loc, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
@@ -26,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()
..()
@@ -62,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
@@ -103,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"
@@ -147,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()
..()
@@ -157,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'."
@@ -215,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/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 7188ce64cbc..c829cff0c4a 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -5,7 +5,7 @@
mag_type = /obj/item/ammo_box/magazine/internal/cylinder
/obj/item/weapon/gun/projectile/revolver/chamber_round()
- if (chambered || !magazine)
+ if ((chambered && chambered.BB)|| !magazine) //if there's a live ammo in the chamber or no magazine
return
else if (magazine.ammo_count())
chambered = magazine.get_round(1)
@@ -37,6 +37,9 @@
else
user << "[src] is empty."
+/obj/item/weapon/gun/projectile/revolver/can_shoot()
+ return get_ammo(0,0)
+
/obj/item/weapon/gun/projectile/revolver/get_ammo(var/countchambered = 0, var/countempties = 1)
var/boolets = 0 //mature var names for mature people
if (chambered && countchambered)
@@ -172,7 +175,7 @@
return
/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user as mob)
- if(!spun && get_ammo(0,0))
+ if(!spun && can_shoot())
user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
Spin()
else
@@ -190,34 +193,35 @@
user << "[src] is empty."
/obj/item/weapon/gun/projectile/revolver/russian/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
- if(!spun && get_ammo(0,0))
- user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
- Spin()
- ..()
- spun = 0
-
-/obj/item/weapon/gun/projectile/revolver/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj)
- if(!spun && get_ammo(0,0))
- user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
- Spin()
+ if(user.a_intent == "harm") // Flogging action
+ return
+ if(isliving(user))
+ if(!can_trigger_gun(user))
+ return
+ if(target != user)
+ user << "A mechanism prevents you from shooting anyone but yourself."
return
-
- if(target == user)
- if(!chambered)
- user.visible_message("*click*", "*click*")
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(!spun)
+ user << "You need to spin the revolver's chamber first."
return
- if(isliving(target) && isliving(user))
- var/obj/item/organ/limb/affecting = user.zone_sel.selecting
- if(affecting == "head")
- var/obj/item/ammo_casing/AC = chambered
- if(AC.fire(user, user))
+ spun = 0
+
+ if(chambered)
+ var/obj/item/ammo_casing/AC = chambered
+ if(AC.fire(user, user))
+ playsound(user, fire_sound, 50, 1)
+ var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting))
+ var/limb_name = affecting.getDisplayName()
+ if(affecting == "head" || affecting == "eyes" || affecting == "mouth")
user.apply_damage(300, BRUTE, affecting)
- playsound(user, fire_sound, 50, 1)
- user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a [istype(AC.BB, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!")
- return
+ user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a gunshot!")
else
- user.visible_message("*click*", "*click*")
- return
- ..()
+ user.visible_message("[user.name] cowardly fires [src] at \his [limb_name]!", "You cowardly fire [src] at your [limb_name]!", "You hear a gunshot!")
+ return
+
+ user.visible_message("*click*")
+ playsound(user, 'sound/weapons/empty.ogg', 100, 1)
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 1858059454a..f07dde7e94f 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -25,6 +25,11 @@
/obj/item/weapon/gun/projectile/shotgun/chamber_round()
return
+/obj/item/weapon/gun/projectile/shotgun/can_shoot()
+ if(!chambered)
+ return 0
+ return (chambered.BB ? 1 : 0)
+
/obj/item/weapon/gun/projectile/shotgun/attack_self(mob/living/user)
if(recentpump) return
pump(user)
@@ -69,8 +74,12 @@
/obj/item/weapon/gun/projectile/shotgun/riot/attackby(var/obj/item/A as obj, mob/user as mob)
..()
- if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
+ if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
sawoff(user)
+ if(istype(A, /obj/item/weapon/melee/energy))
+ var/obj/item/weapon/melee/energy/W = A
+ if(W.active)
+ sawoff(user)
/obj/item/weapon/gun/projectile/revolver/doublebarrel
name = "double-barreled shotgun"
@@ -89,27 +98,13 @@
..()
if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
chamber_round()
- if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
+ if(istype(A, /obj/item/weapon/melee/energy))
+ var/obj/item/weapon/melee/energy/W = A
+ if(W.active)
+ sawoff(user)
+ if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
sawoff(user)
-/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob)
- user << "You begin to shorten \the [src]."
- if(get_ammo())
- afterattack(user, user)
- user.visible_message("The [src] goes off!", "The [src] goes off in your face!")
- return
- if(do_after(user, 30))
- name = "sawn-off [src.name]"
- desc = sawn_desc
- icon_state = initial(icon_state) + "-sawn"
- w_class = 3.0
- item_state = "gun"
- slot_flags &= ~SLOT_BACK //you can't sling it on your back
- slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
- user << "You shorten \the [src]!"
- update_icon()
- return
-
/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user as mob)
var/num_unloaded = 0
while (get_ammo() > 0)
@@ -140,7 +135,7 @@
/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(var/obj/item/A as obj, mob/user as mob)
..()
- if(istype(A, /obj/item/stack/cable_coil))
+ if(istype(A, /obj/item/stack/cable_coil) && !sawn_state)
var/obj/item/stack/cable_coil/C = A
if(C.use(10))
flags = CONDUCT
@@ -150,4 +145,87 @@
update_icon()
else
user << "You need at least ten lengths of cable if you want to make a sling."
- return
\ No newline at end of file
+ return
+
+//Sawing guns related procs
+/obj/item/weapon/gun/projectile/proc/blow_up(mob/user as mob)
+ . = 0
+ for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
+ if(AC.BB)
+ process_fire(user, user)
+ . = 1
+
+/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user as mob)
+ . = 0
+ if(chambered && chambered.BB)
+ process_fire(user, user,0)
+ . = 1
+ for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
+ if(AC.BB)
+ chambered = AC
+ process_fire(user, user,0)
+ . = 1
+
+/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob)
+ if(sawn_state == SAWN_OFF)
+ user << "\The [src] is already shorten."
+ return
+
+ if(sawn_state == SAWN_SAWING)
+ return
+
+ user.visible_message("[user] begin to shorten \the [src].", "You begin to shorten \the [src].")
+
+ //if there's any live ammo inside the gun, makes it go off
+ if(blow_up(user))
+ user.visible_message("\The [src] goes off!", "\The [src] goes off in your face!")
+ return
+
+ sawn_state = SAWN_SAWING
+
+ if(do_after(user, 30))
+ name = "sawn-off [src.name]"
+ desc = sawn_desc
+ icon_state = initial(icon_state) + "-sawn"
+ w_class = 3.0
+ item_state = "gun"
+ slot_flags &= ~SLOT_BACK //you can't sling it on your back
+ slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+ sawn_state = SAWN_OFF
+ user.visible_message("[user] shorten \the [src]!", "You shorten \the [src]!")
+ update_icon()
+ return
+ else
+ 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..0de1e2fe156 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)
@@ -74,8 +91,8 @@
if(hitsound)
var/volume = vol_by_damage()
playsound(loc, hitsound, volume, 1, -1)
- M.visible_message("[M] is hit by \a [src] in the [parse_zone(def_zone)]!", \
- "[M] is hit by \a [src] in the [parse_zone(def_zone)]!") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
+ M.visible_message("[M] is hit by \a [src] in the [parse_zone(def_zone)]!", \
+ "[M] is hit by \a [src] in the [parse_zone(def_zone)]!") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
add_logs(firer, M, "shot", object="[src]", addition=reagent_note)
var/turf/new_loc = get_turf(A)
@@ -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..e0a9ff034e6 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -36,6 +36,14 @@
irradiate = 30
forcedodge = 1
+/obj/item/projectile/beam/disabler
+ name = "disabler beam"
+ icon_state = "omnilaser"
+ damage = 33
+ damage_type = STAMINA
+ hitsound = 'sound/weapons/tap.ogg'
+ 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/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index a6d6d2572e2..254b10db479 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -247,7 +247,9 @@ datum/reagents/proc/handle_reactions()
else
if(my_atom.type == C.required_container)
matching_container = 1
-
+ if (isliving(my_atom)) //Makes it so certain chemical reactions don't occur in mobs
+ if (C.mob_react)
+ return
if(!C.required_other)
matching_other = 1
@@ -282,7 +284,7 @@ datum/reagents/proc/handle_reactions()
ME2.Uses--
if(ME2.Uses <= 0) // give the notification that the slime core is dead
for(var/mob/M in seen)
- M << "\icon[my_atom] The [my_atom]'s power is consumed in the reaction."
+ M << "\icon[my_atom] \The [my_atom]'s power is consumed in the reaction."
ME2.name = "used slime extract"
ME2.desc = "This extract has been used up."
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
index b777938b760..eb3f4846edd 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
@@ -88,7 +88,7 @@ datum/reagent/proc/on_update(var/atom/A)
return
datum/reagent/blood
- data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null)
+ data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
name = "Blood"
id = "blood"
color = "#C80000" // rgb: 200, 0, 0
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 11cfec3f0dc..e174ee01f2f 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -12,6 +12,7 @@
var/result_amount = 0
var/secondary = 0 // set to nonzero if secondary reaction
+ var/mob_react = 0 //Determines if a chemical reaction can occur inside a mob
/datum/chemical_reaction/proc/on_reaction(var/datum/reagents/holder, var/created_volume)
return
@@ -384,6 +385,7 @@ silicate
required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1)
result_amount = null
secondary = 1
+ mob_react = 1
/datum/chemical_reaction/chemsmoke/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
@@ -448,6 +450,7 @@ silicate
result = null
required_reagents = list("iron" = 5, "frostoil" = 5, "plasma" = 20)
result_amount = 1
+ mob_react = 1
/datum/chemical_reaction/plasmasolidification/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
@@ -537,6 +540,7 @@ silicate
result = null
required_reagents = list("fluorosurfactant" = 1, "water" = 1)
result_amount = 2
+ mob_react = 1
/datum/chemical_reaction/foam/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -566,6 +570,7 @@ silicate
result = null
required_reagents = list("aluminium" = 3, "foaming_agent" = 1, "pacid" = 1)
result_amount = 5
+ mob_react = 1
/datum/chemical_reaction/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -586,6 +591,7 @@ silicate
result = null
required_reagents = list("iron" = 3, "foaming_agent" = 1, "pacid" = 1)
result_amount = 5
+ mob_react = 1
/datum/chemical_reaction/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 92c325faedf..ab30aa772f6 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -24,7 +24,7 @@
/obj/item/weapon/grenade/chem_grenade,
/obj/machinery/bot/medbot,
/obj/machinery/computer/pandemic,
- /obj/item/weapon/storage/secure/safe,
+ /obj/structure/safe,
/obj/machinery/disposal,
/obj/machinery/hydroponics,
/obj/machinery/biogenerator,
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 3e08174bdaa..ce8256a3d34 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -79,7 +79,7 @@
user << "You are unable to locate any blood."
return
if(target != user)
- target.visible_message("[user] is trying to take a blood sample from [target]!", \
+ target.visible_message("[user] is trying to take a blood sample from [target]!", \
"[user] is trying to take a blood sample from [target]!")
if(!do_mob(user, target))
return
@@ -118,6 +118,7 @@
B.data["cloneable"] = 1
B.data["gender"] = T.gender
B.data["real_name"] = T.real_name
+ B.data["factions"] = T.faction
reagents.reagent_list += B
reagents.update_total()
on_reagent_change()
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.dm b/code/modules/research/designs.dm
index 9be7c88ea13..d67da5e6504 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -55,198 +55,6 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
return
-///////////////////////////////////
-/////Non-Board Computer Stuff//////
-///////////////////////////////////
-
-datum/design/intellicard
- name = "Intellicard AI Transportation System"
- desc = "Allows for the construction of an intellicard."
- id = "intellicard"
- req_tech = list("programming" = 4, "materials" = 4)
- build_type = PROTOLATHE
- materials = list("$glass" = 1000, "$gold" = 200)
- build_path = /obj/item/device/aicard
-
-datum/design/paicard
- name = "Personal Artificial Intelligence Card"
- desc = "Allows for the construction of a pAI Card."
- id = "paicard"
- req_tech = list("programming" = 2)
- build_type = PROTOLATHE
- materials = list("$glass" = 500, "$metal" = 500)
- build_path = /obj/item/device/paicard
-
-
-////////////////////////////////////////
-//////////Disk Construction Disks///////
-////////////////////////////////////////
-datum/design/design_disk
- name = "Design Storage Disk"
- desc = "Produce additional disks for storing device designs."
- id = "design_disk"
- req_tech = list("programming" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 30, "$glass" = 10)
- build_path = /obj/item/weapon/disk/design_disk
-
-datum/design/tech_disk
- name = "Technology Data Storage Disk"
- desc = "Produce additional disks for storing technology data."
- id = "tech_disk"
- req_tech = list("programming" = 1)
- build_type = PROTOLATHE | AUTOLATHE
- materials = list("$metal" = 30, "$glass" = 10)
- build_path = /obj/item/weapon/disk/tech_disk
-
-
-/////////////////////////////////////////
-/////////////////Mining//////////////////
-/////////////////////////////////////////
-
-datum/design/jackhammer
- name = "Sonic Jackhammer"
- desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
- id = "jackhammer"
- req_tech = list("materials" = 3, "powerstorage" = 2, "engineering" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 2000, "$glass" = 500, "$silver" = 500)
- build_path = /obj/item/weapon/pickaxe/jackhammer
-
-datum/design/drill
- name = "Mining Drill"
- desc = "Yours is the drill that will pierce through the rock walls."
- id = "drill"
- req_tech = list("materials" = 2, "powerstorage" = 3, "engineering" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 6000, "$glass" = 1000) //expensive, but no need for miners.
- build_path = /obj/item/weapon/pickaxe/drill
-
-datum/design/plasmacutter
- name = "Plasma Cutter"
- desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
- id = "plasmacutter"
- req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500)
- reliability = 79
- build_path = /obj/item/weapon/pickaxe/plasmacutter
-
-datum/design/pick_diamond
- name = "Diamond Pickaxe"
- desc = "A pickaxe with a diamond pick head, this is just like minesim 2554!."
- id = "pick_diamond"
- req_tech = list("materials" = 6)
- build_type = PROTOLATHE
- materials = list("$diamond" = 3000)
- build_path = /obj/item/weapon/pickaxe/diamond
-
-datum/design/drill_diamond
- name = "Diamond Mining Drill"
- desc = "Yours is the drill that will pierce the heavens!"
- id = "drill_diamond"
- req_tech = list("materials" = 6, "powerstorage" = 4, "engineering" = 4)
- build_type = PROTOLATHE
- materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed.
- reliability = 79
- build_path = /obj/item/weapon/pickaxe/drill/diamonddrill
-
-/////////////////////////////////////////
-//////////////Blue Space/////////////////
-/////////////////////////////////////////
-
-datum/design/beacon
- name = "Tracking Beacon"
- desc = "A blue space tracking beacon."
- id = "beacon"
- req_tech = list("bluespace" = 1)
- build_type = PROTOLATHE
- materials = list("$metal" = 20, "$glass" = 10)
- build_path = /obj/item/device/radio/beacon
-
-datum/design/bag_holding
- name = "Bag of Holding"
- desc = "A backpack that opens into a localized pocket of Blue Space."
- id = "bag_holding"
- req_tech = list("bluespace" = 4, "materials" = 6)
- build_type = PROTOLATHE
- materials = list("$gold" = 3000, "$diamond" = 1500, "$uranium" = 250)
- reliability = 80
- build_path = /obj/item/weapon/storage/backpack/holding
-
-datum/design/bluespace_crystal
- name = "Artificial Bluespace Crystal"
- desc = "A small blue crystal with mystical properties."
- id = "bluespace_crystal"
- req_tech = list("bluespace" = 4, "materials" = 6)
- build_type = PROTOLATHE
- materials = list("$diamond" = 1500, "$plasma" = 1500)
- reliability = 100
- build_path = /obj/item/bluespace_crystal/artificial
-
-datum/design/telesci_gps
- name = "GPS Device"
- desc = "Little thingie that can track its position at all times."
- id = "telesci_gps"
- req_tech = list("materials" = 2, "magnets" = 3, "bluespace" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 500, "$glass" = 1000)
- build_path = /obj/item/device/gps
-
-
-/////////////////////////////////////////
-/////////////////HUDs////////////////////
-/////////////////////////////////////////
-
-datum/design/health_hud
- name = "Health Scanner HUD"
- desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
- id = "health_hud"
- req_tech = list("biotech" = 2, "magnets" = 3)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/clothing/glasses/hud/health
-
-datum/design/health_hud_night
- name = "Night Vision Health Scanner HUD"
- desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
- id = "health_hud_night"
- req_tech = list("biotech" = 4, "magnets" = 5)
- build_type = PROTOLATHE
- materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$silver" = 250)
- build_path = /obj/item/clothing/glasses/hud/health/night
-
-datum/design/security_hud
- name = "Security HUD"
- desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
- id = "security_hud"
- req_tech = list("magnets" = 3, "combat" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 50, "$glass" = 50)
- build_path = /obj/item/clothing/glasses/hud/security
-
-datum/design/security_hud_night
- name = "Night Vision Security HUD"
- desc = "A heads-up display which provides id data and vision in complete darkness."
- id = "security_hud_night"
- req_tech = list("magnets" = 5, "combat" = 4)
- build_type = PROTOLATHE
- materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$gold" = 350)
- build_path = /obj/item/clothing/glasses/hud/security/night
-
-/////////////////////////////////////////
-//////////////////Test///////////////////
-/////////////////////////////////////////
-
- /* test
- name = "Test Design"
- desc = "A design to test the new protolathe."
- id = "protolathe_test"
- build_type = PROTOLATHE
- req_tech = list("materials" = 1)
- materials = list("$gold" = 3000, "iron" = 15, "copper" = 10, "$silver" = 2500)
- build_path = /obj/item/weapon/banhammer" */
-
////////////////////////////////////////
//Disks for transporting design datums//
////////////////////////////////////////
@@ -266,28 +74,221 @@ datum/design/security_hud_night
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
+///////////////////////////////////
+/////Non-Board Computer Stuff//////
+///////////////////////////////////
+
+/datum/design/intellicard
+ name = "Intellicard AI Transportation System"
+ desc = "Allows for the construction of an intellicard."
+ id = "intellicard"
+ req_tech = list("programming" = 4, "materials" = 4)
+ build_type = PROTOLATHE
+ materials = list("$glass" = 1000, "$gold" = 200)
+ build_path = /obj/item/device/aicard
+ category = list("Electronics")
+
+/datum/design/paicard
+ name = "Personal Artificial Intelligence Card"
+ desc = "Allows for the construction of a pAI Card."
+ id = "paicard"
+ req_tech = list("programming" = 2)
+ build_type = PROTOLATHE
+ materials = list("$glass" = 500, "$metal" = 500)
+ build_path = /obj/item/device/paicard
+ category = list("Electronics")
+
+
+////////////////////////////////////////
+//////////Disk Construction Disks///////
+////////////////////////////////////////
+/datum/design/design_disk
+ name = "Design Storage Disk"
+ desc = "Produce additional disks for storing device designs."
+ id = "design_disk"
+ req_tech = list("programming" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 30, "$glass" = 10)
+ build_path = /obj/item/weapon/disk/design_disk
+ category = list("Electronics")
+
+/datum/design/tech_disk
+ name = "Technology Data Storage Disk"
+ desc = "Produce additional disks for storing technology data."
+ id = "tech_disk"
+ req_tech = list("programming" = 1)
+ build_type = PROTOLATHE | AUTOLATHE
+ materials = list("$metal" = 30, "$glass" = 10)
+ build_path = /obj/item/weapon/disk/tech_disk
+ category = list("Electronics")
+
/////////////////////////////////////////
-//////////////Borg Upgrades//////////////
+/////////////////Mining//////////////////
/////////////////////////////////////////
-datum/design/borg_syndicate_module
- name = "Borg Illegal Weapons Upgrade"
- desc = "Allows for the construction of illegal upgrades for cyborgs"
- id = "borg_syndicate_module"
- build_type = MECHFAB
- req_tech = list("combat" = 4, "syndicate" = 3)
- build_path = /obj/item/borg/upgrade/syndicate
- materials = list("$metal"=10000,"$glass"=15000,"$diamond" = 10000)
- construction_time = 120
- category = list("Cyborg Upgrade Modules")
+/datum/design/jackhammer
+ name = "Sonic Jackhammer"
+ desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
+ id = "jackhammer"
+ req_tech = list("materials" = 3, "powerstorage" = 2, "engineering" = 2)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 2000, "$glass" = 500, "$silver" = 500)
+ build_path = /obj/item/weapon/pickaxe/jackhammer
+ category = list("Mining Designs")
+/datum/design/drill
+ name = "Mining Drill"
+ desc = "Yours is the drill that will pierce through the rock walls."
+ id = "drill"
+ req_tech = list("materials" = 2, "powerstorage" = 3, "engineering" = 2)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 6000, "$glass" = 1000) //expensive, but no need for miners.
+ build_path = /obj/item/weapon/pickaxe/drill
+ category = list("Mining Designs")
+
+/datum/design/plasmacutter
+ name = "Plasma Cutter"
+ desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
+ id = "plasmacutter"
+ req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500)
+ reliability = 79
+ build_path = /obj/item/weapon/pickaxe/plasmacutter
+ category = list("Mining Designs")
+
+/datum/design/pick_diamond
+ name = "Diamond Pickaxe"
+ desc = "A pickaxe with a diamond pick head, this is just like minesim 2554!."
+ id = "pick_diamond"
+ req_tech = list("materials" = 6)
+ build_type = PROTOLATHE
+ materials = list("$diamond" = 3000)
+ build_path = /obj/item/weapon/pickaxe/diamond
+ category = list("Mining Designs")
+
+/datum/design/drill_diamond
+ name = "Diamond Mining Drill"
+ desc = "Yours is the drill that will pierce the heavens!"
+ id = "drill_diamond"
+ req_tech = list("materials" = 6, "powerstorage" = 4, "engineering" = 4)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed.
+ reliability = 79
+ build_path = /obj/item/weapon/pickaxe/drill/diamonddrill
+ category = list("Mining Designs")
+
+/////////////////////////////////////////
+//////////////Blue Space/////////////////
+/////////////////////////////////////////
+
+/datum/design/beacon
+ name = "Tracking Beacon"
+ desc = "A blue space tracking beacon."
+ id = "beacon"
+ req_tech = list("bluespace" = 1)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 20, "$glass" = 10)
+ build_path = /obj/item/device/radio/beacon
+ category = list("Bluespace Designs")
+
+/datum/design/bag_holding
+ name = "Bag of Holding"
+ desc = "A backpack that opens into a localized pocket of Blue Space."
+ id = "bag_holding"
+ req_tech = list("bluespace" = 4, "materials" = 6)
+ build_type = PROTOLATHE
+ materials = list("$gold" = 3000, "$diamond" = 1500, "$uranium" = 250)
+ reliability = 80
+ build_path = /obj/item/weapon/storage/backpack/holding
+ category = list("Bluespace Designs")
+
+/datum/design/bluespace_crystal
+ name = "Artificial Bluespace Crystal"
+ desc = "A small blue crystal with mystical properties."
+ id = "bluespace_crystal"
+ req_tech = list("bluespace" = 4, "materials" = 6)
+ build_type = PROTOLATHE
+ materials = list("$diamond" = 1500, "$plasma" = 1500)
+ reliability = 100
+ build_path = /obj/item/bluespace_crystal/artificial
+ category = list("Bluespace Designs")
+
+/datum/design/telesci_gps
+ name = "GPS Device"
+ desc = "Little thingie that can track its position at all times."
+ id = "telesci_gps"
+ req_tech = list("materials" = 2, "magnets" = 3, "bluespace" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 500, "$glass" = 1000)
+ build_path = /obj/item/device/gps
+ category = list("Bluespace Designs")
+
+
+/////////////////////////////////////////
+/////////////////HUDs////////////////////
+/////////////////////////////////////////
+
+/datum/design/health_hud
+ name = "Health Scanner HUD"
+ desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
+ id = "health_hud"
+ req_tech = list("biotech" = 2, "magnets" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/clothing/glasses/hud/health
+ category = list("Equipement")
+
+/datum/design/health_hud_night
+ name = "Night Vision Health Scanner HUD"
+ desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
+ id = "health_hud_night"
+ req_tech = list("biotech" = 4, "magnets" = 5)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$silver" = 250)
+ build_path = /obj/item/clothing/glasses/hud/health/night
+ category = list("Equipement")
+
+/datum/design/security_hud
+ name = "Security HUD"
+ desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
+ id = "security_hud"
+ req_tech = list("magnets" = 3, "combat" = 2)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/clothing/glasses/hud/security
+ category = list("Equipement")
+
+/datum/design/security_hud_night
+ name = "Night Vision Security HUD"
+ desc = "A heads-up display which provides id data and vision in complete darkness."
+ id = "security_hud_night"
+ req_tech = list("magnets" = 5, "combat" = 4)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$gold" = 350)
+ build_path = /obj/item/clothing/glasses/hud/security/night
+ category = list("Equipement")
+
+/////////////////////////////////////////
+//////////////////Test///////////////////
+/////////////////////////////////////////
+
+ /* test
+ name = "Test Design"
+ desc = "A design to test the new protolathe."
+ id = "protolathe_test"
+ build_type = PROTOLATHE
+ req_tech = list("materials" = 1)
+ materials = list("$gold" = 3000, "iron" = 15, "copper" = 10, "$silver" = 2500)
+ build_path = /obj/item/weapon/banhammer"
+ category = list("Weapons") */
/////////////////////////////////////////
//////////////////Misc///////////////////
/////////////////////////////////////////
-datum/design/welding_mask
+/datum/design/welding_mask
name = "Welding Gas Mask"
desc = "A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd."
id = "weldingmask"
@@ -295,8 +296,9 @@ datum/design/welding_mask
build_type = PROTOLATHE
materials = list("$metal" = 4000, "$glass" = 1000)
build_path = /obj/item/clothing/mask/gas/welding
+ category = list("Equipement")
-datum/design/mesons
+/datum/design/mesons
name = "Optical Meson Scanners"
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
id = "mesons"
@@ -304,8 +306,9 @@ datum/design/mesons
build_type = PROTOLATHE
materials = list("$metal" = 200, "$glass" = 300, "$plasma" = 100)
build_path = /obj/item/clothing/glasses/meson
+ category = list("Equipement")
-datum/design/night_vision_goggles
+/datum/design/night_vision_goggles
name = "Night Vision Goggles"
desc = "Goggles that let you see through darkness unhindered."
id = "night_visision_goggles"
@@ -313,8 +316,9 @@ datum/design/night_vision_goggles
build_type = PROTOLATHE
materials = list("$metal" = 100, "$glass" = 100, "$uranium" = 1000)
build_path = /obj/item/clothing/glasses/night
+ category = list("Equipement")
-datum/design/magboots
+/datum/design/magboots
name = "Magnetic Boots"
desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
id = "magboots"
@@ -322,23 +326,13 @@ datum/design/magboots
build_type = PROTOLATHE
materials = list("$metal" = 4500, "$silver" = 1500, "$gold" = 2500)
build_path = /obj/item/clothing/shoes/magboots
-
-datum/design/drone_shell
- name = "Drone Shell"
- desc = "A shell of a maintenance drone, an expendable robot built to perform station repairs."
- id = "drone_shell"
- req_tech = list("programming" = 2, "biotech" = 4)
- build_type = MECHFAB
- materials = list("$metal" = 800, "$glass" = 350)
- construction_time=150
- build_path = /obj/item/drone_shell
- category = list("Misc")
+ category = list("Equipement")
/////////////////////////////////////////
////////////Janitor Designs//////////////
/////////////////////////////////////////
-datum/design/advmop
+/datum/design/advmop
name = "Advanced Mop"
desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals."
id = "advmop"
@@ -346,12 +340,14 @@ datum/design/advmop
build_type = PROTOLATHE
materials = list("$metal" = 2500, "$glass" = 200)
build_path = /obj/item/weapon/mop/advanced
+ category = list("Equipement")
-datum/design/holosign
+/datum/design/holosign
name = "Holographic Sign Projector"
desc = "A holograpic projector used to project various warning signs."
id = "holosign"
req_tech = list("magnets" = 3, "powerstorage" = 2)
build_type = PROTOLATHE
materials = list("$metal" = 2000, "$glass" = 1000)
- build_path = /obj/item/weapon/holosign_creator
\ No newline at end of file
+ build_path = /obj/item/weapon/holosign_creator
+ category = list("Equipement")
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/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 26f834ff7e2..158b666f29d 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -594,7 +594,10 @@
construction_time = 500
category = list("Exosuit Equipment")
-//Cyborg Upgrade Modules
+/////////////////////////////////////////
+//////////////Borg Upgrades//////////////
+/////////////////////////////////////////
+
/datum/design/borg_upgrade_reset
name = "Cyborg Upgrade Module (Reset Module)"
id = "borg_upgrade_reset"
@@ -649,6 +652,17 @@
construction_time = 120
category = list("Cyborg Upgrade Modules")
+/datum/design/borg_syndicate_module
+ name = "Borg Illegal Weapons Upgrade"
+ desc = "Allows for the construction of illegal upgrades for cyborgs"
+ id = "borg_syndicate_module"
+ build_type = MECHFAB
+ req_tech = list("combat" = 4, "syndicate" = 3)
+ build_path = /obj/item/borg/upgrade/syndicate
+ materials = list("$metal"=10000,"$glass"=15000,"$diamond" = 10000)
+ construction_time = 120
+ category = list("Cyborg Upgrade Modules")
+
//Misc
/datum/design/mecha_tracking
name = "Exosuit Tracking Beacon"
@@ -657,4 +671,15 @@
build_path =/obj/item/mecha_parts/mecha_tracking
materials = list("$metal"=500)
construction_time = 50
+ category = list("Misc")
+
+/datum/design/drone_shell
+ name = "Drone Shell"
+ desc = "A shell of a maintenance drone, an expendable robot built to perform station repairs."
+ id = "drone_shell"
+ req_tech = list("programming" = 2, "biotech" = 4)
+ build_type = MECHFAB
+ materials = list("$metal" = 800, "$glass" = 350)
+ construction_time=150
+ build_path = /obj/item/drone_shell
category = list("Misc")
\ No newline at end of file
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..807541815a7 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)"
@@ -66,6 +67,7 @@ datum/design/pacman
reliability = 79
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/pacman
+ category = list("Engineering Machinery")
datum/design/superpacman
name = "Machine Design (SUPERPACMAN-type Generator Board)"
@@ -76,6 +78,7 @@ datum/design/superpacman
reliability = 76
materials = list("$glass" = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/pacman/super
+ category = list("Engineering Machinery")
datum/design/mrspacman
name = "Machine Design (MRSPACMAN-type Generator Board)"
@@ -85,4 +88,5 @@ 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
+ category = list("Engineering Machinery")
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..c6ed0a4f8f3 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -25,6 +25,18 @@ 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",
+ "Medical Designs",
+ "Bluespace Designs",
+ "Stock Parts",
+ "Equipement",
+ "Mining Designs",
+ "Electronics",
+ "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/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index ea7bb4ce13a..e0eccaff92b 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -60,10 +60,10 @@
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
if(anchored)
anchored = 0
- user << " The [src] can now be moved."
+ user << " \The [src] can now be moved."
else if(!anchored)
anchored = 1
- user << " The [src] is now secured."
+ user << " \The [src] is now secured."
if(istype(W, /obj/item/weapon/screwdriver))
if(stage == 0)
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
diff --git a/code/world.dm b/code/world.dm
index 82f3817b3c2..c31d225da1d 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -89,7 +89,7 @@
master_controller = new /datum/controller/game_controller()
spawn(-1)
master_controller.setup()
- lighting_controller.Initialize()
+ lighting_controller.initializeLighting()
src.update_status()
diff --git a/config/admins.txt b/config/admins.txt
index c56f60cb022..cec937826ec 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -71,3 +71,5 @@ xxnoob = Game Master
tkdrg = Game Master
Cuboos = Game Master
thunder12345 = Game Master
+wjohnston = Game Master
+mandurrh = Game Master
diff --git a/config/config.txt b/config/config.txt
index d3fb04150a5..0d112194334 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -152,4 +152,7 @@ TICKCOMP 0
#AUTOMUTE_ON
## Communication key for receiving data through world/Topic(), you don't want to give this out
-#COMMS_KEY default_pwd
\ No newline at end of file
+#COMMS_KEY default_pwd
+
+## Uncomment this to let players see their own notes (they can still be set by admins only)
+#SEE_OWN_NOTES
diff --git a/config/game_options.txt b/config/game_options.txt
index 7f469d35001..00fad47a4de 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -27,6 +27,10 @@ REVIVAL_BRAIN_LIFE -1
#Comment this out if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results.
OOC_DURING_ROUND
+### EMOJI ###
+#Comment this out if you want to disable emojis
+EMOJIS
+
### MOB MOVEMENT ###
## We suggest editing these variables ingame to find a good speed for your server.
diff --git a/html/changelog.html b/html/changelog.html
index c0dafcb126f..092b4c9d99f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,28 @@
-->
+
+
27 December 2014
+
Dorsidwarf updated:
+
+ - Buffs the RCD from 30 matter units to max capacity 100, and increases the value of matter charges.
+
+
Paprika updated:
+
+ - Taser electrodes now have a limited range of 7 tiles.
+ - The energy gun's stun mode has been replaced with a disable mode.
+ - Security officers will now spawn with tasers.
+ - Disabler beams now go through windows and grilles.
+ - 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.
+ - 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.
+ - Added an advanced taser for RnD, the child of a disabler and a taser.
+
+
Tkdrg updated:
+
+ - Envoys from the distant Viji sector have brought an exotic contraption to Centcomm. Known as the 'supermatter shard', it is a fragment of an ancient alien artifact, believed to have a dangerous and mysterious power. This precious item has been made available to the Space Station 13 cargo team for the cost of a hundred supply points, as a reward for all your hard work. Good luck, and stay safe.
+
+
16 December 2014
Paprika updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 11d9482ac4a..c68eb21a486 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2205,3 +2205,27 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: The number of junk food in snack vending machine is lowered from 6 to 5
of each type.
- bugfix: Fixing not being able to load an omelette du fromage on a tray.
+2014-12-27:
+ Dorsidwarf:
+ - tweak: Buffs the RCD from 30 matter units to max capacity 100, and increases the
+ value of matter charges.
+ Paprika:
+ - 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.
+ Tkdrg:
+ - rscadd: Envoys from the distant Viji sector have brought an exotic contraption
+ to Centcomm. Known as the 'supermatter shard', it is a fragment of an ancient
+ alien artifact, believed to have a dangerous and mysterious power. This precious
+ item has been made available to the Space Station 13 cargo team for the cost
+ of a hundred supply points, as a reward for all your hard work. Good luck, and
+ stay safe.
diff --git a/html/changelogs/Dorsidwarf-RCDbuff-6242.yml.txt b/html/changelogs/Dorsidwarf-RCDbuff-6242.yml.txt
deleted file mode 100644
index 885ecc9ef6a..00000000000
--- a/html/changelogs/Dorsidwarf-RCDbuff-6242.yml.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscdel (general adding of nice things)
-# rscadd (general deleting of nice things)
-# imageadd
-# imagedel
-# spellcheck (typo fixes)
-# experiment
-# tgs (TG-ported fixes?)
-#################################
-# Your name.
-author: Dorsidwarf
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
-- tweak: "Buffs the RCD from 30 matter units to max capacity 100, and increases the value of matter charges.
\ No newline at end of file
diff --git a/html/changelogs/JJRcop-OOCemoji.yml b/html/changelogs/JJRcop-OOCemoji.yml
new file mode 100644
index 00000000000..fa65b93fb7e
--- /dev/null
+++ b/html/changelogs/JJRcop-OOCemoji.yml
@@ -0,0 +1,4 @@
+author: JJRcop, Nienhaus
+delete-after: True
+changes:
+ - rscadd: "Adds emoji to OOC chat."
\ No newline at end of file
diff --git a/html/changelogs/Tkdrg-FUCKING_SUPERMATTER.yml b/html/changelogs/Tkdrg-FUCKING_SUPERMATTER.yml
deleted file mode 100644
index 8a39d30d075..00000000000
--- a/html/changelogs/Tkdrg-FUCKING_SUPERMATTER.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Tkdrg
-delete-after: True
-
-changes:
- - rscadd: "Envoys from the distant Viji sector have brought an exotic contraption to Centcomm. Known as the 'supermatter shard', it is a fragment of an ancient alien artifact, believed to have a dangerous and mysterious power. This precious item has been made available to the Space Station 13 cargo team for the cost of a hundred supply points, as a reward for all your hard work. Good luck, and stay safe."
diff --git a/icons/emoji.dmi b/icons/emoji.dmi
new file mode 100644
index 00000000000..a78a7e3df79
Binary files /dev/null and b/icons/emoji.dmi differ
diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi
index 8c8690ea853..0b2c7f8e136 100644
Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 2b363ca9647..05e667d2553 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 9c0449f011e..d613dedcefe 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index e711157e2e5..0a170f70789 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/corgi_back.dmi b/icons/mob/corgi_back.dmi
index 6c7c1444909..7ea3cee1a4a 100644
Binary files a/icons/mob/corgi_back.dmi and b/icons/mob/corgi_back.dmi differ
diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi
index 4faf6d77ddb..e03c9eb25c0 100644
Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ
diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi
index 8ff02f67652..fe9e2b691e7 100644
Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index ec869f4ad98..b10bcfce92b 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index 57009026e86..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 33af023bd79..32316ec15f2 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/mob/monkey.dmi b/icons/mob/monkey.dmi
index 99beec24bf8..d1872d6aaff 100644
Binary files a/icons/mob/monkey.dmi and b/icons/mob/monkey.dmi differ
diff --git a/icons/mob/screen_alien.dmi b/icons/mob/screen_alien.dmi
index 3674b2bf163..e0257307ac1 100644
Binary files a/icons/mob/screen_alien.dmi and b/icons/mob/screen_alien.dmi differ
diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi
index 12741f6e83c..4e5a9f42d54 100644
Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 6ca00c2dde1..b6923194bb1 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi
index c2befc32eaa..bab5533b140 100644
Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 2109dcef03e..30334b16415 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 367ef6ee234..df6f3a4ba10 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index b5dd02a219d..605c08c4590 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index e17dbc09f5d..24f9048fc45 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 1728af68a25..30fd1979df8 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi
index 80722813075..7be081f9579 100644
Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 70d7f0fcc85..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/objects.dmi b/icons/obj/objects.dmi
index 201a73b0905..e0bbc6ea25a 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.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..0e7af4bc429 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"
@@ -852,6 +854,7 @@
#include "code\modules\detectivework\evidence.dm"
#include "code\modules\detectivework\footprints_and_rag.dm"
#include "code\modules\detectivework\scanner.dm"
+#include "code\modules\emoji\emoji_parse.dm"
#include "code\modules\events\alien_infestation.dm"
#include "code\modules\events\anomaly.dm"
#include "code\modules\events\anomaly_bluespace.dm"
@@ -1285,6 +1288,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"