."
+ else
+ text += "According the blueprints, you are now in outer space. Hold your breath.
" //YWEdit End.
if (AREA_STATION)
text += "According the blueprints, you are now in \"[A.name]\".
"
if (AREA_SPECIAL)
@@ -116,6 +120,9 @@
return A
/obj/item/blueprints/proc/get_area_type(var/area/A = get_area())
+ for(var/type in SPACE_OUTSIDE_TYPES) //YWEDIT Start.
+ if(istype(A, type))
+ return AREA_SPACE //YWEDIT End.
for(var/type in SPACE_AREA_TYPES)
if(istype(A, type))
return AREA_SPACE
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index b49ee7a70f..690cdefff1 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -40,6 +40,26 @@
storage_capacity = (MOB_MEDIUM * 2) - 1
var/contains_body = 0
+//Yawn add
+/obj/item/bodybag/large
+ name = "mass grave body bag"
+ desc = "A large folded bag designed for the storage and transportation of cadavers."
+ icon = 'icons/obj/closets/bodybag_large.dmi'
+ w_class = ITEMSIZE_LARGE
+
+ attack_self(mob/user)
+ var/obj/structure/closet/body_bag/large/R = new /obj/structure/closet/body_bag/large(user.loc)
+ R.add_fingerprint(user)
+ qdel(src)
+
+/obj/structure/closet/body_bag/large
+ name = "mass grave body bag"
+ desc = "A massive body bag that holds as much as it does due to bluespace lining on its zipper. Shockingly compact for its storage."
+ icon = 'icons/obj/closets/bodybag_large.dmi'
+ storage_capacity = (MOB_MEDIUM * 12) - 1 //Holds 12 bodys
+ item_path = /obj/item/bodybag/large
+//End of Yawn add
+
/obj/structure/closet/body_bag/attackby(var/obj/item/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/pen))
var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text
diff --git a/code/game/objects/items/devices/communicator/helper.dm b/code/game/objects/items/devices/communicator/helper.dm
index b406100456..5cf5eac2c2 100644
--- a/code/game/objects/items/devices/communicator/helper.dm
+++ b/code/game/objects/items/devices/communicator/helper.dm
@@ -44,18 +44,19 @@
var/index = 0
for(var/datum/feed_message/FM in channel.messages)
index++
- var/list/msgdata = list(
- "author" = FM.author,
- "body" = FM.body,
- "img" = null,
- "message_type" = FM.message_type,
- "time_stamp" = FM.time_stamp,
- "caption" = FM.caption,
- "index" = index
- )
if(FM.img)
- msgdata["img"] = icon2base64(FM.img)
- messages[++messages.len] = msgdata
+ usr << browse_rsc(FM.img, "pda_news_tmp_photo_[feeds["channel"]]_[index].png")
+ // News stories are HTML-stripped but require newline replacement to be properly displayed in NanoUI
+ var/body = replacetext(FM.body, "\n", "
")
+ messages[++messages.len] = list(
+ "author" = FM.author,
+ "body" = body,
+ "message_type" = FM.message_type,
+ "time_stamp" = FM.time_stamp,
+ "has_image" = (FM.img != null),
+ "caption" = FM.caption,
+ "index" = index
+ )
feeds[++feeds.len] = list(
"name" = channel.channel_name,
@@ -95,3 +96,448 @@
news.Swap(1, 3) // List is sorted in ascending order of timestamp, we want descending
return news
+
+
+
+// Putting the commcard data harvesting helpers here
+// Not ideal to put all the procs on the base type
+// but it may open options for adminbus,
+// And it saves duplicated code
+
+
+// Medical records
+/obj/item/weapon/commcard/proc/get_med_records()
+ var/med_records[0]
+ for(var/datum/data/record/M in sortRecord(data_core.medical))
+ var/record[0]
+ record[++record.len] = list("tab" = "Name", "val" = M.fields["name"])
+ record[++record.len] = list("tab" = "ID", "val" = M.fields["id"])
+ record[++record.len] = list("tab" = "Blood Type", "val" = M.fields["b_type"])
+ record[++record.len] = list("tab" = "DNA #", "val" = M.fields["b_dna"])
+ record[++record.len] = list("tab" = "Gender", "val" = M.fields["id_gender"])
+ record[++record.len] = list("tab" = "Entity Classification", "val" = M.fields["brain_type"])
+ record[++record.len] = list("tab" = "Minor Disorders", "val" = M.fields["mi_dis"])
+ record[++record.len] = list("tab" = "Major Disorders", "val" = M.fields["ma_dis"])
+ record[++record.len] = list("tab" = "Allergies", "val" = M.fields["alg"])
+ record[++record.len] = list("tab" = "Condition", "val" = M.fields["cdi"])
+ record[++record.len] = list("tab" = "Notes", "val" = M.fields["notes"])
+
+ med_records[++med_records.len] = list("name" = M.fields["name"], "record" = record)
+ return med_records
+
+
+// Employment records
+/obj/item/weapon/commcard/proc/get_emp_records()
+ var/emp_records[0]
+ for(var/datum/data/record/G in sortRecord(data_core.general))
+ var/record[0]
+ record[++record.len] = list("tab" = "Name", "val" = G.fields["name"])
+ record[++record.len] = list("tab" = "ID", "val" = G.fields["id"])
+ record[++record.len] = list("tab" = "Rank", "val" = G.fields["rank"])
+ record[++record.len] = list("tab" = "Fingerprint", "val" = G.fields["fingerprint"])
+ record[++record.len] = list("tab" = "Entity Classification", "val" = G.fields["brain_type"])
+ record[++record.len] = list("tab" = "Sex", "val" = G.fields["sex"])
+ record[++record.len] = list("tab" = "Species", "val" = G.fields["species"])
+ record[++record.len] = list("tab" = "Age", "val" = G.fields["age"])
+ record[++record.len] = list("tab" = "Notes", "val" = G.fields["notes"])
+
+ emp_records[++emp_records.len] = list("name" = G.fields["name"], "record" = record)
+ return emp_records
+
+
+// Security records
+/obj/item/weapon/commcard/proc/get_sec_records()
+ var/sec_records[0]
+ for(var/datum/data/record/G in sortRecord(data_core.general))
+ var/record[0]
+ record[++record.len] = list("tab" = "Name", "val" = G.fields[""])
+ record[++record.len] = list("tab" = "Sex", "val" = G.fields[""])
+ record[++record.len] = list("tab" = "Species", "val" = G.fields[""])
+ record[++record.len] = list("tab" = "Age", "val" = G.fields[""])
+ record[++record.len] = list("tab" = "Rank", "val" = G.fields[""])
+ record[++record.len] = list("tab" = "Fingerprint", "val" = G.fields[""])
+ record[++record.len] = list("tab" = "Physical Status", "val" = G.fields[""])
+ record[++record.len] = list("tab" = "Mental Status", "val" = G.fields[""])
+ record[++record.len] = list("tab" = "Criminal Status", "val" = G.fields[""])
+ record[++record.len] = list("tab" = "Major Crimes", "val" = G.fields[""])
+ record[++record.len] = list("tab" = "Minor Crimes", "val" = G.fields[""])
+ record[++record.len] = list("tab" = "Notes", "val" = G.fields["notes"])
+
+ sec_records[++sec_records.len] = list("name" = G.fields["name"], "record" = record)
+ return sec_records
+
+
+// Status of all secbots
+// Weaker than what PDAs appear to do, but as of 7/1/2018 PDA secbot access is nonfunctional
+/obj/item/weapon/commcard/proc/get_sec_bot_access()
+ var/sec_bots[0]
+ for(var/mob/living/bot/secbot/S in mob_list)
+ // Get new bot
+ var/status[0]
+ status[++status.len] = list("tab" = "Name", "val" = sanitize(S.name))
+
+ // If it's turned off, then it shouldn't be broadcasting any further info
+ if(!S.on)
+ status[++status.len] = list("tab" = "Power", "val" = "Off") // Encoding the span classes here so I don't have to do complicated switches in the ui template
+ continue
+ status[++status.len] = list("tab" = "Power", "val" = "On")
+
+ // -- What it's doing
+ // If it's engaged, then say who it thinks it's engaging
+ if(S.target)
+ status[++status.len] = list("tab" = "Status", "val" = "Apprehending Target")
+ status[++status.len] = list("tab" = "Target", "val" = S.target_name(S.target))
+ // Else if it's patrolling
+ else if(S.will_patrol)
+ status[++status.len] = list("tab" = "Status", "val" = "Patrolling")
+ // Otherwise we don't know what it's doing
+ else
+ status[++status.len] = list("tab" = "Status", "val" = "Idle")
+
+ // Where it is
+ status[++status.len] = list("tab" = "Location", "val" = sanitize("[get_area(S.loc)]"))
+
+ // Append bot to the list
+ sec_bots[++sec_bots.len] = list("bot" = S.name, "status" = status)
+ return sec_bots
+
+
+// Code and frequency of stored signalers
+// Supports multiple signalers within the device
+/obj/item/weapon/commcard/proc/get_int_signalers()
+ var/signalers[0]
+ for(var/obj/item/device/assembly/signaler/S in internal_devices)
+ var/unit[0]
+ unit[++unit.len] = list("tab" = "Code", "val" = S.code)
+ unit[++unit.len] = list("tab" = "Frequency", "val" = S.frequency)
+
+ signalers[++signalers.len] = list("ref" = "\ref[S]", "status" = unit)
+
+ return signalers
+
+// Returns list of all powernet sensors currently visible to the commcard
+/obj/item/weapon/commcard/proc/find_powernet_sensors()
+ var/grid_sensors[0]
+
+ // Find all the powernet sensors we need to pull data from
+ // Copied from /datum/nano_module/power_monitor/proc/refresh_sensors(),
+ // located in '/code/modules/nano/modules/power_monitor.dm'
+ // Minor tweaks for efficiency and cleanliness
+ var/turf/T = get_turf(src)
+ if(T)
+ var/list/levels = using_map.get_map_levels(T.z, FALSE)
+ for(var/obj/machinery/power/sensor/S in machines)
+ if((S.long_range) || (S.loc.z in levels) || (S.loc.z == T.z)) // Consoles have range on their Z-Level. Sensors with long_range var will work between Z levels.
+ if(S.name_tag == "#UNKN#") // Default name. Shouldn't happen!
+ warning("Powernet sensor with unset ID Tag! [S.x]X [S.y]Y [S.z]Z")
+ else
+ grid_sensors += S
+ return grid_sensors
+
+// List of powernets
+/obj/item/weapon/commcard/proc/get_powernet_monitoring_list()
+ // Fetch power monitor data
+ var/sensors[0]
+
+ for(var/obj/machinery/power/sensor/S in internal_data["grid_sensors"])
+ var/list/focus = S.return_reading_data()
+
+ sensors[++sensors.len] = list(
+ "name" = S.name_tag,
+ "alarm" = focus["alarm"]
+ )
+
+ return sensors
+
+// Information about the targeted powernet
+/obj/item/weapon/commcard/proc/get_powernet_target(var/target_sensor)
+ if(!target_sensor)
+ return
+
+ var/powernet_target[0]
+
+ for(var/obj/machinery/power/sensor/S in internal_data["grid_sensors"])
+ var/list/focus = S.return_reading_data()
+
+ // Packages the span class here so it doesn't need to be interpreted w/in the for loop in the ui template
+ var/load_stat = "Optimal"
+ if(focus["load_percentage"] >= 95)
+ load_stat = "DANGER: Overload"
+ else if(focus["load_percentage"] >= 85)
+ load_stat = "WARNING: High Load"
+
+ var/alarm_stat = focus["alarm"] ? "WARNING: Abnormal activity detected!" : "Secure"
+
+ if(target_sensor == S.name_tag)
+ powernet_target = list(
+ "name" = S.name_tag,
+ "alarm" = focus["alarm"],
+ "error" = focus["error"],
+ "apc_data" = focus["apc_data"],
+ "status" = list(
+ list("field" = "Network Load Status", "statval" = load_stat),
+ list("field" = "Network Security Status", "statval" = alarm_stat),
+ list("field" = "Load Percentage", "statval" = focus["load_percentage"]),
+ list("field" = "Available Power", "statval" = focus["total_avail"]),
+ list("field" = "APC Power Usage", "statval" = focus["total_used_apc"]),
+ list("field" = "Other Power Usage", "statval" = focus["total_used_other"]),
+ list("field" = "Total Usage", "statval" = focus["total_used_all"])
+ )
+ )
+
+ return powernet_target
+
+// Compiles the locations of all janitorial paraphernalia, as used by janitorialLocator.tmpl
+/obj/item/weapon/commcard/proc/get_janitorial_locations()
+ // Fetch janitorial locator
+ var/janidata[0]
+ var/list/cleaningList = list()
+ cleaningList += GLOB.all_mops + GLOB.all_mopbuckets + GLOB.all_janitorial_carts
+
+ // User's location
+ var/turf/userloc = get_turf(src)
+ if(isturf(userloc))
+ janidata[++janidata.len] = list("field" = "Current Location", "val" = "[userloc.x], [userloc.y], [using_map.get_zlevel_name(userloc.z)]")
+ else
+ janidata[++janidata.len] = list("field" = "Current Location", "val" = "Unknown")
+ return janidata // If the user isn't on a valid turf, then it shouldn't be able to find anything anyways
+
+ // Mops, mop buckets, janitorial carts.
+ for(var/obj/C in cleaningList)
+ var/turf/T = get_turf(C)
+ if(isturf(T) )//&& T.z in using_map.get_map_levels(userloc, FALSE))
+ if(T.z == userloc.z)
+ janidata[++janidata.len] = list("field" = apply_text_macros("\proper [C.name]"), "val" = "[T.x], [T.y], [using_map.get_zlevel_name(T.z)]")
+ else
+ janidata[++janidata.len] = list("field" = apply_text_macros("\proper [C.name]"), "val" = "[T.x], [T.y], [using_map.get_zlevel_name(T.z)]")
+
+ // Cleanbots
+ for(var/mob/living/bot/cleanbot/B in living_mob_list)
+ var/turf/T = get_turf(B)
+ if(isturf(T) )//&& T.z in using_map.get_map_levels(userloc, FALSE))
+ var/textout = ""
+ if(B.on)
+ textout += "Status: Online
"
+ if(T.z == userloc.z)
+ textout += "[T.x], [T.y], [using_map.get_zlevel_name(T.z)]"
+ else
+ textout += "[T.x], [T.y], [using_map.get_zlevel_name(T.z)]"
+ else
+ textout += "Status: Offline"
+
+ janidata[++janidata.len] = list("field" = "[B.name]", "val" = textout)
+
+ return janidata
+
+// Compiles the three lists used by GPS_access.tmpl
+// The contents of the three lists are inherently related, so separating them into different procs would be largely redundant
+/obj/item/weapon/commcard/proc/get_GPS_lists()
+ // GPS Access
+ var/intgps[0] // Gps devices within the commcard -- Allow tag edits, turning on/off, etc
+ var/extgps[0] // Gps devices not inside the commcard -- Print locations if a gps is on
+ var/stagps[0] // Gps net status, location, whether it's on, if it's got long range
+ var/obj/item/device/gps/cumulative = new(src)
+ cumulative.tracking = FALSE
+ cumulative.local_mode = TRUE // Won't detect long-range signals automatically
+ cumulative.long_range = FALSE
+ var/list/toggled_gps = list() // List of GPS units that are turned off before display_list() is called
+
+ for(var/obj/item/device/gps/G in internal_devices)
+ var/gpsdata[0]
+ if(G.tracking && !G.emped)
+ cumulative.tracking = TRUE // Turn it on
+ if(G.long_range)
+ cumulative.long_range = TRUE // It can detect long-range
+ if(!G.local_mode)
+ cumulative.local_mode = FALSE // It is detecting long-range
+
+ gpsdata["ref"] = "\ref[G]"
+ gpsdata["tag"] = G.gps_tag
+ gpsdata["power"] = G.tracking
+ gpsdata["local_mode"] = G.local_mode
+ gpsdata["long_range"] = G.long_range
+ gpsdata["hide_signal"] = G.hide_signal
+ gpsdata["can_hide"] = G.can_hide_signal
+
+ intgps[++intgps.len] = gpsdata // Add it to the list
+
+ if(G.tracking)
+ G.tracking = FALSE // Disable the internal gps units so they don't show up in the report
+ toggled_gps += G
+
+ var/list/remote_gps = cumulative.display_list() // Fetch information for all units except the ones inside of this device
+
+ for(var/obj/item/device/gps/G in toggled_gps) // Reenable any internal GPS units
+ G.tracking = TRUE
+
+ stagps["enabled"] = cumulative.tracking
+ stagps["long_range_en"] = (cumulative.long_range && !cumulative.local_mode)
+
+ stagps["my_area_name"] = remote_gps["my_area_name"]
+ stagps["curr_x"] = remote_gps["curr_x"]
+ stagps["curr_y"] = remote_gps["curr_y"]
+ stagps["curr_z"] = remote_gps["curr_z"]
+ stagps["curr_z_name"] = remote_gps["curr_z_name"]
+
+ extgps = remote_gps["gps_list"] // Compiled by the GPS
+
+ qdel(cumulative) // Don't want spare GPS units building up in the contents
+
+ return list(
+ intgps,
+ extgps,
+ stagps
+ )
+
+// Collects the current status of the supply shuttle
+// Copied from /obj/machinery/computer/supplycomp/ui_interact(),
+// code\game\machinery\computer\supply.dm, starting at line 55
+/obj/item/weapon/commcard/proc/get_supply_shuttle_status()
+ var/shuttle_status[0]
+ var/datum/shuttle/autodock/ferry/supply/shuttle = SSsupply.shuttle
+ if(shuttle)
+ if(shuttle.has_arrive_time())
+ shuttle_status["location"] = "In transit"
+ shuttle_status["mode"] = SUP_SHUTTLE_TRANSIT
+ shuttle_status["time"] = shuttle.eta_minutes()
+
+ else
+ shuttle_status["time"] = 0
+ if(shuttle.at_station())
+ if(shuttle.shuttle_docking_controller)
+ switch(shuttle.shuttle_docking_controller.get_docking_status())
+ if("docked")
+ shuttle_status["location"] = "Docked"
+ shuttle_status["mode"] = SUP_SHUTTLE_DOCKED
+ if("undocked")
+ shuttle_status["location"] = "Undocked"
+ shuttle_status["mode"] = SUP_SHUTTLE_UNDOCKED
+ if("docking")
+ shuttle_status["location"] = "Docking"
+ shuttle_status["mode"] = SUP_SHUTTLE_DOCKING
+ shuttle_status["force"] = shuttle.can_force()
+ if("undocking")
+ shuttle_status["location"] = "Undocking"
+ shuttle_status["mode"] = SUP_SHUTTLE_UNDOCKING
+ shuttle_status["force"] = shuttle.can_force()
+
+ else
+ shuttle_status["location"] = "Station"
+ shuttle_status["mode"] = SUP_SHUTTLE_DOCKED
+
+ else
+ shuttle_status["location"] = "Away"
+ shuttle_status["mode"] = SUP_SHUTTLE_AWAY
+
+ if(shuttle.can_launch())
+ shuttle_status["launch"] = 1
+ else if(shuttle.can_cancel())
+ shuttle_status["launch"] = 2
+ else
+ shuttle_status["launch"] = 0
+
+ switch(shuttle.moving_status)
+ if(SHUTTLE_IDLE)
+ shuttle_status["engine"] = "Idle"
+ if(SHUTTLE_WARMUP)
+ shuttle_status["engine"] = "Warming up"
+ if(SHUTTLE_INTRANSIT)
+ shuttle_status["engine"] = "Engaged"
+
+ else
+ shuttle["mode"] = SUP_SHUTTLE_ERROR
+
+ return shuttle_status
+
+// Compiles the list of supply orders
+// Copied from /obj/machinery/computer/supplycomp/ui_interact(),
+// code\game\machinery\computer\supply.dm, starting at line 130
+/obj/item/weapon/commcard/proc/get_supply_orders()
+ var/orders[0]
+ for(var/datum/supply_order/S in SSsupply.order_history)
+ orders[++orders.len] = list(
+ "ref" = "\ref[S]",
+ "status" = S.status,
+ "entries" = list(
+ list("field" = "Supply Pack", "entry" = S.name),
+ list("field" = "Cost", "entry" = S.cost),
+ list("field" = "Index", "entry" = S.index),
+ list("field" = "Reason", "entry" = S.comment),
+ list("field" = "Ordered by", "entry" = S.ordered_by),
+ list("field" = "Ordered at", "entry" = S.ordered_at),
+ list("field" = "Approved by", "entry" = S.approved_by),
+ list("field" = "Approved at", "entry" = S.approved_at)
+ )
+ )
+
+ return orders
+
+// Compiles the list of supply export receipts
+// Copied from /obj/machinery/computer/supplycomp/ui_interact(),
+// code\game\machinery\computer\supply.dm, starting at line 147
+/obj/item/weapon/commcard/proc/get_supply_receipts()
+ var/receipts[0]
+ for(var/datum/exported_crate/E in SSsupply.exported_crates)
+ receipts[++receipts.len] = list(
+ "ref" = "\ref[E]",
+ "contents" = E.contents,
+ "error" = E.contents["error"],
+ "title" = list(
+ list("field" = "Name", "entry" = E.name),
+ list("field" = "Value", "entry" = E.value)
+ )
+ )
+ return receipts
+
+
+// Compiles the list of supply packs for the category currently stored in internal_data["supply_category"]
+// Copied from /obj/machinery/computer/supplycomp/ui_interact(),
+// code\game\machinery\computer\supply.dm, starting at line 147
+/obj/item/weapon/commcard/proc/get_supply_pack_list()
+ var/supply_packs[0]
+ for(var/pack_name in SSsupply.supply_pack)
+ var/datum/supply_pack/P = SSsupply.supply_pack[pack_name]
+ if(P.group == internal_data["supply_category"])
+ var/list/pack = list(
+ "name" = P.name,
+ "cost" = P.cost,
+ "contraband" = P.contraband,
+ "manifest" = uniquelist(P.manifest),
+ "random" = P.num_contained,
+ "expand" = 0,
+ "ref" = "\ref[P]"
+ )
+
+ if(P in internal_data["supply_pack_expanded"])
+ pack["expand"] = 1
+
+ supply_packs[++supply_packs.len] = pack
+
+ return supply_packs
+
+
+// Compiles miscellaneous data and permissions used by the supply template
+/obj/item/weapon/commcard/proc/get_misc_supply_data()
+ return list(
+ "shuttle_auth" = (internal_data["supply_controls"] & SUP_SEND_SHUTTLE),
+ "order_auth" = (internal_data["supply_controls"] & SUP_ACCEPT_ORDERS),
+ "supply_points" = SSsupply.points,
+ "supply_categories" = all_supply_groups
+ )
+
+/obj/item/weapon/commcard/proc/get_status_display()
+ return list(
+ "line1" = internal_data["stat_display_line1"],
+ "line2" = internal_data["stat_display_line2"],
+ "active_line1" = internal_data["stat_display_active1"],
+ "active_line2" = internal_data["stat_display_active2"],
+ "active" = internal_data["stat_display_special"]
+ )
+
+/obj/item/weapon/commcard/proc/find_blast_doors()
+ var/target_doors[0]
+ for(var/obj/machinery/door/blast/B in machines)
+ if(B.id == internal_data["shuttle_door_code"])
+ target_doors += B
+
+ return target_doors
diff --git a/code/game/objects/items/devices/geiger_yw.dm b/code/game/objects/items/devices/geiger_yw.dm
new file mode 100644
index 0000000000..eb89f3f4dd
--- /dev/null
+++ b/code/game/objects/items/devices/geiger_yw.dm
@@ -0,0 +1,112 @@
+/obj/item/device/geiger/wall
+ name = "mounted geiger counter"
+ desc = "A wall mounted device used for detecting and measuring radiation in an area."
+ icon = 'icons/obj/devices_yw.dmi'
+ icon_state = "geiger_wall"
+ item_state = "geiger_wall"
+ anchored = 1
+ scanning = 1
+ radiation_count = 0
+ plane = TURF_PLANE
+ layer = ABOVE_TURF_LAYER
+ w_class = ITEMSIZE_LARGE
+ flags = NOBLOODY
+ var/circuit = /obj/item/weapon/circuitboard/geiger
+ var/number = 0
+ var/last_tick //used to delay the powercheck
+ var/wiresexposed = 0
+
+/obj/item/device/geiger/wall/Initialize()
+ START_PROCESSING(SSobj, src)
+ soundloop = new(list(src), FALSE)
+ return ..()
+
+/obj/item/device/geiger/wall/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ QDEL_NULL(soundloop)
+ return ..()
+/*
+/obj/item/device/geiger/wall/process()
+ get_radiation()
+
+/obj/item/device/geiger/wall/proc/get_radiation()
+ if(!scanning)
+ return
+ radiation_count = SSradiation.get_rads_at_turf(get_turf(src))
+ update_icon()
+ update_sound()
+
+/obj/item/device/geiger/wall/examine(mob/user)
+ ..(user)
+ get_radiation()
+ to_chat(user, "[scanning ? "Ambient" : "Stored"] radiation level: [radiation_count ? radiation_count : "0"]Bq.")
+
+/obj/item/device/geiger/wall/rad_act(amount)
+ if(!amount || !scanning)
+ return FALSE
+
+ if(amount > radiation_count)
+ radiation_count = amount
+
+ update_icon()
+ update_sound()
+*/
+
+/obj/item/device/geiger/wall/attack_self(var/mob/user)
+ scanning = !scanning
+ update_icon()
+ update_sound()
+ to_chat(user, "\icon[src] You switch [scanning ? "on" : "off"] \the [src].")
+
+/obj/item/device/geiger/wall/update_icon()
+ if(!scanning)
+ icon_state = "geiger_wall-p"
+ return 1
+
+ switch(radiation_count)
+ if(null)
+ icon_state = "geiger_level_1"
+ if(-INFINITY to RAD_LEVEL_LOW)
+ icon_state = "geiger_level_1"
+ if(RAD_LEVEL_LOW to RAD_LEVEL_MODERATE)
+ icon_state = "geiger_level_2"
+ if(RAD_LEVEL_MODERATE to RAD_LEVEL_HIGH)
+ icon_state = "geiger_level_3"
+ if(RAD_LEVEL_HIGH to RAD_LEVEL_VERY_HIGH)
+ icon_state = "geiger_level_4"
+ if(RAD_LEVEL_VERY_HIGH to INFINITY)
+ icon_state = "geiger_level_5"
+/*
+/obj/item/device/geiger/wall/process()
+ if(((world.timeofday - last_tick) > 30) || ((world.timeofday - last_tick) < 0))
+ last_tick = world.timeofday
+
+ if(!src.loc)
+ scanning = 0
+ else
+ var/area/A = get_area(src)
+ if(!A)
+ scanning = 0
+ else
+ scanning = A.powered(EQUIP) // set "on" to the power status
+
+ if(!scanning)
+ if(wiresexposed)
+ icon_state = "geiger_wall-p_open"
+ else
+ icon_state = "geiger_wall-p"
+ else
+ if(wiresexposed)
+ icon_state = "geiger_wall-p_open"
+ else
+ icon_state = initial(icon_state) */
+
+/obj/item/device/geiger/wall/attack_ai(mob/user as mob)
+ src.add_fingerprint(user)
+ spawn (0)
+ attack_self(user)
+
+/obj/item/device/geiger/wall/attack_hand(mob/user as mob)
+ src.add_fingerprint(user)
+ spawn (0)
+ attack_self(user)
diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm
new file mode 100644
index 0000000000..d273995fae
--- /dev/null
+++ b/code/game/objects/items/devices/instruments.dm
@@ -0,0 +1,105 @@
+//copy pasta of the space violin, don't hurt me -RF
+
+/obj/item/device/instrument/guitar
+ name = "guitar"
+ desc = "It's made of wood and has bronze strings."
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "guitar"
+ item_state = "guitar"
+ attack_verb = list("smashed")
+ instrumentId = "guitar"
+ instrumentExt = "ogg"
+
+/obj/item/device/instrument/keytar
+ name = "portable keyboard"
+ desc = "A keyboard, for those interested in the piano on the go! "
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "keyboard"
+ item_state = "keyboard"
+ attack_verb = list("smashed")
+ instrumentId = "piano"
+ instrumentExt = "ogg"
+
+/obj/item/device/instrument/eguitar
+ name = "electrica guitar"
+ desc = "A metallic musical instrument with strings, made for all your shredding needs."
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "eguitar"
+ item_state = "eguitar"
+ attack_verb = list("smashed")
+ instrumentId = "eguitar"
+ instrumentExt = "ogg"
+
+/obj/item/device/instrument/xylophone
+ name = "xylophone"
+ desc = "A percussion instrument consisting of a series of wooden bars graduated in length."
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "xylophone"
+ attack_verb = list("smashed")
+ instrumentId = "xylophone"
+ instrumentExt = "mid"
+
+/obj/item/device/instrument/accordion
+ name = "accordion"
+ desc = "A musical instrument played by blowing and pressing keys. Someone detached Pun-Pun's hands!"
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "accordion"
+ attack_verb = list("smashed")
+ instrumentId = "accordion"
+ instrumentExt = "mid"
+
+/obj/item/device/instrument/saxophone
+ name = "saxophone"
+ desc = "A metal wind instruments with a single-reed mouthpiece known for it's soothing tones."
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "saxophone"
+ attack_verb = list("smashed")
+ instrumentId = "saxophone"
+ instrumentExt = "mid"
+
+/obj/item/device/instrument/glockenspiel
+ name = "glockenspiel"
+ desc = "A percussion instrument composed of a set of tuned metal bars perfect for any marching band."
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "glockenspiel"
+ attack_verb = list("smashed")
+ instrumentId = "glockenspiel"
+ instrumentExt = "mid"
+
+/obj/item/device/instrument/recorder
+ name = "recorder"
+ desc = "A depressing version of a flute. Does anyone even play this?"
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "recorder"
+ attack_verb = list("smashed")
+ instrumentId = "recorder"
+ instrumentExt = "mid"
+
+/obj/item/device/instrument/trombone
+ name = "trombone"
+ desc = "A large brass wind instrument. Seems to call for incidental music."
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "trombone"
+ attack_verb = list("smashed")
+ instrumentId = "trombone"
+ instrumentExt = "mid"
+
+/obj/item/device/instrument/harmonica
+ name = "harmonica"
+ desc = "A literal mouth organ, it just smells of the frontier!"
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "harmonica"
+ attack_verb = list("smashed")
+ instrumentId = "harmonica"
+ instrumentExt = "mid"
+ w_class = ITEMSIZE_SMALL
+
+/obj/item/device/instrument/bikehorn
+ name = "bike horn"
+ desc = "Why... why would you even play this?!"
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "bike_horn"
+ attack_verb = list("smashed")
+ instrumentId = "bikehorn"
+ instrumentExt = "ogg"
+
diff --git a/code/game/objects/items/devices/radio/encryptionkey_vr.dm b/code/game/objects/items/devices/radio/encryptionkey_vr.dm
index f492f097ed..92a5ed142b 100644
--- a/code/game/objects/items/devices/radio/encryptionkey_vr.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey_vr.dm
@@ -1,7 +1,7 @@
-/obj/item/device/encryptionkey/heads/hop
+/obj/item/device/encryptionkey/heads/hop //YW Edit: removes Explorer channel access, not in line with our chain of command.
name = "head of personnel's encryption key"
icon_state = "hop_cypherkey"
- channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1, "Explorer" = 1)
+ channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1)
/obj/item/device/encryptionkey/heads/ai_integrated
name = "ai integrated encryption key"
@@ -14,10 +14,10 @@
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1)
-/obj/item/device/encryptionkey/heads/rd
+/obj/item/device/encryptionkey/heads/rd //YW Edit: adds Explorer channel access, to come in line with our chain of command.
name = "research director's encryption key"
icon_state = "rd_cypherkey"
- channels = list("Command" = 1, "Science" = 1)
+ channels = list("Command" = 1, "Science" = 1, "Explorer" = 1)
/obj/item/device/encryptionkey/ert
channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1)
@@ -25,15 +25,15 @@
/obj/item/device/encryptionkey/omni //Literally only for the admin intercoms
channels = list("Mercenary" = 1, "Raider" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1)
-/obj/item/device/encryptionkey/pathfinder
+/obj/item/device/encryptionkey/pathfinder //YW Edit: removes command channel access, not in line with our chain of command.
name = "pathfinder's encryption key"
icon_state = "com_cypherkey"
- channels = list("Command" = 1, "Explorer" = 1)
+ channels = list("Explorer" = 1)
-/obj/item/device/encryptionkey/qm
+/obj/item/device/encryptionkey/qm //YW Edit: removes command channel access, not in line with our chain of command.
name = "quartermaster's encryption key"
icon_state = "qm_cypherkey"
- channels = list("Command" = 1, "Supply" = 1)
+ channels = list("Supply" = 1)
/obj/item/device/encryptionkey/pilot
name = "pilot's encryption key"
diff --git a/code/game/objects/items/devices/radio/encryptionkey_yw.dm b/code/game/objects/items/devices/radio/encryptionkey_yw.dm
new file mode 100644
index 0000000000..d54b0fc1e7
--- /dev/null
+++ b/code/game/objects/items/devices/radio/encryptionkey_yw.dm
@@ -0,0 +1,4 @@
+/obj/item/device/encryptionkey/heads/blueshield
+ name = "blueshield's encryption key"
+ icon_state = "hos_cypherkey"
+ channels = list("Security" = 1, "Command" = 1)
\ No newline at end of file
diff --git a/code/game/objects/items/devices/radio/headset_yw.dm b/code/game/objects/items/devices/radio/headset_yw.dm
new file mode 100644
index 0000000000..178e4f01f1
--- /dev/null
+++ b/code/game/objects/items/devices/radio/headset_yw.dm
@@ -0,0 +1,5 @@
+/obj/item/device/radio/headset/heads/blueshield
+ name = "Blueshield headset"
+ desc = "The headset of the man who protects command's worthless lifes."
+ icon_state = "com_headset"
+ ks2type = /obj/item/device/encryptionkey/heads/blueshield
\ No newline at end of file
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index df39eeaf02..05be57c265 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -33,6 +33,12 @@
/obj/item/device/radio/intercom/interrogation
name = "station intercom (Interrogation)"
frequency = 1449
+ broadcasting = 1 //yw edit starts
+ listening = 0
+
+/obj/item/device/radio/intercom/interrogation/observation
+ listening = 1
+ broadcasting = 0 //yw edit ends
/obj/item/device/radio/intercom/private
name = "station intercom (Private)"
diff --git a/code/game/objects/items/devices/radio/radio_yw.dm b/code/game/objects/items/devices/radio/radio_yw.dm
new file mode 100644
index 0000000000..66072ca8db
--- /dev/null
+++ b/code/game/objects/items/devices/radio/radio_yw.dm
@@ -0,0 +1,7 @@
+/obj/item/device/bluespaceradio/cryogaia_prelinked
+ name = "bluespace radio (Cryogaia)"
+ handset = /obj/item/device/radio/bluespacehandset/linked/cryogaia_prelinked
+
+/obj/item/device/radio/bluespacehandset/linked/cryogaia_prelinked
+ bs_tx_preload_id = "cryogaia_rx" //Transmit to a receiver
+ bs_rx_preload_id = "cryogaia_tx" //Recveive from a transmitter
\ No newline at end of file
diff --git a/code/game/objects/items/devices/starcaster_ch.dm b/code/game/objects/items/devices/starcaster_ch.dm
new file mode 100644
index 0000000000..bb4fa728bb
--- /dev/null
+++ b/code/game/objects/items/devices/starcaster_ch.dm
@@ -0,0 +1,75 @@
+/datum/category_item/catalogue/information/starfire_news
+ desc = "A small news reporting agency based near Sif's New Reykjavik, the Starfire Report is somewhat infamous \
+ for scrutinizing the actions of Trans-Stellar Corporations in the Vir system yet coming out on top in the legal \
+ battles with inevitably follow. Aside from reporting, the agency is also known for inventing and manufacturing the \
+ starcaster, a cheap device capable of accessing news articles from almost anywhere in the galaxy without need for \
+ a stable exonet connection."
+ value = CATALOGUER_REWARD_TRIVIAL
+
+/obj/item/device/starcaster_news
+ name = "\improper Starcaster"
+ desc = "A device from the Starfire Report for reading the news and nothing else."
+ icon = 'icons/obj/library.dmi'
+ icon_state = "newscodex-open"
+// catalogue_data = list(/datum/category_item/catalogue/information/starfire_news) Commented out until I can figure out why this won't scan.
+
+ var/datum/computer_file/data/news_article/loaded_article = null //You must specify the variable this far to avoid compilation errors.
+ var/show_archived = null
+
+
+
+/obj/item/device/starcaster_news/attack_self(mob/user as mob)
+
+ user.set_machine(src)
+ ui_interact(user) //Activates nanoUI. Fuck nanoUI.
+ return
+
+/obj/item/device/starcaster_news/Topic(href, href_list) //Mostly ripped off from news_browser.dm
+ if(..())
+ return 1
+ if(href_list["PRG_openarticle"])
+ . = 1
+ if(loaded_article)
+ return 1
+
+ for(var/datum/computer_file/data/news_article/N in ntnet_global.available_news)
+ if(N.uid == text2num(href_list["PRG_openarticle"]))
+ loaded_article = N.clone()
+ break
+ if(href_list["PRG_reset"])
+ . = 1
+ loaded_article = null
+ if(href_list["PRG_toggle_archived"]) //Fuck nanoUI
+ . = 1
+ show_archived = !show_archived
+ if(.)
+ SSnanoui.update_uis(src)
+
+/obj/item/device/starcaster_news/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) //Also ripped from news_browser.dm. Fuck nanoUI
+ var/obj/item/device/starcaster_news/PRG = src //If you're trying to understand this shit go to nano/templates/starcaster_ch.tmpl
+
+ var/list/data = list()
+
+ if(PRG.loaded_article) // Viewing an article.
+ data["title"] = PRG.loaded_article.filename
+ data["cover"] = PRG.loaded_article.cover
+ data["article"] = PRG.loaded_article.stored_data
+ else // Viewing list of articles
+ var/list/all_articles[0]
+ for(var/datum/computer_file/data/news_article/F in ntnet_global.available_news)
+ if(!PRG.show_archived && F.archived)
+ continue
+ all_articles.Add(list(list(
+ "name" = F.filename,
+ "uid" = F.uid,
+ "archived" = F.archived
+ )))
+ data["all_articles"] = all_articles
+ data["showing_archived"] = PRG.show_archived
+
+ ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+ if (!ui)
+ ui = new(user, src, ui_key, "starcaster_ch.tmpl", "Starcaster News Browser", 575, 750)
+ ui.auto_update_layout = 1
+ ui.set_initial_data(data)
+ ui.open()
diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm
index 3e2d5dc5c7..7400b14ddb 100644
--- a/code/game/objects/items/devices/translocator_vr.dm
+++ b/code/game/objects/items/devices/translocator_vr.dm
@@ -113,7 +113,7 @@
/obj/item/device/perfect_tele/attack_self(mob/user)
if(loc_network)
- for(var/obj/item/device/perfect_tele_beacon/stationary/nb in premade_tele_beacons)
+ for(var/obj/item/device/perfect_tele_beacon/stationary/nb in GLOB.premade_tele_beacons)
if(nb.tele_network == loc_network)
beacons[nb.tele_name] = nb
loc_network = null //Consumed
diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm
index 5dc215cf91..ce6b929f94 100644
--- a/code/game/objects/items/devices/violin.dm
+++ b/code/game/objects/items/devices/violin.dm
@@ -6,6 +6,10 @@
var/instrumentExt = "mid"
icon = 'icons/obj/musician.dmi'
force = 10
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_instruments.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_instruments.dmi',
+ )
/obj/item/device/instrument/New()
..()
@@ -34,8 +38,16 @@
song.interact(user)
/obj/item/device/instrument/violin
- name = "space violin"
- desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
+ name = "violin"
+ desc = "A wooden musical instrument with four strings and a bow. A true classic."
icon_state = "violin"
attack_verb = list("smashed")
instrumentId = "violin"
+ item_state = "violin"
+
+/obj/item/device/instrument/violin/gold
+ name = "golden violin"
+ desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
+ icon = 'icons/obj/musician_yw.dmi'
+ icon_state = "golden_violin"
+ attack_verb = list("smashed")
diff --git a/code/game/objects/items/gunbox_yw.dm b/code/game/objects/items/gunbox_yw.dm
new file mode 100644
index 0000000000..c7d4047c74
--- /dev/null
+++ b/code/game/objects/items/gunbox_yw.dm
@@ -0,0 +1,39 @@
+/obj/item/gunbox/blueshield
+ name = "blueshield mainarm box"
+ desc = "A secure box containing a blueshield main weapon."
+
+//Primary gun: Either shotgun or SMG
+
+/obj/item/gunbox/blueshield/attack_self(mob/living/user)
+ var/list/options = list()
+ options["Jackhammer Revolver Shotgun (12 Gauge)"] = list(/obj/item/weapon/gun/projectile/revolvershotgun, /obj/item/ammo_magazine/m12gdrumjack, /obj/item/ammo_magazine/m12gdrumjack, /obj/item/ammo_magazine/m12gdrumjack/beanbag)
+ options["WT550 Machine Pistol (9mm)"] = list(/obj/item/weapon/gun/projectile/automatic/wt550, /obj/item/ammo_magazine/m9mmt/rubber, /obj/item/ammo_magazine/m9mmt, /obj/item/ammo_magazine/m9mmt)
+ options["X01 Energy Gun (Weapon Cell)"] = list(/obj/item/weapon/gun/energy/x01, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon)
+ var/choice = input(user,"Would you prefer a Jackhammer shotgun, a WT550 Machine Pistol, or an X01 Energy Gun?") as null|anything in options
+ if(src && choice)
+ var/list/things_to_spawn = options[choice]
+ for(var/new_type in things_to_spawn) // Spawn all the things, the gun and the ammo.
+ var/atom/movable/AM = new new_type(get_turf(src))
+ if(istype(AM, /obj/item/weapon/gun))
+ to_chat(user, "You have chosen \the [AM].")
+ qdel(src)
+
+/obj/item/gunbox/blueshield/secondary
+ name = "blueshield sidearm box"
+ desc = "A secure box containing a blueshield sidearm."
+
+//Sidearm: Egun, or a .44 with rubber and lethal mag
+
+/obj/item/gunbox/blueshield/secondary/attack_self(mob/living/user)
+ var/list/options = list()
+ options["NSCW Variable Pistol(Microbattery)"] = list(/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos)
+ options["E-Gun (Weapon Cell)"] = list(/obj/item/weapon/gun/energy/gun, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon)
+ options["Consul Revolver (.44)"] = list(/obj/item/weapon/gun/projectile/revolver/consul, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44/rubber)
+ var/choice = input(user,"Would you prefer an NSCW, e-gun or a revolver?") as null|anything in options
+ if(src && choice)
+ var/list/things_to_spawn = options[choice]
+ for(var/new_type in things_to_spawn) // Spawn all the things, the gun and the ammo.
+ var/atom/movable/AM = new new_type(get_turf(src))
+ if(istype(AM, /obj/item/weapon/gun))
+ to_chat(user, "You have chosen \the [AM].")
+ qdel(src)
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm
new file mode 100644
index 0000000000..6b1018021b
--- /dev/null
+++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles_yw.dm
@@ -0,0 +1,27 @@
+/obj/fiftyspawner/bcarpet
+ name = "stack of black carpet"
+ type_to_spawn = /obj/item/stack/tile/carpet/bcarpet
+
+/obj/fiftyspawner/blucarpet
+ name = "stack of blue carpet"
+ type_to_spawn = /obj/item/stack/tile/carpet/blucarpet
+
+/obj/fiftyspawner/turcarpet
+ name = "stack of tue carpet"
+ type_to_spawn = /obj/item/stack/tile/carpet/turcarpet
+
+/obj/fiftyspawner/sblucarpet
+ name = "stack of silver blue carpet"
+ type_to_spawn = /obj/item/stack/tile/carpet/sblucarpet
+
+/obj/fiftyspawner/gaycarpet
+ name = "stack of clown carpet"
+ type_to_spawn = /obj/item/stack/tile/carpet/gaycarpet
+
+/obj/fiftyspawner/purcarpet
+ name = "stack of purple carpet"
+ type_to_spawn = /obj/item/stack/tile/carpet/purcarpet
+
+/obj/fiftyspawner/oracarpet
+ name = "stack of orange carpet"
+ type_to_spawn = /obj/item/stack/tile/carpet/oracarpet
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index f7282464e2..d70db63f08 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -20,6 +20,11 @@
drop_sound = 'sound/items/drop/axe.ogg'
pickup_sound = 'sound/items/pickup/axe.ogg'
+ var/material/material //CHOMPEDIT: Start, To make tiles have material variables
+ var/default_type = DEFAULT_WALL_MATERIAL
+ var/perunit = SHEET_MATERIAL_AMOUNT
+ var/apply_colour //CHOMPEDIT: End
+
/obj/item/stack/tile/New()
..()
randpixel_xy()
@@ -72,9 +77,9 @@
stacktype = /obj/item/stack/tile/wood
build_type = /obj/item/stack/tile/wood
+
+//CHOMPEDIT: Moving carpets to tile_types_ch to give them proper names, descriptions and material variables
/*
- * Carpets
- */
/obj/item/stack/tile/carpet
name = "carpet"
singular_name = "carpet"
@@ -96,7 +101,8 @@
icon_state = "tile-tealcarpet"
no_variants = FALSE
-/obj/item/stack/tile/carpet/bcarpet
+/obj/item/stack/tile/carpet/bcarpet //YW EDIT: Commented out to help with upstream merging. Get on this you fucking virgo bois. -yw //CHOMP Comment: Yawn commented out this block, but CHOMP already commented out this stuff so I just removed theirs.
+
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/blucarpet
icon_state = "tile-carpet"
@@ -110,6 +116,7 @@
icon_state = "tile-carpet"
/obj/item/stack/tile/carpet/oracarpet
icon_state = "tile-carpet"
+ */
/obj/item/stack/tile/floor
name = "floor tile"
@@ -242,4 +249,4 @@
uses_charge = 1
charge_costs = list(250)
stacktype = /obj/item/stack/tile/roofing
- build_type = /obj/item/stack/tile/roofing
\ No newline at end of file
+ build_type = /obj/item/stack/tile/roofing
diff --git a/code/game/objects/items/stacks/tiles/tile_types_ch.dm b/code/game/objects/items/stacks/tiles/tile_types_ch.dm
new file mode 100644
index 0000000000..cd919466e6
--- /dev/null
+++ b/code/game/objects/items/stacks/tiles/tile_types_ch.dm
@@ -0,0 +1,102 @@
+// Procs to allow tiles to have material variables, consider unifying this on stack parent?
+// Uncertain if any of these procs can result in unforseen issues with tile objects, if there are bugs with tiles check if any of these procs are the cause
+
+/obj/item/stack/tile/New()
+ ..()
+
+ if(!default_type)
+ default_type = DEFAULT_WALL_MATERIAL
+ material = get_material_by_name("[default_type]")
+ if(!material)
+ qdel(src)
+ return 0
+
+ recipes = material.get_recipes()
+ stacktype = material.stack_type
+ if(islist(material.stack_origin_tech))
+ origin_tech = material.stack_origin_tech.Copy()
+
+ if(apply_colour)
+ color = material.icon_colour
+
+ if(!material.conductive)
+ flags |= NOCONDUCT
+
+ matter = material.get_matter()
+ return 1
+
+
+/obj/item/stack/material/get_material()
+ return material
+
+/*
+ * Carpets
+ */
+/obj/item/stack/tile/carpet
+ name = "red carpet"
+ singular_name = "red carpet"
+ desc = "A piece of red carpet. It is the same size as a normal floor tile!"
+ icon_state = "tile-carpet"
+ force = 1.0
+ throwforce = 1.0
+ throw_speed = 5
+ throw_range = 20
+ flags = 0
+ no_variants = FALSE
+ default_type = MAT_CARPET
+
+/obj/item/stack/tile/carpet/teal
+ name = "teal carpet"
+ singular_name = "teal carpet"
+ desc = "A piece of teal carpet. It is the same size as a normal floor tile!"
+ icon_state = "tile-tealcarpet"
+ default_type = MAT_CARPET_TEAL
+
+/obj/item/stack/tile/carpet/bcarpet
+ name = "black carpet"
+ singular_name = "black carpet"
+ desc = "A piece of black carpet. It is the same size as a normal floor tile!"
+ icon_state = "tile-carpet"
+ default_type = MAT_CARPET_BLACK
+
+/obj/item/stack/tile/carpet/blucarpet
+ name = "blue carpet"
+ singular_name = "blue carpet"
+ desc = "A piece of blue carpet. It is the same size as a normal floor tile!"
+ icon_state = "tile-carpet"
+ default_type = MAT_CARPET_BLUE
+
+/obj/item/stack/tile/carpet/turcarpet
+ name = "turquoise carpet"
+ singular_name = "turquoise carpet"
+ desc = "A piece of turquoise carpet. It is the same size as a normal floor tile!"
+ icon_state = "tile-carpet"
+ default_type = MAT_CARPET_TURQUOISE
+
+/obj/item/stack/tile/carpet/sblucarpet
+ name = "silver blue carpet"
+ singular_name = "silver blue carpet"
+ desc = "A piece of silver blue carpet. It is the same size as a normal floor tile!"
+ icon_state = "tile-carpet"
+ default_type = MAT_CARPET_SILVERBLUE
+
+/obj/item/stack/tile/carpet/gaycarpet
+ name = "clown carpet"
+ singular_name = "clown carpet"
+ desc = "A piece of clown carpet. It is the same size as a normal floor tile!"
+ icon_state = "tile-carpet"
+ default_type = MAT_CARPET_PINK
+
+/obj/item/stack/tile/carpet/purcarpet
+ name = "purple carpet"
+ singular_name = "purple carpet"
+ desc = "A piece of purple carpet. It is the same size as a normal floor tile!"
+ icon_state = "tile-carpet"
+ default_type = MAT_CARPET_PURPLE
+
+/obj/item/stack/tile/carpet/oracarpet
+ name = "orange carpet"
+ singular_name = "orange carpet"
+ desc = "A piece of orange carpet. It is the same size as a normal floor tile!"
+ icon_state = "tile-carpet"
+ default_type = MAT_CARPET_ORANGE
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/tiles/tile_types_yw.dm b/code/game/objects/items/stacks/tiles/tile_types_yw.dm
new file mode 100644
index 0000000000..a78efd1045
--- /dev/null
+++ b/code/game/objects/items/stacks/tiles/tile_types_yw.dm
@@ -0,0 +1,21 @@
+/obj/item/stack/tile/carpet/bcarpet
+ name = "black carpet"
+ icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/blucarpet
+ name = "blue carpet"
+ icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/turcarpet
+ name = "tur carpet"
+ icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/sblucarpet
+ name = "silver blue carpet"
+ icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/gaycarpet
+ name = "Clown Carpet"
+ icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/purcarpet
+ name = "purple carpet"
+ icon_state = "tile-carpet"
+/obj/item/stack/tile/carpet/oracarpet
+ name = "orange carpet"
+ icon_state = "tile-carpet"
\ No newline at end of file
diff --git a/code/game/objects/items/surplus_voucher_ch.dm b/code/game/objects/items/surplus_voucher_ch.dm
new file mode 100644
index 0000000000..3d2adc8601
--- /dev/null
+++ b/code/game/objects/items/surplus_voucher_ch.dm
@@ -0,0 +1,180 @@
+// Contains the supply vouchers for taskmanager.dm
+/obj/item/surplus_voucher
+ icon = 'icons/obj/items.dmi'
+ icon_state = "pizza_voucher"
+ throwforce = 0
+ throw_speed = 5
+ throw_range = 4
+ force = 0
+
+/obj/item/surplus_voucher/com
+ name = "Reward Surplus Voucher"
+ desc = "A surplus voucher! This one is meant to reward valued employees! Activate it for your surplus delivery!"
+/obj/item/surplus_voucher/com/attack_self(mob/user as mob)
+ spawn_item(get_turf(src))
+
+/obj/item/surplus_voucher/com/proc/spawn_item(var/turf/T)
+ var/path = pick(prob(6);/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,
+ prob(3);/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey,
+ prob(3);/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka,
+ prob(3);/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla,
+ prob(3);/obj/item/weapon/reagent_containers/food/drinks/bottle/rum,
+ prob(3);/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager,
+ prob(3);/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth,
+ prob(3);/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac,
+ prob(3);/obj/item/weapon/reagent_containers/food/drinks/bottle/wine,
+ prob(3);/obj/item/weapon/spacecash/c50,
+ prob(3);/obj/item/weapon/spacecash/c100,
+ prob(3);/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,
+ prob(3);/obj/item/weapon/reagent_containers/food/snacks/cheeseburger,
+ prob(3);/obj/item/weapon/reagent_containers/food/snacks/fries,
+ prob(2);/obj/item/pizzabox/meat,
+ prob(2);/obj/item/pizzabox/vegetable,
+ prob(1);/obj/item/pizzabox/pineapple,
+ prob(2);/obj/item/pizzabox/margherita,
+ prob(2);/obj/item/pizzabox/mushroom,
+ prob(3);/obj/item/toy/bouquet,
+ prob(5);/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,
+ prob(3);/obj/item/weapon/storage/box/snappops,
+ prob(2);/obj/item/clothing/under/syndicate/tacticool,
+ prob(3);/obj/item/clothing/head/cowboy_hat/small,
+ prob(3);/obj/item/toy/sword,
+ prob(3);/obj/item/toy/cultsword,
+ prob(1);/obj/structure/plushie/ian)
+ playsound(T, 'sound/effects/phasein.ogg', 25, 1)
+ new path(T)
+ del(src)
+
+/obj/item/surplus_voucher/eng
+ name = "Engineering Surplus Voucher"
+ desc = "A surplus voucher! This one is meant to resupply engineering with tools! Activate it for your surplus delivery!"
+/obj/item/surplus_voucher/eng/attack_self(mob/user as mob)
+ spawn_item(get_turf(src))
+
+/obj/item/surplus_voucher/eng/proc/spawn_item(var/turf/T)
+ var/path = pick(prob(2);/datum/design/item/powercell/high,
+ prob(2);/obj/item/weapon/storage/briefcase/inflatable,
+ prob(2);/obj/item/clamp,
+ prob(3);/obj/item/weapon/extinguisher,
+ prob(3);/obj/item/weapon/weldingtool/largetank,
+ prob(2);/obj/item/weapon/tool/wirecutters,
+ prob(3);/obj/item/weapon/tool/wrench,
+ prob(3);/obj/item/weapon/tool/screwdriver,
+ prob(3);/obj/item/device/analyzer,
+ prob(3);/obj/item/device/t_scanner,
+ prob(2);/obj/item/weapon/grenade/chem_grenade/metalfoam,
+ prob(1);/obj/item/toy/figure/engineer)
+ playsound(T, 'sound/effects/phasein.ogg', 25, 1)
+ new path(T)
+ del(src)
+
+
+
+/obj/item/surplus_voucher/med
+ name = "Medical Surplus Voucher"
+ desc = "A surplus voucher! This one is meant to resupply medical with chemicals and kits! Activate it for your surplus delivery!"
+/obj/item/surplus_voucher/med/attack_self(mob/user as mob)
+ spawn_item(get_turf(src))
+
+/obj/item/surplus_voucher/med/proc/spawn_item(var/turf/T)
+ var/path = pick(prob(6);/obj/item/weapon/storage/firstaid/regular,
+ prob(6);/obj/item/weapon/storage/firstaid/fire,
+ prob(6);/obj/item/weapon/storage/firstaid/toxin,
+ prob(6);/obj/item/weapon/storage/firstaid/o2,
+ prob(6);/obj/item/weapon/storage/firstaid/adv,
+ prob(3);/obj/item/weapon/storage/pill_bottle/antitox,
+ prob(3);/obj/item/weapon/storage/pill_bottle/bicaridine,
+ prob(2);/obj/item/weapon/storage/pill_bottle/dexalin_plus,
+ prob(3);/obj/item/weapon/storage/pill_bottle/dylovene,
+ prob(3);/obj/item/weapon/storage/pill_bottle/inaprovaline,
+ prob(3);/obj/item/weapon/storage/pill_bottle/kelotane,
+ prob(3);/obj/item/weapon/storage/pill_bottle/dermaline,
+ prob(3);/obj/item/weapon/storage/pill_bottle/spaceacillin,
+ prob(3);/obj/item/weapon/storage/pill_bottle/tramadol,
+ prob(3);/obj/item/weapon/storage/pill_bottle/carbon,
+ prob(3);/obj/item/weapon/storage/pill_bottle/iron,
+ prob(4);/obj/item/weapon/storage/pill_bottle/assorted,
+ prob(4);/obj/item/weapon/backup_implanter,
+ prob(2);/obj/item/toy/plushie/borgplushie/medihound)
+ playsound(T, 'sound/effects/phasein.ogg', 25, 1)
+ new path(T)
+ del(src)
+
+/obj/item/surplus_voucher/sci
+ name = "Science Surplus Voucher"
+ desc = "A surplus voucher! This one is meant to supply science with a variety of miscellaneous items! Activate it for your surplus delivery!"
+/obj/item/surplus_voucher/sci/attack_self(mob/user as mob)
+ spawn_item(get_turf(src))
+
+/obj/item/surplus_voucher/sci/proc/spawn_item(var/turf/T)
+ var/path = pick(prob(1);/obj/item/device/kit/paint/ripley,
+ prob(1);/obj/item/device/kit/paint/ripley/death,
+ prob(1);/obj/item/device/kit/paint/ripley/flames_red,
+ prob(1);/obj/item/device/kit/paint/ripley/flames_blue,
+ prob(1);/obj/item/device/kit/paint/durand,
+ prob(1);/obj/item/device/kit/paint/gygax/darkgygax,
+ prob(3);/obj/item/weapon/reagent_containers/food/snacks/monkeycube,
+ prob(3);/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube,
+ prob(3);/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sarucube,
+ prob(3);/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sparracube,
+ prob(3);/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube,
+ prob(2);/obj/item/weapon/storage/part_replacer,
+ prob(2);/obj/item/device/integrated_circuit_printer,
+ prob(1);/obj/item/weapon/disk/integrated_circuit/upgrade/advanced,
+ prob(3);/obj/item/stack/nanopaste,
+ prob(3);/obj/item/weapon/melee/baton/slime,
+ prob(3);/obj/item/weapon/gun/energy/taser/xeno,
+ prob(3);/obj/item/weapon/storage/box/monkeycubes,
+ prob(1);/obj/item/toy/figure/borg)
+ playsound(T, 'sound/effects/phasein.ogg', 25, 1)
+ new path(T)
+ del(src)
+
+/obj/item/surplus_voucher/sec
+ name = "Security Surplus Voucher"
+ desc = "A surplus voucher! This one is meant to resupply security with gear... and donuts! Activate it for your surplus delivery!"
+/obj/item/surplus_voucher/sec/attack_self(mob/user as mob)
+ spawn_item(get_turf(src))
+
+/obj/item/surplus_voucher/sec/proc/spawn_item(var/turf/T)
+ var/path = pick(prob(2);/obj/item/weapon/storage/box/flashbangs,
+ prob(4);/obj/item/weapon/storage/box/flare,
+ prob(5);/obj/item/weapon/storage/box/donut,
+ prob(4);/obj/item/weapon/storage/box/handcuffs,
+ prob(3);/obj/item/weapon/reagent_containers/spray/pepper,
+ prob(3);/obj/item/weapon/melee/baton/loaded,
+ prob(2);/obj/item/weapon/storage/box/beanbags,
+ prob(2);/obj/item/weapon/storage/box/stunshells,
+ prob(2);/obj/item/ammo_magazine/m45/rubber,
+ prob(2);/obj/item/ammo_magazine/m9mmt/rubber,
+ prob(2);/obj/item/weapon/cell/device/weapon,
+ prob(1);/obj/item/toy/plushie/borgplushie)
+ playsound(T, 'sound/effects/phasein.ogg', 25, 1)
+ new path(T)
+ del(src)
+
+/obj/item/surplus_voucher/ser
+ name = "Service Surplus Voucher"
+ desc = "A surplus voucher! This one is meant to generally resupply service employees! Activate it for your surplus delivery!"
+/obj/item/surplus_voucher/ser/attack_self(mob/user as mob)
+ spawn_item(get_turf(src))
+
+/obj/item/surplus_voucher/ser/proc/spawn_item(var/turf/T)
+ var/path = pick(prob(4);/obj/item/weapon/reagent_containers/food/drinks/milk,
+ prob(4);/obj/item/weapon/reagent_containers/food/condiment/flour,
+ prob(4);/obj/item/weapon/reagent_containers/food/drinks/soymilk,
+ prob(4);/obj/item/weapon/storage/fancy/egg_box,
+ prob(3);/obj/item/weapon/reagent_containers/food/snacks/meat,
+ prob(3);/obj/item/weapon/reagent_containers/spray/cleaner,
+ prob(2);/obj/item/weapon/grenade/chem_grenade/cleaner,
+ prob(1);/obj/item/weapon/storage/box/monkeycubes,
+ prob(3);/obj/item/weapon/reagent_containers/spray/plantbgone,
+ prob(2);/obj/item/seeds/sunflowerseed,
+ prob(2);/obj/item/seeds/cornseed,
+ prob(2);/obj/item/seeds/berryseed,
+ prob(2);/obj/item/seeds/wheatseed,
+ prob(2);/obj/item/seeds/orangeseed,
+ prob(1);/obj/item/toy/figure/bartender)
+ playsound(T, 'sound/effects/phasein.ogg', 25, 1)
+ new path(T)
+ del(src)
\ No newline at end of file
diff --git a/code/game/objects/items/toys/toys_yw.dm b/code/game/objects/items/toys/toys_yw.dm
new file mode 100644
index 0000000000..b312d70341
--- /dev/null
+++ b/code/game/objects/items/toys/toys_yw.dm
@@ -0,0 +1,109 @@
+/obj/item/toy/plushie/teshari/strix
+ name = "Strix Hades"
+ desc = "This is Strix Hades the plushie Avali. Very soft, with a pompom on the tail. The toy is made well, as if alive. Looks like he is sleeping. Shhh!"
+ icon_state = "strixplush"
+ item_state = "strixplush"
+ slot_flags = SLOT_BACK | SLOT_HEAD
+ pokephrase = "Weh!"
+ icon = 'icons/obj/toy_yw.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
+ slot_back_str = 'icons/mob/toy_worn_yw.dmi',
+ slot_head_str = 'icons/mob/toy_worn_yw.dmi')
+
+ rename_plushie()
+ set name = "Name Plushie"
+ set category = "Object"
+ set desc = "Give your plushie a cute name!"
+ var/mob/M = usr
+ if(!M.mind)
+ return 0
+
+ if(src && !M.stat && in_range(M,src))
+ to_chat(M, "You cannot rename Strix Hades! You hug him anyway.")
+ return 1
+
+/obj/item/toy/plushie/teshari/eili
+ name = "Eili"
+ desc = "This is a plushie that resembles an Avali named Eili. The ammount of detail makes it almost look lifelike! Looks like she is sleeping. Shhh!"
+ icon_state = "jeans_eiliplush"
+ item_state = "jeans_eiliplush"
+ slot_flags = SLOT_BACK | SLOT_HEAD
+ pokephrase = "Weh!"
+ icon = 'icons/vore/custom_items_yw.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/vore/custom_items_left_hand_yw.dmi',
+ slot_r_hand_str = 'icons/vore/custom_items_right_hand_yw.dmi',
+ slot_back_str = 'icons/vore/custom_onmob_yw.dmi',
+ slot_head_str = 'icons/vore/custom_onmob_yw.dmi')
+
+
+ rename_plushie()
+ set name = "Name Plushie"
+ set category = "Object"
+ set desc = "Give your plushie a cute name!"
+ var/mob/M = usr
+ if(!M.mind)
+ return 0
+
+ if(src && !M.stat && in_range(M,src))
+ to_chat(M, "You cannot rename Eili! You hug her anyway.")
+ return 1
+
+/obj/item/toy/plushie/teshari/_yw
+ name = "lifelike teshari plush"
+ desc = "This is a plush teshari. Very soft. The ammount of detail makes it almost look lifelike! Looks like it is sleeping. Shhh!"
+ icon_state = "teshariplushie_brown"
+ item_state = "teshariplushie_brown"
+ pokephrase = "Rya!"
+ slot_flags = SLOT_BACK | SLOT_HEAD
+ icon = 'icons/obj/toy_yw.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
+ slot_back_str = 'icons/mob/toy_worn_yw.dmi',
+ slot_head_str = 'icons/mob/toy_worn_yw.dmi')
+
+/obj/item/toy/plushie/teshari/w_yw
+ name = "lifelike teshari plush"
+ desc = "This is a plush teshari. Very soft. The ammount of detail makes it almost look lifelike! Looks like it is sleeping. Shhh!"
+ icon_state = "teshariplushie_white"
+ item_state = "teshariplushie_white"
+ pokephrase = "Rya!"
+ slot_flags = SLOT_BACK | SLOT_HEAD
+ icon = 'icons/obj/toy_yw.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
+ slot_back_str = 'icons/mob/toy_worn_yw.dmi',
+ slot_head_str = 'icons/mob/toy_worn_yw.dmi')
+
+/obj/item/toy/plushie/teshari/b_yw
+ name = "lifelike teshari plush"
+ desc = "This is a plush teshari. Very soft. The ammount of detail makes it almost look lifelike! Looks like it is sleeping. Shhh!"
+ icon_state = "teshariplushie_black"
+ item_state = "teshariplushie_black"
+ pokephrase = "Rya!"
+ slot_flags = SLOT_BACK | SLOT_HEAD
+ icon = 'icons/obj/toy_yw.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
+ slot_back_str = 'icons/mob/toy_worn_yw.dmi',
+ slot_head_str = 'icons/mob/toy_worn_yw.dmi',
+ slot_ear_str = 'icons/mob/toy_worn_yw.dmi')
+
+/obj/item/toy/plushie/teshari/y_yw
+ name = "lifelike teshari plush"
+ desc = "This is a plush teshari. Very soft. The ammount of detail makes it almost look lifelike! Looks like it is sleeping. Shhh!"
+ icon_state = "teshariplushie_yellow"
+ item_state = "teshariplushie_yellow"
+ pokephrase = "Rya!"
+ slot_flags = SLOT_BACK | SLOT_HEAD
+ icon = 'icons/obj/toy_yw.dmi'
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
+ slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
+ slot_back_str = 'icons/mob/toy_worn_yw.dmi',
+ slot_head_str = 'icons/mob/toy_worn_yw.dmi')
diff --git a/code/game/objects/items/weapons/RMS_vr.dm b/code/game/objects/items/weapons/RMS_vr.dm
index b0a72144d4..634e3602da 100644
--- a/code/game/objects/items/weapons/RMS_vr.dm
+++ b/code/game/objects/items/weapons/RMS_vr.dm
@@ -168,22 +168,24 @@
10;new /obj/item/stack/material/snow,
5;new /obj/item/stack/material/phoron,
5;new /obj/item/stack/material/silver,
- 5;new /obj/item/stack/material/gold,
- 1;new /obj/item/stack/material/diamond)
+ 5;new /obj/item/stack/material/gold
+ //YW EDIT: 1;new /obj/item/stack/material/diamond
+ )
if(overcharge && emagged)
product = pick(1;new /obj/item/stack/rods,
5;new /obj/item/device/fbp_backup_cell,
5;new /obj/item/trash/rkibble,
10;new /obj/item/stack/tile/grass,
10;new /obj/item/stack/tile/carpet,
- 10;new /obj/item/weapon/reagent_containers/spray/waterflower,
- 10;new /obj/item/weapon/bikehorn,
- 10;new /obj/item/weapon/storage/backpack/clown,
- 10;new /obj/item/clothing/under/rank/clown,
- 10;new /obj/item/clothing/shoes/clown_shoes,
- 10;new /obj/item/clothing/mask/gas/clown_hat,
- 10;new /obj/item/device/pda/clown,
- 1;new /mob/living/simple_mob/vore/catgirl)
+ 10;new /obj/item/weapon/reagent_containers/spray/waterflower
+ //YW EDIT: 10;new /obj/item/weapon/bikehorn,
+ //YW EDIT: 10;new /obj/item/weapon/storage/backpack/clown,
+ //YW EDIT: 10;new /obj/item/clothing/under/rank/clown,
+ //YW EDIT: 10;new /obj/item/clothing/shoes/clown_shoes,
+ //YW EDIT: 10;new /obj/item/clothing/mask/gas/clown_hat,
+ //YW EDIT: 10;new /obj/item/device/pda/clown,
+ //YW EDIT: 1;new /mob/living/simple_mob/vore/catgirl
+ )
spark_system.start()
product.loc = get_turf(A)
diff --git a/code/game/objects/items/weapons/RPD_vr.dm b/code/game/objects/items/weapons/RPD_vr.dm
index b658db082c..d4650eb16a 100644
--- a/code/game/objects/items/weapons/RPD_vr.dm
+++ b/code/game/objects/items/weapons/RPD_vr.dm
@@ -31,7 +31,7 @@
var/category = ATMOS_CATEGORY
var/piping_layer = PIPING_LAYER_DEFAULT
var/obj/item/weapon/tool/wrench/tool
- var/datum/pipe_recipe/recipe // pipe recipie selected for display/construction
+ var/datum/pipe_recipe/recipe = null // pipe recipie selected for display/construction //YW edit, added = null
var/static/datum/pipe_recipe/first_atmos
var/static/datum/pipe_recipe/first_disposal
var/mode = BUILD_MODE | DESTROY_MODE | WRENCH_MODE
@@ -56,6 +56,8 @@
recipe = first_atmos
if(!first_disposal)
first_disposal = GLOB.disposal_pipe_recipes[GLOB.disposal_pipe_recipes[1]][1]
+ if(!recipe)
+ recipe = first_atmos
/obj/item/weapon/pipe_dispenser/Destroy()
qdel_null(spark_system)
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index 5d983e596a..b178ecc6dd 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -70,21 +70,25 @@ RSF
mode = 2
to_chat(user,"Changed dispensing mode to 'Container'.")
return
- if (mode == 2)
+ if(mode == 2)
mode = 3
- to_chat(user,"Changed dispensing mode to 'Paper'")
+ to_chat(user,"Changed dispensing mode to 'Metamorphic Glass: Pint'") //YW Changes begin
return
- if (mode == 3)
+ if(mode == 3)
mode = 4
- to_chat(user,"Changed dispensing mode to 'Pen'")
+ to_chat(user,"Changed dispensing mode to 'Paper'")
return
- if (mode == 4)
+ if(mode == 4)
mode = 5
- to_chat(user,"Changed dispensing mode to 'Dice Pack'")
+ to_chat(user,"Changed dispensing mode to 'Pen'")
return
- if (mode == 5)
+ if(mode == 5)
+ mode = 6
+ to_chat(user,"Changed dispensing mode to 'Dice Pack'")
+ return
+ if(mode == 6)
mode = 1
- to_chat(user,"Changed dispensing mode to 'Cigarette'")
+ to_chat(user,"Changed dispensing mode to 'Cigarette'") // YW Changes end
return
/obj/item/weapon/rsf/afterattack(atom/A, mob/user as mob, proximity)
@@ -114,12 +118,15 @@ RSF
product = new glasstype()
used_energy = 50
if(3)
+ product = new /obj/item/weapon/reagent_containers/food/drinks/metaglass() //YW Changes begin
+ used_energy = 50
+ if(4)
product = new /obj/item/weapon/paper()
used_energy = 10
- if(4)
+ if(5)
product = new /obj/item/weapon/pen()
used_energy = 50
- if(5)
+ if(6) //YW Changes end
product = new /obj/item/weapon/storage/pill_bottle/dice()
used_energy = 200
diff --git a/code/game/objects/items/weapons/circuitboards/circuitboards_yw.dm b/code/game/objects/items/weapons/circuitboards/circuitboards_yw.dm
new file mode 100644
index 0000000000..ed2d1c5da0
--- /dev/null
+++ b/code/game/objects/items/weapons/circuitboards/circuitboards_yw.dm
@@ -0,0 +1,5 @@
+/obj/item/weapon/circuitboard/geiger
+ name = T_BOARD("geiger counter")
+ build_path = /obj/item/device/geiger/wall
+ board_type = new /datum/frame/frame_types/geiger
+ matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/circuitboards/frame.dm b/code/game/objects/items/weapons/circuitboards/frame.dm
index e9c0ee728a..85f81b1058 100644
--- a/code/game/objects/items/weapons/circuitboards/frame.dm
+++ b/code/game/objects/items/weapons/circuitboards/frame.dm
@@ -172,7 +172,7 @@
/obj/item/weapon/circuitboard/teleporter_hub
name = T_BOARD("teleporter hub")
build_path = /obj/machinery/teleport/hub
- board_type = "teleporter_hub"
+ board_type = new /datum/frame/frame_types/machine //YWEdit makes buildable
// origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 4)
req_components = list(
/obj/item/weapon/stock_parts/scanning_module = 4,
@@ -182,7 +182,7 @@
/obj/item/weapon/circuitboard/teleporter_station
name = T_BOARD("teleporter station")
build_path = /obj/machinery/teleport/station
- board_type = "teleporter_station"
+ board_type = new /datum/frame/frame_types/machine //YWEdit makes buildable
// origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 3)
req_components = list(
/obj/item/weapon/stock_parts/console_screen = 1,
diff --git a/code/game/objects/items/weapons/circuitboards/frame_ch.dm b/code/game/objects/items/weapons/circuitboards/frame_ch.dm
new file mode 100644
index 0000000000..45df1c1e48
--- /dev/null
+++ b/code/game/objects/items/weapons/circuitboards/frame_ch.dm
@@ -0,0 +1,9 @@
+/obj/item/weapon/circuitboard/microwave/advanced
+ name = T_BOARD("deluxe microwave")
+ build_path = /obj/machinery/microwave/advanced
+ board_type = new /datum/frame/frame_types/microwave
+ matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+ req_components = list(
+ /obj/item/weapon/stock_parts/console_screen = 1,
+ /obj/item/weapon/stock_parts/motor = 1,
+ /obj/item/weapon/stock_parts/capacitor = 1)
diff --git a/code/game/objects/items/weapons/circuitboards/mecha_ch.dm b/code/game/objects/items/weapons/circuitboards/mecha_ch.dm
new file mode 100644
index 0000000000..b44e45869e
--- /dev/null
+++ b/code/game/objects/items/weapons/circuitboards/mecha_ch.dm
@@ -0,0 +1,21 @@
+#ifdef T_BOARD_CHMecha
+#error T_BOARD_CHMECHA already defined elsewhere, we can't use it.
+#endif
+#define T_BOARD_CHMECHA(name) "exosuit module circuit board (" + (name) + ")"
+//renaming CHmecha for Chomp mecha to allow for more to be made if needed.
+
+/obj/item/weapon/circuitboard/mecha/scarab
+ origin_tech = list(TECH_DATA = 4)
+
+/obj/item/weapon/circuitboard/mecha/scarab/peripherals
+ name = T_BOARD_CHMECHA("Scarab peripherals control")
+ icon_state = "mcontroller"
+
+/obj/item/weapon/circuitboard/mecha/scarab/targeting
+ name = T_BOARD_CHMECHA("Scarab weapon control and targeting")
+ icon_state = "mcontroller"
+ origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 4)
+
+/obj/item/weapon/circuitboard/mecha/scarab/main
+ name = T_BOARD_CHMECHA("Scarab central control")
+ icon_state = "mainboard"
diff --git a/code/game/objects/items/weapons/grenades/confetti_grenade_ch.dm b/code/game/objects/items/weapons/grenades/confetti_grenade_ch.dm
new file mode 100644
index 0000000000..3f0583ba66
--- /dev/null
+++ b/code/game/objects/items/weapons/grenades/confetti_grenade_ch.dm
@@ -0,0 +1,51 @@
+/obj/item/weapon/grenade/confetti
+ desc = "It is set to detonate in 2 seconds. These party grenades will make everyone jump with joy (or fright)!"
+ name = "grenatti"
+ icon = 'icons/obj/grenade.dmi'
+ icon_state = "grenade"
+ det_time = 20
+ item_state = "grenade"
+ slot_flags = SLOT_BELT
+ var/datum/effect/effect/system/confetti_spread
+ var/confetti_strength = 8
+
+/obj/item/weapon/grenade/confetti/New()
+ ..()
+ src.confetti_spread = new /datum/effect/effect/system/confetti_spread()
+ src.confetti_spread.attach(src)
+
+/obj/item/weapon/grenade/confetti/Destroy()
+ qdel(confetti_spread)
+ confetti_spread = null
+ return ..()
+
+/obj/item/weapon/grenade/confetti/detonate() //Find a good confetti firework or pop sound effect later
+ playsound(src.loc, 'sound/effects/snap.ogg', 50, 1, -3)
+ src.confetti_spread.set_up(10, 0, usr.loc)
+ spawn(0)
+ for(var/i = 1 to confetti_strength)
+ src.confetti_spread.start()
+ sleep(10)
+ qdel(src)
+
+ return
+
+/obj/item/weapon/grenade/confetti/party_ball //Intended to be used only with the confetti cannon.
+ name = "party ball"
+ desc = "Full of !!FUN!!"
+ icon = 'icons/obj/grenade_ch.dmi'
+ icon_state = "party_ball"
+ confetti_strength = 2
+ det_time = 1
+ throwforce = 0 //Confetti cannon is only fun to shoot at people if it deals no damage.
+
+/obj/item/weapon/grenade/confetti/party_ball/detonate() //Could condense this by making the sound a variable in the parent but I'm lazy.
+ playsound(src.loc, 'sound/effects/confetti_ball.ogg', 50, 1, -3)
+ src.confetti_spread.set_up(10, 0, usr.loc)
+ spawn(0)
+ for(var/i = 1 to confetti_strength)
+ src.confetti_spread.start()
+ sleep(10)
+ qdel(src)
+
+ return
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm b/code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm
new file mode 100644
index 0000000000..48f4e42a74
--- /dev/null
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm
@@ -0,0 +1,115 @@
+/obj/item/weapon/grenade/spawnergrenade/casino
+
+ desc = "It is set to detonate in 5 seconds. It will release a goose that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Goose)"
+ icon = 'icons/obj/grenade_ch.dmi'
+ icon_state = "casino"
+ item_state = "casino"
+ origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2)
+ spawner_type = /mob/living/simple_mob/animal/space/goose/domesticated
+
+
+// Detonate now just handles the two loops that query for people in lockers and people who can see it.
+/obj/item/weapon/grenade/spawnergrenade/casino/detonate()
+
+ if(spawner_type && deliveryamt)
+ var/turf/T = get_turf(src)
+ playsound(T, 'sound/effects/phasein.ogg', 100, 1)
+
+ for(var/i=1, i<=deliveryamt, i++)
+ var/atom/movable/x = new spawner_type(T)
+ if(prob(50))
+ for(var/j = 1, j <= rand(1, 3), j++)
+ step(x, pick(NORTH,SOUTH,EAST,WEST))
+ qdel(src)
+ return
+
+/obj/item/weapon/grenade/spawnergrenade/casino/goat
+ desc = "It is set to detonate in 5 seconds. It will release a goat that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Goat)"
+ spawner_type = /mob/living/simple_mob/animal/goat
+
+/obj/item/weapon/grenade/spawnergrenade/casino/armadillo
+ desc = "It is set to detonate in 5 seconds. It will release a armadillo that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Armadillo)"
+ spawner_type = /mob/living/simple_mob/animal/passive/armadillo
+
+/obj/item/weapon/grenade/spawnergrenade/casino/cat
+ desc = "It is set to detonate in 5 seconds. It will release a cat that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Cat)"
+ spawner_type = /mob/living/simple_mob/animal/passive/cat
+
+/obj/item/weapon/grenade/spawnergrenade/casino/chicken
+ desc = "It is set to detonate in 5 seconds. It will release a chicken that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Chicken)"
+ spawner_type = /mob/living/simple_mob/animal/passive/chicken
+
+/obj/item/weapon/grenade/spawnergrenade/casino/cow
+ desc = "It is set to detonate in 5 seconds. It will release a cow that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Cow)"
+ spawner_type = /mob/living/simple_mob/animal/passive/cow
+
+/obj/item/weapon/grenade/spawnergrenade/casino/corgi
+ desc = "It is set to detonate in 5 seconds. It will release a corgi that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Corgi)"
+ spawner_type = /mob/living/simple_mob/animal/passive/dog/corgi
+
+/obj/item/weapon/grenade/spawnergrenade/casino/fox
+ desc = "It is set to detonate in 5 seconds. It will release a fox that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Fox)"
+ spawner_type = /mob/living/simple_mob/animal/passive/fox
+
+/obj/item/weapon/grenade/spawnergrenade/casino/lizard
+ desc = "It is set to detonate in 5 seconds. It will release a lizard that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Lizard)"
+ spawner_type = /mob/living/simple_mob/animal/passive/lizard
+
+/obj/item/weapon/grenade/spawnergrenade/casino/penguin
+ desc = "It is set to detonate in 5 seconds. It will release a penguin that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Penguin)"
+ spawner_type = /mob/living/simple_mob/animal/passive/penguin
+
+/obj/item/weapon/grenade/spawnergrenade/casino/snake
+ desc = "It is set to detonate in 5 seconds. It will release a snake that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Snake)"
+ spawner_type = /mob/living/simple_mob/animal/passive/snake
+
+/obj/item/weapon/grenade/spawnergrenade/casino/yithian
+ desc = "It is set to detonate in 5 seconds. It will release a yithian that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Yithian)"
+ spawner_type = /mob/living/simple_mob/animal/passive/yithian
+
+/obj/item/weapon/grenade/spawnergrenade/casino/tindalos
+ desc = "It is set to detonate in 5 seconds. It will release a tindalos that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Tindalos)"
+ spawner_type = /mob/living/simple_mob/animal/passive/tindalos
+
+/obj/item/weapon/grenade/spawnergrenade/casino/fennec
+ desc = "It is set to detonate in 5 seconds. It will release a fennec that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Fennec)"
+ spawner_type = /mob/living/simple_mob/vore/fennec
+
+/obj/item/weapon/grenade/spawnergrenade/casino/redpanda
+ desc = "It is set to detonate in 5 seconds. It will release a red panda that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Red panda)"
+ spawner_type = /mob/living/simple_mob/vore/redpanda
+
+/obj/item/weapon/grenade/spawnergrenade/casino/horse
+ desc = "It is set to detonate in 5 seconds. It will release a horse that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Horse)"
+ spawner_type = /mob/living/simple_mob/vore/horse
+
+/obj/item/weapon/grenade/spawnergrenade/casino/otie
+ desc = "It is set to detonate in 5 seconds. It will release a otie that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Otie)"
+ spawner_type = /mob/living/simple_mob/otie/friendly
+
+/obj/item/weapon/grenade/spawnergrenade/casino/otie/chubby
+ desc = "It is set to detonate in 5 seconds. It will release a chonker otie that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Well feed Otie)"
+ spawner_type = /mob/living/simple_mob/otie/friendly/chubby
+
+/obj/item/weapon/grenade/spawnergrenade/casino/zorgoia
+ desc = "It is set to detonate in 5 seconds. It will release a zorgoia that has been won from the golden goose casino!"
+ name = "Casino Creature Container (Zorgoia)"
+ spawner_type = /mob/living/simple_mob/otie/zorgoia/friendly
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/id cards/CH_ids.dm b/code/game/objects/items/weapons/id cards/CH_ids.dm
new file mode 100644
index 0000000000..2d023bb626
--- /dev/null
+++ b/code/game/objects/items/weapons/id cards/CH_ids.dm
@@ -0,0 +1,26 @@
+/obj/item/weapon/card/id/casino
+ name = "casino employee id"
+ desc = "An ID card for an employee of the golden goose casino."
+ icon_state = "ch_casino"
+ item_state = "gold_id"
+
+ access = list(160)
+
+/obj/item/weapon/card/id/casino/booth
+ name = "casino booth employee id"
+ desc = "An ID card for an employee of the golden goose casino with extra access to prize booth."
+ access = list(160, 200)
+
+/obj/item/weapon/card/id/casino
+ name = "casino employee id"
+ desc = "An ID card for an employee of the golden goose casino."
+ icon_state = "ch_casino"
+ item_state = "gold_id"
+
+ access = list(160, 200, 201)
+
+/obj/item/weapon/card/id/casino/manager
+ name = "casino manager id"
+ desc = "An ID card for the manager of the golden goose casino."
+ icon_state = "ch_casino_manager"
+ access = list(160, 200, 201, 300)
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/id cards/YW_ids.dm b/code/game/objects/items/weapons/id cards/YW_ids.dm
new file mode 100644
index 0000000000..64f5500873
--- /dev/null
+++ b/code/game/objects/items/weapons/id cards/YW_ids.dm
@@ -0,0 +1,5 @@
+/obj/item/weapon/card/id/blueshield
+ assignment = "Blueshield Guard"
+ rank= "Blueshield Guard"
+ icon_state = "blueshield"
+ preserve_item = 0
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/lego.dm b/code/game/objects/items/weapons/lego.dm
new file mode 100644
index 0000000000..1c489651a5
--- /dev/null
+++ b/code/game/objects/items/weapons/lego.dm
@@ -0,0 +1,58 @@
+/obj/item/weapon/lego
+ name = "Lego of Doom"
+ throw_speed = 5
+ throw_range = 4
+ gender = PLURAL
+ icon = 'icons/obj/items_ch.dmi'
+ icon_state = "lego"
+ desc = "An absolutely horrifying mechanical trap, banned in most sectors across the universe. Placing one is considered a major war crime."
+ randpixel = 0
+ center_of_mass = null
+ throwforce = 0
+ w_class = ITEMSIZE_SMALL
+
+/obj/item/weapon/lego/Crossed(atom/movable/AM as mob|obj)
+ if(AM.is_incorporeal())
+ return
+ if(isliving(AM))
+ var/mob/living/L = AM
+ if(L.m_intent == "run")
+ L.visible_message(
+ "[L] steps on \the [src].",
+ "You step on \the [src], you poor bastard!",
+ "You hear the sound of immeasurable suffering!"
+ )
+ L.adjustHalLoss(100)
+ playsound(src, 'sound/misc/legodeath.ogg', 50, 1)
+ qdel(src)
+ ..()
+
+/obj/item/weapon/lego/gib
+ name = "Lego of Doom"
+ throw_speed = 5
+ throw_range = 4
+ gender = PLURAL
+ icon = 'icons/obj/items_ch.dmi'
+ icon_state = "lego"
+ desc = "An absolutely horrifying mechanical trap, banned in most sectors across the universe. Placing one is considered a major war crime."
+ randpixel = 0
+ center_of_mass = null
+ throwforce = 0
+ w_class = ITEMSIZE_SMALL
+
+/obj/item/weapon/lego/gib/Crossed(atom/movable/AM as mob|obj)
+ if(AM.is_incorporeal())
+ return
+ if(isliving(AM))
+ var/mob/living/L = AM
+ if(L.m_intent == "run")
+ L.visible_message(
+ "[L] steps on \the [src].",
+ "You step on \the [src], you poor bastard!",
+ "You hear the sound of immeasurable suffering!"
+ )
+ L.gib()
+ playsound(src, 'sound/misc/legodeath.ogg', 50, 1)
+ qdel(src)
+ ..()
+
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 07a868d432..b8252872e8 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -21,7 +21,7 @@
-
+