"
- dat+=" Return "
- if(6)
- dat+="ERROR: Could not submit Feed story to Network. "
- if(src.channel_name=="")
- dat+="�Invalid receiving channel name. "
- if(src.scanned_user=="Unknown")
- dat+="�Channel author unverified. "
- if(src.msg == "" || src.msg == "\[REDACTED\]")
- dat+="�Invalid message body. "
-
- dat+=" Return "
- if(7)
- dat+="ERROR: Could not submit Feed Channel to Network. "
- //var/list/existing_channels = list() //Let's get dem existing channels - OBSOLETE
- var/list/existing_authors = list()
- for(var/datum/feed_channel/FC in GLOB.news_network.network_channels)
- //existing_channels += FC.channel_name //OBSOLETE
- if(FC.author == "\[REDACTED\]")
- existing_authors += FC.backup_author
- else
- existing_authors += FC.author
- if(src.scanned_user in existing_authors)
- dat+="�There already exists a Feed channel under your name. "
- if(src.channel_name=="" || src.channel_name == "\[REDACTED\]")
- dat+="�Invalid channel name. "
- var/check = 0
- for(var/datum/feed_channel/FC in GLOB.news_network.network_channels)
- if(FC.channel_name == src.channel_name)
- check = 1
- break
- if(check)
- dat+="�Channel name already in use. "
- if(src.scanned_user=="Unknown")
- dat+="�Channel author unverified. "
- dat+=" Return "
- if(8)
- var/total_num=length(GLOB.news_network.network_channels)
- var/active_num=total_num
- var/message_num=0
- for(var/datum/feed_channel/FC in GLOB.news_network.network_channels)
- if(!FC.censored)
- message_num += length(FC.messages) //Dont forget, datum/feed_channel's var messages is a list of datum/feed_message
- else
- active_num--
- dat+="Network currently serves a total of [total_num] Feed channels, [active_num] of which are active, and a total of [message_num] Feed Stories." //TODO: CONTINUE
- dat+="
Liquid Paper remaining: [(src.paper_remaining) *100 ] cm^3"
- dat+="
Print Paper"
- dat+=" Cancel"
- if(9)
- dat+="[src.viewing_channel.channel_name]: \[created by: [src.viewing_channel.author]\]"
- if(src.viewing_channel.censored)
- dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Weyland-Yutani D-Notice. "
- dat+="No further feed story additions are allowed while the D-Notice is in effect.
"
- dat+="\[[MESSAGE.message_type] by [MESSAGE.author]\] "
- dat+=" Refresh"
- dat+=" Back"
- if(10)
- dat+="Weyland-Yutani Feed Censorship Tool "
- dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible. "
- dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it."
- dat+="Select Feed channel to get Stories from: "
- if(!length(GLOB.news_network.network_channels))
- dat+="No feed channels found active... "
- else
- for(var/datum/feed_channel/CHANNEL in GLOB.news_network.network_channels)
- dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : null] "
- dat+=" Cancel"
- if(11)
- dat+="Weyland-Yutani D-Notice Handler"
- dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's"
- dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed"
- dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time."
- if(!length(GLOB.news_network.network_channels))
- dat+="No feed channels found active... "
- else
- for(var/datum/feed_channel/CHANNEL in GLOB.news_network.network_channels)
- dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : null] "
-
- dat+=" Back"
- if(12)
- dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \] "
- dat+="[(src.viewing_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]"
-
-
- if(!length(src.viewing_channel.messages) )
- dat+="No feed messages found in channel... "
- else
- for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages)
- dat+="-[MESSAGE.body] \[[MESSAGE.message_type] by [MESSAGE.author]\] "
- dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")] "
- dat+=" Back"
- if(13)
- dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \] "
- dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel."
- if(src.viewing_channel.censored)
- dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Weyland-Yutani D-Notice. "
- dat+="No further feed story additions are allowed while the D-Notice is in effect.
"
- else
- if(!length(src.viewing_channel.messages) )
- dat+="No feed messages found in channel... "
- else
- for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages)
- dat+="-[MESSAGE.body] \[[MESSAGE.message_type] by [MESSAGE.author]\] "
-
- dat+=" Back"
- if(14)
- dat+="Wanted Issue Handler:"
- var/wanted_already = 0
- var/end_param = 1
- if(GLOB.news_network.wanted_issue)
- wanted_already = 1
- end_param = 2
-
- if(wanted_already)
- dat+=" A wanted issue is already in Feed Circulation. You can edit or cancel it below."
- dat+=""
- dat+="Criminal Name: [src.channel_name] "
- dat+="Description: [src.msg] "
- dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]"
- if(wanted_already)
- dat+="Wanted Issue created by: [GLOB.news_network.wanted_issue.backup_author] "
- else
- dat+="Wanted Issue will be created under prosecutor: [src.scanned_user] "
- dat+=" [(wanted_already) ? ("Edit Issue") : ("Submit")]"
- if(wanted_already)
- dat+=" Take down Issue"
- dat+=" Cancel"
- if(15)
- dat+="Wanted issue for [src.channel_name] is now in Network Circulation.
"
- if(1) // X channel pages inbetween.
- for(var/datum/feed_channel/NP in src.news_content)
- src.pages++ //Let's get it right again.
- var/datum/feed_channel/C = src.news_content[src.curr_page]
- dat+="[C.channel_name] \[created by: [C.author]\]
"
- if(C.censored)
- dat+="This channel was deemed dangerous to the general welfare of the station and therefore marked with a D-Notice. Its contents were not transferred to the newspaper at the time of printing."
- else
- if(!length(C.messages))
- dat+="No Feed stories stem from this channel..."
- else
- dat+="
"
- var/i = 0
- for(var/datum/feed_message/MESSAGE in C.messages)
- i++
- dat+="-[MESSAGE.body] "
- if(MESSAGE.img)
- user << browse_rsc(MESSAGE.img, "tmp_photo[i].png")
- dat+=" "
- dat+="\[[MESSAGE.message_type] by [MESSAGE.author]\]
"
- dat+="
"
- if(scribble_page==curr_page)
- dat+=" There is a small scribble near the end of this page... It reads: \"[src.scribble]\""
- dat+= "
"
- dat+="Criminal name: [important_message.author] "
- dat+="Description: [important_message.body] "
- dat+="Photo:: "
- if(important_message.img)
- user << browse_rsc(important_message.img, "tmp_photow.png")
- dat+=" "
- else
- dat+="None"
- else
- dat+="Apart from some uninteresting Classified ads, there's nothing on this page..."
- if(scribble_page==curr_page)
- dat+=" There is a small scribble near the end of this page... It reads: \"[src.scribble]\""
- dat+= "
"
- else
- dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com"
-
- dat+="
[src.curr_page+1]
"
- human_user << browse(dat, "window=newspaper_main;size=300x400")
- onclose(human_user, "newspaper_main")
-
-
-/obj/item/newspaper/Topic(href, href_list)
- var/mob/living/U = usr
- ..()
- if ((src in U.contents) || ( istype(loc, /turf) && in_range(src, U) ))
- U.set_interaction(src)
- if(href_list["next_page"])
- if(curr_page==src.pages+1)
- return //Don't need that at all, but anyway.
- if(src.curr_page == src.pages) //We're at the middle, get to the end
- src.screen = 2
- else
- if(curr_page == 0) //We're at the start, get to the middle
- src.screen=1
- src.curr_page++
- playsound(src.loc, "pageturn", 15, 1)
-
- else if(href_list["prev_page"])
- if(curr_page == 0)
- return
- if(curr_page == 1)
- src.screen = 0
-
- else
- if(curr_page == src.pages+1) //we're at the end, let's go back to the middle.
- src.screen = 1
- src.curr_page--
- playsound(src.loc, "pageturn", 15, 1)
-
- if (istype(src.loc, /mob))
- src.attack_self(src.loc)
-
-
-/obj/item/newspaper/attackby(obj/item/W as obj, mob/user as mob)
- if(HAS_TRAIT(W, TRAIT_TOOL_PEN))
- if(src.scribble_page == src.curr_page)
- to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?")
- else
- var/s = strip_html( input(user, "Write something", "Newspaper", "") )
- s = strip_html(s)
- if (!s)
- return
- if (!in_range(src, usr) && src.loc != usr)
- return
- src.scribble_page = src.curr_page
- src.scribble = s
- src.attack_self(user)
- return
-
-
-////////////////////////////////////helper procs
-
-
-/obj/structure/machinery/newscaster/proc/scan_user(mob/living/user as mob)
- if(istype(user,/mob/living/carbon/human)) //User is a human
- var/mob/living/carbon/human/human_user = user
- if(human_user.wear_id) //Newscaster scans you
- if(istype(human_user.wear_id, /obj/item/card/id) )
- var/obj/item/card/id/ID = human_user.wear_id
- src.scanned_user ="[ID.registered_name] ([ID.assignment])"
- else
- src.scanned_user ="Unknown"
- else
- src.scanned_user ="Unknown"
- else
- var/mob/living/silicon/ai_user = user
- src.scanned_user = "[ai_user.name] ([ai_user.job])"
-
-
-/obj/structure/machinery/newscaster/proc/print_paper()
- var/obj/item/newspaper/NEWSPAPER = new /obj/item/newspaper
- for(var/datum/feed_channel/FC in GLOB.news_network.network_channels)
- NEWSPAPER.news_content += FC
- if(GLOB.news_network.wanted_issue)
- NEWSPAPER.important_message = GLOB.news_network.wanted_issue
- NEWSPAPER.forceMove(get_turf(src))
- src.paper_remaining--
- return
-
-//Removed for now so these aren't even checked every tick. Left this here in-case Agouri needs it later.
-///obj/structure/machinery/newscaster/process() //Was thinking of doing the icon update through process, but multiple iterations per second does not
-// return //bode well with a newscaster network of 10+ machines. Let's just return it, as it's added in the machines list.
-
-/obj/structure/machinery/newscaster/proc/newsAlert(channel) //This isn't Agouri's work, for it is ugly and vile.
- var/turf/T = get_turf(src) //Who the fuck uses spawn(600) anyway, jesus christ
- if(channel)
- for(var/mob/O in hearers(GLOB.world_view_size-1, T))
- O.show_message(SPAN_NEWSCASTER("[src.name] beeps, \"Breaking news from [channel]!\""), SHOW_MESSAGE_AUDIBLE)
- src.alert = 1
- src.update_icon()
- spawn(30 SECONDS)
- src.alert = 0
- src.update_icon()
- playsound(src.loc, 'sound/machines/twobeep.ogg', 25, 1)
- else
- for(var/mob/O in hearers(GLOB.world_view_size-1, T))
- O.show_message(SPAN_NEWSCASTER("[src.name] beeps, \"Attention! Wanted issue distributed!\""), SHOW_MESSAGE_AUDIBLE)
- playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 25, 1)
- return
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index e87bb56da489..d86a5c0e30d0 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -8,14 +8,23 @@
use_power = USE_POWER_IDLE
idle_power_usage = 50
active_power_usage = 50
+ can_buckle = TRUE
+ /// the borg inside
var/mob/living/occupant = null
- var/max_internal_charge = 15000 // Two charged borgs in a row with default cell
- var/current_internal_charge = 15000 // Starts charged, to prevent power surges on round start
- var/charging_cap_active = 25000 // Active Cap - When cyborg is inside
- var/charging_cap_passive = 2500 // Passive Cap - Recharging internal capacitor when no cyborg is inside
- var/icon_update_tick = 0 // Used to update icon only once every 10 ticks
+ /// Two charged borgs in a row with default cell
+ var/max_internal_charge = 15000
+ /// Starts charged, to prevent power surges on round start
+ var/current_internal_charge = 15000
+ /// Active Cap - When cyborg is inside
+ var/charging_cap_active = 25000
+ /// Passive Cap - Recharging internal capacitor when no cyborg is inside
+ var/charging_cap_passive = 2500
+ /// Used to update icon only once every 10 ticks
+ var/icon_update_tick = 0
+ /// implants to not remove
var/known_implants = list(/obj/item/implant/chem, /obj/item/implant/death_alarm, /obj/item/implant/loyalty, /obj/item/implant/tracking, /obj/item/implant/neurostim)
- can_buckle = TRUE
+ ///stun time upon exiting, if at all
+ var/exit_stun = 2
/obj/structure/machinery/recharge_station/Initialize(mapload, ...)
@@ -183,18 +192,23 @@
/obj/structure/machinery/recharge_station/proc/go_out()
- if(!( src.occupant ))
+ if(!occupant)
return
- //for(var/obj/O in src)
- // O.forceMove(src.loc)
- if (src.occupant.client)
- src.occupant.client.eye = src.occupant.client.mob
- src.occupant.client.perspective = MOB_PERSPECTIVE
- src.occupant.forceMove(loc)
- src.occupant = null
+ var/mob/living/synth = occupant
+
+ if(synth.client)
+ synth.client.eye = synth.client.mob
+ synth.client.perspective = MOB_PERSPECTIVE
+
+ synth.forceMove(loc)
+ if(exit_stun)
+ synth.Stun(exit_stun) //Action delay when going out of a closet
+ if(synth.mobility_flags & MOBILITY_MOVE)
+ synth.visible_message(SPAN_WARNING("[synth] suddenly gets out of [src]!"), SPAN_WARNING("You get out of [src] and get your bearings!"))
+
+ occupant = null
update_icon()
update_use_power(USE_POWER_IDLE)
- return
/obj/structure/machinery/recharge_station/verb/move_eject()
set category = "Object"
diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm
index c97a28932262..459eddc4a544 100644
--- a/code/game/machinery/telecomms/presets.dm
+++ b/code/game/machinery/telecomms/presets.dm
@@ -155,7 +155,7 @@
toggle_state(user) // just flip dat switch
/obj/structure/machinery/telecomms/relay/preset/tower/all
- freq_listening = list()
+ freq_listening = list(UNIVERSAL_FREQ)
/obj/structure/machinery/telecomms/relay/preset/tower/faction
name = "UPP telecommunications relay"
@@ -267,8 +267,8 @@ GLOBAL_LIST_EMPTY(all_static_telecomms_towers)
to_chat(user, SPAN_WARNING("\The [src.name] needs repairs to have frequencies added to its software!"))
return
var/choice = tgui_input_list(user, "What do you wish to do?", "TC-3T comms tower", list("Wipe communication frequencies", "Add your faction's frequencies"))
- if(choice == "Wipe frequencies")
- freq_listening = null
+ if(choice == "Wipe communication frequencies")
+ freq_listening.Cut()
to_chat(user, SPAN_NOTICE("You wipe the preexisting frequencies from \the [src]."))
return
else if(choice == "Add your faction's frequencies")
@@ -277,12 +277,16 @@ GLOBAL_LIST_EMPTY(all_static_telecomms_towers)
switch(user.faction)
if(FACTION_SURVIVOR)
freq_listening |= COLONY_FREQ
+ if(FACTION_MARINE in user.faction_group) //FORECON survivors
+ freq_listening |= SOF_FREQ
if(FACTION_CLF)
freq_listening |= CLF_FREQS
if(FACTION_UPP)
freq_listening |= UPP_FREQS
if(FACTION_WY,FACTION_PMC)
freq_listening |= PMC_FREQS
+ if(FACTION_TWE)
+ freq_listening |= RMC_FREQ
if(FACTION_YAUTJA)
to_chat(user, SPAN_WARNING("You decide to leave the human machine alone."))
return
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index 8b8b12dfd170..7652ac601f56 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -26,7 +26,7 @@ GLOBAL_LIST_EMPTY_TYPED(telecomms_list, /obj/structure/machinery/telecomms)
var/traffic = 0 // value increases as traffic increases
var/netspeed = 5 // how much traffic to lose per tick (50 gigabytes/second * netspeed)
var/list/autolinkers = list() // list of text/number values to link with
- var/list/freq_listening = list() // list of frequencies to tune into: if none, will listen to all
+ var/list/freq_listening = list(UNIVERSAL_FREQ) // list of frequencies to tune into: if universal frequency is included, will listen to all
var/machinetype = 0 // just a hacky way of preventing alike machines from pairing
var/delay = 10 // how many process() ticks to delay per heat
var/long_range_link = 0 // Can you link it across Z levels or on the otherside of the map? (Relay & Hub)
diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm
index 2ba1ac089826..4f825030d627 100644
--- a/code/game/machinery/vending/cm_vending.dm
+++ b/code/game/machinery/vending/cm_vending.dm
@@ -900,7 +900,7 @@ GLOBAL_LIST_EMPTY(vending_products)
for(var/list/vendspec in listed_products)
var/multiplier = vendspec[2]
if(multiplier > 0)
- var/awarded = round(vendspec[2] * scale) // Starting amount
+ var/awarded = round(vendspec[2] * scale, 1) // Starting amount
//Record the multiplier and how many have actually been given out
dynamic_stock_multipliers[vendspec] = list(vendspec[2], awarded)
vendspec[2] = awarded // Override starting amount
@@ -920,8 +920,8 @@ GLOBAL_LIST_EMPTY(vending_products)
var/list/metadata = dynamic_stock_multipliers[vendspec]
var/multiplier = metadata[1] // How much do we multiply scales by
var/previous_max_amount = metadata[2] // How many we already handed out at old scale
- var/projected_max_amount = round(new_scale * multiplier) // How much we would have had total now in total
- var/amount_to_add = round(projected_max_amount - previous_max_amount) // Rounding just in case
+ var/projected_max_amount = round(new_scale * multiplier, 1) // How much we would have had total now in total
+ var/amount_to_add = round(projected_max_amount - previous_max_amount, 1) // Rounding just in case
if(amount_to_add > 0)
metadata[2] += amount_to_add
vendspec[2] += amount_to_add
diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm
index 0a7b85cae7e2..92ba81af4d94 100644
--- a/code/game/machinery/vending/vending_types.dm
+++ b/code/game/machinery/vending/vending_types.dm
@@ -200,25 +200,30 @@
/obj/item/storage/fancy/cigarettes/arcturian_ace = 15,
/obj/item/storage/fancy/cigarettes/emeraldgreen = 15,
/obj/item/storage/fancy/cigarettes/wypacket = 15,
+ /obj/item/storage/fancy/cigarettes/trading_card = 15,
/obj/item/storage/fancy/cigarettes/lady_finger = 15,
/obj/item/storage/fancy/cigarettes/blackpack = 10,
/obj/item/storage/fancy/cigar/tarbacks = 5,
+
/obj/item/storage/box/matches = 10,
/obj/item/tool/lighter/random = 20,
/obj/item/tool/lighter/zippo = 5,
+
)
prices = list(
/obj/item/storage/fancy/cigarettes/kpack = 40,
/obj/item/storage/fancy/cigarettes/arcturian_ace = 25,
/obj/item/storage/fancy/cigarettes/emeraldgreen = 35,
- /obj/item/storage/fancy/cigarettes/wypacket = 35,
+ /obj/item/storage/fancy/cigarettes/wypacket = 30,
+ /obj/item/storage/fancy/cigarettes/trading_card = 35,
/obj/item/storage/fancy/cigarettes/lady_finger = 30,
/obj/item/storage/fancy/cigarettes/blackpack = 75,
/obj/item/storage/fancy/cigar/tarbacks = 35,
/obj/item/storage/box/matches = 1,
/obj/item/tool/lighter/random = 10,
/obj/item/tool/lighter/zippo = 25,
+
)
/obj/structure/machinery/vending/security
@@ -407,7 +412,7 @@
name = "\improper Rec-Vend"
desc = "Contains Weyland-Yutani approved recreational items, like Walkmans and Cards."
icon_state = "walkman"
- product_ads = "The only place to have fun in the entire Marine Corps!;You'll find no better music from here to Arcturus!;Instructions not included with decks of cards!;No volume controls - you don't need them!;All products responsibly made by people having just as much fun as you will be!"
+ product_ads = "The only place to have fun in the entire Marine Corps!;You'll find no better music from here to Arcturus!;Instructions not included with decks of cards!;No volume controls - you don't need them!;All products responsibly made by people having just as much fun as you will be!;Say goodbye to the lucky strike military tobacco monopoly, with the new Weyland Yutani Military Trading Card Gold cigarette pack!"
vend_delay = 0.5 SECONDS
idle_power_usage = 200
@@ -436,6 +441,10 @@
/obj/item/tool/pen/blue = 10,
/obj/item/tool/pen/red = 10,
/obj/item/tool/pen/fountain = 3,
+ /obj/item/storage/fancy/cigarettes/trading_card = 20,
+ /obj/item/storage/fancy/trading_card = 20,
+ /obj/item/toy/trading_card = 50,
+
)
contraband = list(/obj/item/toy/sword = 2)
@@ -463,6 +472,10 @@
/obj/item/tool/pen/blue = 2,
/obj/item/tool/pen/red = 2,
/obj/item/tool/pen/fountain = 30,
+ /obj/item/storage/fancy/cigarettes/trading_card = 30,
+ /obj/item/storage/fancy/trading_card = 20,
+ /obj/item/toy/trading_card = 5,
+
)
product_type = VENDOR_PRODUCT_TYPE_RECREATIONAL
diff --git a/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm b/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm
new file mode 100644
index 000000000000..b0894ca2a5a2
--- /dev/null
+++ b/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm
@@ -0,0 +1,51 @@
+//------------ CC CLOTHING VENDOR---------------
+
+GLOBAL_LIST_INIT(cm_vending_clothing_combat_correspondent, list(
+ list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
+ list("Essential Reporter's Set", 0, /obj/effect/essentials_set/cc, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+ list("Portable Press Fax Machine", 0, /obj/item/device/fax_backpack, CIVILIAN_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED),
+ list("Press Broadcasting Camera", 0, /obj/item/device/camera/broadcasting, CIVILIAN_CAN_BUY_UTILITY, VENDOR_ITEM_RECOMMENDED),
+ list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
+
+ list("UNIFORM (CHOOSE 1)", 0, null, null, null),
+ list("Black Uniform", 0, /obj/item/clothing/under/marine/reporter/black, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Orange Uniform", 0, /obj/item/clothing/under/marine/reporter/orange, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Red Uniform", 0, /obj/item/clothing/under/marine/reporter/red, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+
+ list("ARMOR (CHOOSE 1)", 0, null, null, null),
+ list("Combat Correspondent's Armor", 0, /obj/item/clothing/suit/storage/marine/light/reporter, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
+ list("Blue Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/reporter/blue, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Black Vest", 0, /obj/item/clothing/suit/storage/hazardvest/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Black Coat", 0, /obj/item/clothing/suit/storage/jacket/marine/reporter/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Green Coat", 0, /obj/item/clothing/suit/storage/jacket/marine/reporter/green, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+
+ list("HELMET (CHOOSE 1)", 0, null, null, null),
+ list("Combat Correspondent's Helmet", 0, /obj/item/clothing/head/helmet/marine/reporter, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED),
+ list("Combat Correspondent's Cap", 0, /obj/item/clothing/head/cmcap/reporter, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+ list("Fedora", 0, /obj/item/clothing/head/fedora, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+
+ list("REFILLS", 0, null, null, null),
+ list("Camera", 10, /obj/item/device/camera, null, VENDOR_ITEM_REGULAR),
+ list("Camera Film", 5, /obj/item/device/camera_film, null, VENDOR_ITEM_REGULAR),
+ list("Toner", 5, /obj/item/device/toner, null, VENDOR_ITEM_REGULAR),
+ list("Regulation Tapes", 15, /obj/item/storage/box/tapes, null, VENDOR_ITEM_REGULAR),
+ list("Paper Bin", 10, /obj/item/paper_bin/uscm, null, VENDOR_ITEM_REGULAR),
+ ))
+
+/obj/structure/machinery/cm_vending/clothing/combat_correspondent
+ name = "\improper ColMarTech Combat Correspondent Equipment Rack"
+ desc = "An automated rack hooked up to a colossal storage of Reporter standard-issue equipment."
+ req_access = list(ACCESS_PRESS)
+ vendor_role = list(JOB_COMBAT_REPORTER)
+
+/obj/structure/machinery/cm_vending/clothing/combat_correspondent/get_listed_products(mob/user)
+ return GLOB.cm_vending_clothing_combat_correspondent
+
+/obj/effect/essentials_set/cc
+ spawned_gear_list = list(
+ /obj/item/device/flashlight,
+ /obj/item/tool/pen,
+ /obj/item/device/binoculars,
+ /obj/item/notepad,
+ /obj/item/device/taperecorder,
+ )
diff --git a/code/game/machinery/vending/vendor_types/crew/engineering.dm b/code/game/machinery/vending/vendor_types/crew/engineering.dm
new file mode 100644
index 000000000000..9d5a809e52f7
--- /dev/null
+++ b/code/game/machinery/vending/vendor_types/crew/engineering.dm
@@ -0,0 +1,74 @@
+//------------ MT CLOTHING VENDOR---------------
+
+GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list(
+ list("MAINTENANCE SET (MANDATORY)", 0, null, null, null),
+ list("Essential Maintenance Set", 0, /obj/effect/essentials_set/maintenance, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+
+ list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
+ list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
+ list("Headset", 0, /obj/item/device/radio/headset/almayer/mt, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
+ list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
+ list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY),
+
+ list("HELMET (CHOOSE 1)", 0, null, null, null),
+ list("Beret, Engineering", 0, /obj/item/clothing/head/beret/eng, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+ list("White Hardhat", 0, /obj/item/clothing/head/hardhat/white, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+ list("Orange Hardhat", 0, /obj/item/clothing/head/hardhat/orange, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+ list("Blue Hardhat", 0, /obj/item/clothing/head/hardhat/dblue, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+ list("Welding Helmet", 0, /obj/item/clothing/head/welding, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
+
+ list("SUIT (CHOOSE 1)", 0, null, null, null),
+ list("Black Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Blue Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/blue, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Orange Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("Yellow Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/yellow, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+
+ list("BACKPACK (CHOOSE 1)", 0, null, null, null),
+ list("Technician Backpack", 0, /obj/item/storage/backpack/marine/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
+ list("Technician Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
+ list("Technician Welderpack", 0, /obj/item/storage/backpack/marine/engineerpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
+ list("Technician Welder-Satchel", 0, /obj/item/storage/backpack/marine/engineerpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED),
+ list("Technician Welder Chestrig", 0, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
+
+ list("BELT (CHOOSE 1)", 0, null, null, null),
+ list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY),
+
+ list("POUCHES (CHOOSE 2)", 0, null, null, null),
+ list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
+ list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+ list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
+
+ list("MASK (CHOOSE 1)", 0, null, null, null),
+ list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+ list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+ list("Rebreather", 0, /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
+
+ list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
+ list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
+ list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+ list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+ ))
+
+/obj/structure/machinery/cm_vending/clothing/maintenance_technician
+ name = "\improper ColMarTech Maintenance Technician Equipment Rack"
+ desc = "An automated rack hooked up to a colossal storage of Maintenance Technician standard-issue equipment."
+ req_access = list(ACCESS_MARINE_ENGINEERING)
+ vendor_role = list(JOB_MAINT_TECH)
+
+/obj/structure/machinery/cm_vending/clothing/maintenance_technician/get_listed_products(mob/user)
+ return GLOB.cm_vending_clothing_maintenance_technician
+
+/obj/effect/essentials_set/maintenance
+ spawned_gear_list = list(
+ /obj/item/device/lightreplacer,
+ /obj/item/device/demo_scanner,
+ /obj/item/storage/bag/trash,
+ /obj/item/storage/toolbox/mechanical,
+ /obj/item/device/flashlight,
+ )
diff --git a/code/game/machinery/vending/vendor_types/crew/medical.dm b/code/game/machinery/vending/vendor_types/crew/medical.dm
index 29838f3b57d0..af519a908ee6 100644
--- a/code/game/machinery/vending/vendor_types/crew/medical.dm
+++ b/code/game/machinery/vending/vendor_types/crew/medical.dm
@@ -43,6 +43,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_doctor, list(
list("UNIFORM (CHOOSE 1)", 0, null, null, null),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("SUIT (CHOOSE 1)", 0, null, null, null),
@@ -106,7 +107,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_nurse, list(
list("Prescription Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health/prescription, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY),
list("UNIFORM (CHOOSE 1)", 0, null, null, null),
- list("Medical Nurse Scrubs", 0, /obj/item/clothing/under/rank/medical/nurse, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
+ list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
@@ -178,6 +179,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_researcher, list(
list("Researcher Uniform", 0, /obj/item/clothing/under/marine/officer/researcher, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("SUIT (CHOOSE 1)", 0, null, null, null),
diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm
index 96e7bf058924..a5d3cbe85b01 100644
--- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm
+++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm
@@ -162,6 +162,9 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list(
list("M41A Pulse Rifle MK2", 0, /obj/item/storage/box/guncase/m41a, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
list("M240 Incinerator Unit", 0, /obj/item/storage/box/guncase/flamer, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
+ list("Spare Equipment", 0, null, null, null),
+ list("Technician's Headset", 15, /obj/item/device/radio/headset/almayer/mt, null, VENDOR_ITEM_REGULAR),
+
))
@@ -228,6 +231,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list(
list("Doctor Uniform", 0, /obj/item/clothing/under/rank/medical, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
+ list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("SUIT (CHOOSE 1)", 0, null, null, null),
@@ -287,6 +291,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list(
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
+
+ list("Spare Equipment", 0, null, null, null),
+ list("Doctor's Headset", 15, /obj/item/device/radio/headset/almayer/doc, null, VENDOR_ITEM_REGULAR),
+ list("Researcher's Headset", 15, /obj/item/device/radio/headset/almayer/research, null, VENDOR_ITEM_REGULAR),
))
diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
index 2395d572bad7..c3fa77be3798 100644
--- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm
+++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm
@@ -183,6 +183,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("USCM UNIFORMS", 0, null, null, null),
list("Medical Scrubs, Blue", 12, /obj/item/clothing/under/rank/medical/blue, null, VENDOR_ITEM_REGULAR),
+ list("Medical Scrubs, Light Blue", 0, /obj/item/clothing/under/rank/medical/lightblue, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Green", 12, /obj/item/clothing/under/rank/medical/green, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/rank/medical/purple, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, White", 12, /obj/item/clothing/under/rank/medical, null, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm
index 1a9ec9156e20..9ce8390095e8 100644
--- a/code/game/machinery/vending/vendor_types/requisitions.dm
+++ b/code/game/machinery/vending/vendor_types/requisitions.dm
@@ -409,6 +409,7 @@
list("Engineering Radio Encryption Key", 5, /obj/item/device/encryptionkey/engi, VENDOR_ITEM_REGULAR),
list("Intel Radio Encryption Key", 5, /obj/item/device/encryptionkey/intel, VENDOR_ITEM_REGULAR),
list("JTAC Radio Encryption Key", 5, /obj/item/device/encryptionkey/jtac, VENDOR_ITEM_REGULAR),
+ list("Medical Radio Encryption Key", 5, /obj/item/device/encryptionkey/med, VENDOR_ITEM_REGULAR),
list("Sentry Gun Network Encryption Key", 8, /obj/item/device/encryptionkey/sentry_laptop, VENDOR_ITEM_REGULAR),
list("Marine Radio Headset", 5, /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR),
list("Supply Radio Encryption Key", 5, /obj/item/device/encryptionkey/req, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
index 6d015c203bd7..95864404f4e8 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm
@@ -36,16 +36,22 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list(
list("M20 Mine Box (x4 mines)", 18, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR),
list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR),
- list("AMMUNITION", 0, null, null, null),
+ list("PRIMARY AMMUNITION", 0, null, null, null),
list("M4RA AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR),
list("M39 AP Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR),
list("M39 Extended Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR),
list("M41A AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR),
list("M41A Extended Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR),
+ list("SIDEARM AMMUNITION", 0, null, null, null),
+ list("M44 Heavy Speed Loader (.44)", 6, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 HP Magazine", 3, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 AP Magazine", 3, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR),
+ list("VP78 Magazine", 3, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
+
list("ARMORS", 0, null, null, null),
list("M3 B12 Pattern Marine Armor", 24, /obj/item/clothing/suit/storage/marine/medium/leader, null, VENDOR_ITEM_REGULAR),
- list("M4 Pattern Armor", 30, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR),
+ list("M4 Pattern Armor", 16, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR),
list("RESTRICTED FIREARMS", 0, null, null, null),
list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm
index 6c7cbf2db740..0039d5b03250 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm
@@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list(
list("Basic Engineering Supplies", 0, /obj/item/storage/box/kit/engineering_supply_kit, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR),
list("ARMORS", 0, null, null, null),
- list("M4 Pattern Armor", 30, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR),
+ list("M4 Pattern Armor", 16, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR),
list("CLOTHING ITEMS", 0, null, null, null),
list("Machete Scabbard (Full)", 4, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR),
@@ -79,12 +79,20 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list(
list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR),
list("Roller Bed", 2, /obj/item/roller, null, VENDOR_ITEM_REGULAR),
- list("SPECIAL AMMUNITION", 0, null, null, null),
+ list("PRIMARY AMMUNITION", 0, null, null, null),
list("M4RA AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR),
list("M39 AP Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR),
list("M39 Extended Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR),
list("M41A AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR),
list("M41A Extended Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR),
+
+ list("SIDEARM AMMUNITION", 0, null, null, null),
+ list("M44 Heavy Speed Loader (.44)", 6, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 HP Magazine", 3, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 AP Magazine", 3, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR),
+ list("VP78 Magazine", 3, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
+
+ list("SPECIAL AMMUNITION", 0, null, null, null),
list("M240 Incinerator Tank (Napthal)", 3, /obj/item/ammo_magazine/flamer_tank, null, VENDOR_ITEM_REGULAR),
list("M240 Incinerator Tank (B-Gel)", 3, /obj/item/ammo_magazine/flamer_tank/gellied, null, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
index 6b4954ee5e92..b29b528ded13 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm
@@ -58,16 +58,22 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list(
list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR),
list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR),
- list("AMMUNITION", 0, null, null, null),
+ list("PRIMARY AMMUNITION", 0, null, null, null),
list("M4RA AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR),
list("M39 AP Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR),
list("M39 Extended Magazine (10x20mm)", 6, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR),
list("M41A AP Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR),
list("M41A Extended Magazine (10x24mm)", 6, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR),
+ list("SIDEARM AMMUNITION", 0, null, null, null),
+ list("M44 Heavy Speed Loader (.44)", 6, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 HP Magazine", 3, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 AP Magazine", 3, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR),
+ list("VP78 Magazine", 3, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
+
list("ARMORS", 0, null, null, null),
- list("M3 B12 Pattern Marine Armor", 28, /obj/item/clothing/suit/storage/marine/medium/leader, null, VENDOR_ITEM_REGULAR),
- list("M4 Pattern Armor", 28, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR),
+ list("M3 B12 Pattern Marine Armor", 24, /obj/item/clothing/suit/storage/marine/medium/leader, null, VENDOR_ITEM_REGULAR),
+ list("M4 Pattern Armor", 16, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR),
list("RESTRICTED FIREARMS", 0, null, null, null),
list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
index 27c041312765..2736de3a981d 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
@@ -130,6 +130,7 @@
list("Technician Backpack", round(scale * 15), /obj/item/storage/backpack/marine/tech, VENDOR_ITEM_REGULAR),
list("Medical Backpack", round(scale * 15), /obj/item/storage/backpack/marine/medic, VENDOR_ITEM_REGULAR),
list("USCM Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR),
+ list("USCM Chestrig", round(scale * 15), /obj/item/storage/backpack/marine/satchel/chestrig, VENDOR_ITEM_REGULAR),
list("USCM Technical Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel/tech, VENDOR_ITEM_REGULAR),
list("USCM Technical Chestrig", round(scale * 15), /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, VENDOR_ITEM_REGULAR),
list("Medical Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel/medic, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm
index 15661cc4b661..0b980fc31960 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm
@@ -67,23 +67,28 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list(
list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 15, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR),
list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR),
- list("AMMUNITION", 0, null, null, null),
+ list("PRIMARY AMMUNITION", 0, null, null, null),
list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR),
list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR),
list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR),
list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR),
list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR),
+
+ list("SIDEARM AMMUNITION", 0, null, null, null),
list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 HP Magazine", 5, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 AP Magazine", 5, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR),
+ list("VP78 Magazine", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
list("ARMORS", 0, null, null, null),
list("M3 B12 Pattern Marine Armor", 30, /obj/item/clothing/suit/storage/marine/medium/leader, null, VENDOR_ITEM_REGULAR),
- list("M4 Pattern Armor", 30, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR),
+ list("M4 Pattern Armor", 20, /obj/item/clothing/suit/storage/marine/medium/rto, null, VENDOR_ITEM_REGULAR),
list("CLOTHING ITEMS", 0, null, null, null),
list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR),
list("Brown Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_REGULAR),
list("Black Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_REGULAR),
- list("Drop Pouch", 15, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR),
+ list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 15, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR),
list("Machete Scabbard (Full)", 15, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR),
list("Machete Pouch (Full)", 15, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm
index 04061370168d..8c64e48f0f84 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm
@@ -20,6 +20,16 @@ GLOBAL_LIST_INIT(cm_vending_gear_smartgun, list(
list("M74 AGM-Hornet Airburst Packet (x3 airburst grenades", 20, /obj/item/storage/box/packet/hornet, null, VENDOR_ITEM_REGULAR),
list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR),
+ list("SIDEARM AMMUNITION", 0, null, null, null),
+ list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 HP Magazine", 5, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 AP Magazine", 5, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR),
+ list("VP78 Magazine", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
+
+ list("RESTRICTED FIREARMS", 0, null, null, null),
+ list("VP78 Pistol", 15, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR),
+ list("SU-6 Smart Pistol", 15, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR),
+
list("CLOTHING ITEMS", 0, null, null, null),
list("Machete Scabbard (Full)", 6, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR),
list("Fuel Tank Strap Pouch", 5, /obj/item/storage/pouch/flamertank, null, VENDOR_ITEM_REGULAR),
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm
index d9ba7ee97c26..a013ddb15212 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm
@@ -1,17 +1,6 @@
//------------GEAR VENDOR---------------
GLOBAL_LIST_INIT(cm_vending_gear_tl, list(
-
- list("AMMUNITION", 0, null, null, null),
- list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR),
- list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR),
- list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR),
- list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR),
- list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR),
- list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR),
- list("M4A3 HP Magazine", 5, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR),
- list("M4A3 AP Magazine", 5, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR),
-
list("EXPLOSIVES", 0, null, null, null),
list("M40 HEDP High Explosive Packet (x3 grenades)", 18, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
list("M40 HIDP Incendiary Packet (x3 grenades)", 18, /obj/item/storage/box/packet/incendiary, null, VENDOR_ITEM_REGULAR),
@@ -24,6 +13,19 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list(
list("M20 Mine Box (x4 mines)", 20, /obj/item/storage/box/explosive_mines, null, VENDOR_ITEM_REGULAR),
list("M40 MFHS Metal Foam Grenade", 5, /obj/item/explosive/grenade/metal_foam, null, VENDOR_ITEM_REGULAR),
+ list("PRIMARY AMMUNITION", 0, null, null, null),
+ list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR),
+ list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap , null, VENDOR_ITEM_REGULAR),
+ list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended , null, VENDOR_ITEM_REGULAR),
+ list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap , null, VENDOR_ITEM_REGULAR),
+ list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended , null, VENDOR_ITEM_REGULAR),
+
+ list("SIDEARM AMMUNITION", 0, null, null, null),
+ list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 HP Magazine", 5, /obj/item/ammo_magazine/pistol/hp, null, VENDOR_ITEM_REGULAR),
+ list("M4A3 AP Magazine", 5, /obj/item/ammo_magazine/pistol/ap, null, VENDOR_ITEM_REGULAR),
+ list("VP78 Magazine", 5, /obj/item/ammo_magazine/pistol/vp78, null, VENDOR_ITEM_REGULAR),
+
list("RESTRICTED FIREARMS", 0, null, null, null),
list("VP78 Pistol", 10, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR),
list("SU-6 Smart Pistol", 15, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR),
diff --git a/code/game/objects/effects/elevator.dm b/code/game/objects/effects/elevator.dm
index 443652a7f7a7..f3b6da2e442a 100644
--- a/code/game/objects/effects/elevator.dm
+++ b/code/game/objects/effects/elevator.dm
@@ -1,6 +1,6 @@
-/obj/effect/elevator/supply
- name = "\improper empty space"
- desc = "There seems to be an awful lot of machinery down below"
+/obj/effect/elevator
+ name = "\proper empty space"
+ desc = "There seems to be an awful lot of machinery down below..."
icon = 'icons/effects/160x160.dmi'
icon_state = "supply_elevator_lowered"
unacidable = TRUE
@@ -8,17 +8,25 @@
layer = ABOVE_TURF_LAYER
appearance_flags = KEEP_TOGETHER
-/obj/effect/elevator/supply/ex_act(severity)
+/obj/effect/elevator/ex_act(severity)
return
-/obj/effect/elevator/supply/Destroy(force)
+/obj/effect/elevator/Destroy(force)
if(!force)
return QDEL_HINT_LETMELIVE
return ..()
-/obj/effect/elevator/supply/visible_message() //Prevents message spam with empty elevator shaft - "The empty space falls into the depths!"
+// Don't move with the elevator.
+/obj/effect/elevator/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock)
+ return
+/obj/effect/elevator/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+ return
+/obj/effect/elevator/lateShuttleMove(turf/oldT, list/movement_force, move_dir)
return
/obj/effect/elevator/animation_overlay
blend_mode = BLEND_INSET_OVERLAY
appearance_flags = KEEP_TOGETHER
+
+/obj/effect/elevator/vehicle
+ icon_state = "vehicle_elevator_lowered"
diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm
index a7afb80ef080..bf3b952edcf5 100644
--- a/code/game/objects/effects/landmarks/landmarks.dm
+++ b/code/game/objects/effects/landmarks/landmarks.dm
@@ -90,9 +90,11 @@
return
GLOB.nightmare_landmarks[insert_tag] = get_turf(src)
/obj/effect/landmark/nightmare/Destroy()
- if(insert_tag && autoremove \
- && GLOB.nightmare_landmarks[insert_tag] == get_turf(src))
- GLOB.nightmare_landmarks.Remove(insert_tag)
+ if(insert_tag)
+ var/turf/turf = get_turf(src)
+ if(autoremove && GLOB.nightmare_landmarks[insert_tag] == turf)
+ GLOB.nightmare_landmarks.Remove(insert_tag)
+ GLOB.nightmare_landmark_tags_removed += insert_tag
return ..()
/obj/effect/landmark/ert_spawns/distress
diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm
index 39c7dbffa6ee..803d73151aeb 100644
--- a/code/game/objects/effects/landmarks/survivor_spawner.dm
+++ b/code/game/objects/effects/landmarks/survivor_spawner.dm
@@ -35,13 +35,27 @@
intro_text = list("
You are a survivor of a crash landing!
",\
"You are NOT aware of the xenomorph threat.",\
"Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.")
- story_text = "You are a soldier of Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under USCM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rose up and noticed that one of your limbs is at a weird angle, broken. You looked at other survivors, also limping and trying to fix their broken bones."
+ story_text = "You are a soldier fighting for the Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under USCM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rise up and notice that one of your limbs is badly bruised. You looked at other survivors, also limping and trying to tend to their wounds, luckily, none of you were seriously hurt."
roundstart_damage_min = 3
roundstart_damage_max = 10
roundstart_damage_times = 2
spawn_priority = SPAWN_PRIORITY_HIGH
+/obj/effect/landmark/survivor_spawner/lv624_crashed_clf_leader
+ hostile = TRUE
+ equipment = /datum/equipment_preset/clf/leader
+ synth_equipment = /datum/equipment_preset/clf/synth
+ intro_text = list("
You are a survivor of a crash landing!
",\
+ "You are NOT aware of the xenomorph threat.",\
+ "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.")
+ story_text = "You are the leader of a squad fighting for the Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under USCM control. Ready and willing to save poor colonists from parasitic tyrants and under your orders, you and your team small boarded a small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of your pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rise up and notice that one of your limbs is badly bruised. You looked up at the few remaining survivors of your squad, all limping and trying to tend to their wounds, luckily, none of your men were seriously hurt, and all seem to be responsive to your orders."
+ roundstart_damage_min = 2
+ roundstart_damage_max = 10
+ roundstart_damage_times = 2
+
+ spawn_priority = SPAWN_PRIORITY_VERY_HIGH
+
/obj/effect/landmark/survivor_spawner/lv624_crashed_clf_engineer
hostile = TRUE
equipment = /datum/equipment_preset/clf/engineer
@@ -49,7 +63,7 @@
intro_text = list("
You are a survivor of a crash landing!
",\
"You are NOT aware of the xenomorph threat.",\
"Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.")
- story_text = "You are a soldier of Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under USCM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rose up and noticed that one of your limbs is at a weird angle, broken. You looked at other survivors, also limping and trying to fix their broken bones."
+ story_text = "You are an engineer fighting for the Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under USCM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rise up and notice that one of your limbs is badly bruised. You looked at other survivors, also limping and trying to tend to their wounds, luckily, none of you were seriously hurt."
roundstart_damage_min = 3
roundstart_damage_max = 10
roundstart_damage_times = 2
@@ -63,13 +77,35 @@
intro_text = list("
You are a survivor of a crash landing!
",\
"You are NOT aware of the xenomorph threat.",\
"Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.")
- story_text = "You are a soldier of Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under USCM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rose up and noticed that one of your limbs is at a weird angle, broken. You looked at other survivors, also limping and trying to fix their broken bones."
+ story_text = "You are a doctor fighting for the Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under USCM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rise up and notice that one of your limbs is badly bruised. You looked at other survivors, also limping and trying to tend to their wounds, luckily, none of you were seriously hurt."
roundstart_damage_min = 3
roundstart_damage_max = 10
roundstart_damage_times = 2
spawn_priority = SPAWN_PRIORITY_VERY_HIGH
+//Weyland-Yutani Survivors//
+
+/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_cl
+ equipment = /datum/equipment_preset/survivor/wy/executive
+ synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth
+ intro_text = list("
You are the last alive Executive of Lazarus Landing!
",\
+ "You are aware of the xenomorph threat.",\
+ "Your primary objective is to survive the outbreak.")
+ story_text = "You are a Corporate Liaison stationed on LV-624 from Weyland-Yutani. You were tipped off about some very peculiar looking eggs recovered from the alien temple North-East of the colony. Being the smart Executive the Company hired you to be, you decided to prepare your office for the worst when the first 'facehugger' was born in the vats of the Research Dome. Turned out, you were right, everyone who called you crazy and called these the new 'synthetics' is now dead, you along with your Corporate Security detail are the only survivors due to your paranoia. The xenomorph onslaught was relentless, a fuel tank was shot by one of the Officers, leading to the destruction of a part of the dome, along with alot of the defences being melted. You must survive and find a way to contact Weyland-Yutani."
+
+ spawn_priority = SPAWN_PRIORITY_VERY_HIGH
+
+/obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon
+ equipment = /datum/equipment_preset/survivor/goon
+ synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth
+ intro_text = list("
You are a Corporate Security Officer!
",\
+ "You are aware of the xenomorph threat.",\
+ "Your primary objective is to survive the outbreak.")
+ story_text = "You are a Corporate Security Officer stationed on LV-624 from Weyland-Yutani. Suddenly one day you were pulled aside by the Corporate Liaison and told to bring supplies from both Engineering and the Marshals Offices to their office, and fast. You began fortifying the Corporate Dome and was told by the Executive that something big will ravage the entire colony, excluding you. Turns out, the Liaison was right, these so called 'xenomorphs' broke containment from the Research Dome and began destroying the entire colony. Once they came for the Dome and tried to kill all of you, you barely managed to hold them off even after losing one Officer and alot of the defences. The Liaison said they will soon find a way to contact Weyland-Yutani and to remain steadfast until rescue arrives."
+
+ spawn_priority = SPAWN_PRIORITY_HIGH
+
/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc
equipment = /datum/equipment_preset/survivor/pmc
synth_equipment = /datum/equipment_preset/synth/survivor/pmc
@@ -115,13 +151,75 @@
intro_text = list("
You are a survivor of a crash landing!
",\
"You are NOT aware of the xenomorph threat.",\
"Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.")
- story_text = "You are an Assistant Manager from Weyland-Yutani. You were being escorted onboard a PMC ship to Solaris Ridge. On the way, the ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, the pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. The shipcrew lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You must get up and find a way to contact Weyland-Yutani."
+ story_text = "You are an Assistant Manager from Weyland-Yutani. You were being escorted onboard a PMC ship to Solaris Ridge. On the way, the ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, the pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your PMC escorts lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You must get up and find a way to contact Weyland-Yutani."
roundstart_damage_min = 3
roundstart_damage_max = 10
roundstart_damage_times = 2
spawn_priority = SPAWN_PRIORITY_VERY_HIGH
+/obj/effect/landmark/survivor_spawner/shivas_panic_room_cl
+ equipment = /datum/equipment_preset/survivor/wy/asstmanager
+ synth_equipment = /datum/equipment_preset/synth/survivor/wy/corporate_synth
+ intro_text = list("
You are the last alive Senior Administrator on the Colony!
",\
+ "You are aware of the xenomorph threat.",\
+ "Your primary objective is to survive the outbreak.")
+ story_text = "You are the Assistant Operations Manager stationed on 'Ifrit' by Weyland-Yutani. This whole outbreak has been a giant mess, you and all other Company personnel ran to the Operations Panic Room, until you heard shooting outside and closed the shutters. You are running low on food, water and ammunition for the weapons you one-day said were 'useless' and a waste of Company dollars. You remember that Administrator Stahl sent out a distress beacon to any ship in range, hoping to get picked up by the Company, he ran to the Spaceport. You have not seen him since. In their attempts at trying to breach in, the so called 'xenomorphs' have tried attacking the shutters, but to no avail. They will soon try again. You must survive and find a way to contact Weyland-Yutani."
+
+ spawn_priority = SPAWN_PRIORITY_VERY_HIGH
+
+/obj/effect/landmark/survivor_spawner/shivas_panic_room_doc
+ equipment = /datum/equipment_preset/survivor/doctor
+ synth_equipment = /datum/equipment_preset/synth/survivor/emt_synth
+ intro_text = list("
You are a Medical Doctor on the Colony!
",\
+ "You are aware of the xenomorph threat.",\
+ "Your primary objective is to survive the outbreak.")
+ story_text = "You are a Doctor working on 'Ifrit' for Weyland-Yutani. This whole outbreak has been a giant mess, you and all other Company personnel ran to the Operations Panic Room, until you heard shooting outside and closed the shutters. You are running low on food, water and ammunition for the weapons. You remember that the xenomorphs have a sort of implanter which latches on to your face and then... something bursts out of your chest, through the rib cage. You had plenty of those cases at the Medical Bay. In their attempts at trying to breach in, the so called 'xenomorphs' have tried attacking the shutters, but to no avail. They will soon try again. You must survive and find a way to contact Weyland-Yutani."
+
+ spawn_priority = SPAWN_PRIORITY_HIGH
+
+/obj/effect/landmark/survivor_spawner/shivas_panic_room_sci
+ equipment = /datum/equipment_preset/survivor/scientist
+ synth_equipment = /datum/equipment_preset/synth/survivor/scientist_synth
+ intro_text = list("
You are a Weyland-Yutani Scientist on the Colony!
",\
+ "You are aware of the xenomorph threat.",\
+ "Your primary objective is to survive the outbreak.")
+ story_text = "You are a Scientist working on 'Ifrit' for Weyland-Yutani. This whole outbreak has been a giant mess, you and all other Company personnel ran to the Operations Panic Room, until you heard shooting outside and closed the shutters. You are running low on food, water and ammunition for the weapons. You remember that the XX-121 species, codenamed that by Research Director Clarke, have a variety of different species, what you can assume a 'leader' of some sort and that their acid is deadly should it come in contact with you or the shutters. You ran far from the labs and have not seen some your coworkers since. In their attempts at trying to breach in, these so called 'xenomorphs' have tried attacking the shutters, but to no avail. They will soon try again. You must survive and find a way to contact Weyland-Yutani."
+
+ spawn_priority = SPAWN_PRIORITY_HIGH
+
+/obj/effect/landmark/survivor_spawner/shivas_panic_room_civ
+ equipment = /datum/equipment_preset/survivor/civilian
+ synth_equipment = /datum/equipment_preset/synth/survivor/chef_synth
+ intro_text = list("
You are a worker on the Colony!
",\
+ "You are aware of the xenomorph threat.",\
+ "Your primary objective is to survive the outbreak.")
+ story_text = "You are a civilian working on 'Ifrit' for Weyland-Yutani. This whole outbreak has been a giant mess, you and all other Company personnel ran to the Operations Panic Room, until you heard shooting outside and closed the shutters. You are running low on food, water and ammunition for the weapons. You remember hearing the alarms blaring and decided to run with a couple others to the Panic Room, hoping to be safe from the threat until rescue arrives. Now you wait along with others for their second attack on the Panic Room. In their first attempt at trying to breach in, the so called 'xenomorphs' have tried attacking the shutters, but to no avail. They will soon try again. You must survive and find a way to contact Weyland-Yutani."
+
+ spawn_priority = SPAWN_PRIORITY_MEDIUM
+
+//CMB Survivors//
+
+/obj/effect/landmark/survivor_spawner/fiorina_armory_cmb
+ equipment = /datum/equipment_preset/survivor/colonial_marshal
+ synth_equipment = /datum/equipment_preset/synth/survivor/cmb_synth
+ intro_text = list("
You are a CMB Deputy!
",\
+ "You are aware of the 'alien' threat.",\
+ "Your primary objective is to survive the infestation.")
+ story_text = "You are a Deputy of the Office of the Colonial Marshals. Your dispatcher received a distress signal from the infamous Fiorina Maximum Penitentiary. You figured it was just another typical case of the prison dealing with a riot their understaffed security force couldn't handle, with more and more of its personnel getting dispatched elsewhere in the galaxy. This wasn't the first time OCM officers were called in to assist, but unfortunately for you, this time it also wasn't the 'minor riot' you expected it to be. Loaded up with only beanbags and finding nobody to greet you on the LZ after being dropped off, you and the rest of your team had gone towards the armory to speak to the Quartermaster, but only found corpses of both prisoners and security littered around on the way. Worried about armed prisoners, your team was in the process of switching to lethals in the armory when some sort of huge alien jumped out from the shadows and snatched Jerry away while he was off praying. The thing dragged him off too fast to catch and his screams faded away down the halls, poor bastard. Now, you'll need to decide whether to look for more clues about what the hell happened here, hunt whatever's out there, or hold a position and hope someone else will respond to the distress signal before it's too late..."
+
+ spawn_priority = SPAWN_PRIORITY_VERY_HIGH
+
+/obj/effect/landmark/survivor_spawner/fiorina_armory_riot_control
+ equipment = /datum/equipment_preset/survivor/colonial_marshal/fiorina
+ synth_equipment = /datum/equipment_preset/synth/survivor/cmb_synth
+ intro_text = list("
You are a United Americas Riot Control Officer!
",\
+ "You are aware of the 'alien' threat.",\
+ "Your primary objective is to survive the infestation.")
+ story_text = "You are a United Americas Riot Control Officer. Your dispatcher received a request from the local OCM Outpost, requesting some men to intervene assist a Deputy with handling a riot at Fiorina. The prison was an understaffed mess so you weren't too surprised they had sent out a distress signal, calling you in to do their jobs yet again. Unfortunately for you, this time it also wasn't the 'minor riot' you expected it to be. Loaded up with only beanbags and finding nobody to greet you on the LZ after being dropped off, you and the rest of your team had gone towards the armory to speak to the Quartermaster, but only found corpses of both prisoners and security littered around on the way. Worried about armed prisoners, your team was in the process of switching to lethals in the armory when some sort of huge alien jumped out from the shadows and snatched Jerry away while he was off praying. The thing dragged him off too fast to catch and his screams faded away down the halls, poor bastard. Now, you'll need to decide whether to look for more clues about what the hell happened here, hunt whatever's out there, or hold a position and hope someone else will respond to the distress signal before it's too late..."
+
+ spawn_priority = SPAWN_PRIORITY_HIGH
+
//Military Survivors//
/obj/effect/landmark/survivor_spawner/lv522_forecon_tech
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 69eababfe000..6a5d31010ef1 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -22,9 +22,9 @@
/obj/effect/spider/attackby(obj/item/W, mob/user)
if(LAZYLEN(W.attack_verb))
- visible_message(SPAN_DANGER("\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? "by [user]." : ".")]"))
+ visible_message(SPAN_DANGER("[src] has been [pick(W.attack_verb)] with [W][(user ? " by [user]." : ".")]"))
else
- visible_message(SPAN_DANGER("\The [src] have been attacked with \the [W][(user ? "by [user]." : ".")]"))
+ visible_message(SPAN_DANGER("[src] has been attacked with [W][(user ? " by [user]." : ".")]"))
var/damage = W.force / 4
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 9addf3346a39..31158d055327 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -67,7 +67,7 @@
/// The name registered_name on the card
var/registered_name = "Unknown"
- var/registered_ref = null
+ var/datum/weakref/registered_ref = null
var/registered_gid = 0
flags_equip_slot = SLOT_ID
diff --git a/code/game/objects/items/devices/dummy_tablet.dm b/code/game/objects/items/devices/dummy_tablet.dm
index d1036ebfa93b..3172c84c8b01 100644
--- a/code/game/objects/items/devices/dummy_tablet.dm
+++ b/code/game/objects/items/devices/dummy_tablet.dm
@@ -1,6 +1,6 @@
/obj/item/device/professor_dummy_tablet
icon = 'icons/obj/items/devices.dmi'
- name = "Professor DUMMY tablet"
+ name = "\improper Professor DUMMY tablet"
desc = "A Professor DUMMY Control Tablet."
suffix = "\[3\]"
icon_state = "Cotablet"
@@ -21,23 +21,35 @@
*/
/obj/item/device/professor_dummy_tablet/proc/is_adjacent_to_dummy(mob/user)
if (get_dist(linked_dummy, user) > 1)
- to_chat(user, "You are too far away to use the tablet.")
+ to_chat(user, SPAN_WARNING("You are too far away from the dummy to use its tablet."))
return FALSE
-
return TRUE
-/obj/item/device/professor_dummy_tablet/proc/link_mob(mob/living/carbon/human/H)
- linked_dummy = H
+/obj/item/device/professor_dummy_tablet/proc/link_dummy(mob/living/carbon/human/dummy_to_link)
+ if(dummy_to_link)
+ linked_dummy = dummy_to_link
+ RegisterSignal(linked_dummy, COMSIG_PARENT_QDELETING, PROC_REF(self_delete))
+ return
+
+/obj/item/device/professor_dummy_tablet/proc/self_delete()
+ SIGNAL_HANDLER
+
+ UnregisterSignal(linked_dummy, COMSIG_PARENT_QDELETING)
+ linked_dummy = null
+ if(isstorage(loc))
+ var/obj/item/storage/storage = loc
+ storage.remove_from_storage(src, get_turf(src))
+ qdel(src)
/obj/item/device/professor_dummy_tablet/attack_self(mob/user as mob)
..()
interact(user)
/obj/item/device/professor_dummy_tablet/interact(mob/user as mob)
- if (isnull(linked_dummy))
+ if(isnull(linked_dummy))
return
- if (!is_adjacent_to_dummy(user))
+ if(!is_adjacent_to_dummy(user))
return
user.set_interaction(src)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 58e86998f39a..2af343c8de26 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -238,7 +238,7 @@
desc = "A red USCM issued flare. There are instructions on the side, it reads 'pull cord, make light'."
w_class = SIZE_SMALL
light_power = 2
- light_range = 7
+ light_range = 5
icon_state = "flare"
item_state = "flare"
actions = list() //just pull it manually, neckbeard.
diff --git a/code/game/objects/items/devices/helmet_visors.dm b/code/game/objects/items/devices/helmet_visors.dm
index 05d75a9fefd6..4d1b38491791 100644
--- a/code/game/objects/items/devices/helmet_visors.dm
+++ b/code/game/objects/items/devices/helmet_visors.dm
@@ -6,7 +6,7 @@
w_class = SIZE_TINY
///The type of HUD our visor shows
- var/hud_type = MOB_HUD_FACTION_USCM
+ var/hud_type = MOB_HUD_FACTION_MARINE
///The sound when toggling on the visor
var/toggle_on_sound = 'sound/handling/hud_on.ogg'
@@ -302,7 +302,7 @@
/obj/item/device/helmet_visor/night_vision/marine_raider
name = "advanced night vision optic"
desc = "An insertable visor HUD into a standard USCM helmet. This type gives a form of night vision and is standard issue in special forces units."
- hud_type = list(MOB_HUD_FACTION_USCM, MOB_HUD_MEDICAL_ADVANCED)
+ hud_type = list(MOB_HUD_FACTION_MARINE, MOB_HUD_MEDICAL_ADVANCED)
helmet_overlay = "nvg_sight_right_raider"
power_use = 0
visor_glows = FALSE
diff --git a/code/game/objects/items/devices/motion_detector.dm b/code/game/objects/items/devices/motion_detector.dm
index c26db692f082..7db2825deedf 100644
--- a/code/game/objects/items/devices/motion_detector.dm
+++ b/code/game/objects/items/devices/motion_detector.dm
@@ -191,6 +191,14 @@
if(ishuman(A.loc))
return A.loc
+/obj/item/device/motiondetector/xm4
+
+///Forces the blue blip to appear around the detected mob
+/obj/item/device/motiondetector/xm4/get_user()
+ var/atom/holder = loc
+ if(ishuman(holder.loc))
+ return holder.loc
+
/obj/item/device/motiondetector/proc/apply_debuff(mob/M)
return
diff --git a/code/game/objects/items/devices/portable_vendor.dm b/code/game/objects/items/devices/portable_vendor.dm
index da399192b713..8e7c8df1d9a7 100644
--- a/code/game/objects/items/devices/portable_vendor.dm
+++ b/code/game/objects/items/devices/portable_vendor.dm
@@ -267,8 +267,11 @@
req_role = JOB_CORPORATE_LIAISON
listed_products = list(
list("INCENTIVES", 0, null, null, null),
+ list("Corporate Security Bodyguard", 50, /obj/item/handheld_distress_beacon/bodyguard, "white", "A beacon which sends the Corporate Security Division an encoded message informing them of your request for a Corporate Security Bodyguard."),
+ list("Corporate Lawyer Team", 50, /obj/item/handheld_distress_beacon/lawyer, "white", "A beacon which sends the Corporate Affairs Division an encoded message informing them of your request for a Corporate Lawyer, required when a contract signee breaks one of their clauses."),
list("Neurostimulator Implant", 30, /obj/item/implanter/neurostim, "white", "Implant which regulates nociception and sensory function. Benefits include pain reduction, improved balance, and improved resistance to overstimulation and disorientation. To encourage compliance, negative stimulus is applied if the implant hears a (non-radio) spoken codephrase. Implant will be degraded by the body's immune system over time, and thus malfunction with gradually increasing frequency. Personal use not recommended."),
list("Ultrazine Injector", 25, /obj/item/reagent_container/hypospray/autoinjector/ultrazine/liaison, "white", "Highly-addictive stimulant. Enhances short-term physical performance, particularly running speed. Effects last approximately 10 minutes per injection. More than two injections at a time will result in overdose. Withdrawal causes extreme discomfort and hallucinations. Long-term use results in halluciations and organ failure. Conditional distribution secures subject compliance. Not for personal use."),
+ list("Cyanide Pill", 20, /obj/item/reagent_container/pill/cyanide, "white", "A cyanide pill, also known as a suicide pill. For the easy way out."),
list("Ceramic Plate", 10, /obj/item/trash/ceramic_plate, "white", "A ceramic plate, useful in a variety of situations."),
list("Cash", 5, /obj/item/spacecash/c1000/counterfeit, "white", "$1000 USD, unmarked bills"),
list("WY Encryption Key", 5, /obj/item/device/encryptionkey/WY, "white", "WY private comms encryption key, for conducting private business."),
@@ -282,6 +285,7 @@
list("Sake", 5, /obj/item/reagent_container/food/drinks/bottle/sake, "white", "Weyland-Yutani Sake, for a proper business dinner."),
list("Beer", 5, /obj/item/reagent_container/food/drinks/cans/aspen, "white", "Weyland-Yutani Aspen Beer, for a more casual night."),
list("Drinking Glass", 1, /obj/item/reagent_container/food/drinks/drinkingglass, "white", "A Drinking Glass, because you have class."),
+ list("Weyland-Yutani Coffee Mug", 1, /obj/item/reagent_container/food/drinks/coffeecup/wy, "white", "A Weyland-Yutani coffee mug, for any Marines who want a Company souvenir."),
list("STATIONARY", 0, null, null, null),
list("WY pen, black", 1, /obj/item/tool/pen/clicky, "white", "A WY pen, for writing formally on the go."),
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 7b987752011c..00f0ad16220c 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -35,7 +35,7 @@
var/headset_hud_on = FALSE
var/locate_setting = TRACKER_SL
var/misc_tracking = FALSE
- var/hud_type = MOB_HUD_FACTION_USCM
+ var/hud_type = MOB_HUD_FACTION_MARINE
var/default_freq
///The type of minimap this headset is added to
@@ -233,7 +233,7 @@
), PROC_REF(turn_on))
wearer = user
RegisterSignal(user, COMSIG_MOB_STAT_SET_ALIVE, PROC_REF(update_minimap_icon))
- RegisterSignal(user, COMSIG_MOB_LOGIN, PROC_REF(add_hud_tracker))
+ RegisterSignal(user, COMSIG_MOB_LOGGED_IN, PROC_REF(add_hud_tracker))
RegisterSignal(user, COMSIG_MOB_DEATH, PROC_REF(update_minimap_icon))
RegisterSignal(user, COMSIG_HUMAN_SET_UNDEFIBBABLE, PROC_REF(update_minimap_icon))
if(headset_hud_on)
@@ -250,7 +250,7 @@
UnregisterSignal(user, list(
COMSIG_LIVING_REJUVENATED,
COMSIG_HUMAN_REVIVED,
- COMSIG_MOB_LOGIN,
+ COMSIG_MOB_LOGGED_IN,
COMSIG_MOB_DEATH,
COMSIG_HUMAN_SET_UNDEFIBBABLE,
COMSIG_MOB_STAT_SET_ALIVE
@@ -341,7 +341,7 @@
var/z_level = turf_gotten.z
if(wearer.assigned_equipment_preset.always_minimap_visible == TRUE || wearer.stat == DEAD) //We show to all marines if we have this flag, separated by faction
- if(hud_type == MOB_HUD_FACTION_USCM)
+ if(hud_type == MOB_HUD_FACTION_MARINE)
marker_flags = MINIMAP_FLAG_USCM
else if(hud_type == MOB_HUD_FACTION_UPP)
marker_flags = MINIMAP_FLAG_UPP
@@ -1013,7 +1013,7 @@
icon_state = "cmb_headset"
initial_keys = list(/obj/item/device/encryptionkey/cmb)
has_hud = TRUE
- hud_type = MOB_HUD_FACTION_USCM
+ hud_type = MOB_HUD_FACTION_MARINE
/obj/item/device/radio/headset/distress/CMB/limited
name = "\improper Damaged CMB Earpiece"
@@ -1058,7 +1058,7 @@
initial_keys = list(/obj/item/device/encryptionkey/soc/forecon)
volume = RADIO_VOLUME_QUIET
has_hud = TRUE
- hud_type = MOB_HUD_FACTION_USCM
+ hud_type = MOB_HUD_FACTION_MARINE
/obj/item/device/radio/headset/almayer/mcom/vc
name = "marine vehicle crew radio headset"
diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm
index 1d2986f79e55..58cbca9a5ab3 100644
--- a/code/game/objects/items/explosives/plastic.dm
+++ b/code/game/objects/items/explosives/plastic.dm
@@ -24,6 +24,9 @@
var/list/breachable = list(/obj/structure/window, /turf/closed, /obj/structure/machinery/door, /obj/structure/mineral_door , /obj/structure/cargo_container)
antigrief_protection = TRUE //Should it be checked by antigrief?
+ var/req_skill = SKILL_ENGINEER
+ var/req_skill_level = SKILL_ENGINEER_TRAINED
+
/obj/item/explosive/plastic/Destroy()
disarm()
return ..()
@@ -65,7 +68,7 @@
if(user.action_busy || !flag)
return
- if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED))
+ if(!skillcheck(user, req_skill, req_skill_level))
to_chat(user, SPAN_WARNING("You don't seem to know how to use [src]..."))
return
if(!can_place(user, target))
@@ -363,6 +366,9 @@
overlay_image = "riot-active"
shrapnel_volume = 20
shrapnel_type = /datum/ammo/bullet/shrapnel/rubber
+ req_skill = SKILL_POLICE
+ req_skill_level = SKILL_POLICE_SKILLED
+ antigrief_protection = FALSE
/obj/item/explosive/plastic/breaching_charge/plasma
name = "plasma charge"
diff --git a/code/game/objects/items/fulton.dm b/code/game/objects/items/fulton.dm
index e36d269c8b90..664c7871ba7f 100644
--- a/code/game/objects/items/fulton.dm
+++ b/code/game/objects/items/fulton.dm
@@ -140,10 +140,12 @@ GLOBAL_LIST_EMPTY(deployed_fultons)
sleep(30)
original_location = get_turf(attached_atom)
playsound(loc, 'sound/items/fulton.ogg', 50, 1)
- reservation = SSmapping.RequestBlockReservation(3, 3, turf_type_override = /turf/open/space)
- var/middle_x = reservation.bottom_left_coords[1] + Floor((reservation.top_right_coords[1] - reservation.bottom_left_coords[1]) / 2)
- var/middle_y = reservation.bottom_left_coords[2] + Floor((reservation.top_right_coords[2] - reservation.bottom_left_coords[2]) / 2)
- var/turf/space_tile = locate(middle_x, middle_y, reservation.bottom_left_coords[3])
+ reservation = SSmapping.request_turf_block_reservation(3, 3, 1, turf_type_override = /turf/open/space)
+ var/turf/bottom_left_turf = reservation.bottom_left_turfs[1]
+ var/turf/top_right_turf = reservation.top_right_turfs[1]
+ var/middle_x = bottom_left_turf.x + Floor((top_right_turf.x - bottom_left_turf.x) / 2)
+ var/middle_y = bottom_left_turf.y + Floor((top_right_turf.y - bottom_left_turf.y) / 2)
+ var/turf/space_tile = locate(middle_x, middle_y, bottom_left_turf.z)
if(!space_tile)
visible_message(SPAN_WARNING("[src] begins beeping like crazy. Something is wrong!"))
return
diff --git a/code/game/objects/items/handheld_distress_beacon.dm b/code/game/objects/items/handheld_distress_beacon.dm
index c11a7a57c350..5764604c9a2f 100644
--- a/code/game/objects/items/handheld_distress_beacon.dm
+++ b/code/game/objects/items/handheld_distress_beacon.dm
@@ -12,9 +12,9 @@
///Tells the user who the beacon will be sent to IC
var/recipient = "the USCSS Royce"
///The name of the ERT that will be passed to get_specific_call
- var/list/ert_full_name = list("Weyland-Yutani PMC (Chemical Investigation Squad)")
+ var/list/ert_paths = list(/datum/emergency_call/pmc/chem_retrieval) // "Weyland-Yutani PMC (Chemical Investigation Squad)"
///The clickable version that will be sent in message_admins
- var/list/ert_short_name = list("SEND PMCs")
+ var/list/ert_short_names = list("SEND PMCs")
///Whether beacon can be used, or has already been used
var/active = FALSE
@@ -41,13 +41,13 @@
active = TRUE
update_icon()
- if(!ert_full_name || !ert_short_name || (length(ert_full_name) != length(ert_short_name))) //Make sure they are greater than 0, and both are same length
+ if(!ert_paths || !ert_short_names || (length(ert_paths) != length(ert_short_names))) //Make sure they are greater than 0, and both are same length
to_chat(user, SPAN_BOLDWARNING("[src] is broken!"))
CRASH("[src] was improperly set, and has been disabled.") //For the runtime logs
var/beacon_call_buttons
- for(var/current_ert_num in 1 to length(ert_full_name))
- beacon_call_buttons += "([ert_short_name[current_ert_num]]) "
+ for(var/current_ert_num in 1 to length(ert_paths))
+ beacon_call_buttons += "([ert_short_names[current_ert_num]]) "
for(var/client/admin_client in GLOB.admins)
if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights)
@@ -62,5 +62,26 @@
beacon_type = "CMB beacon"
recipient = "Anchorpoint Station"
- ert_full_name = list("CMB - Patrol Team - Marshals in Distress (Friendly)", "CMB - Anchorpoint Station Colonial Marine QRF (Friendly)")
- ert_short_name = list("SEND CMB", "SEND QRF")
+ // "CMB - Patrol Team - Marshals in Distress (Friendly)", "CMB - Anchorpoint Station Colonial Marine QRF (Friendly)"
+ ert_paths = list(/datum/emergency_call/cmb/alt, /datum/emergency_call/cmb/anchorpoint)
+ ert_short_names = list("SEND CMB", "SEND QRF")
+
+// Corporate Lawyer beacon available for 50 points at the CLs briefcase
+/obj/item/handheld_distress_beacon/lawyer
+ name = "\improper Corporate Affairs Division handheld beacon"
+ desc = "An encoded beacon. This one is branded with the Weyland-Yutani slogan, 'Building Better Worlds since 2099'. Etched in stencil on the side is 'FOR CONTRACT BREAKERS ONLY'. This one is branded with the Corporate Affairs Division symbol and provided to most Executives situated in UA or TWE space."
+
+ beacon_type = "Lawyer beacon"
+ recipient = "the Corporate Affairs Division"
+ ert_paths = list(/datum/emergency_call/inspection_wy/lawyer) // "Lawyers - Corporate"
+ ert_short_names = list("SEND LAWYERS")
+
+// Corporate Security Bodyguard beacon available for 50 points at the CLs briefcase
+/obj/item/handheld_distress_beacon/bodyguard
+ name = "\improper Corporate Security Division handheld beacon"
+ desc = "An standard Corporate Security beacon. This one is branded with the Weyland-Yutani slogan, 'Building Better Worlds since 2099'. This one is branded with the Corporate Security Division symbol and provided to Executives stationed in very dangerous sites across the entire Galaxy."
+
+ beacon_type = "Bodyguard beacon"
+ recipient = "the Corporate Security Division"
+ ert_paths = list(/datum/emergency_call/goon/bodyguard) // "Weyland-Yutani Goon (Executive Bodyguard Detail)"
+ ert_short_names = list("SEND BODYGUARD")
diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm
index 3ae57723668f..112a8e40e85b 100644
--- a/code/game/objects/items/reagent_containers/food/snacks.dm
+++ b/code/game/objects/items/reagent_containers/food/snacks.dm
@@ -641,9 +641,17 @@
/obj/item/reagent_container/food/snacks/carpmeat/Initialize()
. = ..()
reagents.add_reagent("fish", 3)
- reagents.add_reagent("carpotoxin", 3)
+ reagents.add_reagent("carpotoxin", 6)
src.bitesize = 6
+/obj/item/reagent_container/food/snacks/carpmeat/processed
+ name = "processed carp fillet"
+ desc = "A fillet of spess carp meat. This one has been processed to remove carpotoxin."
+
+/obj/item/reagent_container/food/snacks/carpmeat/processed/Initialize()
+ . = ..()
+ reagents.remove_reagent("carpotoxin", 6)
+
/obj/item/reagent_container/food/snacks/fishfingers
name = "Fish Fingers"
desc = "A finger of fish."
@@ -653,7 +661,6 @@
/obj/item/reagent_container/food/snacks/fishfingers/Initialize()
. = ..()
reagents.add_reagent("fish", 4)
- reagents.add_reagent("carpotoxin", 3)
bitesize = 3
/obj/item/reagent_container/food/snacks/hugemushroomslice
@@ -802,7 +809,6 @@
. = ..()
reagents.add_reagent("bread", 3)
reagents.add_reagent("fish", 3)
- reagents.add_reagent("carpotoxin", 3)
bitesize = 3
/obj/item/reagent_container/food/snacks/tofuburger
@@ -850,7 +856,6 @@
. = ..()
reagents.add_reagent("bread", 3)
reagents.add_reagent("meatprotein", 3)
- reagents.add_reagent("xenoblood", 3)
bitesize = 3
/obj/item/reagent_container/food/snacks/clownburger
@@ -1070,7 +1075,6 @@
. = ..()
reagents.add_reagent("bread", 4)
reagents.add_reagent("meatprotein", 2)
- reagents.add_reagent("xenoblood", 4)
bitesize = 2
/obj/item/reagent_container/food/snacks/wingfangchu
@@ -1084,7 +1088,6 @@
. = ..()
reagents.add_reagent("soysauce", 4)
reagents.add_reagent("meatprotein", 4)
- reagents.add_reagent("xenoblood", 4)
bitesize = 2
/obj/item/reagent_container/food/snacks/human/kabob
@@ -1133,7 +1136,6 @@
/obj/item/reagent_container/food/snacks/cubancarp/Initialize()
. = ..()
reagents.add_reagent("fish", 6)
- reagents.add_reagent("carpotoxin", 3)
reagents.add_reagent("hotsauce", 3)
bitesize = 3
@@ -1690,7 +1692,6 @@
/obj/item/reagent_container/food/snacks/fishandchips/Initialize()
. = ..()
reagents.add_reagent("fish", 6)
- reagents.add_reagent("carpotoxin", 3)
bitesize = 3
/obj/item/reagent_container/food/snacks/sandwich
@@ -2172,7 +2173,6 @@
reagents.add_reagent("bread", 10)
reagents.add_reagent("meatprotein", 10)
reagents.add_reagent("cheese", 10)
- reagents.add_reagent("xenoblood", 10)
bitesize = 2
/obj/item/reagent_container/food/snacks/xenomeatbreadslice
diff --git a/code/game/objects/items/reagent_containers/food/snacks/meat.dm b/code/game/objects/items/reagent_containers/food/snacks/meat.dm
index f459d1b169ae..f68f488f268d 100644
--- a/code/game/objects/items/reagent_containers/food/snacks/meat.dm
+++ b/code/game/objects/items/reagent_containers/food/snacks/meat.dm
@@ -57,9 +57,16 @@
/obj/item/reagent_container/food/snacks/meat/xenomeat/Initialize()
. = ..()
- reagents.add_reagent("xenoblood", 3)
+ reagents.add_reagent("xenoblood", 6)
src.bitesize = 6
+/obj/item/reagent_container/food/snacks/meat/xenomeat/processed
+ desc = "A slab of acrid smelling meat. This one has been processed to remove acid."
+
+/obj/item/reagent_container/food/snacks/meat/xenomeat/processed/Initialize()
+ . = ..()
+ reagents.remove_reagent("xenoblood", 6)
+
//fishable atoms meat
// todo: rewrite this into a procgen'ed item when gutting fish? May be incompatible with recipe code if done that way and not hardcoded.
/obj/item/reagent_container/food/snacks/meat/fish
diff --git a/code/game/objects/items/reagent_containers/glass.dm b/code/game/objects/items/reagent_containers/glass.dm
index 2a7bde748fba..fc8d03f5d24d 100644
--- a/code/game/objects/items/reagent_containers/glass.dm
+++ b/code/game/objects/items/reagent_containers/glass.dm
@@ -217,17 +217,16 @@
overlays.Cut()
if(reagents && reagents.total_volume)
- var/image/filling = image('icons/obj/items/reagentfillings.dmi', src, "[icon_state]10")
+ var/image/filling = image('icons/obj/items/reagentfillings.dmi', src, "[icon_state]-20")
var/percent = round((reagents.total_volume / volume) * 100)
switch(percent)
- if(0 to 9) filling.icon_state = "[icon_state]-10"
- if(10 to 24) filling.icon_state = "[icon_state]10"
- if(25 to 49) filling.icon_state = "[icon_state]25"
- if(50 to 74) filling.icon_state = "[icon_state]50"
- if(75 to 79) filling.icon_state = "[icon_state]75"
- if(80 to 90) filling.icon_state = "[icon_state]80"
- if(91 to INFINITY) filling.icon_state = "[icon_state]100"
+ if(0) filling.icon_state = null
+ if(1 to 20) filling.icon_state = "[icon_state]-20"
+ if(21 to 40) filling.icon_state = "[icon_state]-40"
+ if(41 to 60) filling.icon_state = "[icon_state]-60"
+ if(61 to 80) filling.icon_state = "[icon_state]-80"
+ if(81 to INFINITY) filling.icon_state = "[icon_state]-100"
filling.color = mix_color_from_reagents(reagents.reagent_list)
overlays += filling
@@ -345,8 +344,8 @@
flags_atom = FPRINT|OPENCONTAINER|NOREACT
/obj/item/reagent_container/glass/beaker/bluespace
- name = "bluespace beaker"
- desc = "A beaker with an enlarged holding capacity, made with blue-tinted plexiglass in order to withstand greater pressure - affectionately nicknamed \"bluespace\". Can hold up to 300 units."
+ name = "high-capacity beaker"
+ desc = "A beaker with an enlarged holding capacity, made with blue-tinted plexiglass in order to withstand greater pressure. Can hold up to 300 units."
icon_state = "beakerbluespace"
matter = list("glass" = 10000)
volume = 300
diff --git a/code/game/objects/items/reagent_containers/glass/bottle.dm b/code/game/objects/items/reagent_containers/glass/bottle.dm
index 01eb751774e1..9e0215b535b6 100644
--- a/code/game/objects/items/reagent_containers/glass/bottle.dm
+++ b/code/game/objects/items/reagent_containers/glass/bottle.dm
@@ -4,13 +4,14 @@
name = "bottle"
desc = "A small bottle."
icon = 'icons/obj/items/chemistry.dmi'
- icon_state = null
+ icon_state = "bottle-1"
item_state = "atoxinbottle"
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5, 10, 15, 25, 30, 40, 60)
flags_atom = FPRINT|OPENCONTAINER
volume = 60
attack_speed = 4
+ var/randomize = TRUE
/obj/item/reagent_container/glass/bottle/on_reagent_change()
update_icon()
@@ -29,247 +30,224 @@
/obj/item/reagent_container/glass/bottle/Initialize()
. = ..()
- if(!icon_state)
+ if(randomize)
icon_state = "bottle-[rand(1,4)]"
/obj/item/reagent_container/glass/bottle/update_icon()
overlays.Cut()
- if(reagents.total_volume && (icon_state == "bottle-1" || icon_state == "bottle-2" || icon_state == "bottle-3" || icon_state == "bottle-4"))
+ if(reagents.total_volume)
var/image/filling = image('icons/obj/items/reagentfillings.dmi', src, "[icon_state]10")
var/percent = round((reagents.total_volume / volume) * 100)
switch(percent)
- if(0 to 9) filling.icon_state = "[icon_state]--10"
- if(10 to 24) filling.icon_state = "[icon_state]-10"
- if(25 to 49) filling.icon_state = "[icon_state]-25"
- if(50 to 74) filling.icon_state = "[icon_state]-50"
- if(75 to 79) filling.icon_state = "[icon_state]-75"
- if(80 to 90) filling.icon_state = "[icon_state]-80"
- if(91 to INFINITY) filling.icon_state = "[icon_state]-100"
+ if(0) filling.icon_state = null
+ if(1 to 20) filling.icon_state = "[icon_state]-20"
+ if(21 to 40) filling.icon_state = "[icon_state]-40"
+ if(41 to 60) filling.icon_state = "[icon_state]-60"
+ if(61 to 80) filling.icon_state = "[icon_state]-80"
+ if(81 to INFINITY) filling.icon_state = "[icon_state]-100"
filling.color = mix_color_from_reagents(reagents.reagent_list)
overlays += filling
- if (!is_open_container())
- var/image/lid = image(icon, src, "lid_bottle")
+ if(!is_open_container())
+ var/image/lid = image(icon, src, "lid_[icon_state]")
overlays += lid
+
/obj/item/reagent_container/glass/bottle/inaprovaline
name = "\improper Inaprovaline bottle"
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle19"
amount_per_transfer_from_this = 60
/obj/item/reagent_container/glass/bottle/inaprovaline/Initialize()
. = ..()
reagents.add_reagent("inaprovaline", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/kelotane
name = "\improper Kelotane bottle"
desc = "A small bottle. Contains kelotane - used to treat burned areas."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle16"
amount_per_transfer_from_this = 60
/obj/item/reagent_container/glass/bottle/kelotane/Initialize()
. = ..()
reagents.add_reagent("kelotane", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/dexalin
name = "\improper Dexalin bottle"
- desc = "A small bottle. Contains dexalin - used to treat oxygen deprivation."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle10"
amount_per_transfer_from_this = 60
/obj/item/reagent_container/glass/bottle/dexalin/Initialize()
. = ..()
reagents.add_reagent("dexalin", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/spaceacillin
name = "\improper Spaceacillin bottle"
desc = "A small bottle. Contains spaceacillin - used to treat infected wounds."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle8"
amount_per_transfer_from_this = 60
/obj/item/reagent_container/glass/bottle/spaceacillin/Initialize()
. = ..()
reagents.add_reagent("spaceacillin", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/toxin
name = "toxin bottle"
desc = "A small bottle of toxins. Do not drink, it is poisonous."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle12"
-
/obj/item/reagent_container/glass/bottle/toxin/Initialize()
. = ..()
reagents.add_reagent("toxin", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/cyanide
name = "cyanide bottle"
desc = "A small bottle of cyanide. Bitter almonds?"
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle12"
/obj/item/reagent_container/glass/bottle/cyanide/Initialize()
. = ..()
reagents.add_reagent("cyanide", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/stoxin
name = "Soporific bottle"
desc = "A small bottle of soporific. Just the fumes make you sleepy."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle20"
amount_per_transfer_from_this = 60
/obj/item/reagent_container/glass/bottle/stoxin/Initialize()
. = ..()
reagents.add_reagent("stoxin", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/chloralhydrate
name = "chloral hydrate bottle"
desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle20"
/obj/item/reagent_container/glass/bottle/chloralhydrate/Initialize()
. = ..()
reagents.add_reagent("chloralhydrate", 30) //Intentionally low since it is so strong. Still enough to knock someone out.
+ update_icon()
/obj/item/reagent_container/glass/bottle/antitoxin
name = "\improper Dylovene bottle"
desc = "A small bottle of dylovene. Counters poisons, and repairs toxin damage. A wonder drug."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle7"
amount_per_transfer_from_this = 60
/obj/item/reagent_container/glass/bottle/antitoxin/Initialize()
. = ..()
reagents.add_reagent("anti_toxin", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/mutagen
name = "unstable mutagen bottle"
desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle7"
/obj/item/reagent_container/glass/bottle/mutagen/Initialize()
. = ..()
reagents.add_reagent("mutagen", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/ammonia
name = "ammonia bottle"
desc = "A small bottle."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle20"
/obj/item/reagent_container/glass/bottle/ammonia/Initialize()
. = ..()
reagents.add_reagent("ammonia", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/diethylamine
name = "diethylamine bottle"
desc = "A small bottle. Contains a potent fertiliser."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle17"
/obj/item/reagent_container/glass/bottle/diethylamine/Initialize()
. = ..()
reagents.add_reagent("diethylamine", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/flu_virion
name = "flu virion culture bottle"
desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
/obj/item/reagent_container/glass/bottle/flu_virion/Initialize()
. = ..()
var/datum/disease/F = new /datum/disease/advance/flu(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 20, data)
+ update_icon()
/obj/item/reagent_container/glass/bottle/epiglottis_virion
name = "epiglottis virion culture bottle"
desc = "A small bottle. Contains Epiglottis virion culture in synthblood medium."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
/obj/item/reagent_container/glass/bottle/epiglottis_virion/Initialize()
. = ..()
var/datum/disease/F = new /datum/disease/advance/voice_change(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 20, data)
+ update_icon()
/obj/item/reagent_container/glass/bottle/liver_enhance_virion
name = "liver enhancement virion culture bottle"
desc = "A small bottle. Contains liver enhancement virion culture in synthblood medium."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
/obj/item/reagent_container/glass/bottle/liver_enhance_virion/Initialize()
. = ..()
var/datum/disease/F = new /datum/disease/advance/heal(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 20, data)
+ update_icon()
/obj/item/reagent_container/glass/bottle/hullucigen_virion
name = "hullucigen virion culture bottle"
desc = "A small bottle. Contains hullucigen virion culture in synthblood medium."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
/obj/item/reagent_container/glass/bottle/hullucigen_virion/Initialize()
. = ..()
var/datum/disease/F = new /datum/disease/advance/hullucigen(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 20, data)
+ update_icon()
/obj/item/reagent_container/glass/bottle/pierrot_throat
name = "\improper Pierrot's Throat culture bottle"
desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
/obj/item/reagent_container/glass/bottle/pierrot_throat/Initialize()
. = ..()
var/datum/disease/F = new /datum/disease/pierrot_throat(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 20, data)
+ update_icon()
/obj/item/reagent_container/glass/bottle/cold
name = "rhinovirus culture bottle"
desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
/obj/item/reagent_container/glass/bottle/cold/Initialize()
. = ..()
var/datum/disease/advance/F = new /datum/disease/advance/cold(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 20, data)
+ update_icon()
/obj/item/reagent_container/glass/bottle/random
name = "random culture bottle"
desc = "A small bottle. Contains a random disease."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
/obj/item/reagent_container/glass/bottle/random/Initialize()
. = ..()
var/datum/disease/advance/F = new(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 20, data)
+ update_icon()
/obj/item/reagent_container/glass/bottle/gbs
name = "\improper GBS culture bottle"
desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
amount_per_transfer_from_this = 5
/obj/item/reagent_container/glass/bottle/gbs/Initialize()
@@ -278,24 +256,23 @@
var/datum/disease/F = new /datum/disease/gbs
var/list/data = list("virus"= F)
reagents.add_reagent("blood", 20, data)
+ update_icon()
/obj/item/reagent_container/glass/bottle/fake_gbs
name = "\improper GBS culture bottle"
desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
/obj/item/reagent_container/glass/bottle/fake_gbs/Initialize()
. = ..()
var/datum/disease/F = new /datum/disease/fake_gbs(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 20, data)
+ update_icon()
+
/*
/obj/item/reagent_container/glass/bottle/rhumba_beat
name = "Rhumba Beat culture bottle"
desc = "A small bottle. Contains The Rhumba Beat culture in synthblood medium."//Or simply - General BullShit
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
amount_per_transfer_from_this = 5
New()
@@ -305,126 +282,117 @@
var/datum/disease/F = new /datum/disease/rhumba_beat
var/list/data = list("virus"= F)
R.add_reagent("blood", 20, data)
+ update_icon()
+
*/
/obj/item/reagent_container/glass/bottle/brainrot
name = "\improper Brainrot culture bottle"
desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
/obj/item/reagent_container/glass/bottle/brainrot/Initialize()
. = ..()
var/datum/disease/F = new /datum/disease/brainrot(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 20, data)
+ update_icon()
/obj/item/reagent_container/glass/bottle/magnitis
name = "\improper Magnitis culture bottle"
desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
/obj/item/reagent_container/glass/bottle/magnitis/Initialize()
. = ..()
var/datum/disease/F = new /datum/disease/magnitis(0)
var/list/data = list("viruses"= list(F))
reagents.add_reagent("blood", 20, data)
+ update_icon()
/obj/item/reagent_container/glass/bottle/pacid
name = "polytrinic acid bottle"
desc = "A small bottle. Contains a small amount of Polytrinic Acid, an extremely potent and dangerous acid."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle17"
/obj/item/reagent_container/glass/bottle/pacid/Initialize()
. = ..()
reagents.add_reagent("pacid", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/adminordrazine
name = "\improper Adminordrazine bottle"
desc = "A small bottle. Contains the liquid essence of the gods."
- icon = 'icons/obj/items/drinks.dmi'
- icon_state = "holyflask"
/obj/item/reagent_container/glass/bottle/adminordrazine/Initialize()
. = ..()
reagents.add_reagent("adminordrazine", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/capsaicin
name = "\improper Capsaicin bottle"
desc = "A small bottle. Contains hot sauce."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle3"
/obj/item/reagent_container/glass/bottle/capsaicin/Initialize()
. = ..()
reagents.add_reagent("capsaicin", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/frostoil
name = "\improper Frost Oil bottle"
desc = "A small bottle. Contains cold sauce."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle17"
/obj/item/reagent_container/glass/bottle/frostoil/Initialize()
. = ..()
reagents.add_reagent("frostoil", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/bicaridine
name = "\improper Bicaridine bottle"
desc = "A small bottle. Contains Bicaridine - Used to treat brute damage."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle17"
amount_per_transfer_from_this = 60
/obj/item/reagent_container/glass/bottle/bicaridine/Initialize()
. = ..()
reagents.add_reagent("bicaridine", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/peridaxon
name = "\improper Peridaxon bottle"
desc = "A small bottle. Contains Peridaxon - Used by lazy doctors to temporarily halt the effects of internal organ damage."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle4"
volume = 60
amount_per_transfer_from_this = 60
/obj/item/reagent_container/glass/bottle/peridaxon/Initialize()
. = ..()
reagents.add_reagent("peridaxon", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/tramadol
name = "\improper Tramadol bottle"
desc = "A small bottle. Contains Tramadol - Used as a basic painkiller."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle1"
volume = 60
amount_per_transfer_from_this = 60
/obj/item/reagent_container/glass/bottle/tramadol/Initialize()
. = ..()
reagents.add_reagent("tramadol", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/oxycodone
name = "\improper Oxycodone bottle"
desc = "A small bottle. Contains Oxycodone - Used as an Extreme Painkiller. ILLEGAL TO DISTRIBUTE."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle2"
volume = 60
amount_per_transfer_from_this = 60
/obj/item/reagent_container/glass/bottle/oxycodone/Initialize()
. = ..()
reagents.add_reagent("oxycodone", 60)
+ update_icon()
/obj/item/reagent_container/glass/bottle/tricordrazine
name = "\improper Tricordrazine bottle"
desc = "A small bottle. Contains tricordrazine - A weak but catch-all medicine for treating all sorts of damage."
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle18"
volume = 60
/obj/item/reagent_container/glass/bottle/tricordrazine/Initialize()
. = ..()
reagents.add_reagent("tricordrazine", 60)
+ update_icon()
diff --git a/code/game/objects/items/reagent_containers/glass/bottle/robot.dm b/code/game/objects/items/reagent_containers/glass/bottle/robot.dm
index 553b3e0dcbc3..67c397e30eb5 100644
--- a/code/game/objects/items/reagent_containers/glass/bottle/robot.dm
+++ b/code/game/objects/items/reagent_containers/glass/bottle/robot.dm
@@ -10,7 +10,6 @@
name = "internal inaprovaline bottle"
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle16"
reagent = "inaprovaline"
/obj/item/reagent_container/glass/bottle/robot/inaprovaline/Initialize()
@@ -23,7 +22,6 @@
name = "internal anti-toxin bottle"
desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug."
icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle17"
reagent = "anti_toxin"
/obj/item/reagent_container/glass/bottle/robot/antitoxin/Initialize()
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index cb5071326e13..d984f01ae1be 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -107,7 +107,7 @@ GLOBAL_LIST_INIT_TYPED(plasteel_recipes, /datum/stack_recipe, list ( \
/obj/item/stack/sheet/plasteel
name = "plasteel sheet"
singular_name = "plasteel sheet"
- desc = "These sheets are an alloy of iron and phoron."
+ desc = "Plasteel is an expensive, durable material made from combining platinum, steel, and advanced polymers to create a metal that is corrosion-resistant, highly durable, and lightweight. The only reason this isn't used more often is because of how damn costly it is."
icon_state = "sheet-plasteel"
item_state = "sheet-plasteel"
matter = list("metal" = 3750)
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 29c4ec15d03a..5aeef14c536d 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -494,6 +494,12 @@
desc = "A heavy-duty chestrig used by some USCM technicians."
icon_state = "marinesatch_techi"
+/obj/item/storage/backpack/marine/satchel/chestrig
+ name = "\improper USCM chestrig"
+ desc = "A chestrig used by some USCM personnel."
+ icon_state = "chestrig"
+ has_gamemode_skin = FALSE
+
GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/rto)
/obj/item/storage/backpack/marine/satchel/rto
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index f7ada8ce220c..5d7aecbc03db 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -218,6 +218,46 @@
default_cig_type = /obj/item/clothing/mask/cigarette/ucigarette
storage_slots = 4
+/obj/item/storage/fancy/cigarettes/trading_card
+ name = "\improper WeyYu Gold Military Trading Card packet"
+ desc = "Gotta collect 'em all, and smoke 'em all! This fancy military trading card version of Weyland Yutani Gold cigarette packs has one card that is apart of the 3 available 5-card sets."
+ icon_state = "collectpacket"
+ item_state = "collectpacket"
+ storage_slots = 21
+ can_hold = list(
+ /obj/item/clothing/mask/cigarette,
+ /obj/item/clothing/mask/cigarette/ucigarette,
+ /obj/item/clothing/mask/cigarette/bcigarette,
+ /obj/item/tool/lighter,
+ /obj/item/toy/trading_card,
+ )
+ var/obj/item/toy/trading_card/trading_card
+
+/obj/item/storage/fancy/cigarettes/trading_card/fill_preset_inventory()
+ flags_atom |= NOREACT
+ for(var/i = 1 to (storage_slots-1))
+ new default_cig_type(src)
+ trading_card = new(src)
+
+/obj/item/storage/fancy/cigarettes/trading_card/attack_hand(mob/user, mods)
+ if(trading_card?.loc == src && loc == user)
+ to_chat(user, SPAN_NOTICE("You pull a [trading_card.collection_color] trading card out of the cigarette pack."))
+ //have to take two disparate systems n' ram 'em together
+ remove_from_storage(trading_card, user.loc)
+ user.put_in_hands(trading_card)
+ trading_card = null
+
+ return ..()
+
+/obj/item/storage/fancy/cigarettes/trading_card/attackby(obj/item/attacked_by_item, mob/user)
+ if(istype(attacked_by_item, /obj/item/toy/trading_card))
+ trading_card = attacked_by_item
+
+ return ..()
+
+/////////////
+//CIGAR BOX//
+/////////////
// CIGAR BOX
/obj/item/storage/fancy/cigar
@@ -409,3 +449,73 @@
/obj/item/storage/lockbox/vials/attackby(obj/item/W as obj, mob/user as mob)
..()
update_icon()
+
+// Trading Card Pack
+
+/obj/item/storage/fancy/trading_card
+ name = "pack of Red WeyYu Military Trading Cards"
+ desc = "A 5 pack of Red Weyland Yutani Military Trading Cards."
+ icon = 'icons/obj/items/playing_cards.dmi'
+ icon_state = "trading_red_pack_closed"
+ storage_slots = 5
+ icon_type = "trading card"
+ can_hold = list(/obj/item/toy/trading_card)
+ foldable = /obj/item/stack/sheet/cardboard
+ var/collection_color = null
+ var/obj/item/toy/trading_card/top_trading_card
+
+/obj/item/storage/fancy/trading_card/Initialize()
+ if(!collection_color)
+ collection_color = pick("red", "green", "blue") // because of vodoo shenanigans with fill_preset_inventory happening during parent's initalize this'll have to run prior to that
+
+ . = ..()
+
+ name = "pack of [capitalize(collection_color)] WeyYu Military Trading Cards"
+ desc = "A 5 pack of [capitalize(collection_color)] Weyland Yutani Military Trading Cards."
+ icon_state = "trading_[collection_color]_pack_closed"
+
+
+/obj/item/storage/fancy/trading_card/fill_preset_inventory()
+
+ for(var/i in 1 to storage_slots)
+ top_trading_card = new /obj/item/toy/trading_card(src)
+
+/obj/item/storage/fancy/trading_card/update_icon()
+ if(!(top_trading_card))
+ icon_state = "trading_[collection_color]_pack_empty"
+ return
+ if(length(contents) == storage_slots)
+ icon_state = "trading_[collection_color]_pack_closed"
+ return
+ icon_state = "trading_[collection_color]_pack_open"
+
+/obj/item/storage/fancy/trading_card/attack_hand(mob/user, mods)
+ if(top_trading_card?.loc == src && loc == user)
+ to_chat(user, SPAN_NOTICE("You pull a [top_trading_card.collection_color] trading card out of the pack."))
+ //have to take two disparate systems n' ram 'em together
+ remove_from_storage(top_trading_card, user.loc)
+ user.put_in_hands(top_trading_card)
+ if(!(length(contents)))
+ top_trading_card = null
+ update_icon()
+ return
+ top_trading_card = contents[(length(contents))]
+ update_icon()
+ return
+
+ return ..()
+
+/obj/item/storage/fancy/trading_card/attackby(obj/item/attacked_by_item, mob/user)
+ if(istype(attacked_by_item, /obj/item/toy/trading_card))
+ top_trading_card = attacked_by_item
+
+ return ..()
+
+/obj/item/storage/fancy/trading_card/red
+ collection_color = "red"
+
+/obj/item/storage/fancy/trading_card/green
+ collection_color = "green"
+
+/obj/item/storage/fancy/trading_card/blue
+ collection_color = "blue"
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 3b2dbfa33aa4..3e7c00f3d0ff 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -123,7 +123,6 @@
desc = "It's an emergency medical kit containing lifesaving anti-toxic medication. With medical training you can fit this in a backpack."
icon_state = "antitoxin"
item_state = "firstaid-toxin"
- possible_icons_full = list("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
/obj/item/storage/firstaid/toxin/fill_preset_inventory()
new /obj/item/device/healthanalyzer(src)
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index 3f653926f8b3..09885db34fc9 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -64,6 +64,7 @@
can_hold = list(
/obj/item/weapon/gun/shotgun/pump,
/obj/item/weapon/gun/shotgun/combat,
+ /obj/item/weapon/gun/shotgun/double/mou53,
)
has_gamemode_skin = TRUE
diff --git a/code/game/objects/items/tools/hydro_tools.dm b/code/game/objects/items/tools/hydro_tools.dm
index 7ae4989104f6..045a5b864555 100644
--- a/code/game/objects/items/tools/hydro_tools.dm
+++ b/code/game/objects/items/tools/hydro_tools.dm
@@ -31,24 +31,19 @@
/obj/item/tool/plantspray/pests/old
name = "bottle of pestkiller"
- icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle16"
/obj/item/tool/plantspray/pests/old/carbaryl
name = "bottle of carbaryl"
- icon_state = "bottle16"
toxicity = 4
pest_kill_str = 2
/obj/item/tool/plantspray/pests/old/lindane
name = "bottle of lindane"
- icon_state = "bottle18"
toxicity = 6
pest_kill_str = 4
/obj/item/tool/plantspray/pests/old/phosmet
name = "bottle of phosmet"
- icon_state = "bottle15"
toxicity = 8
pest_kill_str = 7
@@ -57,25 +52,21 @@
/obj/item/tool/weedkiller
name = "bottle of weedkiller"
icon = 'icons/obj/items/chemistry.dmi'
- icon_state = "bottle16"
var/toxicity = 0
var/weed_kill_str = 0
/obj/item/tool/weedkiller/triclopyr
name = "bottle of glyphosate"
- icon_state = "bottle16"
toxicity = 4
weed_kill_str = 2
/obj/item/tool/weedkiller/lindane
name = "bottle of triclopyr"
- icon_state = "bottle18"
toxicity = 6
weed_kill_str = 4
/obj/item/tool/weedkiller/D24
name = "bottle of 2,4-D"
- icon_state = "bottle15"
toxicity = 8
weed_kill_str = 7
diff --git a/code/game/objects/items/tools/surgery_tools.dm b/code/game/objects/items/tools/surgery_tools.dm
index 2e2725b52b81..7d354d8d8c1c 100644
--- a/code/game/objects/items/tools/surgery_tools.dm
+++ b/code/game/objects/items/tools/surgery_tools.dm
@@ -201,6 +201,8 @@
icon_state = "bone-gel"
w_class = SIZE_SMALL
matter = list("plastic" = 7500)
+ ///base icon state for update_icon() to reference, fixes bonegel/empty
+ var/base_icon_state = "bone-gel"
///percent of gel remaining in container
var/remaining_gel = 100
///If gel is used when doing bone surgery
@@ -215,6 +217,22 @@
///How much bone gel is needed to mend bones
var/mend_bones_fix_cost = 5
+/obj/item/tool/surgery/bonegel/update_icon()
+ . = ..()
+ if(remaining_gel >= 100)
+ icon_state = base_icon_state
+ return
+ if(remaining_gel > 50)
+ icon_state = "[base_icon_state]_75"
+ return
+ if(remaining_gel > 25)
+ icon_state = "[base_icon_state]_50"
+ return
+ if(remaining_gel > 0)
+ icon_state = "[base_icon_state]_25"
+ return
+ icon_state = "[base_icon_state]_0"
+
/obj/item/tool/surgery/bonegel/get_examine_text(mob/user)
. = ..()
if(unlimited_gel) //Only show how much gel is left if it actually uses bone gel
@@ -244,6 +262,7 @@
if(!do_after(user, time_per_refill, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, refilling_obj))
break
remaining_gel = clamp(remaining_gel + 10, 0, 100)
+ update_icon()
to_chat(user, SPAN_NOTICE("[refilling_obj] chimes, and displays \"[remaining_gel]% filled\"."))
refilling = FALSE
@@ -257,14 +276,17 @@
if(remaining_gel < gel_cost)
return FALSE
remaining_gel -= gel_cost
+ update_icon()
return TRUE
/obj/item/tool/surgery/bonegel/empty
remaining_gel = 0
+ icon_state = "bone-gel_0"
/obj/item/tool/surgery/bonegel/predatorbonegel
name = "gel gun"
desc = "Inside is a liquid that is similar in effect to bone gel, but requires much smaller quantities, allowing near infinite use from a single capsule."
+ base_icon_state = "predator_bone-gel"
icon_state = "predator_bone-gel"
unlimited_gel = TRUE
diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
index 6fa420df35d5..91d8164dcf38 100644
--- a/code/game/objects/items/toys/toys.dm
+++ b/code/game/objects/items/toys/toys.dm
@@ -396,6 +396,14 @@
src.add_fingerprint(user)
addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), 2 SECONDS)
+// rubber duck
+/obj/item/toy/bikehorn/rubberducky
+ name = "rubber ducky"
+ desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~" //thanks doohl
+ icon = 'icons/obj/structures/props/watercloset.dmi'
+ icon_state = "rubberducky"
+ item_state = "rubberducky"
+
/obj/item/computer3_part
name = "computer part"
desc = "Holy jesus you donnit now"
diff --git a/code/game/objects/items/toys/trading_cards.dm b/code/game/objects/items/toys/trading_cards.dm
new file mode 100644
index 000000000000..9fb83cd1e5e1
--- /dev/null
+++ b/code/game/objects/items/toys/trading_cards.dm
@@ -0,0 +1,61 @@
+/obj/item/toy/trading_card
+ name = "WeyYu Military Trading Card"
+ icon = 'icons/obj/items/playing_cards.dmi'
+ icon_state = "trading_red"
+ w_class = SIZE_TINY
+
+ var/trading_card_number = "1"
+ var/picture_description = "barrel charger"
+ var/collection_color
+ var/is_front = FALSE
+ var/back_name = "Red WeyYu Military Trading Card"
+ var/front_name = "Red WeyYu Military Trading Card Number One"
+ var/back_description = "The back of a red trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!"
+ var/front_description = "A red trading card with a picture of the United Americas flag emblazoned on it. It is number one out of the five red cards."
+ var/back_icon_state = "trading_red"
+ var/front_icon_state = "trading_red_one"
+ var/picture_descriptions = list("5" = list("red" = "a fanatical colonial seditionist", "green" = "Almirante Joelle De La Cruz (the United Americas Secretary of Defense)", "blue" = "the United Americas flag"),
+ "4" = list("red" = "a UPPA soldier", "green" = "Marechal-do-ar Enzo Gabriel Lurdes (the Chief of Naval Operations of the Latin American Colonial Navy)", "blue" = "the Union of Progressive Peoples flag"),
+ "3" = list("red" = "a UPPA minigunner", "green" = "Generale d'armee Felix Couture (the Commandant of the Canadian Colonial Armed Forces)", "blue" = "the Three World Empire flag"),
+ "2" = list("red" = "a UPPA officer", "green" = "General Diego Dellamarggio (the Commandant of the United States Colonial Marines)", "blue" = "the Weyland Yutani logo"),
+ "1" = list("red" = "a Holy Order of the HEFA cultist", "green" = "General Delyla S. Vaughn (the Assistant Commandant of the United States Colonial Marines)", "blue" = "the Independent Core System Colonies logo",)
+ )
+
+/obj/item/toy/trading_card/Initialize()
+ . = ..()
+
+ if(istype(loc, /obj/item/storage/fancy/trading_card))
+ var/obj/item/storage/fancy/trading_card/packet = loc
+ collection_color = packet.collection_color
+
+ if(!collection_color)
+ collection_color = pick("red", "green", "blue")
+ trading_card_number = pick_weight(list("5" = 25, "4" = 20, "3" = 15, "2" = 10, "1" = 5))
+ picture_description = picture_descriptions[trading_card_number][collection_color]
+
+ name = "[capitalize(collection_color)] WeyYu Military Trading Card"
+ back_name = "[capitalize(collection_color)] WeyYu Military Trading Card"
+ front_name = "[capitalize(collection_color)] WeyYu Military Trading Card #[trading_card_number]"
+
+ desc = "The back of a [collection_color] trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!"
+ back_description = "The back of a [collection_color] trading card with the text: WeyYu Military Trading Cards! GOTTA COLLECT EM ALL!"
+ front_description = "A [collection_color] trading card with a picture of [picture_description] emblazoned on it. It is #[trading_card_number] out of the five [collection_color] cards."
+
+ icon_state = "trading_[collection_color]"
+ back_icon_state = "trading_[collection_color]"
+ front_icon_state = "trading_[collection_color]_[trading_card_number]"
+
+/obj/item/toy/trading_card/attack_self(mob/user)
+ if(loc == user)
+ if(is_front)
+ name = back_name
+ desc = back_description
+ icon_state = back_icon_state
+ is_front = FALSE
+ else
+ to_chat(user, SPAN_NOTICE("You reveal the card. It has a picture of [picture_description] on it!"))
+ name = front_name
+ desc = front_description
+ icon_state = front_icon_state
+ is_front = TRUE
+ return ..()
diff --git a/code/game/objects/structures/barricade/barricade.dm b/code/game/objects/structures/barricade/barricade.dm
index 0a37e4bcec59..313067ca6a56 100644
--- a/code/game/objects/structures/barricade/barricade.dm
+++ b/code/game/objects/structures/barricade/barricade.dm
@@ -5,21 +5,28 @@
climbable = TRUE
anchored = TRUE
density = TRUE
- throwpass = TRUE //You can throw objects over this, despite its density.
+ /// You can throw objects over this, despite its density.
+ throwpass = TRUE
layer = BELOW_OBJ_LAYER
flags_atom = ON_BORDER
- var/stack_type //The type of stack the barricade dropped when disassembled if any.
- var/stack_amount = 5 //The amount of stack dropped when disassembled at full health
- var/destroyed_stack_amount //to specify a non-zero amount of stack to drop when destroyed
+ /// The type of stack the barricade dropped when disassembled if any.
+ var/stack_type
+ /// The amount of stack dropped when disassembled at full health
+ var/stack_amount = 5
+ /// to specify a non-zero amount of stack to drop when destroyed
+ var/destroyed_stack_amount
health = 100 //Pretty tough. Changes sprites at 300 and 150
- var/maxhealth = 100 //Basic code functions
+ var/maxhealth = 100
/// Used for calculating some stuff related to maxhealth as it constantly changes due to e.g. barbed wire. set to 100 to avoid possible divisions by zero
var/starting_maxhealth = 100
- var/crusher_resistant = TRUE //Whether a crusher can ram through it.
- var/force_level_absorption = 5 //How much force an item needs to even damage it at all.
+ /// Whether a crusher can ram through it.
+ var/crusher_resistant = TRUE
+ /// How much force an item needs to even damage it at all.
+ var/force_level_absorption = 5
var/barricade_hitsound
var/barricade_type = "barricade" //"metal", "plasteel", etc.
- var/wire_icon = 'icons/obj/structures/barricades.dmi' //! Icon file used for the wiring
+ /// ! Icon file used for the wiring
+ var/wire_icon = 'icons/obj/structures/barricades.dmi'
var/can_change_dmg_state = TRUE
var/damage_state = BARRICADE_DMG_NONE
var/closed = FALSE
@@ -35,6 +42,8 @@
var/burn_flame_multiplier = 1
var/repair_materials = list()
var/metallic = TRUE
+ /// Lower limit of damage beyond which the barricade cannot be fixed by welder. Compared to damage_state. If null it can be repaired at any damage_state.
+ var/welder_lower_damage_limit = null
/obj/structure/barricade/Initialize(mapload, mob/user)
. = ..()
@@ -357,9 +366,8 @@
if(50 to 75) damage_state = BARRICADE_DMG_SLIGHT
if(75 to INFINITY) damage_state = BARRICADE_DMG_NONE
-/obj/structure/barricade/proc/weld_cade(obj/item/tool/weldingtool/welder, mob/user)
- if(!metallic)
- user.visible_message(SPAN_WARNING("You can't weld \the [src]!"))
+/obj/structure/barricade/proc/try_weld_cade(obj/item/tool/weldingtool/welder, mob/user, repeat = TRUE, skip_check = FALSE)
+ if(!skip_check && !can_weld(welder, user))
return FALSE
if(!(welder.remove_fuel(2, user)))
@@ -378,6 +386,16 @@
user.count_niche_stat(STATISTICS_NICHE_REPAIR_CADES)
update_health(-200)
playsound(src.loc, 'sound/items/Welder2.ogg', 25, TRUE)
+
+ var/current_tool = user.get_active_hand()
+ if(current_tool != welder)
+ return TRUE // Swapped hands or tool
+ if(repeat && can_weld(welder, user, silent = TRUE))
+ // Assumption: The implementation of can_weld will return false if fully repaired
+ if(!try_weld_cade(welder, user, repeat = TRUE, skip_check = TRUE))
+ // If this returned false, then we were interrupted or ran out of fuel, so stop looping
+ return TRUE
+
return TRUE
/obj/structure/barricade/verb/count_rotate()
@@ -466,3 +484,29 @@
nailgun.in_chamber = null
nailgun.load_into_chamber()
return TRUE
+
+/obj/structure/barricade/proc/can_weld(obj/item/item, mob/user, silent)
+ if(user.action_busy)
+ return FALSE
+
+ if(!metallic)
+ if(!silent)
+ user.visible_message(SPAN_WARNING("You can't weld \the [src]!"))
+ return FALSE
+
+ if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH))
+ if(!silent)
+ to_chat(user, SPAN_WARNING("You need a stronger blowtorch!"))
+ return FALSE
+
+ if(health == maxhealth)
+ if(!silent)
+ to_chat(user, SPAN_WARNING("[src] doesn't need repairs."))
+ return FALSE
+
+ if(!(isnull(damage_state)) && !(isnull(welder_lower_damage_limit)) && damage_state >= welder_lower_damage_limit)
+ if(!silent)
+ to_chat(user, SPAN_WARNING("[src] has sustained too much structural damage to be repaired."))
+ return FALSE
+
+ return TRUE
diff --git a/code/game/objects/structures/barricade/deployable.dm b/code/game/objects/structures/barricade/deployable.dm
index 0d5275f98a3d..ca35f82bdde5 100644
--- a/code/game/objects/structures/barricade/deployable.dm
+++ b/code/game/objects/structures/barricade/deployable.dm
@@ -24,40 +24,28 @@
. += SPAN_INFO("Drag its sprite onto yourself to undeploy.")
/obj/structure/barricade/deployable/attackby(obj/item/item, mob/user)
-
if(iswelder(item))
- if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH))
- to_chat(user, SPAN_WARNING("You need a stronger blowtorch!"))
- return
- if(user.action_busy)
- return
- var/obj/item/tool/weldingtool/welder = item
- if(health == maxhealth)
- to_chat(user, SPAN_WARNING("[src] doesn't need repairs."))
- return
-
- weld_cade(welder, user)
+ try_weld_cade(item, user)
return
- else if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR))
+ if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR))
if(user.action_busy)
return
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED))
to_chat(user, SPAN_WARNING("You do not know how to collapse [src] using a crowbar..."))
return
+ user.visible_message(SPAN_NOTICE("[user] starts collapsing [src]."), \
+ SPAN_NOTICE("You begin collapsing [src]..."))
+ playsound(loc, 'sound/items/Crowbar.ogg', 25, 1)
+ if(do_after(user, 1.5 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src))
+ collapse(usr)
else
- user.visible_message(SPAN_NOTICE("[user] starts collapsing [src]."), \
- SPAN_NOTICE("You begin collapsing [src]..."))
- playsound(loc, 'sound/items/Crowbar.ogg', 25, 1)
- if(do_after(user, 1.5 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src))
- collapse(usr)
- else
- to_chat(user, SPAN_WARNING("You stop collapsing [src]."))
+ to_chat(user, SPAN_WARNING("You stop collapsing [src]."))
if(try_nailgun_usage(item, user))
return
- . = ..()
+ return ..()
/obj/structure/barricade/deployable/MouseDrop(obj/over_object as obj)
if(!ishuman(usr))
@@ -202,7 +190,7 @@
to_chat(user, SPAN_INFO("You transfer [to_transfer] between the stacks."))
return
- else if(iswelder(item))
+ if(iswelder(item))
if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH))
to_chat(user, SPAN_WARNING("You need a stronger blowtorch!"))
return
@@ -248,7 +236,7 @@
playsound(loc, 'sound/items/Welder2.ogg', 25, TRUE)
return
- . = ..()
+ return ..()
/obj/item/stack/folding_barricade/attack_hand(mob/user)
var/mob/living/carbon/human/human = user
diff --git a/code/game/objects/structures/barricade/handrail.dm b/code/game/objects/structures/barricade/handrail.dm
index ae166dbbf985..1d641479c3d9 100644
--- a/code/game/objects/structures/barricade/handrail.dm
+++ b/code/game/objects/structures/barricade/handrail.dm
@@ -67,7 +67,7 @@
reinforced = !reinforced
update_icon()
-/obj/structure/barricade/handrail/attackby(obj/item/W, mob/user)
+/obj/structure/barricade/handrail/attackby(obj/item/item, mob/user)
for(var/obj/effect/xenomorph/acid/A in src.loc)
if(A.acid_t == src)
to_chat(user, "You can't get near that, it's melting!")
@@ -75,7 +75,7 @@
switch(build_state)
if(BARRICADE_BSTATE_SECURED) //Non-reinforced. Wrench to unsecure. Screwdriver to disassemble into metal. 1 metal to reinforce.
- if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) // Make unsecure
+ if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH)) // Make unsecure
if(user.action_busy)
return
if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED))
@@ -89,7 +89,7 @@
build_state = BARRICADE_BSTATE_UNSECURED
update_icon()
return
- if(istype(W, /obj/item/stack/sheet/metal)) // Start reinforcing
+ if(istype(item, /obj/item/stack/sheet/metal)) // Start reinforcing
if(!can_be_reinforced)
return
if(user.action_busy)
@@ -97,7 +97,7 @@
if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED))
to_chat(user, SPAN_WARNING("You are not trained to reinforce [src]..."))
return
- var/obj/item/stack/sheet/metal/M = W
+ var/obj/item/stack/sheet/metal/M = item
playsound(src.loc, 'sound/items/Screwdriver2.ogg', 25, 1)
if(M.amount >= 1 && do_after(user, 30, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) //Shouldnt be possible, but doesnt hurt to check
if(!M.use(1))
@@ -109,7 +109,7 @@
return
if(BARRICADE_BSTATE_UNSECURED)
- if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) // Secure again
+ if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH)) // Secure again
if(user.action_busy)
return
if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED))
@@ -123,7 +123,7 @@
build_state = BARRICADE_BSTATE_SECURED
update_icon()
return
- if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) // Disassemble into metal
+ if(HAS_TRAIT(item, TRAIT_TOOL_SCREWDRIVER)) // Disassemble into metal
if(user.action_busy)
return
if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED))
@@ -141,7 +141,7 @@
if(BARRICADE_BSTATE_FORTIFIED)
if(reinforced)
- if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR)) // Un-reinforce
+ if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR)) // Un-reinforce
if(user.action_busy)
return
if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED))
@@ -155,8 +155,8 @@
reinforce()
return
else
- if(iswelder(W)) // Finish reinforcing
- if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH))
+ if(iswelder(item)) // Finish reinforcing
+ if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH))
to_chat(user, SPAN_WARNING("You need a stronger blowtorch!"))
return
if(user.action_busy)
diff --git a/code/game/objects/structures/barricade/metal.dm b/code/game/objects/structures/barricade/metal.dm
index 4f250eed50e9..3e79af2e21e1 100644
--- a/code/game/objects/structures/barricade/metal.dm
+++ b/code/game/objects/structures/barricade/metal.dm
@@ -19,6 +19,8 @@
var/build_state = BARRICADE_BSTATE_SECURED //Look at __game.dm for barricade defines
var/upgrade = null
+ welder_lower_damage_limit = BARRICADE_DMG_HEAVY
+
/obj/structure/barricade/metal/update_icon()
. = ..()
if(dir > 2)
@@ -42,26 +44,20 @@
if(BARRICADE_UPGRADE_ANTIFF)
. += SPAN_NOTICE("The cade is protected by a composite upgrade.")
-/obj/structure/barricade/metal/attackby(obj/item/item, mob/user)
- if(iswelder(item))
- if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH))
- to_chat(user, SPAN_WARNING("You need a stronger blowtorch!"))
- return
- if(user.action_busy)
- return
- if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED))
+/obj/structure/barricade/metal/can_weld(obj/item/item, mob/user, silent)
+ if(!..())
+ return FALSE
+
+ if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED))
+ if(!silent)
to_chat(user, SPAN_WARNING("You're not trained to repair [src]..."))
- return
- var/obj/item/tool/weldingtool/welder = item
- if(damage_state == BARRICADE_DMG_HEAVY)
- to_chat(user, SPAN_WARNING("[src] has sustained too much structural damage to be repaired."))
- return
+ return FALSE
- if(health == maxhealth)
- to_chat(user, SPAN_WARNING("[src] doesn't need repairs."))
- return
+ return TRUE
- weld_cade(welder, user)
+/obj/structure/barricade/metal/attackby(obj/item/item, mob/user)
+ if(iswelder(item))
+ try_weld_cade(item, user)
return
if(try_nailgun_usage(item, user))
@@ -204,11 +200,13 @@
to_chat(user, SPAN_WARNING("You are not trained to assemble [src]..."))
return
playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1)
- if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return
+ if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src))
+ return
user.visible_message(SPAN_NOTICE("[user] set [src]'s protection panel back."),
SPAN_NOTICE("You set [src]'s protection panel back."))
build_state = BARRICADE_BSTATE_SECURED
return
+
if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH))
if(user.action_busy)
return
@@ -216,13 +214,15 @@
to_chat(user, SPAN_WARNING("You are not trained to disassemble [src]..."))
return
playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1)
- if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return
+ if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src))
+ return
user.visible_message(SPAN_NOTICE("[user] loosens [src]'s anchor bolts."),
SPAN_NOTICE("You loosen [src]'s anchor bolts."))
anchored = FALSE
build_state = BARRICADE_BSTATE_MOVABLE
update_icon() //unanchored changes layer
return
+
if(BARRICADE_BSTATE_MOVABLE) //Anchor bolts loosened step. Apply crowbar to unseat the panel and take apart the whole thing. Apply wrench to resecure anchor bolts
if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH))
if(user.action_busy)
@@ -239,13 +239,15 @@
to_chat(user, SPAN_WARNING("[src] must be secured on a proper surface!"))
return
playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1)
- if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return
+ if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src))
+ return
user.visible_message(SPAN_NOTICE("[user] secures [src]'s anchor bolts."),
SPAN_NOTICE("You secure [src]'s anchor bolts."))
build_state = BARRICADE_BSTATE_UNSECURED
anchored = TRUE
update_icon() //unanchored changes layer
return
+
if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR))
if(user.action_busy)
return
@@ -262,7 +264,7 @@
deconstruct(TRUE) //Note : Handles deconstruction too !
return
- . = ..()
+ return ..()
/obj/structure/barricade/metal/wired/New()
maxhealth += 50
@@ -271,7 +273,7 @@
is_wired = TRUE
climbable = FALSE
update_icon()
- . = ..()
+ return ..()
/obj/structure/barricade/metal/wired/initialize_pass_flags(datum/pass_flags_container/PF)
..()
diff --git a/code/game/objects/structures/barricade/misc.dm b/code/game/objects/structures/barricade/misc.dm
index 5e0958f974b1..a0465de8f070 100644
--- a/code/game/objects/structures/barricade/misc.dm
+++ b/code/game/objects/structures/barricade/misc.dm
@@ -44,8 +44,8 @@
user.visible_message(SPAN_NOTICE("\The [user] removes \the [src]."))
deconstruct(TRUE)
return
- else
- . = ..()
+
+ return ..()
/obj/structure/barricade/snow/hit_barricade(obj/item/I)
switch(I.damtype)
@@ -101,7 +101,7 @@
if(try_nailgun_usage(W, user))
return
- . = ..()
+ return ..()
/obj/structure/barricade/wooden/hit_barricade(obj/item/I)
switch(I.damtype)
diff --git a/code/game/objects/structures/barricade/plasteel.dm b/code/game/objects/structures/barricade/plasteel.dm
index dd95aa3f1baf..1acedae9997d 100644
--- a/code/game/objects/structures/barricade/plasteel.dm
+++ b/code/game/objects/structures/barricade/plasteel.dm
@@ -20,12 +20,15 @@
repair_materials = list("plasteel" = 0.3)
var/build_state = BARRICADE_BSTATE_SECURED //Look at __game.dm for barricade defines
- var/tool_cooldown = 0 //Delay to apply tools to prevent spamming
- var/busy = FALSE //Standard busy check
+ /// Delay to apply tools to prevent spamming
+ var/tool_cooldown = 0
+ /// Standard busy check
+ var/busy = FALSE
var/linked = 0
var/recentlyflipped = FALSE
var/hasconnectionoverlay = TRUE
var/linkable = TRUE
+ welder_lower_damage_limit = BARRICADE_DMG_HEAVY
/obj/structure/barricade/plasteel/update_icon()
..()
@@ -44,7 +47,7 @@
if(!closed) // Closed = gate down for plasteel for some reason
return ..()
else
- return 0
+ return FALSE
/obj/structure/barricade/plasteel/get_examine_text(mob/user)
. = ..()
@@ -57,35 +60,28 @@
if(BARRICADE_BSTATE_MOVABLE)
. += SPAN_INFO("The protection panel has been removed and the anchor bolts loosened. It's ready to be taken apart.")
-/obj/structure/barricade/plasteel/weld_cade(obj/item/W, mob/user)
+/obj/structure/barricade/plasteel/try_weld_cade(obj/item/item, mob/user, repeat = TRUE, skip_check = FALSE)
busy = TRUE
..()
busy = FALSE
-/obj/structure/barricade/plasteel/attackby(obj/item/W, mob/user)
- if(iswelder(W))
- if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH))
- to_chat(user, SPAN_WARNING("You need a stronger blowtorch!"))
- return
- if(busy || tool_cooldown > world.time)
- return
- tool_cooldown = world.time + 10
- if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED))
+/obj/structure/barricade/plasteel/can_weld(obj/item/item, mob/user, silent)
+ if(!..())
+ return FALSE
+
+ if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED))
+ if(!silent)
to_chat(user, SPAN_WARNING("You're not trained to repair [src]..."))
- return
- var/obj/item/tool/weldingtool/WT = W
- if(damage_state == BARRICADE_DMG_HEAVY)
- to_chat(user, SPAN_WARNING("[src] has sustained too much structural damage to be repaired."))
- return
+ return FALSE
- if(health == maxhealth)
- to_chat(user, SPAN_WARNING("[src] doesn't need repairs."))
- return
+ return TRUE
- weld_cade(WT, user)
+/obj/structure/barricade/plasteel/attackby(obj/item/item, mob/user)
+ if(iswelder(item))
+ try_weld_cade(item, user)
return
- if(try_nailgun_usage(W, user))
+ if(try_nailgun_usage(item, user))
return
for(var/obj/effect/xenomorph/acid/A in src.loc)
@@ -94,8 +90,8 @@
return
switch(build_state)
- if(2) //Fully constructed step. Use screwdriver to remove the protection panels to reveal the bolts
- if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER))
+ if(BARRICADE_BSTATE_SECURED) //Fully constructed step. Use screwdriver to remove the protection panels to reveal the bolts
+ if(HAS_TRAIT(item, TRAIT_TOOL_SCREWDRIVER))
if(busy || tool_cooldown > world.time)
return
tool_cooldown = world.time + 10
@@ -107,13 +103,15 @@
if(B != src && B.dir == dir)
to_chat(user, SPAN_WARNING("There's already a barricade here."))
return
- if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return
+ if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src))
+ return
user.visible_message(SPAN_NOTICE("[user] removes [src]'s protection panel."),
SPAN_NOTICE("You remove [src]'s protection panels, exposing the anchor bolts."))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1)
build_state = BARRICADE_BSTATE_UNSECURED
return
- if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR))
+
+ if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR))
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
to_chat(user, SPAN_WARNING("You are not trained to modify [src]..."))
return
@@ -132,28 +130,32 @@
for(var/obj/structure/barricade/plasteel/cade in get_step(src, direction))
cade.update_icon()
update_icon()
- if(1) //Protection panel removed step. Screwdriver to put the panel back, wrench to unsecure the anchor bolts
- if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER))
+
+ if(BARRICADE_BSTATE_UNSECURED) //Protection panel removed step. Screwdriver to put the panel back, wrench to unsecure the anchor bolts
+ if(HAS_TRAIT(item, TRAIT_TOOL_SCREWDRIVER))
if(busy || tool_cooldown > world.time)
return
tool_cooldown = world.time + 10
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
to_chat(user, SPAN_WARNING("You are not trained to assemble [src]..."))
return
- if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return
+ if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src))
+ return
user.visible_message(SPAN_NOTICE("[user] set [src]'s protection panel back."),
SPAN_NOTICE("You set [src]'s protection panel back."))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1)
build_state = BARRICADE_BSTATE_SECURED
return
- if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH))
+
+ if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH))
if(busy || tool_cooldown > world.time)
return
tool_cooldown = world.time + 10
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
to_chat(user, SPAN_WARNING("You are not trained to assemble [src]..."))
return
- if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return
+ if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src))
+ return
user.visible_message(SPAN_NOTICE("[user] loosens [src]'s anchor bolts."),
SPAN_NOTICE("You loosen [src]'s anchor bolts."))
playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1)
@@ -162,8 +164,8 @@
update_icon() //unanchored changes layer
return
- if(0) //Anchor bolts loosened step. Apply crowbar to unseat the panel and take apart the whole thing. Apply wrench to rescure anchor bolts
- if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH))
+ if(BARRICADE_BSTATE_MOVABLE) //Anchor bolts loosened step. Apply crowbar to unseat the panel and take apart the whole thing. Apply wrench to rescure anchor bolts
+ if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH))
if(busy || tool_cooldown > world.time)
return
tool_cooldown = world.time + 10
@@ -174,7 +176,8 @@
if(!(istype(T) && T.allow_construction))
to_chat(user, SPAN_WARNING("[src] must be secured on a proper surface!"))
return
- if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) return
+ if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src))
+ return
user.visible_message(SPAN_NOTICE("[user] secures [src]'s anchor bolts."),
SPAN_NOTICE("You secure [src]'s anchor bolts."))
playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1)
@@ -182,7 +185,8 @@
build_state = BARRICADE_BSTATE_UNSECURED
update_icon() //unanchored changes layer
return
- if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR))
+
+ if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR))
if(busy || tool_cooldown > world.time)
return
tool_cooldown = world.time + 10
@@ -194,15 +198,14 @@
playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1)
busy = TRUE
if(do_after(user, 50 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src))
- busy = FALSE
user.visible_message(SPAN_NOTICE("[user] takes [src]'s panels apart."),
SPAN_NOTICE("You take [src]'s panels apart."))
playsound(loc, 'sound/items/Deconstruct.ogg', 25, 1)
deconstruct(TRUE) //Note : Handles deconstruction too !
- else busy = FALSE
+ busy = FALSE
return
- . = ..()
+ return ..()
/obj/structure/barricade/plasteel/attack_hand(mob/user as mob)
if(isxeno(user))
@@ -264,7 +267,7 @@
is_wired = TRUE
climbable = FALSE
update_icon()
- . = ..()
+ return ..()
/obj/structure/barricade/plasteel/wired/initialize_pass_flags(datum/pass_flags_container/PF)
..()
diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
index 41c27ae47519..c1c0839fa6f5 100644
--- a/code/game/objects/structures/crates_lockers/closets/coffin.dm
+++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -14,6 +14,13 @@
else
icon_state = icon_opened
+/obj/structure/closet/coffin/uscm
+ name = "\improper USCM coffin"
+ desc = "A burial receptacle for dearly departed Marines, adorned in red and finished with the Corps' emblem on the interior. Semper fi."
+ icon_state = "uscm_coffin"
+ icon_closed = "uscm_coffin"
+ icon_opened = "uscm_coffin_open"
+
/obj/structure/closet/coffin/predator
name = "strange coffin"
desc = "It's a burial receptacle for the dearly departed. Seems to have weird markings on the side..?"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
index 9b473d91f46e..6c711a7bcabe 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
@@ -254,6 +254,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
new /obj/item/storage/belt/medical/full(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/blue(src)
+ new /obj/item/clothing/under/rank/medical/lightblue(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/head/surgery/green(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 4244fd82881e..f7518a8c6058 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -93,6 +93,7 @@
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/blue(src)
+ new /obj/item/clothing/under/rank/medical/lightblue(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/head/surgery/green(src)
new /obj/item/clothing/head/surgery/blue(src)
@@ -106,8 +107,6 @@
new /obj/item/storage/pouch/medical(src)
new /obj/item/storage/pouch/syringe(src)
new /obj/item/storage/pouch/medkit(src)
- if(is_mainship_level(z))
- new /obj/item/device/radio/headset/almayer/cmo(src)
return
/obj/structure/closet/secure_closet/chemical
name = "chemical closet"
@@ -170,3 +169,63 @@
. = ..()
new /obj/item/storage/surgical_tray(src)
new /obj/item/roller/surgical(src)
+
+/obj/structure/closet/secure_closet/professor_dummy
+ name = "professor dummy cabinet"
+ desc = "An ultrasafe cabinet containing Professor DUMMY and its tablet. Only accessible by Chief Medical Officers and Senior Listed Advisors."
+ icon_state = "surgical_wall_locked"
+ icon_closed = "surgical_wall_unlocked"
+ icon_locked = "surgical_wall_locked"
+ icon_opened = "surgical_wall_open"
+ icon_broken = "surgical_wall_spark"
+ health = null // Unbreakable
+ unacidable = TRUE
+ unslashable = TRUE
+ store_mobs = TRUE
+ wall_mounted = TRUE
+
+/obj/structure/closet/secure_closet/professor_dummy/Initialize()
+ . = ..()
+ var/mob/living/carbon/human/dummy/professor_dummy/spawned_dummy = new(src)
+ var/datum/equipment_preset/dummy_preset = /datum/equipment_preset/other/professor_dummy
+ arm_equipment(spawned_dummy, initial(dummy_preset.name), TRUE, FALSE)
+
+/obj/structure/closet/secure_closet/professor_dummy/togglelock(mob/living/user)
+ if(user.job == JOB_CMO || user.job == JOB_SEA)
+ return ..()
+
+ to_chat(user, SPAN_WARNING("Only the [JOB_CMO] or the [JOB_SEA] can toggle this lock."))
+
+/obj/structure/closet/secure_closet/professor_dummy/dump_contents()
+ if(locate(/mob/living/carbon/human/dummy/professor_dummy) in src)
+ visible_message(SPAN_HIGHDANGER("Professor DUMMY should only be used for teaching medical personnel, exclusively done by the [JOB_CMO] or the [JOB_SEA]. Do not abuse it."))
+ return ..()
+
+/obj/structure/closet/secure_closet/professor_dummy/close()
+ for(var/mob/mob in loc)
+ if(!istype(mob, /mob/living/carbon/human/dummy/professor_dummy))
+ visible_message(SPAN_WARNING("[src] won't budge!"))
+ return
+ ..()
+
+ // Force locking upon closing it
+ locked = TRUE
+ update_icon()
+
+/obj/structure/closet/secure_closet/professor_dummy/flashbang(datum/source, obj/item/explosive/grenade/flashbang/FB)
+ return
+
+/obj/structure/closet/secure_closet/professor_dummy/proc/check_and_destroy_dummy()
+ var/mob/dummy = locate(/mob/living/carbon/human/dummy/professor_dummy) in src
+ if(dummy)
+ visible_message(SPAN_DANGER("Something in [src] blows apart!"))
+ playsound(src, 'sound/effects/metal_crash.ogg', 25, 1)
+ qdel(dummy)
+
+/obj/structure/closet/secure_closet/professor_dummy/emp_act(severity)
+ check_and_destroy_dummy()
+ ..()
+
+/obj/structure/closet/secure_closet/professor_dummy/ex_act(severity)
+ check_and_destroy_dummy()
+ ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index daecf1906c21..eddc0690233c 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -297,6 +297,7 @@
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical/blue(src)
+ new /obj/item/clothing/under/rank/medical/lightblue(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/shoes/white(src)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index cfb62812f0c6..d891119a8404 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -335,7 +335,7 @@
icon_closed = "closed_supply"
/obj/structure/closet/crate/trashcart
- name = "\improper trash cart"
+ name = "trash cart"
desc = "A heavy, metal trashcart with wheels."
icon_state = "closed_trashcart"
icon_opened = "open_trashcart"
@@ -437,4 +437,3 @@
density = TRUE
icon_opened = "open_mcart_y"
icon_closed = "closed_mcart_y"
-
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 39a659c5f397..5620f106b560 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -22,32 +22,18 @@
playsound(src, unpacking_sound, 35)
- /// Store the reference of the crate material
- var/obj/item/stack/sheet/material_sheet
- if(parts_type) // Create the crate material and store its reference
- material_sheet = new parts_type(current_turf, 2)
-
- // Move the objects back to the turf, above the crate material
+ // Move the contents back to the turf
for(var/atom/movable/moving_atom as anything in contents)
moving_atom.forceMove(current_turf)
- deconstruct(TRUE)
-
- // Move the crate material to the bottom of the turf's contents
- if(material_sheet)
- move_to_bottom(material_sheet, current_turf)
+ if(parts_type) // Create the crate material
+ new parts_type(current_turf, 2)
-/// Custom proc to move an object to the bottom of the turf's contents
-/obj/structure/largecrate/proc/move_to_bottom(obj/moving_down, turf/current_turf)
- if(!istype(moving_down) || !istype(current_turf))
- return
- for(var/atom/movable/checking_atom in current_turf.contents)
- if(checking_atom != moving_down)
- checking_atom.layer = max(checking_atom.layer, moving_down.layer + 0.1)
+ deconstruct(TRUE)
/obj/structure/largecrate/deconstruct(disassembled = TRUE)
if(!disassembled)
- new /obj/item/stack/sheet/wood(loc)
+ new parts_type(loc)
return ..()
diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm
index 8aad7de3e04c..8c03a4dbd66c 100644
--- a/code/game/objects/structures/props.dm
+++ b/code/game/objects/structures/props.dm
@@ -926,7 +926,7 @@
name = "\improper S-52 fusion reactor"
desc = "A Westingland S-52 Fusion Reactor. Takes fuels cells and converts them to power. Also produces a large amount of heat."
icon = 'icons/obj/structures/machinery/fusion_eng.dmi'
- icon_state = "off-0"
+ icon_state = "off"
/obj/structure/prop/invuln/pipe_water
name = "pipe water"
diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm
index 1981dcaba569..a89f35ce38f3 100644
--- a/code/game/objects/structures/reagent_dispensers.dm
+++ b/code/game/objects/structures/reagent_dispensers.dm
@@ -5,6 +5,7 @@
icon_state = "watertank"
density = TRUE
anchored = FALSE
+ drag_delay = 1
health = 100 // Can be destroyed in 2-4 slashes.
flags_atom = CAN_BE_SYRINGED
wrenchable = TRUE
@@ -432,6 +433,7 @@
icon = 'icons/obj/objects.dmi'
icon_state = "peppertank"
anchored = TRUE
+ drag_delay = 3
wrenchable = FALSE
density = FALSE
amount_per_transfer_from_this = 45
@@ -445,6 +447,7 @@
icon_state = "water_cooler"
possible_transfer_amounts = null
anchored = TRUE
+ drag_delay = 3
chemical = "water"
/obj/structure/reagent_dispensers/water_cooler/walk_past
@@ -460,6 +463,7 @@
icon_state = "beertankTEMP"
amount_per_transfer_from_this = 10
chemical = "beer"
+ drag_delay = 3
/obj/structure/reagent_dispensers/beerkeg/alt
icon_state = "beertank_alt"
@@ -474,6 +478,7 @@
icon_state = "virusfoodtank"
amount_per_transfer_from_this = 10
anchored = TRUE
+ drag_delay = 3
wrenchable = FALSE
density = FALSE
chemical = "virusfood"
diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm
new file mode 100644
index 000000000000..b731a2c0e242
--- /dev/null
+++ b/code/game/objects/structures/shower.dm
@@ -0,0 +1,222 @@
+/obj/structure/machinery/shower
+ name = "shower"
+ desc = "The HS-451. Installed in the 2050s by the Weyland Hygiene Division."
+ icon = 'icons/obj/structures/props/watercloset.dmi'
+ icon_state = "shower"
+ density = FALSE
+ anchored = TRUE
+ use_power = USE_POWER_NONE
+ var/on = 0
+ var/obj/effect/mist/mymist = null
+ /// needs a var so we can make it linger~
+ var/ismist = 0
+ /// freezing, normal, or boiling
+ var/watertemp = "normal"
+ /// true if there is a mob on the shower's loc, this is to ease process()
+ var/mobpresent = 0
+ var/is_washing = 0
+
+/obj/structure/machinery/shower/Initialize()
+ . = ..()
+ create_reagents(2)
+
+//add heat controls? when emagged, you can freeze to death in it?
+
+/obj/effect/mist
+ name = "mist"
+ icon = 'icons/obj/structures/props/watercloset.dmi'
+ icon_state = "mist"
+ layer = FLY_LAYER
+ anchored = TRUE
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+
+
+/obj/structure/machinery/shower/attack_hand(mob/M as mob)
+ on = !on
+ update_icon()
+ if(on)
+ start_processing()
+ if (M.loc == loc)
+ wash(M)
+ check_heat(M)
+ for (var/atom/movable/G in src.loc)
+ G.clean_blood()
+ else
+ stop_processing()
+
+
+/obj/structure/machinery/shower/attackby(obj/item/I as obj, mob/user as mob)
+ if(I.type == /obj/item/device/analyzer)
+ to_chat(user, SPAN_NOTICE("The water temperature seems to be [watertemp]."))
+ if(HAS_TRAIT(I, TRAIT_TOOL_WRENCH))
+ to_chat(user, SPAN_NOTICE("You begin to adjust the temperature valve with \the [I]."))
+ if(do_after(user, 50, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+ switch(watertemp)
+ if("normal")
+ watertemp = "freezing"
+ if("freezing")
+ watertemp = "boiling"
+ if("boiling")
+ watertemp = "normal"
+ user.visible_message(SPAN_NOTICE("[user] adjusts the shower with \the [I]."), SPAN_NOTICE("You adjust the shower with \the [I]."))
+ add_fingerprint(user)
+
+
+/obj/structure/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up
+ overlays.Cut() //once it's been on for a while, in addition to handling the water overlay.
+ QDEL_NULL(mymist)
+
+ if(on)
+ overlays += image('icons/obj/structures/props/watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
+ if(watertemp == "freezing")
+ return
+ if(!ismist)
+ spawn(50)
+ if(src && on)
+ ismist = 1
+ mymist = new /obj/effect/mist(loc)
+ else
+ ismist = 1
+ mymist = new /obj/effect/mist(loc)
+ else if(ismist)
+ ismist = 1
+ mymist = new /obj/effect/mist(loc)
+ spawn(250)
+ if(src && !on)
+ QDEL_NULL(mymist)
+ ismist = 0
+
+
+/obj/structure/machinery/shower/Crossed(atom/movable/O)
+ ..()
+ wash(O)
+ if(ismob(O))
+ mobpresent++
+ check_heat(O)
+
+
+/obj/structure/machinery/shower/Uncrossed(atom/movable/O)
+ if(ismob(O))
+ mobpresent--
+ ..()
+
+//Yes, showers are super powerful as far as washing goes.
+/obj/structure/machinery/shower/proc/wash(atom/movable/O as obj|mob)
+ if(!on) return
+
+
+ if(isliving(O))
+ var/mob/living/L = O
+ L.ExtinguishMob()
+ L.fire_stacks = -20 //Douse ourselves with water to avoid fire more easily
+ to_chat(L, SPAN_WARNING("You've been drenched in water!"))
+ if(iscarbon(O))
+ var/mob/living/carbon/M = O
+ if(M.r_hand)
+ M.r_hand.clean_blood()
+ if(M.l_hand)
+ M.l_hand.clean_blood()
+ if(M.back)
+ if(M.back.clean_blood())
+ M.update_inv_back(0)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ var/washgloves = 1
+ var/washshoes = 1
+ var/washmask = 1
+ var/washears = 1
+ var/washglasses = 1
+
+ if(H.wear_suit)
+ washgloves = !(H.wear_suit.flags_inv_hide & HIDEGLOVES)
+ washshoes = !(H.wear_suit.flags_inv_hide & HIDESHOES)
+
+ if(H.head)
+ washmask = !(H.head.flags_inv_hide & HIDEMASK)
+ washglasses = !(H.head.flags_inv_hide & HIDEEYES)
+ washears = !(H.head.flags_inv_hide & HIDEEARS)
+
+ if(H.wear_mask)
+ if (washears)
+ washears = !(H.wear_mask.flags_inv_hide & HIDEEARS)
+ if (washglasses)
+ washglasses = !(H.wear_mask.flags_inv_hide & HIDEEYES)
+
+ if(H.head)
+ if(H.head.clean_blood())
+ H.update_inv_head()
+ if(H.wear_suit)
+ if(H.wear_suit.clean_blood())
+ H.update_inv_wear_suit()
+ else if(H.w_uniform)
+ if(H.w_uniform.clean_blood())
+ H.update_inv_w_uniform()
+ if(H.gloves && washgloves)
+ if(H.gloves.clean_blood())
+ H.update_inv_gloves()
+ if(H.shoes && washshoes)
+ if(H.shoes.clean_blood())
+ H.update_inv_shoes()
+ if(H.wear_mask && washmask)
+ if(H.wear_mask.clean_blood())
+ H.update_inv_wear_mask()
+ if(H.glasses && washglasses)
+ if(H.glasses.clean_blood())
+ H.update_inv_glasses()
+ if((H.wear_l_ear || H.wear_r_ear) && washears)
+ if((H.wear_l_ear && H.wear_l_ear.clean_blood()) ||(H.wear_r_ear && H.wear_r_ear.clean_blood()))
+ H.update_inv_ears()
+ if(H.belt)
+ if(H.belt.clean_blood())
+ H.update_inv_belt()
+ H.clean_blood(washshoes)
+ else
+ if(M.wear_mask) //if the mob is not human, it cleans the mask without asking for bitflags
+ if(M.wear_mask.clean_blood())
+ M.update_inv_wear_mask()
+ M.clean_blood()
+ else
+ O.clean_blood()
+
+ if(isturf(loc))
+ var/turf/tile = loc
+ tile.clean_blood()
+ for(var/obj/effect/E in tile)
+ if(istype(E,/obj/effect/decal/cleanable) || istype(E,/obj/effect/overlay))
+ qdel(E)
+
+
+/obj/structure/machinery/shower/process()
+ if(!on) return
+ wash_floor()
+ if(!mobpresent) return
+ for(var/mob/living/carbon/C in loc)
+ check_heat(C)
+
+
+/obj/structure/machinery/shower/proc/wash_floor()
+ if(!ismist && is_washing)
+ return
+ is_washing = 1
+ var/turf/T = get_turf(src)
+// reagents.add_reagent("water", 2)
+ T.clean(src)
+ addtimer(VARSET_CALLBACK(src, is_washing, FALSE), 10 SECONDS)
+
+
+/obj/structure/machinery/shower/proc/check_heat(mob/M as mob)
+ if(!on || watertemp == "normal") return
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+
+ if(watertemp == "freezing")
+ C.bodytemperature = max(80, C.bodytemperature - 80)
+ C.recalculate_move_delay = TRUE
+ to_chat(C, SPAN_WARNING("The water is freezing!"))
+ return
+ if(watertemp == "boiling")
+ C.bodytemperature = min(500, C.bodytemperature + 35)
+ C.recalculate_move_delay = TRUE
+ C.apply_damage(5, BURN)
+ to_chat(C, SPAN_DANGER("The water is searing!"))
+ return
diff --git a/code/game/objects/structures/sink.dm b/code/game/objects/structures/sink.dm
new file mode 100644
index 000000000000..6bac40ea7da4
--- /dev/null
+++ b/code/game/objects/structures/sink.dm
@@ -0,0 +1,122 @@
+/obj/structure/sink
+ name = "sink"
+ icon = 'icons/obj/structures/props/watercloset.dmi'
+ icon_state = "sink_emptied_animation"
+ desc = "A sink used for washing one's hands and face."
+ anchored = TRUE
+ /// if something's being washed at the moment
+ var/busy = FALSE
+
+
+/obj/structure/sink/Initialize()
+ . = ..()
+ if(prob(50))
+ icon_state = "sink_emptied"
+
+
+/obj/structure/sink/proc/stop_flow() //sets sink animation to normal sink (without running water)
+
+ if(prob(50))
+ icon_state = "sink_emptied_animation"
+ else
+ icon_state = "sink_emptied"
+ flick("sink_animation_empty", src)
+
+
+/obj/structure/sink/attack_hand(mob/user)
+ if(isRemoteControlling(user))
+ return
+
+ if(!Adjacent(user))
+ return
+
+ if(busy)
+ to_chat(user, SPAN_DANGER("Someone's already washing here."))
+ return
+
+ to_chat(usr, SPAN_NOTICE(" You start washing your hands."))
+ flick("sink_animation_fill", src) //<- play the filling animation then automatically switch back to the loop
+ icon_state = "sink_animation_fill_loop" //<- set it to the loop
+ addtimer(CALLBACK(src, PROC_REF(stop_flow)), 6 SECONDS)
+ playsound(loc, 'sound/effects/sinkrunning.ogg', 25, TRUE)
+
+ busy = TRUE
+ sleep(40)
+ busy = FALSE
+
+ if(!Adjacent(user)) return //Person has moved away from the sink
+
+ user.clean_blood()
+ if(ishuman(user))
+ user:update_inv_gloves()
+ for(var/mob/V in viewers(src, null))
+ V.show_message(SPAN_NOTICE("[user] washes their hands using \the [src]."), SHOW_MESSAGE_VISIBLE)
+
+
+/obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob)
+ if(busy)
+ to_chat(user, SPAN_DANGER("Someone's already washing here."))
+ return
+
+ var/obj/item/reagent_container/RG = O
+ if (istype(RG) && RG.is_open_container())
+ RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
+ user.visible_message(SPAN_NOTICE("[user] fills \the [RG] using \the [src]."),SPAN_NOTICE("You fill \the [RG] using \the [src]."))
+ return
+
+ else if (istype(O, /obj/item/weapon/baton))
+ var/obj/item/weapon/baton/B = O
+ if(B.bcell)
+ if(B.bcell.charge > 0 && B.status == 1)
+ flick("baton_active", src)
+ user.apply_effect(10, STUN)
+ user.stuttering = 10
+ user.apply_effect(10, WEAKEN)
+ B.deductcharge(B.hitcost)
+ user.visible_message( \
+ SPAN_DANGER("[user] was stunned by \his wet [O]!"), \
+ SPAN_DANGER("You were stunned by your wet [O]!"))
+ return
+
+ var/turf/location = user.loc
+ if(!isturf(location)) return
+
+ var/obj/item/I = O
+ if(!I || !istype(I,/obj/item)) return
+
+ to_chat(usr, SPAN_NOTICE(" You start washing \the [I]."))
+
+ busy = TRUE
+ sleep(40)
+ busy = FALSE
+
+ if(user.loc != location) return //User has moved
+ if(!I) return //Item's been destroyed while washing
+ if(user.get_active_hand() != I) return //Person has switched hands or the item in their hands
+
+ O.clean_blood()
+ user.visible_message( \
+ SPAN_NOTICE("[user] washes \a [I] using \the [src]."), \
+ SPAN_NOTICE("You wash \a [I] using \the [src]."))
+
+
+/obj/structure/sink/kitchen
+ name = "kitchen sink"
+ icon_state = "sink_alt"
+
+
+/obj/structure/sink/puddle //splishy splashy ^_^
+ name = "puddle"
+ icon_state = "puddle"
+
+
+/obj/structure/sink/puddle/attack_hand(mob/M as mob)
+ icon_state = "puddle-splash"
+ ..()
+ icon_state = "puddle"
+
+
+/obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob)
+ icon_state = "puddle-splash"
+ ..()
+ icon_state = "puddle"
diff --git a/code/game/objects/structures/urinal.dm b/code/game/objects/structures/urinal.dm
new file mode 100644
index 000000000000..c6d14f46540a
--- /dev/null
+++ b/code/game/objects/structures/urinal.dm
@@ -0,0 +1,22 @@
+/obj/structure/urinal
+ name = "urinal"
+ desc = "The HU-452, an experimental urinal."
+ icon = 'icons/obj/structures/props/watercloset.dmi'
+ icon_state = "urinal"
+ density = FALSE
+ anchored = TRUE
+
+/obj/structure/urinal/attackby(obj/item/I, mob/living/user)
+ if(istype(I, /obj/item/grab))
+ if(isxeno(user)) return
+ var/obj/item/grab/G = I
+ if(isliving(G.grabbed_thing))
+ var/mob/living/GM = G.grabbed_thing
+ if(user.grab_level > GRAB_PASSIVE)
+ if(!GM.loc == get_turf(src))
+ to_chat(user, SPAN_NOTICE("[GM.name] needs to be on the urinal."))
+ return
+ user.visible_message(SPAN_DANGER("[user] slams [GM.name] into [src]!"), SPAN_NOTICE("You slam [GM.name] into [src]!"))
+ GM.apply_damage(8, BRUTE)
+ else
+ to_chat(user, SPAN_NOTICE("You need a tighter grip."))
diff --git a/code/game/objects/structures/vulture_spotter.dm b/code/game/objects/structures/vulture_spotter.dm
index d90a1ec1615a..4d8e5d06749b 100644
--- a/code/game/objects/structures/vulture_spotter.dm
+++ b/code/game/objects/structures/vulture_spotter.dm
@@ -87,7 +87,7 @@
if(user.client)
RegisterSignal(user.client, COMSIG_PARENT_QDELETING, PROC_REF(do_unscope))
user.client.change_view(scope_zoom, src)
- RegisterSignal(user, list(COMSIG_MOB_PICKUP_ITEM, COMSIG_MOB_RESISTED), PROC_REF(do_unscope))
+ RegisterSignal(user, list(COMSIG_MOB_PICKUP_ITEM, COMSIG_MOB_RESISTED, COMSIG_MOB_DEATH, COMSIG_LIVING_SET_BODY_POSITION), PROC_REF(do_unscope))
user.see_in_dark += darkness_view
user.lighting_alpha = 127
user.sync_lighting_plane_alpha()
@@ -234,7 +234,7 @@
user.lighting_alpha = user.default_lighting_alpha
user.sync_lighting_plane_alpha()
user.clear_fullscreen("vulture_spotter")
- UnregisterSignal(user, list(COMSIG_MOB_PICKUP_ITEM, COMSIG_MOB_RESISTED))
+ UnregisterSignal(user, list(COMSIG_MOB_PICKUP_ITEM, COMSIG_MOB_RESISTED, COMSIG_MOB_DEATH, COMSIG_LIVING_SET_BODY_POSITION))
user.pixel_x = 0
user.pixel_y = 0
if(user.client)
@@ -295,6 +295,10 @@
return rifle.attachments["rail"]
+/obj/structure/vulture_spotter_tripod/check_eye(mob/living/user)
+ if((user.body_position != STANDING_UP) || (get_dist(user, src) > 0) || user.is_mob_incapacitated() || !user.client)
+ do_unscope()
+
/datum/action/vulture_tripod_unscope
name = "Stop Using Scope"
action_icon_state = "vulture_tripod_close"
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index ea93d868c5a1..1014e8ab7a96 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -1,5 +1,3 @@
-//todo: toothbrushes, and some sort of "toilet-filthinator" for the hos
-
/obj/structure/toilet
name = "toilet"
desc = "The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean."
@@ -9,16 +7,19 @@
anchored = TRUE
can_buckle = TRUE
buckle_lying = 0
- var/open = 0 //if the lid is up
- var/cistern = 0 //if the cistern bit is open
- var/w_items = 0 //the combined w_class of all the items in the cistern
- var/mob/living/swirlie = null //the mob being given a swirlie
+ /// if the lid is up
+ var/open = 0
+ /// if the cistern bit is open
+ var/cistern = 0
+ /// the combined w_class of all the items in the cistern
+ var/w_items = 0
+ /// the mob being given a swirlie
+ var/mob/living/swirlie = null
var/list/buckling_y = list("north" = 1, "south" = 4, "east" = 0, "west" = 0)
var/list/buckling_x = list("north" = 0, "south" = 0, "east" = -5, "west" = 4)
var/atom/movable/overlay/cistern_overlay
-
/obj/structure/toilet/Initialize()
. = ..()
open = round(rand(0, 1))
@@ -29,6 +30,7 @@
vis_contents += cistern_overlay
update_icon()
+
/obj/structure/toilet/attack_hand(mob/living/user as mob)
if(buckled_mob)
manual_unbuckle(user)
@@ -69,7 +71,6 @@
flick("cistern[cistern]_flush", cistern_overlay)
-
/obj/structure/toilet/send_buckling_message(mob/M, mob/user)
if (M == user)
to_chat(M, SPAN_NOTICE("You seat yourself onto the toilet"))
@@ -77,10 +78,10 @@
to_chat(user, SPAN_NOTICE("[M] has been seated onto the toilet by [user]."))
to_chat(M, SPAN_NOTICE("You have been seated onto the toilet by [user]."))
+
/obj/structure/toilet/afterbuckle(mob/M)
. = ..()
-
if(. && buckled_mob == M)
var/direction = dir2text(dir)
M.pixel_y = buckling_y[direction] + pixel_y
@@ -106,7 +107,6 @@
M.overlays -= image("toilet00")
-
/obj/structure/toilet/verb/flip_lid()
set name = "Flip lid"
set category = "Object"
@@ -116,11 +116,11 @@
update_icon()
-
/obj/structure/toilet/update_icon()
icon_state = "toilet[open][cistern]"
cistern_overlay.icon_state = "cistern[cistern]"
+
/obj/structure/toilet/attackby(obj/item/I, mob/living/user)
if(HAS_TRAIT(I, TRAIT_TOOL_CROWBAR))
to_chat(user, SPAN_NOTICE("You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]."))
@@ -168,374 +168,3 @@
w_items += I.w_class
to_chat(user, "You carefully place \the [I] into the cistern.")
return
-
-
-
-/obj/structure/urinal
- name = "urinal"
- desc = "The HU-452, an experimental urinal."
- icon = 'icons/obj/structures/props/watercloset.dmi'
- icon_state = "urinal"
- density = FALSE
- anchored = TRUE
-
-/obj/structure/urinal/attackby(obj/item/I, mob/living/user)
- if(istype(I, /obj/item/grab))
- if(isxeno(user)) return
- var/obj/item/grab/G = I
- if(isliving(G.grabbed_thing))
- var/mob/living/GM = G.grabbed_thing
- if(user.grab_level > GRAB_PASSIVE)
- if(!GM.loc == get_turf(src))
- to_chat(user, SPAN_NOTICE("[GM.name] needs to be on the urinal."))
- return
- user.visible_message(SPAN_DANGER("[user] slams [GM.name] into [src]!"), SPAN_NOTICE("You slam [GM.name] into [src]!"))
- GM.apply_damage(8, BRUTE)
- else
- to_chat(user, SPAN_NOTICE("You need a tighter grip."))
-
-
-
-/obj/structure/machinery/shower
- name = "shower"
- desc = "The HS-451. Installed in the 2050s by the Weyland Hygiene Division."
- icon = 'icons/obj/structures/props/watercloset.dmi'
- icon_state = "shower"
- density = FALSE
- anchored = TRUE
- use_power = USE_POWER_NONE
- var/on = 0
- var/obj/effect/mist/mymist = null
- var/ismist = 0 //needs a var so we can make it linger~
- var/watertemp = "normal" //freezing, normal, or boiling
- var/mobpresent = 0 //true if there is a mob on the shower's loc, this is to ease process()
- var/is_washing = 0
-
-/obj/structure/machinery/shower/Initialize()
- . = ..()
- create_reagents(2)
-
-//add heat controls? when emagged, you can freeze to death in it?
-
-/obj/effect/mist
- name = "mist"
- icon = 'icons/obj/structures/props/watercloset.dmi'
- icon_state = "mist"
- layer = FLY_LAYER
- anchored = TRUE
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-
-/obj/structure/machinery/shower/attack_hand(mob/M as mob)
- on = !on
- update_icon()
- if(on)
- start_processing()
- if (M.loc == loc)
- wash(M)
- check_heat(M)
- for (var/atom/movable/G in src.loc)
- G.clean_blood()
- else
- stop_processing()
-
-/obj/structure/machinery/shower/attackby(obj/item/I as obj, mob/user as mob)
- if(I.type == /obj/item/device/analyzer)
- to_chat(user, SPAN_NOTICE("The water temperature seems to be [watertemp]."))
- if(HAS_TRAIT(I, TRAIT_TOOL_WRENCH))
- to_chat(user, SPAN_NOTICE("You begin to adjust the temperature valve with \the [I]."))
- if(do_after(user, 50, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
- switch(watertemp)
- if("normal")
- watertemp = "freezing"
- if("freezing")
- watertemp = "boiling"
- if("boiling")
- watertemp = "normal"
- user.visible_message(SPAN_NOTICE("[user] adjusts the shower with \the [I]."), SPAN_NOTICE("You adjust the shower with \the [I]."))
- add_fingerprint(user)
-
-/obj/structure/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up
- overlays.Cut() //once it's been on for a while, in addition to handling the water overlay.
- QDEL_NULL(mymist)
-
- if(on)
- overlays += image('icons/obj/structures/props/watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
- if(watertemp == "freezing")
- return
- if(!ismist)
- spawn(50)
- if(src && on)
- ismist = 1
- mymist = new /obj/effect/mist(loc)
- else
- ismist = 1
- mymist = new /obj/effect/mist(loc)
- else if(ismist)
- ismist = 1
- mymist = new /obj/effect/mist(loc)
- spawn(250)
- if(src && !on)
- QDEL_NULL(mymist)
- ismist = 0
-
-/obj/structure/machinery/shower/Crossed(atom/movable/O)
- ..()
- wash(O)
- if(ismob(O))
- mobpresent++
- check_heat(O)
-
-/obj/structure/machinery/shower/Uncrossed(atom/movable/O)
- if(ismob(O))
- mobpresent--
- ..()
-
-//Yes, showers are super powerful as far as washing goes.
-/obj/structure/machinery/shower/proc/wash(atom/movable/O as obj|mob)
- if(!on) return
-
-
- if(isliving(O))
- var/mob/living/L = O
- L.ExtinguishMob()
- L.fire_stacks = -20 //Douse ourselves with water to avoid fire more easily
- to_chat(L, SPAN_WARNING("You've been drenched in water!"))
- if(iscarbon(O))
- var/mob/living/carbon/M = O
- if(M.r_hand)
- M.r_hand.clean_blood()
- if(M.l_hand)
- M.l_hand.clean_blood()
- if(M.back)
- if(M.back.clean_blood())
- M.update_inv_back(0)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/washgloves = 1
- var/washshoes = 1
- var/washmask = 1
- var/washears = 1
- var/washglasses = 1
-
- if(H.wear_suit)
- washgloves = !(H.wear_suit.flags_inv_hide & HIDEGLOVES)
- washshoes = !(H.wear_suit.flags_inv_hide & HIDESHOES)
-
- if(H.head)
- washmask = !(H.head.flags_inv_hide & HIDEMASK)
- washglasses = !(H.head.flags_inv_hide & HIDEEYES)
- washears = !(H.head.flags_inv_hide & HIDEEARS)
-
- if(H.wear_mask)
- if (washears)
- washears = !(H.wear_mask.flags_inv_hide & HIDEEARS)
- if (washglasses)
- washglasses = !(H.wear_mask.flags_inv_hide & HIDEEYES)
-
- if(H.head)
- if(H.head.clean_blood())
- H.update_inv_head()
- if(H.wear_suit)
- if(H.wear_suit.clean_blood())
- H.update_inv_wear_suit()
- else if(H.w_uniform)
- if(H.w_uniform.clean_blood())
- H.update_inv_w_uniform()
- if(H.gloves && washgloves)
- if(H.gloves.clean_blood())
- H.update_inv_gloves()
- if(H.shoes && washshoes)
- if(H.shoes.clean_blood())
- H.update_inv_shoes()
- if(H.wear_mask && washmask)
- if(H.wear_mask.clean_blood())
- H.update_inv_wear_mask()
- if(H.glasses && washglasses)
- if(H.glasses.clean_blood())
- H.update_inv_glasses()
- if((H.wear_l_ear || H.wear_r_ear) && washears)
- if((H.wear_l_ear && H.wear_l_ear.clean_blood()) ||(H.wear_r_ear && H.wear_r_ear.clean_blood()))
- H.update_inv_ears()
- if(H.belt)
- if(H.belt.clean_blood())
- H.update_inv_belt()
- H.clean_blood(washshoes)
- else
- if(M.wear_mask) //if the mob is not human, it cleans the mask without asking for bitflags
- if(M.wear_mask.clean_blood())
- M.update_inv_wear_mask()
- M.clean_blood()
- else
- O.clean_blood()
-
- if(isturf(loc))
- var/turf/tile = loc
- tile.clean_blood()
- for(var/obj/effect/E in tile)
- if(istype(E,/obj/effect/decal/cleanable) || istype(E,/obj/effect/overlay))
- qdel(E)
-
-/obj/structure/machinery/shower/process()
- if(!on) return
- wash_floor()
- if(!mobpresent) return
- for(var/mob/living/carbon/C in loc)
- check_heat(C)
-
-/obj/structure/machinery/shower/proc/wash_floor()
- if(!ismist && is_washing)
- return
- is_washing = 1
- var/turf/T = get_turf(src)
-// reagents.add_reagent("water", 2)
- T.clean(src)
- addtimer(VARSET_CALLBACK(src, is_washing, FALSE), 10 SECONDS)
-
-/obj/structure/machinery/shower/proc/check_heat(mob/M as mob)
- if(!on || watertemp == "normal") return
- if(iscarbon(M))
- var/mob/living/carbon/C = M
-
- if(watertemp == "freezing")
- C.bodytemperature = max(80, C.bodytemperature - 80)
- C.recalculate_move_delay = TRUE
- to_chat(C, SPAN_WARNING("The water is freezing!"))
- return
- if(watertemp == "boiling")
- C.bodytemperature = min(500, C.bodytemperature + 35)
- C.recalculate_move_delay = TRUE
- C.apply_damage(5, BURN)
- to_chat(C, SPAN_DANGER("The water is searing!"))
- return
-
-
-
-/obj/item/toy/bikehorn/rubberducky
- name = "rubber ducky"
- desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~" //thanks doohl
- icon = 'icons/obj/structures/props/watercloset.dmi'
- icon_state = "rubberducky"
- item_state = "rubberducky"
-
-
-
-/obj/structure/sink
- name = "sink"
- icon = 'icons/obj/structures/props/watercloset.dmi'
- icon_state = "sink_emptied_animation"
- desc = "A sink used for washing one's hands and face."
- anchored = TRUE
- var/busy = FALSE //Something's being washed at the moment
-
-/obj/structure/sink/Initialize()
- . = ..()
- if(prob(50))
- icon_state = "sink_emptied"
-
-
-
-/obj/structure/sink/proc/stop_flow() //sets sink animation to normal sink (without running water)
-
- if(prob(50))
- icon_state = "sink_emptied_animation"
- else
- icon_state = "sink_emptied"
- flick("sink_animation_empty", src)
-
-
-
-/obj/structure/sink/attack_hand(mob/user)
- if(isRemoteControlling(user))
- return
-
- if(!Adjacent(user))
- return
-
- if(busy)
- to_chat(user, SPAN_DANGER("Someone's already washing here."))
- return
-
- to_chat(usr, SPAN_NOTICE(" You start washing your hands."))
- flick("sink_animation_fill", src) //<- play the filling animation then automatically switch back to the loop
- icon_state = "sink_animation_fill_loop" //<- set it to the loop
- addtimer(CALLBACK(src, PROC_REF(stop_flow)), 6 SECONDS)
- playsound(loc, 'sound/effects/sinkrunning.ogg', 25, TRUE)
-
- busy = TRUE
- sleep(40)
- busy = FALSE
-
- if(!Adjacent(user)) return //Person has moved away from the sink
-
- user.clean_blood()
- if(ishuman(user))
- user:update_inv_gloves()
- for(var/mob/V in viewers(src, null))
- V.show_message(SPAN_NOTICE("[user] washes their hands using \the [src]."), SHOW_MESSAGE_VISIBLE)
-
-
-/obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob)
- if(busy)
- to_chat(user, SPAN_DANGER("Someone's already washing here."))
- return
-
- var/obj/item/reagent_container/RG = O
- if (istype(RG) && RG.is_open_container())
- RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
- user.visible_message(SPAN_NOTICE("[user] fills \the [RG] using \the [src]."),SPAN_NOTICE("You fill \the [RG] using \the [src]."))
- return
-
- else if (istype(O, /obj/item/weapon/baton))
- var/obj/item/weapon/baton/B = O
- if(B.bcell)
- if(B.bcell.charge > 0 && B.status == 1)
- flick("baton_active", src)
- user.apply_effect(10, STUN)
- user.stuttering = 10
- user.apply_effect(10, WEAKEN)
- B.deductcharge(B.hitcost)
- user.visible_message( \
- SPAN_DANGER("[user] was stunned by \his wet [O]!"), \
- SPAN_DANGER("You were stunned by your wet [O]!"))
- return
-
- var/turf/location = user.loc
- if(!isturf(location)) return
-
- var/obj/item/I = O
- if(!I || !istype(I,/obj/item)) return
-
- to_chat(usr, SPAN_NOTICE(" You start washing \the [I]."))
-
- busy = TRUE
- sleep(40)
- busy = FALSE
-
- if(user.loc != location) return //User has moved
- if(!I) return //Item's been destroyed while washing
- if(user.get_active_hand() != I) return //Person has switched hands or the item in their hands
-
- O.clean_blood()
- user.visible_message( \
- SPAN_NOTICE("[user] washes \a [I] using \the [src]."), \
- SPAN_NOTICE("You wash \a [I] using \the [src]."))
-
-
-/obj/structure/sink/kitchen
- name = "kitchen sink"
- icon_state = "sink_alt"
-
-
-/obj/structure/sink/puddle //splishy splashy ^_^
- name = "puddle"
- icon_state = "puddle"
-
-/obj/structure/sink/puddle/attack_hand(mob/M as mob)
- icon_state = "puddle-splash"
- ..()
- icon_state = "puddle"
-
-/obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob)
- icon_state = "puddle-splash"
- ..()
- icon_state = "puddle"
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 6ab70b8266f4..226045caaea6 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -599,6 +599,34 @@
unacidable = TRUE
health = 1000000 //Failsafe, shouldn't matter
+/obj/structure/window/framed/almayer/aicore
+ icon_state = "ai_rwindow0"
+ basestate = "ai_rwindow"
+ window_frame = /obj/structure/window_frame/almayer/aicore
+
+/obj/structure/window/framed/almayer/aicore/hull
+ name = "hull window"
+ desc = "An ultra-reinforced window designed to protect the AI Core. Made out of exotic materials to prevent hull breaches, nothing will get through here."
+ not_damageable = TRUE
+ not_deconstructable = TRUE
+ unslashable = TRUE
+ unacidable = TRUE
+ health = 1000000 //Failsafe, shouldn't matter
+
+/obj/structure/window/framed/almayer/aicore/white
+ icon_state = "w_ai_rwindow0"
+ basestate = "w_ai_rwindow"
+ window_frame = /obj/structure/window_frame/almayer/aicore/white
+
+/obj/structure/window/framed/almayer/aicore/white/hull
+ name = "hull window"
+ desc = "An ultra-reinforced window designed to protect the AI Core. Made out of exotic materials to prevent hull breaches, nothing will get through here."
+ not_damageable = TRUE
+ not_deconstructable = TRUE
+ unslashable = TRUE
+ unacidable = TRUE
+ health = 1000000 //Failsafe, shouldn't matter
+
/obj/structure/window/framed/colony
name = "window"
icon_state = "col_window0"
diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm
index 2c165b424dad..460a11af1000 100644
--- a/code/game/objects/structures/window_frame.dm
+++ b/code/game/objects/structures/window_frame.dm
@@ -174,6 +174,16 @@
basestate = "white_window"
window_type = /obj/structure/window/framed/almayer/white
+/obj/structure/window_frame/almayer/aicore
+ icon_state = "ai_window0_frame"
+ basestate = "ai_window"
+ window_type = /obj/structure/window/framed/almayer/aicore
+
+/obj/structure/window_frame/almayer/aicore/white
+ icon_state = "w_ai_window0_frame"
+ basestate = "w_ai_window"
+ window_type = /obj/structure/window/framed/almayer/aicore/white
+
/obj/structure/window_frame/almayer/requisitions/attackby(obj/item/W, mob/living/user)
if(istype(W, sheet_type))
to_chat(user, SPAN_WARNING("You can't repair this window."))
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 893071c758ed..c4698e5722c5 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -1277,7 +1277,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
/datum/controller/supply/proc/black_market_investigation()
black_market_heat = -1
- SSticker.mode.get_specific_call("Inspection - Colonial Marshal Ledger Investigation Team", TRUE, TRUE)
+ SSticker.mode.get_specific_call(/datum/emergency_call/inspection_cmb/black_market, TRUE, TRUE) // "Inspection - Colonial Marshals Ledger Investigation Team"
log_game("Black Market Inspection auto-triggered.")
/obj/structure/machinery/computer/supplycomp/proc/is_buyable(datum/supply_packs/supply_pack)
@@ -1402,11 +1402,13 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
return
dat += "Platform position: "
- if (SSshuttle.vehicle_elevator.timeLeft())
+ if (SSshuttle.vehicle_elevator.mode != SHUTTLE_IDLE)
dat += "Moving"
else
if(is_mainship_level(SSshuttle.vehicle_elevator.z))
dat += "Raised"
+ if(!spent)
+ dat += " \[Lower\]"
else
dat += "Lowered"
dat += " "
@@ -1442,15 +1444,12 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
world.log << "## ERROR: Eek. The supply/elevator datum is missing somehow."
return
- if(!should_block_game_interaction(SSshuttle.vehicle_elevator))
- to_chat(usr, SPAN_WARNING("The elevator needs to be in the cargo bay dock to call a vehicle up. Ask someone to send it away."))
- return
-
if(isturf(loc) && ( in_range(src, usr) || isSilicon(usr) ) )
usr.set_interaction(src)
if(href_list["get_vehicle"])
- if(is_mainship_level(SSshuttle.vehicle_elevator.z))
+ if(is_mainship_level(SSshuttle.vehicle_elevator.z) || SSshuttle.vehicle_elevator.mode != SHUTTLE_IDLE)
+ to_chat(usr, SPAN_WARNING("The elevator needs to be in the cargo bay dock to call a vehicle up!"))
return
// dunno why the +1 is needed but the vehicles spawn off-center
var/turf/middle_turf = get_turf(SSshuttle.vehicle_elevator)
@@ -1458,9 +1457,11 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
var/obj/vehicle/multitile/ordered_vehicle
var/datum/vehicle_order/VO = locate(href_list["get_vehicle"])
+ if(!(VO in vehicles))
+ return
- if(!VO) return
- if(VO.has_vehicle_lock()) return
+ if(VO?.has_vehicle_lock())
+ return
spent = TRUE
ordered_vehicle = new VO.ordered_vehicle(middle_turf)
@@ -1470,5 +1471,11 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_VEHICLE_ORDERED, ordered_vehicle)
+ else if(href_list["lower_elevator"])
+ if(!is_mainship_level(SSshuttle.vehicle_elevator.z))
+ return
+
+ SSshuttle.vehicle_elevator.request(SSshuttle.getDock("adminlevel vehicle"))
+
add_fingerprint(usr)
updateUsrDialog()
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index bf84bc04bf10..abc745dbdd45 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -15,6 +15,21 @@
icon_state = "black"
mouse_opacity = FALSE
+/// Cordon turf marking z-level boundaries and surrounding reservations
+/turf/closed/cordon
+ name = "world border"
+ icon = 'icons/turf/shuttle.dmi'
+ icon_state = "pclosed"
+ layer = ABOVE_TURF_LAYER
+ baseturfs = /turf/closed/cordon
+
+/// Used as placeholder turf when something went really wrong, as per /tg/ string lists handler
+/turf/closed/cordon/debug
+ name = "debug turf"
+ desc = "This turf shouldn't be here and probably result of incorrect turf replacement. Adminhelp about it or report it in an issue."
+ color = "#660088"
+ baseturfs = /turf/closed/cordon/debug
+
/turf/closed/mineral //mineral deposits
name = "Rock"
icon = 'icons/turf/walls/walls.dmi'
diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm
index f957686fac22..8a8698d0c047 100644
--- a/code/game/turfs/floor_types.dm
+++ b/code/game/turfs/floor_types.dm
@@ -180,7 +180,22 @@
/turf/open/floor/plating/plating_catwalk/shiva
icon = 'icons/turf/floors/ice_colony/shiva_floor.dmi'
+/turf/open/floor/plating/plating_catwalk/aicore
+ icon = 'icons/turf/floors/aicore.dmi'
+ icon_state = "ai_plating_catwalk"
+/turf/open/floor/plating/plating_catwalk/aicore/update_icon()
+ . = ..()
+ if(covered)
+ overlays += image(icon, src, "ai_catwalk", CATWALK_LAYER)
+
+/turf/open/floor/plating/plating_catwalk/aicore/white
+ icon_state = "w_ai_plating_catwalk"
+
+/turf/open/floor/plating/plating_catwalk/aicore/white/update_icon()
+ . = ..()
+ if(covered)
+ overlays += image(icon, src, "w_ai_catwalk", CATWALK_LAYER)
/turf/open/floor/plating/ironsand
name = "Iron Sand"
@@ -210,21 +225,13 @@
plating_type = /turf/open/floor/tdome
hull_floor = TRUE
-//Cargo elevator
+/// Base type of the requisitions and vehicle bay elevator pits.
/turf/open/floor/almayer/empty
- name = "empty space"
- desc = "There seems to be an awful lot of machinery down below"
+ name = "\proper empty space"
+ desc = "There seems to be an awful lot of machinery down below..."
icon = 'icons/turf/floors/floors.dmi'
icon_state = "black"
-/turf/open/floor/almayer/empty/Initialize(mapload, ...)
- . = ..()
- GLOB.asrs_empty_space_tiles_list += src
-
-/turf/open/floor/almayer/empty/Destroy(force) // may as well
- . = ..()
- GLOB.asrs_empty_space_tiles_list -= src
-
/turf/open/floor/almayer/empty/is_weedable()
return NOT_WEEDABLE
@@ -239,9 +246,14 @@
/turf/open/floor/almayer/empty/Entered(atom/movable/AM)
..()
- if(!isobserver(AM))
+ if(!isobserver(AM) && !istype(AM, /obj/effect/elevator) && !istype(AM, /obj/docking_port))
addtimer(CALLBACK(src, PROC_REF(enter_depths), AM), 0.2 SECONDS)
+/// Returns a list of turfs to be used as a destination for anyone unfortunate enough to fall into the pit.
+/turf/open/floor/almayer/empty/proc/get_depths_turfs()
+ // Empty proc to be overridden.
+ return
+
/turf/open/floor/almayer/empty/proc/enter_depths(atom/movable/AM)
if(AM.throwing == 0 && istype(get_turf(AM), /turf/open/floor/almayer/empty))
AM.visible_message(SPAN_WARNING("[AM] falls into the depths!"), SPAN_WARNING("You fall into the depths!"))
@@ -252,14 +264,12 @@
for(var/atom/computer as anything in GLOB.supply_controller.bound_supply_computer_list)
computer.balloon_alert_to_viewers("you hear horrifying noises coming from the elevator!")
- var/area/area_shuttle = GLOB.supply_controller.shuttle?.get_location_area()
- if(!area_shuttle)
- return
- var/list/turflist = list()
- for(var/turf/turf in area_shuttle)
- turflist |= turf
+ var/list/depths_turfs = get_depths_turfs()
+ if(!length(depths_turfs))
+ // If this ever happens, something went wrong.
+ CRASH("get_depths_turfs() didn't return anything!")
- thrown_human.forceMove(pick(turflist))
+ thrown_human.forceMove(pick(depths_turfs))
var/timer = 0.5 SECONDS
for(var/index in 1 to 10)
@@ -268,9 +278,34 @@
return
else
- for(var/obj/effect/decal/cleanable/C in contents) //for the off chance of someone bleeding mid=flight
+ for(var/obj/effect/decal/cleanable/C in contents) //for the off chance of someone bleeding mid-flight
qdel(C)
+/// Requisitions pit.
+/turf/open/floor/almayer/empty/requisitions
+
+/turf/open/floor/almayer/empty/requisitions/Initialize(mapload, ...)
+ . = ..()
+ GLOB.asrs_empty_space_tiles_list += src
+
+/turf/open/floor/almayer/empty/requisitions/Destroy(force)
+ GLOB.asrs_empty_space_tiles_list -= src
+ return ..()
+
+/turf/open/floor/almayer/empty/requisitions/get_depths_turfs()
+ var/area/elevator_area = GLOB.supply_controller.shuttle?.get_location_area()
+
+ var/turf_list = list()
+ for(var/turf/turf in elevator_area)
+ turf_list |= turf
+ return turf_list
+
+/// Vehicle bay pit.
+/turf/open/floor/almayer/empty/vehicle_bay
+
+/turf/open/floor/almayer/empty/vehicle_bay/get_depths_turfs()
+ return SSshuttle.vehicle_elevator.return_turfs()
+
//Others
/turf/open/floor/almayer/uscm
icon_state = "logo_c"
@@ -283,6 +318,27 @@
allow_construction = FALSE
hull_floor = TRUE
+/turf/open/floor/almayer/aicore
+ icon = 'icons/turf/floors/aicore.dmi'
+ icon_state = "ai_floor1"
+
+/turf/open/floor/almayer/aicore/glowing
+ icon_state = "ai_floor2"
+ light_color = "#d69c46"
+ light_range = 2
+
+/turf/open/floor/almayer/aicore/glowing/Initialize(mapload, ...)
+ . = ..()
+ set_light_on(TRUE)
+
+/turf/open/floor/almayer/aicore/no_build
+ allow_construction = FALSE
+ hull_floor = TRUE
+
+/turf/open/floor/almayer/aicore/glowing/no_build
+ allow_construction = FALSE
+ hull_floor = TRUE
+
// RESEARCH STUFF
/turf/open/floor/almayer/research/containment/entrance
icon_state = "containment_entrance"
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index e21dd142f931..8d9ded899a70 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -95,6 +95,10 @@
edge_overlay.SwapColor(rgb(255, 0, 255, 255), rgb(0, 0, 0, 0))
overlays += edge_overlay
+ var/area/my_area = loc
+ if(my_area.lighting_effect)
+ overlays += my_area.lighting_effect
+
/turf/open/proc/scorch(heat_level)
// All scorched icons should be in the dmi that their unscorched bases are
// "name_scorched#" where # is the scorchedness level 0 - 1 - 2 - 3
diff --git a/code/game/turfs/transit.dm b/code/game/turfs/transit.dm
index bae6718cfd59..dd6a8d920f6f 100644
--- a/code/game/turfs/transit.dm
+++ b/code/game/turfs/transit.dm
@@ -11,19 +11,117 @@
if(isobserver(crosser) || crosser.anchored)
return
- if(!(isitem(crosser) || isliving(crosser)))
+ if(!isitem(crosser) && !isliving(crosser))
return
- var/turf/open/floor/floor = old_loc
- if(istype(floor))
- var/fling_dir = get_dir(floor, crosser.loc)
-
- var/turf/near_turf = get_step(crosser.loc, get_step(crosser.loc, fling_dir))
- var/turf/projected = get_ranged_target_turf(near_turf, fling_dir, 50)
+ if(!istype(old_loc, /turf/open/space))
+ var/turf/projected = get_ranged_target_turf(crosser.loc, dir, 10)
INVOKE_ASYNC(crosser, TYPE_PROC_REF(/atom/movable, throw_atom), projected, 50, SPEED_FAST, null, TRUE)
- QDEL_IN(crosser, 0.5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(handle_crosser), crosser), 0.5 SECONDS)
+
+/turf/open/space/transit/proc/handle_crosser(atom/movable/crosser)
+ if(QDELETED(crosser))
+ return
+ qdel(crosser)
+
+/turf/open/space/transit/dropship
+ var/shuttle_tag
+
+/turf/open/space/transit/dropship/handle_crosser(atom/movable/crosser)
+ if(QDELETED(crosser))
+ return
+ if(!shuttle_tag)
+ return ..()
+
+ var/obj/docking_port/mobile/marine_dropship/dropship = SSshuttle.getShuttle(shuttle_tag)
+ if(!istype(dropship) || dropship.mode != SHUTTLE_CALL)
+ return ..()
+
+ if(dropship.destination.id != DROPSHIP_LZ1 && dropship.destination.id != DROPSHIP_LZ2)
+ return ..() // we're not heading towards the LZs
+
+ // you just jumped out of a dropship heading towards the LZ, have fun living on the way down!
+ var/list/ground_z_levels = SSmapping.levels_by_trait(ZTRAIT_GROUND)
+ if(!length(ground_z_levels))
+ return ..()
+
+ var/list/area/potential_areas = shuffle(SSmapping.areas_in_z["[ground_z_levels[1]]"])
+
+ for(var/area/maybe_this_area in potential_areas)
+ if(CEILING_IS_PROTECTED(maybe_this_area.ceiling, CEILING_PROTECTION_TIER_1)) // prevents out of bounds too
+ continue
+ if(istype(maybe_this_area, /area/space)) // make sure its not space, just in case
+ continue
+
+ var/turf/open/possible_turf = null
+ var/list/area_turfs = get_area_turfs(maybe_this_area)
+ for(var/i in 1 to 10)
+ possible_turf = pick_n_take(area_turfs)
+ // we're looking for an open, non-dense, and non-space turf.
+ if(!istype(possible_turf) || is_blocked_turf(possible_turf) || istype(possible_turf, /turf/open/space))
+ continue
+
+ if(!istype(possible_turf) || is_blocked_turf(possible_turf) || istype(possible_turf, /turf/open/space))
+ continue // couldnt find one in 10 loops, check another area
+
+ // we found a good turf, lets drop em
+ INVOKE_ASYNC(src, PROC_REF(handle_drop), crosser, possible_turf, dropship.name)
+ return
+
+ return ..() // they couldn't be dropped, just delete them
+
+/turf/open/space/transit/dropship/proc/handle_drop(atom/movable/crosser, turf/target, dropship_name)
+ if(QDELETED(crosser))
+ return
+ ADD_TRAIT(crosser, TRAIT_IMMOBILIZED, TRAIT_SOURCE_DROPSHIP_INTERACTION)
+
+ crosser.pixel_z = 360
+ crosser.forceMove(target)
+ crosser.visible_message(SPAN_WARNING("[crosser] falls out of the sky."), SPAN_HIGHDANGER("As you fall out of the [dropship_name], you plummet towards the ground."))
+ animate(crosser, time = 6, pixel_z = 0, flags = ANIMATION_PARALLEL)
+
+ REMOVE_TRAIT(crosser, TRAIT_IMMOBILIZED, TRAIT_SOURCE_DROPSHIP_INTERACTION)
+ if(isitem(crosser))
+ var/obj/item/item = crosser
+ item.explosion_throw(200) // give it a bit of a kick
+ return
+
+ if(!isliving(crosser))
+ return // don't know how you got here, but you shouldnt be here.
+ var/mob/living/fallen_mob = crosser
+
+ playsound(target, "punch", rand(20, 70), TRUE)
+ playsound(target, "punch", rand(20, 70), TRUE)
+ playsound(target, "bone_break", rand(20, 70), TRUE)
+ playsound(target, "bone_break", rand(20, 70), TRUE)
+
+ fallen_mob.KnockDown(10) // 10 seconds
+ fallen_mob.Stun(3) // 3 seconds
+
+
+ if(ishuman(fallen_mob))
+ var/mob/living/carbon/human/human = fallen_mob
+ human.last_damage_data = create_cause_data("falling from [dropship_name]", human)
+ // I'd say falling from space is pretty much like getting hit by an explosion
+ human.take_overall_armored_damage(300, ARMOR_BOMB, limb_damage_chance = 100)
+ // but just in case, you will still take a ton of damage.
+ human.take_overall_damage(200, used_weapon = "falling", limb_damage_chance = 100)
+ if(human.stat != DEAD)
+ human.death(human.last_damage_data)
+ fallen_mob.status_flags |= PERMANENTLY_DEAD
+ return
+ // take a little bit more damage otherwise
+ fallen_mob.take_overall_damage(400, used_weapon = "falling", limb_damage_chance = 100)
+
+/turf/open/space/transit/dropship/alamo
+ shuttle_tag = DROPSHIP_ALAMO
+ dir = SOUTH
+
+/turf/open/space/transit/dropship/normandy
+ shuttle_tag = DROPSHIP_NORMANDY
+ dir = SOUTH
/turf/open/space/transit/south
dir = SOUTH
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index be58259e17ba..9b0f457cf074 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -24,7 +24,6 @@
*/
-
/turf
icon = 'icons/turf/floors/floors.dmi'
var/intact_tile = 1 //used by floors to distinguish floor with/without a floortile(e.g. plating).
@@ -47,7 +46,7 @@
var/changing_turf = FALSE
var/chemexploded = FALSE // Prevents explosion stacking
- var/flags_turf = NO_FLAGS
+ var/turf_flags = NO_FLAGS
/// Whether we've broken through the ceiling yet
var/ceiling_debrised = FALSE
@@ -57,6 +56,7 @@
///Lumcount added by sources other than lighting datum objects, such as the overlay lighting component.
var/dynamic_lumcount = 0
+
///List of light sources affecting this turf.
///Which directions does this turf block the vision of, taking into account both the turf's opacity and the movable opacity_sources.
var/directional_opacity = NONE
@@ -101,11 +101,6 @@
if(opacity)
directional_opacity = ALL_CARDINALS
- //Get area light
- var/area/A = loc
- if(A?.lighting_effect)
- overlays += A.lighting_effect
-
return INITIALIZE_HINT_NORMAL
/turf/Destroy(force)
@@ -145,6 +140,22 @@
/turf/proc/update_icon() //Base parent. - Abby
return
+/// Call to move a turf from its current area to a new one
+/turf/proc/change_area(area/old_area, area/new_area)
+ //dont waste our time
+ if(old_area == new_area)
+ return
+
+ //move the turf
+ new_area.contents += src
+
+ //changes to make after turf has moved
+ on_change_area(old_area, new_area)
+
+/// Allows for reactions to an area change without inherently requiring change_area() be called (I hate maploading)
+/turf/proc/on_change_area(area/old_area, area/new_area)
+ transfer_area_lighting(old_area, new_area)
+
/turf/proc/add_cleanable_overlays()
for(var/cleanable_type in cleanables)
var/obj/effect/decal/cleanable/C = cleanables[cleanable_type]
@@ -435,6 +446,10 @@
W.levelupdate()
return W
+//If you modify this function, ensure it works correctly with lateloaded map templates.
+/turf/proc/AfterChange(flags, oldType) //called after a turf has been replaced in ChangeTurf()
+ return // Placeholder. This is mostly used by /tg/ code for atmos updates
+
// Take off the top layer turf and replace it with the next baseturf down
/turf/proc/ScrapeAway(amount=1, flags)
if(!amount)
@@ -767,6 +782,33 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
change_type = new_baseturfs
return ChangeTurf(change_type, null, flags)
+/// Places a turf on top - for map loading
+/turf/proc/load_on_top(turf/added_layer, flags)
+ var/area/our_area = get_area(src)
+ flags = our_area.PlaceOnTopReact(list(baseturfs), added_layer, flags)
+
+ if(flags & CHANGETURF_SKIP) // We haven't been initialized
+ if(flags_atom & INITIALIZED)
+ stack_trace("CHANGETURF_SKIP was used in a PlaceOnTop call for a turf that's initialized. This is a mistake. [src]([type])")
+ assemble_baseturfs()
+
+ var/turf/new_turf
+ if(!length(baseturfs))
+ baseturfs = list(baseturfs)
+
+ var/list/old_baseturfs = baseturfs.Copy()
+ if(!isclosedturf(src))
+ old_baseturfs += type
+
+ new_turf = ChangeTurf(added_layer, null, flags)
+ new_turf.assemble_baseturfs(initial(added_layer.baseturfs)) // The baseturfs list is created like roundstart
+ if(!length(new_turf.baseturfs))
+ new_turf.baseturfs = list(baseturfs)
+
+ // The old baseturfs are put underneath, and we sort out the unwanted ones
+ new_turf.baseturfs = baseturfs_string_list(old_baseturfs + (new_turf.baseturfs - GLOB.blacklisted_automated_baseturfs), new_turf)
+ return new_turf
+
/turf/proc/insert_self_into_baseturfs()
baseturfs += type
diff --git a/code/game/turfs/walls/wall_icon.dm b/code/game/turfs/walls/wall_icon.dm
index 2b414ca46af8..218d59305bdc 100644
--- a/code/game/turfs/walls/wall_icon.dm
+++ b/code/game/turfs/walls/wall_icon.dm
@@ -44,6 +44,10 @@
bullet_overlay = image('icons/effects/bulletholes.dmi', src, "bhole_[bullethole_state]_2")
overlays += bullet_overlay
+ var/area/my_area = loc
+ if(my_area.lighting_effect)
+ overlays += my_area.lighting_effect
+
#undef BULLETHOLE_STATES
#undef cur_increment
diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm
index d546e7274331..259e386825ff 100644
--- a/code/game/turfs/walls/wall_types.dm
+++ b/code/game/turfs/walls/wall_types.dm
@@ -211,7 +211,39 @@
icon_state = "containment_window"
opacity = FALSE
+//AI Core
+/turf/closed/wall/almayer/aicore
+ walltype = WALL_AICORE
+ icon = 'icons/turf/walls/almayer_aicore.dmi'
+ icon_state = "aiwall"
+
+/turf/closed/wall/almayer/aicore/reinforced
+ name = "reinforced hull"
+ damage_cap = HEALTH_WALL_REINFORCED
+ icon_state = "reinforced"
+
+/turf/closed/wall/almayer/aicore/hull
+ name = "ultra reinforced hull"
+ desc = "An extremely reinforced metal wall used to isolate potentially dangerous areas"
+ hull = TRUE
+ icon_state = "hull"
+
+/turf/closed/wall/almayer/aicore/white
+ walltype = WALL_AICORE
+ icon = 'icons/turf/walls/almayer_aicore_white.dmi'
+ icon_state = "aiwall"
+
+/turf/closed/wall/almayer/aicore/white/reinforced
+ name = "reinforced hull"
+ damage_cap = HEALTH_WALL_REINFORCED
+ icon_state = "reinforced"
+
+/turf/closed/wall/almayer/aicore/white/hull
+ name = "ultra reinforced hull"
+ desc = "An extremely reinforced metal wall used to isolate potentially dangerous areas"
+ hull = TRUE
+ icon_state = "hull"
//Sulaco walls.
@@ -720,7 +752,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
var/hivenumber = XENO_HIVE_NORMAL
var/should_track_build = FALSE
var/datum/cause_data/construction_data
- flags_turf = TURF_ORGANIC
+ turf_flags = TURF_ORGANIC
/turf/closed/wall/resin/Initialize(mapload)
. = ..()
diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm
index cb58ad2274a4..251b23ad9c57 100644
--- a/code/game/turfs/walls/walls.dm
+++ b/code/game/turfs/walls/walls.dm
@@ -173,7 +173,7 @@
if (acided_hole)
. += SPAN_WARNING("There's a large hole in the wall that could've been caused by some sort of acid.")
- if(flags_turf & TURF_ORGANIC)
+ if(turf_flags & TURF_ORGANIC)
return // Skip the part below. 'Organic' walls aren't deconstructable with tools.
switch(d_state)
diff --git a/code/game/verbs/records.dm b/code/game/verbs/records.dm
index 743a09d0ab6e..05506804790a 100644
--- a/code/game/verbs/records.dm
+++ b/code/game/verbs/records.dm
@@ -184,6 +184,7 @@
GLOBAL_DATUM_INIT(medals_view_tgui, /datum/medals_view_tgui, new)
+
/datum/medals_view_tgui/tgui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
@@ -194,7 +195,7 @@ GLOBAL_DATUM_INIT(medals_view_tgui, /datum/medals_view_tgui, new)
. = ..()
.["medals"] = list()
- for(var/datum/view_record/medal_view/medal as anything in DB_VIEW(/datum/view_record/medal_view, DB_COMP("player_id", DB_EQUALS, user.client.player_data.id)))
+ for(var/datum/view_record/medal_view/medal as anything in get_medals(user))
var/xeno_medal = FALSE
if(medal.medal_type in GLOB.xeno_medals)
xeno_medal = TRUE
@@ -212,6 +213,10 @@ GLOBAL_DATUM_INIT(medals_view_tgui, /datum/medals_view_tgui, new)
.["medals"] += list(current_medal)
+/datum/medals_view_tgui/proc/get_medals(mob/user)
+ return DB_VIEW(/datum/view_record/medal_view, DB_COMP("player_id", DB_EQUALS, user.client.player_data.id))
+
+
/datum/medals_view_tgui/ui_state(mob/user)
return GLOB.always_state
@@ -225,3 +230,23 @@ GLOBAL_DATUM_INIT(medals_view_tgui, /datum/medals_view_tgui, new)
set category = "OOC.Records"
GLOB.medals_view_tgui.tgui_interact(mob)
+
+GLOBAL_DATUM_INIT(medals_view_given_tgui, /datum/medals_view_tgui/given_medals, new)
+
+
+/datum/medals_view_tgui/given_medals/get_medals(mob/user)
+ return DB_VIEW(/datum/view_record/medal_view, DB_COMP("giver_player_id", DB_EQUALS, user.client.player_data.id))
+
+
+/datum/medals_view_tgui/given_medals/tgui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "MedalsViewer", "[user.ckey]'s Given Medals")
+ ui.open()
+
+
+/client/verb/view_given_medals()
+ set name = "View Medals Given to Others"
+ set category = "OOC.Records"
+
+ GLOB.medals_view_given_tgui.tgui_interact(mob)
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 5871fdc7a152..a73a3b96e5e4 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -17,6 +17,7 @@
FACTION_PMC = 0,
FACTION_CLF = 0,
FACTION_UPP = 0,
+ FACTION_TWE = 0,
FACTION_FREELANCER = 0,
FACTION_SURVIVOR = 0,
FACTION_WY_DEATHSQUAD = 0,
diff --git a/code/game/world.dm b/code/game/world.dm
index f68263412715..e55741ca71e5 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -87,10 +87,6 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt"))
GLOB.obfs_x = rand(-500, 500) //A number between -100 and 100
GLOB.obfs_y = rand(-500, 500) //A number between -100 and 100
- spawn(3000) //so we aren't adding to the round-start lag
- if(CONFIG_GET(flag/ToRban))
- ToRban_autoupdate()
-
// If the server's configured for local testing, get everything set up ASAP.
// Shamelessly stolen from the test manager's host_tests() proc
if(testing_locally)
@@ -129,7 +125,8 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt"))
GLOB.world_runtime_log = "[GLOB.log_directory]/runtime.log"
GLOB.round_stats = "[GLOB.log_directory]/round_stats.log"
GLOB.scheduler_stats = "[GLOB.log_directory]/round_scheduler_stats.log"
- GLOB.mutator_logs = "[GLOB.log_directory]/mutator_logs.log"
+ GLOB.mapping_log = "[GLOB.log_directory]/mapping.log"
+ GLOB.strain_logs = "[GLOB.log_directory]/strain_logs.log"
start_log(GLOB.tgui_log)
start_log(GLOB.world_href_log)
@@ -138,7 +135,8 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt"))
start_log(GLOB.world_runtime_log)
start_log(GLOB.round_stats)
start_log(GLOB.scheduler_stats)
- start_log(GLOB.mutator_logs)
+ start_log(GLOB.mapping_log)
+ start_log(GLOB.strain_logs)
if(fexists(GLOB.config_error_log))
fcopy(GLOB.config_error_log, "[GLOB.log_directory]/config_error.log")
@@ -321,9 +319,39 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt"))
/world/proc/on_tickrate_change()
SStimer.reset_buckets()
+/**
+ * Handles incresing the world's maxx var and intializing the new turfs and assigning them to the global area.
+ * If map_load_z_cutoff is passed in, it will only load turfs up to that z level, inclusive.
+ * This is because maploading will handle the turfs it loads itself.
+ */
+/world/proc/increase_max_x(new_maxx, map_load_z_cutoff = maxz)
+ if(new_maxx <= maxx)
+ return
+// var/old_max = world.maxx
+ maxx = new_maxx
+ if(!map_load_z_cutoff)
+ return
+// var/area/global_area = GLOB.areas_by_type[world.area] // We're guaranteed to be touching the global area, so we'll just do this
+// var/list/to_add = block(
+// locate(old_max + 1, 1, 1),
+// locate(maxx, maxy, map_load_z_cutoff))
+// global_area.contained_turfs += to_add
+
+/world/proc/increase_max_y(new_maxy, map_load_z_cutoff = maxz)
+ if(new_maxy <= maxy)
+ return
+// var/old_maxy = maxy
+ maxy = new_maxy
+ if(!map_load_z_cutoff)
+ return
+// var/area/global_area = GLOB.areas_by_type[world.area] // We're guarenteed to be touching the global area, so we'll just do this
+// var/list/to_add = block(
+// locate(1, old_maxy + 1, 1),
+// locate(maxx, maxy, map_load_z_cutoff))
+// global_area.contained_turfs += to_add
+
/world/proc/incrementMaxZ()
maxz++
- //SSmobs.MaxZChanged()
/** For initializing and starting byond-tracy when BYOND_TRACY is defined
* byond-tracy is a useful profiling tool that allows the user to view the CPU usage and execution time of procs as they run.
@@ -346,6 +374,7 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt"))
/world/proc/HandleTestRun()
// Wait for the game ticker to initialize
Master.sleep_offline_after_initializations = FALSE
+ SSticker.start_immediately = TRUE
UNTIL(SSticker.initialized)
//trigger things to run the whole process
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 94f40629fc6a..85a1028c2296 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -1,6 +1,6 @@
#ifndef OVERRIDE_BAN_SYSTEM
//Blocks an attempt to connect before even creating our client datum thing.
-/world/IsBanned(key,address,computer_id, type, real_bans_only=FALSE)
+/world/IsBanned(key,address,computer_id, type, real_bans_only=FALSE, is_telemetry = FALSE)
var/ckey = ckey(key)
// This is added siliently. Thanks to MSO for this fix. You will see it when/if we go OS
@@ -17,6 +17,7 @@
message_admins("Failed Login: [key] - Guests not allowed")
return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.")
+ // wait for database to be ready
WAIT_DB_READY
if(GLOB.admin_datums[ckey] && (GLOB.admin_datums[ckey].rights & R_MOD))
return ..()
@@ -26,19 +27,8 @@
var/datum/entity/player/P = get_player_from_key(ckey)
- //check if the IP address is a known TOR node
- if(CONFIG_GET(flag/ToRban) && ToRban_isbanned(address))
- log_access("Failed Login: [src] - Banned: ToR")
- message_admins("Failed Login: [src] - Banned: ToR")
- return list("reason"="Using ToR", "desc"="\nReason: The network you are using to connect has been banned.\nIf you believe this is a mistake, please request help at [CONFIG_GET(string/banappeals)]")
-
- // wait for database to be ready
-
- . = P.check_ban(computer_id, address)
- if(.)
- return .
- return ..() //default pager ban stuff
+ . = P.check_ban(computer_id, address, is_telemetry)
#endif
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index 7dca354129ff..f4394738fb2d 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -180,15 +180,44 @@ GLOBAL_DATUM(Banlist, /savefile)
expiry = "Removal Pending"
else
expiry = "Permaban"
- var/unban_link = "(U)"
+ var/unban_link
+ if(ban.is_permabanned)
+ unban_link = "(UP)"
+ else
+ unban_link = "(UT)"
- dat += "
"
- else
- dat+="None"
- dat+="["wylogo.png"]])