" reading += "Ultraviolet light: [uv_reading] lx ([uv_reading * 5.5 - 1.5] adlx)" - to_chat(usr, span("notice", reading)) + to_chat(usr, SPAN_NOTICE(reading)) /obj/item/device/light_meter/verb/set_low_bound() set category = "Object" diff --git a/code/game/objects/items/devices/magnetic_lock.dm b/code/game/objects/items/devices/magnetic_lock.dm index e1443cfb929..b6f3c0571ed 100644 --- a/code/game/objects/items/devices/magnetic_lock.dm +++ b/code/game/objects/items/devices/magnetic_lock.dm @@ -130,7 +130,7 @@ update_icon() else playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) - to_chat(user, span("warning", "\The [src] buzzes as you swipe your [I].")) + to_chat(user, SPAN_WARNING("\The [src] buzzes as you swipe your [I].")) return else to_chat(user, "You cannot swipe your [I] through [src] with it partially dismantled!") @@ -166,11 +166,11 @@ if (I.iswelder()) var/obj/item/weldingtool/WT = I if (WT.remove_fuel(2, user)) - user.visible_message(span("notice", "[user] starts welding the metal shell of [src]."), span("notice", "You start [hacked ? "repairing" : "welding open"] the metal covering of [src].")) + user.visible_message(SPAN_NOTICE("[user] starts welding the metal shell of [src]."), SPAN_NOTICE("You start [hacked ? "repairing" : "welding open"] the metal covering of [src].")) playsound(loc, 'sound/items/Welder.ogg', 50, 1) add_overlay("overlay_welding") if (do_after(user, 25/I.toolspeed)) - to_chat(user, span("notice", "You are able to [hacked ? "repair" : "weld through"] the metal shell of [src].")) + to_chat(user, SPAN_NOTICE("You are able to [hacked ? "repair" : "weld through"] the metal shell of [src].")) if (hacked) locked = 1 else locked = 0 hacked = !hacked @@ -182,38 +182,38 @@ if (I.iscrowbar()) if (!locked) - to_chat(user, span("notice", "You pry the cover off [src].")) + to_chat(user, SPAN_NOTICE("You pry the cover off [src].")) setconstructionstate(1) else - to_chat(user, span("notice", "You try to pry the cover off [src] but it doesn't budge.")) + to_chat(user, SPAN_NOTICE("You try to pry the cover off [src] but it doesn't budge.")) return if (1) if (istype(I, /obj/item/cell)) if (powercell) - to_chat(user, span("notice","There's already a powercell in \the [src].")) + to_chat(user, SPAN_NOTICE("There's already a powercell in \the [src].")) return if (I.iscrowbar()) - to_chat(user, span("notice", "You wedge the cover back in place.")) + to_chat(user, SPAN_NOTICE("You wedge the cover back in place.")) setconstructionstate(0) return if (2) if (I.isscrewdriver()) - to_chat(user, span("notice", "You unscrew and remove the wiring cover from \the [src].")) + to_chat(user, SPAN_NOTICE("You unscrew and remove the wiring cover from \the [src].")) playsound(loc, I.usesound, 50, 1) setconstructionstate(3) return if (I.iscrowbar()) - to_chat(user, span("notice", "You wedge the cover back in place.")) + to_chat(user, SPAN_NOTICE("You wedge the cover back in place.")) setconstructionstate(0) return if (istype(I, /obj/item/cell)) if (!powercell) - to_chat(user, span("notice","You place the [I] inside \the [src].")) + to_chat(user, SPAN_NOTICE("You place the [I] inside \the [src].")) user.drop_from_inventory(I,src) powercell = I setconstructionstate(1) @@ -221,20 +221,20 @@ if (3) if (I.iswirecutter()) - to_chat(user, span("notice", "You cut the wires connecting the [src]'s magnets to their internal powersupply, [target ? "making the device fall off [target] and rendering it unusable." : "rendering the device unusable."]")) + to_chat(user, SPAN_NOTICE("You cut the wires connecting the [src]'s magnets to their internal powersupply, [target ? "making the device fall off [target] and rendering it unusable." : "rendering the device unusable."]")) playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1) setconstructionstate(4) return if (I.isscrewdriver()) - to_chat(user, span("notice", "You replace and screw tight the wiring cover from \the [src].")) + to_chat(user, SPAN_NOTICE("You replace and screw tight the wiring cover from \the [src].")) playsound(loc, I.usesound, 50, 1) setconstructionstate(2) return if (4) if (I.iswirecutter()) - to_chat(user, span("notice", "You repair the wires connecting the [src]'s magnets to their internal powersupply")) + to_chat(user, SPAN_NOTICE("You repair the wires connecting the [src]'s magnets to their internal powersupply")) setconstructionstate(3) return @@ -262,35 +262,35 @@ BU.charge -= diff else BU.charge = 0 - visible_message(span("danger", "[src] beeps loudly and falls off \the [target]; its powercell having run out of power.")) + visible_message(SPAN_DANGER("[src] beeps loudly and falls off \the [target]; its powercell having run out of power.")) detach(0) else if (BU.charge > drainamount) BU.charge -= drainamount else BU.charge = 0 - visible_message(span("danger", "[src] beeps loudly and falls off \the [target]; its powercell having run out of power.")) + visible_message(SPAN_DANGER("[src] beeps loudly and falls off \the [target]; its powercell having run out of power.")) detach(0) last_process_time = world.time /obj/item/device/magnetic_lock/proc/check_target(var/obj/machinery/door/airlock/newtarget, var/mob/user as mob) if (status == STATUS_BROKEN) - to_chat(user, span("danger", "[src] is damaged beyond repair! It cannot be used!")) + to_chat(user, SPAN_DANGER("[src] is damaged beyond repair! It cannot be used!")) return 0 if (hacked) - to_chat(user, span("danger", "[src] buzzes; it can't be used until you repair it!")) + to_chat(user, SPAN_DANGER("[src] buzzes; it can't be used until you repair it!")) return 0 if (!newtarget.density || newtarget.operating) - to_chat(user, span("danger", "[newtarget] must be closed before you can attach [src] to it!")) + to_chat(user, SPAN_DANGER("[newtarget] must be closed before you can attach [src] to it!")) return 0 if (newtarget.p_open) - to_chat(user, span("danger", "You must close [newtarget]'s maintenance panel before attaching [src] to it!")) + to_chat(user, SPAN_DANGER("You must close [newtarget]'s maintenance panel before attaching [src] to it!")) return 0 if (!user.Adjacent(newtarget)) - to_chat(user, span("danger", "You must stand next to [newtarget] while attaching it!")) + to_chat(user, SPAN_DANGER("You must stand next to [newtarget] while attaching it!")) return 0 return 1 @@ -505,7 +505,7 @@ ui.close() else playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) - to_chat(usr, span("warning", "\The [src] buzzes as you enter passcode.")) + to_chat(usr, SPAN_WARNING("\The [src] buzzes as you enter passcode.")) return if(href_list["set_passcode"]) if(!locked) diff --git a/code/game/objects/items/devices/radio/_radio_defines.dm b/code/game/objects/items/devices/radio/_radio_defines.dm index 2f3dc55961a..a6eb388e49b 100644 --- a/code/game/objects/items/devices/radio/_radio_defines.dm +++ b/code/game/objects/items/devices/radio/_radio_defines.dm @@ -13,4 +13,5 @@ #define CHANNEL_RAIDER "Raider" #define CHANNEL_MERCENARY "Mercenary" -#define CHANNEL_NINJA "Ninja" \ No newline at end of file +#define CHANNEL_NINJA "Ninja" +#define CHANNEL_BURGLAR "Burglar" \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 876a171e7b6..ba0471e544b 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -28,6 +28,12 @@ origin_tech = list(TECH_ILLEGAL = 2) syndie = TRUE +/obj/item/device/encryptionkey/burglar + icon_state = "cypherkey" + channels = list(CHANNEL_COMMON = TRUE, CHANNEL_ENTERTAINMENT = TRUE, CHANNEL_BURGLAR = TRUE) + origin_tech = list(TECH_ILLEGAL = 2) + syndie = TRUE + /obj/item/device/encryptionkey/ninja icon_state = "cypherkey" channels = list(CHANNEL_COMMON = TRUE, CHANNEL_ENTERTAINMENT = TRUE, CHANNEL_NINJA = TRUE) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index d5c06701464..e303966a137 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -413,6 +413,12 @@ syndie = 1 ks1type = /obj/item/device/encryptionkey/raider +/obj/item/device/radio/headset/burglar + icon_state = "syn_headset" + origin_tech = list(TECH_ILLEGAL = 2) + syndie = TRUE + ks1type = /obj/item/device/encryptionkey/burglar + /obj/item/device/radio/headset/ninja icon_state = "syn_headset" origin_tech = list(TECH_ILLEGAL = 3) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index ebf0e13c4a7..ba1ee6bc4e8 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -14,8 +14,8 @@ /obj/item/device/radio/intercom/custom name = "station intercom (Custom)" - broadcasting = 0 - listening = 0 + broadcasting = FALSE + listening = FALSE /obj/item/device/radio/intercom/interrogation name = "station intercom (Interrogation)" @@ -31,8 +31,8 @@ /obj/item/device/radio/intercom/department canhear_range = 5 - broadcasting = 0 - listening = 1 + broadcasting = FALSE + listening = TRUE /obj/item/device/radio/intercom/department/medbay name = "station intercom (Medbay)" @@ -157,7 +157,7 @@ add_overlay(screen_overlays["intercom_l"]) /obj/item/device/radio/intercom/broadcasting - broadcasting = 1 + broadcasting = TRUE /obj/item/device/radio/intercom/locked var/locked_frequency @@ -172,8 +172,8 @@ /obj/item/device/radio/intercom/locked/ai_private name = "\improper AI intercom" frequency = AI_FREQ - broadcasting = 1 - listening = 1 + broadcasting = TRUE + listening = TRUE /obj/item/device/radio/intercom/locked/confessional name = "confessional intercom" diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 0864032c254..b4763f75cdc 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -35,8 +35,8 @@ var/global/list/default_medbay_channels = list( var/canhear_range = 3 // the range which mobs can hear this radio from var/datum/wires/radio/wires = null var/b_stat = 0 - var/broadcasting = 0 - var/listening = 1 + var/broadcasting = FALSE + var/listening = TRUE var/list/channels = list() //see communications.dm for full list. First non-common, non-entertainment channel is a "default" for :h var/subspace_transmission = 0 var/syndie = 0//Holder to see if it's a syndicate encrypted radio @@ -46,7 +46,7 @@ var/global/list/default_medbay_channels = list( throw_range = 9 w_class = 2 matter = list(DEFAULT_WALL_MATERIAL = 75, MATERIAL_GLASS = 25) - var/const/FREQ_LISTENING = 1 + var/const/FREQ_LISTENING = TRUE var/list/internal_channels var/clicksound = "button" //played sound on usage var/clickvol = 10 //volume @@ -311,7 +311,7 @@ var/global/list/default_medbay_channels = list( if (iscarbon(M)) var/mob/living/carbon/C = M if (CE_UNDEXTROUS in C.chem_effects) - to_chat(M, span("warning", "Your can't move your arms enough to activate the radio...")) + to_chat(M, SPAN_WARNING("Your can't move your arms enough to activate the radio...")) return if(istype(M)) @@ -591,8 +591,8 @@ var/global/list/default_medbay_channels = list( else return /obj/item/device/radio/emp_act(severity) - broadcasting = 0 - listening = 0 + broadcasting = FALSE + listening = FALSE for (var/ch_name in channels) channels[ch_name] = 0 ..() @@ -668,35 +668,34 @@ var/global/list/default_medbay_channels = list( return /obj/item/device/radio/borg/proc/recalculateChannels() - src.channels = list() - src.syndie = 0 + channels = list(CHANNEL_COMMON = TRUE, CHANNEL_ENTERTAINMENT = TRUE) + syndie = FALSE - var/mob/living/silicon/robot/D = src.loc + var/mob/living/silicon/robot/D = loc if(D.module) for(var/ch_name in D.module.channels) - if(ch_name in src.channels) + if(ch_name in channels) continue - src.channels += ch_name - src.channels[ch_name] += D.module.channels[ch_name] + channels[ch_name] += D.module.channels[ch_name] if(keyslot) for(var/ch_name in keyslot.channels) - if(ch_name in src.channels) + if(ch_name in channels) continue - src.channels += ch_name - src.channels[ch_name] += keyslot.channels[ch_name] + channels += ch_name + channels[ch_name] += keyslot.channels[ch_name] if(keyslot.syndie) - src.syndie = 1 + syndie = TRUE - for (var/ch_name in src.channels) + for(var/ch_name in src.channels) if(!SSradio) sleep(30) // Waiting for the SSradio to be created. if(!SSradio) - src.name = "broken radio" + name = "broken radio" return + secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT) - secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT) - + setupRadioDescription() return /obj/item/device/radio/borg/Topic(href, href_list) @@ -776,13 +775,13 @@ var/global/list/default_medbay_channels = list( return /obj/item/device/radio/off - listening = 0 + listening = FALSE /obj/item/device/radio/phone - broadcasting = 0 + broadcasting = FALSE icon = 'icons/obj/radio.dmi' icon_state = "red_phone" - listening = 1 + listening = TRUE name = "phone" var/radio_sound = null diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 6b1922a9fc9..03828c28330 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -248,7 +248,7 @@ BREATH ANALYZER var/datum/reagent/R = A if(R.scannable) print_reagent_default_message = FALSE - reagentdata["[R.id]"] = " [round(H.reagents.get_reagent_amount(R.id), 1)]u [R.name]" + reagentdata["[R.type]"] = " [round(H.reagents.get_reagent_amount(R.type), 1)]u [R.name]" else unknown++ if(reagentdata.len) @@ -370,7 +370,7 @@ BREATH ANALYZER if(reagents.total_volume) var/list/blood_traces = list() for(var/datum/reagent/R in reagents.reagent_list) - if(R.id != "blood") + if(R.type != /datum/reagent/blood) reagents.clear_reagents() to_chat(user, "The sample was contaminated! Please insert another sample") return @@ -456,27 +456,27 @@ BREATH ANALYZER /obj/item/device/slime_scanner/attack(mob/living/M, mob/living/user) if(!isslime(M)) - to_chat(user, span("warning", "This device can only scan slimes!")) + to_chat(user, SPAN_WARNING("This device can only scan slimes!")) return var/mob/living/carbon/slime/T = M - to_chat(user, span("notice", "**************************")) - to_chat(user, span("notice", "Slime scan results:")) - to_chat(user, span("notice", capitalize_first_letters("[T.colour] [T.is_adult ? "adult" : "baby"] slime"))) - to_chat(user, span("notice", "Health: [T.health]")) - to_chat(user, span("notice", "Nutrition: [T.nutrition]/[T.get_max_nutrition()]")) + to_chat(user, SPAN_NOTICE("**************************")) + to_chat(user, SPAN_NOTICE("Slime scan results:")) + to_chat(user, SPAN_NOTICE(capitalize_first_letters("[T.colour] [T.is_adult ? "adult" : "baby"] slime"))) + to_chat(user, SPAN_NOTICE("Health: [T.health]")) + to_chat(user, SPAN_NOTICE("Nutrition: [T.nutrition]/[T.get_max_nutrition()]")) if(T.nutrition < T.get_starve_nutrition()) - to_chat(user, span("alert", "Warning: slime is starving!")) + to_chat(user, SPAN_ALERT("Warning: slime is starving!")) else if (T.nutrition < T.get_hunger_nutrition()) - to_chat(user, span("warning", "Warning: slime is hungry!")) - to_chat(user, span("notice", "Electric charge strength: [T.powerlevel]")) - to_chat(user, span("notice", "Growth progress: [T.amount_grown]/10")) + to_chat(user, SPAN_WARNING("Warning: slime is hungry!")) + to_chat(user, SPAN_NOTICE("Electric charge strength: [T.powerlevel]")) + to_chat(user, SPAN_NOTICE("Growth progress: [T.amount_grown]/10")) if(T.cores > 1) - to_chat(user, span("warning", "Anomalous number of slime cores detected.")) + to_chat(user, SPAN_WARNING("Anomalous number of slime cores detected.")) else if(!T.cores) - to_chat(user, span("warning", "No slime cores detected.")) - to_chat(user, span("notice", "Genetic Information:")) + to_chat(user, SPAN_WARNING("No slime cores detected.")) + to_chat(user, SPAN_NOTICE("Genetic Information:")) if(T.slime_mutation[4] == T.colour) - to_chat(user, span("warning", "This slime cannot evolve any further.")) + to_chat(user, SPAN_WARNING("This slime cannot evolve any further.")) else var/list/poss_mutations = uniquelist(T.slime_mutation) var/mutation_message = capitalize(english_list(poss_mutations)) diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index a9e7f8b05bf..1153f0cb78b 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -156,9 +156,9 @@ return 0 /obj/item/device/radio/spy - listening = 0 + listening = FALSE frequency = 1473 - broadcasting = 0 + broadcasting = FALSE canhear_range = 1 name = "spy device" icon_state = "syn_cypherkey" diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 52cd1ef3190..bd0d0c74930 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -116,7 +116,7 @@ /obj/item/device/suit_cooling_unit/proc/turn_off() if(ismob(src.loc)) var/mob/M = src.loc - to_chat(M, span("warning", "\The [src] clicks and whines as it powers down.")) + to_chat(M, SPAN_WARNING("\The [src] clicks and whines as it powers down.")) on = FALSE update_icon() @@ -130,7 +130,7 @@ cell.add_fingerprint(user) cell.update_icon() - to_chat(user, span("notice", "You remove the [src.cell].")) + to_chat(user, SPAN_NOTICE("You remove the [src.cell].")) src.cell = null update_icon() return @@ -141,27 +141,27 @@ else turn_on() if(on) - to_chat(user, span("notice", "You switch on the [src].")) + to_chat(user, SPAN_NOTICE("You switch on the [src].")) /obj/item/device/suit_cooling_unit/attackby(obj/item/W, mob/user) if(W.isscrewdriver()) if(cover_open) cover_open = FALSE - to_chat(user, span("notice", "You screw the panel into place.")) + to_chat(user, SPAN_NOTICE("You screw the panel into place.")) else cover_open = TRUE - to_chat(user, span("notice", "You unscrew the panel.")) + to_chat(user, SPAN_NOTICE("You unscrew the panel.")) update_icon() return if(istype(W, /obj/item/cell)) if(cover_open) if(cell) - to_chat(user, span("warning", "There is a [cell] already installed here.")) + to_chat(user, SPAN_WARNING("There is a [cell] already installed here.")) else user.drop_from_inventory(W,src) cell = W - to_chat(user, span("notice", "You insert the [cell].")) + to_chat(user, SPAN_NOTICE("You insert the [cell].")) update_icon() return @@ -201,26 +201,26 @@ if(on) if(attached_to_suit(src.loc)) - to_chat(user, span("notice", "It's switched on and running.")) + to_chat(user, SPAN_NOTICE("It's switched on and running.")) else if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(H.species.flags & ACCEPTS_COOLER) - to_chat(user, span("notice", "It's switched on and running, connected to the cooling systems of [H].")) + to_chat(user, SPAN_NOTICE("It's switched on and running, connected to the cooling systems of [H].")) else - to_chat(user, span("notice", "It's switched on, but not attached to anything.")) + to_chat(user, SPAN_NOTICE("It's switched on, but not attached to anything.")) else - to_chat(user, span("notice", "It is switched off.")) + to_chat(user, SPAN_NOTICE("It is switched off.")) if(cover_open) if(cell) - to_chat(user, span("notice", "The panel is open, exposing the [cell].")) + to_chat(user, SPAN_NOTICE("The panel is open, exposing the [cell].")) else - to_chat(user, span("notice", "The panel is open.")) + to_chat(user, SPAN_NOTICE("The panel is open.")) if(cell) - to_chat(user, span("notice", "The charge meter reads [round(cell.percent())]%.")) + to_chat(user, SPAN_NOTICE("The charge meter reads [round(cell.percent())]%.")) else - to_chat(user, span("notice", "It doesn't have a power cell installed.")) + to_chat(user, SPAN_NOTICE("It doesn't have a power cell installed.")) /obj/item/device/suit_cooling_unit/no_cell celltype = null \ No newline at end of file diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm index 9fbda490693..9a73a8d72e1 100644 --- a/code/game/objects/items/devices/t_scanner.dm +++ b/code/game/objects/items/devices/t_scanner.dm @@ -28,7 +28,7 @@ icon_state = "t-ray[on]" /obj/item/device/t_scanner/emp_act() - audible_message(src, span("notice", "\The [src] buzzes oddly.")) + audible_message(src, SPAN_NOTICE("\The [src] buzzes oddly.")) set_active(FALSE) /obj/item/device/t_scanner/attack_self(mob/user) @@ -38,7 +38,7 @@ /obj/item/device/t_scanner/afterattack(atom/target, mob/user, proximity_flag, click_parameters) var/obj/structure/disposalpipe/D = target if(D && istype(D)) - to_chat(user, span("info", "Pipe segment integrity: [(D.health / 10) * 100]%")) + to_chat(user, SPAN_INFO("Pipe segment integrity: [(D.health / 10) * 100]%")) /obj/item/device/t_scanner/proc/set_active(var/active) on = active diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 16f0e47d5ac..b74fb3c15a4 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -235,11 +235,10 @@ P.name = "Transcript" usr.put_in_hands(P) can_print = FALSE - addtimer(CALLBACK(src, .proc/toggle_can_print), 300) - can_print = TRUE + addtimer(CALLBACK(src, .proc/set_can_print, 1), 150) -/obj/item/device/taperecorder/proc/toggle_can_print() - can_print = !can_print +/obj/item/device/taperecorder/proc/set_can_print(var/set_state = TRUE) + can_print = set_state /obj/item/device/taperecorder/verb/eject_usb() set name = "Eject Portable Storage" @@ -263,7 +262,8 @@ file_data += "[printed_message]
" F.stored_data = file_data - portable_drive.store_file(F) + if(!portable_drive.store_file(F)) + to_chat(usr, SPAN_WARNING("\The [portable_drive] does not have enough space to store the latest transcript, but will eject anyway.")) to_chat(usr, SPAN_NOTICE("You eject the portable drive.")) usr.put_in_hands(portable_drive) diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index dbe8436eabd..c66b0ba2ebb 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -413,8 +413,12 @@ A list of items and costs is stored under the datum of every game mode, alongsid /obj/item/device/special_uplink/ninja name = "infiltrator uplink" +/obj/item/device/special_uplink/burglar + name = "sponsored uplink" + starting_telecrystals = 15 + /obj/item/device/special_uplink/rev name = "station bounced radio" desc = null // SBRs have no desc icon_state = "walkietalkie" // more incognito - starting_telecrystals = DEFAULT_TELECRYSTAL_AMOUNT * 2 + starting_telecrystals = DEFAULT_TELECRYSTAL_AMOUNT * 2 \ No newline at end of file diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 936a1acd174..c6a8103a367 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -43,6 +43,11 @@ icon_state = "securearea" var/sight_mode = null +/obj/item/borg/sight/on_module_hotbar(mob/living/silicon/robot/R) + R.sight_mode |= sight_mode + +/obj/item/borg/sight/on_module_store(mob/living/silicon/robot/R) + R.sight_mode &= ~sight_mode /obj/item/borg/sight/xray name = "\proper x-ray vision" diff --git a/code/game/objects/items/skrell.dm b/code/game/objects/items/skrell.dm index a56fa9f0785..c4112950aa5 100644 --- a/code/game/objects/items/skrell.dm +++ b/code/game/objects/items/skrell.dm @@ -185,14 +185,14 @@ // Could add some stuff to this in the future? I dunno. I just couldn't figure out how to callback to_chat LOL - geeves /obj/item/jargontag/proc/do_loyalty(var/mob/wearer) - to_chat(wearer, span("good", "You feel an intense feeling of loyalty towards the Jargon Federation surge through your brain.")) + to_chat(wearer, SPAN_GOOD("You feel an intense feeling of loyalty towards the Jargon Federation surge through your brain.")) /obj/item/jargontag/proc/clamp_on(var/mob/wearer) if(fried) return canremove = FALSE icon_state = "[initial(icon_state)]_active" - to_chat(wearer, span("warning", "\The [src] clamps down around your ear, releasing a burst of static before going silent. Something probes at your ear canal...")) + to_chat(wearer, SPAN_WARNING("\The [src] clamps down around your ear, releasing a burst of static before going silent. Something probes at your ear canal...")) addtimer(CALLBACK(src, .proc/do_loyalty, wearer), 15) /obj/item/jargontag/proc/unclamp() @@ -200,7 +200,7 @@ return if(!canremove) icon_state = initial(icon_state) - visible_message(span("warning", "\The [src] fizzles loudly, then clicks open!")) + visible_message(SPAN_WARNING("\The [src] fizzles loudly, then clicks open!")) canremove = TRUE fried = TRUE @@ -212,5 +212,5 @@ unclamp() return TRUE else - to_chat(user, span("notice", "\The [src] isn't locked down, your e-mag has no effect!")) + to_chat(user, SPAN_NOTICE("\The [src] isn't locked down, your e-mag has no effect!")) return FALSE diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index caccecbc42d..56a0e153b5d 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -34,6 +34,10 @@ stacktype = type if (amount) src.amount = amount + if(amount > max_amount) + var/amount_overdue = max_amount - amount + new type(get_turf(src), amount_overdue) + amount -= amount_overdue if (icon_has_variants && !item_state) item_state = icon_state @@ -58,10 +62,11 @@ /obj/item/stack/examine(mob/user) if(..(user, 1)) - if(!uses_charge) - to_chat(user, "There [src.amount == 1 ? "is" : "are"] [src.amount] [src.singular_name]\s in the stack.") - else - to_chat(user, "There is enough charge for [get_amount()].") + if(!iscoil()) + if(!uses_charge) + to_chat(user, "There [src.amount == 1 ? "is" : "are"] [src.amount] [src.singular_name]\s in the stack.") + else + to_chat(user, "You have enough charge to produce [get_amount()].") /obj/item/stack/attack_self(mob/user as mob) list_recipes(user) @@ -197,7 +202,7 @@ /obj/item/stack/proc/can_use(var/used, var/mob/user=null) if (get_amount() < used) if(user && isrobot(user)) - to_chat(user, span("warning", "You don't have enough charge left in your synthesizer!")) + to_chat(user, SPAN_WARNING("You don't have enough charge left in your synthesizer!")) return 0 return 1 diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index ff56b0fbb38..f982f70562d 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -15,12 +15,12 @@ /obj/item/stack/wrapping_paper/attackby(obj/item/W, mob/user) ..() if (!isturf(loc)) - to_chat(user, span("warning", "The paper must be set down for you to wrap a gift!")) + to_chat(user, SPAN_WARNING("The paper must be set down for you to wrap a gift!")) return if (W.w_class < 4) var/a_used = 2 * (src.w_class - 1) if (src.amount < a_used) - to_chat(user, span("warning", "You need more paper!")) + to_chat(user, SPAN_WARNING("You need more paper!")) return else if(istype(W, /obj/item/smallDelivery) || istype(W, /obj/item/gift)) //No gift wrapping gifts! @@ -43,7 +43,7 @@ return else - to_chat(user, span("warning", "This object is far too large to wrap!")) + to_chat(user, SPAN_WARNING("This object is far too large to wrap!")) return diff --git a/code/game/objects/items/tajara.dm b/code/game/objects/items/tajara.dm index 45d14a670fb..50461784940 100644 --- a/code/game/objects/items/tajara.dm +++ b/code/game/objects/items/tajara.dm @@ -1,8 +1,40 @@ +/obj/item/storage/fancy/cigarettes/pra + name = "\improper Labourer's Choice cigarette packet" + desc = "Jokingly referred to an essential part of a working class citizen's breakfast, beside state-provided provisions." + desc_fluff = "Imported from the People's Republic of Adhomai." + icon_state = "prapacket" + item_state = "Dpacket" + storage_slots = 7 + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai + can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/trash/cigbutt, /obj/item/tajcard) + +/obj/item/storage/fancy/cigarettes/pra/fill() + ..() + new /obj/item/tajcard(src) + +/obj/item/storage/fancy/cigarettes/dpra + name = "\improper Shastar List'ya cigarette packet" + desc = "Rumored to be a de-facto currency for Adhominian knuckles off-planet." + desc_fluff = "Imported from the Democratic People's Republic of Adhomai." + icon_state = "dprapacket" + item_state = "Bpacket" + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai + +/obj/item/storage/fancy/cigarettes/nka + name = "\improper Gato Royales cigarette packet" + desc = "Popular with the aristocrats of the New Kingdom of Adhomai for its mild menthol flavor." + desc_fluff = "Imported from the New Kingdom of Adhomai." + icon_state = "nkapacket" + item_state = "Fpacket" + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai + /obj/item/tajcard name = "collectable tajaran card" - desc = "A collectable card, usually found inside cigarette packs, with the illustration of a famous Tajara." + desc = "A collectable card with an illustration of a famous Tajaran figure, usually found inside cigarette packets." icon = 'icons/obj/playing_cards.dmi' icon_state = "tajcig" + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' w_class = ITEMSIZE_SMALL var/list/figures = list("hadii", "tesla", "headmaster", "commissar", "almanq", "yasmin", "andrey", "paratrooper", "scout") @@ -92,7 +124,9 @@ /obj/item/pocketwatch/adhomai name = "adhomian watch" desc = "A watch made in the traditional adhomian style. It can be stored in a pocket or worn around the neck." - desc_fluff = "Because your wrists have better things to do." + desc_fluff = "Baltoris a fortress founded during the Gunpowder Age; it was the landing site of the royal armies during the Suns'wars. Baltor plays a strategic role in controlling the \ + Ras'val sea during the war. A town emerged around the fort over time, attracted by the safety provided by the military presence. The city is known for its skilled watchmaker artisans, \ + a trade that has been passed down through generations. The Mez'gin clock tower, located at the town square, is one of its points of interest." icon = 'icons/obj/tajara_items.dmi' icon_state = "adhomai_clock" item_state = "adhomai_clock" @@ -136,7 +170,7 @@ adhomian_day = current_day + 30 if("October", "November", "December") - adhomian_month = "Sil’nryy-rhazzimy" + adhomian_month = "Sil'nryy-rhazzimy" if (current_month == "November") adhomian_day = current_day + 15 if (current_month == "December") @@ -153,7 +187,7 @@ /obj/item/flame/lighter/adhomai name = "adhomian lighter" - desc = "An adhomian lighter, it is designated to protect the flame from the strong winds of the Tajaran homeworld." + desc = "An adhomian lighter, designed to protect the flame from the strong winds of the Tajaran homeworld." icon = 'icons/obj/tajara_items.dmi' icon_state = "trenchlighter" item_state = "trenchlighter" @@ -210,3 +244,26 @@ ..() add_fingerprint(user) + +/obj/item/dice/tajara + name = "adhomian dice" + desc = "An adhomian dice made out of wood. Commonly used to play Suns and Moon." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "brother1" + base_icon = "brother" + +/obj/item/dice/tajara/alt + icon_state = "sister1" + base_icon = "sister" + +/obj/item/storage/pill_bottle/dice/tajara + name = "bag of adhomian dice" + desc = "A bag containing enough dice to play Suns and Moon." + icon = 'icons/obj/tajara_items.dmi' + desc_fluff = "Suns and Moon is a very common dice game. It is played by all, though the lower classes have the tendency to gamble whereas upper classes play it just for fun. The ease and universality \ + of the rules has garnered it quite the reputation. Die will usually have an image of Rredouane fixed upon them. Parks will commonly have designated spots for people to play Suns and Moon. Disputes are \ + also solved through this game." + starts_with = list( + /obj/item/dice/tajara = 3, + /obj/item/dice/tajara/alt = 3 + ) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index b849e3b5284..5d30d502e71 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -66,7 +66,7 @@ if(O.reagents.total_volume < 1) to_chat(user, "The [O] is empty.") else if(O.reagents.total_volume >= 1) - if(O.reagents.has_reagent("pacid", 1)) + if(O.reagents.has_reagent(/datum/reagent/acid/polyacid, 1)) to_chat(user, "The acid chews through the balloon!") O.reagents.splash(user, reagents.total_volume) qdel(src) diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm index 0550f3c1d72..4270da6a680 100644 --- a/code/game/objects/items/weapons/RFD.dm +++ b/code/game/objects/items/weapons/RFD.dm @@ -360,13 +360,15 @@ RFD Mining-Class icon_state = "rfd-m" item_state = "rfd-m" -/obj/item/rfd/mining/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/rfd/mining/afterattack(atom/A, mob/user, proximity) + if(!proximity) + return - if(!proximity) return - - if(istype(user,/mob/living/silicon/robot)) + if(isrobot(user)) var/mob/living/silicon/robot/R = user - if(R.stat || !R.cell || R.cell.charge <= 0) + if(R.stat || !R.cell || R.cell.charge <= 500) + to_chat(user, SPAN_WARNING("You are unable to produce enough charge to use \the [src]!")) + flick("[icon_state]-empty", src) return else if(stored_matter <= 0) @@ -378,26 +380,23 @@ RFD Mining-Class return if(locate(/obj/structure/track) in A) + to_chat(user, SPAN_WARNING("There is already a track on \the [A]!")) return playsound(src.loc, 'sound/machines/click.ogg', 10, 1) - var/used_energy = 0 - - used_energy = 10 new /obj/structure/track(get_turf(A)) - to_chat(user, "Dispensing track...") + to_chat(user, SPAN_NOTICE("You deploy a mine track on \the [A].")) update_icon() if(isrobot(user)) var/mob/living/silicon/robot/R = user if(R.cell) - R.cell.use(used_energy) - + R.cell.use(500) else stored_matter-- - to_chat(user, "The RFD now holds [stored_matter]/30 fabrication-units.") + to_chat(user, SPAN_NOTICE("The RFD now holds [stored_matter]/30 fabrication-units.")) // Malf AI RFD Transformer. diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index 71f86d8a5da..ada3e43b70b 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -140,7 +140,7 @@ scan_data += "
" for(var/mob/O in viewers(usr)) - O.show_message(span("notice", "\The [src] rattles and prints out a sheet of paper."), 1) + O.show_message(SPAN_NOTICE("\The [src] rattles and prints out a sheet of paper."), 1) playsound(loc, "sound/bureaucracy/print_short.ogg", 50, 1) sleep(10) @@ -164,19 +164,19 @@ src.wdata = list() src.chemtraces = list() src.timeofdeath = null - to_chat(user, span("notice", "A new patient has been registered. Purging data for previous patient.")) + to_chat(user, SPAN_NOTICE("A new patient has been registered. Purging data for previous patient.")) src.timeofdeath = M.timeofdeath var/obj/item/organ/external/S = M.get_organ(user.zone_sel.selecting) if(!S) - to_chat(usr, span("warning", "You can't scan this body part.")) + to_chat(usr, SPAN_WARNING("You can't scan this body part.")) return if(!S.open) - to_chat(usr, span("warning", "You have to cut the limb open first!")) + to_chat(usr, SPAN_WARNING("You have to cut the limb open first!")) return for(var/mob/O in viewers(M)) - O.show_message(span("notice", "\The [user] scans the wounds on [M.name]'s [S.name] with \the [src]"), 1) + O.show_message(SPAN_NOTICE("\The [user] scans the wounds on [M.name]'s [S.name] with \the [src]"), 1) src.add_data(S) diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index f8d3835a2f8..c825887c783 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -30,15 +30,15 @@ var/obj/item/weldingtool/WT = W if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool light() - to_chat(user, span("notice", "\The [user] casually lights \the [name] with [W].")) - else if(isflamesource(W)) + to_chat(user, SPAN_NOTICE("\The [user] casually lights \the [name] with [W].")) + else if(W.isFlameSource()) light() - to_chat(user, span("notice", "\The [user] lights \the [name].")) + to_chat(user, SPAN_NOTICE("\The [user] lights \the [name].")) else if(istype(W, /obj/item/flame/candle)) var/obj/item/flame/candle/C = W if(C.lit) light() - to_chat(user, span("notice", "\The [user] lights \the [name].")) + to_chat(user, SPAN_NOTICE("\The [user] lights \the [name].")) /obj/item/flame/candle/proc/light() if(!src.lit) @@ -58,7 +58,7 @@ new /obj/item/trash/candle(src.loc) if(istype(src.loc, /mob)) src.dropped() - to_chat(user, span("notice", "The candle burns out.")) + to_chat(user, SPAN_NOTICE("The candle burns out.")) playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) STOP_PROCESSING(SSprocessing, src) qdel(src) @@ -70,7 +70,7 @@ /obj/item/flame/candle/attack_self(mob/user as mob) if(lit) lit = 0 - to_chat(user, span("notice", "You snuff out the flame.")) + to_chat(user, SPAN_NOTICE("You snuff out the flame.")) playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) update_icon() set_light(0) diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm index 9f5da0d35b8..c05ab3a86c7 100644 --- a/code/game/objects/items/weapons/chaplain_items.dm +++ b/code/game/objects/items/weapons/chaplain_items.dm @@ -56,7 +56,7 @@ if(!ispath(nullchoices[picked])) return - to_chat(user, span("notice", "You start reassembling your obsidian relic.")) + to_chat(user, SPAN_NOTICE("You start reassembling your obsidian relic.")) if(!do_after(user, 2 SECONDS)) return @@ -72,16 +72,16 @@ if(LAZYLEN(user.spell_list)) user.silence_spells(300) //30 seconds - to_chat(user, span("danger", "You've been silenced!")) + to_chat(user, SPAN_DANGER("You've been silenced!")) return if(!user.IsAdvancedToolUser()) - to_chat(user, span("danger", "You don't have the dexterity to use this!")) + to_chat(user, SPAN_DANGER("You don't have the dexterity to use this!")) return if((user.is_clumsy()) && prob(50)) - to_chat(user, span("danger", "The [src] slips out of your hand and you hit yourself!")) - visible_message(span("danger", "[user] fumbles with the [src] and hits themselves in the process!")) + to_chat(user, SPAN_DANGER("The [src] slips out of your hand and you hit yourself!")) + visible_message(SPAN_DANGER("[user] fumbles with the [src] and hits themselves in the process!")) user.take_organ_damage(10) user.Paralyse(20) return @@ -90,25 +90,25 @@ var/mob/living/K = M if(cult && (K.mind in cult.current_antagonists) && prob(75)) if(do_after(user, 15)) - K.visible_message(span("danger", "[user] waves \the [src] over \the [K]'s head, [K] looks captivated by it."), span("warning", "[user] waves the [src] over your head. You see a foreign light, asking you to follow it. Its presence burns and blinds.")) + K.visible_message(SPAN_DANGER("[user] waves \the [src] over \the [K]'s head, [K] looks captivated by it."), SPAN_WARNING("[user] waves the [src] over your head. You see a foreign light, asking you to follow it. Its presence burns and blinds.")) var/choice = alert(K,"Do you want to give up your goal?","Become cleansed","Resist","Give in") switch(choice) if("Resist") - K.visible_message(span("warning", "The gaze in [K]'s eyes remains determined."), span("notice", "You turn away from the light, remaining true to the Geometer!")) + K.visible_message(SPAN_WARNING("The gaze in [K]'s eyes remains determined."), SPAN_NOTICE("You turn away from the light, remaining true to the Geometer!")) K.say("*scream") K.take_overall_damage(5, 15) admin_attack_log(user, M, "attempted to deconvert", "was unsuccessfully deconverted by", "attempted to deconvert") if("Give in") - K.visible_message(span("notice", "[K]'s eyes become clearer, the evil gone, but not without leaving scars.")) + K.visible_message(SPAN_NOTICE("[K]'s eyes become clearer, the evil gone, but not without leaving scars.")) K.take_overall_damage(10, 20) cult.remove_antagonist(K.mind) admin_attack_log(user, M, "successfully deconverted", "was successfully deconverted by", "successfully deconverted") else - user.visible_message(span("warning", "[user]'s concentration is broken!"), span("warning", "Your concentration is broken! You and your target need to stay uninterrupted for longer!")) + user.visible_message(SPAN_WARNING("[user]'s concentration is broken!"), SPAN_WARNING("Your concentration is broken! You and your target need to stay uninterrupted for longer!")) return else - to_chat(user, span("danger", "The [src] appears to do nothing.")) - M.visible_message(span("danger", "\The [user] waves \the [src] over \the [M]'s head.")) + to_chat(user, SPAN_DANGER("The [src] appears to do nothing.")) + M.visible_message(SPAN_DANGER("\The [user] waves \the [src] over \the [M]'s head.")) if(ishuman(M)) var/mob/living/carbon/human/H = M if(prob(25)) @@ -117,7 +117,7 @@ H.cure_all_traumas(cure_type = CURE_CRYSTAL) return else if(user.a_intent != I_HURT) // to prevent the chaplain from hurting peoples accidentally - to_chat(user, span("notice", "The [src] appears to do nothing.")) + to_chat(user, SPAN_NOTICE("The [src] appears to do nothing.")) return else return ..() @@ -127,7 +127,7 @@ return if(istype(A, /turf/simulated/floor) && (cooldown + 5 SECONDS < world.time)) cooldown = world.time - user.visible_message(span("notice", "[user] loudly taps their [src.name] against the floor.")) + user.visible_message(SPAN_NOTICE("[user] loudly taps their [src.name] against the floor.")) playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) var/rune_found = FALSE for(var/obj/effect/rune/R in orange(2, get_turf(src))) @@ -164,7 +164,7 @@ return ..() else if(proximity) if(contents.len) - to_chat(user, span("warning", "\The [src] is already full!")) + to_chat(user, SPAN_WARNING("\The [src] is already full!")) return user.visible_message("[user] scoops \the [A] into \the [src], securing the lid.", "You scoop \the [A] into \the [src], securing the lid.") desc = "A vase used to store the ashes of the deceased. It contains some ashes." @@ -172,7 +172,7 @@ /obj/item/material/urn/attack_self(mob/user) if(!contents.len) - to_chat(user, span("warning", "\The [src] is empty!")) + to_chat(user, SPAN_WARNING("\The [src] is empty!")) return else for(var/obj/effect/decal/cleanable/ash/A in contents) diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index b6c33599f14..e80c91b609a 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -10,13 +10,12 @@ var/chem_volume = 0 var/chewtime = 0 var/brand - var/list/filling = list() var/wrapped = FALSE /obj/item/clothing/mask/chewable/attack_self(mob/user) if(wrapped) wrapped = FALSE - to_chat(user, span("notice", "You unwrap \the [name].")) + to_chat(user, SPAN_NOTICE("You unwrap \the [name].")) playsound(src.loc, 'sound/items/drop/wrapper.ogg', 50, 1) slot_flags = SLOT_EARS | SLOT_MASK update_icon() @@ -29,11 +28,9 @@ add_overlay(base_overlay) obj/item/clothing/mask/chewable/Initialize() + create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15 . = ..() flags |= NOREACT // so it doesn't react until you light it - create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15 - for(var/R in filling) - reagents.add_reagent(R, filling[R]) if(wrapped) slot_flags = null update_icon() @@ -45,7 +42,7 @@ obj/item/clothing/mask/chewable/Initialize() if(C.check_has_mouth()) START_PROCESSING(SSprocessing, src) else - to_chat(user, span("notice", "You don't have a mouth, and can't make much use of \the [src].")) + to_chat(user, SPAN_NOTICE("You don't have a mouth, and can't make much use of \the [src].")) /obj/item/clothing/mask/chewable/dropped() STOP_PROCESSING(SSprocessing, src) @@ -90,37 +87,46 @@ obj/item/clothing/mask/chewable/Destroy() /obj/item/clothing/mask/chewable/proc/spitout(var/mob/user, var/no_message) STOP_PROCESSING(SSprocessing, src) - if (type_butt) - var/obj/item/butt = new type_butt(get_turf(src)) + if(type_butt) + var/obj/item/butt = new type_butt(user) transfer_fingerprints_to(butt) butt.color = color if(brand) butt.desc += " This one is \a [brand]." if(ismob(loc)) var/mob/living/M = loc - if (!no_message) - to_chat(M, span("notice", "You spit out the [name].")) + if(!no_message) + to_chat(M, SPAN_NOTICE("The [name] runs out of flavor.")) + if(M.wear_mask) + M.remove_from_mob(src) //un-equip it so the overlays can update + M.update_inv_wear_mask(0) + M.equip_to_slot_if_possible(butt, slot_wear_mask) + else + M.remove_from_mob(src) // if it gets blocked somehow, since chewables shouldn't be processing outside the mask slot. + M.update_inv_l_hand(0) + M.update_inv_r_hand(1) + M.put_in_hands(butt) qdel(src) /obj/item/clothing/mask/chewable/tobacco/bad name = "chewing tobacco" desc = "A chewy wad of cheap tobacco. Cut in long strands and treated with syrup so it tastes less like an ash-tray when you stuff it into your face." - filling = list("tobaccobad" = 2) + reagents_to_add = list(/datum/reagent/toxin/tobacco/fake = 2) /obj/item/clothing/mask/chewable/tobacco/generic name = "chewing tobacco" desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face." - filling = list("tobacco" = 2) + reagents_to_add = list(/datum/reagent/toxin/tobacco = 2) /obj/item/clothing/mask/chewable/tobacco/fine name = "chewing tobacco" desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face." - filling = list("tobaccofine" = 2) + reagents_to_add = list(/datum/reagent/toxin/tobacco/rich = 2) /obj/item/clothing/mask/chewable/tobacco/nico name = "nicotine gum" desc = "A chewy wad of synthetic rubber, laced with nicotine. Possibly the least disgusting method of nicotine delivery." - filling = list("nicotine" = 2) + reagents_to_add = list(/datum/reagent/mental/nicotine = 2) icon_state = "nic_gum" type_butt = /obj/item/trash/spitgum wrapped = TRUE @@ -135,7 +141,7 @@ obj/item/clothing/mask/chewable/Destroy() slot_flags = SLOT_EARS | SLOT_MASK chem_volume = 50 chewtime = 300 - filling = list("sugar" = 2) + reagents_to_add = list(/datum/reagent/sugar = 2) /obj/item/trash/spitgum name = "old gum" @@ -152,7 +158,7 @@ obj/item/clothing/mask/chewable/Destroy() /obj/item/clothing/mask/chewable/candy/gum/Initialize() . = ..() - reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),10) + reagents.add_reagent(pick(/datum/reagent/drink/banana,/datum/reagent/drink/berryjuice,/datum/reagent/drink/grapejuice,/datum/reagent/drink/lemonjuice,/datum/reagent/drink/limejuice,/datum/reagent/drink/orangejuice,/datum/reagent/drink/watermelonjuice),10) color = reagents.get_color() update_icon() @@ -167,7 +173,7 @@ obj/item/clothing/mask/chewable/Destroy() starts_with = list(/obj/item/clothing/mask/chewable/candy/gum = 5) can_hold = list(/obj/item/clothing/mask/chewable/candy/gum, /obj/item/trash/spitgum) - use_sound = 'sound/items/drop/paper.ogg' + use_sound = 'sound/items/drop/wrapper.ogg' drop_sound = 'sound/items/drop/wrapper.ogg' pickup_sound = 'sound/items/pickup/wrapper.ogg' max_storage_space = 5 @@ -197,7 +203,7 @@ obj/item/clothing/mask/chewable/Destroy() /obj/item/clothing/mask/chewable/candy/lolli/Initialize() . = ..() - reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),20) + reagents.add_reagent(pick(/datum/reagent/drink/banana,/datum/reagent/drink/berryjuice,/datum/reagent/drink/grapejuice,/datum/reagent/drink/lemonjuice,/datum/reagent/drink/limejuice,/datum/reagent/drink/orangejuice,/datum/reagent/drink/watermelonjuice),20) color = reagents.get_color() update_icon() @@ -210,9 +216,9 @@ obj/item/clothing/mask/chewable/Destroy() /obj/item/clothing/mask/chewable/candy/lolli/meds/Initialize() . = ..() var/datum/reagent/payload = pick(list( - "paracetamol", - "tramadol", - "dylovene")) + /datum/reagent/paracetamol, + /datum/reagent/tramadol, + /datum/reagent/dylovene)) reagents.add_reagent(payload, 15) color = reagents.get_color() desc = "[desc] This one is labeled '[initial(payload.name)]'." @@ -220,13 +226,13 @@ obj/item/clothing/mask/chewable/Destroy() /obj/item/clothing/mask/chewable/candy/lolli/weak_meds name = "medicine lollipop" desc = "A sucrose sphere on a small handle, it has been infused with medication." - filling = list("sugar" = 6) + reagents_to_add = list(/datum/reagent/sugar = 6) /obj/item/clothing/mask/chewable/candy/lolli/weak_meds/Initialize() . = ..() var/datum/reagent/payload = pick(list( - "dylovene", - "norepinephrine")) + /datum/reagent/dylovene, + /datum/reagent/norepinephrine)) reagents.add_reagent(payload, 15) color = reagents.get_color() desc = "[desc] This one is labeled '[initial(payload.name)]'." diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index f42da6d70a1..e2c54cc52df 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -14,29 +14,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM //For anything that can light stuff on fire /obj/item/flame - var/lit = 0 + var/lit = FALSE -/proc/isflamesource(A) - var/obj/item/I = A - if(I.iswelder()) - var/obj/item/weldingtool/WT = A - return (WT.isOn()) - else if(istype(I, /obj/item/flame)) - var/obj/item/flame/F = I - return (F.lit) - else if(istype(I, /obj/item/device/assembly/igniter)) - return 1 - else if(istype(I, /obj/item/clothing/gloves/fluff/lunea_gloves)) - var/obj/item/clothing/gloves/fluff/lunea_gloves/F = I - return (F.lit) - return 0 +/obj/item/flame/isFlameSource() + return lit /////////// //MATCHES// /////////// /obj/item/flame/match - name = "match" - desc = "A simple match stick, used for lighting fine smokables." + name = "safety match" + desc = "A simple safety match. Used for lighting fine smokables, among other things." icon = 'icons/obj/cigs_lighters.dmi' icon_state = "match_unlit" item_state = "match_unlit" @@ -44,48 +32,112 @@ CIGARETTE PACKETS ARE IN FANCY.DM slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi', slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi', ) - var/burnt = 0 var/smoketime = 5 - w_class = 1.0 + var/type_burnt = /obj/item/trash/match + w_class = ITEMSIZE_TINY origin_tech = list(TECH_MATERIAL = 1) - slot_flags = SLOT_EARS + slot_flags = SLOT_EARS | SLOT_MASK attack_verb = list("burnt", "singed") drop_sound = 'sound/items/drop/food.ogg' pickup_sound = 'sound/items/pickup/food.ogg' +/obj/item/trash/match + name = "burnt match" + desc = "A match. This one has seen better days." + icon = 'icons/obj/cigs_lighters.dmi' + icon_state = "match_burnt" + item_state = "match_burnt" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi', + ) + randpixel = 10 + slot_flags = SLOT_EARS | SLOT_MASK + attack_verb = list("flicked") + drop_sound = 'sound/items/cigs_lighters/cig_snuff.ogg' + pickup_sound = 'sound/items/pickup/food.ogg' + +/obj/item/trash/match/Initialize() + . = ..() + randpixel_xy() + transform = turn(transform,rand(0,360)) + +/obj/item/trash/match/attack_self(mob/user) + var/turf/location = get_turf(src) + new /obj/effect/decal/cleanable/ash(location) + user.visible_message("[user] crushes \the [src] into a fine ash.", range = 3) + qdel(src) + /obj/item/flame/match/process() if(isliving(loc)) var/mob/living/M = loc M.IgniteMob() var/turf/location = get_turf(src) smoketime-- - if(smoketime < 1) - burn_out() + if(smoketime < 1 || istype(loc, /obj/item/storage)) // Shouldn't be lit in a bag. + die() return if(location) location.hotspot_expose(700, 5) return -/obj/item/flame/match/dropped(mob/user as mob) - //If dropped, put ourselves out - //not before lighting up the turf we land on, though. +/obj/item/flame/match/attack_self(mob/user as mob) if(lit) - spawn(0) - var/turf/location = src.loc - if(istype(location)) - location.hotspot_expose(700, 5) - burn_out() + user.visible_message("[user] waves out \the [src], extinguishing it.", range = 3) + die(TRUE) return ..() -/obj/item/flame/match/proc/burn_out() - lit = 0 - burnt = 1 - damtype = "brute" - icon_state = "match_burnt" - item_state = "match_burnt" - name = "burnt match" - desc = "A match. This one has seen better days." - STOP_PROCESSING(SSprocessing, src) +/obj/item/flame/match/attackby(obj/item/W as obj, mob/user as mob) + ..() + if(W.isFlameSource() && !src.lit) + playsound(src, 'sound/items/cigs_lighters/cig_light.ogg', 75, 1, -1) + user.visible_message("In a feat of redundancy, [user] lights \the [src] using \the [W].", range = 3) + light() + +/obj/item/flame/match/dropped(mob/user as mob) + if(lit) + spawn(0) + var/turf/location = src.loc // Light up the turf we land on. + if(istype(location)) + location.hotspot_expose(700, 5) + die(TRUE) // Put ourselves out. + return ..() + +/obj/item/flame/match/proc/light() + lit = TRUE + damtype = "burn" + icon_state = "match_lit" + item_state = "match_lit" + if(ismob(loc)) + var/mob/living/M = loc + M.update_inv_wear_mask(0) + M.update_inv_l_hand(0) + M.update_inv_r_hand(1) + set_light(2, 0.25, "#E38F46") + START_PROCESSING(SSprocessing, src) + +/obj/item/flame/match/proc/die(var/nomessage = FALSE) + var/turf/T = get_turf(src) + playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) + if(type_burnt) + var/obj/item/burnt = new type_burnt(T) + transfer_fingerprints_to(burnt) + if(ismob(loc)) + var/mob/living/M = loc + if(!nomessage) + to_chat(M, span("notice", "Your [name] goes out.")) + if(M.wear_mask) + M.remove_from_mob(src) //un-equip it so the overlays can update + M.update_inv_wear_mask(0) + M.equip_to_slot_if_possible(burnt, slot_wear_mask) + else + M.remove_from_mob(src) // if it dies in your hand. + M.update_inv_l_hand(0) + M.update_inv_r_hand(1) + M.put_in_hands(burnt) + set_light(0) + STOP_PROCESSING(SSprocessing, src) + qdel(src) ////////////////// //FINE SMOKABLES// @@ -103,6 +155,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/icon_off var/type_butt = null var/chem_volume = 15 //Size of a syringe + var/genericmes = "USER lights NAME with FLAME" var/matchmes = "USER lights NAME with FLAME" var/lightermes = "USER lights NAME with FLAME" var/zippomes = "USER lights NAME with FLAME" @@ -120,8 +173,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15 /obj/item/clothing/mask/smokable/process() - - if(reagents && reagents.total_volume && burn_rate) + if(reagents && reagents.total_volume && burn_rate && !istype(loc, /obj/item/storage)) if(!initial_volume) initial_volume = reagents.total_volume var/mob/living/carbon/human/C = loc @@ -142,19 +194,19 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/proc/light(var/flavor_text = "[usr] lights the [name].") if(!src.lit) - src.lit = 1 + src.lit = TRUE playsound(src, 'sound/items/cigs_lighters/cig_light.ogg', 75, 1, -1) src.reagents.set_temperature(T0C + 45) damtype = "fire" - if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire + if(reagents.get_reagent_amount(/datum/reagent/toxin/phoron)) // the phoron explodes when exposed to fire var/datum/effect/effect/system/reagents_explosion/e = new() - e.set_up(round(reagents.get_reagent_amount("phoron") / 2.5, 1), get_turf(src), 0, 0) + e.set_up(round(reagents.get_reagent_amount(/datum/reagent/toxin/phoron) / 2.5, 1), get_turf(src), 0, 0) e.start() qdel(src) return - if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently + if(reagents.get_reagent_amount(/datum/reagent/fuel)) // the fuel explodes, too, but much less violently var/datum/effect/effect/system/reagents_explosion/e = new() - e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0) + e.set_up(round(reagents.get_reagent_amount(/datum/reagent/fuel) / 5, 1), get_turf(src), 0, 0) e.start() qdel(src) return @@ -172,29 +224,34 @@ CIGARETTE PACKETS ARE IN FANCY.DM set_light(2, 0.25, "#E38F46") START_PROCESSING(SSprocessing, src) -/obj/item/clothing/mask/smokable/proc/die(var/nomessage = 0) +/obj/item/clothing/mask/smokable/proc/die(var/no_message = 0, var/mob/living/M) var/turf/T = get_turf(src) set_light(0) playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) - if (type_butt) - var/obj/item/butt = new type_butt(T) + if(type_butt) + var/obj/item/butt = new type_butt(src.loc) transfer_fingerprints_to(butt) if(ismob(loc)) - var/mob/living/M = loc - if (!nomessage) - to_chat(M, span("notice", "Your [name] goes out.")) - M.remove_from_mob(src) //un-equip it so the overlays can update - M.update_inv_wear_mask(0) - M.update_inv_l_hand(0) - M.update_inv_r_hand(1) + M = loc + if(!no_message) + to_chat(M, SPAN_NOTICE("Your [name] goes out.")) + if(M.wear_mask) + M.remove_from_mob(src) //un-equip it so the overlays can update + M.update_inv_wear_mask(0) + M.equip_to_slot_if_possible(butt, slot_wear_mask) + else + M.remove_from_mob(src) // if it dies in your hand. + M.update_inv_l_hand(0) + M.update_inv_r_hand(1) + M.put_in_hands(butt) STOP_PROCESSING(SSprocessing, src) qdel(src) else new /obj/effect/decal/cleanable/ash(T) if(ismob(loc)) - var/mob/living/M = loc - if (!nomessage) - to_chat(M, span("notice", "Your [name] goes out, and you empty the ash.")) + M = loc + if(!no_message) + to_chat(M, SPAN_NOTICE("Your [name] goes out, and you empty the ash.")) playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) lit = 0 icon_state = icon_off @@ -206,7 +263,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/attackby(obj/item/W as obj, mob/user as mob) ..() - if(isflamesource(W)) + if(W.isFlameSource()) var/text = matchmes if(istype(W, /obj/item/flame/match)) text = matchmes @@ -218,18 +275,23 @@ CIGARETTE PACKETS ARE IN FANCY.DM text = weldermes else if(istype(W, /obj/item/device/assembly/igniter)) text = ignitermes - text = replacetext(text, "USER", "[user]") - text = replacetext(text, "NAME", "[name]") - text = replacetext(text, "FLAME", "[W.name]") + else + text = genericmes + text = replacetext(text, "USER", "\the [user]") + text = replacetext(text, "NAME", "\the [name]") + text = replacetext(text, "FLAME", "\the [W.name]") light(text) +/obj/item/clothing/mask/smokable/isFlameSource() + return lit + /obj/item/clothing/mask/smokable/cigarette name = "cigarette" desc = "A roll of tobacco and nicotine." icon_state = "cigoff" throw_speed = 0.5 item_state = "cigoff" - w_class = 1 + w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS | SLOT_MASK attack_verb = list("burnt", "singed") icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi @@ -245,25 +307,22 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/Initialize() . = ..() - reagents.add_reagent("tobacco",10) - reagents.add_reagent("nicotine",5) // 2/3 ratio, Adds 0.03 units per second - + reagents.add_reagent(/datum/reagent/toxin/tobacco,10) + reagents.add_reagent(/datum/reagent/mental/nicotine,5) // 2/3 ratio, Adds 0.03 units per second /obj/item/clothing/mask/smokable/cigarette/attackby(obj/item/W as obj, mob/user as mob) ..() - if(istype(W, /obj/item/melee/energy/sword)) var/obj/item/melee/energy/sword/S = W if(S.active) - light(span("warning", "[user] swings their [W], barely missing themselves. They light their [name] in the process.")) - + light(SPAN_WARNING("[user] swings their [W], barely missing themselves. They light their [name] in the process.")) return /obj/item/clothing/mask/smokable/cigarette/attack(mob/living/carbon/human/H, mob/user, def_zone) if(lit && H == user && istype(H)) var/obj/item/blocked = H.check_mouth_coverage() if(blocked) - to_chat(H, span("warning", "\The [blocked] is in the way!")) + to_chat(H, SPAN_WARNING("\The [blocked] is in the way!")) return 1 if(last_drag <= world.time - 30) //Spam limiter. Only for messages/sound. last_drag = world.time @@ -280,19 +339,19 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(istype(glass)) //you can dip cigarettes into beakers var/transfered = glass.reagents.trans_to_obj(src, chem_volume) if(transfered) //if reagents were transfered, show the message - to_chat(user, span("warning", "You dip \the [src] into \the [glass].")) + to_chat(user, SPAN_WARNING("You dip \the [src] into \the [glass].")) playsound(src.loc, 'sound/effects/footstep/water1.ogg', 50, 1) else //if not, either the beaker was empty, or the cigarette was full if(!glass.reagents.total_volume) - to_chat(user, span("notice", "[glass] is empty.")) + to_chat(user, SPAN_NOTICE("[glass] is empty.")) else - to_chat(user, span("notice", "[src] is full.")) + to_chat(user, SPAN_NOTICE("[src] is full.")) /obj/item/clothing/mask/smokable/cigarette/attack_self(mob/user as mob) - if(lit == 1) - user.visible_message(span("notice", "[user] calmly drops and treads on the lit [src], putting it out instantly.")) + if(lit == TRUE) + user.visible_message(SPAN_NOTICE("[user] calmly drops and treads on the lit [src], putting it out instantly.")) playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) - die(1) + die(TRUE) return ..() @@ -302,7 +361,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/vanilla/Initialize() . = ..() reagents.clear_reagents() - reagents.add_reagent("tobacco",15) + reagents.add_reagent(/datum/reagent/toxin/tobacco,15) /obj/item/clothing/mask/smokable/cigarette/acmeco burn_rate = 0.015 @@ -310,10 +369,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/acmeco/Initialize() . = ..() reagents.clear_reagents() - reagents.add_reagent("tobacco",5) - reagents.add_reagent("nicotine",5) - reagents.add_reagent("lexorin",2) - reagents.add_reagent("serotrotium",3) + reagents.add_reagent(/datum/reagent/toxin/tobacco,5) + reagents.add_reagent(/datum/reagent/mental/nicotine,5) + reagents.add_reagent(/datum/reagent/lexorin,2) + reagents.add_reagent(/datum/reagent/serotrotium,3) /obj/item/clothing/mask/smokable/cigarette/blank burn_rate = 0.003 //300 seconds @@ -328,24 +387,24 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/dromedaryco/Initialize() . = ..() reagents.clear_reagents() - reagents.add_reagent("tobacco",5) - reagents.add_reagent("nicotine",10) + reagents.add_reagent(/datum/reagent/toxin/tobacco,5) + reagents.add_reagent(/datum/reagent/mental/nicotine,10) /obj/item/clothing/mask/smokable/cigarette/nicotine /obj/item/clothing/mask/smokable/cigarette/nicotine/Initialize() . = ..() reagents.clear_reagents() - reagents.add_reagent("tobaccofine",5) - reagents.add_reagent("nicotine",10) + reagents.add_reagent(/datum/reagent/toxin/tobacco/rich,5) + reagents.add_reagent(/datum/reagent/mental/nicotine,10) /obj/item/clothing/mask/smokable/cigarette/rugged /obj/item/clothing/mask/smokable/cigarette/rugged/Initialize() . = ..() reagents.clear_reagents() - reagents.add_reagent("tobaccobad",10) - reagents.add_reagent("nicotine",5) + reagents.add_reagent(/datum/reagent/toxin/tobacco/fake,10) + reagents.add_reagent(/datum/reagent/mental/nicotine,5) /obj/item/clothing/mask/smokable/cigarette/adhomai name = "adhomian cigarette" @@ -354,8 +413,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/adhomai/Initialize() . = ..() reagents.clear_reagents() - reagents.add_reagent("tobacco",5) - reagents.add_reagent("nicotine",5) + reagents.add_reagent(/datum/reagent/toxin/tobacco,5) + reagents.add_reagent(/datum/reagent/mental/nicotine,5) //////////// // CIGARS // @@ -382,8 +441,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/cigar/Initialize() . = ..() reagents.clear_reagents() - reagents.add_reagent("tobaccorich",25) - reagents.add_reagent("nicotine",5) // 1/5 Ratio + reagents.add_reagent(/datum/reagent/toxin/tobacco/rich,25) + reagents.add_reagent(/datum/reagent/mental/nicotine,5) // 1/5 Ratio /obj/item/clothing/mask/smokable/cigarette/cigar/havana name = "premium Havanian cigar" @@ -397,9 +456,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/cigar/havana/Initialize() . = ..() reagents.clear_reagents() - reagents.add_reagent("tobaccorich",15) - reagents.add_reagent("nicotine",5) // 1/6 Ratio - reagents.add_reagent("tricordrazine",10) + reagents.add_reagent(/datum/reagent/toxin/tobacco/rich,15) + reagents.add_reagent(/datum/reagent/mental/nicotine,5) // 1/6 Ratio + reagents.add_reagent(/datum/reagent/tricordrazine,10) /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba name = "\improper Cohiba robusto cigar" @@ -413,9 +472,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba/Initialize() . = ..() reagents.clear_reagents() - reagents.add_reagent("tobaccorich",30) - reagents.add_reagent("nicotine",10) //1/6 Ratio - reagents.add_reagent("tricordrazine",20) + reagents.add_reagent(/datum/reagent/toxin/tobacco/rich,30) + reagents.add_reagent(/datum/reagent/mental/nicotine,10) //1/6 Ratio + reagents.add_reagent(/datum/reagent/tricordrazine,20) /obj/item/trash/cigbutt name = "cigarette butt" @@ -423,10 +482,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon = 'icons/obj/clothing/masks.dmi' icon_state = "cigbutt" randpixel = 10 - w_class = 1 - slot_flags = SLOT_EARS + w_class = ITEMSIZE_TINY + slot_flags = SLOT_EARS | SLOT_MASK throwforce = 1 drop_sound = 'sound/items/cigs_lighters/cig_snuff.ogg' + pickup_sound = 'sound/items/pickup/food.ogg' /obj/item/trash/cigbutt/Initialize() . = ..() @@ -459,7 +519,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/rolled/sausage/Initialize() . = ..() reagents.clear_reagents() - reagents.add_reagent("protein",6) + reagents.add_reagent(/datum/reagent/nutriment/protein,6) /obj/item/trash/cigbutt/sausagebutt name = "sausage butt" @@ -477,7 +537,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_on = "pipeon" //Note - these are in masks.dmi icon_off = "pipeoff" burn_rate = 0.003 - w_class = 1 + w_class = ITEMSIZE_TINY chem_volume = 30 matchmes = "USER lights their NAME with their FLAME." lightermes = "USER manages to light their NAME with FLAME." @@ -494,7 +554,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/pipe/light(var/flavor_text = "[usr] lights the [name].") if(!src.lit && burn_rate) - src.lit = 1 + src.lit = TRUE damtype = "fire" icon_state = icon_on item_state = icon_on @@ -508,8 +568,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM M.update_inv_r_hand(1) /obj/item/clothing/mask/smokable/pipe/attack_self(mob/user as mob) - if(lit == 1) - user.visible_message(span("notice", "[user] puts out [src]."), span("notice", "You put out [src].")) + if(lit == TRUE) + user.visible_message(SPAN_NOTICE("[user] puts out [src]."), SPAN_NOTICE("You put out [src].")) playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) lit = 0 icon_state = icon_off @@ -517,7 +577,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM STOP_PROCESSING(SSprocessing, src) else if (burn_rate) var/turf/location = get_turf(user) - user.visible_message(span("notice", "[user] empties out [src]."), span("notice", "You empty out [src].")) + user.visible_message(SPAN_NOTICE("[user] empties out [src]."), SPAN_NOTICE("You empty out [src].")) new /obj/effect/decal/cleanable/ash(location) burn_rate = 0 reagents.clear_reagents() @@ -532,10 +592,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM if (istype(W, /obj/item/reagent_containers/food/snacks)) var/obj/item/reagent_containers/food/snacks/grown/G = W if (!G.dry) - to_chat(user, span("notice", "[G] must be dried before you stuff it into [src].")) + to_chat(user, SPAN_NOTICE("[G] must be dried before you stuff it into [src].")) return if (burn_rate) - to_chat(user, span("notice", "[src] is already packed.")) + to_chat(user, SPAN_NOTICE("[src] is already packed.")) return if(G.reagents) initial_volume = G.reagents.total_volume @@ -547,15 +607,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM else if(istype(W, /obj/item/flame/lighter)) var/obj/item/flame/lighter/L = W if(L.lit) - light(span("notice", "[user] manages to light their [name] with [W].")) + light(SPAN_NOTICE("[user] manages to light their [name] with [W].")) else if(istype(W, /obj/item/flame/match)) var/obj/item/flame/match/M = W if(M.lit) - light(span("notice", "[user] lights their [name] with their [W].")) + light(SPAN_NOTICE("[user] lights their [name] with their [W].")) else if(istype(W, /obj/item/device/assembly/igniter)) - light(span("notice", "[user] fiddles with [W], and manages to light their [name] with the power of science.")) + light(SPAN_NOTICE("[user] fiddles with [W], and manages to light their [name] with the power of science.")) user.update_inv_wear_mask(0) user.update_inv_l_hand(0) @@ -583,7 +643,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi', slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi', ) - w_class = 1 + w_class = ITEMSIZE_TINY throwforce = 4 flags = CONDUCT slot_flags = SLOT_BELT @@ -614,13 +674,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = icon_state base_state = icon_state -/obj/item/flame/lighter/zippo/update_icon() +/obj/item/flame/lighter/update_icon() if(lit) icon_state = "[base_state]on" item_state = "[base_state]on" else icon_state = "[base_state]" item_state = "[base_state]" + update_held_icon() /obj/item/flame/lighter/attack_self(mob/living/user) if(!base_state) @@ -631,20 +692,19 @@ CIGARETTE PACKETS ARE IN FANCY.DM update_icon() playsound(src.loc, pick(activation_sound), 75, 1) if(istype(src, /obj/item/flame/lighter/zippo) ) - user.visible_message(span("notice", "Without even breaking stride, [user] flips open and lights [src] in one smooth movement.")) + user.visible_message(FONT_SMALL("Without even breaking stride, [user] flips open and lights \the [src] in one smooth movement."), range = 3) else if(prob(95)) - user.visible_message(span("notice", "After a few attempts, [user] manages to light the [src].")) + user.visible_message(FONT_SMALL("After a few attempts, [user] manages to light \the [src]."), range = 3) else - - to_chat(user, span("warning", "You burn yourself while lighting the lighter.")) + to_chat(user, FONT_SMALL("You burn yourself while lighting the lighter.")) if(user.IgniteMob()) - user.visible_message(span("danger","\The [user] accidentally sets themselves on fire!")) - if (user.l_hand == src) - user.apply_damage(2,BURN,BP_L_HAND) + user.visible_message(FONT_SMALL("[user] accidentally sets themselves on fire!")) + if(user.l_hand == src) + user.apply_damage(2, BURN,BP_L_HAND) else - user.apply_damage(2,BURN,BP_R_HAND) - user.visible_message(span("notice", "After a few attempts, [user] manages to light the [src], they however burn their finger in the process.")) + user.apply_damage(2, BURN,BP_R_HAND) + user.visible_message(FONT_SMALL("After a few attempts, [user] manages to light \the [src], they however burn their finger in the process."), range = 3) set_light(2, 1, l_color = LIGHT_COLOR_LAVA) START_PROCESSING(SSprocessing, src) @@ -653,9 +713,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM update_icon() playsound(src.loc, deactivation_sound, 75, 1) if(istype(src, /obj/item/flame/lighter/zippo) ) - user.visible_message(span("notice", "You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.")) + user.visible_message(FONT_SMALL("You hear a quiet click, as [user] shuts off \the [src] without even looking at what they're doing."), range = 3) else - user.visible_message(span("notice", "[user] quietly shuts off the [src].")) + user.visible_message(FONT_SMALL("[user] quietly shuts off \the [src]."), range = 3) set_light(0) STOP_PROCESSING(SSprocessing, src) @@ -669,7 +729,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return if(lit && M.IgniteMob()) - M.visible_message(span("danger","\The [user] ignites \the [M] with \the [src]!")) + M.visible_message(SPAN_DANGER("\The [user] ignites \the [M] with \the [src]!")) if(istype(M.wear_mask, /obj/item/clothing/mask/smokable/cigarette) && user.zone_sel.selecting == BP_MOUTH && lit) var/obj/item/clothing/mask/smokable/cigarette/cig = M.wear_mask @@ -677,16 +737,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM cig.attackby(src, user) else if(istype(src, /obj/item/flame/lighter/zippo)) - cig.light(span("notice", "[user] whips the [name] out and holds it for [M].")) + cig.light(SPAN_NOTICE("[user] whips the [name] out and holds it for [M].")) else - cig.light(span("notice", "[user] holds the [name] out for [M], and lights the [cig.name].")) + cig.light(SPAN_NOTICE("[user] holds the [name] out for [M], and lights the [cig.name].")) else ..() /obj/item/flame/lighter/throw_impact(mob/living/carbon/M as mob) . = ..() if(istype(M) && lit && M.IgniteMob()) - M.visible_message(span("danger","\The [M] is ignited by \the [src]!")) + M.visible_message(SPAN_DANGER("\The [M] is ignited by \the [src]!")) /obj/item/flame/lighter/process() var/turf/location = get_turf(src) @@ -696,7 +756,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(lit && prob(10) && isliving(src.loc)) var/mob/living/M = src.loc if(M.IgniteMob()) - M.visible_message(span("danger","\The [M] is ignited by \the [src]!")) + M.visible_message(SPAN_DANGER("\The [M] is ignited by \the [src]!")) if (istype(loc, /obj/item/storage))//A lighter shouldn't stay lit inside a closed container lit = 0 @@ -743,7 +803,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM desc = "A thin piece of paper used to make smokables." icon = 'icons/obj/cigs_lighters.dmi' icon_state = "cigpaper_generic" - w_class = 1.0 + w_class = ITEMSIZE_TINY /obj/item/paper/cig/attackby(obj/item/P as obj, mob/user as mob) if(istype(P, /obj/item/flame) || P.iswelder()) @@ -762,7 +822,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM name = "cigarette filter" desc = "A small nub like filter for cigarettes." icon_state = "cigfilter" - w_class = 1.0 + w_class = ITEMSIZE_TINY /obj/item/paper/cig/filter/attackby(obj/item/P as obj, mob/user as mob) if(istype(P, /obj/item/flame) || P.iswelder()) @@ -775,13 +835,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM ..() return if (user.a_intent == I_GRAB && icon_state != "scrap" && !istype(src, /obj/item/paper/carbon)) - user.show_message(span("alert", "The cigarette paper is too small to fold into a plane.")) + user.show_message(SPAN_ALERT("The cigarette paper is too small to fold into a plane.")) return //tobacco sold seperately if you're too snobby to grow it yourself. /obj/item/reagent_containers/food/snacks/grown/dried_tobacco plantname = "tobacco" - w_class = 1.0 + w_class = ITEMSIZE_TINY /obj/item/reagent_containers/food/snacks/grown/dried_tobacco/Initialize() . = ..() @@ -801,13 +861,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/rolled/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/paper/cig/filter)) if(filter) - to_chat(user, span("warning", "[src] already has a filter!")) + to_chat(user, SPAN_WARNING("[src] already has a filter!")) return if(lit) - to_chat(user, span("warning", "[src] is lit already!")) + to_chat(user, SPAN_WARNING("[src] is lit already!")) return if(user.unEquip(I)) - to_chat(user, span("notice", "You stick [I] into \the [src]")) + to_chat(user, SPAN_NOTICE("You stick [I] into \the [src]")) playsound(src, 'sound/items/drop/gloves.ogg', 25, 1) filter = 1 name = "filtered [name]" @@ -819,13 +879,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/I, mob/user) if(is_type_in_list(I, list(/obj/item/paper/cig/, /obj/item/paper/, /obj/item/teleportation_scroll))) if(!dry) - to_chat(user, span("warning", "You need to dry [src] first!")) + to_chat(user, SPAN_WARNING("You need to dry [src] first!")) return if(user.unEquip(I)) var/obj/item/clothing/mask/smokable/cigarette/rolled/R = new(get_turf(src)) R.chem_volume = reagents.total_volume reagents.trans_to_holder(R.reagents, R.chem_volume) - to_chat(user, span("notice", "You roll \the [src] into \the [I]")) + to_chat(user, SPAN_NOTICE("You roll \the [src] into \the [I]")) playsound(src, 'sound/bureaucracy/paperfold.ogg', 25, 1) user.put_in_active_hand(R) qdel(I) diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm index 689d2cd4902..8838c3d1a07 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm @@ -2,7 +2,7 @@ #ifdef T_BOARD #error T_BOARD already defined elsewhere, we can't use it. #endif -#define T_BOARD(name) "circuit board (" + (name) + ")" +#define T_BOARD(name) "" + "circuit board " + "(" + (name) + ")" /obj/item/circuitboard name = "circuit board" diff --git a/code/game/objects/items/weapons/circuitboards/mecha.dm b/code/game/objects/items/weapons/circuitboards/mecha.dm index 1d3d0fe02f6..c67a8ef3fe3 100644 --- a/code/game/objects/items/weapons/circuitboards/mecha.dm +++ b/code/game/objects/items/weapons/circuitboards/mecha.dm @@ -1,7 +1,7 @@ #ifdef T_BOARD_MECHA #error T_BOARD_MECHA already defined elsewhere, we can't use it. #endif -#define T_BOARD_MECHA(name) "exosuit module circuit board (" + (name) + ")" +#define T_BOARD_MECHA(name) "" + "exosuit module circuit board " + "(" + (name) + ")" /obj/item/circuitboard/mecha name = "exosuit circuit board" diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 3869b3974e2..f5daa0d492a 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/dice.dmi' icon_state = "d66" w_class = 1 + var/base_icon = "d6" var/side_mult = 1 // Used for d100s. var/sides = 6 var/weighted = FALSE //if this dice can cheat or something @@ -11,8 +12,13 @@ var/weighted_value = 70 //what is the chance of falling on the favored number attack_verb = list("diced") -/obj/item/dice/New() - icon_state = "[name][rand(1,sides)]" +/obj/item/dice/Initialize() + . = ..() + icon_state = "[base_icon][rand(1,sides)]" + +/obj/item/dice/update_icon(var/result) + if(result) + icon_state = "[base_icon][result]" /obj/item/dice/throw_impact(atom/hit_atom) ..() @@ -27,7 +33,7 @@ comment = "Nat 20!" else if(sides == 20 && result == 1) comment = "Ouch, bad luck." - icon_state = "[name][result]" + update_icon(result) src.visible_message("\The [name] lands on [result * side_mult]. [comment]") /obj/item/dice/d4 @@ -35,34 +41,40 @@ desc = "A dice with four sides." icon_state = "d44" sides = 4 + base_icon = "d4" /obj/item/dice/d8 name = "d8" desc = "A dice with eight sides." icon_state = "d88" sides = 8 + base_icon = "d8" /obj/item/dice/d10 name = "d10" desc = "A dice with ten sides." icon_state = "d1010" sides = 10 + base_icon = "d10" /obj/item/dice/d12 name = "d12" desc = "A dice with twelve sides." icon_state = "d1212" sides = 12 + base_icon = "d12" /obj/item/dice/d20 name = "d20" desc = "A dice with twenty sides." icon_state = "d2020" sides = 20 + base_icon = "d20" /obj/item/dice/d100 name = "d100" desc = "A dice with ten sides. This one is for the tens digit." icon_state = "d10010" sides = 10 - side_mult = 10 \ No newline at end of file + side_mult = 10 + base_icon = "d100" \ No newline at end of file diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index cc7b7dbb321..c8f625f9ef7 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -76,7 +76,7 @@ /obj/item/reagent_containers/extinguisher_refill/filled/Initialize() . =..() - reagents.add_reagent("monoammoniumphosphate", volume) + reagents.add_reagent(/datum/reagent/toxin/fertilizer/monoammoniumphosphate, volume) flags &= ~OPENCONTAINER return @@ -124,7 +124,7 @@ /obj/item/extinguisher/New() create_reagents(max_water) - reagents.add_reagent("monoammoniumphosphate", max_water) + reagents.add_reagent(/datum/reagent/toxin/fertilizer/monoammoniumphosphate, max_water) ..() /obj/item/extinguisher/examine(mob/user) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index d1253a60089..2c0bc9772a8 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -224,7 +224,7 @@ var/atom/movable/I = new gift_type(get_turf(user)) user.remove_from_mob(src) user.put_in_hands(I) - to_chat(user, span("notice", "You open the gift, revealing your new [I.name]! Just what you always wanted!")) + to_chat(user, SPAN_NOTICE("You open the gift, revealing your new [I.name]! Just what you always wanted!")) qdel(src) return @@ -294,7 +294,7 @@ user.remove_from_mob(src) if (!user.put_in_hands(I)) user.forceMove(get_turf(src)) - to_chat(user, span("notice", "You open the gift, revealing your new [I.name]! Just what you always wanted!")) + to_chat(user, SPAN_NOTICE("You open the gift, revealing your new [I.name]! Just what you always wanted!")) qdel(src) return @@ -338,6 +338,6 @@ var/atom/movable/I = new gift_type(get_turf(user)) user.remove_from_mob(src) user.put_in_hands(I) - to_chat(user, span("notice", "You open the gift, revealing your new [I.name]! Just what you always wanted!")) + to_chat(user, SPAN_NOTICE("You open the gift, revealing your new [I.name]! Just what you always wanted!")) qdel(src) return diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 885f0ff8d43..78945365339 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -201,9 +201,9 @@ var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("aluminum", 30) - B2.reagents.add_reagent("foaming_agent", 10) - B2.reagents.add_reagent("pacid", 10) + B1.reagents.add_reagent(/datum/reagent/aluminum, 30) + B2.reagents.add_reagent(/datum/reagent/foaming_agent, 10) + B2.reagents.add_reagent(/datum/reagent/acid/polyacid, 10) detonator = new/obj/item/device/assembly_holder/timer_igniter(src) @@ -222,11 +222,11 @@ var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("aluminum", 15) - B1.reagents.add_reagent("fuel",20) - B2.reagents.add_reagent("phoron", 15) - B2.reagents.add_reagent("sacid", 15) - B1.reagents.add_reagent("fuel",20) + B1.reagents.add_reagent(/datum/reagent/aluminum, 15) + B1.reagents.add_reagent(/datum/reagent/fuel,20) + B2.reagents.add_reagent(/datum/reagent/toxin/phoron, 15) + B2.reagents.add_reagent(/datum/reagent/acid, 15) + B1.reagents.add_reagent(/datum/reagent/fuel,20) detonator = new/obj/item/device/assembly_holder/timer_igniter(src) @@ -245,10 +245,10 @@ var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("plantbgone", 25) - B1.reagents.add_reagent("potassium", 25) - B2.reagents.add_reagent("phosphorus", 25) - B2.reagents.add_reagent("sugar", 25) + B1.reagents.add_reagent(/datum/reagent/toxin/plantbgone, 25) + B1.reagents.add_reagent(/datum/reagent/potassium, 25) + B2.reagents.add_reagent(/datum/reagent/phosphorus, 25) + B2.reagents.add_reagent(/datum/reagent/sugar, 25) detonator = new/obj/item/device/assembly_holder/timer_igniter(src) @@ -267,12 +267,12 @@ var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("sugar", 20) - B1.reagents.add_reagent("potassium",20) - B1.reagents.add_reagent("stoxin", 10) - B1.reagents.add_reagent("dylovene", 10) - B2.reagents.add_reagent("chloralhydrate",40) - B2.reagents.add_reagent("phosphorus",20) + B1.reagents.add_reagent(/datum/reagent/sugar, 20) + B1.reagents.add_reagent(/datum/reagent/potassium,20) + B1.reagents.add_reagent(/datum/reagent/soporific, 10) + B1.reagents.add_reagent(/datum/reagent/dylovene, 10) + B2.reagents.add_reagent(/datum/reagent/chloralhydrate,40) + B2.reagents.add_reagent(/datum/reagent/phosphorus,20) detonator = new/obj/item/device/assembly_holder/timer_igniter(src) @@ -291,9 +291,9 @@ var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("surfactant", 40) - B2.reagents.add_reagent("water", 40) - B2.reagents.add_reagent("cleaner", 10) + B1.reagents.add_reagent(/datum/reagent/surfactant, 40) + B2.reagents.add_reagent(/datum/reagent/water, 40) + B2.reagents.add_reagent(/datum/reagent/spacecleaner, 10) detonator = new/obj/item/device/assembly_holder/timer_igniter(src) @@ -312,10 +312,10 @@ var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) - B1.reagents.add_reagent("cardox", 40) - B1.reagents.add_reagent("potassium", 40) - B2.reagents.add_reagent("phosphorus", 40) - B2.reagents.add_reagent("sugar", 40) + B1.reagents.add_reagent(/datum/reagent/toxin/cardox, 40) + B1.reagents.add_reagent(/datum/reagent/potassium, 40) + B2.reagents.add_reagent(/datum/reagent/phosphorus, 40) + B2.reagents.add_reagent(/datum/reagent/sugar, 40) detonator = new/obj/item/device/assembly_holder/timer_igniter(src) @@ -335,11 +335,11 @@ var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) - B1.reagents.add_reagent("phosphorus", 40) - B1.reagents.add_reagent("potassium", 40) - B1.reagents.add_reagent("condensedcapsaicin", 40) - B2.reagents.add_reagent("sugar", 40) - B2.reagents.add_reagent("condensedcapsaicin", 80) + B1.reagents.add_reagent(/datum/reagent/phosphorus, 40) + B1.reagents.add_reagent(/datum/reagent/potassium, 40) + B1.reagents.add_reagent(/datum/reagent/capsaicin/condensed, 40) + B2.reagents.add_reagent(/datum/reagent/sugar, 40) + B2.reagents.add_reagent(/datum/reagent/capsaicin/condensed, 80) detonator = new/obj/item/device/assembly_holder/timer_igniter(src) @@ -358,10 +358,10 @@ var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("surfactant", 40) - B1.reagents.add_reagent("monoammoniumphosphate", 20) - B2.reagents.add_reagent("water", 40) - B2.reagents.add_reagent("monoammoniumphosphate", 20) + B1.reagents.add_reagent(/datum/reagent/surfactant, 40) + B1.reagents.add_reagent(/datum/reagent/toxin/fertilizer/monoammoniumphosphate, 20) + B2.reagents.add_reagent(/datum/reagent/water, 40) + B2.reagents.add_reagent(/datum/reagent/toxin/fertilizer/monoammoniumphosphate, 20) detonator = new/obj/item/device/assembly_holder/timer_igniter(src) diff --git a/code/game/objects/items/weapons/grenades/dynamite.dm b/code/game/objects/items/weapons/grenades/dynamite.dm index 47e0911d7a2..eece9f56317 100644 --- a/code/game/objects/items/weapons/grenades/dynamite.dm +++ b/code/game/objects/items/weapons/grenades/dynamite.dm @@ -18,7 +18,7 @@ if(WT.isOn()) activate(user) - else if(isflamesource(W)) + else if(W.isFlameSource()) activate(user) else if(istype(W, /obj/item/flame/candle)) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index df86af86e49..246a88d0afb 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -2,7 +2,7 @@ name = "handcuffs" desc = "Use this to keep prisoners in line." gender = PLURAL - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/handcuffs.dmi' icon_state = "handcuff" flags = CONDUCT slot_flags = SLOT_BELT @@ -26,7 +26,7 @@ return if ((user.is_clumsy()) && prob(50)) - to_chat(user, "Uh ... how do those things work?!") + to_chat(user, SPAN_WARNING("Uh ... how do those things work?!")) place_handcuffs(user, user) return @@ -47,24 +47,24 @@ if(can_place) place_handcuffs(C, user) else - to_chat(user, "You need to have a firm grip on [C] before you can put \the [src] on!") + to_chat(user, SPAN_DANGER("You need to have a firm grip on [C] before you can put \the [src] on!")) /obj/item/handcuffs/proc/place_handcuffs(var/mob/living/carbon/target, var/mob/user) playsound(src.loc, cuff_sound, 30, 1, -2) var/mob/living/carbon/human/H = target if(!istype(H)) - return 0 + return FALSE if (!H.has_organ_for_slot(slot_handcuffed)) - to_chat(user, "\The [H] needs at least two wrists before you can cuff them together!") - return 0 + to_chat(user, SPAN_DANGER("\The [H] needs at least two wrists before you can cuff them together!")) + return FALSE if(istype(H.gloves,/obj/item/clothing/gloves/rig) && !elastic) // Can't cuff someone who's in a deployed hardsuit. - to_chat(user, "\The [src] won't fit around \the [H.gloves]!") - return 0 + to_chat(user, SPAN_DANGER("\The [src] won't fit around \the [H.gloves]!")) + return FALSE - user.visible_message("\The [user] is attempting to put [cuff_type] on \the [H]!") + user.visible_message(SPAN_DANGER("\The [user] is attempting to put [cuff_type] on \the [H]!")) if(!do_mob(user, target, 30)) return @@ -77,7 +77,7 @@ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.do_attack_animation(H) - user.visible_message("\The [user] has put [cuff_type] on \the [H]!") + user.visible_message(SPAN_DANGER("\The [user] has put [cuff_type] on \the [H]!")) target.drop_r_hand() target.drop_l_hand() // Apply cuffs. @@ -88,7 +88,7 @@ user.drop_from_inventory(cuffs,target) target.handcuffed = cuffs target.update_inv_handcuffed() - return 1 + return TRUE /mob/living/carbon/human/RestrainedClickOn(var/atom/A) if (A != src) return ..() @@ -106,8 +106,8 @@ var/obj/item/organ/external/O = H.organs_by_name[H.hand?BP_L_HAND:BP_R_HAND] if (!O) return - var/s = "[H.name] chews on \his [O.name]!" - H.visible_message(s, "You chew on your [O.name]!") + var/s = SPAN_WARNING("[H.name] chews on \his [O.name]!") + H.visible_message(s, SPAN_WARNING("You chew on your [O.name]!")) message_admins("[key_name_admin(H)] is chewing on [H.get_pronoun(1)] restrained hand - (JMP)") H.attack_log += text("\[[time_stamp()]\] [s] ([H.ckey])") log_attack("[s] ([H.ckey])",ckey=key_name(H)) @@ -120,35 +120,54 @@ /obj/item/handcuffs/cable name = "cable restraints" desc = "Looks like some cables tied together. Could be used to tie something up." - icon_state = "cuff_white" + icon_state = "cablecuff" + item_state = "coil" + color = COLOR_RED + item_icons = list( + slot_l_hand_str = 'icons/mob/items/stacks/lefthand_materials.dmi', + slot_r_hand_str = 'icons/mob/items/stacks/righthand_materials.dmi', + ) breakouttime = 300 //Deciseconds = 30s cuff_sound = 'sound/weapons/cablecuff.ogg' cuff_type = "cable restraints" - elastic = 1 + elastic = TRUE + build_from_parts = TRUE + worn_overlay = "end" -/obj/item/handcuffs/cable/red - color = "#DD0000" +/obj/item/handcuffs/cable/Initialize(mapload, new_color) + . = ..() + if(new_color) + color = new_color + + if(build_from_parts) //random colors! + if(!color) + color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_ORANGE, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN) + add_overlay(overlay_image(icon, "[initial(icon_state)]_end", flags=RESET_COLOR)) /obj/item/handcuffs/cable/yellow - color = "#DDDD00" + color = COLOR_YELLOW /obj/item/handcuffs/cable/blue - color = "#0000DD" + color = COLOR_BLUE /obj/item/handcuffs/cable/green - color = "#00DD00" + color = COLOR_GREEN /obj/item/handcuffs/cable/pink - color = "#DD00DD" + color = COLOR_PINK /obj/item/handcuffs/cable/orange - color = "#DD8800" + color = COLOR_ORANGE /obj/item/handcuffs/cable/cyan - color = "#00DDDD" + color = COLOR_CYAN /obj/item/handcuffs/cable/white - color = "#FFFFFF" + color = COLOR_WHITE + +/obj/item/handcuffs/cable/random/Initialize() + color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_ORANGE, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN) + . = ..() /obj/item/handcuffs/cable/attackby(var/obj/item/I, mob/user as mob) ..() @@ -157,12 +176,18 @@ if (R.use(1)) var/obj/item/material/wirerod/W = new(get_turf(user)) user.put_in_hands(W) - to_chat(user, "You wrap the cable restraint around the top of the rod.") + to_chat(user, SPAN_NOTICE("You wrap the cable restraint around the top of the rod.")) qdel(src) update_icon(user) + else if(I.iswirecutter()) + user.visible_message("[user] cuts the [src].", SPAN_NOTICE("You cut the [src].")) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) + new/obj/item/stack/cable_coil(get_turf(src), 15, color) + qdel(src) + update_icon(user) /obj/item/handcuffs/cyborg - dispenser = 1 + dispenser = TRUE /obj/item/handcuffs/cable/tape name = "tape restraints" @@ -176,8 +201,8 @@ /obj/item/handcuffs/ziptie name = "ziptie" desc = " A sturdy and reliable plastic ziptie for binding the wrists." - icon = 'icons/obj/items.dmi' icon_state = "ziptie" breakouttime = 600 cuff_sound = 'sound/weapons/cablecuff.ogg' - elastic = 1 + cuff_type = "zipties" + elastic = TRUE diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 955906c38ed..01f2046151f 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -612,7 +612,7 @@ the implant may become unstable and either pre-maturely inject the subject or si for(var/obj/item/implant/mindshield/I in H) if(I.implanted) - to_chat(H, span("danger", "Rage surges through your body, but the nanobots from your mind shield implant stop it soon after it starts!")) + to_chat(H, SPAN_DANGER("Rage surges through your body, but the nanobots from your mind shield implant stop it soon after it starts!")) return TRUE var/datum/antagonist/antag_data = get_antag_data(H.mind.special_role) @@ -621,10 +621,10 @@ the implant may become unstable and either pre-maturely inject the subject or si log_and_message_admins("[key_name(H)] was implanted by an aggression implant, but was not effected.", H) else if(antag_data?.id == MODE_LOYALIST) clear_antag_roles(H.mind, 1) - to_chat(H, span("danger", "You feel a surge of rage override your loyalty!")) + to_chat(H, SPAN_DANGER("You feel a surge of rage override your loyalty!")) log_and_message_admins("[key_name(H)] was implanted by an aggression implant, clearing their loyalist status!", H) else - to_chat(H, span("danger", "You feel a surge of rage course through your body and very soul!")) + to_chat(H, SPAN_DANGER("You feel a surge of rage course through your body and very soul!")) log_and_message_admins("[key_name(H)] was implanted by an aggression implant!", H) return TRUE diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 2a13c2b22c1..a595c38c7cb 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -11,7 +11,7 @@ w_class = 2.0 var/obj/item/implantcase/case = null var/broadcasting = null - var/listening = 1.0 + var/listening = TRUE proc update() diff --git a/code/game/objects/items/weapons/material/ashtray.dm b/code/game/objects/items/weapons/material/ashtray.dm index f58b99015d7..de751d6da2a 100644 --- a/code/game/objects/items/weapons/material/ashtray.dm +++ b/code/game/objects/items/weapons/material/ashtray.dm @@ -49,7 +49,7 @@ if (istype(W,/obj/item/clothing/mask/smokable/cigarette)) var/obj/item/clothing/mask/smokable/cigarette/cig = W - if (cig.lit == 1) + if (cig.lit == TRUE) src.visible_message("[user] crushes [cig] in \the [src], putting it out.") playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) STOP_PROCESSING(SSprocessing, cig) @@ -59,7 +59,7 @@ W = butt //spawn(1) // TemperatureAct(150) - else if (cig.lit == 0) + else if (cig.lit == FALSE) to_chat(user, "You place [cig] in [src] without even smoking it. Why would you do that?") src.visible_message("[user] places [W] in [src].") diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index b90ceb15e64..999af19b3ae 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -49,15 +49,15 @@ if (fullness > (550 * (1 + M.overeatduration / 2000))) to_chat(M, "You cannot force anymore food down!") return - M.visible_message(span("notice", "\The [user] [is_liquid ? "drinks" : "eats"] some [loaded] from \the [src].")) + M.visible_message(SPAN_NOTICE("\The [user] [is_liquid ? "drinks" : "eats"] some [loaded] from \the [src].")) else if (fullness > (550 * (1 + M.overeatduration / 2000))) to_chat(M, "You cannot force anymore food down their throat!") return - user.visible_message(span("warning", "\The [user] begins to feed \the [M]!")) + user.visible_message(SPAN_WARNING("\The [user] begins to feed \the [M]!")) if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS))) return - M.visible_message(span("notice", "\The [user] feeds some [loaded] to \the [M] with \the [src].")) + M.visible_message(SPAN_NOTICE("\The [user] feeds some [loaded] to \the [M] with \the [src].")) reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST) if(is_liquid) playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1) @@ -67,7 +67,7 @@ cut_overlays() return else - to_chat(user, span("warning", "You don't have anything on \the [src].")) //if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK) + to_chat(user, SPAN_WARNING("You don't have anything on \the [src].")) //if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK) return /obj/item/material/kitchen/utensil/fork @@ -114,7 +114,7 @@ /obj/item/material/kitchen/utensil/knife/attack(mob/target, mob/living/user, var/target_zone) if ((user.is_clumsy()) && prob(50)) - to_chat(user, span("warning", "You accidentally cut yourself with \the [src].")) + to_chat(user, SPAN_WARNING("You accidentally cut yourself with \the [src].")) user.take_organ_damage(20) return return ..() @@ -139,7 +139,7 @@ /obj/item/material/kitchen/rollingpin/attack(mob/living/M, mob/living/user, var/target_zone) if ((user.is_clumsy()) && prob(50)) - to_chat(user, span("warning", "\The [src] slips out of your hand and hits your head.")) + to_chat(user, SPAN_WARNING("\The [src] slips out of your hand and hits your head.")) user.drop_from_inventory(src) user.take_organ_damage(10) user.Paralyse(2) diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 0585f7b1848..8f1920d98c9 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -64,7 +64,7 @@ if(M.buckled) //wheelchairs, office chairs, rollerbeds return - to_chat(M, span("danger", "You step on \the [src]!")) + to_chat(M, SPAN_DANGER("You step on \the [src]!")) playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm index dc2a6e23600..5fd76f533c2 100644 --- a/code/game/objects/items/weapons/material/swords.dm +++ b/code/game/objects/items/weapons/material/swords.dm @@ -19,7 +19,7 @@ drop_sound = 'sound/items/drop/sword.ogg' pickup_sound = 'sound/items/pickup/sword.ogg' -/obj/item/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/material/sword/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") var/parry_bonus = 1 if(ishuman(user)) @@ -55,7 +55,7 @@ target.drop_l_hand() return TRUE - if(target_zone == "r_feet" || target_zone == "l_feet" || target_zone == BP_R_LEG || target_zone == BP_L_LEG) + if(target_zone == BP_R_FOOT || target_zone == BP_R_FOOT || target_zone == BP_R_LEG || target_zone == BP_L_LEG) if(prob(60 - armor_reduction)) target.Weaken(5) return TRUE diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 84b25ad778a..3d006eae207 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -80,7 +80,7 @@ return unwield() //Allow a small chance of parrying melee attacks when wielded - maybe generalize this to other weapons someday -/obj/item/material/twohanded/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/material/twohanded/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(wielded && default_parry_check(user, attacker, damage_source) && prob(parry_chance)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) @@ -343,7 +343,7 @@ applies_material_colour = 0 default_material = "steel" parry_chance = 5 - var/fuel_type = "fuel" + var/fuel_type = /datum/reagent/fuel var/opendelay = 30 // How long it takes to perform a door opening action with this chainsaw, in seconds. var/max_fuel = 300 // The maximum amount of fuel the chainsaw stores. var/fuel_cost = 1 // Multiplier for fuel cost. @@ -375,7 +375,7 @@ /obj/item/material/twohanded/chainsaw/proc/PowerUp() var/turf/T = get_turf(src) - T.audible_message(span("notice", "\The [src] rumbles to life.")) + T.audible_message(SPAN_NOTICE("\The [src] rumbles to life.")) playsound(src, "sound/weapons/chainsawstart.ogg", 25, 0, 30) force = 15 force_unwielded = 30 @@ -390,7 +390,7 @@ /obj/item/material/twohanded/chainsaw/proc/PowerDown() var/turf/T = get_turf(src) - T.audible_message(span("notice", "\The [src] slowly powers down.")) + T.audible_message(SPAN_NOTICE("\The [src] slowly powers down.")) force = initial(force) force_wielded = initial(force_wielded) throwforce = initial(throwforce) @@ -488,7 +488,7 @@ PowerDown(user) else if(!wielded) to_chat(user, "You need to hold this with two hands to turn this on.") - else if(reagents.get_reagent_amount("fuel") <= 0) + else if(reagents.get_reagent_amount(/datum/reagent/fuel) <= 0) user.visible_message(\ "[user] pulls the cord on the [src], but nothing happens.",\ "You pull the cord on the [src], but nothing happens.",\ diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index b09e304a520..831a214dee3 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -62,7 +62,7 @@ add_fingerprint(user) return -/obj/item/melee/energy/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/melee/energy/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(active && default_parry_check(user, attacker, damage_source) && prob(50)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") @@ -286,12 +286,12 @@ /obj/item/melee/energy/sword/hegemony/activate(mob/living/user) ..() icon_state = "kataphract-esword1" - to_chat(user, span("notice", "\The [src] is now energised.")) + to_chat(user, SPAN_NOTICE("\The [src] is now energised.")) /obj/item/melee/energy/sword/hegemony/deactivate(mob/living/user) ..() icon_state = initial(icon_state) - to_chat(user, span("notice", "\The [src] is de-energised.")) + to_chat(user, SPAN_NOTICE("\The [src] is de-energised.")) /obj/item/melee/energy/sword/knife name = "energy utility knife" diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 83f178bc832..fbff49d9e55 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -42,13 +42,13 @@ active= !active if(active) playsound(user, 'sound/weapons/saw/chainsawstart.ogg', 50, 1) - to_chat(user, span("notice", "\The [src] rumbles to life.")) + to_chat(user, SPAN_NOTICE("\The [src] rumbles to life.")) force = 35 hitsound = 'sound/weapons/saw/chainsword.ogg' icon_state = "chainswordon" slot_flags = null else - to_chat(user, span("notice", "\The [src] slowly powers down.")) + to_chat(user, SPAN_NOTICE("\The [src] slowly powers down.")) force = initial(force) hitsound = initial(hitsound) icon_state = initial(icon_state) diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 1d371e6d5a2..b8b4864b626 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -34,10 +34,10 @@ if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) if(reagents.total_volume < 1) if(clean_msg) - to_chat(user, span("notice", "Your mop is dry!")) + to_chat(user, SPAN_NOTICE("Your mop is dry!")) return if (!(last_clean && world.time < last_clean + 120)) //spam is bad - user.visible_message(span("warning", "[user] begins to mop \the [get_turf(A)].")) + user.visible_message(SPAN_WARNING("[user] begins to mop \the [get_turf(A)].")) clean_msg = TRUE last_clean = world.time else @@ -49,7 +49,7 @@ if(T) T.clean(src, user) if(clean_msg) - to_chat(user, span("notice", "You have finished mopping!")) + to_chat(user, SPAN_NOTICE("You have finished mopping!")) update_icon() @@ -81,7 +81,7 @@ cleantime = 15 var/refill_enabled = TRUE //Self-refill toggle for when a janitor decides to mop with something other than water. var/refill_rate = 0.5 //Rate per process() tick mop refills itself - var/refill_reagent = "water" //Determins what reagent to use for refilling, just in case someone wanted to make a HOLY MOP OF PURGING + var/refill_reagent = /datum/reagent/water //Determins what reagent to use for refilling, just in case someone wanted to make a HOLY MOP OF PURGING /obj/item/mop/advanced/New() ..() @@ -93,7 +93,7 @@ START_PROCESSING(SSprocessing, src) else STOP_PROCESSING(SSprocessing,src) - to_chat(user, span("notice", "You set the condenser switch to the '[refill_enabled ? "ON" : "OFF"]' position.")) + to_chat(user, SPAN_NOTICE("You set the condenser switch to the '[refill_enabled ? "ON" : "OFF"]' position.")) playsound(user, 'sound/machines/click.ogg', 25, 1) /obj/item/mop/advanced/process() @@ -102,7 +102,7 @@ /obj/item/mop/advanced/examine(mob/user) ..() - to_chat(user, span("notice", "\The condenser switch is set to [refill_enabled ? "ON" : "OFF"].")) + to_chat(user, SPAN_NOTICE("\The condenser switch is set to [refill_enabled ? "ON" : "OFF"].")) /obj/item/mop/advanced/Destroy() if(refill_enabled) diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 62a68aec82b..216e2a593d5 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -17,16 +17,16 @@ no_shatter = TRUE var/paint_reagent = null //name of the reagent responsible for colouring the paint var/paint_type = null //used for colouring detective technicolor coat and hat + reagents_to_add = list(/datum/reagent/water = 3/5, /datum/reagent/toxin/plasticide = 1/5) /obj/item/reagent_containers/glass/paint/Initialize() + reagents_to_add[paint_reagent] = 1/5 + for(var/datum/reagent/R in reagents_to_add) + reagents_to_add[R] *= volume . = ..() + reagents.handle_reactions() if(paint_type && length(paint_type) > 0) name = paint_type + " " + name - reagents.add_reagent("water", volume*3/5) - reagents.add_reagent("plasticide", volume/5) - if(paint_reagent) - reagents.add_reagent(paint_reagent, volume/5) - reagents.handle_reactions() update_icon() /obj/item/reagent_containers/glass/paint/update_icon() @@ -54,29 +54,29 @@ update_icon() /obj/item/reagent_containers/glass/paint/red - paint_reagent = "crayon_dust_red" + paint_reagent = /datum/reagent/crayon_dust/red paint_type = "red" /obj/item/reagent_containers/glass/paint/yellow - paint_reagent = "crayon_dust_yellow" + paint_reagent = /datum/reagent/crayon_dust/yellow paint_type = "yellow" /obj/item/reagent_containers/glass/paint/green - paint_reagent = "crayon_dust_green" + paint_reagent = /datum/reagent/crayon_dust/green paint_type = "green" /obj/item/reagent_containers/glass/paint/blue - paint_reagent = "crayon_dust_blue" + paint_reagent = /datum/reagent/crayon_dust/blue paint_type = "blue" /obj/item/reagent_containers/glass/paint/purple - paint_reagent = "crayon_dust_purple" + paint_reagent = /datum/reagent/crayon_dust/purple paint_type = "purple" /obj/item/reagent_containers/glass/paint/black - paint_reagent = "carbon" + paint_reagent = /datum/reagent/carbon paint_type = "black" /obj/item/reagent_containers/glass/paint/white - paint_reagent = "aluminum" + paint_reagent = /datum/reagent/aluminum paint_type = "white" diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index 324930e5395..31a28cd5dea 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -58,13 +58,13 @@ var/list/tape_roll_applications = list() /obj/item/taperoll/attack_self(mob/user as mob) if(icon_state == "[icon_base]_start") start = get_turf(src) - to_chat(usr, span("notice", "You place the first end of the [src].")) + to_chat(usr, SPAN_NOTICE("You place the first end of the [src].")) icon_state = "[icon_base]_stop" else icon_state = "[icon_base]_start" end = get_turf(src) if(start.y != end.y && start.x != end.x || start.z != end.z) - to_chat(usr, span("notice", "[src] can only be laid horizontally or vertically.")) + to_chat(usr, SPAN_NOTICE("[src] can only be laid horizontally or vertically.")) return var/turf/cur = start @@ -93,7 +93,7 @@ var/list/tape_roll_applications = list() break cur = get_step_towards(cur,end) if (!can_place) - to_chat(usr, span("notice", "You can't run \the [src] through that!")) + to_chat(usr, SPAN_NOTICE("You can't run \the [src] through that!")) return cur = start @@ -106,7 +106,7 @@ var/list/tape_roll_applications = list() var/obj/item/tape/P = new tape_type(cur) P.icon_state = "[P.icon_base]_[dir]" cur = get_step_towards(cur,end) - to_chat(usr, span("notice", "You finish placing the [src].")) //Git Test) + to_chat(usr, SPAN_NOTICE("You finish placing the [src].")) //Git Test) /obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity) if(!proximity) @@ -118,7 +118,7 @@ var/list/tape_roll_applications = list() P.forceMove(locate(T.x,T.y,T.z)) P.icon_state = "[src.icon_base]_door" P.layer = 3.2 - to_chat(user, span("notice", "You finish placing the [src].")) + to_chat(user, SPAN_NOTICE("You finish placing the [src].")) if (istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor)) var/turf/F = A @@ -157,7 +157,7 @@ var/list/tape_roll_applications = list() /obj/item/tape/attack_hand(mob/user as mob) if (user.a_intent == I_HELP && src.allowed(user)) - user.show_viewers(span("notice", "[user] lifts [src], allowing passage.")) + user.show_viewers(SPAN_NOTICE("[user] lifts [src], allowing passage.")) crumple() lifted = 1 spawn(200) @@ -171,7 +171,7 @@ var/list/tape_roll_applications = list() if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user)))) to_chat(user, "You can't break the [src] with that!") return - user.show_viewers(span("notice", "[user] breaks the [src]!")) + user.show_viewers(SPAN_NOTICE("[user] breaks the [src]!")) var/dir[2] var/icon_dir = src.icon_state diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 008d0b77109..d14e2bb9baa 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -19,11 +19,11 @@ if(!user.is_wizard()) if(istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/H = user - var/obj/item/organ/O = H.internal_organs_by_name[pick(BP_EYES,"appendix",BP_KIDNEYS,BP_LIVER, BP_HEART, BP_LUNGS, BP_BRAIN)] + var/obj/item/organ/O = H.internal_organs_by_name[pick(BP_EYES, BP_APPENDIX, BP_KIDNEYS, BP_LIVER, BP_HEART, BP_LUNGS, BP_BRAIN)] if(O == null) - to_chat(user, span("notice", "You can't make any sense of the arcane glyphs. . . maybe you should try again.")) + to_chat(user, SPAN_NOTICE("You can't make any sense of the arcane glyphs. . . maybe you should try again.")) else - to_chat(user, span("alert", "As you stumble over the arcane glyphs, you feel a twisting sensation in [O]!")) + to_chat(user, SPAN_ALERT("As you stumble over the arcane glyphs, you feel a twisting sensation in [O]!")) user.visible_message("A flash of smoke pours out of [user]'s orifices!") playsound(user, 'sound/magic/lightningshock.ogg', 40, 1) var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread() diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 1f5374443bb..758deb33e06 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -39,18 +39,25 @@ ) var/base_block_chance = 50 -/obj/item/shield/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/shield/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(user.incapacitated()) return 0 + var/shield_dir = reverse_dir[user.dir] + if(on_back) + shield_dir = user.dir + //block as long as they are not directly behind us - var/bad_arc = reverse_direction(user.dir) //arc of directions from which we cannot block + var/bad_arc = shield_dir //arc of directions from which we cannot block if(check_shield_arc(user, bad_arc, damage_source, attacker)) if(prob(get_block_chance(user, damage, damage_source, attacker))) user.visible_message("\The [user] blocks [attack_text] with \the [src]!") return 1 return 0 +/obj/item/shield/can_shield_back() + return TRUE + /obj/item/shield/proc/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null) return base_block_chance @@ -139,7 +146,7 @@ var/shield_power = 150 var/active = 0 -/obj/item/shield/energy/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/shield/energy/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(!active) return 0 //turn it on first! @@ -150,8 +157,12 @@ spark(user.loc, 5) playsound(user.loc, 'sound/weapons/blade.ogg', 50, 1) + var/shield_dir = reverse_dir[user.dir] + if(on_back) + shield_dir = user.dir + //block as long as they are not directly behind us - var/bad_arc = reverse_direction(user.dir) //arc of directions from which we cannot block + var/bad_arc = shield_dir //arc of directions from which we cannot block if(check_shield_arc(user, bad_arc, damage_source, attacker)) if(prob(get_block_chance(user, damage, damage_source, attacker))) @@ -299,7 +310,7 @@ throw_speed = 2 w_class = 4 slot_flags = SLOT_BACK - to_chat(user, span("notice","You extend \the [src] downward with a sharp snap of your wrist.")) + to_chat(user, SPAN_NOTICE("You extend \the [src] downward with a sharp snap of your wrist.")) else icon_state = "[initial(icon_state)]" item_state = "[initial(item_state)]" @@ -308,7 +319,7 @@ throw_speed = 3 w_class = 3 slot_flags = 0 - to_chat(user, span("notice","\The [src] folds inwards neatly as you snap your wrist upwards and push it back into the frame.")) + to_chat(user, SPAN_NOTICE("\The [src] folds inwards neatly as you snap your wrist upwards and push it back into the frame.")) if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index 22c181a6e6d..48dd235bc12 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -19,21 +19,22 @@ var/key_data var/clean_msg var/last_clean + var/capacity = 10 drop_sound = 'sound/misc/slip.ogg' /obj/item/soap/New() ..() - create_reagents(10) + create_reagents(capacity) wet() /obj/item/soap/proc/wet() playsound(loc, 'sound/effects/slosh.ogg', 25, 1) - reagents.add_reagent("cleaner", 10) + reagents.add_reagent(/datum/reagent/spacecleaner, capacity) /obj/item/soap/attackby(var/obj/item/I, var/mob/user) if(istype(I, /obj/item/key)) if(!key_data) - to_chat(user, span("notice", "You imprint \the [I] into \the [src].")) + to_chat(user, SPAN_NOTICE("You imprint \the [I] into \the [src].")) var/obj/item/key/K = I key_data = K.key_data update_icon() @@ -55,13 +56,13 @@ //I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing. //So this is a workaround. This also makes more sense from an IC standpoint. ~Carn if(user.client && (target in user.client.screen)) - to_chat(user, span("notice", "You need to take that [target.name] off before cleaning it.")) + to_chat(user, SPAN_NOTICE("You need to take that [target.name] off before cleaning it.")) else if(istype(target,/obj/structure/sink) || istype(target,/obj/structure/sink)) - to_chat(user, span("notice", "You wet \the [src] in the sink.")) + to_chat(user, SPAN_NOTICE("You wet \the [src] in the sink.")) wet() else if (istype(target, /obj/structure/mopbucket) || istype(target, /obj/item/reagent_containers/glass) || istype(target, /obj/structure/reagent_dispensers/watertank)) if (target.reagents && target.reagents.total_volume) - to_chat(user, span("notice", "You wet \the [src] in the [target].")) + to_chat(user, SPAN_NOTICE("You wet \the [src] in the [target].")) wet() else to_chat(user, "\The [target] is empty!") @@ -76,7 +77,7 @@ if (do_after(user, 25, needhand = 0)) target.clean_blood() if(clean_msg) - to_chat(user, span("notice", "You scrub \the [target.name] out.")) + to_chat(user, SPAN_NOTICE("You scrub \the [target.name] out.")) if(istype(target, /turf) || istype(target, /obj/effect/decal/cleanable) || istype(target, /obj/effect/overlay)) var/turf/T = get_turf(target) if(T) @@ -86,7 +87,7 @@ //attack_as_weapon /obj/item/soap/attack(mob/living/target, mob/living/user, var/target_zone) if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == BP_MOUTH ) - user.visible_message(span("danger", "\The [user] washes \the [target]'s mouth out with soap!")) + user.visible_message(SPAN_DANGER("\The [user] washes \the [target]'s mouth out with soap!")) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //prevent spam return ..() @@ -112,6 +113,7 @@ desc = "An untrustworthy bar of soap. Smells of fear." icon_state = "soapsyndie" item_state = "soapsyndie" + capacity = 20 /obj/item/soap/space_soap name = "Soap" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 8d21a8ca1ca..974565c0be5 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -341,7 +341,8 @@ /obj/item/warp_core, /obj/item/extraction_pack, /obj/item/rfd/mining, - /obj/item/gun/custom_ka + /obj/item/gun/custom_ka, + /obj/item/device/orbital_dropper ) /obj/item/storage/belt/hydro diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 07fda1c3bb9..bcb0295e051 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -28,14 +28,14 @@ if(!proximity) return if(user.mind && (user.mind.assigned_role == "Chaplain")) - if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder - if(A.reagents.get_reagent_amount("water") > 60) - to_chat(user, span("notice", "There's too much water for you to bless at once!")) + if(A.reagents && A.reagents.has_reagent(/datum/reagent/water)) //blesses all the water in the holder + if(A.reagents.get_reagent_amount(/datum/reagent/water) > 60) + to_chat(user, SPAN_NOTICE("There's too much water for you to bless at once!")) else - to_chat(user, span("notice", "You bless the water in [A], turning it into holy water.")) - var/water2holy = A.reagents.get_reagent_amount("water") - A.reagents.del_reagent("water") - A.reagents.add_reagent("holywater", water2holy) + to_chat(user, SPAN_NOTICE("You bless the water in [A], turning it into holy water.")) + var/water2holy = A.reagents.get_reagent_amount(/datum/reagent/water) + A.reagents.del_reagent(/datum/reagent/water) + A.reagents.add_reagent(/datum/reagent/water/holywater, water2holy) /obj/item/storage/bible/attackby(obj/item/W as obj, mob/user as mob) if(src.use_sound) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index cf1c51461e6..64b1651203c 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -54,7 +54,7 @@ if (istype(L, /mob/living/carbon/alien/diona) || istype(L, /mob/living/simple_animal) || istype(L, /mob/living/carbon/human))//Monkey-like things do attack_generic, not crew if(contents.len && !locate(/obj/item/reagent_containers/food) in src) // you can tear open empty boxes for nesting material, or for food - to_chat(user, span("warning", "There's no food in that box!")) + to_chat(user, SPAN_WARNING("There's no food in that box!")) return var/damage if (!L.mob_size) @@ -80,9 +80,9 @@ ..() if (health < maxHealth) if (health >= (maxHealth * 0.5)) - to_chat(user, span("warning", "It is slightly torn.")) + to_chat(user, SPAN_WARNING("It is slightly torn.")) else - to_chat(user, span("danger", "It is full of tears and holes.")) + to_chat(user, SPAN_DANGER("It is full of tears and holes.")) // BubbleWrap - A box can be folded up to make card /obj/item/storage/box/attack_self(mob/user as mob) @@ -491,34 +491,29 @@ starts_with = list(/obj/item/toy/snappop/syndi = 8) /obj/item/storage/box/matches - name = "matchbox" - desc = "A small box of 'Space-Proof' premium matches." + name = "safety match box" + desc = "A small box of 'Space-Proof' premium safety matches." //can't strike these anywhere other than matchboxes, so they're safety matches icon = 'icons/obj/cigs_lighters.dmi' icon_state = "matchbox" - item_state = "zippo" - w_class = 1 + item_state = "box" + w_class = ITEMSIZE_TINY drop_sound = 'sound/items/drop/matchbox.ogg' pickup_sound = 'sound/items/pickup/matchbox.ogg' slot_flags = SLOT_BELT can_hold = list(/obj/item/flame/match) starts_with = list(/obj/item/flame/match = 10) -/obj/item/storage/box/matches/attackby(obj/item/flame/match/W as obj, mob/user as mob) - if(istype(W) && !W.lit && !W.burnt) +/obj/item/storage/box/matches/attackby(obj/item/flame/match/W, mob/user) + if(istype(W) && !W.lit) if(prob(25)) playsound(src.loc, 'sound/items/cigs_lighters/matchstick_lit.ogg', 25, 0, -1) - user.visible_message("[user] manages to light the match on the matchbox.") - W.lit = 1 - W.damtype = "burn" - W.icon_state = "match_lit" - W.item_state = "match_lit" - START_PROCESSING(SSprocessing, W) + user.visible_message("[user] manages to light \the [W] by striking it on \the [src].", range = 3) + W.light() else playsound(src.loc, 'sound/items/cigs_lighters/matchstick_hit.ogg', 25, 0, -1) W.update_icon() return - /obj/item/storage/box/autoinjectors name = "box of empty injectors" desc = "Contains empty autoinjectors." @@ -860,3 +855,12 @@ /obj/item/storage/box/dynamite/throw_impact(atom/hit_atom) ..() spill() + +/obj/item/storage/box/closet_teleporter + starts_with = list(/obj/item/closet_teleporter = 2) + +/obj/item/storage/box/closet_teleporter/fill() + var/obj/item/closet_teleporter/CT_1 = new /obj/item/closet_teleporter(src) + var/obj/item/closet_teleporter/CT_2 = new /obj/item/closet_teleporter(src) + CT_1.linked_teleporter = CT_2 + CT_2.linked_teleporter = CT_1 diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 80bc3db6592..0574bfc0862 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -114,7 +114,7 @@ icon = 'icons/obj/crayons.dmi' icon_state = "crayonbox" icon_type = "crayon" - w_class = 2.0 + w_class = ITEMSIZE_SMALL can_hold = list( /obj/item/pen/crayon ) @@ -152,8 +152,9 @@ //CIG PACK// //////////// /obj/item/storage/fancy/cigarettes - name = "Trans-Stellar Duty Free cigarette packet" + name = "Trans-Stellar Duty Frees cigarette packet" desc = "A ubiquitous brand of cigarettes, found in the facilities of every major spacefaring corporation in the universe. As mild and flavorless as it gets." + desc_info = "You can put a cigarette directly in your mouth by selecting the mouth region and clicking on yourself with a cigarette packet in hand." icon = 'icons/obj/cigs_lighters.dmi' icon_state = "cigpacket" item_state = "cigpacket" @@ -164,8 +165,8 @@ ) drop_sound = 'sound/items/drop/gloves.ogg' pickup_sound = 'sound/items/pickup/gloves.ogg' - use_sound = 'sound/items/drop/paper.ogg' - w_class = 1 + use_sound = 'sound/items/drop/wrapper.ogg' + w_class = ITEMSIZE_TINY throwforce = 2 slot_flags = SLOT_BELT storage_slots = 6 @@ -197,7 +198,7 @@ if(M == user && target_zone == BP_MOUTH && contents.len > 0 && !user.wear_mask) var/obj/item/clothing/mask/smokable/cigarette/W = new cigarette_to_spawn(user) if(!istype(W)) - to_chat(user, "The [W] is blocking the cigarettes.") + to_chat(user, SPAN_NOTICE("The [W] is in the way.")) return //Checking contents of packet so lighters won't be cigarettes. for (var/i = contents.len; i > 0; i--) @@ -211,7 +212,7 @@ reagents.trans_to_obj(W, (reagents.total_volume/contents.len)) user.equip_to_slot_if_possible(W, slot_wear_mask) reagents.maximum_volume = 15 * contents.len - to_chat(user, "You take a cigarette out of the pack.") + user.visible_message("[user] casually pulls out a [icon_type] from \the [src] with their mouth.", range = 3) update_icon() else ..() @@ -220,120 +221,52 @@ /obj/item/storage/fancy/cigarettes/acmeco name = "\improper AcmeCo cigarette packet" - desc = "A packet of six AcmeCo cigarettes. For those who somehow want to obtain the record for the most amount of cancerous tumors." + desc = "For those who somehow want to obtain the record for the most amount of cancerous tumors." icon_state = "Apacket" item_state = "Apacket" cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/acmeco /obj/item/storage/fancy/cigarettes/blank name = "\improper blank cigarette packet" - desc = "A packet of six blank cigarettes. The healthiest cigarettes on the market!" + desc = "The healthiest cigarettes on the market! Wait, isn't this just a roll of paper?" icon_state = "Bpacket" item_state = "Bpacket" cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/blank +/obj/item/storage/fancy/cigarettes/cigar + name = "cigar case" + desc = "A luxurious tote for your fat tokes." + icon_state = "cigarcase" + item_state = "cigarcase" + icon_type = "cigar" + drop_sound = 'sound/items/drop/weldingtool.ogg' + pickup_sound = 'sound/items/pickup/weldingtool.ogg' + use_sound = 'sound/items/storage/briefcase.ogg' + storage_slots = 8 + can_hold = list(/obj/item/clothing/mask/smokable/cigarette/cigar) + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/cigar + /obj/item/storage/fancy/cigarettes/dromedaryco name = "\improper DromedaryCo cigarette packet" - desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\"" + desc = "A label on the packaging reads, \"Wouldn't a slow death make a change?\"" icon_state = "Dpacket" item_state = "Dpacket" cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/dromedaryco -/obj/item/storage/fancy/cigar - name = "cigar case" - desc = "A case for holding your cigars when you are not smoking them." - icon_state = "cigarcase" - item_state = "cigarcase" - icon = 'icons/obj/cigs_lighters.dmi' - drop_sound = 'sound/items/drop/shovel.ogg' - pickup_sound = 'sound/items/pickup/shovel.ogg' - use_sound = 'sound/items/storage/briefcase.ogg' - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi', - ) - w_class = 1 - throwforce = 2 - slot_flags = SLOT_BELT - storage_slots = 8 - can_hold = list(/obj/item/clothing/mask/smokable/cigarette/cigar) - icon_type = "cigar" - -/obj/item/storage/fancy/cigar/Initialize() - . = ..() - flags |= NOREACT - create_reagents(15 * storage_slots) - -/obj/item/storage/fancy/cigar/fill() - ..() - for(var/i = 1 to storage_slots) - new /obj/item/clothing/mask/smokable/cigarette/cigar(src) - -/obj/item/storage/fancy/cigar/update_icon() - icon_state = "[initial(icon_state)][contents.len]" - return - -/obj/item/storage/fancy/cigar/remove_from_storage(obj/item/W as obj, atom/new_location) - var/obj/item/clothing/mask/smokable/cigarette/cigar/C = W - if(!istype(C)) return - reagents.trans_to_obj(C, (reagents.total_volume/contents.len)) - ..() - -/obj/item/storage/fancy/cigar/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob, var/target_zone) - if(!istype(M, /mob)) - return - - if(M == user && target_zone == BP_MOUTH && contents.len > 0 && !user.wear_mask) - var/obj/item/clothing/mask/smokable/cigarette/cigar/W = new /obj/item/clothing/mask/smokable/cigarette/cigar(user) - reagents.trans_to_obj(W, (reagents.total_volume/contents.len)) - user.equip_to_slot_if_possible(W, slot_wear_mask) - reagents.maximum_volume = 15 * contents.len - contents.len-- - to_chat(user, "You take a cigar out of the case.") - update_icon() - else - ..() - /obj/item/storage/fancy/cigarettes/nicotine name = "\improper Nico-Tine cigarette packet" - desc = "A packet of six Nico-Tine cigarettes. Allegedly advertised as the most enviromentally friendly cigarettes in the market. It doesn't specify how, but it definitely isn't your body." + desc = "An Eridani marketing triumph - the jingle still torments people to this day." icon_state = "Epacket" item_state = "Epacket" cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/nicotine /obj/item/storage/fancy/cigarettes/rugged - name = "\improper Lucky Strike cigarette packet" - desc = "A packet of six Lucky Strike cigarettes. Rumored to be part of an Idris money laundering scheme, its original purpose long forgotten." + name = "\improper Laissez-Faires cigarette packet" + desc = "Rumored to have outlived its original purpose as part of an Idris money laundering scheme." icon_state = "Fpacket" item_state = "Fpacket" cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/rugged -/obj/item/storage/fancy/cigarettes/pra - name = "\improper Working Tajara cigarette packet" - desc = "A packet of six adhomian \"Working Tajara\" cigarettes, imported straight from the People's Republic of Adhomai." - icon_state = "prapacket" - item_state = "prapacket" - cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai - can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/trash/cigbutt, /obj/item/tajcard) - -/obj/item/storage/fancy/cigarettes/pra/fill() - ..() - new /obj/item/tajcard(src) - -/obj/item/storage/fancy/cigarettes/dpra - name = "\improper Shastar Leaves cigarette packet" - desc = "A packet of six adhomian \"Shastar Leaves\" cigarettes, imported straight from the Democratic People's Republic of Adhomai." - icon_state = "dprapacket" - item_state = "dprapacket" - cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai - -/obj/item/storage/fancy/cigarettes/nka - name = "\improper Royal Choice cigarette packet" - desc = "A packet of six adhomian \"Royal Choice\" cigarettes, imported straight from the New Kingdom of Adhomai." - icon_state = "nkapacket" - item_state = "nkapacket" - cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai - /* * Vial Box */ @@ -359,7 +292,7 @@ use_sound = 'sound/items/drop/glass.ogg' drop_sound = 'sound/items/drop/toolbox.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' - max_w_class = 2 + max_w_class = ITEMSIZE_SMALL can_hold = list(/obj/item/reagent_containers/glass/beaker/vial) max_storage_space = 12 //The sum of the w_classes of all the items in this storage item. storage_slots = 6 diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 0329b44529d..3a8d649b35a 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -164,22 +164,22 @@ /obj/item/storage/pill_bottle/attack_self(mob/living/user) if(user.get_inactive_hand()) - to_chat(user, span("notice","You need an empty hand to take something out.")) + to_chat(user, SPAN_NOTICE("You need an empty hand to take something out.")) return if(contents.len) var/obj/item/I = contents[1] if(!remove_from_storage(I,user)) return if(user.put_in_inactive_hand(I)) - to_chat(user, span("notice","You take \the [I] out of \the [src].")) + to_chat(user, SPAN_NOTICE("You take \the [I] out of \the [src].")) if(iscarbon(user)) var/mob/living/carbon/C = user C.swap_hand() else I.dropInto(loc) - to_chat(user, span("notice","You fumble around with \the [src] and drop \the [I] on the floor.")) + to_chat(user, SPAN_NOTICE("You fumble around with \the [src] and drop \the [I] on the floor.")) else - to_chat(user, span("warning","\The [src] is empty.")) + to_chat(user, SPAN_WARNING("\The [src] is empty.")) /obj/item/storage/pill_bottle/antitox diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index e1133044359..8990aa892f4 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -59,7 +59,7 @@ item_state = "cigpacket" drop_sound = 'sound/items/drop/wrapper.ogg' pickup_sound = 'sound/items/pickup/wrapper.ogg' - use_sound = 'sound/items/drop/paper.ogg' + use_sound = 'sound/items/drop/wrapper.ogg' item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi', slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi', @@ -93,7 +93,7 @@ make_exact_fit() drop_sound = 'sound/items/drop/gloves.ogg' pickup_sound = 'sound/items/pickup/gloves.ogg' - use_sound = 'sound/items/drop/paper.ogg' + use_sound = 'sound/items/drop/wrapper.ogg' /obj/item/storage/fancy/cigpaper/fine name = "\improper Trident cigarette paper" diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index ea4fde672d1..7180600b3a5 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -30,6 +30,7 @@ var/obj/screen/storage/stored_continue var/obj/screen/storage/stored_end var/obj/screen/close/closer + var/care_about_storage_depth = TRUE var/use_to_pickup //Set this to make it possible to use this item in an inverse way, so you can have the item in your hand and click items on the floor to pick them up. var/list/pickup_blacklist = list() // If you click a blacklisted item, it won't try to pick it up if use_to_pickup is true var/display_contents_with_number //Set this to make the storage item group contents of the same type and display them as a number. @@ -403,23 +404,24 @@ queue_icon_update() //Call this proc to handle the removal of an item from the storage item. The item will be moved to the atom sent as new_target -/obj/item/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location) - if(!istype(W)) return 0 +/obj/item/storage/proc/remove_from_storage(obj/item/W, atom/new_location) + if(!istype(W)) + return FALSE if(istype(src, /obj/item/storage/fancy)) var/obj/item/storage/fancy/F = src - F.update_icon(1) + F.update_icon(TRUE) - for(var/mob/M in range(1, src.loc)) - if (M.s_active == src) - if (M.client) + for(var/mob/M in range(1, get_turf(src))) + if(M.s_active == src) + if(M.client) M.client.screen -= W if(new_location) if(ismob(loc)) W.dropped(usr) if(ismob(new_location)) - W.layer = SCREEN_LAYER+0.01 + W.layer = SCREEN_LAYER + 0.01 else W.layer = initial(W.layer) W.forceMove(new_location) @@ -434,31 +436,30 @@ W.maptext = "" W.on_exit_storage(src) update_icon() - return 1 + return TRUE /obj/item/storage/proc/remove_from_storage_deferred(obj/item/W, atom/new_location, mob/user) - if (!istype(W)) + if(!istype(W)) return FALSE // fuck if I know. - for(var/mob/M in range(1, src.loc)) - if (M.s_active == src) - if (M.client) + for(var/mob/M in range(1, get_turf(src))) + if(M.s_active == src) + if(M.client) M.client.screen -= W - if (new_location) - if (ismob(loc)) + if(new_location) + if(ismob(loc)) W.dropped(user) - if (ismob(new_location)) - W.layer = SCREEN_LAYER+0.01 + if(ismob(new_location)) + W.layer = SCREEN_LAYER + 0.01 else W.layer = initial(W.layer) - W.forceMove(new_location) else W.forceMove(get_turf(src)) - if (W.maptext) + if(W.maptext) W.maptext = "" W.on_exit_storage(src) @@ -564,7 +565,7 @@ return if(empty_delay) - visible_message("\The [usr] starts to empty the contents of \the [src].") + usr.visible_message("\The [usr] starts to empty the contents of \the [src]...", SPAN_NOTICE("You start emptying the contents of \the [src]...")) if(!do_after(usr, contents.len * empty_delay, act_target=usr)) return @@ -577,9 +578,7 @@ CHECK_TICK post_remove_from_storage_deferred(loc, usr) - - if(empty_delay) - visible_message("\The [usr] empties the contents of \the [src].") + usr.visible_message("\The [usr] empties the contents of \the [src].", , SPAN_NOTICE("You empty the contents of \the [src].")) // Override this to fill the storage object with stuff. /obj/item/storage/proc/fill() @@ -657,6 +656,13 @@ src.quick_empty() return 1 +/obj/item/storage/CtrlClick(mob/user) + if(user.get_active_hand() == src) + if(src.verbs.Find(/obj/item/storage/verb/quick_empty)) + src.quick_empty() + return + ..() + /obj/item/storage/proc/make_exact_fit() storage_slots = contents.len @@ -684,6 +690,11 @@ var/depth = 0 var/atom/cur_atom = src + if(istype(cur_atom.loc, /obj/item/storage)) + var/obj/item/storage/S = cur_atom.loc + if(!S.care_about_storage_depth) + return 1 + while (cur_atom && !(cur_atom in container.contents)) if (isarea(cur_atom)) return -1 @@ -702,6 +713,11 @@ var/depth = 0 var/atom/cur_atom = src + if(istype(cur_atom.loc, /obj/item/storage)) + var/obj/item/storage/S = cur_atom.loc + if(!S.care_about_storage_depth) + return 1 + while (cur_atom && !isturf(cur_atom)) if (isarea(cur_atom)) return -1 diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 0f3969b916a..d6c95ff9cd2 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -143,7 +143,7 @@ spill(3, get_turf(M)) playsound(M, 'sound/items/trayhit2.ogg', 100, 1) //sound playin' again update_force() - user.visible_message(span("danger", "[user] smashes the [src] into [M], causing it to break open and strew its contents across the area")) + user.visible_message(SPAN_DANGER("[user] smashes the [src] into [M], causing it to break open and strew its contents across the area")) /obj/item/storage/toolbox/lunchbox diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index c6ecede7c8a..e1da38f277e 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -170,31 +170,31 @@ ..() var/obj/item/storage/fancy/cigarettes/pack pack = new /obj/item/storage/fancy/cigarettes(src) - fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5)) + fill_cigarre_package(pack, list(/datum/reagent/aluminum = 5, /datum/reagent/potassium = 5, /datum/reagent/sulfur = 5)) pack.desc += " 'F' has been scribbled on it." pack = new /obj/item/storage/fancy/cigarettes(src) - fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5)) + fill_cigarre_package(pack, list(/datum/reagent/aluminum = 5, /datum/reagent/potassium = 5, /datum/reagent/sulfur = 5)) pack.desc += " 'F' has been scribbled on it." pack = new /obj/item/storage/fancy/cigarettes(src) - fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5)) + fill_cigarre_package(pack, list(/datum/reagent/potassium = 5, /datum/reagent/sugar = 5, /datum/reagent/phosphorus = 5)) pack.desc += " 'S' has been scribbled on it." pack = new /obj/item/storage/fancy/cigarettes(src) - fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5)) + fill_cigarre_package(pack, list(/datum/reagent/potassium = 5, /datum/reagent/sugar = 5, /datum/reagent/phosphorus = 5)) pack.desc += " 'S' has been scribbled on it." pack = new /obj/item/storage/fancy/cigarettes(src) // Dylovene. Going with 1.5 rather than 1.6666666... - fill_cigarre_package(pack, list("potassium" = 1.5, "ammonia" = 1.5, "silicon" = 1.5)) + fill_cigarre_package(pack, list(/datum/reagent/potassium = 1.5, /datum/reagent/ammonia = 1.5, /datum/reagent/silicon = 1.5)) // Mindbreaker - fill_cigarre_package(pack, list("silicon" = 4.5, "hydrazine" = 4.5, "dylovene" = 4.5)) + fill_cigarre_package(pack, list(/datum/reagent/silicon = 4.5, /datum/reagent/hydrazine = 4.5, /datum/reagent/dylovene = 4.5)) pack.desc += " 'MB' has been scribbled on it." pack = new /obj/item/storage/fancy/cigarettes(src) - pack.reagents.add_reagent("tricordrazine", 15 * pack.storage_slots) + pack.reagents.add_reagent(/datum/reagent/tricordrazine, 15 * pack.storage_slots) pack.desc += " 'T' has been scribbled on it." new /obj/item/flame/lighter/zippo(src) diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 3ceafb23f0a..9d64b4bb351 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -283,7 +283,7 @@ if(..() && contents.len) spill(3, get_turf(M)) playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again - user.visible_message(span("danger", "[user] smashes \the [src] into [M], causing it to spill its contents across the area!")) + user.visible_message(SPAN_DANGER("[user] smashes \the [src] into [M], causing it to spill its contents across the area!")) /obj/item/storage/fancy/tray/throw_impact(atom/hit_atom) ..() diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 25785b0f749..aaf5ab0303b 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -82,3 +82,83 @@ src.icon_state = "c-4detonator_0" to_chat(user, "You close the lighter.") pr_open = 0 + +/obj/item/syndie/teleporter + name = "pen" + desc = "An instrument for writing or drawing with ink. This one is in black, in a classic, grey casing. Stylish, classic and professional." + desc_antag = "While this may look like a bog-standard pen, in reality, this is a handheld teleportation device. Simply click on any turf within view to attempt to teleport there! The teleporter will recharge after a minute." + icon = 'icons/obj/bureaucracy.dmi' + icon_state = "pen" + item_state = "pen" + slot_flags = SLOT_BELT | SLOT_EARS + throwforce = 0 + w_class = ITEMSIZE_TINY + throw_speed = 7 + throw_range = 15 + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' + maptext_x = 3 + maptext_y = 2 + var/ready_to_use = TRUE + var/recharge_time = 1 MINUTE + var/held_maptext = "Ready" + +/obj/item/syndie/teleporter/Initialize() + . = ..() + if(ismob(loc) || ismob(loc.loc)) + maptext = held_maptext + +/obj/item/syndie/teleporter/attack() + return + +/obj/item/syndie/teleporter/afterattack(atom/target, mob/user, proximity_flag, click_parameters) + if(!ready_to_use) + to_chat(user, SPAN_WARNING("\The [src] isn't ready to use yet!")) + return + var/turf/T = target + if(!istype(T)) + T = get_turf(target) + if(!T) + to_chat(user, SPAN_WARNING("Something has gone terribly wrong while choosing a target, please try again somewhere else!")) + return + if(T.density || T.contains_dense_objects()) + to_chat(user, SPAN_WARNING("You cannot teleport to a location with solid objects!")) + return + + user.visible_message("[user] blinks into nothingness!", SPAN_NOTICE("You jump into the nothing.")) + user.forceMove(T) + spark(user, 3, alldirs) + user.visible_message("[user] appears out of thin air!", SPAN_NOTICE("You successfully step into your destination.")) + use() + +/obj/item/syndie/teleporter/proc/check_maptext(var/new_maptext) + if(new_maptext) + held_maptext = new_maptext + if(ismob(loc) || ismob(loc.loc)) + maptext = held_maptext + else + maptext = "" + +/obj/item/syndie/teleporter/proc/use() + addtimer(CALLBACK(src, .proc/recharge), recharge_time) + ready_to_use = FALSE + check_maptext("Charge") + +/obj/item/syndie/teleporter/proc/recharge() + ready_to_use = TRUE + check_maptext("Ready") + +/obj/item/syndie/teleporter/throw_at() + ..() + check_maptext() + +/obj/item/syndie/teleporter/dropped() + ..() + check_maptext() + +/obj/item/syndie/teleporter/on_give() + check_maptext() + +/obj/item/syndie/teleporter/pickup() + ..() + addtimer(CALLBACK(src, .proc/check_maptext), 1) \ No newline at end of file diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 48eb3aab1f3..b7960126a6f 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -82,8 +82,8 @@ M.update_inv_back() M.update_action_buttons() - to_chat(usr, span("notice", "You toggle the thrusters [on? "on":"off"].")) - to_chat(usr, span("notice", "You toggle the stabilization [stabilization_on? "on":"off"].")) + to_chat(usr, SPAN_NOTICE("You toggle the thrusters [on? "on":"off"].")) + to_chat(usr, SPAN_NOTICE("You toggle the stabilization [stabilization_on? "on":"off"].")) /obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user as mob) if(!(src.on)) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 40a982c1ee4..2a136a1b6c5 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -130,7 +130,7 @@ /obj/item/watertank/janitor/Initialize() . = ..() - reagents.add_reagent("cleaner", 500) + reagents.add_reagent(/datum/reagent/spacecleaner, 500) /obj/item/reagent_containers/spray/chemsprayer/mister/janitor name = "janitor spray nozzle" diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index ec1352e220e..74101d16299 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -2,6 +2,7 @@ * Contains: * Locator * Hand-tele + * Closet Teleporter */ /* @@ -9,13 +10,13 @@ */ /obj/item/locator name = "locator" - desc = "Used to track those with locater implants." + desc = "A device that can be used to track those with locator implants." icon = 'icons/obj/device.dmi' icon_state = "locator" var/temp = null var/frequency = 1451 var/broadcasting = null - var/listening = 1.0 + var/listening = TRUE flags = CONDUCT w_class = 2.0 item_state = "electronic" @@ -190,3 +191,46 @@ Frequency: P.creator = src src.add_fingerprint(user) return + +/obj/item/closet_teleporter + name = "closet teleporter" + desc = "A device that allows a user to connect two closets into a bluespace network." + desc_antag = "Click a closet with this to install. Step into the closet and close the door to teleport to the linked closet. It has a one minute cooldown after a batch teleport." + icon = 'icons/obj/modular_components.dmi' + icon_state = "cpu_normal_photonic" + flags = CONDUCT + w_class = ITEMSIZE_SMALL + origin_tech = list(TECH_MAGNET = 2, TECH_BLUESPACE = 3) + matter = list(DEFAULT_WALL_MATERIAL = 400) + var/obj/structure/closet/attached_closet + var/obj/item/closet_teleporter/linked_teleporter + var/last_use = 0 + +/obj/item/closet_teleporter/proc/do_teleport(var/mob/user) + if(!attached_closet) + to_chat(user, SPAN_WARNING("\The [src] doesn't have an attached closet!")) + return + if(!linked_teleporter) + to_chat(user, SPAN_WARNING("\The [src] doesn't have a linked teleporter!")) + return + if(!linked_teleporter.attached_closet) + to_chat(user, SPAN_WARNING("The linked teleporter doesn't have an attached closet!")) + return + if(last_use + 600 > world.time) + return + var/obj/structure/closet/target_closet = linked_teleporter.attached_closet + user.forceMove(target_closet) + if(target_closet.opened) + user.visible_message(SPAN_NOTICE("\The [user] steps out of the back of \the [target_closet]."), SPAN_NOTICE("You teleport into the linked closet, stepping out of it.")) + else + target_closet.visible_message(SPAN_WARNING("\The [target_closet] rattles.")) + to_chat(user, SPAN_NOTICE("You teleport into the target closet, bumping into the closed door.")) + target_closet.animate_shake() + playsound(get_turf(src), 'sound/effects/grillehit.ogg', 100, TRUE) + +/obj/item/closet_teleporter/Destroy() + attached_closet = null + if(linked_teleporter?.linked_teleporter == src) + linked_teleporter.linked_teleporter = null + linked_teleporter = null + return ..() diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index b86bd6d112f..02f27696570 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -66,25 +66,14 @@ drop_sound = 'sound/items/drop/screwdriver.ogg' pickup_sound = 'sound/items/pickup/screwdriver.ogg' lock_picking_level = 5 - var/build_from_parts = TRUE //if the tool uses random coloring - var/tool_colors = list( //if you're wondering why "blue" = COLOR_BLUE, it's so that inhands work. - "blue" = COLOR_BLUE, - "red" = COLOR_RED, - "purple" = COLOR_PURPLE, - "brown" = COLOR_BROWN, - "green" = COLOR_GREEN, - "cyan" = COLOR_CYAN, - "yellow" = COLOR_YELLOW - ) + build_from_parts = TRUE + worn_overlay = "head" /obj/item/screwdriver/Initialize() . = ..() if(build_from_parts) //random colors! - var/our_color = pick(tool_colors) - var/color_hex = tool_colors[our_color] - color = color_hex - item_state = "[initial(icon_state)]-[our_color]" // hardcoded. sucks, but inhands are hard and I can't be bothered. - add_overlay(overlay_image(icon, "[initial(icon_state)]_head", flags=RESET_COLOR)) + color = pick(COLOR_BLUE, COLOR_RED, COLOR_PURPLE, COLOR_BROWN, COLOR_GREEN, COLOR_CYAN, COLOR_YELLOW) + add_overlay(overlay_image(icon, "[initial(icon_state)]_[worn_overlay]", flags=RESET_COLOR)) /obj/item/screwdriver/update_icon() var/matrix/tf = matrix() @@ -144,25 +133,14 @@ drop_sound = 'sound/items/drop/wirecutter.ogg' pickup_sound = 'sound/items/pickup/wirecutter.ogg' var/bomb_defusal_chance = 30 // 30% chance to safely defuse a bomb - var/build_from_parts = TRUE - var/tool_colors = list( - "blue" = COLOR_BLUE, - "red" = COLOR_RED, - "purple" = COLOR_PURPLE, - "brown" = COLOR_BROWN, - "green" = COLOR_GREEN, - "cyan" = COLOR_CYAN, - "yellow" = COLOR_YELLOW - ) + build_from_parts = TRUE + worn_overlay = "head" /obj/item/wirecutters/Initialize() . = ..() if(build_from_parts) - var/our_color = pick(tool_colors) - var/color_hex = tool_colors[our_color] - color = color_hex - item_state = "[initial(icon_state)]-[our_color]" // hardcoded. sucks, but inhands are hard and I can't be bothered. - add_overlay(overlay_image(icon, "[initial(icon_state)]_head", flags=RESET_COLOR)) + color = pick(COLOR_BLUE, COLOR_RED, COLOR_PURPLE, COLOR_BROWN, COLOR_GREEN, COLOR_CYAN, COLOR_YELLOW) + add_overlay(overlay_image(icon, "[initial(icon_state)]_[worn_overlay]", flags=RESET_COLOR)) /obj/item/wirecutters/update_icon() var/matrix/tf = matrix() @@ -287,7 +265,7 @@ var/datum/reagents/R = new/datum/reagents(max_fuel) reagents = R R.my_atom = src - R.add_reagent("fuel", max_fuel) + R.add_reagent(/datum/reagent/fuel, max_fuel) update_icon() /obj/item/weldingtool/update_icon() @@ -317,16 +295,16 @@ /obj/item/weldingtool/attackby(obj/item/W, mob/user) if(W.isscrewdriver()) if(isrobot(loc)) - to_chat(user, span("alert", "You cannot modify your own welder!")) + to_chat(user, SPAN_ALERT("You cannot modify your own welder!")) return if(welding) - to_chat(user, span("danger", "Stop welding first!")) + to_chat(user, SPAN_DANGER("Stop welding first!")) return status = !status if(status) - to_chat(user, span("notice", "You secure the welder.")) + to_chat(user, SPAN_NOTICE("You secure the welder.")) else - to_chat(user, span("notice", "The welder can now be attached and modified.")) + to_chat(user, SPAN_NOTICE("The welder can now be attached and modified.")) add_fingerprint(user) return @@ -374,28 +352,28 @@ return ..() if(H.isSynthetic() && H == user && !(H.get_species() == "Military Frame")) - to_chat(user, span("warning", "You can't repair damage to your own body - it's against OH&S.")) + to_chat(user, SPAN_WARNING("You can't repair damage to your own body - it's against OH&S.")) return if (!welding) - to_chat(user, span("warning", "You need to light the welding tool first!")) + to_chat(user, SPAN_WARNING("You need to light the welding tool first!")) return if(S.brute_dam) if(S.brute_dam > ROBOLIMB_SELF_REPAIR_CAP) - to_chat(user, span("warning", "The damage is far too severe to patch over externally!")) + to_chat(user, SPAN_WARNING("The damage is far too severe to patch over externally!")) return else repair_organ(user, H, S) else if(S.open != 2) - to_chat(user, span("notice", "You can't see any external damage to repair.")) + to_chat(user, SPAN_NOTICE("You can't see any external damage to repair.")) else return ..() /obj/item/weldingtool/proc/repair_organ(var/mob/living/user, var/mob/living/carbon/human/target, var/obj/item/organ/external/affecting) if(!affecting.brute_dam) - user.visible_message(span("notice", "\The [user] finishes repairing the physical damage on \the [target]'s [affecting.name].")) + user.visible_message(SPAN_NOTICE("\The [user] finishes repairing the physical damage on \the [target]'s [affecting.name].")) return if(do_mob(user, target, 30)) @@ -406,7 +384,7 @@ "repairs some joints" ) affecting.heal_damage(brute = 15, robo_repair = TRUE) - user.visible_message(span("warning", "\The [user] [pick(repair_messages)] on [target]'s [affecting.name] with \the [src].")) + user.visible_message(SPAN_WARNING("\The [user] [pick(repair_messages)] on [target]'s [affecting.name] with \the [src].")) playsound(target, 'sound/items/Welder2.ogg', 15) repair_organ(user, target, affecting) @@ -427,7 +405,7 @@ switch(alert("Are you sure you want to do this? It is quite dangerous and could get you in trouble.", "Heat up fuel tank", "No", "Yes")) if("Yes") log_and_message_admins("is attempting to welderbomb", user) - to_chat(user, span("alert", "You start heating the fueltank...")) + to_chat(user, SPAN_ALERT("You start heating the fueltank...")) tank.armed = 1 if(do_after(user, 100)) if(tank.defuse) @@ -436,7 +414,7 @@ tank.armed = 0 return log_and_message_admins("triggered a fuel tank explosion", user) - to_chat(user, span("alert", "That was stupid of you.")) + to_chat(user, SPAN_ALERT("That was stupid of you.")) tank.ex_act(3.0) return else @@ -463,7 +441,7 @@ //Returns the amount of fuel in the welder /obj/item/weldingtool/proc/get_fuel() - return reagents.get_reagent_amount("fuel") + return reagents.get_reagent_amount(/datum/reagent/fuel) //Removes fuel from the welding tool. If a mob is passed, it will perform an eyecheck on the mob. This should probably be renamed to use() /obj/item/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/M = null, var/colourChange = TRUE) @@ -473,19 +451,22 @@ set_light(0.7, 2, l_color = LIGHT_COLOR_CYAN) addtimer(CALLBACK(src, /atom/proc/update_icon), 5) if(get_fuel() >= amount) - reagents.remove_reagent("fuel", amount) + reagents.remove_reagent(/datum/reagent/fuel, amount) if(M) eyecheck(M) return 1 else if(M) - to_chat(M, span("notice", "You need more welding fuel to complete this task.")) + to_chat(M, SPAN_NOTICE("You need more welding fuel to complete this task.")) return 0 //Returns whether or not the welding tool is currently on. /obj/item/weldingtool/proc/isOn() return src.welding +/obj/item/weldingtool/isFlameSource() + return isOn() + //Sets the welding state of the welding tool. If you see W.welding = 1 anywhere, please change it to W.setWelding(1) //so that the welding tool updates accordingly /obj/item/weldingtool/proc/setWelding(var/set_welding, var/mob/M) @@ -591,7 +572,7 @@ var/gen_amount = ((world.time-last_gen) / fuelgen_delay) var/remainder = max_fuel - get_fuel() gen_amount = min(gen_amount, remainder) - reagents.add_reagent("fuel", gen_amount) + reagents.add_reagent(/datum/reagent/fuel, gen_amount) if(get_fuel() >= max_fuel) set_processing(0) else @@ -734,7 +715,6 @@ w_class = ITEMSIZE_SMALL toolspeed = 3 usesound = 'sound/items/drill_use.ogg' - var/drillcolor = null var/current_tool = 1 var/list/tools = list( "screwdriverbit", @@ -744,16 +724,7 @@ /obj/item/powerdrill/Initialize() . = ..() - - switch(pick("red", "blue", "yellow", "green")) - if ("red") - drillcolor = "red" - if ("blue") - drillcolor = "blue" - if ("green") - drillcolor = "green" - if ("yellow") - drillcolor = "yellow" + var/drillcolor = pick("red", "blue", "yellow", "green") icon_state = "powerdrill[drillcolor]" item_state = "powerdrill[drillcolor]" diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 0f45b76b3e9..e8a74efb223 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -1,5 +1,6 @@ /obj/item/trap name = "mechanical trap" + desc = "A mechanically activated leg trap. Low-tech, but reliable. Looks like it could really hurt if you set it off." throw_speed = 2 throw_range = 1 gender = PLURAL @@ -8,13 +9,13 @@ icon_state = "beartrap0" randpixel = 0 center_of_mass = null - desc = "A mechanically activated leg trap. Low-tech, but reliable. Looks like it could really hurt if you set it off." throwforce = 0 - w_class = 3 + w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_ENGINEERING = 2) matter = list(DEFAULT_WALL_MATERIAL = 18750) var/deployed = FALSE var/time_to_escape = 60 + var/ignore_armor = FALSE /obj/item/trap/proc/can_use(mob/user) return (user.IsAdvancedToolUser() && !issilicon(user) && !user.stat && !user.restrained()) @@ -28,16 +29,16 @@ /obj/item/trap/proc/deploy(mob/user) user.visible_message( - "[user] starts to deploy \the [src].", - "You begin deploying \the [src]!", - "You hear the slow creaking of a spring." + SPAN_WARNING("\The [user] starts to deploy \the [src]."), + SPAN_WARNING("You begin deploying \the [src]!"), + SPAN_WARNING("You hear the slow creaking of a spring.") ) - if (do_after(user, 5 SECONDS)) + if(do_after(user, 5 SECONDS)) user.visible_message( - "[user] deploys \the [src].", - "You deploy \the [src]!", - "You hear a latch click loudly." + SPAN_WARNING("\The [user] deploys \the [src]."), + SPAN_WARNING("You deploy \the [src]!"), + SPAN_WARNING("You hear a latch click loudly.") ) deployed = TRUE @@ -48,35 +49,41 @@ /obj/item/trap/user_unbuckle_mob(mob/user) if(buckled_mob && can_use(user)) user.visible_message( - "\The [user] begins freeing \the [buckled_mob] from \the [src].", - "You carefully begin to free \the [buckled_mob] from \the [src].", - "You hear metal creaking." + SPAN_NOTICE("\The [user] begins freeing \the [buckled_mob] from \the [src]..."), + SPAN_NOTICE("You carefully begin to free \the [buckled_mob] from \the [src]..."), + SPAN_NOTICE("You hear metal creaking.") ) if(do_after(user, time_to_escape)) - user.visible_message("\The [buckled_mob] is freed from \the [src] by \the [user].") + user.visible_message( + SPAN_NOTICE("\The [user] frees \the [buckled_mob] from \the [src]."), + SPAN_NOTICE("You free \the [buckled_mob] from \the [src].") + ) unbuckle_mob() anchored = FALSE /obj/item/trap/attack_hand(mob/user) if(buckled_mob && can_use(user)) user.visible_message( - "[user] begins freeing [buckled_mob] from \the [src].", - "You carefully begin to free [buckled_mob] from \the [src]." + SPAN_NOTICE("\The [user] begins freeing \the [buckled_mob] from \the [src]..."), + SPAN_NOTICE("You carefully begin to free \the [buckled_mob] from \the [src]...") ) if(do_after(user, time_to_escape)) - user.visible_message("[buckled_mob] is freed from \the [src] by [user].") + user.visible_message( + SPAN_NOTICE("\The user frees \the [buckled_mob] from \the [src]."), + SPAN_NOTICE("You free \the [buckled_mob] from \the [src].") + ) unbuckle_mob() anchored = FALSE else if(deployed && can_use(user)) user.visible_message( - "[user] starts to disarm \the [src].", - "You begin disarming \the [src]!", - "You hear a latch click followed by the slow creaking of a spring." + SPAN_NOTICE("\The [user] starts to disarm \the [src]..."), + SPAN_NOTICE("You begin disarming \the [src]..."), + SPAN_WARNING("You hear a latch click followed by the slow creaking of a spring.") ) if(do_after(user, 6 SECONDS)) user.visible_message( - "[user] disarms \the [src].", - "You disarm \the [src]!" + SPAN_NOTICE("\The [user] disarms \the [src]!"), + SPAN_NOTICE("You disarm \the [src]!") ) deployed = FALSE anchored = FALSE @@ -85,30 +92,41 @@ ..() /obj/item/trap/proc/attack_mob(mob/living/L) - var/target_zone if(L.lying) target_zone = ran_zone() else target_zone = pick(BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG) - //armour - var/blocked = L.run_armor_check(target_zone, "melee") - if(blocked >= 100) - return + if(!ignore_armor) + //armour + var/blocked = L.run_armor_check(target_zone, "melee") + if(blocked >= 100) + return + var/success = L.apply_damage(30, BRUTE, target_zone, blocked, src) + if(!success) + return FALSE + else + var/success = L.apply_damage(30, BRUTE, target_zone, 0, src) + if(!success) + return FALSE - var/success = L.apply_damage(30, BRUTE, target_zone, blocked, src) - if(!success) - return 0 + var/did_trap = TRUE + if(ishuman(L)) + var/mob/living/carbon/human/H = L + var/obj/item/organ/external/limb = H.get_organ(check_zone(target_zone)) + if(!limb || limb.is_stump()) // oops, we took the limb clean off + did_trap = FALSE + + if(did_trap) + //trap the victim in place + can_buckle = TRUE + buckle_mob(L) + can_buckle = initial(can_buckle) - //trap the victim in place - set_dir(L.dir) - can_buckle = TRUE - buckle_mob(L) - to_chat(L, "The steel jaws of \the [src] bite into you, trapping you in place!") deployed = FALSE - can_buckle = initial(can_buckle) - playsound(src, 'sound/weapons/beartrap_shut.ogg', 100, 1)//Really loud snapping sound + to_chat(L, FONT_LARGE(SPAN_DANGER("The steel jaws of \the [src] bite into you, [did_trap ? "trapping you in place" : "cleaving your limb clean off"]!"))) + playsound(src, 'sound/weapons/beartrap_shut.ogg', 100, TRUE) //Really loud snapping sound if (istype(L, /mob/living/simple_animal/hostile/bear)) var/mob/living/simple_animal/hostile/bear/bear = L @@ -119,21 +137,27 @@ if(deployed && isliving(AM)) var/mob/living/L = AM L.visible_message( - "[L] steps on \the [src].", - "You step on \the [src]!", - "You hear a loud metallic snap!" + SPAN_DANGER("\The [L] steps on \the [src]!"), + FONT_LARGE(SPAN_DANGER("You step on \the [src]!")), + SPAN_WARNING("You hear a loud metallic snap!") ) attack_mob(L) if(!buckled_mob) anchored = FALSE deployed = FALSE update_icon() + animate_shake() ..() /obj/item/trap/update_icon() icon_state = "[icon_base][deployed]" +/obj/item/trap/sharpened + name = "sharpened mechanical trap" + desc_antag = "This device has an even higher chance of penetrating armor and locking foes in place." + ignore_armor = TRUE + /obj/item/trap/animal name = "small trap" throw_speed = 2 @@ -166,7 +190,7 @@ if(!captured) if(!is_type_in_list(M, allowed_mobs)) - to_chat(user, span("warning", "[M] won't fit in there!")) + to_chat(user, SPAN_WARNING("[M] won't fit in there!")) else if(do_after(user, 5 SECONDS)) capture(M) else @@ -184,7 +208,7 @@ to_chat(user, "[L] is trapped inside!") return else if(deployed) - to_chat(user, span("warning", "It's set up and ready to capture something.")) + to_chat(user, SPAN_WARNING("It's set up and ready to capture something.")) else to_chat(user, "\The [src] is empty and un-deployed.") @@ -358,13 +382,13 @@ var/mob/living/M = G.affecting if (G.state == GRAB_PASSIVE || G.state == GRAB_UPGRADING) - to_chat(user, span("notice", "You need a better grip on \the [M]!")) + to_chat(user, SPAN_NOTICE("You need a better grip on \the [M]!")) return user.visible_message("[user] starts putting [M] into \the [src].", "You start putting [M] into \the [src].") if (!is_type_in_list(M, allowed_mobs)) - to_chat(user, span("warning", "[M] won't fit in there!")) + to_chat(user, SPAN_WARNING("[M] won't fit in there!")) return if (do_mob(user, M, 3 SECONDS, needhand = 0)) @@ -375,7 +399,7 @@ else if(W.iswelder()) var/obj/item/weldingtool/WT = W if(!WT.welding) - to_chat(user, span("warning", "Your \the [W] is off!")) + to_chat(user, SPAN_WARNING("Your \the [W] is off!")) return user.visible_message("[user] is trying to slice \the [src] open!", "You are trying to slice \the [src] open!") @@ -426,7 +450,7 @@ return if(anchored && deployed) - to_chat(user, span("notice", "\The [src] is already anchored and set!")) + to_chat(user, SPAN_NOTICE("\The [src] is already anchored and set!")) else if(anchored) deploy(user) else @@ -549,9 +573,9 @@ if(user == buckled_mob) return else if(!anchored) - to_chat(user, span("warning", "You need to anchor \the [src] first!")) + to_chat(user, SPAN_WARNING("You need to anchor \the [src] first!")) else if(captured) - to_chat(user, span("warning", "You can't deploy \the [src] with something caught!")) + to_chat(user, SPAN_WARNING("You can't deploy \the [src] with something caught!")) else ..() @@ -563,7 +587,7 @@ return if(anchored && deployed) - to_chat(user, span("warning", "You can't do that while \the [src] is deployed! Undeploy it first.")) + to_chat(user, SPAN_WARNING("You can't do that while \the [src] is deployed! Undeploy it first.")) return user.visible_message("[user] begins [anchored ? "un" : "" ]securing \the [src]!", @@ -583,7 +607,7 @@ /obj/item/trap/animal/large/MouseDrop(over_object, src_location, over_location) if(captured) - to_chat(usr, span("warning", "The trap door's down, you can't get through there!")) + to_chat(usr, SPAN_WARNING("The trap door's down, you can't get through there!")) return if(!src.Adjacent(usr)) diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index 3fba8aad168..b8628408310 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -13,7 +13,7 @@ var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills reagents = R R.my_atom = src - R.add_reagent("fuel", max_fuel) + R.add_reagent(/datum/reagent/fuel, max_fuel) /obj/item/weldpack/attackby(obj/item/W as obj, mob/user as mob) if(W.iswelder()) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 3608020bbd8..f7dbb110fbf 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -172,7 +172,7 @@ /obj/proc/tesla_act(var/power, var/melt = FALSE) if(melt) - visible_message(span("danger", "\The [src] melts down until ashes are left!")) + visible_message(SPAN_DANGER("\The [src] melts down until ashes are left!")) new /obj/effect/decal/cleanable/ash(loc) qdel(src) return @@ -249,3 +249,7 @@ . = ..() if((obj_flags & OBJ_FLAG_ROTATABLE) || (obj_flags & OBJ_FLAG_ROTATABLE_ANCHORED)) to_chat(user, SPAN_SUBTLE("Can be rotated with alt-click.")) + +// whether mobs can unequip and drop items into us or not +/obj/proc/can_hold_dropped_items() + return TRUE \ No newline at end of file diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 56c2034f831..b4678cb106f 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -97,11 +97,12 @@ desc = "This is a random bomb supply." icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "signaller" - spawnlist = list( - /obj/item/device/assembly/igniter, - /obj/item/device/assembly/prox_sensor, - /obj/item/device/assembly/signaler, - /obj/item/device/multitool + problist = list( + /obj/item/device/assembly/igniter = 2, + /obj/item/device/assembly/prox_sensor = 2, + /obj/item/device/assembly/signaler = 2, + /obj/item/device/multitool = 1, + /obj/item/device/transfer_valve = 0.5 ) /obj/random/toolbox @@ -205,6 +206,24 @@ /obj/item/reagent_containers/inhaler/space_drugs = 2 ) +/obj/random/smokable + name = "random smokable" + desc = "This is a random smoking item." + icon = 'icons/obj/cigs_lighters.dmi' + icon_state = "cigpacket" + problist = list( + /obj/item/storage/fancy/cigarettes = 30, + /obj/item/storage/fancy/cigarettes/blank = 5, + /obj/item/storage/fancy/cigarettes/acmeco = 2, + /obj/item/storage/fancy/cigarettes/dromedaryco = 10, + /obj/item/storage/fancy/cigarettes/cigar = 9, + /obj/item/storage/fancy/cigarettes/nicotine = 10, + /obj/item/storage/fancy/cigarettes/rugged = 10, + /obj/item/storage/fancy/cigarettes/pra = 5, + /obj/item/storage/fancy/cigarettes/dpra = 2, + /obj/item/storage/fancy/cigarettes/nka = 2 + ) + /obj/random/energy name = "Random Energy Weapon" desc = "This is a random security weapon." @@ -570,7 +589,7 @@ /obj/item/reagent_containers/food/drinks/bottle/gin, /obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/item/reagent_containers/food/drinks/bottle/vodka, - /obj/item/reagent_containers/food/drinks/bottle/tequilla, + /obj/item/reagent_containers/food/drinks/bottle/tequila, /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, /obj/item/reagent_containers/food/drinks/bottle/rum, /obj/item/reagent_containers/food/drinks/bottle/champagne, diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 40448842192..12be63a90bf 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -25,6 +25,7 @@ var/store_mobs = 1 var/const/default_mob_size = 15 + var/obj/item/closet_teleporter/linked_teleporter /obj/structure/closet/LateInitialize() if (opened) // if closed, any item at the crate's loc is put in the contents @@ -70,6 +71,8 @@ if(!I.anchored) content_size += Ceiling(I.w_class/2) content_info(user, content_size) + if(linked_teleporter && Adjacent(user) && opened) + to_chat(user, FONT_SMALL(SPAN_NOTICE("There appears to be a device attached to the interior backplate of \the [src]..."))) /obj/structure/closet/proc/stored_weight() var/content_size = 0 @@ -99,6 +102,8 @@ AD.forceMove(loc) for(var/obj/I in src) + if(linked_teleporter && I == linked_teleporter) + continue I.forceMove(loc) for(var/mob/M in src) @@ -139,10 +144,16 @@ icon_state = icon_closed opened = 0 + if(linked_teleporter) + if(linked_teleporter.last_use + 600 > world.time) + return + for(var/mob/M in contents) + linked_teleporter.do_teleport(M) + linked_teleporter.last_use = world.time - playsound(loc, close_sound, 25, 0, -3) - density = 1 - return 1 + playsound(get_turf(src), close_sound, 25, 0, -3) + density = TRUE + return TRUE //Cham Projector Exception /obj/structure/closet/proc/store_misc(var/stored_units) @@ -222,7 +233,30 @@ ..() damage(proj_damage) -/obj/structure/closet/attackby(obj/item/W as obj, mob/user as mob) +/obj/structure/closet/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/closet_teleporter)) + if(linked_teleporter) + to_chat(user, SPAN_WARNING("\The [src] already has a linked teleporter!")) + return + var/obj/item/closet_teleporter/CT = W + user.visible_message(SPAN_NOTICE("\The [user] starts attaching \the [CT] to \the [src]..."), SPAN_NOTICE("You begin attaching \the [CT] to \the [src]..."), range = 3) + if(do_after(user, 30, TRUE, src)) + user.visible_message(SPAN_NOTICE("\The [user] attaches \the [CT] to \the [src]."), SPAN_NOTICE("You attach \the [CT] to \the [src]."), range = 3) + linked_teleporter = CT + CT.attached_closet = src + user.drop_from_inventory(CT, src) + return + if(W.isscrewdriver()) + if(!linked_teleporter) + to_chat(user, SPAN_WARNING("There is nothing to remove with a screwdriver here.")) + return + user.visible_message(SPAN_NOTICE("\The [user] starts detaching \the [linked_teleporter] from \the [src]..."), SPAN_NOTICE("You begin detaching \the [linked_teleporter] from \the [src]..."), range = 3) + if(do_after(user, 30, TRUE, src)) + user.visible_message(SPAN_NOTICE("\The [user] detaches \the [linked_teleporter] from \the [src]."), SPAN_NOTICE("You detach \the [linked_teleporter] from \the [src]."), range = 3) + linked_teleporter.attached_closet = null + user.put_in_hands(linked_teleporter) + linked_teleporter = null + return if(opened) if(istype(W, /obj/item/grab)) var/obj/item/grab/G = W @@ -248,6 +282,9 @@ "[src] has been cut apart by [user] with [WT].", "You cut apart [src] with [WT]." ) + if(linked_teleporter) + linked_teleporter.forceMove(get_turf(src)) + linked_teleporter = null qdel(src) return if(istype(W, /obj/item/storage/laundry_basket) && W.contents.len) @@ -462,6 +499,14 @@ M.gib() else if(A.simulated) A.ex_act(1) + if(linked_teleporter) + linked_teleporter.forceMove(get_turf(src)) + linked_teleporter = null dump_contents() new /obj/item/stack/material/steel(get_turf(src)) qdel(src) + +/obj/structure/closet/Destroy() + if(linked_teleporter) + QDEL_NULL(linked_teleporter) + return ..() \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 3c26237eb53..85963f56d80 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -20,7 +20,7 @@ for(var/i = 0, i < 2, i++) new /obj/item/reagent_containers/food/condiment/flour(src) new /obj/item/reagent_containers/food/condiment/sugar(src) - new /obj/item/reagent_containers/food/condiment/spacespice(src) + new /obj/item/reagent_containers/food/condiment/shaker/spacespice(src) /obj/structure/closet/secure_closet/freezer/kitchen/mining req_access = list() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index be69cb04266..e295e7c98d9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -32,6 +32,8 @@ new /obj/item/gun/energy/pistol(src) new /obj/item/device/flash(src) new /obj/item/melee/telebaton(src) + // acting captain briefcase + new /obj/item/storage/briefcase/nt/acap(src) /obj/structure/closet/secure_closet/captains2 name = "captain's attire" diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index fc832864b1e..16ea7003635 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -51,9 +51,9 @@ for (var/mob/M in src) M.forceMove(get_turf(src)) if (M.stat == CONSCIOUS) - M.visible_message(span("danger","\The [M.name] bursts out of the [src]!"), span("danger","You burst out of the [src]!")) + M.visible_message(SPAN_DANGER("\The [M.name] bursts out of the [src]!"), SPAN_DANGER("You burst out of the [src]!")) else - M.visible_message(span("danger","\The [M.name] tumbles out of the [src]!")) + M.visible_message(SPAN_DANGER("\The [M.name] tumbles out of the [src]!")) icon_state = icon_opened opened = 1 @@ -172,7 +172,7 @@ /obj/structure/closet/crate/toggle(var/mob/user) if (!opened && tablestatus == -1) - to_chat(user, span("warning", "You can't open that while it's under the table")) + to_chat(user, SPAN_WARNING("You can't open that while it's under the table")) return 0 else return ..() @@ -210,18 +210,18 @@ //User must be in reach of the crate if (!user.Adjacent(src)) - to_chat(user, span("warning", "You need to be closer to the crate!")) + to_chat(user, SPAN_WARNING("You need to be closer to the crate!")) return //One of us has to be near the table if (!user.Adjacent(table) && !Adjacent(table)) - to_chat(user, span("warning", "Take the crate closer to the table!")) + to_chat(user, SPAN_WARNING("Take the crate closer to the table!")) return for (var/obj/structure/closet/crate/C in get_turf(table)) if (C.tablestatus != -1) - to_chat(user, span("warning", "There's already a crate on this table!")) + to_chat(user, SPAN_WARNING("There's already a crate on this table!")) return //Crates are heavy, hauling them onto tables is hard. diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index f53d0e7bfe5..b53e0a56136 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -37,14 +37,14 @@ if(W.iswirecutter() || W.sharp && !W.noslice) if(manipulating) return manipulating = TRUE - visible_message(span("notice", "[user] begins cutting down \the [src]."), - span("notice", "You begin cutting down \the [src].")) + visible_message(SPAN_NOTICE("[user] begins cutting down \the [src]."), + SPAN_NOTICE("You begin cutting down \the [src].")) if(!do_after(user, 30/W.toolspeed)) manipulating = FALSE return playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - visible_message(span("notice", "[user] cuts down \the [src]."), - span("notice", "You cut down \the [src].")) + visible_message(SPAN_NOTICE("[user] cuts down \the [src]."), + SPAN_NOTICE("You cut down \the [src].")) if(istype(src, /obj/structure/curtain/open/medical)) new /obj/item/stack/material/plastic(src.loc) else @@ -59,7 +59,7 @@ to_chat(user, "There is already a curtain secured here!") return playsound(src.loc, W.usesound, 50, 1) - visible_message(span("notice", "\The [src] has been [anchored ? "secured in place" : "unsecured"] by \the [user].")) + visible_message(SPAN_NOTICE("\The [src] has been [anchored ? "secured in place" : "unsecured"] by \the [user].")) /obj/structure/curtain/proc/toggle() src.set_opacity(!src.opacity) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index a0bdd575af8..534851d386a 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -181,20 +181,18 @@ var/damage_to_deal = W.force var/weaken = 0 if(reinf_material) - weaken += reinf_material.integrity * 2.5 //Since girders don't have a secondary material, buff 'em up a bit. + weaken += reinf_material.integrity * 3 //Since girders don't have a secondary material, buff 'em up a bit. weaken /= 100 - visible_message("[user] retracts their [W] and starts winding up a strike...") - var/hit_delay = W.w_class * 10 //Heavier weapons take longer to swing, yeah? - if(do_after(user, hit_delay)) - do_attack_animation(src) - playsound(src, 'sound/weapons/smash.ogg', 50) - if(damage_to_deal > weaken && (damage_to_deal > MIN_DAMAGE_TO_HIT)) - damage_to_deal -= weaken - visible_message("[user] strikes \the [src] with \the [W], [is_sharp(W) ? "slicing" : "denting"] a support rod!") - take_damage(damage_to_deal) - else - visible_message("[user] strikes \the [src] with \the [W], but it bounces off!") - return + do_attack_animation(src) + playsound(src, 'sound/weapons/smash.ogg', 50) + if(damage_to_deal > weaken && (damage_to_deal > MIN_DAMAGE_TO_HIT)) + damage_to_deal -= weaken + visible_message("[user] strikes \the [src] with \the [W], [is_sharp(W) ? "slicing" : "denting"] a support rod!") + take_damage(damage_to_deal) + else + visible_message("[user] strikes \the [src] with \the [W], but it bounces off!") + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) + return return ..() diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index a9938791135..211081f669a 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -144,7 +144,7 @@ if(C.iswelder() && damaged) var/obj/item/weldingtool/WT = C if(do_after(user, 5/C.toolspeed, act_target = src) && WT.remove_fuel(1, user)) - to_chat(user, span("notice","You slice apart the [src] leaving nothing useful behind.")) + to_chat(user, SPAN_NOTICE("You slice apart the [src] leaving nothing useful behind.")) playsound(src, 'sound/items/Welder.ogg', 50, 1) qdel(src) else diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index ca56a38ef0c..9fe2883f460 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -2,8 +2,8 @@ * Contains: * Morgue * Morgue trays - * Creamatorium - * Creamatorium trays + * Crematorium + * Crematorium trays */ /* @@ -12,82 +12,86 @@ /obj/structure/morgue name = "morgue" - desc = "Used to keep bodies in untill someone fetches them." + desc = "Used to keep bodies in until someone fetches them." icon = 'icons/obj/stationobjs.dmi' icon_state = "morgue1" dir = EAST - density = 1 + density = TRUE + anchored = TRUE var/obj/structure/m_tray/connected = null - anchored = 1.0 /obj/structure/morgue/Destroy() if(connected) - qdel(connected) - connected = null + QDEL_NULL(connected) return ..() -/obj/structure/morgue/proc/update() - if (src.connected) - src.icon_state = "morgue0" +/obj/structure/morgue/update_icon() + if(connected) + icon_state = "morgue0" else - if (src.contents.len) - src.icon_state = "morgue2" + if(contents.len) + icon_state = "morgue2" else - src.icon_state = "morgue1" + icon_state = "morgue1" return /obj/structure/morgue/ex_act(severity) switch(severity) if(1.0) - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(src.loc) ex_act(severity) qdel(src) return if(2.0) - if (prob(50)) - for(var/atom/movable/A as mob|obj in src) + if(prob(50)) + for(var/atom/movable/A in src) A.forceMove(src.loc) ex_act(severity) qdel(src) return if(3.0) - if (prob(5)) - for(var/atom/movable/A as mob|obj in src) + if(prob(5)) + for(var/atom/movable/A in src) A.forceMove(src.loc) ex_act(severity) qdel(src) return return -/obj/structure/morgue/attack_hand(mob/user as mob) - if (src.connected) - for(var/atom/movable/A as mob|obj in src.connected.loc) - if (!( A.anchored )) +/obj/structure/morgue/attack_hand(mob/user) + if(connected) + for(var/atom/movable/A in connected.loc) + if(!A.anchored) A.forceMove(src) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) playsound(src, 'sound/effects/roll.ogg', 5, 1) - qdel(src.connected) - src.connected = null + QDEL_NULL(connected) else + var/turf/S = get_step(src, src.dir) + if(!S) + return + else + if(S.contains_dense_objects()) + to_chat(user, SPAN_WARNING("There's something in the way of \the [src]!")) + return playsound(src, 'sound/effects/roll.ogg', 5, 1) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - src.connected = new /obj/structure/m_tray( src.loc ) + connected = new /obj/structure/m_tray(src.loc) step(src.connected, src.dir) - src.connected.layer = OBJ_LAYER + connected.layer = OBJ_LAYER - 0.1 var/turf/T = get_step(src, src.dir) - if (T.contents.Find(src.connected)) - src.connected.connected = src - src.icon_state = "morgue0" - for(var/atom/movable/A as mob|obj in src) - A.forceMove(src.connected.loc) - src.connected.icon_state = "morguet" - src.connected.set_dir(src.dir) + if(T.contents.Find(connected)) + connected.connected = src + icon_state = "morgue0" + for(var/atom/movable/A in src) + A.forceMove(connected.loc) + connected.icon_state = "morguet" + connected.set_dir(src.dir) else - qdel(src.connected) - src.connected = null - src.add_fingerprint(user) - update() + QDEL_NULL(connected) + add_fingerprint(user) + update_icon() return /obj/structure/morgue/attack_robot(var/mob/user) @@ -95,37 +99,43 @@ return attack_hand(user) else return ..() -/obj/structure/morgue/attackby(obj/P, mob/user as mob) - if (P.ispen()) +/obj/structure/morgue/attackby(obj/P, mob/user) + if(P.ispen()) var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text - if (user.get_active_hand() != P) + if(user.get_active_hand() != P) return - if ((!in_range(src, usr) && src.loc != user)) + if((!in_range(src, usr) && src.loc != user)) return t = sanitizeSafe(t, MAX_NAME_LEN) - if (t) - src.name = text("Morgue- '[]'", t) + if(t) + name = "Morgue- '[t]'" else - src.name = "Morgue" - src.add_fingerprint(user) + name = "Morgue" + add_fingerprint(user) return -/obj/structure/morgue/relaymove(mob/user as mob) - if (user.stat) +/obj/structure/morgue/relaymove(mob/user) + if(user.stat) + return + var/turf/S = get_step(src, src.dir) + if(!S) return - src.connected = new /obj/structure/m_tray( src.loc ) - step(src.connected, EAST) - src.connected.layer = OBJ_LAYER - var/turf/T = get_step(src, EAST) - if (T.contents.Find(src.connected)) - src.connected.connected = src - src.icon_state = "morgue0" - for(var/atom/movable/A as mob|obj in src) - A.forceMove(src.connected.loc) - src.connected.icon_state = "morguet" else - qdel(src.connected) - src.connected = null + if(S.contains_dense_objects()) + to_chat(user, SPAN_WARNING("There's something in the way of \the [src]!")) + return + connected = new /obj/structure/m_tray(src.loc) + step(connected, EAST) + connected.layer = OBJ_LAYER - 0.1 + var/turf/T = get_step(src, EAST) + if(T.contents.Find(src.connected)) + connected.connected = src + icon_state = "morgue0" + for(var/atom/movable/A in src) + A.forceMove(connected.loc) + connected.icon_state = "morguet" + else + QDEL_NULL(connected) return @@ -137,46 +147,40 @@ desc = "Apply corpse before closing." icon = 'icons/obj/stationobjs.dmi' icon_state = "morguet" - density = 1 + density = TRUE layer = 2.0 var/obj/structure/morgue/connected = null - anchored = 1 - throwpass = 1 + anchored = TRUE + throwpass = TRUE /obj/structure/m_tray/Destroy() - if(connected && connected.connected == src) + if(connected?.connected == src) connected.connected = null connected = null return ..() -/obj/structure/m_tray/attack_hand(mob/user as mob) - if (src.connected) - for(var/atom/movable/A as mob|obj in src.loc) - if (!( A.anchored )) - A.forceMove(src.connected) - //Foreach goto(26) - src.connected.connected = null - src.connected.update() +/obj/structure/m_tray/attack_hand(mob/user) + if(connected) + for(var/atom/movable/A in src.loc) + if(!A.anchored) + A.forceMove(connected) + connected.connected = null + connected.update_icon() add_fingerprint(user) - //SN src = null qdel(src) return return -/obj/structure/m_tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) - if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O))) +/obj/structure/m_tray/MouseDrop_T(atom/movable/O, mob/user ) + if(!istype(O, /atom/movable) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)) return - if (!ismob(O) && !istype(O, /obj/structure/closet/body_bag)) + if(!ismob(O) && !istype(O, /obj/structure/closet/body_bag)) return - if (!ismob(user) || user.stat || user.lying || user.stunned) + if(!ismob(user) || user.stat || user.lying || user.stunned) return O.forceMove(src.loc) - if (user != O) - for(var/mob/B in viewers(user, 3)) - if ((B.client && !( B.blinded ))) - to_chat(B, "\The [user] stuffs [O] into [src]!") - return - + if(user != O) + user.visible_message("[user] stuffs \the [O] into \the [src]!", SPAN_NOTICE("You stuff \the [O] into \the [src]."), range = 3) /* * Crematorium @@ -187,12 +191,12 @@ desc = "A human incinerator. Works well on barbeque nights." icon = 'icons/obj/stationobjs.dmi' icon_state = "crema1" - density = 1 + density = TRUE + anchored = TRUE var/obj/structure/c_tray/connected = null - anchored = 1.0 - var/cremating = 0 + var/cremating = FALSE + var/locked = FALSE var/id = 1 - var/locked = 0 var/_wifi_id var/datum/wifi/receiver/button/crematorium/wifi_receiver @@ -203,41 +207,41 @@ /obj/structure/crematorium/Destroy() if(connected) - qdel(connected) - connected = null + QDEL_NULL(connected) if(wifi_receiver) - qdel(wifi_receiver) - wifi_receiver = null + QDEL_NULL(wifi_receiver) return ..() -/obj/structure/crematorium/proc/update() - if (src.connected) - src.icon_state = "crema0" +/obj/structure/crematorium/update_icon() + if(cremating) + icon_state = "crema_active" + return + if(connected) + icon_state = "crema0" else - if (src.contents.len) - src.icon_state = "crema2" + if(contents.len) + icon_state = "crema2" else - src.icon_state = "crema1" - return + icon_state = "crema1" /obj/structure/crematorium/ex_act(severity) switch(severity) if(1.0) - for(var/atom/movable/A as mob|obj in src) + for(var/atom/movable/A in src) A.forceMove(src.loc) ex_act(severity) qdel(src) return if(2.0) - if (prob(50)) - for(var/atom/movable/A as mob|obj in src) + if(prob(50)) + for(var/atom/movable/A in src) A.forceMove(src.loc) ex_act(severity) qdel(src) return if(3.0) - if (prob(5)) - for(var/atom/movable/A as mob|obj in src) + if(prob(5)) + for(var/atom/movable/A in src) A.forceMove(src.loc) ex_act(severity) qdel(src) @@ -245,109 +249,98 @@ return /obj/structure/crematorium/attack_hand(mob/user as mob) -// if (cremating) AWW MAN! THIS WOULD BE SO MUCH MORE FUN ... TO WATCH -// user.show_message("Uh-oh, that was a bad idea.", 1) -// //to_chat(usr, "Uh-oh, that was a bad idea.") -// src:loc:poison += 20000000 -// src:loc:firelevel = src:loc:poison -// return - if (cremating) - to_chat(usr, "It's locked.") + if(cremating) + to_chat(user, SPAN_WARNING("It's locked.")) return - if ((src.connected) && (src.locked == 0)) - for(var/atom/movable/A as mob|obj in src.connected.loc) - if (!( A.anchored )) + if(connected && !locked) + for(var/atom/movable/A in connected.loc) + if(!A.anchored ) A.forceMove(src) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - //src.connected = null - qdel(src.connected) - else if (src.locked == 0) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - src.connected = new /obj/structure/c_tray( src.loc ) - step(src.connected, SOUTH) - src.connected.layer = OBJ_LAYER - var/turf/T = get_step(src, SOUTH) - if (T.contents.Find(src.connected)) - src.connected.connected = src - src.icon_state = "crema0" - for(var/atom/movable/A as mob|obj in src) - A.forceMove(src.connected.loc) - src.connected.icon_state = "cremat" + qdel(connected) + else if(!locked) + var/turf/S = get_step(src, src.dir) + if(!S) + return + else + if(S.contains_dense_objects()) + to_chat(user, SPAN_WARNING("There's something in the way of \the [src]!")) + return + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + connected = new /obj/structure/c_tray(src.loc) + step(connected, src.dir) + connected.layer = OBJ_LAYER - 0.1 + var/turf/T = get_step(src, src.dir) + if(T.contents.Find(connected)) + connected.connected = src + src.icon_state = "crema0" + for(var/atom/movable/A in src) + A.forceMove(connected.loc) + connected.icon_state = "cremat" else - //src.connected = null qdel(src.connected) - src.add_fingerprint(user) - update() + add_fingerprint(user) + update_icon() /obj/structure/crematorium/attackby(obj/P, mob/user as mob) - if (P.ispen()) - var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text - if (user.get_active_hand() != P) + if(P.ispen()) + var/t = input(user, "What would you like the label to be?", "[src.name]") as text + if(user.get_active_hand() != P) return - if ((!in_range(src, usr) > 1 && src.loc != user)) + if((!in_range(src, usr) > 1 && src.loc != user)) return t = sanitizeSafe(t, MAX_NAME_LEN) - if (t) - src.name = text("Crematorium- '[]'", t) + if(t) + name = "Crematorium- '[t]'" else - src.name = "Crematorium" - src.add_fingerprint(user) + name = "Crematorium" + add_fingerprint(user) return -/obj/structure/crematorium/relaymove(mob/user as mob) - if (user.stat || locked) +/obj/structure/crematorium/relaymove(mob/user) + if(user.stat || locked) + return + var/turf/S = get_step(src, src.dir) + if(!S) return - src.connected = new /obj/structure/c_tray( src.loc ) - step(src.connected, SOUTH) - src.connected.layer = OBJ_LAYER - var/turf/T = get_step(src, SOUTH) - if (T.contents.Find(src.connected)) - src.connected.connected = src - src.icon_state = "crema0" - for(var/atom/movable/A as mob|obj in src) - A.forceMove(src.connected.loc) - src.connected.icon_state = "cremat" else - qdel(src.connected) - src.connected = null + if(S.contains_dense_objects()) + to_chat(user, SPAN_WARNING("There's something in the way of \the [src]!")) + return + connected = new /obj/structure/c_tray(src.loc) + step(connected, src.dir) + connected.layer = OBJ_LAYER - 0.1 + var/turf/T = get_step(src, src.dir) + if(T.contents.Find(src.connected)) + connected.connected = src + icon_state = "crema0" + for(var/atom/movable/A in src) + A.forceMove(connected.loc) + connected.icon_state = "cremat" + else + QDEL_NULL(connected) return -/obj/structure/crematorium/proc/cremate(atom/A, mob/user as mob) -// for(var/obj/machinery/crema_switch/O in src) //trying to figure a way to call the switch, too drunk to sort it out atm -// if(var/on == 1) -// return +/obj/structure/crematorium/proc/cremate(atom/A, mob/user) if(cremating) - return //don't let you cremate something twice or w/e + return if(contents.len <= 0) - for (var/mob/M in viewers(src)) - M.show_message("You hear a hollow crackle.", 1) - return - + visible_message(SPAN_WARNING("You hear a hollow crackle coming from \the [src]."), range = 3) else - if(!isemptylist(src.search_contents_for(/obj/item/disk/nuclear))) - to_chat(usr, "You get the feeling that you shouldn't cremate one of the items in the cremator.") - return - - for (var/mob/M in viewers(src)) - M.show_message("You hear a roar as the crematorium activates.", 1) - - cremating = 1 - locked = 1 + visible_message(SPAN_WARNING("You hear a roar as \the [src] activates.")) + cremating = TRUE + locked = TRUE + update_icon() for(var/mob/living/M in contents) - if (M.stat!=2) - if (!iscarbon(M)) + if(M.stat < UNCONSCIOUS) + if(!iscarbon(M)) M.emote("scream") else var/mob/living/carbon/C = M - if (C.can_feel_pain()) + if(C.can_feel_pain()) C.emote("scream") - - //Logging for this causes runtimes resulting in the cremator locking up. Commenting it out until that's figured out. - //M.attack_log += "\[[time_stamp()]\] Has been cremated by [user]/[user.ckey]" //No point in this when the mob's about to be deleted - //user.attack_log +="\[[time_stamp()]\] Cremated [M]/[M.ckey]" - //log_attack("\[[time_stamp()]\] [user]/[user.ckey] cremated [M]/[M.ckey]") M.death(1) M.ghostize() qdel(M) @@ -355,10 +348,12 @@ for(var/obj/O in contents) //obj instead of obj/item so that bodybags and ashes get destroyed. We dont want tons and tons of ash piling up qdel(O) - new /obj/effect/decal/cleanable/ash(src) + var/obj/effect/decal/cleanable/ash/F = new /obj/effect/decal/cleanable/ash(src) + F.layer = OBJ_LAYER sleep(30) - cremating = 0 - locked = 0 + cremating = FALSE + locked = FALSE + update_icon() playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) return @@ -371,45 +366,40 @@ desc = "Apply body before burning." icon = 'icons/obj/stationobjs.dmi' icon_state = "cremat" - density = 1 + density = TRUE + anchored = TRUE + throwpass = TRUE layer = 2.0 var/obj/structure/crematorium/connected = null - anchored = 1 - throwpass = 1 /obj/structure/c_tray/Destroy() - if(connected && connected.connected == src) + if(connected?.connected == src) connected.connected = null connected = null return ..() -/obj/structure/c_tray/attack_hand(mob/user as mob) - if (src.connected) - for(var/atom/movable/A as mob|obj in src.loc) - if (!( A.anchored )) +/obj/structure/c_tray/attack_hand(mob/user) + if(connected) + for(var/atom/movable/A in src.loc) + if(!A.anchored) A.forceMove(src.connected) - //Foreach goto(26) - src.connected.connected = null - src.connected.update() + connected.connected = null + connected.update_icon() add_fingerprint(user) - //SN src = null qdel(src) return return -/obj/structure/c_tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) - if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O))) +/obj/structure/c_tray/MouseDrop_T(atom/movable/O, mob/user) + if(!istype(O, /atom/movable) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)) return - if (!ismob(O) && !istype(O, /obj/structure/closet/body_bag)) + if(!ismob(O) && !istype(O, /obj/structure/closet/body_bag)) return - if (!ismob(user) || user.stat || user.lying || user.stunned) + if(!ismob(user) || user.stat || user.lying || user.stunned) return O.forceMove(src.loc) - if (user != O) - for(var/mob/B in viewers(user, 3)) - if ((B.client && !( B.blinded ))) - to_chat(B, text("[] stuffs [] into []!", user, O, src)) - //Foreach goto(99) + if(user != O) + user.visible_message("[user] stuffs \the [O] into \the [src]!", SPAN_NOTICE("You stuff \the [O] into \the [src]."), range = 3) return /obj/machinery/button/crematorium @@ -419,17 +409,29 @@ icon_state = "crema_switch" req_access = list(access_crematorium) id = 1 + var/cremate_dir // something for mappers, setting will make a crematorium in one step in this direction toggle /obj/machinery/button/crematorium/update_icon() return -/obj/machinery/button/crematorium/attack_hand(mob/user as mob) +/obj/machinery/button/crematorium/attack_hand(mob/user) + if(!allowed(user)) + to_chat(user, SPAN_WARNING("Access denied.")) + return if(..()) return - if(src.allowed(user)) - for (var/obj/structure/crematorium/C in world) - if (C.id == id) - if (!C.cremating) - C.cremate(user) + + var/list/obj/structure/crematorium/crematoriums = list() + if(!cremate_dir) + for(var/obj/structure/crematorium/C in range(3, src)) + if(C.id == id) + crematoriums += C else - to_chat(usr, "Access denied.") + var/turf/T = get_step(src, cremate_dir) + var/obj/structure/crematorium/C = locate() in T + if(C?.id == id) + crematoriums += C + for(var/thing in crematoriums) + var/obj/structure/crematorium/C = thing + if(!C.cremating) + C.cremate(user) \ No newline at end of file diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index dc346f664f2..95783bd5410 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -256,7 +256,7 @@ return if(broken) - to_chat(user,span("notice","\The [src] seems to be broken after so many years of misuse, perhaps due to reckless hooligans breaking into the display case and carelessly bashing keys.")) + to_chat(user, SPAN_NOTICE("\The [src] seems to be broken after so many years of misuse, perhaps due to reckless hooligans breaking into the display case and carelessly bashing keys.")) return usr.machine = src diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 3548ec2702e..c5c00e39a06 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -51,14 +51,14 @@ if(manipulating) return manipulating = TRUE if(W.iswirecutter() || W.sharp && !W.noslice) - visible_message(span("notice", "[user] begins cutting down \the [src]."), - span("notice", "You begin cutting down \the [src].")) + visible_message(SPAN_NOTICE("[user] begins cutting down \the [src]."), + SPAN_NOTICE("You begin cutting down \the [src].")) if(!do_after(user, 30/W.toolspeed)) manipulating = FALSE return playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - visible_message(span("notice", "[user] cuts down \the [src]."), - span("notice", "You cut down \the [src].")) + visible_message(SPAN_NOTICE("[user] cuts down \the [src]."), + SPAN_NOTICE("You cut down \the [src].")) qdel(src) /obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index ceda0be6efa..5010687089e 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -639,12 +639,12 @@ return if((!iswall(A) && !istype(A, /obj/structure/window)) || !isturf(user.loc)) - to_chat(user, span("warning","You can't place this here!")) + to_chat(user, SPAN_WARNING("You can't place this here!")) return var/placement_dir = get_dir(user, A) if (!(placement_dir in cardinal)) - to_chat(user, span("warning","You must stand directly in front of the location you wish to place that on.")) + to_chat(user, SPAN_WARNING("You must stand directly in front of the location you wish to place that on.")) return var/obj/structure/sign/flag/P = new(user.loc) @@ -694,7 +694,7 @@ if(!do_after(user, 2 SECONDS, act_target = src)) return 0 - visible_message(span("warning","\The [user] rips \the [src] in a single, decisive motion!" )) + visible_message(SPAN_WARNING("\The [user] rips \the [src] in a single, decisive motion!" )) playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1) icon_state = "poster_ripped" name = "ripped poster" @@ -706,11 +706,11 @@ if(istype(W, /obj/item/flame/lighter)) - visible_message(span("warning","\The [user] starts to burn \the [src] down!")) + visible_message(SPAN_WARNING("\The [user] starts to burn \the [src] down!")) if(!do_after(user, 2 SECONDS, act_target = src)) return 0 - visible_message(span("warning","\The [user] burns \the [src] down!")) + visible_message(SPAN_WARNING("\The [user] burns \the [src] down!")) playsound(src.loc, 'sound/items/cigs_lighters/zippo_on.ogg', 100, 1) new /obj/effect/decal/cleanable/ash(src.loc) diff --git a/code/game/objects/structures/therapy.dm b/code/game/objects/structures/therapy.dm index 18abe10253b..79e7188a8bf 100644 --- a/code/game/objects/structures/therapy.dm +++ b/code/game/objects/structures/therapy.dm @@ -116,9 +116,9 @@ set src in usr if(closed) - usr.visible_message (span("notice", "[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes, not noticing it's closed."), span("notice", "You point down at the [src], an arrogant look about your eyes.")) + usr.visible_message (SPAN_NOTICE("[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes, not noticing it's closed."), SPAN_NOTICE("You point down at the [src], an arrogant look about your eyes.")) else - usr.visible_message (span("notice", "[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes."), span("notice", "You point down at the [src], an arrogant look about your eyes.")) + usr.visible_message (SPAN_NOTICE("[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes."), SPAN_NOTICE("You point down at the [src], an arrogant look about your eyes.")) /obj/item/mesmetron name = "mesmetron pocketwatch" diff --git a/code/game/objects/structures/vr/_remote_chair.dm b/code/game/objects/structures/vr/_remote_chair.dm index 3ca6bcbc3f0..c18dc31650c 100644 --- a/code/game/objects/structures/vr/_remote_chair.dm +++ b/code/game/objects/structures/vr/_remote_chair.dm @@ -35,7 +35,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.old_mob) - to_chat(H, span("warning", "The chair rejects you! You cannot recursively control bodies.")) + to_chat(H, SPAN_WARNING("The chair rejects you! You cannot recursively control bodies.")) return add_overlay(image('icons/obj/furniture.dmi', src, "vr_helmet", MOB_LAYER + 1)) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 96cab0d4ff1..6899c3dd8a9 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -20,13 +20,13 @@ /obj/structure/toilet/attack_hand(mob/living/user as mob) if(swirlie) usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - usr.visible_message(span("danger", "[user] slams the toilet seat onto [swirlie.name]'s head!"), span("notice", "You slam the toilet seat onto [swirlie.name]'s head!"), "You hear reverberating porcelain.") + usr.visible_message(SPAN_DANGER("[user] slams the toilet seat onto [swirlie.name]'s head!"), SPAN_NOTICE("You slam the toilet seat onto [swirlie.name]'s head!"), "You hear reverberating porcelain.") swirlie.adjustBruteLoss(8) return if(cistern && !open) if(!contents.len) - to_chat(user, span("notice", "The cistern is empty.")) + to_chat(user, SPAN_NOTICE("The cistern is empty.")) return else var/obj/item/I = pick(contents) @@ -34,7 +34,7 @@ user.put_in_hands(I) else I.forceMove(get_turf(src)) - to_chat(user, span("notice", "You find \an [I] in the cistern.")) + to_chat(user, SPAN_NOTICE("You find \an [I] in the cistern.")) w_items -= I.w_class return @@ -46,10 +46,10 @@ /obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob) if(I.iscrowbar()) - to_chat(user, span("notice", "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"].")) + to_chat(user, SPAN_NOTICE("You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"].")) playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1) if(do_after(user, 30/I.toolspeed)) - user.visible_message(span("notice", "[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!"), span("notice", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!"), "You hear grinding porcelain.") + user.visible_message(SPAN_NOTICE("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!"), SPAN_NOTICE("You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!"), "You hear grinding porcelain.") cistern = !cistern update_icon() return @@ -63,29 +63,29 @@ if(G.state>1) if(!GM.loc == get_turf(src)) - to_chat(user, span("notice", "[GM.name] needs to be on the toilet.")) + to_chat(user, SPAN_NOTICE("[GM.name] needs to be on the toilet.")) return if(open && !swirlie) - user.visible_message(span("danger", "[user] starts to give [GM.name] a swirlie!"), span("notice", "You start to give [GM.name] a swirlie!")) + user.visible_message(SPAN_DANGER("[user] starts to give [GM.name] a swirlie!"), SPAN_NOTICE("You start to give [GM.name] a swirlie!")) swirlie = GM if(do_after(user, 30, 5, 0)) - user.visible_message(span("danger", "[user] gives [GM.name] a swirlie!"), span("notice", "You give [GM.name] a swirlie!"), "You hear a toilet flushing.") + user.visible_message(SPAN_DANGER("[user] gives [GM.name] a swirlie!"), SPAN_NOTICE("You give [GM.name] a swirlie!"), "You hear a toilet flushing.") if(!GM.internal) GM.adjustOxyLoss(5) SSfeedback.IncrementSimpleStat("swirlies") swirlie = null else - user.visible_message(span("danger", "[user] slams [GM.name] into the [src]!"), span("notice", "You slam [GM.name] into the [src]!")) + user.visible_message(SPAN_DANGER("[user] slams [GM.name] into the [src]!"), SPAN_NOTICE("You slam [GM.name] into the [src]!")) GM.adjustBruteLoss(8) else - to_chat(user, span("notice", "You need a tighter grip.")) + to_chat(user, SPAN_NOTICE("You need a tighter grip.")) if(cistern && !istype(user,/mob/living/silicon/robot)) //STOP PUTTING YOUR MODULES IN THE TOILET. if(I.w_class > 3) - to_chat(user, span("notice", "\The [I] does not fit.")) + to_chat(user, SPAN_NOTICE("\The [I] does not fit.")) return if(w_items + I.w_class > 5) - to_chat(user, span("notice", "The cistern is full.")) + to_chat(user, SPAN_NOTICE("The cistern is full.")) return user.drop_from_inventory(I,src) w_items += I.w_class @@ -116,12 +116,12 @@ var/mob/living/GM = G.affecting if(G.state>1) if(!GM.loc == get_turf(src)) - to_chat(user, span("notice", "[GM.name] needs to be on the urinal.")) + to_chat(user, SPAN_NOTICE("[GM.name] needs to be on the urinal.")) return - user.visible_message(span("danger", "[user] slams [GM.name] into the [src]!"), span("notice", "You slam [GM.name] into the [src]!")) + user.visible_message(SPAN_DANGER("[user] slams [GM.name] into the [src]!"), SPAN_NOTICE("You slam [GM.name] into the [src]!")) GM.adjustBruteLoss(8) else - to_chat(user, span("notice", "You need a tighter grip.")) + to_chat(user, SPAN_NOTICE("You need a tighter grip.")) @@ -174,14 +174,14 @@ /obj/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].")) + to_chat(user, SPAN_NOTICE("The water temperature seems to be [watertemp].")) if(I.iswrench()) var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings - to_chat(user, span("notice", "You begin to adjust the temperature valve with \the [I].")) + to_chat(user, SPAN_NOTICE("You begin to adjust the temperature valve with \the [I].")) playsound(src.loc, I.usesound, 50, 1) if(do_after(user, 50/I.toolspeed)) watertemp = newtemp - user.visible_message(span("notice", "[user] adjusts the shower with \the [I]."), span("notice", "You adjust the shower with \the [I].")) + 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/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up @@ -233,7 +233,7 @@ var/obj/effect/effect/water/W = new(O) W.create_reagents(spray_amount) - W.reagents.add_reagent("water", spray_amount) + W.reagents.add_reagent(/datum/reagent/water, spray_amount) W.set_up(O, spray_amount) if(iscarbon(O)) @@ -362,7 +362,7 @@ return is_washing = 1 var/turf/T = get_turf(src) - reagents.add_reagent("water", 2) + reagents.add_reagent(/datum/reagent/water, 2) T.clean(src) spawn(100) is_washing = 0 @@ -378,9 +378,9 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(temperature >= H.species.heat_level_1) - to_chat(H, span("danger", "The water is searing hot!")) + to_chat(H, SPAN_DANGER("The water is searing hot!")) else if(temperature <= H.species.cold_level_1) - to_chat(H, span("warning", "The water is freezing cold!")) + to_chat(H, SPAN_WARNING("The water is freezing cold!")) /obj/item/bikehorn/rubberducky name = "rubber ducky" @@ -414,7 +414,7 @@ if (user.hand) temp = H.organs_by_name[BP_L_HAND] if(temp && !temp.is_usable()) - to_chat(user, span("notice", "You try to move your [temp.name], but cannot!")) + to_chat(user, SPAN_NOTICE("You try to move your [temp.name], but cannot!")) return if(isrobot(user) || isAI(user)) @@ -424,10 +424,10 @@ return if(busy) - to_chat(user, span("warning", "Someone's already washing here.")) + to_chat(user, SPAN_WARNING("Someone's already washing here.")) return - to_chat(usr, span("notice", "You start washing your hands.")) + to_chat(usr, SPAN_NOTICE("You start washing your hands.")) playsound(loc, 'sound/effects/sink_long.ogg', 75, 1) busy = 1 @@ -441,12 +441,12 @@ user.clean_blood() user.visible_message( \ - span("notice", "[user] washes their hands using \the [src]."), \ - span("notice", "You wash your hands using \the [src].")) + SPAN_NOTICE("[user] washes their hands using \the [src]."), \ + SPAN_NOTICE("You wash your hands using \the [src].")) /obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob) if(busy) - to_chat(user, span("warning", "Someone's already washing here.")) + to_chat(user, SPAN_WARNING("Someone's already washing here.")) return // Filling/emptying open reagent containers @@ -457,22 +457,22 @@ if(!usr.Adjacent(src)) return if(RG.loc != usr && !isrobot(user)) return if(busy) - to_chat(usr, span("warning", "Someone's already using \the [src].")) + to_chat(usr, SPAN_WARNING("Someone's already using \the [src].")) return switch(atype) if ("Fill") if(RG.reagents.total_volume >= RG.volume) - to_chat(usr, span("warning", "\The [RG] is already full.")) + to_chat(usr, SPAN_WARNING("\The [RG] is already full.")) return - RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, amount_per_transfer_from_this)) + RG.reagents.add_reagent(/datum/reagent/water, min(RG.volume - RG.reagents.total_volume, amount_per_transfer_from_this)) user.visible_message("[user] fills \a [RG] using \the [src].", SPAN_NOTICE("You fill \a [RG] using \the [src].")) playsound(loc, 'sound/effects/sink.ogg', 75, 1) if ("Empty") if(!RG.reagents.total_volume) - to_chat(usr, span("warning", "\The [RG] is already empty.")) + to_chat(usr, SPAN_WARNING("\The [RG] is already empty.")) return var/empty_amount = RG.reagents.trans_to(src, RG.amount_per_transfer_from_this) @@ -487,22 +487,22 @@ switch(S.mode) if(0) // draw if(S.reagents.total_volume >= S.volume) - to_chat(usr, span("warning", "\The [S] is already full.")) + to_chat(usr, SPAN_WARNING("\The [S] is already full.")) return var/trans = min(S.volume - S.reagents.total_volume, S.amount_per_transfer_from_this) - S.reagents.add_reagent("water", trans) - user.visible_message(span("notice", "[usr] uses \the [S] to draw water from \the [src]."), - span("notice", "You draw [trans] units of water from \the [src]. \The [S] now contains [S.reagents.total_volume] units.")) + S.reagents.add_reagent(/datum/reagent/water, trans) + user.visible_message(SPAN_NOTICE("[usr] uses \the [S] to draw water from \the [src]."), + SPAN_NOTICE("You draw [trans] units of water from \the [src]. \The [S] now contains [S.reagents.total_volume] units.")) if(1) // inject if(!S.reagents.total_volume) - to_chat(usr, span("warning", "\The [S] is already empty.")) + to_chat(usr, SPAN_WARNING("\The [S] is already empty.")) return var/trans = min(S.amount_per_transfer_from_this, S.reagents.total_volume) S.reagents.remove_any(trans) - user.visible_message(span("notice", "[usr] empties \the [S] into \the [src]."), - span("notice", "You empty [trans] units of water into \the [src]. \The [S] now contains [S.reagents.total_volume] units.")) + user.visible_message(SPAN_NOTICE("[usr] empties \the [S] into \the [src]."), + SPAN_NOTICE("You empty [trans] units of water into \the [src]. \The [S] now contains [S.reagents.total_volume] units.")) return else if (istype(O, /obj/item/melee/baton)) @@ -518,14 +518,14 @@ R.cell.charge -= 20 else B.deductcharge(B.hitcost) - user.visible_message(span("danger", "[user] was stunned by \the [O]!")) + user.visible_message(SPAN_DANGER("[user] was stunned by \the [O]!")) return 1 // Short of a rewrite, this is necessary to stop monkeycubes being washed. else if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube)) return else if(istype(O, /obj/item/mop)) - O.reagents.add_reagent("water", 5) - to_chat(user, span("notice", "You wet \the [O] in \the [src].")) + O.reagents.add_reagent(/datum/reagent/water, 5) + to_chat(user, SPAN_NOTICE("You wet \the [O] in \the [src].")) playsound(loc, 'sound/effects/slosh.ogg', 25, 1) return @@ -535,7 +535,7 @@ var/obj/item/I = O if(!I || !istype(I,/obj/item)) return - to_chat(usr, span("notice", "You start washing \the [I].")) + to_chat(usr, SPAN_NOTICE("You start washing \the [I].")) playsound(loc, 'sound/effects/sink_long.ogg', 75, 1) busy = 1 @@ -550,8 +550,8 @@ O.clean_blood() user.visible_message( \ - span("notice", "[user] washes \a [I] using \the [src]."), \ - span("notice", "You wash \a [I] using \the [src].")) + 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" diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index ce337c46637..3900fb4ce60 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -26,24 +26,24 @@ . = ..(user) if(health == maxhealth) - to_chat(user, span("notice", "It looks fully intact.")) + to_chat(user, SPAN_NOTICE("It looks fully intact.")) else var/perc = health / maxhealth if(perc > 0.75) - to_chat(user, span("notice", "It has a few cracks.")) + to_chat(user, SPAN_NOTICE("It has a few cracks.")) else if(perc > 0.5) - to_chat(user, span("warning", "It looks slightly damaged.")) + to_chat(user, SPAN_WARNING("It looks slightly damaged.")) else if(perc > 0.25) - to_chat(user, span("warning", "It looks moderately damaged.")) + to_chat(user, SPAN_WARNING("It looks moderately damaged.")) else - to_chat(user, span("danger", "It looks heavily damaged.")) + to_chat(user, SPAN_DANGER("It looks heavily damaged.")) if(silicate) if (silicate < 30) - to_chat(user, span("notice", "It has a thin layer of silicate.")) + to_chat(user, SPAN_NOTICE("It has a thin layer of silicate.")) else if (silicate < 70) - to_chat(user, span("notice", "It is covered in silicate.")) + to_chat(user, SPAN_NOTICE("It is covered in silicate.")) else - to_chat(user, span("notice", "There is a thick layer of silicate covering it.")) + to_chat(user, SPAN_NOTICE("There is a thick layer of silicate covering it.")) /obj/structure/window/proc/take_damage(var/damage = 0, var/sound_effect = 1) var/initialhealth = health @@ -59,13 +59,13 @@ if(sound_effect) playsound(loc, 'sound/effects/glass_hit.ogg', 100, 1) if(health < maxhealth / 4 && initialhealth >= maxhealth / 4) - visible_message(span("danger", "[src] looks like it's about to shatter!")) + visible_message(SPAN_DANGER("[src] looks like it's about to shatter!")) playsound(loc, "glasscrack", 100, 1) else if(health < maxhealth / 2 && initialhealth >= maxhealth / 2) - visible_message(span("warning", "[src] looks seriously damaged!")) + visible_message(SPAN_WARNING("[src] looks seriously damaged!")) playsound(loc, "glasscrack", 100, 1) else if(health < maxhealth * 3/4 && initialhealth >= maxhealth * 3/4) - visible_message(span("warning", "Cracks begin to appear in [src]!")) + visible_message(SPAN_WARNING("Cracks begin to appear in [src]!")) playsound(loc, "glasscrack", 100, 1) return @@ -89,7 +89,7 @@ /obj/structure/window/proc/shatter(var/display_message = 1) playsound(src, "shatter", 70, 1) if(display_message) - visible_message(span("warning", "\The [src] shatters!")) + visible_message(SPAN_WARNING("\The [src] shatters!")) if(dir == SOUTHWEST) var/index = null index = 0 @@ -157,7 +157,7 @@ /obj/structure/window/hitby(AM as mob|obj) ..() - visible_message(span("danger", "[src] was hit by [AM].")) + visible_message(SPAN_DANGER("[src] was hit by [AM].")) var/tforce = 0 if(ismob(AM)) tforce = 40 @@ -175,7 +175,7 @@ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(HULK in user.mutations) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!")) - user.visible_message(span("danger", "[user] smashes through [src]!")) + user.visible_message(SPAN_DANGER("[user] smashes through [src]!")) user.do_attack_animation(src) shatter() @@ -188,8 +188,8 @@ playsound(src.loc, 'sound/effects/glass_knock.ogg', 90, 1) user.do_attack_animation(src) - user.visible_message(span("danger", "\The [user] bangs against \the [src]!"), - span("danger", "You bang against \the [src]!"), + user.visible_message(SPAN_DANGER("\The [user] bangs against \the [src]!"), + SPAN_DANGER("You bang against \the [src]!"), "You hear a banging sound.") else playsound(src.loc, 'sound/effects/glass_knock.ogg', 60, 1) @@ -201,16 +201,16 @@ /obj/structure/window/attack_generic(var/mob/user, var/damage) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(damage >= 10) - visible_message(span("danger", "[user] smashes into [src]!")) + visible_message(SPAN_DANGER("[user] smashes into [src]!")) take_damage(damage) else - visible_message(span("notice", "\The [user] bonks \the [src] harmlessly.")) + visible_message(SPAN_NOTICE("\The [user] bonks \the [src] harmlessly.")) playsound(src.loc, 'sound/effects/glass_hit.ogg', 10, 1, -2) user.do_attack_animation(src) return 1 /obj/structure/window/do_simple_ranged_interaction(var/mob/user) - visible_message(span("notice", "Something knocks on \the [src].")) + visible_message(SPAN_NOTICE("Something knocks on \the [src].")) playsound(loc, 'sound/effects/glass_hit.ogg', 50, 1) return TRUE @@ -230,26 +230,26 @@ state = 3 - state update_nearby_icons() playsound(loc, W.usesound, 75, 1) - to_chat(user, (state == 1 ? span("notice", "You have unfastened the window from the frame.") : span("notice", "You have fastened the window to the frame."))) + to_chat(user, (state == 1 ? SPAN_NOTICE("You have unfastened the window from the frame.") : SPAN_NOTICE("You have fastened the window to the frame."))) else if(reinf && state == 0) anchored = !anchored update_nearby_icons() playsound(loc, W.usesound, 75, 1) - to_chat(user, (anchored ? span("notice", "You have fastened the frame to the floor.") : span("notice", "You have unfastened the frame from the floor."))) + to_chat(user, (anchored ? SPAN_NOTICE("You have fastened the frame to the floor.") : SPAN_NOTICE("You have unfastened the frame from the floor."))) else if(!reinf) anchored = !anchored update_nearby_icons() playsound(loc, W.usesound, 75, 1) - to_chat(user, (anchored ? span("notice", "You have fastened the window to the floor.") : span("notice", "You have unfastened the window."))) + to_chat(user, (anchored ? SPAN_NOTICE("You have fastened the window to the floor.") : SPAN_NOTICE("You have unfastened the window."))) else if(W.iscrowbar() && reinf && state <= 1) state = 1 - state playsound(loc, W.usesound, 75, 1) - to_chat(user, (state ? span("notice", "You have pried the window into the frame.") : span("notice", "You have pried the window out of the frame."))) + to_chat(user, (state ? SPAN_NOTICE("You have pried the window into the frame.") : SPAN_NOTICE("You have pried the window out of the frame."))) else if(W.iswrench() && !anchored && (!state || !reinf)) if(!glasstype) - to_chat(user, span("notice", "You're not sure how to dismantle \the [src] properly.")) + to_chat(user, SPAN_NOTICE("You're not sure how to dismantle \the [src] properly.")) else - visible_message(span("notice", "[user] dismantles \the [src].")) + visible_message(SPAN_NOTICE("[user] dismantles \the [src].")) if(dir == SOUTHWEST) var/obj/item/stack/material/mats = new glasstype(loc) mats.amount = is_fulltile() ? 4 : 2 @@ -281,17 +281,17 @@ var/blocked = M.run_armor_check(def_zone, "melee") switch (state) if(1) - M.visible_message(span("warning", "[user] slams [M] against \the [src]!")) + M.visible_message(SPAN_WARNING("[user] slams [M] against \the [src]!")) M.apply_damage(7, damtype, def_zone, blocked, src) hit(10) if(2) - M.visible_message(span("danger", "[user] bashes [M] against \the [src]!")) + M.visible_message(SPAN_DANGER("[user] bashes [M] against \the [src]!")) if (prob(50)) M.Weaken(1) M.apply_damage(10, damtype, def_zone, blocked, src) hit(25) if(3) - M.visible_message(span("danger", "[user] crushes [M] against \the [src]!")) + M.visible_message(SPAN_DANGER("[user] crushes [M] against \the [src]!")) M.Weaken(5) M.apply_damage(20, damtype, def_zone, blocked, src) hit(50) diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index cbf369b5266..05f451d2ddb 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -327,4 +327,4 @@ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(ishuman(user)) ChangeTurf(/turf/space) - to_chat(user, span("notice","You clear away the metal foam.")) \ No newline at end of file + to_chat(user, SPAN_NOTICE("You clear away the metal foam.")) \ No newline at end of file diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index f57ae480695..c7830b6380e 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -39,21 +39,24 @@ return 1 /turf/simulated/wall/proc/try_touch(var/mob/user, var/rotting) - if(rotting) if(reinf_material) - to_chat(user, "\The [reinf_material.display_name] feels porous and crumbly.") + to_chat(user, SPAN_WARNING("\The [reinf_material.display_name] feels porous and crumbly.")) else - to_chat(user, "\The [material.display_name] crumbles under your touch!") + to_chat(user, SPAN_WARNING("\The [material.display_name] crumbles under your touch!")) dismantle_wall() - return 1 + return TRUE + + user.visible_message(SPAN_NOTICE("\The [user] starts feeling around and pushing on \the [src]..."), SPAN_NOTICE("You start feeling around and pushing on \the [src]...")) + if(!do_after(user, 30, TRUE, src)) + return if(!can_open) - to_chat(user, "You push the wall, but nothing happens.") - playsound(src, 'sound/weapons/Genhit.ogg', 25, 1) + to_chat(user, SPAN_NOTICE("You push the wall, but nothing happens.")) + playsound(src, 'sound/weapons/Genhit.ogg', 25, TRUE) else toggle_open(user) - return 0 + return FALSE /turf/simulated/wall/attack_hand(var/mob/user) @@ -373,21 +376,19 @@ var/weaken = 0 var/sound_to_play = 'sound/weapons/smash.ogg' if(material) - weaken += material.integrity * 2 + weaken += material.integrity * 2.5 sound_to_play = material.hitsound if(reinf_material) - weaken += reinf_material.integrity * 2 + weaken += reinf_material.integrity * 2.5 weaken /= 100 //For reference, plasteel's integrity is 600. - visible_message("[user] retracts their [W] and starts winding up a strike...") - var/hit_delay = W.w_class * 10 //Heavier weapons take longer to swing, yeah? - if(do_after(user, hit_delay)) - user.do_attack_animation(src) - playsound(src, sound_to_play, 50) - if(damage_to_deal > weaken && (damage_to_deal > MIN_DAMAGE_TO_HIT)) - //Plasteel walls take 24 & 15 minimum damage. - //Steel walls take 3 & 15 minimum damage. - damage_to_deal -= weaken - visible_message("[user] strikes \the [src] with \the [W], [is_sharp(W) ? "slicing some of the plating" : "putting a heavy dent on it"]!") - take_damage(damage_to_deal) - else - visible_message("[user] strikes \the [src] with \the [W], but it bounces off!") + user.do_attack_animation(src) + playsound(src, sound_to_play, 50) + if(damage_to_deal > weaken && (damage_to_deal > MIN_DAMAGE_TO_HIT)) + //Plasteel walls take 24 & 15 minimum damage. + //Steel walls take 3 & 15 minimum damage. + damage_to_deal -= weaken + visible_message("[user] strikes \the [src] with \the [W], [is_sharp(W) ? "slicing some of the plating" : "putting a heavy dent on it"]!") + take_damage(damage_to_deal) + else + visible_message("[user] strikes \the [src] with \the [W], but it bounces off!") + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index efb2b0dd3a3..9ef21d02ce8 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -86,7 +86,7 @@ gasid = H.species.exhale_type var/datum/gas_mixture/water_breath = new() var/datum/gas_mixture/above_air = return_air() - water_breath.adjust_gas(gasid, BREATH_MOLES) // They have no oxygen, but non-zero moles and temp + water_breath.adjust_gas(gasid, ONE_ATMOSPHERE) // this will cause them to suffocate, but not pop their lung water_breath.temperature = above_air.temperature return water_breath return return_air() // Otherwise their head is above the water, so get the air from the atmosphere instead. @@ -94,7 +94,7 @@ /turf/simulated/floor/beach/water/Entered(atom/movable/AM, atom/oldloc) if(!SSATOMS_IS_PROBABLY_DONE) return - reagents.add_reagent("water", 2) + reagents.add_reagent(/datum/reagent/water, 2) clean(src) START_PROCESSING(SSprocessing, src) if(istype(AM, /obj)) @@ -110,7 +110,7 @@ /turf/simulated/floor/beach/water/Exited(atom/movable/AM, atom/newloc) if(!SSATOMS_IS_PROBABLY_DONE) return - reagents.add_reagent("water", 2) + reagents.add_reagent(/datum/reagent/water, 2) clean(src) if(istype(AM, /obj) && numobjects) numobjects -= 1 @@ -123,7 +123,7 @@ ..() /turf/simulated/floor/beach/water/process() - reagents.add_reagent("water", 2) + reagents.add_reagent(/datum/reagent/water, 2) clean(src) for(var/mob/living/L in src) wash(L) @@ -143,7 +143,7 @@ var/obj/effect/effect/water/W = new(O) W.create_reagents(100) - W.reagents.add_reagent("water", 100) + W.reagents.add_reagent(/datum/reagent/water, 100) W.set_up(O, 100) if(iscarbon(O)) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index faae94076e3..7aff5b60336 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -383,7 +383,7 @@ var/const/enterloopsanity = 100 //expects an atom containing the reagents used to clean the turf /turf/proc/clean(atom/source, mob/user) - if(source.reagents.has_reagent("water", 1) || source.reagents.has_reagent("cleaner", 1)) + if(source.reagents.has_reagent(/datum/reagent/water, 1) || source.reagents.has_reagent(/datum/reagent/spacecleaner, 1)) clean_blood() if(istype(src, /turf/simulated)) var/turf/simulated/T = src @@ -396,10 +396,10 @@ var/const/enterloopsanity = 100 var/obj/effect/rune/R = O // Only show message for visible runes if(!R.invisibility) - to_chat(user, span("warning", "No matter how well you wash, the bloody symbols remain!")) + to_chat(user, SPAN_WARNING("No matter how well you wash, the bloody symbols remain!")) else if( !(last_clean && world.time < last_clean + 100) ) - to_chat(user, span("warning", "\The [source] is too dry to wash that.")) + to_chat(user, SPAN_WARNING("\The [source] is too dry to wash that.")) last_clean = world.time source.reagents.trans_to_turf(src, 1, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly. @@ -520,7 +520,7 @@ var/const/enterloopsanity = 100 tally += limbCheck(lfoot) if(tally >= 120) - to_chat(user, span("notice", "You're too injured to do this!")) + to_chat(user, SPAN_NOTICE("You're too injured to do this!")) return var/finaltime = 25 + (5 * (user.weakened * 1.5)) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 213bd8c8bc1..8d7c2a2ccbc 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1213,14 +1213,14 @@ var/list/admin_verbs_cciaa = list( if (isnull(P) || !ismob(P)) var/msg = "P_LIST DEBUG: Found null entry in player_list!" log_debug(msg) - message_admins(span("danger", msg)) + message_admins(SPAN_DANGER(msg)) player_list -= P else var/mob/M = P if (!M.client) var/msg = "P_LIST DEBUG: Found a mob without a client in player_list! [M.name]" log_debug(msg) - message_admins(span("danger", msg)) + message_admins(SPAN_DANGER(msg)) player_list -= M /client/proc/reset_openturf() diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 906373190cd..48bbf467728 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -576,7 +576,7 @@ else if(href_list["remove_psionics"]) var/datum/psi_complexus/psi = locate(href_list["remove_psionics"]) if(psi && psi.owner && !QDELETED(psi)) - to_chat(psi.owner, span("notice", "Your psionic powers vanish abruptly, leaving you cold and empty.")) + to_chat(psi.owner, SPAN_NOTICE("Your psionic powers vanish abruptly, leaving you cold and empty.")) log_and_message_admins("removed all psionics from [key_name(psi.owner)].") QDEL_NULL(psi) diff --git a/code/modules/admin/verbs/bluespacetech.dm b/code/modules/admin/verbs/bluespacetech.dm index b3e6f7053c8..c2a17fe4613 100644 --- a/code/modules/admin/verbs/bluespacetech.dm +++ b/code/modules/admin/verbs/bluespacetech.dm @@ -30,7 +30,7 @@ return //how did they get here? if(!ROUND_IS_STARTED) - to_chat(src, span("alert", "The game hasn't started yet!")) + to_chat(src, SPAN_ALERT("The game hasn't started yet!")) return bst_cooldown = TRUE @@ -135,7 +135,7 @@ var/fall_override = TRUE /mob/living/carbon/human/bst/can_inject(var/mob/user, var/error_msg, var/target_zone) - to_chat(user, span("alert", "The [src] disarms you before you can inject them.")) + to_chat(user, SPAN_ALERT("The [src] disarms you before you can inject them.")) user.drop_item() return 0 @@ -309,10 +309,10 @@ if(!src.incorporeal_move) src.incorporeal_move = 2 - to_chat(src, span("notice", "You will now phase through solid matter.")) + to_chat(src, SPAN_NOTICE("You will now phase through solid matter.")) else src.incorporeal_move = 0 - to_chat(src, span("notice", "You will no-longer phase through solid matter.")) + to_chat(src, SPAN_NOTICE("You will no-longer phase through solid matter.")) return /mob/living/carbon/human/bst/verb/bstrecover() @@ -352,7 +352,7 @@ set category = "BST" status_flags ^= GODMODE - to_chat(src, span("notice", "God mode is now [status_flags & GODMODE ? "enabled" : "disabled"]")) + to_chat(src, SPAN_NOTICE("God mode is now [status_flags & GODMODE ? "enabled" : "disabled"]")) //Equipment. All should have canremove set to 0 //All items with a /bst need the attack_hand() proc overrided to stop people getting overpowered items. @@ -367,7 +367,7 @@ if(!usr) return if(!istype(usr, /mob/living/carbon/human/bst)) - to_chat(usr, span("alert", "Your hand seems to go right through the [src]. It's like it doesn't exist.")) + to_chat(usr, SPAN_ALERT("Your hand seems to go right through the [src]. It's like it doesn't exist.")) return else ..() @@ -386,7 +386,7 @@ if(!usr) return if(!istype(usr, /mob/living/carbon/human/bst)) - to_chat(usr, span("alert", "Your hand seems to go right through the [src]. It's like it doesn't exist.")) + to_chat(usr, SPAN_ALERT("Your hand seems to go right through the [src]. It's like it doesn't exist.")) return else ..() @@ -413,7 +413,7 @@ if(!usr) return if(!istype(usr, /mob/living/carbon/human/bst)) - to_chat(usr, span("alert", "Your hand seems to go right through the [src]. It's like it doesn't exist.")) + to_chat(usr, SPAN_ALERT("Your hand seems to go right through the [src]. It's like it doesn't exist.")) return else ..() @@ -430,7 +430,7 @@ if(!usr) return if(!istype(usr, /mob/living/carbon/human/bst)) - to_chat(usr, span("alert", "Your hand seems to go right through the [src]. It's like it doesn't exist.")) + to_chat(usr, SPAN_ALERT("Your hand seems to go right through the [src]. It's like it doesn't exist.")) return else ..() @@ -474,7 +474,7 @@ if(!usr) return if(!istype(usr, /mob/living/carbon/human/bst)) - to_chat(usr, span("alert", "Your hand seems to go right through the [src]. It's like it doesn't exist.")) + to_chat(usr, SPAN_ALERT("Your hand seems to go right through the [src]. It's like it doesn't exist.")) return else ..() @@ -491,7 +491,7 @@ if(!usr) return if(!istype(usr, /mob/living/carbon/human/bst)) - to_chat(usr, span("alert", "Your hand seems to go right through the [src]. It's like it doesn't exist.")) + to_chat(usr, SPAN_ALERT("Your hand seems to go right through the [src]. It's like it doesn't exist.")) return else ..() @@ -510,7 +510,7 @@ if(!usr) return if(!istype(usr, /mob/living/carbon/human/bst)) - to_chat(usr, span("alert", "Your hand seems to go right through the [src]. It's like it doesn't exist.")) + to_chat(usr, SPAN_ALERT("Your hand seems to go right through the [src]. It's like it doesn't exist.")) return else ..() @@ -524,7 +524,7 @@ if(!usr) return if(!istype(usr, /mob/living/carbon/human/bst)) - to_chat(usr, span("alert", "Your hand seems to go right through the [src]. It's like it doesn't exist.")) + to_chat(usr, SPAN_ALERT("Your hand seems to go right through the [src]. It's like it doesn't exist.")) return else ..() diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index eddf1c47988..94521fa71e8 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -335,7 +335,7 @@ proc/get_ghosts(var/notify = 0,var/what = 2, var/client/C = null) R.uneq_all() R.mod_type = initial(R.mod_type) - R.hands.icon_state = initial(R.hands.icon_state) + R.hands.icon_state = "nomod" R.module.Reset(R) QDEL_NULL(R.module) diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index d95e00edf73..5c307f72822 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -24,7 +24,7 @@ if (issilicon(M) && alert(usr, "Synth detected. Would you like to run rename silicon verb automatically?",, "Yes", "No") == "Yes") var/mob/living/silicon/S = M S.SetName(new_name) - to_chat(usr, span("notice", "Silicon properly renamed.")) + to_chat(usr, SPAN_NOTICE("Silicon properly renamed.")) href_list["datumrefresh"] = href_list["rename"] @@ -466,7 +466,7 @@ to_chat(usr, "This can only be done on mobs with clients") return - to_chat(usr, span("alert", "This command is temporarily disabled.")) + to_chat(usr, SPAN_ALERT("This command is temporarily disabled.")) //SSnanoui.send_resources(H.client) //to_chat(usr, "Resource files sent") diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 7815d28075c..4a9ac779e6c 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -33,3 +33,6 @@ activate() add_fingerprint(user) return + +/obj/item/device/assembly/igniter/isFlameSource() + return TRUE \ No newline at end of file diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index b3c4f666598..7b1bf582c7c 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -6,7 +6,7 @@ pickup_sound = 'sound/items/pickup/component.ogg' origin_tech = list(TECH_MAGNET = 1) matter = list(DEFAULT_WALL_MATERIAL = 500, MATERIAL_GLASS = 50) - var/listening = 0 + var/listening = FALSE var/recorded //the activation message /obj/item/device/assembly/voice/New() @@ -20,7 +20,7 @@ /obj/item/device/assembly/voice/hear_talk(mob/living/M as mob, msg) if(listening) recorded = msg - listening = 0 + listening = FALSE var/turf/T = get_turf(src) //otherwise it won't work in hand T.visible_message("\icon[src] beeps, \"Activation message is '[recorded]'.\"") else @@ -43,4 +43,4 @@ /obj/item/device/assembly/voice/toggle_secure() . = ..() - listening = 0 + listening = FALSE diff --git a/code/modules/background/accent/accent.dm b/code/modules/background/accent/accent.dm new file mode 100644 index 00000000000..ae30f2b692c --- /dev/null +++ b/code/modules/background/accent/accent.dm @@ -0,0 +1,4 @@ +/datum/accent + var/name + var/description = "Unga Dunga." + var/tag_icon //those icons should go in accent_tags.dmi \ No newline at end of file diff --git a/code/modules/background/accent/diona.dm b/code/modules/background/accent/diona.dm new file mode 100644 index 00000000000..db8d09cea2b --- /dev/null +++ b/code/modules/background/accent/diona.dm @@ -0,0 +1,4 @@ +/datum/accent/diona + name = ACCENT_DIONA + description = "An innate accent to all Diona, and can be detected in Diona across the Orion Spur, no matter the distance. It can be profoundly noticed on the sh, sk and ch sounding syllables." + tag_icon = "dionae" \ No newline at end of file diff --git a/code/modules/background/accent/human.dm b/code/modules/background/accent/human.dm new file mode 100644 index 00000000000..3abe44b9e7d --- /dev/null +++ b/code/modules/background/accent/human.dm @@ -0,0 +1,126 @@ +/datum/accent/ceti + name = ACCENT_CETI + description = "Often described as the \"true\" way of speaking Tau Ceti Basic, the Biesellite accent is easy to reproduce due to the phonetics of TCB." + tag_icon = "biesel" + +/datum/accent/coc + name = ACCENT_COC + description = "The frontier is home to an unknowably vast amount of humans and settlements, covering everything from small outposts of only a few hundred to major planets such as \ + Xanu Prime. The Frontiersfolk are as diverse as their accents are, but the most common \"frontier accent\" is generally regarded as that of Xanu Prime - the arguable capital of \ + the massive Coalition of Colonies." + tag_icon = "coalition" + +/datum/accent/elyra + name = ACCENT_ELYRA + description = "The typical Elyran accent is an odd combination of Tau Ceti Basic and Sol Common due to the Republic's independence from the Sol Alliance. The standard language \ + of the Republic of Elyra is Elyran Common, a variation upon standard Sol Common that is closer to Tau Ceti Basic than other Sol Common dialects." + tag_icon = "elyra" + +/datum/accent/eridani + name = ACCENT_ERIDANI + description = "The accent of Eridanian \"suits\" is almost universally looked upon as the accent of corporate excellence throughout the Sol Alliance and Republic of Biesel. \ + Speaking with this accent is a surefire way to get one's foot into the door in the corporate world, and wealthier Suits often devote time and resources to refining their \ + accent to be more properly Eridanian." + tag_icon = "eridani" + +/datum/accent/eridani_dreg + name = ACCENT_ERIDANIDREG + description = "The Eridanian \"dreg\" accent is almost universally looked upon as the accent of petty criminals and ne'er-do-wells throughout the Orion Spur. \ + Speaking with this accent in the proximity of most humans is a surefire way to gain their suspicion, and those speaking with this accent often find themselves under \ + enhanced security surveillance in corporate facilities. Eagle Corp, one of the major employers of dregs in Eridani, devotes a significant amount of its training \ + to making its dreg recruits drop this distinctive accent." + tag_icon = "eridani_dreg" + +/datum/accent/sol + name = ACCENT_SOL + description = "The typical Solarian accent has a hundred tiny variants and can be found on a multitude of planets in countless systems, and is often simply regarded \ + as the \"accent of humanity\" due to its prevalence. It can be found on planets as prominent as Earth or as obscure as settlements of only a few million in the Sol Alliance's Outer Ring." + tag_icon = "sol" + +/datum/accent/scarab + name = ACCENT_SCARAB + description = "The common accent of the Scarab Fleet has dozens, perhaps hundreds, of small variations due to the Fleet itself being spread throughout a massive number of \ + individual ships, most of which have their own unique variations upon the standard Scarab accent." + tag_icon = "scarabs" + +/datum/accent/silversun + name = ACCENT_SILVERSUN + description = "The native accent of Silversun is a sing-songy take on standard Sol Common that has, since massive investment into the planet by Idris Incorporated, come to be \ + associated with the planet's renowned tourism industry. Many native residents of Silversun are bitter that their accent - and planet - are seen as nothing more than an enormous \ + vacation retreat by the greater Orion Spur." + tag_icon = "silversun" + +/datum/accent/phong + name = ACCENT_PHONG + description = "New Hai Phongese Common is, compared to the typical Sol Common accent, much more tonal. This has lent it a distinctive accent that is easy to tell apart from the \ + standard Sol Common accent associated with the Solarian core worlds. Due to the hazardous environmental conditions present on New Hai Phong, many residents of New Hai Phong \ + carry another distinctive auditory cue: coughing and wheezing due to asthma." + tag_icon = "new_hai_phong" + +/datum/accent/mars + name = ACCENT_MARTIAN + description = "Martian Common is a more guttural form of Sol Common that borrows some elements of Freespeak. The distinctive accent is, as a result, looked down upon as \ + a \"hick\" dialect on Luna and Venus and regarded as the dialect of quarrelsome and annoying Martians elsewhere. Some Martians go to great lengths to hide their accents due to \ + this reputation, which is still alive in the Republic of Biesel despite its separation from the greater Sol Alliance." + tag_icon = "mars" + +/datum/accent/luna + name = ACCENT_LUNA + description = "The Lunarian accent is regarded throughout the Sol Alliance, and beyond, as a distinctive mark of being Lunarian. The accent is extremely hard for immigrants to Luna \ + to pick up and replicate, and is carefully maintained by Lunarians abroad to keep their accent distinct. Many Idris Incorporated IPCs are programmed with Lunarian accents to make \ + them seem high-class in both appearance and in accent." + tag_icon = "luna" + +/datum/accent/gibson + name = ACCENT_GIBSON + description = "The New Gibsoner accent is very close to the accent of Tau Ceti proper, due to the nature of the planet’s colonization. However, New Gibsoners are known for talking \ + with a faster and more clipped accent than those from Biesel and, at times, sound as if they are tripping over their words due to the rapid pace at which they speak." + tag_icon = "gibson" + +/datum/accent/konyang + name = ACCENT_KONYAN + description = "The Konyanger Common accent is quite similar to standard Sol Common, but has drawn some influence from Freespeak due to Konyang's position near the border between \ + the Sol Alliance and the Coalition of Colonies. A significant amount of IPCs possess a Konyanger accent, due to the planet being the origin of IPCs and a major producer of them." + tag_icon = "konyang" + +/datum/accent/himeo + name = ACCENT_HIMEO + description = "Himean Common is more guttural and harsh-sounding than the typical Sol Common accent, due to Himeo's position in the Coalition of Colonies. The Himean accent and its \ + distinctive guttural method of speaking are easily distinguishable from other Sol Common speakers, even when speaking Tau Ceti Basic or Freespeak. Himean Common has the unusual \ + reputation of making its speaker always sound angry, no matter the speaker's mood, due to its more guttural nature." + tag_icon = "himeo" + +/datum/accent/vysoka + name = ACCENT_VYSOKA + description = "The typical Vyoskan accent is regarded as a throatier and harsher variation of Freespeak, with the planetary accent possessing many harsh tones. Some non-Vysokans have \ + noted that the accent sounds similar to Himean Common at times, due to both accents being more guttural than average. However, the Vysokan accent remains distinctive from Himean \ + Common due to its roots in Freespeak rather than Sol Common." + tag_icon = "vysoka" + +/datum/accent/venus + name = ACCENT_VENUS + description = "Venusian Common (referred time as Cytherean Common on Venus itself) is often regarded as the \"most common\" form of Sol Common due to the prevalence of its entertainment \ + industry. It sounds extremely similar to Earthbound Sol Common. Many high-end entertainment IPCs used throughout human space come pre-programmed with this accent, due to its \ + association with the Venusian entertainment industry." + tag_icon = "venus" + +/datum/accent/venusjin + name = ACCENT_VENUSJIN + description = "Jintarian Common is looked down upon on Venus itself for its association with Venusian surfacers, and is often used by the planet's entertainment industry to mark a \ + character as villainous or untrustworthy. As a result, it is often looked down upon throughout human space." + tag_icon = "venus_surfacer" + +/datum/accent/dominia + name = ACCENT_DOMINIA + description = "The most common Dominian accent is Vulgar Morozi, a variation of Sol Common found upon Moroz itself. Dominion-spoken Sol Common and Tau Ceti Basic are both heavily \ + influenced by Tradeband, the common language of both human and unathi nobility in the Empire. Vulgar Morozi has regional variations on the colonies of the Dominian Empire, and in \ + the rebellious Morozian region of Fisanduh. The Fisanduhian accent is considered to be a distinctive higher-pitched variation of Vulgar Morozi that is often suppressed by insurgents \ + to better blend in with the greater Imperial population." + tag_icon = "dominia" + +/datum/accent/jupiter + name = ACCENT_JUPITER + description = "The Jovian accent is an odd mish-mash of accents from Jupiter's various moons, and has heavy variation on each of the moons. On Idris Incorporated-dominated Europa, \ + the Jovian accent often takes on traces of Tradeband due to the amount of high-income tourism, while the Castillean Jovian accent is known for the rapid, breathless pace at which it \ + is typically spoken. Ganymede is often seen as the \"standard\" Jovian accent, though some on Castillo vehemently believe that the Castillian accent should be the standard." + tag_icon = "jupiter" \ No newline at end of file diff --git a/code/modules/background/accent/skrell.dm b/code/modules/background/accent/skrell.dm new file mode 100644 index 00000000000..a8ccac8ec4f --- /dev/null +++ b/code/modules/background/accent/skrell.dm @@ -0,0 +1,5 @@ +/datum/accent/skrell + name = ACCENT_SKRELL + description = "The typical accent found in the Jargon Federation. It has remained the most popular accent for just under a millennium due to the influences of the psionic field Skrell \ + share, and government influence; however it has not remained unchanged, especially as of recent due to the addition of alien populations to the Jargon Federation." + tag_icon = "skrell" \ No newline at end of file diff --git a/code/modules/background/accent/tajara.dm b/code/modules/background/accent/tajara.dm new file mode 100644 index 00000000000..a6c9ba06e11 --- /dev/null +++ b/code/modules/background/accent/tajara.dm @@ -0,0 +1,68 @@ +/datum/accent/republican_siik + name = ACCENT_REPUBICLANSIIK + description = "The dialect of north and central Ras'nrr. It was spoken by the Hadii dynasty and its subjects before being adopted as the official version of the People's Republic \ + Siik'maas. This variation is taught in all Republican schools since the end of the first revolution and is considered as the most pure and correct form. PRA citizens are encouraged \ + to learn and adopt it, as speaking another accent is frowned upon. It is notable for its unusually rigid grammatical construction as opposed to most other Adhomian dialects. \ + Republican Siik'maas is the language of Hadiist loyalists, both in and outside of S'rand'marr." + tag_icon = "tajara" + +/datum/accent/nazira_siik + name = ACCENT_NAZIRASIIK + description = "Nazira Siik'maas is native to the southern regions of Ras'nrr. This accent is the oldest and most solemn form of Siik'maas, avoiding contractions of words and speaking \ + its sentences slowly. It is commonly associated with the church of S'rand'marr, due to its proximity to Sana Sahira. Priests are taught to replicate this dialect when conducting \ + religious service." + tag_icon = "tajara_nazira" + +/datum/accent/crevan + name = ACCENT_CREVAN + description = "Once the dialect of merchants and sailors across all Adhomai. Born from the melting pot that is Crevus, where Tajara from all the planet would bring and mix their \ + cultures. Thanks to the importance of the city during its trading age, it can be found in most Tajara ports as well. Crevan Creole is known for its heavy focus on nasal sounds, with many \ + Adhomian comedians parodying it." + tag_icon = "tajara_crevan" + +/datum/accent/dasnrra_siik + name = ACCENT_DASNRRASIIK + description = "Found on the island of Das'nrra, this accent is famous for its emphasis at the end of vowels and uncommon pronunciation of glottal stops. While tracing its origins back \ + to the rural population, it was shaped by the urban workers that emerged after the first revolution. It is associated with Democratic People's Republic citizens and its offworld \ + community." + tag_icon = "tajara_dasnrra" + +/datum/accent/high_harr_siik + name = ACCENT_HIGHHARRSIIK + description = "Used by the natives of northern Harr'masir. It is deemed to be a rustic and harsh-sounding form of siik'maas; the accent is associated with peasants and uneducated \ + Tajara. It is the most common dialect among New Kingdom's commoners. The nobility usually attempts to mask this accent due to its relationship with the common people. It is also \ + spoken by the New Kingdom population living in Tau Ceti." + tag_icon = "tajara_high_harr" + +/datum/accent/low_harr_siik + name = ACCENT_LOWHARRSIIK + description = "Native to the southern area of Harr'masir. In comparison to other Siik'maas dialects - it is the one that deviates the most from the standard version. Due to Republican \ + propaganda, it has gained the fame of being the tongue of criminals and guerrilla fighters. Most speakers are Democratic People's Republic citizens. Its words are spoken in a hushed \ + manner." + tag_icon = "tajara_low_harr" + +/datum/accent/amohda_siik + name = ACCENT_AMOHDASIIK + description = "Spoken by the Tajara from the island of Amohda. Despite past Republican attempts to destroy this dialect; it survived and is now undergoing a period of revival by Amohdan \ + nationalists. It can also be found in the New kingdom because of the Amohda Exiles. Due to royalist influence, it has many Ya'ssa loan words. Amohdan Siik'maas has a characteristic \ + drawl tone to it." + tag_icon = "tajara_amohda" + +/datum/accent/rural_delvahhi + name = ACCENT_RURALDELVAHHI + description = "The form of Delvahhi spoken by settled zhan communities. It has been heavily influenced by Siik'maas. It is also used as the liturgical language by some Ma'ta'ke \ + priests. Rural Delvahhi speakers usually speak siik'maas with a slower and throaty tone." + tag_icon = "tajara_rural" + +/datum/accent/nomad_delvahhi + name = ACCENT_NOMADDELVAHHI + description = "The version of Delvahhi used by the Rhazar'Hrujmagh. It emerged after the breakup in the primordial Zhan-Khazan population. Unlike the rural dialect, it remained \ + relatively unchanged over time. It is far more guttural and brief than its sister tongue. " + tag_icon = "tajara_nomad" + +/datum/accent/old_yassa + name = ACCENT_OLDYASSA + description = "The tongue of the old Tajaran nobility, spoken by those who were born before the first revolution. It differs from the modern Ya'ssa by having a far more complex set \ + of rules, long-drawn-out sentences and compound words. Old Ya'ssa is a dying tongue; as the version taught by the New Kingdom of Adhomai has mostly replaced it in the post-revolution \ + noble generation." + tag_icon = "tajara_oldyassa" \ No newline at end of file diff --git a/code/modules/background/accent/unathi.dm b/code/modules/background/accent/unathi.dm new file mode 100644 index 00000000000..f05258d99ab --- /dev/null +++ b/code/modules/background/accent/unathi.dm @@ -0,0 +1,35 @@ +/datum/accent/hegemon_noble + name = ACCENT_HEGEMON_NOBLE + description = "The Noble Hegemonic accent is eloquent and flowing, staying near the front of the mouth. Airy and filled with hissing, this accent requires birth-right or years of \ + practice to properly convey. The families of Lords, Sk'akh Priests, noble warriors, and some merchants will often share this accent, and will mostly find the Sinta'Azaziba language \ + and Traditionalist accent more savage. The Noble Hegemonic accent is primarily found in the Untouched Lands, and originates from the Sinta'Unathi language." + tag_icon = "hegemon_noble" + +/datum/accent/hegemon_peasant + name = ACCENT_HEGEMON_PEASANT + description = "Lowborn guilds-workers, first-generation merchants, simple warrior levymen, and hundreds of other tasks for the common Clans - this is the most common accent for \ + Unathi, stereotypically. It still holds a slight air of royalty to it compared to the Traditional accents. It is most commonly found in the crowded Untouched Lands and in colonies. \ + It originates from the Sinta'Unathi language. " + tag_icon = "hegemon_peasant" + +/datum/accent/trad_noble + name = ACCENT_TRAD_NOBLE + description = "A more guttural, droning accent - although one that would demand respect on Moghes before the Contact War, and still demands it in the Wasteland. Primarily born from the \ + guttural intonations and physical movement required to communicate in Sinta'Azaziba, this Noble Traditional accent requires clan-training from a family member or shaman - and has \ + become either a sign of survival or defeat to most who see this ancient accent fading from existence." + tag_icon = "trad_noble" + +/datum/accent/trad_peasant + name = ACCENT_TRAD_PEASANT + description = "Primarily derived from the guttural intonations and physical movement of Sinta'Azaziba, common Unathi from the Wasteland would have this grittier speech pattern. \ + Although filled with variety due to the multitude of kingdoms composed in the Wasteland, the borders of where these accents used to be set no longer exist and have simply become \ + what it is now, struggling to find identity." + tag_icon = "trad_peasant" + +/datum/accent/wastelander + name = ACCENT_WASTELAND + description = "Deep within the Wasteland, the most savage lands dominated by bandits, death cults, and nomadic peoples that have lost any connection to their ancestors culturally. \ + The Deep Wasteland accent comes from a disconnection to original talking styles, and adds in more aggressive speech patterns. To both Hegemonic and Traditionalist, the Deep \ + Wastelander accent is the sign of an individual who has grown up without a home or clan that could have taught them an ancestral dialect. The accent is apparent in both \ + Sinta'Unathi and Sinta'Azaziba." + tag_icon = "deep_wastelander" \ No newline at end of file diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index 138ad75ce92..a5416b9d5a6 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -45,3 +45,46 @@ #define RELIGION_HIVEPANTHEON "Hive Pantheon" #define RELIGION_PREIMMINENNCE "Preimminennce" #define RELIGION_PILOTDREAM "Pilot Dream" + +//accent defines + +#define ACCENT_CETI "Biesellite" +#define ACCENT_COC "Frontiersfolk" +#define ACCENT_ELYRA "Elyran" +#define ACCENT_ERIDANI "Eridanian" +#define ACCENT_ERIDANIDREG "Eridanian Dreg" +#define ACCENT_SOL "Solarian" +#define ACCENT_SCARAB "Scarab Fleets" +#define ACCENT_SILVERSUN "Silversun" +#define ACCENT_PHONG "New Hai Phongese" +#define ACCENT_MARTIAN "Martian" +#define ACCENT_KONYAN "Konyanger" +#define ACCENT_LUNA "Lunan" +#define ACCENT_GIBSON "New Gibsoner" +#define ACCENT_HIMEO "Himean" +#define ACCENT_VYSOKA "Vysokan" +#define ACCENT_VENUS "Venusian Cytherean" +#define ACCENT_VENUSJIN "Venusian Jintarian" +#define ACCENT_DOMINIA "Dominian" +#define ACCENT_JUPITER "Jovian" + +#define ACCENT_REPUBICLANSIIK "Republican Siik'maas" +#define ACCENT_NAZIRASIIK "Nazira Siik'maas" +#define ACCENT_CREVAN "Crevan Creole" +#define ACCENT_DASNRRASIIK "Das'nrra Siik'maas" +#define ACCENT_HIGHHARRSIIK "High-Harr'masir Siik'maas" +#define ACCENT_LOWHARRSIIK "Lower-Harr'masir Siik'maas" +#define ACCENT_AMOHDASIIK "Amohdan Siik'maas" +#define ACCENT_RURALDELVAHHI "Rural Delvahhi" +#define ACCENT_NOMADDELVAHHI "Nomadic Delvahhi" +#define ACCENT_OLDYASSA "Old Ya'ssa" + +#define ACCENT_HEGEMON_NOBLE "Noble Hegemonic" +#define ACCENT_HEGEMON_PEASANT "Peasant Hegemonic" +#define ACCENT_TRAD_NOBLE "Noble Traditional" +#define ACCENT_TRAD_PEASANT "Peasant Traditional" +#define ACCENT_WASTELAND "Deep Wastelander" + +#define ACCENT_SKRELL "Standard Nral'Malic" + +#define ACCENT_DIONA "Diona" \ No newline at end of file diff --git a/code/modules/battlemonsters/items/card.dm b/code/modules/battlemonsters/items/card.dm index f28ca46d780..bb3938baabd 100644 --- a/code/modules/battlemonsters/items/card.dm +++ b/code/modules/battlemonsters/items/card.dm @@ -27,8 +27,8 @@ /obj/item/battle_monsters/card/resolve_attackby(atom/A, mob/user, var/click_parameters) if(istype(A,/obj/structure/table) || istype(A,/obj/structure/dueling_table)) user.visible_message(\ - span("notice","\The [user] plays \the [src]!"),\ - span("notice","You play \the [src]!")\ + SPAN_NOTICE("\The [user] plays \the [src]!"),\ + SPAN_NOTICE("You play \the [src]!")\ ) ..(A, user, click_parameters) @@ -44,15 +44,15 @@ user.drop_from_inventory(src) new_deck.icon_state = "hand" user.put_in_inactive_hand(new_deck) - to_chat(user,span("notice","You combine \the [src] and the [adding_card] to form a hand.")) + to_chat(user, SPAN_NOTICE("You combine \the [src] and the [adding_card] to form a hand.")) else new_deck.set_dir(dir) new_deck.pixel_x = pixel_x new_deck.pixel_y = pixel_y new_deck.layer = max(layer,new_deck.layer) user.visible_message(\ - span("notice","\The [user] combines \the [src] and the [adding_card] to form a deck."),\ - span("notice","You combine \the [src] and the [adding_card] to form a deck.")\ + SPAN_NOTICE("\The [user] combines \the [src] and the [adding_card] to form a deck."),\ + SPAN_NOTICE("You combine \the [src] and the [adding_card] to form a deck.")\ ) new_deck.add_card(user,src) @@ -63,19 +63,19 @@ if(src.loc == user) if(!facedown) - to_chat(user,span("notice","You reveal \the [name] to yourself, preparing to play it face up.")) + to_chat(user, SPAN_NOTICE("You reveal \the [name] to yourself, preparing to play it face up.")) else - to_chat(user,span("notice", "You prepare \the [name] to be played face down.")) + to_chat(user, SPAN_NOTICE("You prepare \the [name] to be played face down.")) else if(!facedown) user.visible_message(\ - span("notice","\The [user] flip the card face up and reveals \the [name]."),\ - span("notice","You flip the card face up and reveal \the [name].")\ + SPAN_NOTICE("\The [user] flip the card face up and reveals \the [name]."),\ + SPAN_NOTICE("You flip the card face up and reveal \the [name].")\ ) else user.visible_message(\ - span("notice","\The [user] flips \the [name] face down."),\ - span("notice","You flip \the [name] face down.")\ + SPAN_NOTICE("\The [user] flips \the [name] face down."),\ + SPAN_NOTICE("You flip \the [name] face down.")\ ) update_icon() @@ -169,7 +169,7 @@ ..() if(facedown && src.loc != user) - to_chat(user,span("notice","You can't examine \the [src] while it's face down!")) + to_chat(user, SPAN_NOTICE("You can't examine \the [src] while it's face down!")) return if(trap_datum) diff --git a/code/modules/battlemonsters/items/core.dm b/code/modules/battlemonsters/items/core.dm index 145be97881f..6f0e9d47994 100644 --- a/code/modules/battlemonsters/items/core.dm +++ b/code/modules/battlemonsters/items/core.dm @@ -45,23 +45,23 @@ if(rotated) if(src.loc == user) - to_chat(user,span("notice", "You prepare \the [name] to be played horizontally.")) + to_chat(user, SPAN_NOTICE("You prepare \the [name] to be played horizontally.")) set_dir(turn(NORTH,90)) else set_dir(turn(user.dir,90)) user.visible_message(\ - span("notice","\The [user] adjusts the orientation of \the [src] horizontally."),\ - span("notice","You adjust the orientation of \the [src] horizontally.")\ + SPAN_NOTICE("\The [user] adjusts the orientation of \the [src] horizontally."),\ + SPAN_NOTICE("You adjust the orientation of \the [src] horizontally.")\ ) else if(src.loc == user) - to_chat(user,span("notice", "You prepare \the [name] to be played vertically.")) + to_chat(user, SPAN_NOTICE("You prepare \the [name] to be played vertically.")) set_dir(NORTH) else set_dir(user.dir) user.visible_message(\ - span("notice","\The [user] adjusts the orientation of \the [src] vertically."),\ - span("notice","You adjust the orientation of \the [src] vertically.")\ + SPAN_NOTICE("\The [user] adjusts the orientation of \the [src] vertically."),\ + SPAN_NOTICE("You adjust the orientation of \the [src] vertically.")\ ) update_icon() diff --git a/code/modules/battlemonsters/items/deck.dm b/code/modules/battlemonsters/items/deck.dm index 9b2b6071421..de60d179eb3 100644 --- a/code/modules/battlemonsters/items/deck.dm +++ b/code/modules/battlemonsters/items/deck.dm @@ -32,13 +32,13 @@ if(icon_state == "stack") //Deck form user.visible_message(\ - span("notice","\The [user] draws a card from their [src]."),\ - span("notice","You draw a card from their [src].")\ + SPAN_NOTICE("\The [user] draws a card from their [src]."),\ + SPAN_NOTICE("You draw a card from their [src].")\ ) else user.visible_message(\ - span("notice","\The [user] takes a card from their hand."),\ - span("notice","You take a card from your hand.")\ + SPAN_NOTICE("\The [user] takes a card from their hand."),\ + SPAN_NOTICE("You take a card from your hand.")\ ) take_specific_card(user,get_top_card()) @@ -52,7 +52,7 @@ else if(!user.get_inactive_hand()) user.put_in_inactive_hand(new_card) else - to_chat(user,span("notice","Your hands are full!")) + to_chat(user, SPAN_NOTICE("Your hands are full!")) return new_card.pickup(user) @@ -73,8 +73,8 @@ stored_card_names += added_deck.stored_card_names user.visible_message(\ - span("notice","\The [user] combines two decks together."),\ - span("notice","You combine two decks together.")\ + SPAN_NOTICE("\The [user] combines two decks together."),\ + SPAN_NOTICE("You combine two decks together.")\ ) qdel(C) @@ -100,14 +100,14 @@ if(icon_state == "hand") usr.visible_message(\ - span("notice","\The [usr] turns their hand into a stack of cards."),\ - span("notice","You turn your hand into a stack of cards.")\ + SPAN_NOTICE("\The [usr] turns their hand into a stack of cards."),\ + SPAN_NOTICE("You turn your hand into a stack of cards.")\ ) icon_state = "stack" else usr.visible_message(\ - span("notice","\The [usr] turns their stack of cards into a hand."),\ - span("notice","You turn your stack of cards into a hand.")\ + SPAN_NOTICE("\The [usr] turns their stack of cards into a hand."),\ + SPAN_NOTICE("You turn your stack of cards into a hand.")\ ) icon_state = "hand" @@ -122,8 +122,8 @@ return usr.visible_message(\ - span("notice","\The [usr] shuffles \the [src]."),\ - span("notice","You shuffle \the [src].")\ + SPAN_NOTICE("\The [usr] shuffles \the [src]."),\ + SPAN_NOTICE("You shuffle \the [src].")\ ) playsound(src.loc, 'sound/items/cardshuffle.ogg', 100, 1, -4) @@ -144,18 +144,18 @@ /obj/item/battle_monsters/deck/attack_self(mob/user) if(user != src.loc) //Idk how this is possible but you never know. - to_chat(user,span("notice","You'll have to pick up \the [src] to examine the cards!")) + to_chat(user, SPAN_NOTICE("You'll have to pick up \the [src] to examine the cards!")) return if(icon_state != "hand") user.visible_message(\ - span("notice","\The [usr] begins searching through \the [src]..."),\ - span("notice","You begin searching through your deck...")\ + SPAN_NOTICE("\The [usr] begins searching through \the [src]..."),\ + SPAN_NOTICE("You begin searching through your deck...")\ ) if(!do_after(user, 5 + stored_card_names.len, act_target = src)) user.visible_message(\ - span("notice","\The [usr] stops and thinks better of it."),\ - span("notice","You stop and think better of it.")\ + SPAN_NOTICE("\The [usr] stops and thinks better of it."),\ + SPAN_NOTICE("You stop and think better of it.")\ ) return diff --git a/code/modules/battlemonsters/items/wrapped.dm b/code/modules/battlemonsters/items/wrapped.dm index 91b5145e7b4..fa2a69f3d37 100644 --- a/code/modules/battlemonsters/items/wrapped.dm +++ b/code/modules/battlemonsters/items/wrapped.dm @@ -30,8 +30,8 @@ /obj/item/battle_monsters/wrapped/attack_self(mob/user) user.visible_message(\ - span("notice","\The [user] unwraps \the [src]."),\ - span("notice","You unwrap \the [src].")\ + SPAN_NOTICE("\The [user] unwraps \the [src]."),\ + SPAN_NOTICE("You unwrap \the [src].")\ ) var/obj/item/battle_monsters/deck/generated_deck = new(get_turf(src)) GenerateCards(user,generated_deck) @@ -40,6 +40,14 @@ generated_deck.update_icon() qdel(src) +/obj/item/battle_monsters/wrapped/basic + name = "battle monsters basic booster pack" + desc = "A pack of 7 basic battle monster cards, merely to prod the imagination." + icon_state = "pack2" + contained_cards = 7 + rarity_max = BATTLE_MONSTERS_RARITY_COMMON + rarity_min = BATTLE_MONSTERS_RARITY_COMMON + /obj/item/battle_monsters/wrapped/pro name = "battle monsters booster pack" desc = "A pack of 10 rare battle monster cards, with a chance of having legendary cards." diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index 39f2e6595ce..cb2e4a7dd21 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -12,14 +12,14 @@ /datum/bounty/reagent/applies_to(obj/O) if(!istype(O, /obj/item/reagent_containers)) return FALSE - if(!O.reagents || !O.reagents.has_reagent(wanted_reagent.id)) + if(!O.reagents || !O.reagents.has_reagent(wanted_reagent.type)) return FALSE return shipped_volume < required_volume /datum/bounty/reagent/ship(obj/O) if(!applies_to(O)) return - shipped_volume += O.reagents.get_reagent_amount(wanted_reagent.id) + shipped_volume += O.reagents.get_reagent_amount(wanted_reagent.type) if(shipped_volume > required_volume) shipped_volume = required_volume @@ -27,7 +27,7 @@ if(!istype(other_bounty, /datum/bounty/reagent)) return TRUE var/datum/bounty/reagent/R = other_bounty - return wanted_reagent.id != R.wanted_reagent.id + return wanted_reagent.type != R.wanted_reagent.type /datum/bounty/reagent/simple_drink name = "Simple Drink" @@ -45,7 +45,7 @@ /datum/reagent/alcohol/ethanol/black_russian,\ /datum/reagent/alcohol/ethanol/bloody_mary,\ /datum/reagent/alcohol/ethanol/martini,\ - /datum/reagent/alcohol/ethanol/cuba_libre,\ + /datum/reagent/alcohol/ethanol/cubalibre,\ /datum/reagent/alcohol/ethanol/erikasurprise,\ /datum/reagent/alcohol/ethanol/ginfizz,\ /datum/reagent/alcohol/ethanol/gintonic,\ @@ -60,7 +60,7 @@ /datum/reagent/alcohol/ethanol/snowwhite,\ /datum/reagent/drink/coffee/soy_latte,\ /datum/reagent/drink/coffee/cafe_latte,\ - /datum/reagent/alcohol/ethanol/syndicatebomb,\ + /datum/reagent/alcohol/ethanol/gibsonhooch,\ /datum/reagent/alcohol/ethanol/manly_dorf,\ /datum/reagent/alcohol/ethanol/thirteenloko,\ /datum/reagent/alcohol/ethanol/vodkamartini,\ diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm index 41e16845179..7d44cc88647 100644 --- a/code/modules/cargo/random_stock/t1_common.dm +++ b/code/modules/cargo/random_stock/t1_common.dm @@ -1,7 +1,7 @@ // --- Common --- STOCK_ITEM_COMMON(toolbox, 4) - if (prob(5)) + if(prob(5)) new /obj/item/storage/toolbox/syndicate(L) else new /obj/random/toolbox(L) @@ -16,7 +16,7 @@ STOCK_ITEM_COMMON(steel, 7) new /obj/item/stack/material/steel(L, 50) STOCK_ITEM_COMMON(glass, 2.5) - if (prob(35)) + if(prob(35)) new /obj/item/stack/material/glass/reinforced(L, rand(10,50)) else new /obj/item/stack/material/glass(L, 50) @@ -33,34 +33,33 @@ STOCK_ITEM_COMMON(cardboard, 1) //A lightreplacer and a kit of lights STOCK_ITEM_COMMON(lightreplacer, 1) var/obj/item/device/lightreplacer/LR - if (prob(5)) + if(prob(5)) LR = new /obj/item/device/lightreplacer/advanced(L) else LR = new /obj/item/device/lightreplacer(L) LR.uses = 0 new /obj/item/storage/box/lights/mixed(L) - new /obj/item/storage/box/lights/mixed(L) //A bundle of bodybags or stasis bags STOCK_ITEM_COMMON(bodybag, 2.2) - if (prob(25)) - new /obj/item/bodybag/cryobag(L) - new /obj/item/bodybag/cryobag(L) + if(prob(25)) new /obj/item/bodybag/cryobag(L) new /obj/item/bodybag/cryobag(L) + if(prob(50)) + new /obj/item/bodybag/cryobag(L) + new /obj/item/bodybag/cryobag(L) else new /obj/item/storage/box/bodybags(L) STOCK_ITEM_COMMON(lamp, 2.4) - for (var/i in 1 to rand(1, 3)) - var/obj/item/device/flashlight/lamp/P - if (prob(50)) - P = new /obj/item/device/flashlight/lamp/green(L) - else - P = new /obj/item/device/flashlight/lamp(L) - P.on = FALSE - P.queue_icon_update() + var/obj/item/device/flashlight/lamp/P + if(prob(50)) + P = new /obj/item/device/flashlight/lamp/green(L) + else + P = new /obj/item/device/flashlight/lamp(L) + P.on = FALSE + P.queue_icon_update() STOCK_ITEM_COMMON(mousetrap, 2) new /obj/item/storage/box/mousetraps(L) @@ -71,11 +70,11 @@ STOCK_ITEM_COMMON(sterile, 2) STOCK_ITEM_COMMON(light, 1.8) new /obj/item/storage/box/lights/mixed(L) - if (prob(50)) + if(prob(50)) new /obj/item/storage/box/lights/mixed(L) - if (prob(25)) + if(prob(25)) new /obj/item/storage/box/lights/coloredmixed(L) - if (prob(15)) + if(prob(15)) var/type = pick( \ /obj/item/storage/box/lights/colored/red, \ /obj/item/storage/box/lights/colored/green, \ @@ -92,56 +91,40 @@ STOCK_ITEM_COMMON(aid, 4) STOCK_ITEM_COMMON(flame, 2) new /obj/item/storage/box/matches(L) new /obj/item/flame/lighter/random(L) + +STOCK_ITEM_COMMON(candles, 1.5) new /obj/item/storage/fancy/candle_box(L) - new /obj/item/storage/fancy/candle_box(L) + if(prob(75)) + new /obj/item/storage/fancy/candle_box(L) STOCK_ITEM_COMMON(crayons, 1.5) new /obj/item/storage/fancy/crayons(L) STOCK_ITEM_COMMON(figure, 1) + new /obj/random/action_figure(L) STOCK_ITEM_COMMON(bombsupply, 4.5) - new /obj/random/bomb_supply(L) - new /obj/random/bomb_supply(L) - new /obj/random/bomb_supply(L) - new /obj/random/bomb_supply(L) + for(var/i in 1 to rand(1, 3)) + new /obj/random/bomb_supply(L) STOCK_ITEM_COMMON(tech, 5) - new /obj/random/tech_supply(L) - new /obj/random/tech_supply(L) - new /obj/random/tech_supply(L) - new /obj/random/tech_supply(L) + for(var/i in 1 to rand(1, 3)) + new /obj/random/tech_supply(L) -STOCK_ITEM_COMMON(smokes, 2) - new /obj/item/flame/lighter/random(L) - if (prob(20)) - new /obj/item/storage/fancy/cigar(L) - new /obj/item/storage/fancy/cigar(L) - else - new /obj/item/storage/fancy/cigarettes/blank(L) - new /obj/item/storage/fancy/cigarettes/blank(L) - if (prob(50)) - new /obj/item/storage/fancy/cigarettes/dromedaryco(L) - new /obj/item/storage/fancy/cigarettes/dromedaryco(L) - new /obj/item/storage/fancy/cigarettes/dromedaryco(L) - new /obj/item/storage/fancy/cigarettes/dromedaryco(L) - else - new /obj/item/storage/fancy/cigarettes(L) - new /obj/item/storage/fancy/cigarettes(L) - new /obj/item/storage/fancy/cigarettes(L) - new /obj/item/storage/fancy/cigarettes(L) - - if (prob(30)) - new /obj/item/clothing/mask/smokable/pipe(L) +STOCK_ITEM_COMMON(smokable, 2) + if(prob(50)) + new /obj/item/flame/lighter/random(L) + for(var/i in 1 to rand(2, 4)) + new /obj/random/smokable(L) STOCK_ITEM_COMMON(vials, 2) - if (prob(20)) + if(prob(20)) new /obj/item/storage/lockbox/vials(L) else new /obj/item/storage/fancy/vials(L) STOCK_ITEM_COMMON(smallcell, 4) - for (var/i in 1 to rand(1, 4)) + for(var/i in 1 to rand(1, 2)) var/type = pick( \ /obj/item/cell, \ /obj/item/cell/device, \ @@ -164,10 +147,14 @@ STOCK_ITEM_COMMON(circuitboard, 2) var/type = pick(allboards) new type(L) -STOCK_ITEM_COMMON(smalloxy, 3.2) - new /obj/random/smalltank(L) - new /obj/random/smalltank(L) +STOCK_ITEM_COMMON(oxy, 3.2) new /obj/random/smalltank(L) + new /obj/item/tank/oxygen(L) + if(prob(25)) + new /obj/random/smalltank(L) + new /obj/random/smalltank(L) + if(prob(10)) + new /obj/item/tank/oxygen(L) STOCK_ITEM_COMMON(belts, 2) new /obj/random/belt(L) @@ -178,11 +165,11 @@ STOCK_ITEM_COMMON(backpack, 4.5) new /obj/random/backpack(L) STOCK_ITEM_COMMON(weldgear, 2) - if (prob(50)) + if(prob(50)) new /obj/item/clothing/glasses/welding(L) - if (prob(50)) + if(prob(50)) new /obj/item/clothing/head/welding(L) - if (prob(50)) + if(prob(50)) new /obj/item/weldpack(L) STOCK_ITEM_COMMON(inflatable, 3) @@ -194,7 +181,7 @@ STOCK_ITEM_COMMON(wheelchair, 1) //We'll put it ontop of a crate if we need to though, its not essential to find clear space //In any case, we always spawn it on a turf and never in a container var/turf/T = get_turf(L) - if (!turf_clear(T)) + if(!turf_clear(T)) for (var/turf/U in range(T,1)) if (turf_clear(U)) T = U @@ -204,25 +191,26 @@ STOCK_ITEM_COMMON(wheelchair, 1) STOCK_ITEM_COMMON(meson, 1.5) new /obj/item/clothing/glasses/meson(L) - if (prob(50)) + if(prob(50)) new /obj/item/clothing/glasses/meson(L) STOCK_ITEM_COMMON(trap, 2) new /obj/item/trap(L) - if (prob(50)) + if(prob(30)) new /obj/item/trap(L) STOCK_ITEM_COMMON(trays, 1.8) - for (var/i in 1 to rand(1, 7)) - new /obj/item/tray(L) + new /obj/item/tray(L) STOCK_ITEM_COMMON(utensil, 2) new /obj/item/storage/box/kitchen(L) -STOCK_ITEM_COMMON(metalfoam, 1.5) - new /obj/item/grenade/chem_grenade/metalfoam(L) - new /obj/item/grenade/chem_grenade/metalfoam(L) - new /obj/item/grenade/chem_grenade/metalfoam(L) +STOCK_ITEM_COMMON(utilitygrenades, 1.5) + for(var/i in 1 to rand(1, 4)) + if(prob(50)) + new /obj/item/grenade/chem_grenade/metalfoam(L) + else + new /obj/item/grenade/chem_grenade/cleaner(L) STOCK_ITEM_COMMON(nanopaste, 2) new /obj/item/stack/nanopaste(L) @@ -244,13 +232,14 @@ STOCK_ITEM_COMMON(gloves, 3.3) exclusion += typesof(/obj/item/clothing/gloves/ballistic) allgloves -= exclusion - for (var/i in 1 to rand(1, 5)) + for (var/i in 1 to rand(1, 3)) var/gtype = pick(allgloves) new gtype(L) STOCK_ITEM_COMMON(insulated, 1.8) new /obj/item/clothing/gloves/yellow(L) - new /obj/item/clothing/gloves/yellow(L) + if(prob(50)) + new /obj/item/clothing/gloves/yellow(L) STOCK_ITEM_COMMON(scanners, 3.2) //A random scanning device, most are useless @@ -269,48 +258,48 @@ STOCK_ITEM_COMMON(scanners, 3.2) /obj/item/barcodescanner = 1, /obj/item/device/depth_scanner = 1 ) - for (var/i in 1 to rand(1, 3)) + for(var/i in 1 to rand(1, 3)) var/stype = pickweight(possible) new stype(L) STOCK_ITEM_COMMON(binoculars, 1.5) new /obj/item/device/binoculars(L) - if (prob(50)) + if(prob(50)) new /obj/item/device/binoculars(L) STOCK_ITEM_COMMON(flash, 1) new /obj/item/device/flash(L) STOCK_ITEM_COMMON(maglock, 2) - if (prob(50)) + if(prob(50)) new /obj/item/device/magnetic_lock/engineering(L) else new /obj/item/device/magnetic_lock/security(L) -STOCK_ITEM_COMMON(luminol, 2) - new /obj/item/reagent_containers/spray/luminol(L) +STOCK_ITEM_COMMON(forensic, 1) + if(prob(50)) + new /obj/item/reagent_containers/spray/luminol(L) + else + new /obj/item/device/uv_light(L) + if(prob(25)) + new /obj/item/storage/box/slides(L) STOCK_ITEM_COMMON(cleaning, 3.5) - if (prob(80)) + if(prob(80)) new /obj/item/reagent_containers/glass/rag(L) - if (prob(80)) - var/list/soaps = list( - /obj/item/soap, - /obj/item/soap/nanotrasen, - /obj/item/soap/deluxe, - /obj/item/soap/syndie - ) - var/soaptype = pick(soaps) - new soaptype(L) - if (prob(80)) + if(prob(80)) + new /obj/random/soap(L) + if(prob(80)) new /obj/item/mop(L) + else if(prob(5)) + new /obj/item/mop/advanced(L) -STOCK_ITEM_COMMON(bsdm, 2) - if (prob(50)) +STOCK_ITEM_COMMON(bsdm, 1.5) + if(prob(50)) new /obj/item/clothing/glasses/sunglasses/blindfold(L) - if (prob(50)) + if(prob(50)) new /obj/item/clothing/mask/muzzle(L) - if (prob(30)) + if(prob(30)) new /obj/item/clothing/suit/straight_jacket(L) STOCK_ITEM_COMMON(charger, 2) @@ -331,9 +320,6 @@ STOCK_ITEM_COMMON(smokebombs, 1.1) STOCK_ITEM_COMMON(jar, 2) new /obj/item/glass_jar(L) -STOCK_ITEM_COMMON(uvlight, 1.2) - new /obj/item/device/uv_light(L) - STOCK_ITEM_COMMON(glasses, 1.2) new /obj/item/storage/box/rxglasses(L) @@ -353,7 +339,7 @@ STOCK_ITEM_COMMON(pills, 1.2) new newtype(L) STOCK_ITEM_COMMON(cosmetic, 2.2) - if (prob(50)) + if(prob(50)) new /obj/item/lipstick/random(L) else new /obj/item/haircomb(L) @@ -361,9 +347,20 @@ STOCK_ITEM_COMMON(cosmetic, 2.2) STOCK_ITEM_COMMON(suitcooler, 1.2) new /obj/item/device/suit_cooling_unit(L) +STOCK_ITEM_COMMON(paperwork, 1.2) + if(prob(50)) + new /obj/item/hand_labeler(L) + else + new /obj/item/clipboard(L) + if(prob(15)) + var/obj/item/pen/fountain/F = pick(typesof(/obj/item/pen/fountain)) + new F(L) + else if(prob(15)) + new /obj/item/pen/multi(L) + STOCK_ITEM_COMMON(officechair, 1.2) var/turf/T = get_turf(L) - if (!turf_clear(T)) + if(!turf_clear(T)) for (var/turf/U in range(T,1)) if (turf_clear(U)) T = U @@ -371,7 +368,7 @@ STOCK_ITEM_COMMON(officechair, 1.2) new /obj/structure/bed/chair/office/dark(T) STOCK_ITEM_COMMON(booze, 3.7) - if (prob(8))//Spare keg of beer or xuizi juice + if(prob(8))//Spare keg of beer or xuizi juice var/turf/T = get_turf(L) if (!turf_clear(T)) for (var/turf/U in range(T,1)) @@ -391,7 +388,7 @@ STOCK_ITEM_COMMON(booze, 3.7) STOCK_ITEM_COMMON(plant, 3.5) var/turf/T = get_turf(L) - if (!turf_clear(T)) + if(!turf_clear(T)) for (var/turf/U in range(T,1)) if (turf_clear(U)) T = U @@ -409,11 +406,11 @@ STOCK_ITEM_COMMON(bag, 3.5) /obj/item/storage/bag/books \ ) new type(L) - if (prob(30)) + if(prob(30)) new type(L) STOCK_ITEM_COMMON(extinguish, 2.2) - for (var/i in 1 to rand(1, 3)) + for(var/i in 1 to rand(1, 3)) var/type = pick( \ /obj/item/extinguisher, \ /obj/item/extinguisher/mini \ @@ -421,7 +418,7 @@ STOCK_ITEM_COMMON(extinguish, 2.2) new type(L) STOCK_ITEM_COMMON(hailer, 1.1) - if (prob(50)) + if(prob(50)) new /obj/item/device/megaphone(L) else new /obj/item/device/hailer(L) @@ -430,12 +427,12 @@ STOCK_ITEM_COMMON(hailer, 1.1) //Take em up to science for gun testing STOCK_ITEM_COMMON(target, 2) var/turf/T = get_turf(L) - if (!turf_clear(T)) - for (var/turf/U in range(T,1)) - if (turf_clear(U)) + if(!turf_clear(T)) + for(var/turf/U in range(T,1)) + if(turf_clear(U)) T = U break - if (prob(50)) + if(prob(50)) new /obj/item/target(T) else new /obj/structure/target_stake(T) @@ -445,8 +442,8 @@ STOCK_ITEM_COMMON(snacks, 4) //This ensures the cargo bay will have a supply of food in an obtainable place for animals //allows nymphs and rats to raid it for nutrients, and thus gives player rats more //reason to infest the warehouse - if (CS && prob(65)) - if (!isturf(L)) + if(CS && prob(65)) + if(!isturf(L)) L = get_turf(pick(CS.tables)) var/list/snacks = list( @@ -461,32 +458,14 @@ STOCK_ITEM_COMMON(snacks, 4) var/type = pickweight(snacks) new type(L) -STOCK_ITEM_COMMON(oxytank, 2.5) - new /obj/item/tank/oxygen(L) - new /obj/item/tank/oxygen(L) - -STOCK_ITEM_COMMON(signs, 4) - var/list/allsigns = subtypesof(/obj/structure/sign) - allsigns -= typesof(/obj/structure/sign/double) - allsigns -= typesof(/obj/structure/sign/poster) - allsigns -= /obj/structure/sign/directions - allsigns -= typesof(/obj/structure/sign/christmas) - allsigns -= typesof(/obj/structure/sign/flag) - - for (var/i in 1 to rand(1, 5)) - var/newsign = pick(allsigns) - if (newsign != /obj/structure/sign)//Dont want to spawn the generic parent class - var/obj/structure/sign/S = new newsign(L) - S.unfasten() - STOCK_ITEM_COMMON(posters, 3) new /obj/item/contraband/poster(L) - if (prob(50)) + if(prob(40)) new /obj/item/contraband/poster(L) - if (prob(50)) + if(prob(20)) new /obj/item/contraband/poster(L) -STOCK_ITEM_COMMON(parts, 6) +STOCK_ITEM_COMMON(parts, 5) var/list/parts = list( /obj/item/stock_parts/console_screen = 3, //Low ranking parts, common /obj/item/stock_parts/capacitor = 3, @@ -513,20 +492,20 @@ STOCK_ITEM_COMMON(parts, 6) /obj/item/stock_parts/subspace/transmitter = 0.5 ) - for (var/i in 1 to rand(2, 5)) + for(var/i in 1 to rand(2, 3)) var/part = pickweight(parts) new part(L) STOCK_ITEM_COMMON(cane, 2) - if (prob(5)) + if(prob(5)) new /obj/item/cane/concealed(L) - else if (prob(20)) - new /obj/item/staff/broom(L) + else if(prob(40)) + new /obj/item/cane/crutch(L) else new /obj/item/cane(L) STOCK_ITEM_COMMON(warning, 2.2) - if (prob(50)) + if(prob(50)) new /obj/item/clothing/suit/caution(L) else new /obj/item/clothing/head/cone(L) @@ -548,38 +527,24 @@ STOCK_ITEM_COMMON(gasmask, 2) var/type = pickweight(masks) new type(L) -STOCK_ITEM_COMMON(cleanernades, 1.5) - new /obj/item/grenade/chem_grenade/cleaner(L) - new /obj/item/grenade/chem_grenade/cleaner(L) - if (prob(50)) - new /obj/item/grenade/chem_grenade/cleaner(L) - new /obj/item/grenade/chem_grenade/cleaner(L) - STOCK_ITEM_COMMON(mining, 2) - if (prob(50)) - new /obj/item/shovel(L) - if (prob(50)) - new /obj/item/pickaxe(L) - if (prob(50)) - new /obj/item/clothing/glasses/material(L) - if (prob(50)) - new /obj/item/device/flashlight/lantern(L) - if (prob(50)) - new /obj/item/mining_scanner(L) - if (prob(25)) - new /obj/item/storage/box/excavation(L) + var/list/mine_items = list(/obj/item/shovel, /obj/item/pickaxe, /obj/item/clothing/glasses/material, + /obj/item/device/flashlight/lantern, /obj/item/mining_scanner, /obj/item/storage/box/excavation) + for(var/i in 1 to rand(1, 3)) + var/to_spawn = pick(mine_items) + new to_spawn(L) STOCK_ITEM_COMMON(paicard, 2) new /obj/item/device/paicard(L) -STOCK_ITEM_COMMON(phoronsheets, 2) - new /obj/item/stack/material/phoron(L, rand(5,50)) - STOCK_ITEM_COMMON(hide, 1) new /obj/item/stack/material/animalhide(L, rand(5,50)) STOCK_ITEM_COMMON(custom_ka, 1) new /obj/random/custom_ka(L) +STOCK_ITEM_COMMON(towel, 1) + new /obj/item/towel(L) + STOCK_ITEM_COMMON(nothing, 0) - // do nothing + // do nothing \ No newline at end of file diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm index 3c54cb5666a..98e182bab38 100644 --- a/code/modules/cargo/random_stock/t2_uncommon.dm +++ b/code/modules/cargo/random_stock/t2_uncommon.dm @@ -1,9 +1,12 @@ // --- Uncommon --- -STOCK_ITEM_UNCOMMON(glowshrooms, 2) - new /obj/item/seeds/glowshroom(L) - new /obj/item/seeds/glowshroom(L) - new /obj/item/seeds/glowshroom(L) +STOCK_ITEM_UNCOMMON(shrooms, 2) + if(prob(65)) + new /obj/item/seeds/glowshroom(L) + if(prob(5)) + new /obj/item/seeds/ghostmushroomseed(L) + if(prob(30)) + new /obj/item/seeds/amanitamycelium(L) STOCK_ITEM_UNCOMMON(plasteel, 3) new /obj/item/stack/material/plasteel(L, rand(1,30)) @@ -11,6 +14,9 @@ STOCK_ITEM_UNCOMMON(plasteel, 3) STOCK_ITEM_UNCOMMON(silver, 2) new /obj/item/stack/material/silver(L, rand(5,30)) +STOCK_ITEM_UNCOMMON(phoronsheets, 2) + new /obj/item/stack/material/phoron(L, rand(5,50)) + STOCK_ITEM_UNCOMMON(phoronglass, 2) new /obj/item/stack/material/glass/phoronglass(L, 50) @@ -23,26 +29,33 @@ STOCK_ITEM_UNCOMMON(marble, 2) STOCK_ITEM_UNCOMMON(iron, 2) new /obj/item/stack/material/iron(L, 50) +STOCK_ITEM_UNCOMMON(other_mat, 0.5) + var/obj/item/stack/material/M = pick(/obj/item/stack/material/osmium, /obj/item/stack/material/mhydrogen, /obj/item/stack/material/tritium, /obj/item/stack/material/bronze) + new M(L, rand(1, 10)) + STOCK_ITEM_UNCOMMON(flare, 2) new /obj/item/device/flashlight/flare(L) new /obj/item/device/flashlight/flare(L) if (prob(50)) new /obj/random/glowstick(L) -STOCK_ITEM_UNCOMMON(deathalarm, 2) - new /obj/item/storage/box/cdeathalarm_kit(L) - -STOCK_ITEM_UNCOMMON(trackimp, 1) - new /obj/item/storage/box/trackimp(L) +STOCK_ITEM_UNCOMMON(implants, 1) + if(prob(50)) + new /obj/item/storage/box/cdeathalarm_kit(L) + else + new /obj/item/storage/box/trackimp(L) STOCK_ITEM_UNCOMMON(flashbang, 0.75) new /obj/item/storage/box/flashbangs(L) -STOCK_ITEM_UNCOMMON(cuffs, 1) - new /obj/item/storage/box/handcuffs(L) +STOCK_ITEM_UNCOMMON(arrest, 1) + if(prob(60)) + new /obj/item/storage/box/handcuffs(L) + else + new /obj/item/device/holowarrant(L) STOCK_ITEM_UNCOMMON(monkey, 2) - if (prob(40)) + if(prob(40)) var/type = pick( \ /obj/item/storage/box/monkeycubes/farwacubes, \ /obj/item/storage/box/monkeycubes/stokcubes, \ @@ -53,17 +66,17 @@ STOCK_ITEM_UNCOMMON(monkey, 2) new /obj/item/storage/box/monkeycubes(L) STOCK_ITEM_UNCOMMON(specialcrayon, 1.5) - if (prob(50)) + if(prob(50)) new /obj/item/pen/crayon/mime(L) else new /obj/item/pen/crayon/rainbow(L) STOCK_ITEM_UNCOMMON(contraband, 2) - for (var/i in 1 to rand(1,8)) + for(var/i in 1 to rand(1, 4)) new /obj/random/contraband(L) STOCK_ITEM_UNCOMMON(mediumcell, 3) - for (var/i in 1 to rand(1,2)) + for(var/i in 1 to rand(1,2)) var/type = pick( \ /obj/item/cell/super, \ /obj/item/cell/potato, \ @@ -73,10 +86,11 @@ STOCK_ITEM_UNCOMMON(mediumcell, 3) STOCK_ITEM_UNCOMMON(chempack, 5) var/list/chems = SSchemistry.chemical_reagents.Copy() - var/list/exclusion = list("drink", "reagent", "adminordrazine", "beer2", "azoth", "elixir_life", "liquid_fire", "philosopher_stone", "undead_ichor", "love", "shapesand", "usolve",\ - "sglue", "black_matter", "lightning", "trioxin", "phoron_salt", "nanites", "nitroglycerin") + var/list/exclusion = list(/datum/reagent/drink, /datum/reagent, /datum/reagent/adminordrazine, /datum/reagent/chloralhydrate/beer2, /datum/reagent/azoth, /datum/reagent/elixir,\ + /datum/reagent/liquid_fire, /datum/reagent/philosopher_stone, /datum/reagent/toxin/undead, /datum/reagent/love_potion, /datum/reagent/shapesand, /datum/reagent/usolve,\ + /datum/reagent/sglue, /datum/reagent/black_matter, /datum/reagent/bottle_lightning, /datum/reagent/toxin/trioxin, /datum/reagent/toxin/phoron_salt, /datum/reagent/toxin/nanites, /datum/reagent/nitroglycerin) chems -= exclusion - for (var/i in 1 to rand(2, 6)) + for (var/i in 1 to rand(2, 4)) var/obj/item/reagent_containers/chem_disp_cartridge/C = new /obj/item/reagent_containers/chem_disp_cartridge(L) var/rname = pick(chems) var/datum/reagent/R = SSchemistry.chemical_reagents[rname] @@ -90,7 +104,7 @@ STOCK_ITEM_UNCOMMON(chempack, 5) C.setLabel(R.name) STOCK_ITEM_UNCOMMON(robolimbs, 3) - for (var/i in 1 to rand(2, 5)) + for(var/i in 1 to rand(1, 2)) var/manuf = pick(fabricator_robolimbs) var/type = pick( \ /obj/item/robot_parts/l_arm, \ @@ -109,23 +123,28 @@ STOCK_ITEM_UNCOMMON(circuitboards, 3) exclusion += typesof(/obj/item/circuitboard/mecha) allboards -= exclusion - for (var/i in 1 to rand(2, 5)) + for(var/i in 1 to rand(2, 3)) var/type = pick(allboards) new type(L) STOCK_ITEM_UNCOMMON(jetpack, 3) new /obj/item/tank/jetpack/void(L) - new /obj/item/tank/emergency_oxygen/double(L) + if(prob(40)) + new /obj/item/tank/emergency_oxygen/double(L) STOCK_ITEM_UNCOMMON(xenocostume, 1) new /obj/item/clothing/suit/xenos(L) new /obj/item/clothing/head/xenos(L) STOCK_ITEM_UNCOMMON(inhaler, 1) - log_debug("Unimplemented item inhaler.") + var/obj/item/reagent_containers/inhaler/I = pick(subtypesof(/obj/item/reagent_containers/inhaler)) + new I(L) STOCK_ITEM_UNCOMMON(advwelder, 2) - new /obj/item/weldingtool/hugetank(L) + if(prob(5)) + new /obj/item/weldingtool/experimental(L) + else + new /obj/item/weldingtool/hugetank(L) STOCK_ITEM_UNCOMMON(sord, 1) new /obj/item/sord(L) @@ -135,7 +154,7 @@ STOCK_ITEM_UNCOMMON(policebaton, 1.5) STOCK_ITEM_UNCOMMON(stunbaton, 0.75) //batons spawn with no powercell var/obj/item/melee/baton/B = new /obj/item/melee/baton(L) - if (B.bcell) + if(B.bcell) QDEL_NULL(B.bcell) B.queue_icon_update() @@ -143,10 +162,8 @@ STOCK_ITEM_UNCOMMON(stunbaton, 0.75) //batons spawn with no powercell STOCK_ITEM_UNCOMMON(firingpin, 3) new /obj/item/storage/box/firingpins(L) -STOCK_ITEM_UNCOMMON(watches, 3) - new /obj/item/clothing/gloves/watch(L) - new /obj/item/clothing/gloves/watch(L) - new /obj/item/clothing/gloves/watch(L) +STOCK_ITEM_UNCOMMON(watch, 3) + new /obj/random/watches(L) STOCK_ITEM_UNCOMMON(MMI, 1.5) new /obj/item/device/mmi(L) @@ -165,11 +182,11 @@ STOCK_ITEM_UNCOMMON(atmosfiresuit, 2) new /obj/item/clothing/suit/fire/atmos(L) STOCK_ITEM_UNCOMMON(pdacart, 3) - for (var/i in 1 to rand(1, 4)) + for(var/i in 1 to rand(1, 3)) new /obj/random/pda_cart(L) STOCK_ITEM_UNCOMMON(debugger, 2) - new /obj/item/device/debugger(L)//No idea what this thing does, or if it works at all + new /obj/item/device/debugger(L) STOCK_ITEM_UNCOMMON(surgerykit, 2.5) new /obj/item/storage/firstaid/surgery(L) @@ -185,7 +202,7 @@ STOCK_ITEM_UNCOMMON(gift, 4) STOCK_ITEM_UNCOMMON(coatrack, 1) var/turf/T = get_turf(L) - if (!turf_clear(T)) + if(!turf_clear(T)) for (var/turf/U in range(T,1)) if (turf_clear(U)) T = U @@ -194,7 +211,7 @@ STOCK_ITEM_UNCOMMON(coatrack, 1) STOCK_ITEM_UNCOMMON(riotshield, 2) new /obj/item/shield/riot(L) - if (prob(60)) + if(prob(40)) new /obj/item/shield/riot(L) STOCK_ITEM_UNCOMMON(fireaxe, 1) @@ -214,22 +231,19 @@ STOCK_ITEM_UNCOMMON(robot, 2) ) var/type = pickweight(bots) - if (type == /mob/living/bot/secbot/ed209)//ED is large and should spawn on the floor + if(type == /mob/living/bot/secbot/ed209)//ED is large and should spawn on the floor L = get_turf(L) - if (!turf_clear(L)) - for (var/turf/U in range(L,1)) - if (turf_clear(U)) + if(!turf_clear(L)) + for(var/turf/U in range(L,1)) + if(turf_clear(U)) L = U break var/mob/living/bot/newbot = new type(L) newbot.on = FALSE //Deactivated - if (prob(10)) + if(prob(10)) newbot.emag_act(9999, null) -STOCK_ITEM_UNCOMMON(taperoll, 1) - // ??? - STOCK_ITEM_UNCOMMON(headset, 2) var/list/sets = list( /obj/item/device/radio/headset/headset_eng = 1, @@ -250,42 +264,33 @@ STOCK_ITEM_UNCOMMON(bat, 1.2) STOCK_ITEM_UNCOMMON(scythe, 0.75) new /obj/item/material/scythe(L) -STOCK_ITEM_UNCOMMON(manual, 2) - var/type = pick( \ - /obj/item/book/manual/excavation, \ - /obj/item/book/manual/mass_spectrometry, \ - /obj/item/book/manual/anomaly_spectroscopy, \ - /obj/item/book/manual/materials_chemistry_analysis, \ - /obj/item/book/manual/anomaly_testing, \ - /obj/item/book/manual/stasis, \ - /obj/item/book/manual/engineering_particle_accelerator, \ - /obj/item/book/manual/supermatter_engine, \ - /obj/item/book/manual/engineering_singularity_safety, \ - /obj/item/book/manual/medical_cloning, \ - /obj/item/book/manual/ripley_build_and_repair, \ - /obj/item/book/manual/research_and_development, \ - /obj/item/book/manual/robotics_cyborgs, \ - /obj/item/book/manual/medical_diagnostics_manual, \ - /obj/item/book/manual/chef_recipes, \ - /obj/item/book/manual/barman_recipes, \ - /obj/item/book/manual/detective, \ - /obj/item/book/manual/atmospipes, \ - /obj/item/book/manual/evaguide \ - ) +STOCK_ITEM_UNCOMMON(laserpoint, 0.75) + new /obj/item/device/laser_pointer(L) +STOCK_ITEM_UNCOMMON(manual, 2) + var/list/booklist = subtypesof(/obj/item/book/manual) + booklist -= /obj/item/book/manual/wiki //just this one. we want to keep the subtypes. + booklist -= /obj/item/book/manual/nuclear //yeah no + var/type = pick(booklist) new type(L) STOCK_ITEM_UNCOMMON(jammer, 2) new /obj/item/device/radiojammer(L) +STOCK_ITEM_UNCOMMON(seeds, 1) + for(var/i in 1 to rand(1, 3)) + var/obj/item/seeds/SP = pick(subtypesof(/obj/item/seeds)) + new SP(L) + STOCK_ITEM_UNCOMMON(rped, 2) new /obj/item/storage/part_replacer(L) STOCK_ITEM_UNCOMMON(briefcase, 2) - if (prob(20)) + if(prob(20)) new /obj/item/storage/secure/briefcase(L) else - new /obj/item/storage/briefcase(L) + var/obj/item/storage/briefcase/B = pick(typesof(/obj/item/storage/briefcase)) + new B(L) STOCK_ITEM_UNCOMMON(blade, 1.2) var/list/blades = list( @@ -296,7 +301,8 @@ STOCK_ITEM_UNCOMMON(blade, 1.2) /obj/item/material/hatchet/butch = 1, /obj/item/material/hatchet = 1.5, /obj/item/material/hatchet/unathiknife = 0.75, - /obj/item/material/knife/tacknife = 1 + /obj/item/material/knife/tacknife = 1, + /obj/item/material/knife/bayonet = 0.5 ) var/type = pickweight(blades) @@ -314,38 +320,75 @@ STOCK_ITEM_UNCOMMON(laserscalpel, 1.3) STOCK_ITEM_UNCOMMON(electropack, 1) new /obj/item/device/radio/electropack(L) - if (istype(L, /obj/structure/closet/crate) && prob(40)) + if(istype(L, /obj/structure/closet/crate) && prob(40)) var/obj/structure/closet/crate/cr = L cr.rigged = TRUE //Boobytrapped crate, will electrocute when you attempt to open it //Can be disarmed with wirecutters or ignored with insulated gloves -STOCK_ITEM_UNCOMMON(monkeyhide, 0.5) - new /obj/item/stack/material/animalhide/monkey(L, 50) - -STOCK_ITEM_UNCOMMON(cathide, 0.5) - new /obj/item/stack/material/animalhide/cat(L, 50) - -STOCK_ITEM_UNCOMMON(corgihide, 0.5) - new /obj/item/stack/material/animalhide/corgi(L, 50) - -STOCK_ITEM_UNCOMMON(lizardhide, 0.5) - new /obj/item/stack/material/animalhide/lizard(L, 50) +STOCK_ITEM_UNCOMMON(randomhide, 0.5) + var/obj/item/stack/material/animalhide/spawn_hide = pick(typesof(/obj/item/stack/material/animalhide)) + new spawn_hide(L, rand(5, 50)) STOCK_ITEM_UNCOMMON(hoodie, 0.5) new /obj/random/hoodie(L) +STOCK_ITEM_UNCOMMON(bang, 0.5) + var/obj/item/gun/bang/B = pick(subtypesof(/obj/item/gun/bang)) + new B(L) + STOCK_ITEM_UNCOMMON(cookingoil, 1) var/turf/T = get_turf(L) - if (!turf_clear(T)) - for (var/turf/U in range(T,1)) - if (turf_clear(U)) + if(!turf_clear(T)) + for(var/turf/U in range(T,1)) + if(turf_clear(U)) T = U break new /obj/structure/reagent_dispensers/cookingoil(T) STOCK_ITEM_UNCOMMON(coin, 1.3) new /obj/random/coin(L) + if(prob(20)) + new /obj/random/coin(L) + +STOCK_ITEM_UNCOMMON(plushie, 1) + new /obj/random/plushie(L) + +STOCK_ITEM_UNCOMMON(flag, 1) + new /obj/random/random_flag(L) + +STOCK_ITEM_UNCOMMON(apiary, 1) + new /obj/item/bee_pack(L) + if(prob(75)) + new /obj/item/bee_net(L) + if(prob(60)) + new /obj/item/bee_smoker(L) + if(prob(30)) + new /obj/item/honey_frame(L) + +STOCK_ITEM_UNCOMMON(wristbound, 0.5) + var/obj/item/modular_computer/wristbound/preset/P = pick(subtypesof(/obj/item/modular_computer/wristbound/preset)) + new P(L) + +STOCK_ITEM_UNCOMMON(pops, 0.5) + if(prob(85)) + new /obj/item/storage/box/snappops(L) + else + new /obj/item/storage/box/snappops/syndi(L) + +STOCK_ITEM_UNCOMMON(collectable_headwear, 0.5) + var/type = pick(subtypesof(/obj/item/clothing/head/collectable/)) + new type(L) + +STOCK_ITEM_UNCOMMON(alt_glasses, 1) + var/list/glasses = list(/obj/item/clothing/glasses/regular/circle, + /obj/item/clothing/glasses/regular/jamjar, + /obj/item/clothing/glasses/threedglasses, + /obj/item/clothing/glasses/regular/hipster, + /obj/item/clothing/glasses/regular/scanners) + for(var/i in 1 to rand(1, 2)) + var/type = pick(glasses) + new type(L) STOCK_ITEM_UNCOMMON(nothing, 0) // no-op \ No newline at end of file diff --git a/code/modules/cargo/random_stock/t3_rare.dm b/code/modules/cargo/random_stock/t3_rare.dm index b6d7cc323a9..def319bec2a 100644 --- a/code/modules/cargo/random_stock/t3_rare.dm +++ b/code/modules/cargo/random_stock/t3_rare.dm @@ -26,8 +26,10 @@ STOCK_ITEM_RARE(posibrain, 3) STOCK_ITEM_RARE(bsbeaker, 3) new /obj/item/reagent_containers/glass/beaker/bluespace(L) - if (prob(50)) + if(prob(50)) new /obj/item/reagent_containers/glass/beaker/bluespace(L) + else if(prob(40)) + new /obj/item/reagent_containers/glass/beaker/noreact(L) STOCK_ITEM_RARE(energyshield, 2) new /obj/item/shield/energy(L) @@ -89,7 +91,7 @@ STOCK_ITEM_RARE(exogear, 1.5) /obj/item/mecha_equipment/sleeper = 0.9 ) - for (var/i in 1 to rand(2,5)) + for(var/i in 1 to rand(1,3)) var/type = pickweight(equips) new type(L) @@ -99,16 +101,57 @@ STOCK_ITEM_RARE(teleporter, 1) STOCK_ITEM_RARE(voice, 1.5) new /obj/item/clothing/mask/gas/voice(L) -STOCK_ITEM_RARE(xenohide, 0.5) - new /obj/item/stack/material/animalhide/xeno(L, rand(2,15)) - -STOCK_ITEM_RARE(humanhide, 0.5) - new /obj/item/stack/material/animalhide/human(L, rand(2,15)) - -STOCK_ITEM_RARE(contraband, 0.8) - new /obj/random/contraband(L) - STOCK_ITEM_RARE(prebuilt_ka, 0.5) new /obj/random/prebuilt_ka(L) -STOCK_ITEM_RARE(nothing, 0) +STOCK_ITEM_RARE(ipctags, 0.5) + if(prob(50)) + new /obj/item/ipc_tag_scanner(L) + else + new /obj/item/implanter/ipc_tag(L) + +STOCK_ITEM_RARE(rfd, 0.5) + var/obj/item/rfd/rfd_spawn = pick(/obj/item/rfd/construction, /obj/item/rfd/mining, /obj/item/rfd/piping) + new rfd_spawn(L) + +STOCK_ITEM_RARE(xbow, 0.5) + if(prob(95)) + new /obj/item/toy/crossbow(L) + else + new /obj/item/gun/energy/crossbow(L) + +STOCK_ITEM_RARE(watertank, 1) + if(prob(25)) + new /obj/item/watertank/janitor(L) + else + new /obj/item/watertank(L) + +STOCK_ITEM_RARE(bmonster, 0.5) + var/obj/item/battle_monsters/wrapped/W = pick(subtypesof(/obj/item/battle_monsters/wrapped)) + new W(L) + if(prob(15)) + W = pick(subtypesof(/obj/item/battle_monsters/wrapped)) + new W(L) + +STOCK_ITEM_RARE(rare_clothing, 1) + var/list/clothing_picks = list( + /obj/item/clothing/under/elyra_holo, + /obj/item/clothing/suit/acapjacket, + /obj/item/clothing/head/acapcap, + /obj/item/clothing/suit/storage/toggle/himeo, + /obj/item/clothing/suit/storage/vysoka_f, + /obj/item/clothing/suit/storage/vysoka_m, + /obj/item/clothing/under/rank/iacjumpsuit, + /obj/item/clothing/under/rank/fatigues/marine, + /obj/item/clothing/under/rank/dress/subofficer, + /obj/item/clothing/under/dominia/lyodsuit/hoodie, + /obj/item/clothing/under/rank/head_of_security/corp, + /obj/item/clothing/shoes/sandal/clogs, + /obj/item/clothing/under/lance, + /obj/item/clothing/under/dress/lance_dress/male, + /obj/item/clothing/under/kilt) + for(var/i in 1 to rand(1, 2)) + var/obj/item/clothing/C = pick(clothing_picks) + new C(L) + +STOCK_ITEM_RARE(nothing, 0) \ No newline at end of file diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 74ae2b8cf33..726bd93416a 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -233,7 +233,7 @@ if (href_list["view_jobban"]) var/reason = jobban_isbanned(ckey, href_list["view_jobban"]) if (!reason) - to_chat(src, span("notice", "You do not appear jobbanned from this job. If you are still stopped from entering the role however, please adminhelp.")) + to_chat(src, SPAN_NOTICE("You do not appear jobbanned from this job. If you are still stopped from entering the role however, please adminhelp.")) return var/data = "
" diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm index 3b0c93a4a11..35476044d55 100644 --- a/code/modules/client/preference_setup/general/01_basic.dm +++ b/code/modules/client/preference_setup/general/01_basic.dm @@ -129,7 +129,7 @@ pref.spawnpoint = sanitize_inlist(pref.spawnpoint, SSatlas.spawn_locations, initial(pref.spawnpoint)) pref.machine_tag_status = text2num(pref.machine_tag_status) // SQL queries return as text, so make this a num -/datum/category_item/player_setup_item/general/basic/content() +/datum/category_item/player_setup_item/general/basic/content(var/mob/user) var/list/dat = list("Name: ") if (pref.can_edit_name) dat += "[pref.real_name]
" @@ -196,8 +196,7 @@ var/datum/category_item/player_setup_item/general/equipment/equipment_item = category.items[4] equipment_item.sanitize_character() // sanitize equipment - pref.update_preview_icon() - return TOPIC_REFRESH + return TOPIC_UPDATE_PREVIEW else if(href_list["age"]) var/new_age = input(user, "Choose your character's age:\n([pref.getMinAge()]-[pref.getMaxAge()])", "Character Preference", pref.age) as num|null diff --git a/code/modules/client/preference_setup/general/02_language.dm b/code/modules/client/preference_setup/general/02_language.dm index 4fd0338b1b3..b922a12b460 100644 --- a/code/modules/client/preference_setup/general/02_language.dm +++ b/code/modules/client/preference_setup/general/02_language.dm @@ -74,7 +74,7 @@ var/datum/category_group/player_setup_category/cat = category cat.modified = TRUE -/datum/category_item/player_setup_item/general/language/content() +/datum/category_item/player_setup_item/general/language/content(var/mob/user) var/list/dat = list("Languages
") var/datum/species/S = all_species[pref.species] if(S.language) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 26181b9d014..102d6c64a0a 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -25,7 +25,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O S["organ_data"] >> pref.organ_data S["rlimb_data"] >> pref.rlimb_data S["body_markings"] >> pref.body_markings - pref.preview_icon = null /datum/category_item/player_setup_item/general/body/save_character(var/savefile/S) S["hair_red"] << pref.r_hair @@ -48,6 +47,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O S["organ_data"] << pref.organ_data S["rlimb_data"] << pref.rlimb_data S["body_markings"] << pref.body_markings + S["bgstate"] << pref.bgstate /datum/category_item/player_setup_item/general/body/gather_load_query() return list( @@ -64,7 +64,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O "disabilities", "organs_data" = "organ_data", "organs_robotic" = "rlimb_data", - "body_markings" + "body_markings", + "bgstate" ), "args" = list("id") ) @@ -88,6 +89,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O "organs_data", "organs_robotic", "body_markings", + "bgstate", "id" = 1, "ckey" = 1 ) @@ -108,6 +110,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O "organs_robotic"= list2params(pref.rlimb_data), "body_markings" = json_encode(pref.body_markings), "id" = pref.current_character, + "bgstate" = pref.bgstate, "ckey" = pref.client.ckey ) @@ -180,12 +183,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if (!pref.disabilities || !islist(pref.disabilities)) pref.disabilities = list() + if(!pref.bgstate || !(pref.bgstate in pref.bgstate_options)) + pref.bgstate = "000" + /datum/category_item/player_setup_item/general/body/content(var/mob/user) var/list/out = list() - pref.update_preview_icon() - if(!pref.preview_icon) - pref.update_preview_icon() - to_chat(user, browse_rsc(pref.preview_icon, "previewicon.png")) var/datum/species/mob_species = all_species[pref.species] out += "
| Body "
@@ -193,6 +195,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
out += " " out += "Species: [pref.species] " out += "Blood Type: [pref.b_type] " + out += "Cycle background " if(has_flag(mob_species, HAS_SKIN_TONE)) out += "Skin Tone: [-pref.s_tone + 35]/220 " out += "Disabilities: Adjust " @@ -280,13 +283,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O out += "\[...\] " else out += " " - - out += " | Preview " - out += "  [pref.dress_mob ? "Hide equipment" : "Show equipment"]" - out += " |
" + + out += "Hair
" if(has_flag(mob_species, HAS_HAIR_COLOR)) out += "Change Color [HTML_RECT(rgb(pref.r_hair, pref.g_hair, pref.b_hair))] " out += " Style: [pref.h_style]
" @@ -326,7 +324,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(href_list["random"]) pref.randomize_appearance_for() - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["blood_type"]) var/new_b_type = input(user, "Choose your character's blood-type:", "Character Preference") as null|anything in valid_bloodtypes @@ -405,7 +403,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.rlimb_data.Cut() pref.body_markings.Cut() - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["hair_color"]) if(!has_flag(mob_species, HAS_HAIR_COLOR)) @@ -415,7 +413,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.r_hair = GetRedPart(new_hair) pref.g_hair = GetGreenPart(new_hair) pref.b_hair = GetBluePart(new_hair) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["hair_style"]) if(mob_species.bald) @@ -432,7 +430,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/new_h_style = input(user, "Choose your character's hair style:", "Character Preference", pref.h_style) as null|anything in valid_hairstyles if(new_h_style && CanUseTopic(user)) pref.h_style = new_h_style - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["facial_color"]) if(!has_flag(mob_species, HAS_HAIR_COLOR)) @@ -442,7 +440,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.r_facial = GetRedPart(new_facial) pref.g_facial = GetGreenPart(new_facial) pref.b_facial = GetBluePart(new_facial) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["eye_color"]) if(!has_flag(mob_species, HAS_EYE_COLOR)) @@ -452,7 +450,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.r_eyes = GetRedPart(new_eyes) pref.g_eyes = GetGreenPart(new_eyes) pref.b_eyes = GetBluePart(new_eyes) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["skin_tone"]) if(!has_flag(mob_species, HAS_SKIN_TONE)) @@ -460,7 +458,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/new_s_tone = input(user, "Choose your character's skin-tone:\n(Light 30 - 220 Dark)", "Character Preference", (-pref.s_tone) + 35) as num|null if(new_s_tone && has_flag(mob_species, HAS_SKIN_TONE) && CanUseTopic(user)) pref.s_tone = 35 - max(min( round(new_s_tone), 220),30) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["skin_color"]) if(!has_flag(mob_species, HAS_SKIN_COLOR) && !has_flag(mob_species, HAS_SKIN_PRESET)) @@ -471,7 +469,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.r_skin = GetRedPart(new_skin) pref.g_skin = GetGreenPart(new_skin) pref.b_skin = GetBluePart(new_skin) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(has_flag(mob_species, HAS_SKIN_PRESET)) var/new_preset = input(user, "Choose your character's body color preset:", "Character Preference", rgb(pref.r_skin, pref.g_skin, pref.b_skin)) as null|anything in mob_species.character_color_presets @@ -479,7 +477,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.r_skin = GetRedPart(new_preset) pref.g_skin = GetGreenPart(new_preset) pref.b_skin = GetBluePart(new_preset) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["facial_style"]) if(mob_species.bald) @@ -500,7 +498,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/new_f_style = input(user, "Choose your character's facial-hair style:", "Character Preference", pref.f_style) as null|anything in valid_facialhairstyles if(new_f_style && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user)) pref.f_style = new_f_style - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["marking_style"]) var/list/usable_markings = pref.body_markings ^ body_marking_styles_list @@ -520,19 +518,19 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/new_marking = input(user, "Choose a body marking:", "Character Preference") as null|anything in usable_markings if(new_marking && CanUseTopic(user)) pref.body_markings[new_marking] = "#000000" //New markings start black - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["marking_remove"]) var/M = href_list["marking_remove"] pref.body_markings -= M - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["marking_color"]) var/M = href_list["marking_color"] var/mark_color = input(user, "Choose the [M] color: ", "Character Preference", pref.body_markings[M]) as color|null if(mark_color && CanUseTopic(user)) pref.body_markings[M] = "[mark_color]" - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["limbs"]) var/list/acceptable_organ_input = list("Left Leg","Right Leg","Left Arm","Right Arm","Left Foot","Right Foot","Left Hand","Right Hand") @@ -585,7 +583,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(carries_organs) available_states = list("Normal","Prosthesis") var/new_state = input(user, "What state do you wish the limb to be in?") as null|anything in available_states - if(!new_state && !CanUseTopic(user)) return TOPIC_NOACTION + if(!new_state && !CanUseTopic(user)) + return TOPIC_NOACTION switch(new_state) if("Normal") @@ -621,7 +620,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.organ_data[second_limb] = "cyborg" if(third_limb && pref.organ_data[third_limb] == "amputated") pref.organ_data[third_limb] = null - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["organs"]) var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes", "Lungs", "Liver", "Kidneys") @@ -650,13 +649,13 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.organ_data[organ] = "assisted" if("Mechanical") pref.organ_data[organ] = "mechanical" - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["reset_organs"]) pref.organ_data.Cut() pref.rlimb_data.Cut() - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["trait_add"]) var/list/available_disabilities = pref.disabilities ^ chargen_disabilities_list @@ -664,16 +663,16 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/new_trait = input(user, "Choose a disability:", "Character Preference") as null|anything in available_disabilities if(new_trait && CanUseTopic(user)) pref.disabilities += new_trait - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["trait_remove"]) var/M = href_list["trait_remove"] pref.disabilities -= M - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW - else if(href_list["toggle_clothing"]) - pref.dress_mob = !pref.dress_mob - return TOPIC_REFRESH + else if(href_list["cycle_bg"]) + pref.bgstate = next_in_list(pref.bgstate, pref.bgstate_options) + return TOPIC_REFRESH_UPDATE_PREVIEW return ..() diff --git a/code/modules/client/preference_setup/general/04_equipment.dm b/code/modules/client/preference_setup/general/04_equipment.dm index cecd8e97f5c..88affbc0920 100644 --- a/code/modules/client/preference_setup/general/04_equipment.dm +++ b/code/modules/client/preference_setup/general/04_equipment.dm @@ -103,7 +103,7 @@ pref.backbag = sanitize_integer(pref.backbag, 1, backbaglist.len, initial(pref.backbag)) pref.backbag_style = sanitize_integer(pref.backbag_style, 1, backbagstyles.len, initial(pref.backbag_style)) -/datum/category_item/player_setup_item/general/equipment/content() +/datum/category_item/player_setup_item/general/equipment/content(var/mob/user) . = list() . += "Equipment:
" for(var/datum/category_group/underwear/UWC in global_underwear.categories) @@ -143,13 +143,13 @@ var/new_backbag = input(user, "Choose your character's bag type:", "Character Preference", backbaglist[pref.backbag]) as null|anything in backbaglist if(!isnull(new_backbag) && CanUseTopic(user)) pref.backbag = backbaglist.Find(new_backbag) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["change_backpack_style"]) var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference", backbagstyles[pref.backbag_style]) as null|anything in backbagstyles if(!isnull(new_backbag) && CanUseTopic(user)) pref.backbag_style = backbagstyles.Find(new_backbag) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["change_underwear"]) var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[href_list["change_underwear"]] @@ -158,7 +158,7 @@ var/datum/category_item/underwear/selected_underwear = input(user, "Choose underwear:", "Character Preference", pref.all_underwear[UWC.name]) as null|anything in UWC.items if(selected_underwear && CanUseTopic(user)) pref.all_underwear[UWC.name] = selected_underwear.name - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["underwear"] && href_list["tweak"]) var/underwear = href_list["underwear"] if(!(underwear in pref.all_underwear)) @@ -169,7 +169,7 @@ var/new_metadata = gt.get_metadata(usr, get_metadata(underwear, gt)) if(new_metadata) set_metadata(underwear, gt, new_metadata) - return TOPIC_REFRESH + return TOPIC_REFRESH_UPDATE_PREVIEW return ..() diff --git a/code/modules/client/preference_setup/general/05_background.dm b/code/modules/client/preference_setup/general/05_background.dm index 69bd4d5a111..d7d2ebbed52 100644 --- a/code/modules/client/preference_setup/general/05_background.dm +++ b/code/modules/client/preference_setup/general/05_background.dm @@ -8,6 +8,7 @@ S["gen_record"] >> pref.gen_record S["citizenship"] >> pref.citizenship S["religion"] >> pref.religion + S["accent"] >> pref.accent S["nanotrasen_relation"] >> pref.nanotrasen_relation /datum/category_item/player_setup_item/general/background/save_character(var/savefile/S) @@ -16,6 +17,7 @@ S["gen_record"] << pref.gen_record S["citizenship"] << pref.citizenship S["religion"] << pref.religion + S["accent"] << pref.accent S["nanotrasen_relation"] << pref.nanotrasen_relation /datum/category_item/player_setup_item/general/background/gather_load_query() @@ -33,7 +35,8 @@ "vars" = list( "nt_relation" = "nanotrasen_relation", "citizenship", - "religion" + "religion", + "accent" ), "args" = list("id") ) @@ -56,7 +59,9 @@ "ss13_characters" = list( "nt_relation", "citizenship", - "religion","id" = 1, + "religion", + "accent", + "id" = 1, "ckey" = 1 ) ) @@ -70,6 +75,7 @@ "nt_relation" = pref.nanotrasen_relation, "citizenship" = pref.citizenship, "religion" = pref.religion, + "accent" = pref.accent, "id" = pref.current_character, "ckey" = PREF_CLIENT_CKEY ) @@ -87,6 +93,9 @@ if(!(pref.religion in S.allowed_religions)) pref.religion = RELIGION_NONE + if(!(pref.accent in S.allowed_accents)) + pref.accent = S.default_accent + pref.nanotrasen_relation = sanitize_inlist(pref.nanotrasen_relation, COMPANY_ALIGNMENTS, initial(pref.nanotrasen_relation)) /datum/category_item/player_setup_item/general/background/content(var/mob/user) @@ -95,6 +104,7 @@ "[current_map.company_name] Relation: [pref.nanotrasen_relation]
", "Citizenship: [pref.citizenship]
", "Religion: [pref.religion]
", + "Accent: [pref.accent]
", "
Records:
" ) @@ -142,6 +152,18 @@ sanitize_character() return TOPIC_REFRESH + else if(href_list["accent"]) + var/choice = input(user, "Please choose an accent.", "Character Preference", pref.accent) as null|anything in S.allowed_accents + if(!choice || !CanUseTopic(user)) + return TOPIC_NOACTION + show_accent_menu(user, choice) + return TOPIC_REFRESH + + else if(href_list["set_accent"]) + pref.accent = (html_decode(href_list["set_accent"])) + sanitize_character() + return TOPIC_REFRESH + else if(href_list["set_medical_records"]) var/new_medical = sanitize(input(user,"Enter medical information here.","Character Preference", html_decode(pref.med_record)) as message|null, MAX_PAPER_MESSAGE_LEN, extra = 0) if(!isnull(new_medical) && !jobban_isbanned(user, "Records") && CanUseTopic(user)) @@ -194,4 +216,14 @@ var/list/dat = list("
[religion.description]" dat += "
[accent.description]" + dat += "
", "Current skill level: [pref.GetSkillClass(pref.used_skillpoints)] ([pref.used_skillpoints])
", diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3b4be6fc0ab..853f1e937f8 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -80,10 +80,16 @@ datum/preferences var/citizenship = "None" //Current home system. var/faction = "None" //Antag faction/general associated faction. var/religion = "None" //Religious association. + var/accent = "None" //Character accent. - //Mob preview - var/icon/preview_icon = null - var/is_updating_icon = 0 + var/list/char_render_holders //Should only be a key-value list of north/south/east/west = obj/screen. + var/static/list/preview_screen_locs = list( + "1" = "character_preview_map:1,5:-12", + "2" = "character_preview_map:1,3:15", + "4" = "character_preview_map:1:7,2:10", + "8" = "character_preview_map:1:-7,1:5", + "BG" = "character_preview_map:1,1 to 1,5" + ) //Jobs, uses bitflags var/job_civilian_high = 0 @@ -151,9 +157,8 @@ datum/preferences var/savefile/loaded_character var/datum/category_collection/player_setup_collection/player_setup - var/dress_mob = TRUE - - + var/bgstate = "000" + var/list/bgstate_options = list("000", "FFF", "steel", "white", "plating", "reinforced") /datum/preferences/New(client/C) new_setup() @@ -165,6 +170,10 @@ datum/preferences load_preferences() load_and_update_character() +/datum/preferences/Destroy() + . = ..() + QDEL_NULL_LIST(char_render_holders) + /datum/preferences/proc/load_and_update_character(var/slot) load_character(slot) if(update_setup(loaded_preferences, loaded_character)) @@ -245,17 +254,64 @@ datum/preferences else dat += "Please create an account to save your preferences." + if(!char_render_holders) + update_preview_icon() + show_character_previews() + dat += "
" dat += player_setup.header() dat += "
You were relaxing comfortably in your cryo pod as tragedy struck - the pilot of your luxury yacht fell asleep under some mysterious circumstances. You were unceremoniously stuffed into an escape pod, and left to wander in space. What a despicable, low-quality plot to get rid of you. Should've chosen murder instead - you certainly know you'll convince someone nice to lend you a shuttle." + welcome_message = "You are a stranded star!
You were relaxing comfortably in your cryo pod as tragedy struck - the pilot of your luxury yacht fell asleep under some mysterious circumstances. You were unceremoniously stuffed into an escape pod, and left to wander in space. What a despicable, low-quality plot to get rid of you. Should've chosen murder instead - you certainly know you'll convince someone nice to lend you a shuttle." outfit = /datum/outfit/admin/pod/star - possible_genders = list(FEMALE) possible_species = list("Human","Skrell") else if(t == "priest") welcome_message = "You are a stranded Trinary Perfection priest!
You were traveling around space on your small shuttle, preaching peacefully of the future divinity of the synthetics, and the grand purpose of mankind as the ones to help them achieve that goal. Unfortunately, Dominians don't seem to be as peaceful in disagreeing with your views - and had to evacuate your shot-down ship. Have your prayers to the Divines helped you now?" @@ -95,8 +93,8 @@ /datum/outfit/admin/pod/star name = "RescuePod - Star" - uniform = "dress selection" - shoes = "flats selection" + uniform = "suit selection" + shoes = "oxford shoe selection" backpack_contents = list( /obj/item/lipstick/random = 2, diff --git a/code/modules/ghostroles/spawner/human/golem.dm b/code/modules/ghostroles/spawner/human/golem.dm index e1f484a2320..27392681c81 100644 --- a/code/modules/ghostroles/spawner/human/golem.dm +++ b/code/modules/ghostroles/spawner/human/golem.dm @@ -15,7 +15,7 @@ //The proc to actually spawn in the user /datum/ghostspawner/human/golem/spawn_mob(mob/user) if(!length(spawn_atoms)) - to_chat(user, span("danger", "There are no available golem runes to spawn at!")) + to_chat(user, SPAN_DANGER("There are no available golem runes to spawn at!")) return FALSE var/obj/effect/golemrune/rune = pick(spawn_atoms) diff --git a/code/modules/ghostroles/spawner/human/human.dm b/code/modules/ghostroles/spawner/human/human.dm index 7be4bdc5e3c..3fd6bab066b 100644 --- a/code/modules/ghostroles/spawner/human/human.dm +++ b/code/modules/ghostroles/spawner/human/human.dm @@ -14,7 +14,6 @@ var/list/species_outfits = list() //Outfit overwrite for the species var/uses_species_whitelist = TRUE //Do you need the whitelist to play the species? var/possible_species = list("Human") - var/possible_genders = list(MALE,FEMALE) var/allow_appearance_change = APPEARANCE_PLASTICSURGERY var/list/extra_languages = list() //Which languages are added to this mob @@ -74,7 +73,9 @@ //Spawn in the mob var/mob/living/carbon/human/M = new spawn_mob(null) - M.change_gender(pick(possible_genders)) + var/datum/species/S = all_species[picked_species] + M.change_gender(pick(S.default_genders)) + M.set_species(picked_species) //Prepare the mob diff --git a/code/modules/ghostroles/spawner/human/kataphract.dm b/code/modules/ghostroles/spawner/human/kataphract.dm index f31a9fc3822..b95bf124ebd 100644 --- a/code/modules/ghostroles/spawner/human/kataphract.dm +++ b/code/modules/ghostroles/spawner/human/kataphract.dm @@ -15,7 +15,6 @@ outfit = /datum/outfit/admin/kataphract possible_species = list("Unathi") - possible_genders = list(MALE, FEMALE) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Kataphract-Hopeful" diff --git a/code/modules/ghostroles/spawner/human/merchant.dm b/code/modules/ghostroles/spawner/human/merchant.dm index 02dc8f3ca6c..799f1dd653c 100644 --- a/code/modules/ghostroles/spawner/human/merchant.dm +++ b/code/modules/ghostroles/spawner/human/merchant.dm @@ -12,7 +12,6 @@ //Vars related to human mobs outfit = /datum/outfit/merchant_assistant possible_species = list("Human", "Off-Worlder Human", "Tajara", "Tajara", "M'sai Tajara", "Zhan-Khazan Tajara", "Skrell", "Unathi", "Vaurca Warrior", "Vaurca Worker", "Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame", "Diona") - possible_genders = list(MALE,FEMALE) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Merchants Assistant" diff --git a/code/modules/ghostroles/spawner/human/pra.dm b/code/modules/ghostroles/spawner/human/pra.dm index 38f56f55345..944531cf1b0 100644 --- a/code/modules/ghostroles/spawner/human/pra.dm +++ b/code/modules/ghostroles/spawner/human/pra.dm @@ -12,7 +12,6 @@ outfit = /datum/outfit/admin/pra_cosmonaut possible_species = list("Tajara", "M'sai Tajara", "Zhan-Khazan Tajara") - possible_genders = list(MALE,FEMALE) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Kosmostrelki" diff --git a/code/modules/ghostroles/spawner/human/responseteams/response_team.dm b/code/modules/ghostroles/spawner/human/responseteams/response_team.dm index 48f70a7b333..2d47567a588 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/response_team.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/response_team.dm @@ -9,7 +9,6 @@ //Vars related to human mobs possible_species = list("Human", "Skrell", "Tajara", "M'sai Tajara", "Unathi", "Baseline Frame") - possible_genders = list(MALE,FEMALE) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Emergency Responder" diff --git a/code/modules/ghostroles/spawner/human/visitor.dm b/code/modules/ghostroles/spawner/human/visitor.dm index 3e4c83b880c..853b7968b21 100644 --- a/code/modules/ghostroles/spawner/human/visitor.dm +++ b/code/modules/ghostroles/spawner/human/visitor.dm @@ -12,7 +12,6 @@ //Vars related to human mobs outfit = /datum/outfit/admin/random/visitor possible_species = list("Human", "Skrell", "Tajara", "Unathi") - possible_genders = list(MALE, FEMALE) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Visitor" diff --git a/code/modules/ghostroles/spawner/human/zenghu.dm b/code/modules/ghostroles/spawner/human/zenghu.dm index f142bb6e963..b20e326b040 100644 --- a/code/modules/ghostroles/spawner/human/zenghu.dm +++ b/code/modules/ghostroles/spawner/human/zenghu.dm @@ -13,7 +13,6 @@ outfit = /datum/outfit/admin/zenghu_survivor possible_species = list("Human", "Off-Worlder Human", "Skrell", "Vaurca Worker", "Vaurca Warrior", "Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") - possible_genders = list(MALE,FEMALE) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Zeng-Hu Survivor" diff --git a/code/modules/ghostroles/spawnpoint/spawnpoint.dm b/code/modules/ghostroles/spawnpoint/spawnpoint.dm index 7db2a3c6544..ad5953568b2 100644 --- a/code/modules/ghostroles/spawnpoint/spawnpoint.dm +++ b/code/modules/ghostroles/spawnpoint/spawnpoint.dm @@ -148,5 +148,5 @@ ..() if(use_message && !message_used) message_used = TRUE - visible_message(span("notice",use_message)) + visible_message(SPAN_NOTICE(use_message)) playsound(src.loc, 'sound/machines/chime.ogg', 25, 1) \ No newline at end of file diff --git a/code/modules/hallucinations/types/basic.dm b/code/modules/hallucinations/types/basic.dm index 7ff43838122..77e14bccfc6 100644 --- a/code/modules/hallucinations/types/basic.dm +++ b/code/modules/hallucinations/types/basic.dm @@ -139,7 +139,7 @@ return TRUE /datum/hallucination/prick/start() - to_chat(holder,SPAN_NOTICE("You feel a tiny prick!")) + to_chat(holder, SPAN_NOTICE("You feel a tiny prick!")) /datum/hallucination/prick/end() //chance to feel another effect after duration time switch(rand(1,6)) @@ -148,7 +148,7 @@ if(2) holder.make_dizzy(105) if(3) - to_chat(holder,SPAN_GOOD("You feel good.")) + to_chat(holder, SPAN_GOOD("You feel good.")) ..() //the prick feeling but you actually imagine someone injecting you @@ -169,7 +169,7 @@ to_chat(holder, SPAN_WARNING("\The [injector] is trying to inject \the [holder] with \the [needle]!")) /datum/hallucination/prick/by_person/end() - to_chat(holder,SPAN_NOTICE("\The [injector] injects \the [holder] with \the [needle]!")) + to_chat(holder, SPAN_NOTICE("\The [injector] injects \the [holder] with \the [needle]!")) ..() @@ -181,9 +181,9 @@ if(ishuman(holder)) var/mob/living/carbon/human/H = holder var/obj/O = pick(H.organs) - to_chat(holder,SPAN_DANGER("You feel something [pick("moving","squirming","skittering", "writhing", "burrowing", "crawling")] inside of your [O.name]!")) + to_chat(holder, SPAN_DANGER("You feel something [pick("moving","squirming","skittering", "writhing", "burrowing", "crawling")] inside of your [O.name]!")) else - to_chat(holder,SPAN_DANGER("You feel something [pick("moving","squirming","skittering", "writhing", "burrowing", "crawling")] inside of you!")) + to_chat(holder, SPAN_DANGER("You feel something [pick("moving","squirming","skittering", "writhing", "burrowing", "crawling")] inside of you!")) if(prob(min(holder.hallucination/2, 80))) sound_to(holder, pick('sound/misc/zapsplat/chitter1.ogg', 'sound/misc/zapsplat/chitter2.ogg', 'sound/effects/squelch1.ogg', 'sound/effects/lingextends.ogg')) @@ -208,7 +208,7 @@ holder.adjustHalLoss(min(holder.hallucination / 3, 25)) //always cause fake pain switch(pain_type) if(1) - to_chat(holder,SPAN_DANGER("You feel a sharp pain in your head!")) + to_chat(holder, SPAN_DANGER("You feel a sharp pain in your head!")) if(2) switch(holder.hallucination) if(1 to 15) diff --git a/code/modules/heavy_vehicle/components/_components.dm b/code/modules/heavy_vehicle/components/_components.dm index 428d8c547c4..c047330a122 100644 --- a/code/modules/heavy_vehicle/components/_components.dm +++ b/code/modules/heavy_vehicle/components/_components.dm @@ -44,6 +44,10 @@ /obj/item/mech_component/proc/show_missing_parts(var/mob/user) return +/obj/item/mech_component/proc/return_diagnostics(var/mob/user) + to_chat(user, SPAN_NOTICE("[capitalize_first_letters(src.name)]:")) + to_chat(user, SPAN_NOTICE(" - Integrity: [round(((max_damage - total_damage) / max_damage)) * 100]%" )) + /obj/item/mech_component/proc/prebuild() return diff --git a/code/modules/heavy_vehicle/components/arms.dm b/code/modules/heavy_vehicle/components/arms.dm index 0fe5c2f0e57..a8eac4e9756 100644 --- a/code/modules/heavy_vehicle/components/arms.dm +++ b/code/modules/heavy_vehicle/components/arms.dm @@ -20,6 +20,13 @@ if(!motivator) to_chat(user, "It is missing an actuator.") +/obj/item/mech_component/manipulators/return_diagnostics(mob/user) + ..() + if(motivator) + to_chat(user, SPAN_NOTICE(" Actuator Integrity: [round(((motivator.max_dam - motivator.total_dam) / motivator.max_dam)) * 100]%")) + else + to_chat(user, SPAN_WARNING(" Actuator Missing or Non-functional.")) + /obj/item/mech_component/manipulators/ready_to_install() return motivator diff --git a/code/modules/heavy_vehicle/components/body.dm b/code/modules/heavy_vehicle/components/body.dm index 41422349bc1..229b8e130ae 100644 --- a/code/modules/heavy_vehicle/components/body.dm +++ b/code/modules/heavy_vehicle/components/body.dm @@ -54,6 +54,17 @@ if(!mech_armor) to_chat(user, "It is missing armor plating.") +/obj/item/mech_component/chassis/return_diagnostics(mob/user) + ..() + if(diagnostics) + to_chat(user, SPAN_NOTICE(" Diagnostics Unit Integrity: [round(((diagnostics.max_dam - diagnostics.total_dam) / diagnostics.max_dam)) * 100]%")) + else + to_chat(user, SPAN_WARNING(" Diagnostics Unit Missing or Non-functional.")) + if(mech_armor) + to_chat(user, SPAN_NOTICE(" Armor Integrity: [round(((mech_armor.max_dam - mech_armor.total_dam) / mech_armor.max_dam)) * 100]%")) + else + to_chat(user, SPAN_WARNING(" Armor Missing or Non-functional.")) + /obj/item/mech_component/chassis/Initialize() . = ..() cockpit = new(20) diff --git a/code/modules/heavy_vehicle/components/head.dm b/code/modules/heavy_vehicle/components/head.dm index 5961b96add6..6cdcb81e42c 100644 --- a/code/modules/heavy_vehicle/components/head.dm +++ b/code/modules/heavy_vehicle/components/head.dm @@ -28,6 +28,18 @@ if(!software) to_chat(user, "It is missing a software control module.") +/obj/item/mech_component/sensors/return_diagnostics(mob/user) + ..() + if(software) + to_chat(user, SPAN_NOTICE(" Installed Software")) + for(var/exosystem_software in software.installed_software) + to_chat(user, SPAN_NOTICE(" - [capitalize_first_letters(exosystem_software)]")) + else + to_chat(user, SPAN_WARNING(" Control Module Missing or Non-functional.")) + if(radio) + to_chat(user, SPAN_NOTICE(" Radio Integrity: [round(((radio.max_dam - radio.total_dam) / radio.max_dam)) * 100]%")) + else + to_chat(user, SPAN_WARNING(" Radio Missing or Non-functional.")) /obj/item/mech_component/sensors/prebuild() radio = new(src) diff --git a/code/modules/heavy_vehicle/components/legs.dm b/code/modules/heavy_vehicle/components/legs.dm index 1ff33980fa8..7c1eb57071a 100644 --- a/code/modules/heavy_vehicle/components/legs.dm +++ b/code/modules/heavy_vehicle/components/legs.dm @@ -19,6 +19,13 @@ if(!motivator) to_chat(user, "It is missing a motivator.") +/obj/item/mech_component/propulsion/return_diagnostics(mob/user) + ..() + if(motivator) + to_chat(user, SPAN_NOTICE(" Actuator Integrity: [round(((motivator.max_dam - motivator.total_dam) / motivator.max_dam)) * 100]%")) + else + to_chat(user, SPAN_WARNING(" Actuator Missing or Non-functional.")) + /obj/item/mech_component/propulsion/ready_to_install() return motivator diff --git a/code/modules/heavy_vehicle/components/software.dm b/code/modules/heavy_vehicle/components/software.dm index 72a5e384f8e..c0b6fb7b418 100644 --- a/code/modules/heavy_vehicle/components/software.dm +++ b/code/modules/heavy_vehicle/components/software.dm @@ -1,4 +1,4 @@ -#define T_BOARD_MECHA(name) "vehicle software (" + (name) + ")" +#define T_BOARD_MECHA(name) "" + "vehicle software " + "(" + (name) + ")" /obj/item/circuitboard/exosystem name = "vehicle software template" diff --git a/code/modules/heavy_vehicle/equipment/_equipment.dm b/code/modules/heavy_vehicle/equipment/_equipment.dm index b7fd468a802..332554369d4 100644 --- a/code/modules/heavy_vehicle/equipment/_equipment.dm +++ b/code/modules/heavy_vehicle/equipment/_equipment.dm @@ -88,6 +88,10 @@ if(!icon_state) icon = holding.icon icon_state = holding.icon_state + if(istype(holding, /obj/item/gun)) + var/obj/item/gun/G = holding + G.has_safety = FALSE + G.safety_state = FALSE desc = "[holding.desc] This one is suitable for installation on an exosuit." /obj/item/mecha_equipment/mounted_system/Destroy() diff --git a/code/modules/heavy_vehicle/equipment/engineering.dm b/code/modules/heavy_vehicle/equipment/engineering.dm index 4884c27e441..6ee4c4bc6d3 100644 --- a/code/modules/heavy_vehicle/equipment/engineering.dm +++ b/code/modules/heavy_vehicle/equipment/engineering.dm @@ -31,7 +31,7 @@ /obj/item/extinguisher/mech/New() reagents = new/datum/reagents(max_water) reagents.my_atom = src - reagents.add_reagent("monoammoniumphosphate", max_water) + reagents.add_reagent(/datum/reagent/toxin/fertilizer/monoammoniumphosphate, max_water) ..() /obj/item/extinguisher/mech/get_hardpoint_maptext() diff --git a/code/modules/heavy_vehicle/equipment/medical.dm b/code/modules/heavy_vehicle/equipment/medical.dm index 1faeee53609..b38acfa8158 100644 --- a/code/modules/heavy_vehicle/equipment/medical.dm +++ b/code/modules/heavy_vehicle/equipment/medical.dm @@ -121,9 +121,6 @@ var/mob/living/carbon/Target = null var/datum/beam/MyBeam = null -/obj/item/mecha_equipment/crisis_drone/Initialize() - ..() - /obj/item/mecha_equipment/crisis_drone/Destroy() STOP_PROCESSING(SSprocessing, src) . = ..() @@ -274,5 +271,4 @@ /obj/item/device/healthanalyzer/mech/attack(mob/living/M, var/mob/living/heavy_vehicle/user) for(var/mob/pilot in user.pilots) - health_scan_mob(M, pilot, FALSE) - return + health_scan_mob(M, pilot, TRUE, TRUE) \ No newline at end of file diff --git a/code/modules/heavy_vehicle/equipment/utility.dm b/code/modules/heavy_vehicle/equipment/utility.dm index fd8f3331824..31995b6f19d 100644 --- a/code/modules/heavy_vehicle/equipment/utility.dm +++ b/code/modules/heavy_vehicle/equipment/utility.dm @@ -258,7 +258,7 @@ if(percentage > 95) descriptor = "shows no wear" - to_chat(user, span("notice", "It [descriptor].")) + to_chat(user, SPAN_NOTICE("It [descriptor].")) /obj/item/mecha_equipment/drill name = "drill" @@ -437,9 +437,9 @@ /obj/item/mecha_equipment/sleeper/passenger_compartment/attack_self(var/mob/user) if(!sleeper.occupant) - to_chat(user, span("warning", "There's no one to eject!")) + to_chat(user, SPAN_WARNING("There's no one to eject!")) else - visible_message(span("notice", "\The [src] ejects [sleeper.occupant.name].")) + visible_message(SPAN_NOTICE("\The [src] ejects [sleeper.occupant.name].")) sleeper.go_out() icon_state = "mecha_passenger_open" update_icon() diff --git a/code/modules/heavy_vehicle/interface/_interface.dm b/code/modules/heavy_vehicle/interface/_interface.dm index d868c9e5cc2..b9b4a23f673 100644 --- a/code/modules/heavy_vehicle/interface/_interface.dm +++ b/code/modules/heavy_vehicle/interface/_interface.dm @@ -14,42 +14,44 @@ if(!LAZYLEN(hud_elements)) var/i = 1 for(var/hardpoint in hardpoints) - var/obj/screen/movable/mecha/hardpoint/H = new(src, hardpoint) + var/obj/screen/mecha/hardpoint/H = new(src, hardpoint) H.screen_loc = "1:6,[15-i]" //temp hud_elements |= H hardpoint_hud_elements[hardpoint] = H i++ var/list/additional_hud_elements = list( - /obj/screen/movable/mecha/toggle/maint, - /obj/screen/movable/mecha/eject, - /obj/screen/movable/mecha/toggle/hardpoint, - /obj/screen/movable/mecha/toggle/hatch, - /obj/screen/movable/mecha/toggle/hatch_open, - /obj/screen/movable/mecha/radio, - /obj/screen/movable/mecha/toggle/camera, - /obj/screen/movable/mecha/rename + /obj/screen/mecha/toggle/maint, + /obj/screen/mecha/eject, + /obj/screen/mecha/toggle/hardpoint, + /obj/screen/mecha/toggle/hatch, + /obj/screen/mecha/toggle/hatch_open, + /obj/screen/mecha/radio, + /obj/screen/mecha/toggle/sensor, + /obj/screen/mecha/rename ) if(body && body.pilot_coverage >= 100) - additional_hud_elements += /obj/screen/movable/mecha/toggle/air + additional_hud_elements += /obj/screen/mecha/toggle/air i = 0 var/pos = 7 for(var/additional_hud in additional_hud_elements) - var/obj/screen/movable/mecha/M = new additional_hud(src) - M.screen_loc = "1:6,[pos]:[i * -12]" + var/obj/screen/mecha/M = new additional_hud(src) + var/y_position = i * -12 + if(M.icon_state == "large_base") + y_position += 2 + if(!i) + y_position += 2 + M.screen_loc = "1:6,[pos]:[y_position]" hud_elements |= M i++ - if(i == 3) - pos-- - i = 0 - hud_health = new /obj/screen/movable/mecha/health(src) + hud_health = new /obj/screen/mecha/health(src) hud_health.screen_loc = "EAST-1:28,CENTER-3:11" hud_elements |= hud_health - hud_open = locate(/obj/screen/movable/mecha/toggle/hatch_open) in hud_elements - hud_power = new /obj/screen/movable/mecha/power(src) + hud_open = locate(/obj/screen/mecha/toggle/hatch_open) in hud_elements + hud_power = new /obj/screen/mecha/power(src) hud_power.screen_loc = "EAST-1:12,CENTER-4:25" hud_elements |= hud_power @@ -57,7 +59,7 @@ /mob/living/heavy_vehicle/handle_hud_icons() for(var/hardpoint in hardpoint_hud_elements) - var/obj/screen/movable/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint] + var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint] if(H) H.update_system_info() handle_hud_icons_health() var/obj/item/cell/C = get_cell() diff --git a/code/modules/heavy_vehicle/interface/screen_objects.dm b/code/modules/heavy_vehicle/interface/screen_objects.dm index d13709c4033..b76d3c2fc43 100644 --- a/code/modules/heavy_vehicle/interface/screen_objects.dm +++ b/code/modules/heavy_vehicle/interface/screen_objects.dm @@ -1,30 +1,34 @@ // Screen objects hereon out. -/obj/screen/movable/mecha +/obj/screen/mecha name = "hardpoint" icon = 'icons/mecha/mecha_hud.dmi' icon_state = "hardpoint" var/mob/living/heavy_vehicle/owner + maptext_y = 11 -/obj/screen/movable/mecha/radio +/obj/screen/mecha/radio name = "radio" - icon_state = "radio" + icon_state = "base" + maptext = "RADIO" + maptext_x = 2 + maptext_y = 11 -/obj/screen/movable/mecha/radio/Click() +/obj/screen/mecha/radio/Click() if(..()) if(owner.radio) owner.radio.attack_self(usr) -/obj/screen/movable/mecha/Initialize() +/obj/screen/mecha/Initialize() . = ..() var/mob/living/heavy_vehicle/newowner = loc if(!istype(newowner)) return qdel(src) owner = newowner -/obj/screen/movable/mecha/Click() +/obj/screen/mecha/Click() return (!owner || !usr.incapacitated() && (usr == owner || usr.loc == owner)) -/obj/screen/movable/mecha/hardpoint +/obj/screen/mecha/hardpoint name = "hardpoint" var/hardpoint_tag var/obj/item/holding @@ -33,16 +37,16 @@ maptext_y = 3 maptext_width = 120 -/obj/screen/movable/mecha/hardpoint/Destroy() +/obj/screen/mecha/hardpoint/Destroy() owner = null holding = null . = ..() -/obj/screen/movable/mecha/hardpoint/MouseDrop() +/obj/screen/mecha/hardpoint/MouseDrop() ..() if(holding) holding.screen_loc = screen_loc -/obj/screen/movable/mecha/hardpoint/proc/update_system_info() +/obj/screen/mecha/hardpoint/proc/update_system_info() // No point drawing it if we have no item to use or nobody to see it. if(!holding || !owner) return @@ -119,12 +123,12 @@ new_overlays += hardpoint_bar_cache[i] overlays = new_overlays -/obj/screen/movable/mecha/hardpoint/Initialize(mapload, var/newtag) +/obj/screen/mecha/hardpoint/Initialize(mapload, var/newtag) . = ..() hardpoint_tag = newtag name = "hardpoint ([hardpoint_tag])" -/obj/screen/movable/mecha/hardpoint/Click(var/location, var/control, var/params) +/obj/screen/mecha/hardpoint/Click(var/location, var/control, var/params) if(!(..())) return @@ -147,115 +151,155 @@ if(owner.set_hardpoint(hardpoint_tag)) icon_state = "hardpoint_selected" -/obj/screen/movable/mecha/eject +/obj/screen/mecha/eject name = "eject" - icon_state = "eject" + icon_state = "large_base" + maptext = "EJECT" + maptext_x = 3 + maptext_y = 10 -/obj/screen/movable/mecha/eject/Click() +/obj/screen/mecha/eject/Click() if(..()) owner.eject(usr) -/obj/screen/movable/mecha/rename +/obj/screen/mecha/rename name = "rename" - icon_state = "rename" + icon_state = "base" + maptext = "RENAME" + maptext_x = 1 + maptext_y = 12 -/obj/screen/movable/mecha/rename/Click() +/obj/screen/mecha/rename/Click() if(..()) owner.rename(usr) -/obj/screen/movable/mecha/power +/obj/screen/mecha/power name = "power" icon_state = null maptext_width = 64 maptext_y = 2 -/obj/screen/movable/mecha/toggle +/obj/screen/mecha/toggle name = "toggle" var/toggled -/obj/screen/movable/mecha/toggle/Click() +/obj/screen/mecha/toggle/Click() if(..()) toggled() -/obj/screen/movable/mecha/toggle/proc/toggled() +/obj/screen/mecha/toggle/proc/toggled() toggled = !toggled icon_state = "[initial(icon_state)][toggled ? "_enabled" : ""]" return toggled -/obj/screen/movable/mecha/toggle/air +/obj/screen/mecha/toggle/air name = "air" - icon_state = "air" + icon_state = "base" + maptext = "AIR" + maptext_x = 8 -/obj/screen/movable/mecha/toggle/air/toggled() - owner.use_air = ..() +/obj/screen/mecha/toggle/air/toggled() + toggled = !toggled + owner.use_air = toggled + var/main_color = owner.use_air ? "#d1d1d1" : "#525252" + maptext = "AIR" to_chat(usr, "Auxiliary atmospheric system [owner.use_air ? "enabled" : "disabled"].") -/obj/screen/movable/mecha/toggle/maint +/obj/screen/mecha/toggle/maint name = "toggle maintenance protocol" - icon_state = "maint" + icon_state = "large_base" + maptext = "MAINT" + maptext_x = 2 + maptext_y = 10 -/obj/screen/movable/mecha/toggle/maint/toggled() - owner.maintenance_protocols = ..() +/obj/screen/mecha/toggle/maint/toggled() + toggled = !toggled + owner.maintenance_protocols = toggled + var/main_color = owner.maintenance_protocols ? "#d1d1d1" : "#525252" + maptext = "MAINT" to_chat(usr, "Maintenance protocols [owner.maintenance_protocols ? "enabled" : "disabled"].") -/obj/screen/movable/mecha/toggle/hardpoint +/obj/screen/mecha/toggle/hardpoint name = "toggle hardpoint lock" - icon_state = "hardpoint_lock" + icon_state = "base" + maptext = "GEAR" + maptext_x = 4 -/obj/screen/movable/mecha/toggle/hardpoint/toggled() +/obj/screen/mecha/toggle/hardpoint/toggled() if(owner.force_locked) to_chat(usr, "The locking system cannot be operated due to software restriction. Contact the manufacturer for more details.") return - owner.hardpoints_locked = ..() + toggled = !toggled + owner.hardpoints_locked = toggled + var/main_color = owner.hardpoints_locked ? "#d1d1d1" : "#525252" + maptext = "GEAR" to_chat(usr, "Hardpoint system access is now [owner.hardpoints_locked ? "disabled" : "enabled"].") -/obj/screen/movable/mecha/toggle/hatch +/obj/screen/mecha/toggle/hatch name = "toggle hatch lock" - icon_state = "hatch_lock" + icon_state = "base" + maptext = "LOCK" + maptext_x = 5 -/obj/screen/movable/mecha/toggle/hatch/toggled() +/obj/screen/mecha/toggle/hatch/toggled() if(!owner.hatch_locked && !owner.hatch_closed) to_chat(usr, "You cannot lock the hatch while it is open.") return if(owner.force_locked) to_chat(usr, "The locking system cannot be operated due to software restriction. Contact the manufacturer for more details.") return - owner.hatch_locked = ..() + toggled = !toggled + owner.hatch_locked = toggled + if(owner.hatch_locked) + maptext = "UNLOCK" + maptext_y = 12 + maptext_x = 1 + else + maptext = "LOCK" + maptext_y = 11 + maptext_x = 5 to_chat(usr, "The [owner.body.hatch_descriptor] is [owner.hatch_locked ? "now" : "no longer" ] locked.") -/obj/screen/movable/mecha/toggle/hatch_open +/obj/screen/mecha/toggle/hatch_open name = "open or close hatch" - icon_state = "hatch_status" + icon_state = "base" + maptext = "CLOSE" + maptext_x = 3 -/obj/screen/movable/mecha/toggle/hatch_open/update_icon() - toggled = owner.hatch_closed - icon_state = "hatch_status[owner.hatch_closed ? "" : "_enabled"]" - -/obj/screen/movable/mecha/toggle/hatch_open/toggled() +/obj/screen/mecha/toggle/hatch_open/toggled() if(owner.hatch_locked && owner.hatch_closed) to_chat(usr, "You cannot open the hatch while it is locked.") return - owner.hatch_closed = ..() + toggled = !toggled + owner.hatch_closed = toggled + maptext = "[owner.hatch_closed ? "OPEN" : "CLOSE"]" + maptext_x = owner.hatch_closed ? 4 : 3 to_chat(usr, "The [owner.body.hatch_descriptor] is now [owner.hatch_closed ? "closed" : "open" ].") owner.update_icon() // This is basically just a holder for the updates the mech does. -/obj/screen/movable/mecha/health +/obj/screen/mecha/health name = "exosuit integrity" icon_state = "health" -/obj/screen/movable/mecha/toggle/camera - name = "toggle camera matrix" - icon_state = "camera" +/obj/screen/mecha/toggle/sensor + name = "toggle sensor matrix" + icon_state = "base" + maptext = "SENSOR" + maptext_x = 1 + maptext_y = 12 -/obj/screen/movable/mecha/toggle/camera/toggled() +/obj/screen/mecha/toggle/sensor/toggled() if(!owner.head) - to_chat(usr, "I/O Error: Camera systems not found.") + to_chat(usr, "I/O Error: Sensor systems not found.") return if(!owner.head.vision_flags) - to_chat(usr, "Alternative sensor configurations not found. Contact manufacturer for more details.") + to_chat(usr, "\The [owner.head] does not have any special sensor configurations.") return - owner.head.active_sensors = ..() - to_chat(usr, "[owner.head.name] advanced sensor mode is [owner.head.active_sensors ? "now" : "no longer" ] active.") + toggled = !toggled + owner.head.active_sensors = toggled + var/main_color = owner.head.active_sensors ? "#d1d1d1" : "#525252" + maptext = "SENSOR" + to_chat(usr, "[capitalize_first_letters(owner.head.name)] Advanced Sensor mode is [owner.head.active_sensors ? "now" : "no longer" ] active.") #undef BAR_CAP diff --git a/code/modules/heavy_vehicle/mech_construction.dm b/code/modules/heavy_vehicle/mech_construction.dm index e73718b548f..240220c8071 100644 --- a/code/modules/heavy_vehicle/mech_construction.dm +++ b/code/modules/heavy_vehicle/mech_construction.dm @@ -46,7 +46,7 @@ destroyed_event.unregister(module_to_forget, src, .proc/forget_module) - var/obj/screen/movable/mecha/hardpoint/H = hardpoint_hud_elements[target] + var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[target] H.holding = null hud_elements -= module_to_forget @@ -94,7 +94,7 @@ system.forceMove(src) hardpoints[system_hardpoint] = system - var/obj/screen/movable/mecha/hardpoint/H = hardpoint_hud_elements[system_hardpoint] + var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[system_hardpoint] H.holding = system system.screen_loc = H.screen_loc @@ -131,7 +131,7 @@ system.layer = initial(system.layer) destroyed_event.unregister(system, src, .proc/forget_module) - var/obj/screen/movable/mecha/hardpoint/H = hardpoint_hud_elements[system_hardpoint] + var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[system_hardpoint] H.holding = null for(var/thing in pilots) diff --git a/code/modules/heavy_vehicle/mech_damage.dm b/code/modules/heavy_vehicle/mech_damage.dm index db76766cdfe..9370f6d55ff 100644 --- a/code/modules/heavy_vehicle/mech_damage.dm +++ b/code/modules/heavy_vehicle/mech_damage.dm @@ -51,11 +51,11 @@ /mob/living/heavy_vehicle/proc/zoneToComponent(var/zone) switch(zone) - if("eyes" , "head") + if(BP_EYES, BP_HEAD) return head - if("l_arm" , "r_arm") + if(BP_L_ARM, BP_R_ARM) return arms - if("l_leg" , "r_leg") + if(BP_L_LEG, BP_R_LEG) return legs else return body diff --git a/code/modules/heavy_vehicle/mech_interaction.dm b/code/modules/heavy_vehicle/mech_interaction.dm index 1a9cf76a959..d7c7410448c 100644 --- a/code/modules/heavy_vehicle/mech_interaction.dm +++ b/code/modules/heavy_vehicle/mech_interaction.dm @@ -79,7 +79,7 @@ to_chat(user, "Error: Power levels insufficient.") if(user != src) - a_intent = user.a_intent + set_intent(user.a_intent) if(user.zone_sel) zone_sel.set_selected_zone(user.zone_sel.selecting) else @@ -167,14 +167,14 @@ /mob/living/heavy_vehicle/setClickCooldown(var/timeout) next_move = max(world.time + timeout, next_move) for(var/hardpoint in hardpoint_hud_elements) - var/obj/screen/movable/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint] + var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint] if(H) H.color = "#FF0000" addtimer(CALLBACK(src, .proc/reset_hardpoint_color), timeout) /mob/living/heavy_vehicle/proc/reset_hardpoint_color() for(var/hardpoint in hardpoint_hud_elements) - var/obj/screen/movable/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint] + var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint] if(H) H.color = null @@ -193,7 +193,7 @@ for(var/hardpoint in hardpoints) if(hardpoint != selected_hardpoint) continue - var/obj/screen/movable/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint] + var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint] if(istype(H)) H.icon_state = "hardpoint" break @@ -272,7 +272,7 @@ user.client.screen -= hud_elements user.client.eye = user if(user in pilots) - a_intent = I_HURT + set_intent(I_HURT) LAZYREMOVE(pilots, user) UNSETEMPTY(pilots) update_pilot_overlay() @@ -470,6 +470,12 @@ playsound(user.loc, 'sound/items/Screwdriver.ogg', 50, 1) visible_message("\The [user] installs \the [body.cell] into \the [src].") return + else if(istype(thing, /obj/item/device/robotanalyzer)) + to_chat(user, SPAN_NOTICE("Diagnostic Report for \the [src]:")) + for(var/obj/item/mech_component/limb in list (head, body, arms, legs)) + if(limb) + limb.return_diagnostics(user) + return return ..() diff --git a/code/modules/heavy_vehicle/mecha.dm b/code/modules/heavy_vehicle/mecha.dm index d8be1a359f3..208ebaee843 100644 --- a/code/modules/heavy_vehicle/mecha.dm +++ b/code/modules/heavy_vehicle/mecha.dm @@ -70,9 +70,9 @@ var/next_mecha_move = 0 var/list/hud_elements = list() var/list/hardpoint_hud_elements = list() - var/obj/screen/movable/mecha/health/hud_health - var/obj/screen/movable/mecha/toggle/hatch_open/hud_open - var/obj/screen/movable/mecha/power/hud_power + var/obj/screen/mecha/health/hud_health + var/obj/screen/mecha/toggle/hatch_open/hud_open + var/obj/screen/mecha/power/hud_power /mob/living/heavy_vehicle/Destroy() diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index da507ae92c2..55bbf9a4694 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -263,7 +263,7 @@ New() item_color = "red" -/obj/item/holo/esword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/holo/esword/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(active && default_parry_check(user, attacker, damage_source) && prob(50)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") diff --git a/code/modules/hydroponics/beekeeping/honey_extractor.dm b/code/modules/hydroponics/beekeeping/honey_extractor.dm index 2391de33035..da9b0083ae1 100644 --- a/code/modules/hydroponics/beekeeping/honey_extractor.dm +++ b/code/modules/hydroponics/beekeeping/honey_extractor.dm @@ -34,7 +34,7 @@ return var/obj/item/reagent_containers/glass/G = I var/transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, honey) - G.reagents.add_reagent("honey", transferred) + G.reagents.add_reagent(/datum/reagent/honey, transferred) honey -= transferred user.visible_message(SPAN_NOTICE("\The [user] collects honey from \the [src] into \the [G]."), SPAN_NOTICE("You collect [transferred] units of honey from \the [src] into \the [G].")) return diff --git a/code/modules/hydroponics/beekeeping/smoker.dm b/code/modules/hydroponics/beekeeping/smoker.dm index 9ab90c74782..4111221eaa3 100644 --- a/code/modules/hydroponics/beekeeping/smoker.dm +++ b/code/modules/hydroponics/beekeeping/smoker.dm @@ -51,11 +51,11 @@ smoke_at(A) /obj/item/bee_smoker/proc/get_fuel() - return reagents.get_reagent_amount("fuel") + return reagents.get_reagent_amount(/datum/reagent/fuel) /obj/item/bee_smoker/proc/remove_fuel(var/amount = 1, var/mob/M = null) if(get_fuel() >= amount) - reagents.remove_reagent("fuel", amount) + reagents.remove_reagent(/datum/reagent/fuel, amount) return TRUE else if(M) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 03a3594ba90..dae0310a76a 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -54,7 +54,7 @@ var/list/data = list() if(reagent_data.len > 1 && potency > 0) rtotal += round(potency/reagent_data[2]) - if(rid == "nutriment") + if(rid == /datum/reagent/nutriment) data[seed.seed_name] = max(1,rtotal) reagents.add_reagent(rid,max(1,rtotal),data) update_desc() @@ -74,33 +74,33 @@ desc = SSplants.product_descs["[seed.uid]"] else var/list/descriptors = list() - if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice")) + if(reagents.has_reagent(/datum/reagent/sugar) || reagents.has_reagent(/datum/reagent/nutriment/cherryjelly) || reagents.has_reagent(/datum/reagent/honey) || reagents.has_reagent(/datum/reagent/drink/berryjuice)) descriptors |= "sweet" - if(reagents.has_reagent("dylovene")) + if(reagents.has_reagent(/datum/reagent/dylovene)) descriptors |= "astringent" - if(reagents.has_reagent("frostoil")) + if(reagents.has_reagent(/datum/reagent/frostoil)) descriptors |= "numbing" - if(reagents.has_reagent("nutriment")) + if(reagents.has_reagent(/datum/reagent/nutriment)) descriptors |= "nutritious" - if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin")) + if(reagents.has_reagent(/datum/reagent/capsaicin/condensed) || reagents.has_reagent(/datum/reagent/capsaicin)) descriptors |= "spicy" - if(reagents.has_reagent("coco")) + if(reagents.has_reagent(/datum/reagent/nutriment/coco)) descriptors |= "bitter" - if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice")) + if(reagents.has_reagent(/datum/reagent/drink/orangejuice) || reagents.has_reagent(/datum/reagent/drink/lemonjuice) || reagents.has_reagent(/datum/reagent/drink/limejuice)) descriptors |= "sweet-sour" - if(reagents.has_reagent("radium") || reagents.has_reagent("uranium")) + if(reagents.has_reagent(/datum/reagent/radium) || reagents.has_reagent(/datum/reagent/uranium)) descriptors |= "radioactive" - if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin")) + if(reagents.has_reagent(/datum/reagent/toxin/amatoxin) || reagents.has_reagent(/datum/reagent/toxin)) descriptors |= "poisonous" - if(reagents.has_reagent("psilocybin") || reagents.has_reagent("space_drugs")) + if(reagents.has_reagent(/datum/reagent/psilocybin) || reagents.has_reagent(/datum/reagent/space_drugs)) descriptors |= "hallucinogenic" - if(reagents.has_reagent("bicaridine") || reagents.has_reagent("dylovene")) + if(reagents.has_reagent(/datum/reagent/bicaridine) || reagents.has_reagent(/datum/reagent/dylovene)) descriptors |= "medicinal" - if(reagents.has_reagent("gold")) + if(reagents.has_reagent(/datum/reagent/gold)) descriptors |= "shiny" - if(reagents.has_reagent("lube")) + if(reagents.has_reagent(/datum/reagent/lube)) descriptors |= "slippery" - if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid") || reagents.has_reagent("hclacid")) + if(reagents.has_reagent(/datum/reagent/acid/polyacid) || reagents.has_reagent(/datum/reagent/acid) || reagents.has_reagent(/datum/reagent/acid/hydrochloric)) descriptors |= "acidic" if(seed.get_trait(TRAIT_JUICY)) descriptors |= "juicy" @@ -194,7 +194,7 @@ qdel(src) return else if(seed.chems) - if(istype(W,/obj/item/material/hatchet) && !isnull(seed.chems["woodpulp"])) + if(istype(W,/obj/item/material/hatchet) && !isnull(seed.chems[/datum/reagent/woodpulp])) user.show_message("You make planks out of \the [src]!", 1) playsound(loc, 'sound/effects/woodcutting.ogg', 50, 1) var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR) @@ -211,17 +211,17 @@ to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.amount] planks.") qdel(src) return - else if(!isnull(seed.chems["potato"])) + else if(!isnull(seed.chems[/datum/reagent/drink/potatojuice])) to_chat(user, "You slice \the [src] into sticks.") new /obj/item/reagent_containers/food/snacks/rawsticks(get_turf(src)) qdel(src) return - else if(!isnull(seed.chems["carrotjuice"])) + else if(!isnull(seed.chems[/datum/reagent/drink/carrotjuice])) to_chat(user, "You slice \the [src] into sticks.") new /obj/item/reagent_containers/food/snacks/carrotfries(get_turf(src)) qdel(src) return - else if(!isnull(seed.chems["soymilk"])) + else if(!isnull(seed.chems[/datum/reagent/drink/milk/soymilk])) to_chat(user, "You roughly chop up \the [src].") new /obj/item/reagent_containers/food/snacks/soydope(get_turf(src)) qdel(src) diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index f22f71a564e..a36f0f7c93f 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -376,49 +376,49 @@ chems = list() if(prob(80)) - chems["nutriment"] = list(rand(1,10),rand(10,20)) + chems[/datum/reagent/nutriment] = list(rand(1,10),rand(10,20)) var/additional_chems = rand(0,5) if(additional_chems) var/list/possible_chems = list( - "woodpulp", - "bicaridine", - "hyperzine", - "cryoxadone", - "blood", - "water", - "potassium", - "plasticide", - "mutationtoxin", - "amutationtoxin", - "norepinephrine", - "space_drugs", - "paroxetine", - "mercury", - "sugar", - "radium", - "ryetalyn", - "alkysine", - "thermite", - "tramadol", - "cryptobiolin", - "dermaline", - "dexalin", - "phoron", - "synaptizine", - "impedrezene", - "hyronalin", - "peridaxon", - "toxin", - "rezadone", - "ethylredoxrazine", - "slimejelly", - "cyanide", - "mindbreaker", - "stoxin", - "acetone", - "hydrazine" + /datum/reagent/acetone, + /datum/reagent/alkysine, + /datum/reagent/aslimetoxin, + /datum/reagent/bicaridine, + /datum/reagent/blood, + /datum/reagent/cryoxadone, + /datum/reagent/cryptobiolin, + /datum/reagent/toxin/cyanide, + /datum/reagent/dermaline, + /datum/reagent/dexalin, + /datum/reagent/ethylredoxrazine, + /datum/reagent/hydrazine, + /datum/reagent/hyperzine, + /datum/reagent/hyronalin, + /datum/reagent/impedrezene, + /datum/reagent/mental/paroxetine, + /datum/reagent/mercury, + /datum/reagent/mindbreaker, + /datum/reagent/slimetoxin, + /datum/reagent/norepinephrine, + /datum/reagent/peridaxon, + /datum/reagent/toxin/phoron, + /datum/reagent/toxin/plasticide, + /datum/reagent/potassium, + /datum/reagent/radium, + /datum/reagent/rezadone, + /datum/reagent/ryetalyn, + /datum/reagent/slimejelly, + /datum/reagent/space_drugs, + /datum/reagent/soporific, + /datum/reagent/sugar, + /datum/reagent/synaptizine, + /datum/reagent/thermite, + /datum/reagent/toxin, + /datum/reagent/tramadol, + /datum/reagent/water, + /datum/reagent/woodpulp, ) for(var/x=1;x<=additional_chems;x++) diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index bfb62dffcf6..243641f2810 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -3,7 +3,7 @@ name = "chili" seed_name = "chili" display_name = "chili plants" - chems = list("capsaicin" = list(3,5), "nutriment" = list(1,25)) + chems = list(/datum/reagent/capsaicin = list(3,5), /datum/reagent/nutriment = list(1,25)) mutants = list("icechili") kitchen_tag = "chili" @@ -25,7 +25,7 @@ seed_name = "ice pepper" display_name = "ice-pepper plants" mutants = null - chems = list("frostoil" = list(3,5), "nutriment" = list(1,50)) + chems = list(/datum/reagent/frostoil = list(3,5), /datum/reagent/nutriment = list(1,50)) kitchen_tag = "icechili" /datum/seed/chili/ice/setup_traits() @@ -40,7 +40,7 @@ seed_name = "berry" display_name = "berry bush" mutants = list("glowberries","poisonberries","blueberries") - chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10)) + chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/drink/berryjuice = list(10,10)) kitchen_tag = "berries" /datum/seed/berry/setup_traits() @@ -62,7 +62,7 @@ seed_name = "blueberry" display_name = "blueberry bush" mutants = list("berries","poisonberries","glowberries") - chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10)) + chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/drink/berryjuice = list(10,10)) /datum/seed/berry/blue/setup_traits() ..() @@ -79,7 +79,7 @@ seed_name = "glowberry" display_name = "glowberry bush" mutants = null - chems = list("nutriment" = list(1,10), "uranium" = list(3,5)) + chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/uranium = list(3,5)) /datum/seed/berry/glow/setup_traits() ..() @@ -99,7 +99,7 @@ seed_name = "poison berry" display_name = "poison berry bush" mutants = list("deathberries") - chems = list("nutriment" = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5)) + chems = list(/datum/reagent/nutriment = list(1), /datum/reagent/toxin = list(3,5), /datum/reagent/toxin/poisonberryjuice = list(10,5)) /datum/seed/berry/poison/setup_traits() ..() @@ -112,7 +112,7 @@ seed_name = "death berry" display_name = "death berry bush" mutants = null - chems = list("nutriment" = list(1), "toxin" = list(3,3), "lexorin" = list(1,5)) + chems = list(/datum/reagent/nutriment = list(1), /datum/reagent/toxin = list(3,3), /datum/reagent/lexorin = list(1,5)) /datum/seed/berry/poison/death/setup_traits() ..() @@ -127,7 +127,7 @@ seed_name = "nettle" display_name = "nettles" mutants = list("deathnettle") - chems = list("nutriment" = list(1,50), "sacid" = list(0,1)) + chems = list(/datum/reagent/nutriment = list(1,50), /datum/reagent/acid = list(0,1)) kitchen_tag = "nettle" kitchen_tag = "nettle" @@ -148,7 +148,7 @@ seed_name = "death nettle" display_name = "death nettles" mutants = null - chems = list("nutriment" = list(1,50), "pacid" = list(0,1)) + chems = list(/datum/reagent/nutriment = list(1,50), /datum/reagent/acid/polyacid = list(0,1)) kitchen_tag = "deathnettle" /datum/seed/nettle/death/setup_traits() @@ -164,7 +164,7 @@ seed_name = "tomato" display_name = "tomato plant" mutants = list("bluetomato","bloodtomato") // no killer :( - chems = list("nutriment" = list(1,10), "tomatojuice" = list(10,10)) + chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/drink/tomatojuice = list(10,10)) kitchen_tag = "tomato" /datum/seed/tomato/setup_traits() @@ -187,7 +187,7 @@ seed_name = "blood tomato" display_name = "blood tomato plant" mutants = list("killer") - chems = list("nutriment" = list(1,10), "blood" = list(1,5)) + chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/blood = list(1,5)) splat_type = /obj/effect/decal/cleanable/blood/splatter /datum/seed/tomato/blood/setup_traits() @@ -213,7 +213,7 @@ seed_name = "blue tomato" display_name = "blue tomato plant" mutants = list("bluespacetomato") - chems = list("nutriment" = list(1,20), "lube" = list(1,5)) + chems = list(/datum/reagent/nutriment = list(1,20), /datum/reagent/lube = list(1,5)) /datum/seed/tomato/blue/setup_traits() ..() @@ -225,7 +225,7 @@ seed_name = "bluespace tomato" display_name = "bluespace tomato plant" mutants = null - chems = list("nutriment" = list(1,20), "singulo" = list(10,5)) + chems = list(/datum/reagent/nutriment = list(1,20), /datum/reagent/alcohol/ethanol/singulo = list(10,5)) /datum/seed/tomato/blue/teleport/setup_traits() ..() @@ -240,7 +240,7 @@ seed_name = "eggplant" display_name = "eggplants" mutants = list("realeggplant") - chems = list("nutriment" = list(1,10)) + chems = list(/datum/reagent/nutriment = list(1,10)) kitchen_tag = "eggplant" /datum/seed/eggplant/setup_traits() @@ -260,7 +260,7 @@ name = "huge eggplant" seed_name = "realeggplant" display_name = "eggplants" - chems = list("nutriment" = list(15,30)) + chems = list(/datum/reagent/nutriment = list(15,30)) kitchen_tag = "realeggplant" /datum/seed/realeggplant/setup_traits() @@ -282,7 +282,7 @@ seed_name = "apple" display_name = "apple tree" mutants = list("poisonapple","goldapple") - chems = list("applejuice" = list(1,10), "nutriment" = list(1,10)) + chems = list(/datum/reagent/drink/applejuice = list(1,10), /datum/reagent/nutriment = list(1,10)) kitchen_tag = "apple" /datum/seed/apple/setup_traits() @@ -301,14 +301,14 @@ /datum/seed/apple/poison name = "poisonapple" mutants = null - chems = list("cyanide" = list(1,5)) + chems = list(/datum/reagent/toxin/cyanide = list(1,5)) /datum/seed/apple/gold name = "goldapple" seed_name = "golden apple" display_name = "gold apple tree" mutants = null - chems = list("applejuice" = list(1,10), MATERIAL_GOLD = list(1,5)) + chems = list(/datum/reagent/drink/applejuice = list(1,10), MATERIAL_GOLD = list(1,5)) kitchen_tag = "goldapple" /datum/seed/apple/gold/setup_traits() @@ -325,7 +325,7 @@ seed_name = "ambrosia vulgaris" display_name = "ambrosia vulgaris" mutants = list("ambrosiadeus") - chems = list("nutriment" = list(1), "space_drugs" = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1), "toxin" = list(1,10)) + chems = list(/datum/reagent/nutriment = list(1), /datum/reagent/space_drugs = list(1,8), /datum/reagent/kelotane = list(1,8,1), /datum/reagent/bicaridine = list(1,10,1), /datum/reagent/toxin = list(1,10)) kitchen_tag = "ambrosia" /datum/seed/ambrosia/setup_traits() @@ -345,7 +345,7 @@ seed_name = "ambrosia deus" display_name = "ambrosia deus" mutants = null - chems = list("nutriment" = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), "space_drugs" = list(1,10)) + chems = list(/datum/reagent/nutriment = list(1), /datum/reagent/bicaridine = list(1,8), /datum/reagent/synaptizine = list(1,8,1), /datum/reagent/hyperzine = list(1,10,1), /datum/reagent/space_drugs = list(1,10)) kitchen_tag = "ambrosiadeus" /datum/seed/ambrosia/deus/setup_traits() @@ -360,7 +360,7 @@ seed_noun = "spores" display_name = "chanterelle mushrooms" mutants = list("reishi","amanita","plumphelmet") - chems = list("nutriment" = list(1,25)) + chems = list(/datum/reagent/nutriment = list(1,25)) splat_type = /obj/effect/plant kitchen_tag = "mushroom" @@ -384,8 +384,8 @@ seed_noun = "spores" display_name = "k'ois spores" chems = list( - "koispaste" = list(4), - "phoron" = list(8)) + /datum/reagent/kois = list(4), + /datum/reagent/toxin/phoron = list(8)) splat_type = /obj/effect/plant kitchen_tag = "koisspore" mutants = null @@ -414,8 +414,8 @@ display_name = "black k'ois spores" mutants = null chems = list( - "blackkois" = list(4), - "phoron" = list(2)) + /datum/reagent/kois/black = list(4), + /datum/reagent/toxin/phoron = list(2)) /datum/seed/koisspore/black/setup_traits() ..() @@ -449,7 +449,7 @@ seed_name = "plump helmet" display_name = "plump helmet mushrooms" mutants = list("walkingmushroom","towercap") - chems = list("nutriment" = list(2,10)) + chems = list(/datum/reagent/nutriment = list(2,10)) kitchen_tag = "plumphelmet" /datum/seed/mushroom/plump/setup_traits() @@ -482,7 +482,7 @@ seed_name = "reishi" display_name = "reishi" mutants = list("libertycap","glowshroom") - chems = list("nutriment" = list(1,50), "psilocybin" = list(3,5)) + chems = list(/datum/reagent/nutriment = list(1,50), /datum/reagent/psilocybin = list(3,5)) /datum/seed/mushroom/hallucinogenic/setup_traits() ..() @@ -500,7 +500,7 @@ seed_name = "liberty cap" display_name = "liberty cap mushrooms" mutants = list("ghostmushroom") - chems = list("nutriment" = list(1), "stoxin" = list(3,3), "space_drugs" = list(1,25)) + chems = list(/datum/reagent/nutriment = list(1), /datum/reagent/soporific = list(3,3), /datum/reagent/space_drugs = list(1,25)) /datum/seed/mushroom/hallucinogenic/strong/setup_traits() ..() @@ -516,7 +516,7 @@ seed_name = "fly amanita" display_name = "fly amanita mushrooms" mutants = list("destroyingangel","plastic","panocelium") - chems = list("nutriment" = list(1), "amatoxin" = list(3,3), "psilocybin" = list(1,25)) + chems = list(/datum/reagent/nutriment = list(1), /datum/reagent/toxin/amatoxin = list(3,3), /datum/reagent/psilocybin = list(1,25)) /datum/seed/mushroom/poison/setup_traits() ..() @@ -534,7 +534,7 @@ seed_name = "destroying angel" display_name = "destroying angel mushrooms" mutants = null - chems = list("nutriment" = list(1,50), "amatoxin" = list(13,3), "psilocybin" = list(1,25)) + chems = list(/datum/reagent/nutriment = list(1,50), /datum/reagent/toxin/amatoxin = list(13,3), /datum/reagent/psilocybin = list(1,25)) /datum/seed/mushroom/poison/death/setup_traits() ..() @@ -551,7 +551,7 @@ seed_name = "panocelium" display_name = "panocelium mushrooms" mutants = null - chems = list("nutriment" = list(1,50), "panotoxin" = list(10,3), "psilocybin" = list(1,25)) + chems = list(/datum/reagent/nutriment = list(1,50), /datum/reagent/toxin/panotoxin = list(10,3), /datum/reagent/psilocybin = list(1,25)) /datum/seed/mushroom/poison/panocelium/setup_traits() ..() @@ -567,7 +567,7 @@ name = "towercap" seed_name = "tower cap" display_name = "tower caps" - chems = list("woodpulp" = list(10,1)) + chems = list(/datum/reagent/woodpulp = list(10,1)) mutants = null /datum/seed/mushroom/towercap/setup_traits() @@ -583,7 +583,7 @@ seed_name = "glowshroom" display_name = "glowshrooms" mutants = null - chems = list("radium" = list(1,20)) + chems = list(/datum/reagent/radium = list(1,20)) /datum/seed/mushroom/glowshroom/setup_traits() ..() @@ -603,7 +603,7 @@ seed_name = "plastellium" display_name = "plastellium" mutants = null - chems = list("plasticide" = list(1,10)) + chems = list(/datum/reagent/toxin/plasticide = list(1,10)) /datum/seed/mushroom/plastic/setup_traits() ..() @@ -621,7 +621,7 @@ seed_name = "ghost mushroom" display_name = "ghost mushroom" mutants = null - chems = list("spectrocybin" = list(5,15)) + chems = list(/datum/reagent/toxin/spectrocybin = list(5,15)) /datum/seed/mushroom/ghost/setup_traits() ..() @@ -641,7 +641,7 @@ name = "harebells" seed_name = "harebell" display_name = "harebells" - chems = list("nutriment" = list(1,20)) + chems = list(/datum/reagent/nutriment = list(1,20)) /datum/seed/flower/setup_traits() ..() @@ -658,7 +658,7 @@ name = "poppies" seed_name = "poppy" display_name = "poppies" - chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10)) + chems = list(/datum/reagent/nutriment = list(1,20), /datum/reagent/bicaridine = list(1,10)) kitchen_tag = "poppy" /datum/seed/flower/poppy/setup_traits() @@ -695,7 +695,7 @@ seed_name = "grape" display_name = "grapevines" mutants = list("greengrapes") - chems = list("nutriment" = list(1,10), "sugar" = list(1,5), "grapejuice" = list(10,10)) + chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/sugar = list(1,5), /datum/reagent/drink/grapejuice = list(10,10)) /datum/seed/grapes/setup_traits() ..() @@ -716,7 +716,7 @@ seed_name = "green grape" display_name = "green grapevines" mutants = null - chems = list("nutriment" = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10)) + chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/kelotane = list(3,5), /datum/reagent/drink/grapejuice = list(10,10)) /datum/seed/grapes/green/setup_traits() ..() @@ -727,7 +727,7 @@ name = "peanut" seed_name = "peanut" display_name = "peanut vines" - chems = list("nutriment" = list(1,10)) + chems = list(/datum/reagent/nutriment = list(1,10)) kitchen_tag = "peanut" /datum/seed/peanuts/setup_traits() @@ -746,7 +746,7 @@ name = "cabbage" seed_name = "cabbage" display_name = "cabbages" - chems = list("nutriment" = list(1,10)) + chems = list(/datum/reagent/nutriment = list(1,10)) kitchen_tag = "cabbage" /datum/seed/cabbage/setup_traits() @@ -768,7 +768,7 @@ name = "banana" seed_name = "banana" display_name = "banana tree" - chems = list("banana" = list(10,10)) + chems = list(/datum/reagent/drink/banana = list(10,10)) trash_type = /obj/item/bananapeel kitchen_tag = "banana" @@ -790,7 +790,7 @@ name = "corn" seed_name = "corn" display_name = "ears of corn" - chems = list("nutriment" = list(1,10), "cornoil" = list(1,10)) + chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/nutriment/triglyceride/oil/corn = list(1,10)) kitchen_tag = "corn" trash_type = /obj/item/corncob @@ -812,7 +812,7 @@ name = "potato" seed_name = "potato" display_name = "potatoes" - chems = list("nutriment" = list(1,10), "potato" = list(10,10)) + chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/drink/potatojuice = list(10,10)) kitchen_tag = "potato" /datum/seed/potato/setup_traits() @@ -831,7 +831,7 @@ name = "soybean" seed_name = "soybean" display_name = "soybeans" - chems = list("nutriment" = list(1,20), "soymilk" = list(10,20)) + chems = list(/datum/reagent/nutriment = list(1,20), /datum/reagent/drink/milk/soymilk = list(10,20)) kitchen_tag = "soybeans" /datum/seed/soybean/setup_traits() @@ -849,7 +849,7 @@ name = "wheat" seed_name = "wheat" display_name = "wheat stalks" - chems = list("nutriment" = list(1,25), "flour" = list(15,15)) + chems = list(/datum/reagent/nutriment = list(1,25), /datum/reagent/nutriment/flour = list(15,15)) kitchen_tag = "wheat" /datum/seed/wheat/setup_traits() @@ -869,7 +869,7 @@ name = "rice" seed_name = "rice" display_name = "rice stalks" - chems = list("nutriment" = list(1,25), "rice" = list(10,15)) + chems = list(/datum/reagent/nutriment = list(1,25), /datum/reagent/nutriment/rice = list(10,15)) kitchen_tag = "rice" /datum/seed/rice/setup_traits() @@ -889,7 +889,7 @@ name = "carrot" seed_name = "carrot" display_name = "carrots" - chems = list("nutriment" = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20)) + chems = list(/datum/reagent/nutriment = list(1,20), /datum/reagent/imidazoline = list(3,5), /datum/reagent/drink/carrotjuice = list(10,20)) kitchen_tag = "carrot" /datum/seed/carrots/setup_traits() @@ -924,7 +924,7 @@ name = "whitebeet" seed_name = "white-beet" display_name = "white-beets" - chems = list("nutriment" = list(0,20), "sugar" = list(1,5)) + chems = list(/datum/reagent/nutriment = list(0,20), /datum/reagent/sugar = list(1,5)) kitchen_tag = "whitebeet" /datum/seed/whitebeets/setup_traits() @@ -943,7 +943,7 @@ name = "sugarcane" seed_name = "sugarcane" display_name = "sugarcanes" - chems = list("sugar" = list(4,5)) + chems = list(/datum/reagent/sugar = list(4,5)) /datum/seed/sugarcane/setup_traits() ..() @@ -962,7 +962,7 @@ name = "watermelon" seed_name = "watermelon" display_name = "watermelon vine" - chems = list("nutriment" = list(1,6), "watermelonjuice" = list(10,6)) + chems = list(/datum/reagent/nutriment = list(1,6), /datum/reagent/drink/watermelonjuice = list(10,6)) /datum/seed/watermelon/setup_traits() ..() @@ -985,7 +985,7 @@ name = "pumpkin" seed_name = "pumpkin" display_name = "pumpkin vine" - chems = list("pumpkinpulp" = list(5,6)) + chems = list(/datum/reagent/nutriment/pumpkinpulp = list(5,6)) kitchen_tag = "pumpkin" /datum/seed/pumpkin/setup_traits() @@ -1005,7 +1005,7 @@ name = "lime" seed_name = "lime" display_name = "lime trees" - chems = list("nutriment" = list(1,20), "limejuice" = list(10,20)) + chems = list(/datum/reagent/nutriment = list(1,20), /datum/reagent/drink/limejuice = list(10,20)) kitchen_tag = "lime" /datum/seed/citrus/setup_traits() @@ -1025,7 +1025,7 @@ name = "lemon" seed_name = "lemon" display_name = "lemon trees" - chems = list("nutriment" = list(1,20), "lemonjuice" = list(10,20)) + chems = list(/datum/reagent/nutriment = list(1,20), /datum/reagent/drink/lemonjuice = list(10,20)) kitchen_tag = "lemon" /datum/seed/citrus/lemon/setup_traits() @@ -1040,7 +1040,7 @@ seed_name = "orange" display_name = "orange trees" kitchen_tag = "orange" - chems = list("nutriment" = list(1,20), "orangejuice" = list(10,20)) + chems = list(/datum/reagent/nutriment = list(1,20), /datum/reagent/drink/orangejuice = list(10,20)) /datum/seed/citrus/orange/setup_traits() ..() @@ -1051,7 +1051,7 @@ name = "grass" seed_name = "grass" display_name = "grass" - chems = list("nutriment" = list(1,20)) + chems = list(/datum/reagent/nutriment = list(1,20)) kitchen_tag = "grass" /datum/seed/grass/setup_traits() @@ -1071,7 +1071,7 @@ name = "cacao" seed_name = "cacao" display_name = "cacao tree" - chems = list("nutriment" = list(1,10), "coco" = list(4,5)) + chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/nutriment/coco = list(4,5)) /datum/seed/cocoa/setup_traits() ..() @@ -1091,7 +1091,7 @@ seed_name = "cherry" seed_noun = "pits" display_name = "cherry tree" - chems = list("nutriment" = list(1,15), "sugar" = list(1,15), "cherryjelly" = list(10,15)) + chems = list(/datum/reagent/nutriment = list(1,15), /datum/reagent/sugar = list(1,15), /datum/reagent/nutriment/cherryjelly = list(10,15)) kitchen_tag = "cherries" /datum/seed/cherries/setup_traits() @@ -1111,7 +1111,7 @@ name = "kudzu" seed_name = "kudzu" display_name = "kudzu vines" - chems = list("nutriment" = list(1,50), "dylovene" = list(1,25)) + chems = list(/datum/reagent/nutriment = list(1,50), /datum/reagent/dylovene = list(1,25)) /datum/seed/kudzu/setup_traits() ..() @@ -1151,7 +1151,7 @@ name = "shand" seed_name = "S'Rendarr's hand" display_name = "S'Rendarr's hand leaves" - chems = list("tobacco" = list(1,5), "bicaridine" = list(3,5), "nicotine" = list(1,3)) + chems = list(/datum/reagent/toxin/tobacco = list(1,5), /datum/reagent/bicaridine = list(3,5), /datum/reagent/mental/nicotine = list(1,3)) kitchen_tag = "shand" /datum/seed/shand/setup_traits() @@ -1171,7 +1171,7 @@ name = "mtear" seed_name = "Messa's tear" display_name = "Messa's tear leaves" - chems = list("honey" = list(1,10), "kelotane" = list(3,5)) + chems = list(/datum/reagent/honey = list(1,10), /datum/reagent/kelotane = list(3,5)) kitchen_tag = "mtear" /datum/seed/mtear/setup_traits() @@ -1191,7 +1191,7 @@ name = "earthenroot" seed_name = "earthen-root" display_name = "earthen-roots" - chems = list("nutriment" = list(0,5), "sugar" = list(1,5), "earthenrootjuice" = list(4,8)) + chems = list(/datum/reagent/nutriment = list(0,5), /datum/reagent/sugar = list(1,5), /datum/reagent/drink/earthenrootjuice = list(4,8)) kitchen_tag = "earthenroot" /datum/seed/earthenroot/setup_traits() @@ -1211,7 +1211,7 @@ name = "nifberries" seed_name = "dirt berries" display_name = "dirt berries shrub" - chems = list("nutriment" = list(0,15), "oil" = list(1,5)) + chems = list(/datum/reagent/nutriment = list(0,15), /datum/reagent/nutriment/triglyceride/oil = list(1,5)) kitchen_tag = "nifberries" /datum/seed/nifberries/setup_traits() @@ -1235,7 +1235,7 @@ seed_name = "tobacco" display_name = "tobacco leaves" mutants = list("finetobacco", "puretobacco", "badtobacco") - chems = list("tobacco" = list(1,10)) + chems = list(/datum/reagent/toxin/tobacco = list(1,10)) /datum/seed/tobacco/New() ..() @@ -1255,7 +1255,7 @@ name = "finetobacco" seed_name = "fine tobacco" display_name = "fine tobacco leaves" - chems = list("tobaccofine" = list(1,10)) + chems = list(/datum/reagent/toxin/tobacco/rich = list(1,10)) /datum/seed/tobacco/finetobacco/New() ..() @@ -1268,7 +1268,7 @@ name = "puretobacco" seed_name = "succulent tobacco" display_name = "succulent tobacco leaves" - chems = list("nicotine" = list(1,10)) + chems = list(/datum/reagent/mental/nicotine = list(1,10)) /datum/seed/tobacco/puretobacco/New() ..() @@ -1283,13 +1283,13 @@ seed_name = "low-grade tobacco" display_name = "low-grade tobacco leaves" mutants = list("tobacco") - chems = list("tobaccobad" = list(1,10)) + chems = list(/datum/reagent/toxin/tobacco/fake = list(1,10)) /datum/seed/peppercorn name = "peppercorn" seed_name = "peppercorn" display_name = "black pepper" - chems = list("blackpepper" = list(10,10)) + chems = list(/datum/reagent/blackpepper = list(10,10)) /datum/seed/peppercorn/setup_traits() ..() @@ -1307,7 +1307,7 @@ name = "garlic" seed_name = "garlic" display_name = "garlic" - chems = list("garlicjuice" = list(1,5)) + chems = list(/datum/reagent/drink/garlicjuice = list(1,5)) kitchen_tag = "garlic" /datum/seed/garlic/setup_traits() @@ -1325,7 +1325,7 @@ name = "onion" seed_name = "onion" display_name = "onions" - chems = list("onionjuice" = list(1,5)) + chems = list(/datum/reagent/drink/onionjuice = list(1,5)) kitchen_tag = "onion" /datum/seed/onion/setup_traits() @@ -1344,7 +1344,7 @@ seed_name = "dyn" display_name = "dyn bush" mutants = null - chems = list("dynjuice" = list(2,2), "dylovene" = list(0,1)) + chems = list(/datum/reagent/drink/dynjuice = list(2,2), /datum/reagent/dylovene = list(0,1)) kitchen_tag = "dyn leaf" /datum/seed/dyn/setup_traits() @@ -1361,7 +1361,7 @@ name = "wulumunusha" seed_name = "wulumunusha" display_name = "wulumunusha vines" - chems = list("wulumunusha" = list(3,5)) + chems = list(/datum/reagent/wulumunusha = list(3,5)) kitchen_tag = "wulumunusha" /datum/seed/wulumunusha/setup_traits() @@ -1379,7 +1379,7 @@ name = "sugartree" seed_name = "sugar tree fruit" display_name = "sugar tree" - chems = list("sugar" = list(3,4)) + chems = list(/datum/reagent/sugar = list(3,4)) kitchen_tag = "sugartree" /datum/seed/sugartree/setup_traits() diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 8ad63011a6d..fab4cc20f1d 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -130,7 +130,7 @@ update_icon() SSplants.add_plant(src) // Some plants eat through plating. - if(islist(seed.chems) && !isnull(seed.chems["pacid"])) + if(islist(seed.chems) && !isnull(seed.chems[/datum/reagent/acid/polyacid])) var/turf/T = get_turf(src) T.ex_act(prob(80) ? 3 : 2) @@ -195,7 +195,7 @@ if(growth>2 && growth == max_growth) layer = (seed && seed.force_layer) ? seed.force_layer : 5 opacity = 1 - if(islist(seed.chems) && !isnull(seed.chems["woodpulp"])) + if(islist(seed.chems) && !isnull(seed.chems[/datum/reagent/woodpulp])) density = 1 else layer = (seed && seed.force_layer) ? seed.force_layer : 5 diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm index 7040088e310..572994a41ce 100644 --- a/code/modules/hydroponics/spreading/spreading_growth.dm +++ b/code/modules/hydroponics/spreading/spreading_growth.dm @@ -17,7 +17,7 @@ if((locate(/obj/effect/plant) in floor.contents) || (locate(/obj/effect/dead_plant) in floor.contents) ) continue if(floor.density) - if(seed && seed.chems["pacid"]) + if(seed && seed.chems[/datum/reagent/acid/polyacid]) addtimer(CALLBACK(floor, /atom/.proc/ex_act, 3), rand(5, 25)) continue if(!Adjacent(floor) || !floor.Enter(src)) @@ -39,7 +39,7 @@ return 0 for(var/obj/effect/effect/smoke/chem/smoke in view(1, src)) - if(smoke.reagents.has_reagent("plantbgone")) + if(smoke.reagents.has_reagent(/datum/reagent/toxin/plantbgone)) die_off() return diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index b476bc2b73f..7f96ad86076 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -51,84 +51,86 @@ // Reagent information for process(), consider moving this to a controller along // with cycle information under 'mechanical concerns' at some point. var/global/list/toxic_reagents = list( - "dylovene" = -2, - "toxin" = 2, - "hydrazine" = 2.5, - "acetone" = 1, - "sacid" = 1.5, - "hclacid" = 1.5, - "pacid" = 3, - "plantbgone" = 3, - "cryoxadone" = -3, - "radium" = 2, - "raskara_dust" = 2.5 + /datum/reagent/dylovene = -2, + /datum/reagent/toxin = 2, + /datum/reagent/hydrazine = 2.5, + /datum/reagent/acetone = 1, + /datum/reagent/acid = 1.5, + /datum/reagent/acid/hydrochloric = 1.5, + /datum/reagent/acid/polyacid = 3, + /datum/reagent/toxin/plantbgone = 3, + /datum/reagent/cryoxadone = -3, + /datum/reagent/radium = 2, + /datum/reagent/raskara_dust = 2.5 ) var/global/list/nutrient_reagents = list( - "milk" = 0.1, - "beer" = 0.25, - "phosphorus" = 0.1, - "sugar" = 0.1, - "sodawater" = 0.1, - "ammonia" = 1, - "diethylamine" = 2, - "nutriment" = 1, - "adminordrazine" = 1, - "eznutrient" = 1, - "robustharvest" = 1, - "left4zed" = 1, - "monoammoniumphosphate" = 1 + /datum/reagent/drink/milk = 0.1, + /datum/reagent/alcohol/ethanol/beer = 0.25, + /datum/reagent/phosphorus = 0.1, + /datum/reagent/sugar = 0.1, + /datum/reagent/drink/sodawater = 0.1, + /datum/reagent/ammonia = 1, + /datum/reagent/diethylamine = 2, + /datum/reagent/nutriment = 1, + /datum/reagent/adminordrazine = 1, + // Fertilizers + /datum/reagent/toxin/fertilizer/eznutrient = 1, + /datum/reagent/toxin/fertilizer/robustharvest = 1, + /datum/reagent/toxin/fertilizer/left4zed = 1, + /datum/reagent/toxin/fertilizer/monoammoniumphosphate = 1 ) var/global/list/weedkiller_reagents = list( - "hydrazine" = -4, - "phosphorus" = -2, - "sugar" = 2, - "sacid" = -2, - "hclacid" = -2, - "pacid" = -4, - "plantbgone" = -8, - "adminordrazine" = -5 + /datum/reagent/hydrazine = -4, + /datum/reagent/phosphorus = -2, + /datum/reagent/sugar = 2, + /datum/reagent/acid = -2, + /datum/reagent/acid/hydrochloric = -2, + /datum/reagent/acid/polyacid = -4, + /datum/reagent/toxin/plantbgone = -8, + /datum/reagent/adminordrazine = -5 ) var/global/list/pestkiller_reagents = list( - "sugar" = 2, - "diethylamine" = -2, - "adminordrazine" = -5 + /datum/reagent/sugar = 2, + /datum/reagent/diethylamine = -2, + /datum/reagent/adminordrazine = -5 ) var/global/list/water_reagents = list( - "water" = 1, - "adminordrazine" = 1, - "milk" = 0.9, - "beer" = 0.7, - "hydrazine" = -2, - "phosphorus" = -0.5, - "water" = 1, - "sodawater" = 1 + /datum/reagent/water = 1, + /datum/reagent/adminordrazine = 1, + /datum/reagent/drink/milk = 0.9, + /datum/reagent/alcohol/ethanol/beer = 0.7, + /datum/reagent/hydrazine = -2, + /datum/reagent/phosphorus = -0.5, + /datum/reagent/water = 1, + /datum/reagent/drink/sodawater = 1 ) // Beneficial reagents also have values for modifying yield_mod and mut_mod (in that order). var/global/list/beneficial_reagents = list( - "beer" = list( -0.05, 0, 0 ), - "hydrazine" = list( -2, 0, 0 ), - "phosphorus" = list( -0.75, 0, 0 ), - "sodawater" = list( 0.1, 0, 0 ), - "sacid" = list( -1, 0, 0 ), - "hclacid" = list( -1, 0, 0 ), - "pacid" = list( -2, 0, 0 ), - "plantbgone" = list( -2, 0, 0.2), - "cryoxadone" = list( 3, 0, 0 ), - "ammonia" = list( 0.5, 0, 0 ), - "diethylamine" = list( 1, 0, 0 ), - "nutriment" = list( 0.5, 0.1, 0 ), - "radium" = list( -1.5, 0, 0.2), - "adminordrazine" = list( 1, 1, 1 ), - "robustharvest" = list( 0, 0.2, 0 ), - "left4zed" = list( 0, 0, 0.2) + /datum/reagent/alcohol/ethanol/beer=list( -0.05, 0, 0 ), + /datum/reagent/hydrazine = list( -2, 0, 0 ), + /datum/reagent/phosphorus = list( -0.75, 0, 0 ), + /datum/reagent/drink/sodawater = list( 0.1, 0, 0 ), + /datum/reagent/acid = list( -1, 0, 0 ), + /datum/reagent/acid/hydrochloric = list( -1, 0, 0 ), + /datum/reagent/acid/polyacid = list( -2, 0, 0 ), + /datum/reagent/toxin/plantbgone = list( -2, 0, 0.2), + /datum/reagent/cryoxadone = list( 3, 0, 0 ), + /datum/reagent/ammonia = list( 0.5, 0, 0 ), + /datum/reagent/diethylamine = list( 1, 0, 0 ), + /datum/reagent/nutriment = list( 0.5, 0.1, 0 ), + /datum/reagent/radium = list( -1.5, 0, 0.2), + /datum/reagent/adminordrazine = list( 1, 1, 1 ), + // Fertilizers + /datum/reagent/toxin/fertilizer/robustharvest = list( 0, 0.2, 0 ), + /datum/reagent/toxin/fertilizer/left4zed = list( 0, 0, 0.2) ) // Mutagen list specifies minimum value for the mutation to take place, rather // than a bound as the lists above specify. var/global/list/mutagenic_reagents = list( - "radium" = 8, - "mutagen" = 15 + /datum/reagent/radium = 8, + /datum/reagent/mutagen = 15 ) /obj/machinery/portable_atmospherics/hydroponics/AltClick() @@ -173,12 +175,12 @@ if(nymph.stat == DEAD || nymph.paralysis || nymph.weakened || nymph.stunned || nymph.restrained()) return if(weedlevel > 0) - nymph.ingested.add_reagent("nutriment", weedlevel/6) + nymph.ingested.add_reagent(/datum/reagent/nutriment, weedlevel/6) weedlevel = 0 nymph.visible_message("[nymph] roots through [src], ripping out weeds and eating them noisily.","You root through [src], ripping out weeds and eating them noisily.") return if (dead)//Let nymphs eat dead plants - nymph.ingested.add_reagent("nutriment", 1) + nymph.ingested.add_reagent(/datum/reagent/nutriment, 1) nymph.visible_message("[nymph] rips out the dead plants from [src], and loudly munches them.","You root out the dead plants in [src], eating them with loud chewing sounds.") remove_dead(user) return @@ -252,35 +254,35 @@ for(var/datum/reagent/R in temp_chem_holder.reagents.reagent_list) - var/reagent_total = temp_chem_holder.reagents.get_reagent_amount(R.id) + var/reagent_total = temp_chem_holder.reagents.get_reagent_amount(R.type) if(seed && !dead) //Handle some general level adjustments. - if(toxic_reagents[R.id]) - toxins += toxic_reagents[R.id] * reagent_total - if(weedkiller_reagents[R.id]) - weedlevel -= weedkiller_reagents[R.id] * reagent_total - if(pestkiller_reagents[R.id]) - pestlevel += pestkiller_reagents[R.id] * reagent_total + if(toxic_reagents[R.type]) + toxins += toxic_reagents[R.type] * reagent_total + if(weedkiller_reagents[R.type]) + weedlevel -= weedkiller_reagents[R.type] * reagent_total + if(pestkiller_reagents[R.type]) + pestlevel += pestkiller_reagents[R.type] * reagent_total // Beneficial reagents have a few impacts along with health buffs. - if(beneficial_reagents[R.id]) - health += beneficial_reagents[R.id][1] * reagent_total - yield_mod += beneficial_reagents[R.id][2] * reagent_total - mutation_mod += beneficial_reagents[R.id][3] * reagent_total + if(beneficial_reagents[R.type]) + health += beneficial_reagents[R.type][1] * reagent_total + yield_mod += beneficial_reagents[R.type][2] * reagent_total + mutation_mod += beneficial_reagents[R.type][3] * reagent_total // Mutagen is distinct from the previous types and mostly has a chance of proccing a mutation. - if(mutagenic_reagents[R.id]) - mutation_level += reagent_total*mutagenic_reagents[R.id]+mutation_mod + if(mutagenic_reagents[R.type]) + mutation_level += reagent_total*mutagenic_reagents[R.type]+mutation_mod // Handle nutrient refilling. - if(nutrient_reagents[R.id]) - nutrilevel += nutrient_reagents[R.id] * reagent_total + if(nutrient_reagents[R.type]) + nutrilevel += nutrient_reagents[R.type] * reagent_total // Handle water and water refilling. var/water_added = 0 - if(water_reagents[R.id]) - var/water_input = water_reagents[R.id] * reagent_total + if(water_reagents[R.type]) + var/water_input = water_reagents[R.type] * reagent_total water_added += water_input waterlevel += water_input @@ -449,10 +451,10 @@ if (istype(O,/obj/item/reagent_containers)) var/obj/item/reagent_containers/RC = O if (RC.reagents.reagent_list.len == 1) - if (RC.reagents.has_reagent("water", 1)) + if (RC.reagents.has_reagent(/datum/reagent/water, 1)) if (waterlevel < maxWaterLevel) var/amountToRemove = min((maxWaterLevel - waterlevel), RC.reagents.total_volume) - RC.reagents.remove_reagent("water", amountToRemove, 1) + RC.reagents.remove_reagent(/datum/reagent/water, amountToRemove, 1) waterlevel += amountToRemove user.visible_message("[user] transfers some water to the tray.", "You transfer about [amountToRemove] units of water to the tray.") else diff --git a/code/modules/hydroponics/trays/tray_apiary.dm b/code/modules/hydroponics/trays/tray_apiary.dm index e40e00fe80c..9d6d115791a 100644 --- a/code/modules/hydroponics/trays/tray_apiary.dm +++ b/code/modules/hydroponics/trays/tray_apiary.dm @@ -90,7 +90,7 @@ else to_chat(user, "You begin to harvest the honey.") if(do_after(user,50/O.toolspeed)) - G.reagents.add_reagent("honey",harvestable_honey) + G.reagents.add_reagent(/datum/reagent/honey,harvestable_honey) harvestable_honey = 0 to_chat(user, "You successfully harvest the honey.") else @@ -233,7 +233,7 @@ health -= 15 var/obj/item/reagent_containers/food/snacks/honeycomb/H = new(src.loc) if(toxic > 0) - H.reagents.add_reagent("toxin", toxic) + H.reagents.add_reagent(/datum/reagent/toxin, toxic) to_chat(usr, "You harvest the honeycomb from the hive. There is a wild buzzing!") angry_swarm(usr) diff --git a/code/modules/hydroponics/trays/tray_reagents.dm b/code/modules/hydroponics/trays/tray_reagents.dm index 09f4c2f1e49..219c9e4487b 100644 --- a/code/modules/hydroponics/trays/tray_reagents.dm +++ b/code/modules/hydroponics/trays/tray_reagents.dm @@ -93,8 +93,6 @@ possible_transfer_amounts = null w_class = 2.0 - var/fertilizer //Reagent contained, if any. - //Like a shot glass! amount_per_transfer_from_this = 10 volume = 60 @@ -105,20 +103,17 @@ src.pixel_x = rand(-5.0, 5) src.pixel_y = rand(-5.0, 5) - if(fertilizer) - reagents.add_reagent(fertilizer,60) - /obj/item/reagent_containers/glass/fertilizer/ez name = "bottle of E-Z-Nutrient" icon_state = "bottle16" - fertilizer = "eznutrient" + reagents_to_add = list(/datum/reagent/toxin/fertilizer/eznutrient = 60) /obj/item/reagent_containers/glass/fertilizer/l4z name = "bottle of Left 4 Zed" icon_state = "bottle18" - fertilizer = "left4zed" + reagents_to_add = list(/datum/reagent/toxin/fertilizer/left4zed = 60) /obj/item/reagent_containers/glass/fertilizer/rh name = "bottle of Robust Harvest" icon_state = "bottle15" - fertilizer = "robustharvest" + reagents_to_add = list(/datum/reagent/toxin/fertilizer/robustharvest = 60) diff --git a/code/modules/hydroponics/trays/tray_soil.dm b/code/modules/hydroponics/trays/tray_soil.dm index 1e9512b4bba..01790ba055b 100644 --- a/code/modules/hydroponics/trays/tray_soil.dm +++ b/code/modules/hydroponics/trays/tray_soil.dm @@ -13,10 +13,10 @@ if (istype(O,/obj/item/reagent_containers)) var/obj/item/reagent_containers/RC = O if (RC.reagents.reagent_list.len == 1) - if (RC.reagents.has_reagent("water", 1)) + if (RC.reagents.has_reagent(/datum/reagent/water, 1)) if (waterlevel < maxWaterLevel) var/amountToRemove = min((maxWaterLevel - waterlevel), RC.reagents.total_volume) - RC.reagents.remove_reagent("water", amountToRemove, 1) + RC.reagents.remove_reagent(/datum/reagent/water, amountToRemove, 1) waterlevel += amountToRemove user.visible_message("[user] pours [amountToRemove]u of water into the soil."," You pour [amountToRemove]u of water into the soil.") else diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index e7290495e98..b1bb1f695d8 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -4,6 +4,7 @@ name = "plant clippers" desc = "A tool used to take samples from plants." icon_state = "plantclippers" + item_state = "plantclippers" item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_hydro.dmi', slot_r_hand_str = 'icons/mob/items/righthand_hydro.dmi', @@ -19,18 +20,6 @@ tf.Translate(-1,0) //Could do this with pixel_x but let's just update the appearance once. transform = tf -/obj/item/wirecutters/pickup(mob/user) - ..() - update_icon() - -/obj/item/wirecutters/dropped(mob/user) - ..() - update_icon() - -/obj/item/wirecutters/attack_hand() - ..() - update_icon() - /obj/item/device/analyzer/plant_analyzer name = "plant analyzer" icon = 'icons/obj/device.dmi' @@ -124,7 +113,7 @@ dat += "
This sample contains: " for(var/datum/reagent/R in grown_reagents.reagent_list) - dat += "
- [R.id], [grown_reagents.get_reagent_amount(R.id)] unit(s)" + dat += "
- [R.name], [grown_reagents.get_reagent_amount(R.type)] unit(s)" dat += "
Other Data
" diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm index 041c0522796..ddd2099d188 100644 --- a/code/modules/integrated_electronics/passive/power.dm +++ b/code/modules/integrated_electronics/passive/power.dm @@ -130,7 +130,7 @@ spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) var/volume = 60 - var/list/fuel = list("phoron" = 50000, "slimejelly" = 25000, "fuel" = 15000, "carbon" = 10000, "ethanol"= 10000, "nutriment" =8000, "blood" = 5000) + var/list/fuel = list(/datum/reagent/toxin/phoron = 50000, /datum/reagent/slimejelly = 25000, /datum/reagent/fuel = 15000, /datum/reagent/carbon = 10000, /datum/reagent/alcohol/ethanol = 10000, /datum/reagent/nutriment = 8000, /datum/reagent/blood = 5000) /obj/item/integrated_circuit/passive/power/chemical_cell/New() ..() diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index 47ccd96e38f..9dee026b7b4 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -508,7 +508,7 @@ set_pin_data(IC_OUTPUT, 1, A) push_data() activate_pin(1) - user.visible_message(span("notice", "[user] waves [assembly] around [A]."), span("notice", "You scan [A] with [assembly].")) + user.visible_message(SPAN_NOTICE("[user] waves [assembly] around [A]."), SPAN_NOTICE("You scan [A] with [assembly].")) return TRUE /obj/item/integrated_circuit/input/atmo_scanner @@ -919,7 +919,7 @@ return FALSE set_pin_data(IC_OUTPUT, 1, A) push_data() - user.visible_message(span("notice", "[user] points [assembly] at [A]."), span("notice", "You scan [A] with [assembly].")) + user.visible_message(SPAN_NOTICE("[user] points [assembly] at [A]."), SPAN_NOTICE("You scan [A] with [assembly].")) activate_pin(1) return TRUE diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 3befe1f97b4..680d6ffd6b4 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -297,7 +297,7 @@ /obj/item/integrated_circuit/reagent/storage/scan/do_work() var/list/cont = list() for(var/datum/reagent/RE in reagents.reagent_list) - cont += RE.id + cont += RE.name set_pin_data(IC_OUTPUT, 3, cont) set_pin_data(IC_OUTPUT, 4, reagents.generate_taste_message(src)) push_data() @@ -352,10 +352,10 @@ return for(var/datum/reagent/G in source.reagents.reagent_list) if (!direc) - if(G.id in demand) - source.reagents.trans_id_to(target, G.id, transfer_amount) + if(lowertext(G.name) in demand) + source.reagents.trans_type_to(target, G.type, transfer_amount) else - if(!(G.id in demand)) - source.reagents.trans_id_to(target, G.id, transfer_amount) + if(!(lowertext(G.name) in demand)) + source.reagents.trans_type_to(target, G.type, transfer_amount) activate_pin(2) push_data() diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm index 385e3e11703..4ddcf044392 100644 --- a/code/modules/item_worth/reagents.dm +++ b/code/modules/item_worth/reagents.dm @@ -138,7 +138,7 @@ /datum/reagent/drink/nuka_cola value = 0.13 -/datum/reagent/drink/doctor_delight +/datum/reagent/drink/doctorsdelight value = 0.3 /datum/reagent/drink/ice @@ -186,7 +186,7 @@ /datum/reagent/alcohol/ethanol/sake value = 0.11 -/datum/reagent/alcohol/ethanol/tequilla +/datum/reagent/alcohol/ethanol/tequila value = 0.1 /datum/reagent/alcohol/ethanol/thirteenloko @@ -258,7 +258,7 @@ /datum/reagent/alcohol/ethanol/cmojito value = 0.14 -/datum/reagent/alcohol/ethanol/changelingsting +/datum/reagent/alcohol/ethanol/gibsonpunch value = 0.19 /datum/reagent/alcohol/ethanol/classic @@ -270,7 +270,7 @@ /datum/reagent/alcohol/ethanol/corkpopper value = 0.13 -/datum/reagent/alcohol/ethanol/cuba_libre +/datum/reagent/alcohol/ethanol/cubalibre value = 0.15 /datum/reagent/alcohol/ethanol/demonsblood @@ -393,10 +393,10 @@ /datum/reagent/alcohol/ethanol/suidream value = 0.12 -/datum/reagent/alcohol/ethanol/syndicatebomb +/datum/reagent/alcohol/ethanol/gibsonhooch value = 0.21 -/datum/reagent/alcohol/ethanol/tequilla_sunrise +/datum/reagent/alcohol/ethanol/tequila_sunrise value = 0.13 /datum/reagent/alcohol/ethanol/threemileisland @@ -639,7 +639,7 @@ /datum/reagent/thermite value = 6 -/datum/reagent/space_cleaner +/datum/reagent/spacecleaner value = 0.7 /datum/reagent/lube diff --git a/code/modules/lighting/lighting_profiler.dm b/code/modules/lighting/lighting_profiler.dm index 84317fe013d..ab690823077 100644 --- a/code/modules/lighting/lighting_profiler.dm +++ b/code/modules/lighting/lighting_profiler.dm @@ -37,5 +37,5 @@ var/err = lprof_q.ErrorMsg() if (err) log_debug("lprof_write: SQL Error: [err]") - message_admins(span("danger", "SQL Error during lighting profiling; disabling!")) + message_admins(SPAN_DANGER("SQL Error during lighting profiling; disabling!")) lighting_profiling = FALSE diff --git a/code/modules/lighting/lighting_verbs.dm b/code/modules/lighting/lighting_verbs.dm index 13de5c55c39..d8d1071da94 100644 --- a/code/modules/lighting/lighting_verbs.dm +++ b/code/modules/lighting/lighting_verbs.dm @@ -14,7 +14,7 @@ var/list/admin_verbs_lighting = list( if (!check_rights(R_DEBUG|R_DEV)) return - to_chat(src, span("notice", "Lighting debug verbs have been shown.")) + to_chat(src, SPAN_NOTICE("Lighting debug verbs have been shown.")) verbs += admin_verbs_lighting /client/proc/lighting_hide_verbs() @@ -24,7 +24,7 @@ var/list/admin_verbs_lighting = list( if (!check_rights(R_DEBUG|R_DEV)) return - to_chat(src, span("notice", "Lighting debug verbs have been hidden.")) + to_chat(src, SPAN_NOTICE("Lighting debug verbs have been hidden.")) verbs -= admin_verbs_lighting /client/proc/lighting_flush() @@ -95,7 +95,7 @@ var/list/admin_verbs_lighting = list( if (!check_rights(R_DEBUG|R_SERVER)) return if (!establish_db_connection(dbcon)) - to_chat(usr, span("alert", "Unable to start profiling: No active database connection.")) + to_chat(usr, SPAN_ALERT("Unable to start profiling: No active database connection.")) return lighting_profiling = !lighting_profiling diff --git a/code/modules/makeshift/makeshift_reagents.dm b/code/modules/makeshift/makeshift_reagents.dm index 1febde1d4a2..5baeb568333 100644 --- a/code/modules/makeshift/makeshift_reagents.dm +++ b/code/modules/makeshift/makeshift_reagents.dm @@ -15,14 +15,14 @@ var/list/forbidden = list(/obj/item/reagent_containers/inhaler, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/glass, /obj/item/extinguisher) // duplicate from blender code, since it's not really worth a define. also, it has fewer things. var/list/sheet_reagents = list( //have a number of reagents which is a factor of REAGENTS_PER_SHEET (default 20) unless you like decimals - /obj/item/stack/material/iron = list("iron"), - /obj/item/stack/material/uranium = list("uranium"), - /obj/item/stack/material/phoron = list("phoron"), - /obj/item/stack/material/gold = list("gold"), - /obj/item/stack/material/silver = list("silver"), - /obj/item/stack/material/steel = list("iron", "carbon"), - /obj/item/stack/material/sandstone = list("silicon", "acetone"), - /obj/item/stack/material/glass = list("silicate"), + /obj/item/stack/material/iron = list(/datum/reagent/iron), + /obj/item/stack/material/uranium = list(/datum/reagent/uranium), + /obj/item/stack/material/phoron = list(/datum/reagent/toxin/phoron), + /obj/item/stack/material/gold = list(/datum/reagent/gold), + /obj/item/stack/material/silver = list(/datum/reagent/silver), + /obj/item/stack/material/steel = list(/datum/reagent/iron, /datum/reagent/carbon), + /obj/item/stack/material/sandstone = list(/datum/reagent/silicon, /datum/reagent/acetone), + /obj/item/stack/material/glass = list(/datum/reagent/silicate), ) // removed borosilicate glass, platinum, and plasteel, too tough. just steal a grinder if you need it /obj/structure/chemkit/Initialize() @@ -32,7 +32,7 @@ /obj/structure/chemkit/examine(mob/user) . = ..() if(analyzer) - to_chat(user, span("notice", "The analyzer displays that the temperature is [round(reagents.get_temperature() - T0C,0.1)]C.")) + to_chat(user, SPAN_NOTICE("The analyzer displays that the temperature is [round(reagents.get_temperature() - T0C,0.1)]C.")) /obj/structure/chemkit/verb/phase_filter() set name = "Set Phase Filter" @@ -42,7 +42,7 @@ return 0 phase_filter = input("Which phase do you want to filter?", "Phase Filter", null) as null|anything in list("solid", "liquid", "gas", "none") if(phase_filter) - to_chat(usr, span("notice", "You switch to a [phase_filter] filter.")) + to_chat(usr, SPAN_NOTICE("You switch to a [phase_filter] filter.")) if(phase_filter == "none") phase_filter = FALSE @@ -59,7 +59,7 @@ /obj/structure/chemkit/attack_hand(mob/user) transfer_out = !transfer_out - to_chat(user, span("notice", "You are now [transfer_out ? "removing from" : "adding to"] \the [src].")) + to_chat(user, SPAN_NOTICE("You are now [transfer_out ? "removing from" : "adding to"] \the [src].")) /obj/structure/chemkit/proc/heat_item(obj/item/W, mob/user) var/joules = 0 @@ -72,7 +72,7 @@ else joules = 500 // we're assuming it's some kind of novelty toy like lunea's gloves, etc; not exactly a match but it still works reagents.add_thermal_energy(joules) - user.visible_message(span("warning", "[user] holds \the [W] up to \the [src]!"), span("notice", "You use \the [W] to heat \the [src]'s contents."), span("notice", "You hear something sizzle.")) + user.visible_message(SPAN_WARNING("[user] holds \the [W] up to \the [src]!"), SPAN_NOTICE("You use \the [W] to heat \the [src]'s contents."), SPAN_NOTICE("You hear something sizzle.")) user.setClickCooldown(joules/5000) // two seconds for welder, 1/5 second for matches but they run out /obj/structure/chemkit/proc/trans_item(obj/item/I, mob/user) @@ -88,10 +88,10 @@ else amt = reagents.trans_to_holder(I.reagents, reagents.get_free_space()) if(amt) - to_chat(user, span("notice", "You fill \the [I] with [amt] units from \the [src].")) + to_chat(user, SPAN_NOTICE("You fill \the [I] with [amt] units from \the [src].")) else if(I.reagents && I.reagents.total_volume) var/amt = I.reagents.trans_to_holder(reagents, I.reagents.total_volume) // just pour it if you can - to_chat(user, span("notice", "You pour [amt] units from \the [I] into \the [src].")) + to_chat(user, SPAN_NOTICE("You pour [amt] units from \the [I] into \the [src].")) /obj/structure/chemkit/proc/smash_sheet(obj/item/stack/stack, mob/user) if(!istype(stack)) @@ -107,19 +107,19 @@ reagents.add_reagent(n, (amount_to_take*REAGENTS_PER_SHEET)*rand(6,8)/10) else reagents.add_reagent(sheet_components, (amount_to_take*REAGENTS_PER_SHEET)*rand(6,8)/10) // 60% to 80% efficiency when crushing sheets - to_chat(user, span("notice", "You [pick("crush","smash","grind")] [stack] into a fine powder.")) + to_chat(user, SPAN_NOTICE("You [pick("crush","smash","grind")] [stack] into a fine powder.")) return /obj/structure/chemkit/proc/smash(obj/item/I, mob/user) if(sheet_reagents[I.type]) smash_sheet(I, user) return - to_chat(user, span("notice", "You [pick("crush","smash","grind")] [I] into a fine [pick("paste","powder","pulp")].")) + to_chat(user, SPAN_NOTICE("You [pick("crush","smash","grind")] [I] into a fine [pick("paste","powder","pulp")].")) I.reagents.trans_to_holder(reagents, I.reagents.total_volume, rand(7, 10)/10) // 70% to 100% from smashing, since it's pretty thorough qdel(I) /obj/structure/chemkit/proc/chop(obj/item/I, mob/user) - to_chat(user, span("notice", "You [pick("chop","cut","slice")] [I] into [pick("small","tiny")] [pick("pieces","chunks","bits","slices")].")) + to_chat(user, SPAN_NOTICE("You [pick("chop","cut","slice")] [I] into [pick("small","tiny")] [pick("pieces","chunks","bits","slices")].")) I.reagents.trans_to_holder(reagents, I.reagents.total_volume, rand(4, 8)/10) // 40% to 80% from chopping, since it's not very efficient qdel(I) @@ -138,14 +138,14 @@ if(!istype(W, /obj/item/reagent_containers/food/snacks) && W.is_open_container()) trans_item(W, user) return - if(isflamesource(W)) + if(W.isFlameSource()) heat_item(W, user) return if(istype(W) && W.force >= 5 && !has_edge(W) && LAZYLEN(contents - analyzer)) var/obj/item/smashed = pick(contents - analyzer) if(!smashed.reagents && !sheet_reagents[smashed.type]) return // should never happen anyway, but still - to_chat(user, span("notice", "You begin to [pick("crush","smash","grind")] [smashed].")) + to_chat(user, SPAN_NOTICE("You begin to [pick("crush","smash","grind")] [smashed].")) if(!do_after(user, 15 SECONDS)) return smash(smashed, user) @@ -197,18 +197,18 @@ /obj/structure/distillery/proc/trans_item(obj/item/W, mob/user) if(transfer_out) if(!reagents.total_volume) - to_chat(user, span("notice", "\The [src] is empty.")) + to_chat(user, SPAN_NOTICE("\The [src] is empty.")) return var/amt = reagents.trans_to_holder(W.reagents, reagents.total_volume) - to_chat(user, span("notice", "You fill \the [W] with [amt] units from \the [src].")) + to_chat(user, SPAN_NOTICE("You fill \the [W] with [amt] units from \the [src].")) return else if(!W.reagents || !W.reagents.total_volume) - to_chat(user, span("notice", "\The [W] is empty.")) + to_chat(user, SPAN_NOTICE("\The [W] is empty.")) return var/amt = min(10, W.reagents.total_volume) W.reagents.trans_to_holder(src.reagents, amt) // just pour it if you can - to_chat(user, span("notice", "You pour [amt] units from \the [W] into \the [src].")) + to_chat(user, SPAN_NOTICE("You pour [amt] units from \the [W] into \the [src].")) return /obj/structure/distillery/proc/distill() @@ -218,12 +218,12 @@ if(!istype(R, /datum/reagent/alcohol)) return var/datum/reagent/alcohol/AR = R - reagents.add_reagent("water", (1-(AR.strength/100))*AR.volume) + reagents.add_reagent(/datum/reagent/water, (1-(AR.strength/100))*AR.volume) if(istype(AR, /datum/reagent/alcohol/ethanol)) - reagents.add_reagent("ethanol", (AR.strength/100)*AR.volume) + reagents.add_reagent(/datum/reagent/alcohol/ethanol, (AR.strength/100)*AR.volume) if(istype(AR, /datum/reagent/alcohol/butanol)) - reagents.add_reagent("butanol", (AR.strength/100)*AR.volume) - reagents.remove_reagent(AR.id, AR.volume) + reagents.add_reagent(/datum/reagent/alcohol/butanol, (AR.strength/100)*AR.volume) + reagents.remove_reagent(AR.type, AR.volume) src.icon_state = "distillery-off" /obj/structure/distillery/attackby(obj/item/W, mob/user) @@ -241,10 +241,10 @@ return if(W.isscrewdriver()) transfer_out = !transfer_out - to_chat(user, span("notice", "You [transfer_out ? "open" : "close"] the spigot on the keg, ready to [transfer_out ? "remove" : "add"] reagents.")) + to_chat(user, SPAN_NOTICE("You [transfer_out ? "open" : "close"] the spigot on the keg, ready to [transfer_out ? "remove" : "add"] reagents.")) return - if(isflamesource(W) && istype(welder)) - to_chat(user, span("notice", "You light \the [src] and begin the distillation process.")) + if(W.isFlameSource() && istype(welder)) + to_chat(user, SPAN_NOTICE("You light \the [src] and begin the distillation process.")) addtimer(CALLBACK(src, .proc/distill), 60 SECONDS) src.icon_state = "distillery-active" return diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 687f5a905bc..46cd409422d 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -99,7 +99,7 @@ else if(istype(get_turf(src), /turf/simulated/floor)) var/turf/simulated/floor/T = get_turf(src) var/turf/below_turf = GetBelow(T) - if(!istype(below_turf.loc, /area/mine)) + if(!istype(below_turf.loc, /area/mine) && !istype(below_turf.loc, /area/template_noop)) system_error("Potential station breach below.") return T.ex_act(2.0) @@ -196,11 +196,33 @@ if(!active) if(default_deconstruction_screwdriver(user, O)) return - if (!panel_open) - if(default_deconstruction_crowbar(user, O)) - return - if(default_part_replacement(user, O)) + if(default_part_replacement(user, O)) + return + + if(istype(O, /obj/item/mining_scanner)) + if(!length(resource_field)) + to_chat(user, SPAN_WARNING("\The [src] has no resource field to draw data from!")) + return + to_chat(user, SPAN_NOTICE("You start drawing the data from \the [src]...")) + if(do_after(user, 50, TRUE)) + if(!length(resource_field)) + to_chat(user, SPAN_WARNING("\The [src] has no resource field to draw data from!")) return + var/list/ore_data = list() + for(var/ore_type in ore_types) + ore_data[ore_type] = 0 + for(var/field in resource_field) + var/turf/T = field + if(!T.resources) + continue + for(var/ore in ore_types) + if(T.resources[ore]) + ore_data[ore] += T.resources[ore] + to_chat(user, SPAN_NOTICE("\The [src] has found this ore in the vicinity, and is able to gather it:")) + for(var/entry in ore_data) + to_chat(user, SPAN_NOTICE(" | [entry] - [ore_data[entry]]")) + return + if(active) return ..() @@ -237,16 +259,37 @@ return if(O.iscrowbar()) - if (panel_open) + if(panel_open) if(cell) - to_chat(user, SPAN_NOTICE("You wrench out \the [cell].")) + to_chat(user, SPAN_NOTICE("You shimmy out \the [cell].")) cell.forceMove(get_turf(user)) component_parts -= cell + user.put_in_hands(cell) cell = null return else to_chat(user, SPAN_WARNING("There's no cell to remove!")) return + else + to_chat(user, SPAN_WARNING("The hatch must be open to take out a power cell.")) + return + + if(istype(O, /obj/item/gripper/miner)) // the gripper will always be empty, because it passes its wrapped object's attack if it has one + var/obj/item/gripper/miner/M = O + if(panel_open) + if(cell) + to_chat(user, SPAN_NOTICE("You use your gripper to squeeze the cell out of its case.")) + cell.forceMove(get_turf(user)) + component_parts -= cell + M.grip_item(cell, user, FALSE) + cell = null + return + else + to_chat(user, SPAN_WARNING("There's no cell to remove!")) + return + else + to_chat(user, SPAN_WARNING("The hatch must be open to take out a power cell.")) + return if(istype(O, /obj/item/cell)) if(panel_open) @@ -259,11 +302,11 @@ cell = O component_parts += O O.add_fingerprint(user) - visible_message(span("notice", "\The [user] inserts a power cell into \the [src]."), - span("notice", "You insert the power cell into \the [src].")) + visible_message("\The [user] inserts a power cell into \the [src].", + SPAN_NOTICE("You insert the power cell into \the [src].")) power_change() else - to_chat(user, span("notice", "The hatch must be open to insert a power cell.")) + to_chat(user, SPAN_WARNING("The hatch must be open to insert a power cell.")) return else ..() diff --git a/code/modules/mining/machine_input_output_plates.dm b/code/modules/mining/machine_input_output_plates.dm index 88b7a6dc635..f4f9184be33 100644 --- a/code/modules/mining/machine_input_output_plates.dm +++ b/code/modules/mining/machine_input_output_plates.dm @@ -4,6 +4,7 @@ icon = 'icons/mob/screen/generic.dmi' icon_state = "x2" name = "Input Area" + invisibility = INVISIBILITY_ABSTRACT density = FALSE anchored = TRUE @@ -15,9 +16,10 @@ icon = 'icons/mob/screen/generic.dmi' icon_state = "x" name = "Output Area" + invisibility = INVISIBILITY_ABSTRACT density = FALSE anchored = TRUE /obj/machinery/mineral/output/Initialize() . = ..() - icon_state = "blank" + icon_state = "blank" \ No newline at end of file diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index be8fed71958..25849fe5b94 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -2,6 +2,8 @@ /obj/machinery/mineral/processing_unit_console name = "ore redemption console" + desc = "A handy console which can be use to retrieve mining points for use in the mining vendor, or to set processing values for various ore types." + desc_info = "Up to date settings for the refinery can be found in the Aurorastation Guide to Mining wikipage." icon = 'icons/obj/terminals.dmi' icon_state = "production_console" density = FALSE @@ -182,10 +184,10 @@ /obj/machinery/mineral/processing_unit_console/proc/print_report(var/mob/living/user) if(!inserted_id) - to_chat(user, span("warning", "No ID inserted. Cannot digitally sign.")) + to_chat(user, SPAN_WARNING("No ID inserted. Cannot digitally sign.")) return if(!input_mats.len && !output_mats.len && !alloy_mats) - to_chat(user, span("warning", "There is no data to print.")) + to_chat(user, SPAN_WARNING("There is no data to print.")) return if(printing) return @@ -279,6 +281,7 @@ /obj/machinery/mineral/processing_unit name = "industrial smelter" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron... //lol fuk u bay it is //i'm gay // based and redpilled + desc = "A large smelter and compression machine which heats up ore, then applies the process specified within the ore redemption console, outputting the result to the other side." icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "furnace-off" density = TRUE diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index ecacc58d075..e8992985cb5 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -2,6 +2,7 @@ /obj/machinery/mineral/stacking_unit_console name = "stacking machine console" + desc = "This console allows you to set the max stack size for the stacking machine, as well as letting you eject stacks manually." icon = 'icons/obj/terminals.dmi' icon_state = "production_console" density = FALSE @@ -11,11 +12,15 @@ idle_power_usage = 15 active_power_usage = 50 -/obj/machinery/mineral/processing_unit_console/Initialize(mapload, d, populate_components) - . = ..() +/obj/machinery/mineral/stacking_unit_console/Initialize(mapload, d, populate_components) + ..() var/mutable_appearance/screen_overlay = mutable_appearance(icon, "production_console-screen", EFFECTS_ABOVE_LIGHTING_LAYER) add_overlay(screen_overlay) set_light(1.4, 1, COLOR_CYAN) + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/mineral/stacking_unit_console/LateInitialize() + setup_machine(null) /obj/machinery/mineral/stacking_unit_console/proc/setup_machine(mob/user) if(!machine) @@ -27,7 +32,7 @@ best_distance = get_dist_euclidian(checked_machine,src) if(machine) machine.console = src - else + else if(user) to_chat(user, SPAN_WARNING("ERROR: Linked machine not found!")) return machine @@ -88,6 +93,7 @@ /obj/machinery/mineral/stacking_machine name = "stacking machine" + desc = "A machine which takes loose stacks of finished sheets and packs them together into one easily transportable sheet." icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "stacker" density = TRUE @@ -121,9 +127,12 @@ break /obj/machinery/mineral/stacking_machine/machinery_process() - ..() if(!console) return + if(stat & BROKEN) + return + if(stat & NOPOWER) + return if(output && input) var/turf/T = get_turf(input) @@ -141,4 +150,4 @@ for(var/sheet in stack_storage) if(stack_storage[sheet] >= stack_amt) new sheet(get_turf(output), stack_amt) - stack_storage[sheet] -= stack_amt + stack_storage[sheet] -= stack_amt \ No newline at end of file diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm index 4a3204122ea..db8800d7262 100644 --- a/code/modules/mining/machine_unloading.dm +++ b/code/modules/mining/machine_unloading.dm @@ -1,8 +1,8 @@ /**********************Unloading unit**************************/ - /obj/machinery/mineral/unloading_machine name = "unloading machine" + desc = "A machine capable of unloading an ore box or ore scattered on the floor within its input zone, to its output zone." icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "unloader" density = TRUE diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index d6220ad536c..0f1bb34620d 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -459,6 +459,13 @@ newflag.set_light(2) src.use(1) +/obj/item/stack/flag/purple/borg + name = "stationbound beacon deployer" + desc = "A stationbound-mounted beacon deployer, deploys standard purple beacons in accordance with the mining colour scheme. Uses a metal synthesizer to produce more." + charge_costs = list(1500) + uses_charge = TRUE + stacktype = /obj/item/stack/flag/purple + /**********************Miner Carts***********************/ // RRF refactored into RFD-M, found in RFD.dm @@ -772,7 +779,7 @@ if(istype(target, /mob/living/simple_animal)) var/mob/living/simple_animal/M = target if(!(M.find_type() & revive_type)) - to_chat(user, span("info", "\The [src] does not work on this sort of creature.")) + to_chat(user, SPAN_INFO("\The [src] does not work on this sort of creature.")) return if(M.stat == DEAD) if(!malfunctioning) @@ -785,10 +792,10 @@ playsound(src, 'sound/effects/refill.ogg', 50, TRUE) return else - to_chat(user, span("info", "\The [src] is only effective on the dead.")) + to_chat(user, SPAN_INFO("\The [src] is only effective on the dead.")) return else - to_chat(user, span("info", "\The [src] is only effective on lesser beings.")) + to_chat(user, SPAN_INFO("\The [src] is only effective on lesser beings.")) return /obj/item/lazarus_injector/emp_act() @@ -798,9 +805,9 @@ /obj/item/lazarus_injector/examine(mob/user) ..() if(!loaded) - to_chat(user, span("info", "\The [src] is empty.")) + to_chat(user, SPAN_INFO("\The [src] is empty.")) if(malfunctioning) - to_chat(user, span("info", "The display on \the [src] seems to be flickering.")) + to_chat(user, SPAN_INFO("The display on \the [src] seems to be flickering.")) /**********************Point Transfer Card**********************/ @@ -815,10 +822,10 @@ if(points) var/obj/item/card/id/C = I C.mining_points += points - to_chat(user, span("info", "You transfer [points] points to \the [C].")) + to_chat(user, SPAN_INFO("You transfer [points] points to \the [C].")) points = 0 else - to_chat(user, span("info", "There's no points left on \the [src].")) + to_chat(user, SPAN_INFO("There's no points left on \the [src].")) ..() /obj/item/card/mining_point_card/examine(mob/user) @@ -974,10 +981,10 @@ var/list/total_extraction_beacons = list() /obj/item/resonator/attack_self(mob/user) if(burst_time == 50) burst_time = 30 - to_chat(user, span("info", "You set the resonator's fields to detonate after 3 seconds.")) + to_chat(user, SPAN_INFO("You set the resonator's fields to detonate after 3 seconds.")) else burst_time = 50 - to_chat(user, span("info", "You set the resonator's fields to detonate after 5 seconds.")) + to_chat(user, SPAN_INFO("You set the resonator's fields to detonate after 5 seconds.")) /obj/item/resonator/afterattack(atom/target, mob/user, proximity_flag) ..() diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 849a8eedb6b..69c1a41e297 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -105,22 +105,22 @@ var/list/mineral_can_smooth_with = list( if(mineral) switch(mined_ore) if(0) - to_chat(user, span("info", "It is ripe with [mineral.display_name].")) + to_chat(user, SPAN_INFO("It is ripe with [mineral.display_name].")) if(1) - to_chat(user, span("info", "Its [mineral.display_name] looks a little depleted.")) + to_chat(user, SPAN_INFO("Its [mineral.display_name] looks a little depleted.")) if(2) - to_chat(user, span("info", "Its [mineral.display_name] looks very depleted!")) + to_chat(user, SPAN_INFO("Its [mineral.display_name] looks very depleted!")) else - to_chat(user, span("info", "It is devoid of any valuable minerals.")) + to_chat(user, SPAN_INFO("It is devoid of any valuable minerals.")) switch(emitter_blasts_taken) if(0) - to_chat(user, span("info", "It is in pristine condition.")) + to_chat(user, SPAN_INFO("It is in pristine condition.")) if(1) - to_chat(user, span("info", "It appears a little damaged.")) + to_chat(user, SPAN_INFO("It appears a little damaged.")) if(2) - to_chat(user, span("info", "It is crumbling!")) + to_chat(user, SPAN_INFO("It is crumbling!")) if(3) - to_chat(user, span("info", "It looks ready to collapse at any moment!")) + to_chat(user, SPAN_INFO("It looks ready to collapse at any moment!")) /turf/simulated/mineral/ex_act(severity) switch(severity) @@ -395,8 +395,8 @@ var/list/mineral_can_smooth_with = list( if(prob(25)) var/datum/reagents/R = new/datum/reagents(20) R.my_atom = src - R.add_reagent("stone_dust",20) - var/datum/effect/effect/system/smoke_spread/chem/S = new("stone_dust") + R.add_reagent(/datum/reagent/stone_dust,20) + var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem(/datum/reagent/stone_dust) // have to explicitly say the type to avoid issues with warnings S.show_log = 0 S.set_up(R, 10, 0, src, 40) S.start() @@ -808,7 +808,7 @@ var/list/asteroid_floor_smooth = list( var/area/below_area = get_area(below) // Let's just assume that the turf is not in nullspace. if(below_area.station_area) if(user) - to_chat(user, span("alert", "You strike metal!")) + to_chat(user, SPAN_ALERT("You strike metal!")) below.spawn_roof(ROOF_FORCE_SPAWN) else ChangeTurf(/turf/space) diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 05232e53d84..2d9a9d752a6 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -76,27 +76,27 @@ welcome_drone() /mob/living/silicon/robot/drone/mining/welcome_drone() - to_chat(src, span("danger", "You are a mining drone, a tiny-brained robotic industrial machine.")) - to_chat(src, span("danger", "You have little individual will, some personality, and no drives or urges other than your laws and the art of mining.")) - to_chat(src, span("danger", "Remember, you DO NOT take orders from the AI.")) + to_chat(src, SPAN_DANGER("You are a mining drone, a tiny-brained robotic industrial machine.")) + to_chat(src, SPAN_DANGER("You have little individual will, some personality, and no drives or urges other than your laws and the art of mining.")) + to_chat(src, SPAN_DANGER("Remember, you DO NOT take orders from the AI.")) /mob/living/silicon/robot/drone/mining/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/borg/upgrade)) - to_chat(user, span("warning", "\The [src] is not compatible with \the [W].")) + to_chat(user, SPAN_WARNING("\The [src] is not compatible with \the [W].")) return else if (istype(W, /obj/item/card/id) || istype(W, /obj/item/device/pda)) if(!allowed(user)) - to_chat(user, span("warning", "Access denied.")) + to_chat(user, SPAN_WARNING("Access denied.")) return if(seeking_player) to_chat(user, SPAN_WARNING("\The [src] is already in the reboot process.")) return if(!config.allow_drone_spawn || emagged || health < -maxHealth) //It's dead, Dave. - to_chat(user, span("warning", "The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.")) + to_chat(user, SPAN_WARNING("The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.")) return - user.visible_message(span("warning", "\The [user] swipes \his ID card through \the [src], attempting to reboot it."), span("warning", "You swipe your ID card through \the [src], attempting to reboot it.")) + user.visible_message(SPAN_WARNING("\The [user] swipes \his ID card through \the [src], attempting to reboot it."), SPAN_WARNING("You swipe your ID card through \the [src], attempting to reboot it.")) request_player() return ..() @@ -109,7 +109,7 @@ var/turf/T = get_turf(src) if (!T || isStationLevel(T.z)) return - to_chat(src, span("danger", "WARNING: Removal from NanoTrasen property detected. Anti-Theft mode activated.")) + to_chat(src, SPAN_DANGER("WARNING: Removal from NanoTrasen property detected. Anti-Theft mode activated.")) gib() /**********************Minebot Upgrades**********************/ @@ -124,11 +124,11 @@ if(!istype(M) || !proximity) return if(upgrade_bot(M, user)) - to_chat(user, span("notice", "You successfully install \the [src] into \the [M].")) + to_chat(user, SPAN_NOTICE("You successfully install \the [src] into \the [M].")) /obj/item/device/mine_bot_upgrade/proc/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user) if(M.melee_upgrade) - to_chat(user, span("warning", "[src] already has a drill upgrade installed!")) + to_chat(user, SPAN_WARNING("[src] already has a drill upgrade installed!")) return M.mod_type = initial(M.mod_type) M.uneq_all() @@ -149,7 +149,7 @@ /obj/item/device/mine_bot_upgrade/health/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user) if(M.health_upgrade) - to_chat(user, span("warning", "[src] already has a reinforced chassis!")) + to_chat(user, SPAN_WARNING("[src] already has a reinforced chassis!")) return M.maxHealth = 100 M.health += 55 diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm index 2475a093db4..5db1872a7c3 100644 --- a/code/modules/mining/ore_datum.dm +++ b/code/modules/mining/ore_datum.dm @@ -64,8 +64,8 @@ var/global/list/ore_data = list() /ore/glass name = ORE_SAND display_name = MATERIAL_GLASS - smelts_to = "glass" - compresses_to = "sandstone" + smelts_to = MATERIAL_GLASS + compresses_to = MATERIAL_SANDSTONE worth = 1 /ore/phoron @@ -73,9 +73,9 @@ var/global/list/ore_data = list() display_name = "phoron crystals" compresses_to = MATERIAL_PHORON result_amount = 5 - spread_chance = 25 + spread_chance = 5 ore = /obj/item/ore/phoron - scan_icon = "mineral_uncommon" + scan_icon = "mineral_rare" xarch_ages = list( "thousand" = 999, "million" = 999, @@ -83,7 +83,7 @@ var/global/list/ore_data = list() "billion_lower" = 10 ) xarch_source_mineral = "phoron" - worth = 8 + worth = 30 /ore/silver name = ORE_SILVER @@ -114,7 +114,7 @@ var/global/list/ore_data = list() /ore/diamond name = "diamond" display_name = "diamond" - compresses_to = "diamond" + compresses_to = MATERIAL_DIAMOND result_amount = 5 spread_chance = 5 ore = /obj/item/ore/diamond @@ -125,8 +125,8 @@ var/global/list/ore_data = list() /ore/platinum name = ORE_PLATINUM display_name = "raw platinum" - smelts_to = "platinum" - compresses_to = "osmium" + smelts_to = MATERIAL_PLATINUM + compresses_to = MATERIAL_OSMIUM alloy = TRUE result_amount = 5 spread_chance = 15 @@ -137,7 +137,7 @@ var/global/list/ore_data = list() /ore/hydrogen name = ORE_HYDROGEN display_name = "metallic hydrogen" - smelts_to = "tritium" - compresses_to = "mhydrogen" + smelts_to = MATERIAL_TRITIUM + compresses_to = MATERIAL_HYDROGEN_METALLIC scan_icon = "mineral_rare" worth = 30 \ No newline at end of file diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 820b836e6ba..0ff106f9d6b 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -31,7 +31,7 @@ S.remove_from_storage_deferred(O, src, user) //This will move the item to this item's contents CHECK_TICK S.post_remove_from_storage_deferred(loc, user) - to_chat(user, span("notice", "You empty the satchel into the box.")) + to_chat(user, SPAN_NOTICE("You empty the satchel into the box.")) if(istype(W, /obj/item/warp_core)) if(warp_core) to_chat(user, SPAN_WARNING("\The [src] already has a warp core attached!")) diff --git a/code/modules/mob/abstract/new_player/login.dm b/code/modules/mob/abstract/new_player/login.dm index d73660d3b3d..7f75440b574 100644 --- a/code/modules/mob/abstract/new_player/login.dm +++ b/code/modules/mob/abstract/new_player/login.dm @@ -1,26 +1,3 @@ -/var/obj/effect/lobby_image - -/obj/effect/lobby_image - name = "Aurorastation" - desc = "This shouldn't be read" - icon = 'icons/misc/title.dmi' - screen_loc = "WEST,SOUTH" - -/obj/effect/lobby_image/New() - ..() - if (current_map.lobby_icon) - icon = current_map.lobby_icon - var/list/known_icon_states = icon_states(icon) - for(var/lobby_screen in current_map.lobby_screens) - if(!(lobby_screen in known_icon_states)) - error("Lobby screen '[lobby_screen]' did not exist in the icon set [icon].") - current_map.lobby_screens -= lobby_screen - - if(current_map.lobby_screens.len) - icon_state = pick(current_map.lobby_screens) - else - icon_state = known_icon_states[1] - /mob/abstract/new_player var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled @@ -37,22 +14,11 @@ mind.current = src loc = null - show_title() my_client = client sight |= SEE_TURFS player_list |= src - new_player_panel() spawn(40) if(client) - client.playtitlemusic() - -/mob/abstract/new_player/proc/show_title() - set waitfor = FALSE - if (lobby_image) - client.screen += lobby_image - return - - sleep(5) - .() + client.playtitlemusic() \ No newline at end of file diff --git a/code/modules/mob/abstract/new_player/logout.dm b/code/modules/mob/abstract/new_player/logout.dm index b223deb6681..03a9fffde12 100644 --- a/code/modules/mob/abstract/new_player/logout.dm +++ b/code/modules/mob/abstract/new_player/logout.dm @@ -3,7 +3,6 @@ // see login.dm if(my_client) - my_client.screen -= lobby_image my_client = null ..() diff --git a/code/modules/mob/abstract/new_player/menu.dm b/code/modules/mob/abstract/new_player/menu.dm new file mode 100644 index 00000000000..c797f4ec4f9 --- /dev/null +++ b/code/modules/mob/abstract/new_player/menu.dm @@ -0,0 +1,256 @@ +//MENU SYSTEM BY BIGRAGE, some awful code, some awful design, all as you love //Code edits/additions by AshtonFox +/mob/abstract/new_player/instantiate_hud(datum/hud/HUD, ui_style, ui_color, ui_alpha) + HUD.new_player_hud(ui_style, ui_color, ui_alpha) + HUD.mymob = src + +/datum/hud/new_player + hud_shown = TRUE + inventory_shown = FALSE + hotkey_ui_hidden = FALSE + +/datum/hud/proc/new_player_hud(var/ui_style='icons/mob/screen/white.dmi', var/ui_color = "#fffffe", var/ui_alpha = 255) + adding = list() + var/obj/screen/using + + using = new /obj/screen/new_player/title() + using.name = "Title" + adding += using + + using = new /obj/screen/new_player/selection/join_game(src) + using.name = "Join Game" + adding += using + + using = new /obj/screen/new_player/selection/settings() + using.name = "Setup Character" + adding += using + + using = new /obj/screen/new_player/selection/manifest() + using.name = "Crew Manifest" + adding += using + + using = new /obj/screen/new_player/selection/observe() + using.name = "Observe" + adding += using + + using = new /obj/screen/new_player/selection/changelog() + using.name = "Changelog" + adding += using + + using = new /obj/screen/new_player/selection/polls() + using.name = "Polls" + adding += using + + mymob.client.screen = list() + mymob.client.screen += adding + src.adding += using + +/obj/screen/new_player + icon = 'icons/misc/hudmenu.dmi' + layer = HUD_LAYER + +/obj/screen/new_player/title + name = "Title" + screen_loc = "WEST,SOUTH" + var/lobby_index = 1 + +/obj/screen/new_player/title/Initialize() + icon = current_map.lobby_icon + var/list/known_icon_states = icon_states(icon) + for(var/lobby_screen in current_map.lobby_screens) + if(!(lobby_screen in known_icon_states)) + error("Lobby screen '[lobby_screen]' did not exist in the icon set [icon].") + current_map.lobby_screens -= lobby_screen + + if(length(current_map.lobby_screens)) + if(current_map.lobby_transitions && isnum(current_map.lobby_transitions)) + icon_state = current_map.lobby_screens[lobby_index] + if(Master.initializing) + spawn(current_map.lobby_transitions) + Update() + else + addtimer(CALLBACK(src, .proc/Update), current_map.lobby_transitions, TIMER_UNIQUE | TIMER_CLIENT_TIME | TIMER_OVERRIDE) + else + icon_state = pick(current_map.lobby_screens) + else + icon_state = LAZYACCESS(known_icon_states, 1) + + . = ..() + +/obj/screen/new_player/title/proc/Update() + lobby_index += 1 + if (lobby_index > length(current_map.lobby_screens)) + lobby_index = 1 + animate(src, alpha = 0, time = 1 SECOND) + animate(alpha = 255, icon_state = current_map.lobby_screens[lobby_index], time = 1 SECOND) + if(Master.initializing) + spawn(current_map.lobby_transitions) + Update() + else + addtimer(CALLBACK(src, .proc/Update), current_map.lobby_transitions, TIMER_UNIQUE | TIMER_CLIENT_TIME | TIMER_OVERRIDE) + +/obj/screen/new_player/selection/join_game + name = "Join Game" + icon_state = "unready" + screen_loc = "LEFT+1,CENTER" + +/obj/screen/new_player/selection/settings + name = "Setup" + icon_state = "setup" + screen_loc = "LEFT+1,CENTER-1" + +/obj/screen/new_player/selection/manifest + name = "Crew Manifest" + icon_state = "manifest" + screen_loc = "LEFT+1,CENTER-2" + +/obj/screen/new_player/selection/observe + name = "Observe" + icon_state = "observe" + screen_loc = "LEFT+1,CENTER-3" + +/obj/screen/new_player/selection/changelog + name = "Changelog" + icon_state = "changelog" + screen_loc = "LEFT+1,CENTER-4" + +/obj/screen/new_player/selection/polls + name = "Polls" + icon_state = "polls" + screen_loc = "LEFT+1,CENTER-5" + +//SELECTION + +/obj/screen/new_player/selection/New(var/desired_loc) + color = null + return ..() + +/obj/screen/new_player/selection/MouseEntered(location,control,params) //Yellow color for the font + color = "#ffb200" + var/matrix/M = matrix() + M.Scale(1.1, 1.1) + animate(src, transform = M, time = 1, easing = CUBIC_EASING) + return ..() + +/obj/screen/new_player/selection/MouseExited(location,control,params) + color = null + animate(src, transform = null, time = 1, easing = CUBIC_EASING) + return ..() + +/obj/screen/new_player/selection/join_game/New(var/datum/hud/H) + hud = H + var/mob/abstract/new_player/player = hud.mymob + update_icon(player) + +/obj/screen/new_player/selection/join_game/Click() + var/mob/abstract/new_player/player = usr + sound_to(player, 'sound/effects/pop.ogg') + if(SSticker.current_state <= GAME_STATE_SETTING_UP) + if(player.ready) + player.ready = FALSE + player.ready(FALSE) + else + player.ready = TRUE + player.ready(TRUE) + else + player.join_game() + update_icon(player) + +/obj/screen/new_player/selection/join_game/update_icon(var/mob/abstract/new_player/player) + if(SSticker.current_state <= GAME_STATE_SETTING_UP) + if(player.ready) + icon_state = "ready" + else + icon_state = "unready" + else + icon_state = "joingame" + +/obj/screen/new_player/selection/manifest/Click() + var/mob/abstract/new_player/player = usr + sound_to(player, 'sound/effects/pop.ogg') + player.ViewManifest() + +/obj/screen/new_player/selection/observe/Click() + var/mob/abstract/new_player/player = usr + sound_to(player, 'sound/effects/pop.ogg') + player.new_player_observe() + +/obj/screen/new_player/selection/settings/Click() + var/mob/abstract/new_player/player = usr + sound_to(player, 'sound/effects/pop.ogg') + player.setupcharacter() + +/obj/screen/new_player/selection/changelog/Click() + var/mob/abstract/new_player/player = usr + sound_to(player, 'sound/effects/pop.ogg') + player.client.changes() + +/obj/screen/new_player/selection/poll/Click() + var/mob/abstract/new_player/player = usr + sound_to(player, 'sound/effects/pop.ogg') + player.handle_player_polling() + +/mob/abstract/new_player/proc/setupcharacter() + client.prefs.ShowChoices(src) + return TRUE + +/mob/abstract/new_player/proc/ready(var/readying = TRUE) + if(SSticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started + // Cannot join without a saved character, if we're on SQL saves. + if (config.sql_saves && !client.prefs.current_character) + alert(src, "You have not saved your character yet. Please do so before readying up.") + return + if(client.unacked_warning_count > 0) + alert(src, "You can not ready up, because you have unacknowledged warnings. Acknowledge your warnings in OOC->Warnings and Notifications.") + return + + ready = readying + else + ready = FALSE + +/mob/abstract/new_player/proc/join_game(href, href_list) + if(SSticker.current_state <= GAME_STATE_SETTING_UP || SSticker.current_state >= GAME_STATE_FINISHED) + to_chat(usr, "The round is either not ready, or has already finished...") + return + LateChoices() //show the latejoin job selection menu + +/mob/abstract/new_player/proc/new_player_observe() + if(!SSATOMS_IS_PROBABLY_DONE) + // Don't allow players to observe until initialization is more or less complete. + // Letting them join too early breaks things, they can wait. + alert(src, "Please wait, the map is not initialized yet.") + return 0 + + if(alert(src,"Are you sure you wish to observe? You will have to wait [config.respawn_delay] minutes before being able to respawn!","Player Setup","Yes","No") == "Yes") + if(!client) + return TRUE + var/mob/abstract/observer/observer = new /mob/abstract/observer(src) + spawning = 1 + sound_to(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1)) + + + observer.started_as_observer = 1 + close_spawn_windows() + var/obj/O = locate("landmark*Observer-Start") + if(istype(O)) + to_chat(src, "Now teleporting.") + observer.forceMove(O.loc) + else + to_chat(src, "Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.") + observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly. + + announce_ghost_joinleave(src) + var/mob/living/carbon/human/dummy/mannequin/mannequin = new + client.prefs.dress_preview_mob(mannequin) + observer.appearance = mannequin + observer.alpha = 127 + observer.layer = initial(observer.layer) + observer.invisibility = initial(observer.invisibility) + observer.desc = initial(observer.desc) + + observer.real_name = client.prefs.real_name + observer.name = observer.real_name + if(!client.holder && !config.antag_hud_allowed) + observer.verbs -= /mob/abstract/observer/verb/toggle_antagHUD + observer.ckey = ckey + observer.initialise_postkey() + qdel(src) \ No newline at end of file diff --git a/code/modules/mob/abstract/new_player/new_player.dm b/code/modules/mob/abstract/new_player/new_player.dm index be2b6cada54..ce5cb011202 100644 --- a/code/modules/mob/abstract/new_player/new_player.dm +++ b/code/modules/mob/abstract/new_player/new_player.dm @@ -22,54 +22,6 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) . = ..() dead_mob_list -= src -/mob/abstract/new_player/verb/new_player_panel() - set src = usr - new_player_panel_proc() - -/mob/abstract/new_player/proc/new_player_panel_proc() - var/output = "" - var/character_name = client.prefs.real_name - if(current_map.description) - output += "[current_map.description]
" - - output += "Setup Character " - output += "Observe " - if(ROUND_IS_STARTED) - output += "View the Crew Manifest " - - if(!IsGuestKey(src.key)) - establish_db_connection(dbcon) - - if(dbcon.IsConnected()) - var/isadmin = 0 - if(src.client && src.client.holder) - isadmin = 1 - var/DBQuery/query = dbcon.NewQuery("SELECT id FROM ss13_poll_question WHERE [(isadmin ? "" : "adminonly = false AND")] Now() BETWEEN starttime AND endtime AND id NOT IN (SELECT pollid FROM ss13_poll_vote WHERE ckey = \"[ckey]\") AND id NOT IN (SELECT pollid FROM ss13_poll_textreply WHERE ckey = \"[ckey]\")") - query.Execute() - var/newpoll = 0 - while(query.NextRow()) - newpoll = 1 - break - - if(newpoll) - output += "Show Player Polls (NEW!)" - else - output += "Show Player Polls" - - if(character_name) - output += "
You will board as [character_name]
" - if(ROUND_IS_STARTED) - output += "Join the Game " - else - if(ready) - output += "Un-Ready " - else - output += "Ready Up " - - output += "
Station Announcement:
") - to_world(span("danger", "Warning! Localized Gravity Failure in \the [Area]. Brace for dangerous gravity change!")) + to_world(SPAN_DANGER("Warning! Localized Gravity Failure in \the [Area]. Brace for dangerous gravity change!")) sleep(50) set_state(FALSE) sleep(30) @@ -478,5 +478,5 @@ var/obj/item/clothing/shoes/magboots/boots = H.get_equipped_item(slot_shoes) if(istype(boots)) continue - to_chat(M, span("danger", "Suddenly the gravity pushed you up to the ceiling and dropped you back on the floor with great force!")) + to_chat(M, SPAN_DANGER("Suddenly the gravity pushed you up to the ceiling and dropped you back on the floor with great force!")) M.fall_impact(1) diff --git a/code/modules/power/lights/bulbs.dm b/code/modules/power/lights/bulbs.dm index 2cf64c276ca..b9faf340130 100644 --- a/code/modules/power/lights/bulbs.dm +++ b/code/modules/power/lights/bulbs.dm @@ -152,7 +152,7 @@ to_chat(user, SPAN_NOTICE("You inject the solution into \the [src].")) - if(S.reagents.has_reagent("phoron", 5)) + if(S.reagents.has_reagent(/datum/reagent/toxin/phoron, 5)) log_admin("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.",ckey=key_name(user)) message_admins("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.") diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 4110d112990..a0d8e24d8c2 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -197,7 +197,7 @@ field_generator power level display if(draw_power(round(power_draw)) >= power_draw) return 1 else - visible_message(span("alert", "\The [src] shuts down!")) + visible_message(SPAN_ALERT("\The [src] shuts down!")) turn_off() investigate_log("ran out of power and deactivated","singulo") src.power = 0 diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 6ad9232f667..1be618a8b76 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -117,15 +117,15 @@ if(can_move(T) && can_dunk(get_turf(src),T,move_dir)) switch(z_move) if(1) - visible_message(span("danger","\The [src] gravitates upwards!")) + visible_message(SPAN_DANGER("\The [src] gravitates upwards!")) zMove(UP) - visible_message(span("danger","\The [src] gravitates from below!")) + visible_message(SPAN_DANGER("\The [src] gravitates from below!")) if(0) Move(T) if(-1) - visible_message(span("danger","\The [src] gravitates downwards!")) + visible_message(SPAN_DANGER("\The [src] gravitates downwards!")) zMove(DOWN) - visible_message(span("danger","\The [src] gravitates from above!")) + visible_message(SPAN_DANGER("\The [src] gravitates from above!")) if(dir in alldirs) dir = move_dir @@ -394,7 +394,7 @@ var/obj/singularity/energy_ball/E = source if(E.energy && (E.orbiting_balls.len > rods_count * 4)) // so that miniballs don't fry stuff. melt = TRUE // 1 grounding rod can handle max 4 balls - E.visible_message(span("danger", "All [E.orbiting_balls.len] energize for a second, sending their energy to the main ball, which redirects it at the nearest object! Sacrificing one of its miniballs!")) + E.visible_message(SPAN_DANGER("All [E.orbiting_balls.len] energize for a second, sending their energy to the main ball, which redirects it at the nearest object! Sacrificing one of its miniballs!")) for(var/obj/singularity/energy_ball/mini in E.orbiting_balls) mini.Beam(source, icon_state="lightning[rand(1,12)]", icon = 'icons/effects/effects.dmi', time=2) playsound(source.loc, 'sound/magic/lightning_chargeup.ogg', 100, 1, extrarange = 30) diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 12784d7536e..0b9a196df51 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -11,6 +11,7 @@ var/leaves_residue = 1 var/caliber = "" //Which kind of guns it can be loaded into + var/max_stack = 5 // how many of us can fit in a pile var/projectile_type //The bullet type to create when New() is called var/obj/item/projectile/BB = null //The loaded bullet - make it so that the projectiles are created only when needed? var/spent_icon = "s-casing-spent" @@ -47,7 +48,22 @@ else to_chat(user, "You inscribe \"[label_text]\" into \the [initial(BB.name)].") BB.name = "[initial(BB.name)] (\"[label_text]\")" - + else if(istype(W, /obj/item/ammo_casing)) + if(W.type != src.type) + to_chat(user, SPAN_WARNING("Ammo of different types cannot stack!")) + return + if(max_stack == 1) + to_chat(user, SPAN_WARNING("\The [src] cannot be stacked!")) + return + if(!src.BB) + to_chat(user, SPAN_WARNING("That round is spent!")) + return + var/obj/item/ammo_casing/B = W + if(!B.BB) + to_chat(user, SPAN_WARNING("Your round is spent!")) + return + var/obj/item/ammo_pile/pile = new /obj/item/ammo_pile(get_turf(user), list(src, W)) + user.put_in_hands(pile) ..() /obj/item/ammo_casing/update_icon() diff --git a/code/modules/projectiles/ammunition/ammo_pile.dm b/code/modules/projectiles/ammunition/ammo_pile.dm new file mode 100644 index 00000000000..0631f6b95d2 --- /dev/null +++ b/code/modules/projectiles/ammunition/ammo_pile.dm @@ -0,0 +1,173 @@ +/obj/item/ammo_pile + name = "ammo pile" + desc = "A handful of some kind of ammunition." + w_class = ITEMSIZE_SMALL + + var/list/ammo = list() + var/list/ammo_overlays = list() + var/image/ammo_overlay = list() + var/ammo_type // the type of ammo this ammo pile accepts + var/max_ammo = 5 + +/obj/item/ammo_pile/Initialize(mapload, var/list/provided_ammo) + . = ..() + if(islist(provided_ammo)) + var/obj/first_round = provided_ammo[1] + add_ammo(first_round) + check_name_and_ammo() + provided_ammo -= first_round + for(var/obj/rounds in provided_ammo) + add_ammo(rounds) + else if(ammo_type) + var/obj/first_round = new ammo_type() + add_ammo(first_round) + check_name_and_ammo() + for(var/i = 1, i <= max_ammo - 1, i++) + var/obj/C = new ammo_type() + add_ammo(C) + addtimer(CALLBACK(src, .proc/check_ammo), 5) // if we don't have any ammo in 5 deciseconds, we're an empty pile, which is worthless, so self-delete + +/obj/item/ammo_pile/examine(mob/user) + . = ..() + if(Adjacent(user)) + to_chat(user, SPAN_NOTICE("It contains [length(ammo)] rounds.")) + +/obj/item/ammo_pile/attack() + return + +/obj/item/ammo_pile/afterattack(atom/A, mob/living/user, proximity_flag) + if(!proximity_flag) + return + if(!length(ammo)) + check_ammo() + + if(A.type == ammo_type) + if(length(ammo) >= max_ammo) + to_chat(user, SPAN_WARNING("\The [src] is already fully stacked.")) + return + var/obj/item/ammo_casing/B = A + if(!B.BB) + to_chat(user, SPAN_WARNING("\The [B] is spent!")) + return + to_chat(user, SPAN_NOTICE("You add \the [A] to \the [src].")) + add_ammo(A) + else if(istype(A, /obj/item/ammo_pile)) + if(length(ammo) >= max_ammo) + to_chat(user, SPAN_WARNING("\The [src] is already fully stacked.")) + return + var/obj/item/ammo_pile/target_pile = A + if(target_pile.ammo_type != src.ammo_type) + to_chat(user, SPAN_WARNING("\The [target_pile] has a different type of ammunition!")) + return + var/amount_taken = 0 + for(var/obj/bullet in target_pile.ammo) + if(length(src.ammo) >= src.max_ammo) + break + src.add_ammo(bullet) + target_pile.remove_ammo() + amount_taken++ + to_chat(user, SPAN_NOTICE("You take [amount_taken] rounds from the other pile and add it to yours.")) + else if(istype(A, /obj/item/gun) || istype(A, /obj/item/ammo_magazine)) + var/obj/bullet = get_next_ammo() + A.attackby(bullet, user) + if(!(bullet in src)) // if the gun / mag accepted the bullet, it will no longer be in our pile + remove_ammo() + +/obj/item/ammo_pile/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/ammo_casing)) + if(W.type != ammo_type) + to_chat(user, SPAN_WARNING("\The [W] has a different type of ammunition!")) + return + if(length(ammo) >= max_ammo) + to_chat(user, SPAN_WARNING("\The [src] is already fully stacked.")) + return + var/obj/item/ammo_casing/B = W + if(!B.BB) + to_chat(user, SPAN_WARNING("\The [B] is spent!")) + return + to_chat(user, SPAN_NOTICE("You add \the [W] to \the [src].")) + add_ammo(W) + return + ..() + +/obj/item/ammo_pile/attack_hand(mob/user) + if(user.get_inactive_hand() == src) + var/obj/item/ammo_casing/C = get_next_ammo() + user.put_in_hands(C) + remove_ammo() + else + ..() + +/obj/item/ammo_pile/proc/check_name_and_ammo() + if(length(ammo)) + var/obj/item/ammo_casing/first_round = ammo[1] + name = "[first_round.caliber] pile" + desc = "A pile of [first_round.caliber] rounds." + max_ammo = first_round.max_stack + +/obj/item/ammo_pile/proc/get_next_ammo() //Returns the next shell to be used. + if(!length(ammo)) + qdel(src) + return null + var/obj/item/ammo_casing/to_load = ammo[1] + return to_load + +/obj/item/ammo_pile/proc/check_ammo() + var/ammo_amount = length(ammo) + switch(ammo_amount) + if(0) + qdel(src) + if(1) + var/obj/bullet = ammo[1] + bullet.forceMove(get_turf(src)) + var/mob/gunman + if(ismob(loc)) + gunman = loc + qdel(src) + if(gunman) + gunman.put_in_hands(bullet) + if(ammo_amount) + var/obj/first_round = ammo[1] + if(ammo_amount > 7) + w_class = first_round.w_class + 2 // too many to fit in your pockets, generally + else + w_class = first_round.w_class + 1 + +/obj/item/ammo_pile/proc/add_ammo(var/obj/item/ammo_casing/bullet) + if(!bullet.BB) + return + if(ismob(bullet.loc)) + var/mob/gunman = bullet.loc + gunman.drop_from_inventory(bullet, src) + bullet.forceMove(src) + ammo += bullet + var/image/ammo_picture = image(bullet.icon, bullet.icon_state, dir = pick(alldirs)) + ammo_picture.pixel_x = rand(-6, 6) + ammo_picture.pixel_y = rand(-6, 6) + ammo_overlay[bullet] = ammo_picture + add_overlay(ammo_overlay[bullet]) + +/obj/item/ammo_pile/proc/remove_ammo(var/atom/target) + var/obj/bullet = ammo[1] + if(target) + bullet.forceMove(target) + cut_overlay(ammo_overlay[bullet]) + ammo -= bullet + check_ammo() + +/obj/item/ammo_pile/proc/scatter() + for(var/thing in ammo) + var/obj/bullet = thing + bullet.forceMove(get_turf(src)) + bullet.throw_at_random(FALSE, 2, 7) + remove_ammo(bullet) + +/obj/item/ammo_pile/throw_at() + ..() + scatter() + +/obj/item/ammo_pile/slug + ammo_type = /obj/item/ammo_casing/shotgun + +/obj/item/ammo_pile/fourty_five + ammo_type = /obj/item/ammo_casing/c45 \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 3813fc9808c..e9355fa363a 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -22,6 +22,7 @@ desc = "A .38 bullet casing." caliber = "38" projectile_type = /obj/item/projectile/bullet/pistol + max_stack = 6 /obj/item/ammo_casing/c38/rubber desc = "A .38 rubber bullet casing." @@ -46,6 +47,7 @@ desc = "A 9mm bullet casing." caliber = "9mm" projectile_type = /obj/item/projectile/bullet/pistol + max_stack = 15 /obj/item/ammo_casing/c9mm/flash desc = "A 9mm flash shell casing." @@ -65,6 +67,7 @@ desc = "A 10mm bullet casing." caliber = "10mm" projectile_type = /obj/item/projectile/bullet/pistol + max_stack = 10 /obj/item/ammo_casing/c10mm/rubber desc = "A 10mm rubber bullet casing." @@ -74,6 +77,7 @@ desc = "A .45 bullet casing." caliber = ".45" projectile_type = /obj/item/projectile/bullet/pistol/medium + max_stack = 10 /obj/item/ammo_casing/c45/practice desc = "A .45 practice bullet casing." @@ -93,6 +97,7 @@ desc = "A 12mm bullet casing." caliber = "12mm" projectile_type = /obj/item/projectile/bullet/pistol/medium + max_stack = 7 /obj/item/ammo_casing/shotgun name = "shotgun slug" @@ -181,6 +186,7 @@ spent_icon = "ishell-spent" caliber = "PPS" projectile_type = /obj/item/projectile/bullet/rifle/tranq + max_stack = 6 /obj/item/ammo_casing/a762 desc = "A 7.62mm bullet casing." @@ -188,6 +194,7 @@ projectile_type = /obj/item/projectile/bullet/rifle/a762 icon_state = "rifle-casing" spent_icon = "rifle-casing-spent" + max_stack = 2 /obj/item/ammo_casing/a762/spent/Initialize() . = ..() @@ -201,6 +208,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 1250) icon_state = "lcasing" spent_icon = "lcasing-spent" + max_stack = 2 /obj/item/ammo_casing/a556 desc = "A 5.56mm bullet casing." @@ -208,6 +216,7 @@ projectile_type = /obj/item/projectile/bullet/rifle/a556 icon_state = "rifle-casing" spent_icon = "rifle-casing-spent" + max_stack = 7 /obj/item/ammo_casing/a556/ap desc = "A 5.56mm armor piercing round." @@ -223,6 +232,7 @@ icon_state = "rocketshell" projectile_type = /obj/item/missile caliber = "rocket" + max_stack = 1 /obj/item/ammo_casing/chameleon name = "chameleon bullets" @@ -230,24 +240,13 @@ projectile_type = /obj/item/projectile/bullet/chameleon caliber = ".45" -/* -/obj/item/ammo_casing/a418 - desc = "A .418 bullet casing." - caliber = "357" - projectile_type = /obj/item/projectile/bullet/suffocationbullet - -/obj/item/ammo_casing/a666 - desc = "A .666 bullet casing." - caliber = "357" - projectile_type = /obj/item/projectile/bullet/cyanideround -*/ - /obj/item/ammo_casing/cap name = "cap" desc = "A cap for children toys." caliber = "caps" color = "#FF0000" projectile_type = /obj/item/projectile/bullet/pistol/cap + max_stack = 6 /obj/item/ammo_casing/flechette desc = "A flechette casing." @@ -255,6 +254,7 @@ icon_state = "flechette_casing" caliber = "flechette" projectile_type = /obj/item/projectile/bullet/flechette + max_stack = 4 /obj/item/ammo_casing/flechette/explosive projectile_type = /obj/item/projectile/bullet/flechette/explosive @@ -265,12 +265,14 @@ caliber = "vintage" icon_state = "lcasing" spent_icon = "lcasing-spent" + max_stack = 6 /obj/item/ammo_casing/slugger projectile_type = /obj/item/projectile/bullet/rifle/slugger caliber = "slugger" icon_state = "slugger-sharp" spent_icon = "slugger-spent" + max_stack = 2 /obj/item/ammo_casing/gauss name = "tungsten slug" @@ -278,6 +280,7 @@ caliber = "gauss" icon_state = "tungstenslug" projectile_type = /obj/item/projectile/bullet/gauss + max_stack = 2 /obj/item/ammo_casing/gauss/emp name = "ion slug" @@ -291,6 +294,7 @@ icon_state = "plasmaslug" caliber = "plasma slug" projectile_type = /obj/item/projectile/plasma + max_stack = 2 /obj/item/ammo_casing/plasma_bolt name = "plasma bolt" @@ -298,6 +302,7 @@ icon_state = "plasmabolt" caliber = "plasma bolt" projectile_type = /obj/item/projectile/plasma/light + max_stack = 4 /obj/item/ammo_casing/cannon name = "cannonball" @@ -306,7 +311,8 @@ caliber = "cannon" projectile_type = /obj/item/projectile/bullet/cannonball matter = list(DEFAULT_WALL_MATERIAL = 800) - w_class = 3 + w_class = ITEMSIZE_NORMAL + max_stack = 1 /obj/item/ammo_casing/cannon/explosive name = "explosive cannonball" @@ -325,3 +331,4 @@ caliber = "nuke" desc = "A miniaturized version of a nuclear bomb." projectile_type = /obj/item/projectile/bullet/nuke + max_stack = 2 \ No newline at end of file diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index f9146e4f30d..56e209958f0 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -167,19 +167,19 @@ return FALSE if(user.is_pacified()) - to_chat(user, span("notice", "You don't want to risk harming anyone!")) + to_chat(user, SPAN_NOTICE("You don't want to risk harming anyone!")) return FALSE var/mob/living/M = user if(HULK in M.mutations) - to_chat(M, span("danger", "Your fingers are much too large for the trigger guard!")) + to_chat(M, SPAN_DANGER("Your fingers are much too large for the trigger guard!")) return FALSE if(ishuman(M)) var/mob/living/carbon/human/A = M if(A.martial_art?.no_guns) - to_chat(A, span("warning", "[A.martial_art.no_guns_message]")) + to_chat(A, SPAN_WARNING("[A.martial_art.no_guns_message]")) return FALSE if((M.is_clumsy()) && prob(40)) //Clumsy handling @@ -188,8 +188,8 @@ if(process_projectile(P, user, user, pick(BP_L_FOOT, BP_R_FOOT))) handle_post_fire(user, user) user.visible_message( - span("danger","\The [user] shoots \himself in the foot with \the [src]!"), - span("danger","You shoot yourself in the foot with \the [src]!") + SPAN_DANGER("\The [user] shoots \himself in the foot with \the [src]!"), + SPAN_DANGER("You shoot yourself in the foot with \the [src]!") ) M.drop_item() else @@ -204,7 +204,7 @@ return FALSE else if(needspin) - to_chat(user, span("warning","\The [src]'s trigger is locked. This weapon doesn't have a firing pin installed!")) + to_chat(user, SPAN_WARNING("\The [src]'s trigger is locked. This weapon doesn't have a firing pin installed!")) return FALSE else return TRUE @@ -218,7 +218,7 @@ toggle_wield(usr) update_held_icon() else - to_chat(usr, span("warning", "You can't wield \the [src]!")) + to_chat(usr, SPAN_WARNING("You can't wield \the [src]!")) /obj/item/gun/ui_action_click() if(src in usr) @@ -287,7 +287,7 @@ if(world.time < next_fire_time) if (world.time % 3) //to prevent spam - to_chat(user, span("warning","\The [src] is not ready to fire again!")) + to_chat(user, SPAN_WARNING("\The [src] is not ready to fire again!")) return FALSE var/shoot_time = (burst - 1) * burst_delay @@ -407,7 +407,7 @@ //called if there was no projectile to shoot /obj/item/gun/proc/handle_click_empty(mob/user) if(user) - to_chat(user, span("danger","*click*")) + to_chat(user, SPAN_DANGER("*click*")) else src.visible_message("*click click*") playsound(loc, 'sound/weapons/empty.ogg', 100, 1) @@ -515,20 +515,20 @@ var/mob/living/carbon/human/M = user mouthshoot = TRUE - M.visible_message(span("warning", "\The [user] sticks their gun in their mouth, ready to pull the trigger...")) + M.visible_message(SPAN_WARNING("\The [user] sticks their gun in their mouth, ready to pull the trigger...")) if(!do_after(user, 40)) - M.visible_message(span("notice", "\The [user] decided life was worth living")) + M.visible_message(SPAN_NOTICE("\The [user] decided life was worth living")) mouthshoot = FALSE return var/obj/item/projectile/in_chamber = consume_next_projectile() if (istype(in_chamber)) - user.visible_message(span("warning", "\The [user] pulls the trigger.")) + user.visible_message(SPAN_WARNING("\The [user] pulls the trigger.")) if (!pin && needspin)//Checks the pin of the gun. - user.visible_message(span("warning", "*click click*")) + user.visible_message(SPAN_WARNING("*click click*")) mouthshoot = FALSE return if (!pin.pin_auth() && needspin) - user.visible_message(span("warning", "*click click*")) + user.visible_message(SPAN_WARNING("*click click*")) mouthshoot = FALSE return if(safety() && user.a_intent != I_HURT) @@ -544,11 +544,11 @@ in_chamber.on_hit(M) if (in_chamber.damage == 0) - user.show_message(span("warning", "You feel rather silly, trying to commit suicide with a toy.")) + user.show_message(SPAN_WARNING("You feel rather silly, trying to commit suicide with a toy.")) mouthshoot = FALSE return else if (in_chamber.damage_type == PAIN) - to_chat(user, span("notice", "Ow...")) + to_chat(user, SPAN_NOTICE("Ow...")) user.apply_effect(110,PAIN,0) else log_and_message_admins("[key_name(user)] commited suicide using \a [src]") @@ -625,7 +625,7 @@ /obj/item/gun/attack_self(mob/user) var/datum/firemode/new_mode = switch_firemodes(user) if(new_mode) - to_chat(user, span("notice", "\The [src] is now set to [new_mode.name].")) + to_chat(user, SPAN_NOTICE("\The [src] is now set to [new_mode.name].")) // Safety Procs @@ -633,7 +633,7 @@ safety_state = !safety_state update_icon() if(user) - to_chat(user, span("notice", "You switch the safety [safety_state ? "on" : "off"] on \the [src].")) + to_chat(user, SPAN_NOTICE("You switch the safety [safety_state ? "on" : "off"] on \the [src].")) playsound(src, 'sound/weapons/safety_click.ogg', 30, 1) /obj/item/gun/verb/toggle_safety_verb() @@ -660,20 +660,20 @@ if(!is_wieldable) return if(!istype(user.get_active_hand(), /obj/item/gun)) - to_chat(user, span("warning", "You need to be holding \the [name] in your active hand.")) + to_chat(user, SPAN_WARNING("You need to be holding \the [name] in your active hand.")) return if(!ishuman(user)) - to_chat(user, span("warning", "It's too heavy for you to stabilize properly.")) + to_chat(user, SPAN_WARNING("It's too heavy for you to stabilize properly.")) return var/mob/living/carbon/human/M = user if(M.isMonkey()) - to_chat(user, span("warning", "It's too heavy for you to stabilize properly.")) + to_chat(user, SPAN_WARNING("It's too heavy for you to stabilize properly.")) return if(wielded) unwield() - to_chat(user, span("notice", "You are no-longer stabilizing \the [name] with both hands.")) + to_chat(user, SPAN_NOTICE("You are no-longer stabilizing \the [name] with both hands.")) var/obj/item/offhand/O = user.get_inactive_hand() if(O && istype(O)) @@ -684,10 +684,10 @@ else if(user.get_inactive_hand()) - to_chat(user, span("warning", "You need your other hand to be empty.")) + to_chat(user, SPAN_WARNING("You need your other hand to be empty.")) return wield() - to_chat(user, span("notice", "You stabilize \the [initial(name)] with both hands.")) + to_chat(user, SPAN_NOTICE("You stabilize \the [initial(name)] with both hands.")) var/obj/item/offhand/O = new(user) O.name = "[initial(name)] - offhand" @@ -725,7 +725,7 @@ if(is_wieldable) if(wielded) if(!disable_warning) // unfortunately not sure there's a way to get this to only fire once when it's looped - to_chat(M, span("warning", "Lower \the [initial(name)] first!")) + to_chat(M, SPAN_WARNING("Lower \the [initial(name)] first!")) return FALSE return ..() @@ -776,7 +776,7 @@ if(user) var/obj/item/gun/O = user.get_inactive_hand() if(istype(O)) - to_chat(user, span("notice", "You are no-longer stabilizing \the [name] with both hands.")) + to_chat(user, SPAN_NOTICE("You are no-longer stabilizing \the [name] with both hands.")) O.unwield() unwield() @@ -824,31 +824,31 @@ return ..() if(bayonet) - to_chat(user, span("danger", "There is a bayonet attached to \the [src] already.")) + to_chat(user, SPAN_DANGER("There is a bayonet attached to \the [src] already.")) return user.drop_from_inventory(I,src) bayonet = I - to_chat(user, span("notice", "You attach \the [I] to the front of \the [src].")) + to_chat(user, SPAN_NOTICE("You attach \the [I] to the front of \the [src].")) update_icon() if(I.iscrowbar() && bayonet) - to_chat(user, span("notice", "You detach \the [bayonet] from \the [src].")) + to_chat(user, SPAN_NOTICE("You detach \the [bayonet] from \the [src].")) bayonet.forceMove(get_turf(src)) bayonet = null update_icon() if(pin && I.isscrewdriver()) - visible_message(span("warning", "\The [user] begins to try and pry out \the [src]'s firing pin!")) + visible_message(SPAN_WARNING("\The [user] begins to try and pry out \the [src]'s firing pin!")) if(do_after(user,45 SECONDS,act_target = src)) if(pin.durable || prob(50)) - visible_message(span("notice", "\The [user] pops \the [pin] out of \the [src]!")) + visible_message(SPAN_NOTICE("\The [user] pops \the [pin] out of \the [src]!")) pin.forceMove(get_turf(src)) pin = null//clear it out. else user.visible_message( - span("warning", "\The [user] breaks some electronics free from \the [src] with a crack."), - span("alert", "You apply a bit too much force to \the [pin], and it breaks in two. Oops."), + SPAN_WARNING("\The [user] breaks some electronics free from \the [src] with a crack."), + SPAN_ALERT("You apply a bit too much force to \the [pin], and it breaks in two. Oops."), "You hear a metallic crack.") qdel(pin) pin = null diff --git a/code/modules/projectiles/guns/energy/blaster.dm b/code/modules/projectiles/guns/energy/blaster.dm index 692491fa622..f103e738fd2 100644 --- a/code/modules/projectiles/guns/energy/blaster.dm +++ b/code/modules/projectiles/guns/energy/blaster.dm @@ -57,7 +57,7 @@ else return - user.visible_message(span("warning","\The [user] spins the cylinder of \the [src]!"),span("warning","You spin the cylinder of \the [src]!"),span("notice","You hear something metallic spin and click.")) + user.visible_message(SPAN_WARNING("\The [user] spins the cylinder of \the [src]!"), SPAN_WARNING("You spin the cylinder of \the [src]!"), SPAN_NOTICE("You hear something metallic spin and click.")) playsound(src.loc, 'sound/weapons/revolver_spin.ogg', 100, 1) /obj/item/gun/energy/blaster/revolver/pilot diff --git a/code/modules/projectiles/guns/energy/magic.dm b/code/modules/projectiles/guns/energy/magic.dm index 4bcccd6f88e..80e3bfe7e27 100644 --- a/code/modules/projectiles/guns/energy/magic.dm +++ b/code/modules/projectiles/guns/energy/magic.dm @@ -52,7 +52,7 @@ obj/item/gun/energy/staff/special_check(var/mob/living/user) new_mob = new /mob/living/simple_animal/parrot(H.loc) new_mob.universal_speak = 1 new_mob.key = H.key - new_mob.a_intent = "harm" + new_mob.set_intent(I_HURT) qdel(H) sleep(20) new_mob.say("Poly wanna cracker!") @@ -281,7 +281,7 @@ obj/item/gun/energy/staff/focus/attack_self(mob/living/user as mob) if(!user.is_wizard()) if(istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/H = user - var/obj/item/organ/O = H.internal_organs_by_name[pick(H.species.vision_organ || BP_EYES,"appendix",BP_KIDNEYS,BP_LIVER, BP_HEART, BP_LUNGS, BP_BRAIN)] + var/obj/item/organ/O = H.internal_organs_by_name[pick(H.species.vision_organ || BP_EYES, BP_APPENDIX, BP_KIDNEYS, BP_LIVER, BP_HEART, BP_LUNGS, BP_BRAIN)] if(O == null) to_chat(user, "You can't make any sense of the arcane glyphs... maybe you should try again.") else diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index e6be9772576..7368fb77eed 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -213,7 +213,7 @@ playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) jam_num-- if(!jam_num) - visible_message(span("danger", "\The [user] unjams \the [src]!")) + visible_message(SPAN_DANGER("\The [user] unjams \the [src]!")) playsound(src.loc, 'sound/items/glowstick.ogg', 100, 1) unjam_cooldown = world.time else if(unjam_cooldown + 2 SECONDS > world.time) diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index f22fe6206ed..403f8a65523 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -201,7 +201,7 @@ desc = "A small gas-powered dartgun, fitted for nonhuman hands." /obj/item/gun/projectile/dartgun/vox/medical - starting_chems = list("kelotane","bicaridine","dylovene") + starting_chems = list(/datum/reagent/kelotane, /datum/reagent/bicaridine, /datum/reagent/dylovene) /obj/item/gun/projectile/dartgun/vox/raider - starting_chems = list("space_drugs","stoxin","impedrezene") \ No newline at end of file + starting_chems = list(/datum/reagent/space_drugs, /datum/reagent/soporific, /datum/reagent/impedrezene) \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm index 0488f706f6f..d3467e23501 100644 --- a/code/modules/projectiles/guns/projectile/rifle.dm +++ b/code/modules/projectiles/guns/projectile/rifle.dm @@ -11,7 +11,6 @@ magazine_type = /obj/item/ammo_magazine/boltaction max_shells = 5 - pump_fail_msg = "You cannot work the rifle's bolt without gripping it with both hands!" pump_snd = 'sound/weapons/riflebolt.ogg' has_wield_state = TRUE diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index e039f96425d..f54f1e170af 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -57,7 +57,6 @@ fire_sound = 'sound/weapons/gunshot/gunshot_shotgun2.ogg' is_wieldable = TRUE var/recentpump = 0 // to prevent spammage - var/pump_fail_msg = "You cannot rack the shotgun without gripping it with both hands!" var/pump_snd = 'sound/weapons/shotgunpump.ogg' var/has_wield_state = TRUE @@ -73,10 +72,11 @@ /obj/item/gun/projectile/shotgun/pump/proc/pump(mob/M) if(!wielded) - to_chat(M, pump_fail_msg) - return + if(!do_after(M, 20, TRUE)) // have to stand still for 2 seconds instead of doing it instantly. bad idea during a shootout + return playsound(M, pump_snd, 60, 1) + to_chat(M, SPAN_NOTICE("You rack \the [src]!")) if(chambered)//We have a shell in the chamber chambered.forceMove(get_turf(src)) //Eject casing @@ -120,6 +120,7 @@ /obj/item/gun/projectile/shotgun/doublebarrel name = "double-barreled shotgun" desc = "A true classic." + desc_info = "Use in hand to unload, alt click to change firemodes." icon = 'icons/obj/guns/dshotgun.dmi' icon_state = "dshotgun" item_state = "dshotgun" @@ -148,6 +149,15 @@ can_sawoff = TRUE sawnoff_workmsg = "shorten the barrel" +/obj/item/gun/projectile/shotgun/doublebarrel/attack_self(mob/user) + unload_ammo(user, TRUE) + +/obj/item/gun/projectile/shotgun/doublebarrel/AltClick(mob/user) + if(Adjacent(user)) + var/datum/firemode/new_mode = switch_firemodes(user) + if(new_mode) + to_chat(user, SPAN_NOTICE("\The [src] is now set to [new_mode.name].")) + /obj/item/gun/projectile/shotgun/doublebarrel/update_icon() ..() if(wielded && has_wield_state) diff --git a/code/modules/projectiles/modular/laser_base.dm b/code/modules/projectiles/modular/laser_base.dm index 32d7c754635..a23c3002b17 100644 --- a/code/modules/projectiles/modular/laser_base.dm +++ b/code/modules/projectiles/modular/laser_base.dm @@ -173,7 +173,7 @@ for(var/v in gun_mods) var/obj/item/laser_components/modifier/M = v if(M.type == m.type) - to_chat(user, span("warning", "\The [name] already has [m].")) + to_chat(user, SPAN_WARNING("\The [name] already has [m].")) return FALSE gun_mods += A user.drop_from_inventory(A,src) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 220b2b23d07..39035414810 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -13,6 +13,7 @@ var/projectile_type = /obj/item/projectile var/def_zone = "" //Aiming at + var/hit_zone // The place that actually got hit var/mob/firer = null//Who shot it var/silenced = FALSE //Attack message @@ -124,7 +125,7 @@ return 1 //called when the projectile stops flying because it collided with something -/obj/item/projectile/proc/on_impact(var/atom/A) +/obj/item/projectile/proc/on_impact(var/atom/A, var/affected_limb) return //Checks if the projectile is eligible for embedding. Not that it necessarily will. @@ -169,7 +170,7 @@ //roll to-hit miss_modifier = max(15*(distance-1) - round(25*accuracy) + miss_modifier, 0) - var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob)) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss + hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob)) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss var/result = PROJECTILE_FORCE_MISS if(hit_zone) @@ -266,7 +267,7 @@ return FALSE //stop flying - on_impact(A) + on_impact(A, hit_zone) qdel(src) return TRUE @@ -284,7 +285,7 @@ //If no angle needs to resolve it from xo/yo! if(direct_target) direct_target.bullet_act(src, def_zone) - on_impact(direct_target) + on_impact(direct_target, def_zone) qdel(src) return if(isnum(angle)) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 7a20b67d138..1a39da7aa49 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -249,22 +249,18 @@ if(blocked < 100 && !(blocked < 20)) L.emote("yawns") if(blocked < 20) - if(L.reagents) L.reagents.add_reagent("stoxin", 10) + if(L.reagents) L.reagents.add_reagent(/datum/reagent/soporific, 10) if(def_zone == BP_HEAD && blocked < 100) - if(L.reagents) L.reagents.add_reagent("stoxin", 15) + if(L.reagents) L.reagents.add_reagent(/datum/reagent/soporific, 15) if(def_zone != "torso" && def_zone != BP_HEAD) if(blocked < 100 && !(blocked < 20)) L.emote("yawns") if(blocked < 20) - if(L.reagents) L.reagents.add_reagent("stoxin", 5) + if(L.reagents) L.reagents.add_reagent(/datum/reagent/soporific, 5) if(isanimal(target)) target.visible_message("[target] twitches, foaming at the mouth.") L.apply_damage(35, TOX) //temporary until simple_mob paralysis actually works. - /* var/mob/living/simple_animal/M = target - spawn(60) - target.visible_message("[target] collapses.") - M.Sleeping(1200)*/ //commented out until simple_mob paralysis actually works. ..() /* Miscellaneous */ diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index 87a42000d51..398dd877e86 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -84,7 +84,7 @@ for (var/spell/S in M.spell_list) new_mob.add_spell(new S.type) - new_mob.a_intent = "hurt" + new_mob.set_intent(I_HURT) if(M.mind) M.mind.transfer_to(new_mob) else diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index a30445c568c..d96c174a70b 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -16,15 +16,19 @@ var/brightness = 7 var/light_duration = 5 -/obj/item/projectile/energy/flash/on_impact(var/atom/A) - var/turf/T = flash_range? src.loc : get_turf(A) - if(!istype(T)) return +/obj/item/projectile/energy/flash/on_impact(var/atom/A, affected_limb) + var/turf/T = flash_range ? src.loc : get_turf(A) + if(!istype(T)) + return //blind adjacent people - for (var/mob/living/carbon/M in viewers(T, flash_range)) + for(var/mob/living/carbon/M in viewers(T, flash_range)) if(M.eyecheck() < FLASH_PROTECTION_MODERATE) M.confused = rand(5,15) flick("e_flash", M.flash) + else if(affected_limb && M == A) + M.confused = rand(2, 7) + flick("flash", M.flash) //snap pop playsound(src, 'sound/effects/snap.ogg', 50, 1) diff --git a/code/modules/projectiles/targeting/targeting_triggers.dm b/code/modules/projectiles/targeting/targeting_triggers.dm index ac31e91db24..20b10399015 100644 --- a/code/modules/projectiles/targeting/targeting_triggers.dm +++ b/code/modules/projectiles/targeting/targeting_triggers.dm @@ -15,7 +15,7 @@ G.toggle_safety() else G.handle_click_empty(owner) - to_chat(owner, span("warning", "Your [G]'s safety prevents firing.")) + to_chat(owner, SPAN_WARNING("Your [G]'s safety prevents firing.")) if(!owner || !aiming_with || !aiming_at || !locked) return if(perm && (target_permissions & perm)) diff --git a/code/modules/psionics/complexus/complexus_latency.dm b/code/modules/psionics/complexus/complexus_latency.dm index c7845300cfb..6d9368f67f9 100644 --- a/code/modules/psionics/complexus/complexus_latency.dm +++ b/code/modules/psionics/complexus/complexus_latency.dm @@ -11,7 +11,7 @@ var/new_rank = rand(2,5) owner.set_psi_rank(faculty, new_rank) var/datum/psionic_faculty/faculty_decl = SSpsi.get_faculty(faculty) - to_chat(owner, span("danger", "You scream internally as your [faculty_decl.name] faculty is forced into operancy by [source]!")) + to_chat(owner, SPAN_DANGER("You scream internally as your [faculty_decl.name] faculty is forced into operancy by [source]!")) next_latency_trigger = world.time + rand(600, 1800) * new_rank if(!redactive) owner.adjustBrainLoss(rand(trigger_strength * 2, trigger_strength * 4)) return TRUE diff --git a/code/modules/psionics/complexus/complexus_process.dm b/code/modules/psionics/complexus/complexus_process.dm index 644da69b6ae..6945df397c8 100644 --- a/code/modules/psionics/complexus/complexus_process.dm +++ b/code/modules/psionics/complexus/complexus_process.dm @@ -62,8 +62,8 @@ if(!announced && owner && owner.client && !QDELETED(src)) announced = TRUE to_chat(owner, "") - to_chat(owner, span("notice", "You are psionic, touched by powers beyond understanding.")) - to_chat(owner, span("notice", "Shift-left-click your Psi icon on the bottom right to view a summary of how to use them, or left click it to suppress or unsuppress your psionics. Beware: overusing your gifts can have deadly consequences.")) + to_chat(owner, SPAN_NOTICE("You are psionic, touched by powers beyond understanding.")) + to_chat(owner, SPAN_NOTICE("Shift-left-click your Psi icon on the bottom right to view a summary of how to use them, or left click it to suppress or unsuppress your psionics. Beware: overusing your gifts can have deadly consequences.")) to_chat(owner, "
") /datum/psi_complexus/process() @@ -76,7 +76,7 @@ suppressed = TRUE update_hud = TRUE else - to_chat(owner, span("notice", "You have recovered your mental composure.")) + to_chat(owner, SPAN_NOTICE("You have recovered your mental composure.")) update_hud = TRUE return @@ -167,7 +167,7 @@ if(I.damage > 0 && spend_power(heal_rate)) I.damage = max(I.damage - heal_rate, 0) if(prob(25)) - to_chat(H, span("notice", "Your innards itch as your autoredactive faculty mends your [I.name].")) + to_chat(H, SPAN_NOTICE("Your innards itch as your autoredactive faculty mends your [I.name].")) return // Heal broken bones. @@ -180,25 +180,25 @@ if(heal_internal && (E.status & ORGAN_BROKEN) && E.damage < E.min_broken_damage) // So we don't mend and autobreak. if(spend_power(heal_rate)) if(E.mend_fracture()) - to_chat(H, span("notice", "Your autoredactive faculty coaxes together the shattered bones in your [E.name].")) + to_chat(H, SPAN_NOTICE("Your autoredactive faculty coaxes together the shattered bones in your [E.name].")) return if(heal_bleeding) if((E.status & ORGAN_ARTERY_CUT) && spend_power(heal_rate)) - to_chat(H, span("notice", "Your autoredactive faculty mends the torn artery in your [E.name], stemming the worst of the bleeding.")) + to_chat(H, SPAN_NOTICE("Your autoredactive faculty mends the torn artery in your [E.name], stemming the worst of the bleeding.")) E.status &= ~ORGAN_ARTERY_CUT return if(E.status & ORGAN_TENDON_CUT) - to_chat(H, span("notice", "Your autoredactive faculty repairs the severed tendon in your [E.name].")) + to_chat(H, SPAN_NOTICE("Your autoredactive faculty repairs the severed tendon in your [E.name].")) E.status &= ~ORGAN_TENDON_CUT return TRUE for(var/datum/wound/W in E.wounds) if(W.bleeding() && spend_power(heal_rate)) - to_chat(H, span("notice", "Your autoredactive faculty knits together severed veins, stemming the bleeding from \a [W.desc] on your [E.name].")) + to_chat(H, SPAN_NOTICE("Your autoredactive faculty knits together severed veins, stemming the bleeding from \a [W.desc] on your [E.name].")) W.bleed_timer = 0 W.clamped = TRUE E.status &= ~ORGAN_BLEEDING @@ -209,13 +209,13 @@ if(owner.total_radiation && spend_power(heal_rate)) if(prob(25)) - to_chat(owner, span("notice", "Your autoredactive faculty repairs some of the radiation damage to your body.")) + to_chat(owner, SPAN_NOTICE("Your autoredactive faculty repairs some of the radiation damage to your body.")) owner.total_radiation = max(0, owner.total_radiation - heal_rate) return if(owner.getCloneLoss() && spend_power(heal_rate)) if(prob(25)) - to_chat(owner, span("notice", "Your autoredactive faculty stitches together some of your mangled DNA.")) + to_chat(owner, SPAN_NOTICE("Your autoredactive faculty stitches together some of your mangled DNA.")) owner.adjustCloneLoss(-heal_rate) return @@ -225,4 +225,4 @@ owner.adjustFireLoss(-(heal_rate)) owner.adjustOxyLoss(-(heal_rate)) if(prob(25)) - to_chat(owner, span("notice", "Your skin crawls as your autoredactive faculty heals your body.")) + to_chat(owner, SPAN_NOTICE("Your skin crawls as your autoredactive faculty heals your body.")) diff --git a/code/modules/psionics/equipment/cerebro_enhancers.dm b/code/modules/psionics/equipment/cerebro_enhancers.dm index a15de6f5e52..684a3c53aa0 100644 --- a/code/modules/psionics/equipment/cerebro_enhancers.dm +++ b/code/modules/psionics/equipment/cerebro_enhancers.dm @@ -58,13 +58,13 @@ removed = TRUE else if(slots_left <= 0) - to_chat(user, span("warning", "There are no slots left to install brainboards into.")) + to_chat(user, SPAN_WARNING("There are no slots left to install brainboards into.")) return LAZYADD(boosted_faculties, faculty.id) UNSETEMPTY(boosted_faculties) slots_left = max_boosted_faculties - LAZYLEN(boosted_faculties) - to_chat(user, span("notice", "You [removed ? "remove" : "install"] the [choice] brainboard [removed ? "from" : "in"] \the [src]. There [slots_left!=1 ? "are" : "is"] [slots_left] slot\s left.")) + to_chat(user, SPAN_NOTICE("You [removed ? "remove" : "install"] the [choice] brainboard [removed ? "from" : "in"] \the [src]. There [slots_left!=1 ? "are" : "is"] [slots_left] slot\s left.")) /obj/item/clothing/head/helmet/space/psi_amp/proc/deintegrate() @@ -84,7 +84,7 @@ canremove = TRUE return - to_chat(H, span("warning", "You feel a strange tugging sensation as \the [src] begins removing the slave-minds from your brain...")) + to_chat(H, SPAN_WARNING("You feel a strange tugging sensation as \the [src] begins removing the slave-minds from your brain...")) playsound(H, 'sound/weapons/circsawhit.ogg', 50, 1, -1) operating = TRUE @@ -93,7 +93,7 @@ if(H.psi) H.psi.reset() - to_chat(H, span("notice", "\The [src] chimes quietly as it finishes removing the slave-minds from your brain.")) + to_chat(H, SPAN_NOTICE("\The [src] chimes quietly as it finishes removing the slave-minds from your brain.")) canremove = TRUE operating = FALSE @@ -131,17 +131,17 @@ return if(LAZYLEN(boosted_faculties) < max_boosted_faculties) - to_chat(usr, span("notice", "You still have [max_boosted_faculties - LAZYLEN(boosted_faculties)] facult[LAZYLEN(boosted_faculties) == 1 ? "y" : "ies"] to select. Use \the [src] in-hand to select them.")) + to_chat(usr, SPAN_NOTICE("You still have [max_boosted_faculties - LAZYLEN(boosted_faculties)] facult[LAZYLEN(boosted_faculties) == 1 ? "y" : "ies"] to select. Use \the [src] in-hand to select them.")) return var/mob/living/carbon/human/H = loc if(!istype(H) || H.head != src) - to_chat(usr, span("warning", "\The [src] must be worn on your head in order to be activated.")) + to_chat(usr, SPAN_WARNING("\The [src] must be worn on your head in order to be activated.")) return canremove = FALSE operating = TRUE - to_chat(H, span("warning", "You feel a series of sharp pinpricks as \the [src] anaesthetises your scalp before drilling down into your brain.")) + to_chat(H, SPAN_WARNING("You feel a series of sharp pinpricks as \the [src] anaesthetises your scalp before drilling down into your brain.")) playsound(H, 'sound/weapons/circsawhit.ogg', 50, 1, -1) sleep(80) @@ -156,7 +156,7 @@ H.psi.stamina = H.psi.max_stamina H.psi.update(force = TRUE) - to_chat(H, span("notice", "You experience a brief but powerful wave of deja vu as \the [src] finishes modifying your brain.")) + to_chat(H, SPAN_NOTICE("You experience a brief but powerful wave of deja vu as \the [src] finishes modifying your brain.")) verbs |= /obj/item/clothing/head/helmet/space/psi_amp/proc/deintegrate verbs -= /obj/item/clothing/head/helmet/space/psi_amp/proc/integrate operating = FALSE diff --git a/code/modules/psionics/equipment/psipower_tk.dm b/code/modules/psionics/equipment/psipower_tk.dm index 1168f975f80..34de21f0634 100644 --- a/code/modules/psionics/equipment/psipower_tk.dm +++ b/code/modules/psionics/equipment/psipower_tk.dm @@ -33,7 +33,7 @@ focus = _focus . = attack_self(owner) if(!.) - to_chat(owner, span("warning", "\The [_focus] is too hefty for you to get a mind-grip on.")) + to_chat(owner, SPAN_WARNING("\The [_focus] is too hefty for you to get a mind-grip on.")) qdel(src) return FALSE @@ -46,7 +46,7 @@ return TRUE /obj/item/psychic_power/telekinesis/attack_self(var/mob/user) - user.visible_message(span("notice", "\The [user] makes a strange gesture.")) + user.visible_message(SPAN_NOTICE("\The [user] makes a strange gesture.")) sparkle() return focus.do_simple_ranged_interaction(user) @@ -60,13 +60,13 @@ var/distance = get_dist(get_turf(user), get_turf(focus ? focus : target)) if(distance > user.psi.get_rank(PSI_PSYCHOKINESIS)) - to_chat(user, span("warning", "Your telekinetic power won't reach that far.")) + to_chat(user, SPAN_WARNING("Your telekinetic power won't reach that far.")) return FALSE if(target == focus) attack_self(user) else - user.visible_message(span("danger", "\The [user] gestures sharply!")) + user.visible_message(SPAN_DANGER("\The [user] gestures sharply!")) sparkle() if(!istype(target, /turf) && istype(focus,/obj/item) && target.Adjacent(focus)) var/obj/item/I = focus diff --git a/code/modules/psionics/events/mini_spasm.dm b/code/modules/psionics/events/mini_spasm.dm index 385c6c43da6..718db24ad3d 100644 --- a/code/modules/psionics/events/mini_spasm.dm +++ b/code/modules/psionics/events/mini_spasm.dm @@ -41,17 +41,17 @@ return if(victim.psi) - to_chat(victim, span("danger", "A hauntingly familiar sound hisses from \icon[source] \the [source], and your vision flickers!")) + to_chat(victim, SPAN_DANGER("A hauntingly familiar sound hisses from \icon[source] \the [source], and your vision flickers!")) victim.psi.backblast(rand(5,15)) victim.Paralyse(5) victim.make_jittery(100) else - to_chat(victim, span("danger", "An indescribable, brain-tearing sound hisses from \icon[source] \the [source], and you collapse in a seizure!")) + to_chat(victim, SPAN_DANGER("An indescribable, brain-tearing sound hisses from \icon[source] \the [source], and you collapse in a seizure!")) victim.seizure() var/new_latencies = rand(2,4) var/list/faculties = list(PSI_COERCION, PSI_REDACTION, PSI_ENERGISTICS, PSI_PSYCHOKINESIS) for(var/i = 1 to new_latencies) - to_chat(victim, span("danger", "[pick(psi_operancy_messages)]")) + to_chat(victim, SPAN_DANGER("[pick(psi_operancy_messages)]")) victim.adjustBrainLoss(rand(10,20)) victim.set_psi_rank(pick_n_take(faculties), 1) sleep(30) diff --git a/code/modules/psionics/events/psi_balm.dm b/code/modules/psionics/events/psi_balm.dm index e7b7e115267..16b7060e554 100644 --- a/code/modules/psionics/events/psi_balm.dm +++ b/code/modules/psionics/events/psi_balm.dm @@ -18,4 +18,4 @@ psi.owner.adjustBrainLoss(-1) soothed = TRUE if(soothed && prob(10)) - to_chat(psi.owner, span("notice", "[pick(balm_messages)]")) + to_chat(psi.owner, SPAN_NOTICE("[pick(balm_messages)]")) diff --git a/code/modules/psionics/faculties/coercion.dm b/code/modules/psionics/faculties/coercion.dm index 614b77c1e84..c8025d3ce22 100644 --- a/code/modules/psionics/faculties/coercion.dm +++ b/code/modules/psionics/faculties/coercion.dm @@ -288,12 +288,12 @@ if(H.can_commune() || H.stat >= UNCONSCIOUS) return if(prob(10) && !(H.species.flags & NO_BLOOD)) - to_chat(H,SPAN_WARNING("Your nose begins to bleed...")) + to_chat(H, SPAN_WARNING("Your nose begins to bleed...")) H.drip(3) else if(prob(25) && (H.can_feel_pain())) - to_chat(H,SPAN_WARNING("Your head hurts...")) + to_chat(H, SPAN_WARNING("Your head hurts...")) else if(prob(50)) - to_chat(H,SPAN_WARNING("Your mind buzzes...")) + to_chat(H, SPAN_WARNING("Your mind buzzes...")) /datum/psionic_power/coercion/psiping name = "Psi Ping" diff --git a/code/modules/random_map/automata/diona.dm b/code/modules/random_map/automata/diona.dm index a04a6d719d2..159d7485f2a 100644 --- a/code/modules/random_map/automata/diona.dm +++ b/code/modules/random_map/automata/diona.dm @@ -71,7 +71,7 @@ /obj/structure/diona/bulb/unpowered/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/cell)) - to_chat(user, span("notice", "You jack the power cell into the glow bulb.")) + to_chat(user, SPAN_NOTICE("You jack the power cell into the glow bulb.")) new /obj/structure/diona/bulb(get_turf(src)) qdel(W) qdel(src) diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm index c8ba3b522fd..3cd03b9696b 100644 --- a/code/modules/random_map/noise/ore.dm +++ b/code/modules/random_map/noise/ore.dm @@ -68,7 +68,7 @@ T.resources["gold"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["silver"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["uranium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) - T.resources["phoron"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) + T.resources["phoron"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["osmium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["hydrogen"] = 0 T.resources["diamond"] = 0 @@ -76,7 +76,7 @@ else // Deep metals. T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["diamond"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) - T.resources["phoron"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) + T.resources["phoron"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["osmium"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) T.resources["hydrogen"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) if(prob(40)) // A medium chance for these useful mats to appear in very small quantities diff --git a/code/modules/reagents/Chemistry-Colours.dm b/code/modules/reagents/Chemistry-Colours.dm index 5f0fb34894c..38020e20a49 100644 --- a/code/modules/reagents/Chemistry-Colours.dm +++ b/code/modules/reagents/Chemistry-Colours.dm @@ -12,7 +12,7 @@ if(length(hex) == 7) hex += "FF" if(length(hex) != 9) // PANIC PANIC PANIC - warning("Reagent [R.id] has an incorrect color set ([R.color])") + warning("Reagent [R.type] has an incorrect color set ([R.color])") hex = "#FFFFFFFF" colors[1] += hex2num(copytext(hex, 2, 4)) * R.volume * R.color_weight colors[2] += hex2num(copytext(hex, 4, 6)) * R.volume * R.color_weight diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 873a0c5088c..21fa7d9e330 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -45,9 +45,9 @@ return the_reagent -/datum/reagents/proc/get_reagent(var/id) // Returns reference to reagent matching passed ID +/datum/reagents/proc/get_reagent(var/rtype) // Returns reference to reagent matching passed type for(var/datum/reagent/A in reagent_list) - if (A.id == id) + if (A.type == rtype) return A return null @@ -62,15 +62,15 @@ return the_name -/datum/reagents/proc/get_master_reagent_id() // Returns the id of the reagent with the biggest volume. - var/the_id = null +/datum/reagents/proc/get_master_reagent_type() // Returns the type of the reagent with the biggest volume. + var/the_type = null var/the_volume = 0 for(var/datum/reagent/A in reagent_list) if(A.volume > the_volume) the_volume = A.volume - the_id = A.id + the_type = A.type - return the_id + return the_type /datum/reagents/proc/update_total() // Updates volume and temperature. @@ -78,7 +78,7 @@ for(var/datum/reagent/R in reagent_list) if(R.volume < MINIMUM_CHEMICAL_VOLUME) - del_reagent(R.id) + del_reagent(R.type) else total_volume += R.volume @@ -114,7 +114,7 @@ //need to rebuild this to account for chain reactions for(var/datum/reagent/R in reagent_list) - eligible_reactions |= SSchemistry.chemical_reactions[R.id] + eligible_reactions |= SSchemistry.chemical_reactions[R.type] for(var/datum/chemical_reaction/C in eligible_reactions) if(C.can_happen(src) && C.process(src)) @@ -137,7 +137,7 @@ /* Holder-to-chemical */ -/datum/reagents/proc/add_reagent(var/id, var/amount, var/data = null, var/safety = 0, var/temperature = 0, var/thermal_energy = 0) +/datum/reagents/proc/add_reagent(var/rtype, var/amount, var/data = null, var/safety = 0, var/temperature = 0, var/thermal_energy = 0) if(!isnum(amount) || amount <= 0) return 0 @@ -146,7 +146,7 @@ amount = min(amount, get_free_space()) for(var/datum/reagent/R in reagent_list) - if(R.id == id) //Existing reagent + if(R.type == rtype) //Existing reagent R.volume += amount if(thermal_energy > 0 && old_amount > 0) R.add_thermal_energy(thermal_energy * (amount/old_amount) ) @@ -159,7 +159,7 @@ update_holder(!safety) return 1 - var/datum/reagent/D = SSchemistry.chemical_reagents[id] //New reagent + var/datum/reagent/D = SSchemistry.chemical_reagents[rtype] //New reagent if(D) var/datum/reagent/R = new D.type() reagent_list += R @@ -177,15 +177,15 @@ update_holder(!safety) return 1 else - warning("[my_atom] attempted to add a reagent called '[id]' which doesn't exist. ([usr])") + warning("[my_atom] attempted to add a reagent called '[rtype]' which doesn't exist. ([usr])") return 0 -/datum/reagents/proc/remove_reagent(var/id, var/amount, var/safety = 0) +/datum/reagents/proc/remove_reagent(var/rtype, var/amount, var/safety = 0) if(!isnum(amount)) return 0 for(var/datum/reagent/current in reagent_list) - if(current.id == id) + if(current.type == rtype) amount = min(amount,current.volume) var/old_volume = current.volume current.volume -= amount @@ -194,9 +194,9 @@ return 1 return 0 -/datum/reagents/proc/del_reagent(var/id) +/datum/reagents/proc/del_reagent(var/rtype) for(var/datum/reagent/current in reagent_list) - if (current.id == id) + if (current.type == rtype) if(ismob(my_atom)) current.final_effect(my_atom) reagent_list -= current @@ -204,9 +204,9 @@ update_holder(FALSE) return 0 -/datum/reagents/proc/has_reagent(var/id, var/amount = 0) +/datum/reagents/proc/has_reagent(var/rtype, var/amount = 0) for(var/datum/reagent/current in reagent_list) - if(current.id == id) + if(current.type == rtype) if(current.volume >= amount) return 1 else @@ -215,8 +215,8 @@ /datum/reagents/proc/has_any_reagent(var/list/check_reagents) for(var/datum/reagent/current in reagent_list) - if(current.id in check_reagents) - if(current.volume >= check_reagents[current.id]) + if(current.type in check_reagents) + if(current.volume >= check_reagents[current.type]) return 1 else return 0 @@ -226,39 +226,39 @@ //this only works if check_reagents has no duplicate entries... hopefully okay since it expects an associative list var/missing = check_reagents.len for(var/datum/reagent/current in reagent_list) - if(current.id in check_reagents) - if(current.volume >= check_reagents[current.id]) + if(current.type in check_reagents) + if(current.volume >= check_reagents[current.type]) missing-- return !missing /datum/reagents/proc/clear_reagents() for(var/datum/reagent/current in reagent_list) - del_reagent(current.id) + del_reagent(current.type) return -/datum/reagents/proc/get_reagent_amount(var/id) +/datum/reagents/proc/get_reagent_amount(var/rtype) for(var/datum/reagent/current in reagent_list) - if(current.id == id) + if(current.type == rtype) return current.volume return 0 -/datum/reagents/proc/get_data(var/id) +/datum/reagents/proc/get_data(var/rtype) for(var/datum/reagent/current in reagent_list) - if(current.id == id) + if(current.type == rtype) return current.get_data() return 0 /datum/reagents/proc/get_reagents() . = list() for(var/datum/reagent/current in reagent_list) - . += "[current.id] ([current.volume])" + . += "[current.name] ([current.volume])" return english_list(., "EMPTY", "", ", ", ", ") /datum/reagents/proc/get_ids_by_phase(var/phase) // this proc will probably need to be changed if you can have one reagent in multiple states at the same time . = list() for(var/datum/reagent/current in reagent_list) if(phase == current.reagent_state) - . += current.id + . += current.type /* Holder-to-holder and similar procs */ @@ -272,7 +272,7 @@ for(var/datum/reagent/current in reagent_list) var/amount_to_remove = current.volume * part - remove_reagent(current.id, amount_to_remove, 1) + remove_reagent(current.type, amount_to_remove, 1) update_holder() return amount @@ -295,9 +295,9 @@ for(var/datum/reagent/current in reagent_list) var/amount_to_transfer = current.volume * part var/energy_to_transfer = current.get_thermal_energy() * (amount_to_transfer / current.volume) - target.add_reagent(current.id, amount_to_transfer * multiplier, current.get_data(), TRUE, thermal_energy = energy_to_transfer * multiplier) // We don't react until everything is in place + target.add_reagent(current.type, amount_to_transfer * multiplier, current.get_data(), TRUE, thermal_energy = energy_to_transfer * multiplier) // We don't react until everything is in place if(!copy) - remove_reagent(current.id, amount_to_transfer, TRUE) + remove_reagent(current.type, amount_to_transfer, TRUE) if(!copy) update_holder() @@ -334,11 +334,11 @@ trans_to(target, amount, multiplier, copy) -/datum/reagents/proc/trans_id_to(var/target, var/id, var/amount = 1) +/datum/reagents/proc/trans_type_to(var/target, var/rtype, var/amount = 1) if (!target) return - var/datum/reagent/transfering_reagent = get_reagent(id) + var/datum/reagent/transfering_reagent = get_reagent(rtype) if (istype(target, /atom)) var/atom/A = target @@ -352,10 +352,10 @@ var/datum/reagents/F = new /datum/reagents(amount) - var/tmpdata = get_data(id) + var/tmpdata = get_data(rtype) var/transfering_thermal_energy = transfering_reagent.get_thermal_energy() * (amount/transfering_reagent.volume) - F.add_reagent(id, amount, tmpdata, thermal_energy = transfering_thermal_energy) - remove_reagent(id, amount) + F.add_reagent(rtype, amount, tmpdata, thermal_energy = transfering_thermal_energy) + remove_reagent(rtype, amount) if (istype(target, /atom)) @@ -363,15 +363,15 @@ else if (istype(target, /datum/reagents)) return F.trans_to_holder(target, amount) -/datum/reagents/proc/trans_ids_to(var/target, var/list/ids, var/amount = 1) // amount is distributed equally over all reagents +/datum/reagents/proc/trans_ids_to(var/target, var/list/rtypes, var/amount = 1) // amount is distributed equally over all reagents if(!target) return - if(!LAZYLEN(ids)) // it's always going to be defined but, you know, good practice and all + if(!LAZYLEN(rtypes)) // it's always going to be defined but, you know, good practice and all return - var/amounteach = amount / ids.len + var/amounteach = amount / rtypes.len . = 0 - for(var/id in ids) - . += src.trans_id_to(target, id, amounteach) + for(var/rtype in rtypes) + . += src.trans_type_to(target, rtype, amounteach) // When applying reagents to an atom externally, touch() is called to trigger any on-touch effects of the reagent. // This does not handle transferring reagents to things. @@ -393,11 +393,11 @@ if(temperature >= REAGENTS_BURNING_TEMP_HIGH) var/burn_damage = Clamp(total_volume*(temperature - REAGENTS_BURNING_TEMP_HIGH)*REAGENTS_BURNING_TEMP_HIGH_DAMAGE,0,REAGENTS_BURNING_TEMP_HIGH_DAMAGE_CAP) target.adjustFireLoss(burn_damage) - target.visible_message(span("danger","The hot liquid burns \the [target]!")) + target.visible_message(SPAN_DANGER("The hot liquid burns \the [target]!")) else if(temperature <= REAGENTS_BURNING_TEMP_LOW) var/burn_damage = Clamp(total_volume*(REAGENTS_BURNING_TEMP_LOW - temperature)*REAGENTS_BURNING_TEMP_LOW_DAMAGE,0,REAGENTS_BURNING_TEMP_LOW_DAMAGE_CAP) target.adjustFireLoss(burn_damage) - target.visible_message(span("danger","The freezing liquid burns \the [target]!")) + target.visible_message(SPAN_DANGER("The freezing liquid burns \the [target]!")) for(var/datum/reagent/current in reagent_list) current.touch_mob(target, current.volume) @@ -556,4 +556,7 @@ /* Atom reagent creation - use it all the time */ /atom/proc/create_reagents(var/max_vol) - reagents = new/datum/reagents(max_vol, src) + if(reagents) + reagents.maximum_volume = max(reagents.maximum_volume, max_vol) + else + reagents = new/datum/reagents(max_vol, src) \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index fb5a06e6bcd..0f3ddd55414 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -108,34 +108,34 @@ else if (href_list["add"]) if(href_list["amount"]) - var/id = href_list["add"] + var/rtype = text2path(href_list["add"]) var/amount = Clamp((text2num(href_list["amount"])), 0, 200) - R.trans_id_to(src, id, amount) + R.trans_type_to(src, rtype, amount) else if (href_list["addcustom"]) - var/id = href_list["addcustom"] + var/rtype = text2path(href_list["addcustom"]) useramount = input("Select the amount to transfer.", 30, useramount) as num useramount = Clamp(useramount, 0, 200) - src.Topic(null, list("amount" = "[useramount]", "add" = "[id]")) + src.Topic(null, list("amount" = "[useramount]", "add" = "[rtype]")) else if (href_list["remove"]) if(href_list["amount"]) - var/id = href_list["remove"] + var/rtype = text2path(href_list["remove"]) var/amount = Clamp((text2num(href_list["amount"])), 0, 200) if(mode) - reagents.trans_id_to(beaker, id, amount) + reagents.trans_type_to(beaker, rtype, amount) else - reagents.remove_reagent(id, amount) + reagents.remove_reagent(rtype, amount) else if (href_list["removecustom"]) - var/id = href_list["removecustom"] + var/rtype = text2path(href_list["removecustom"]) useramount = input("Select the amount to transfer.", 30, useramount) as num useramount = Clamp(useramount, 0, 200) - src.Topic(null, list("amount" = "[useramount]", "remove" = "[id]")) + src.Topic(null, list("amount" = "[useramount]", "remove" = "[rtype]")) else if (href_list["toggle"]) mode = !mode @@ -249,22 +249,22 @@ for(var/datum/reagent/G in R.reagent_list) dat += "[G.name] , [G.volume] Units - " dat += "(Analyze) " - dat += "(1) " - dat += "(5) " - dat += "(10) " - dat += "(All) " - dat += "(Custom)
" + dat += "(1) " + dat += "(5) " + dat += "(10) " + dat += "(All) " + dat += "(Custom)
" dat += "
Transfer to [(!mode ? "disposal" : "beaker")]:
" if(reagents.total_volume) for(var/datum/reagent/N in reagents.reagent_list) dat += "[N.name] , [N.volume] Units - " dat += "(Analyze) " - dat += "(1) " - dat += "(5) " - dat += "(10) " - dat += "(All) " - dat += "(Custom)
" + dat += "(1) " + dat += "(5) " + dat += "(10) " + dat += "(All) " + dat += "(Custom)
" else dat += "Empty
" if(!condi) @@ -302,18 +302,18 @@ var/limit = 10 var/list/holdingitems = list() var/list/sheet_reagents = list( //have a number of reagents which is a factor of REAGENTS_PER_SHEET (default 20) unless you like decimals - /obj/item/stack/material/iron = list("iron"), - /obj/item/stack/material/uranium = list("uranium"), - /obj/item/stack/material/phoron = list("phoron"), - /obj/item/stack/material/gold = list("gold"), - /obj/item/stack/material/silver = list("silver"), - /obj/item/stack/material/platinum = list("platinum"), - /obj/item/stack/material/mhydrogen = list("hydrazine"), // i guess - /obj/item/stack/material/steel = list("iron", "carbon"), - /obj/item/stack/material/plasteel = list("iron", "iron", "carbon", "carbon", "platinum"), //8 iron, 8 carbon, 4 platinum, - /obj/item/stack/material/sandstone = list("silicon", "acetone"), - /obj/item/stack/material/glass = list("silicate"), - /obj/item/stack/material/glass/phoronglass = list("platinum", "silicate", "silicate", "silicate"), //5 platinum, 15 silicate, + /obj/item/stack/material/iron = list(/datum/reagent/iron), + /obj/item/stack/material/uranium = list(/datum/reagent/uranium), + /obj/item/stack/material/phoron = list(/datum/reagent/toxin/phoron), + /obj/item/stack/material/gold = list(/datum/reagent/gold), + /obj/item/stack/material/silver = list(/datum/reagent/silver), + /obj/item/stack/material/platinum = list(/datum/reagent/platinum), + /obj/item/stack/material/mhydrogen = list(/datum/reagent/hydrazine), // i guess + /obj/item/stack/material/steel = list(/datum/reagent/iron, /datum/reagent/carbon), + /obj/item/stack/material/plasteel = list(/datum/reagent/iron, /datum/reagent/iron, /datum/reagent/carbon, /datum/reagent/carbon, /datum/reagent/platinum), //8 iron, 8 carbon, 4 platinum, + /obj/item/stack/material/sandstone = list(/datum/reagent/silicon, /datum/reagent/acetone), + /obj/item/stack/material/glass = list(/datum/reagent/silicate), + /obj/item/stack/material/glass/phoronglass = list(/datum/reagent/platinum, /datum/reagent/silicate, /datum/reagent/silicate, /datum/reagent/silicate), //5 platinum, 15 silicate, ) /obj/machinery/reagentgrinder/Initialize() diff --git a/code/modules/reagents/Chemistry-Readme.dm b/code/modules/reagents/Chemistry-Readme.dm index 905cbdd7663..05fbae651bb 100644 --- a/code/modules/reagents/Chemistry-Readme.dm +++ b/code/modules/reagents/Chemistry-Readme.dm @@ -48,8 +48,8 @@ About the Holder: get_master_reagent_name() Ditto, but returns the name. - get_master_reagent_id() - Ditto, but returns ID. + get_master_reagent_type() + Ditto, but returns type. update_total() Updates total volume, called automatically. @@ -111,7 +111,7 @@ About the Holder: Calls touch() before checking the type of [target], calling splash_mob(target, amount), trans_to_turf(target, amount, multiplier, copy), or trans_to_obj(target, amount, multiplier, copy). - trans_id_to(var/atom/target, var/id, var/amount = 1) + trans_type_to(var/atom/target, var/id, var/amount = 1) Transfers [amount] of [id] to [target]. Returns amount transferred. splash_mob(var/mob/target, var/amount = 1, var/clothes = 1) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index cb94da2f75f..6f371f3bdce 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1,6 +1,5 @@ /datum/reagent var/name = "Reagent" - var/id = "reagent" var/description = "A non-descript chemical." var/taste_description = "old rotten bandaids" var/taste_mult = 1 //how this taste compares to others. Higher values means it is more noticable @@ -24,6 +23,10 @@ var/glass_name = null var/glass_desc = null var/glass_center_of_mass = null + var/condiment_icon_state = null + var/condiment_name = null + var/condiment_desc = null + var/condiment_center_of_mass = null var/color = "#000000" var/color_weight = 1 var/unaffected_species = IS_DIONA | IS_MACHINE // Species that aren't affected by this reagent. Does not prevent affect_touch. @@ -46,10 +49,9 @@ /datum/reagent/proc/remove_self(var/amount) // Shortcut if (!holder) - //PROCLOG_WEIRD("Null holder found. Name: [name], id: [id]") return - holder.remove_reagent(id, amount) + holder.remove_reagent(type, amount) // This doesn't apply to skin contact - this is for, e.g. extinguishers and sprays. The difference is that reagent is not directly on the mob's skin - it might just be on their clothing. /datum/reagent/proc/touch_mob(var/mob/living/M, var/amount) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 0cd55e0e67f..6cb63d21a0e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -9,7 +9,6 @@ "trace_chem" = null ) name = "Blood" - id = "blood" reagent_state = LIQUID metabolism = REM * 5 color = "#C80000" @@ -71,7 +70,6 @@ #define WATER_LATENT_HEAT 19000 // How much heat is removed when applied to a hot turf, in J/unit (19000 makes 120 u of water roughly equivalent to 4L) /datum/reagent/water name = "Water" - id = "water" description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen." reagent_state = LIQUID color = "#0064C877" @@ -144,7 +142,7 @@ S.target = null ++S.discipline if(dose == removed) - S.visible_message(span("warning", "[S]'s flesh sizzles where the water touches it!"), span("danger", "Your flesh burns in the water!")) + S.visible_message(SPAN_WARNING("[S]'s flesh sizzles where the water touches it!"), SPAN_DANGER("Your flesh burns in the water!")) /datum/reagent/water/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) @@ -158,7 +156,6 @@ /datum/reagent/fuel name = "Welding fuel" - id = "fuel" description = "Required for welders. Flammable." reagent_state = LIQUID color = "#660000" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index 1d1013ddcae..7189c1d313b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -1,6 +1,5 @@ /datum/reagent/acetone name = "Acetone" - id = "acetone" description = "A colorless liquid solvent used in chemical synthesis." reagent_state = LIQUID color = "#808080" @@ -30,7 +29,6 @@ /datum/reagent/aluminum name = "Aluminum" - id = "aluminum" description = "A silvery white and ductile member of the boron group of chemical elements." reagent_state = SOLID color = "#A8A8A8" @@ -40,7 +38,6 @@ /datum/reagent/ammonia name = "Ammonia" - id = "ammonia" description = "A caustic substance commonly used in fertilizer or household cleaners. Poisonous to most lifeforms, lingers for a while if inhaled." reagent_state = LIQUID color = "#404030" @@ -59,7 +56,6 @@ /datum/reagent/carbon name = "Carbon" - id = "carbon" description = "A chemical element, the builing block of life." reagent_state = SOLID color = "#1C1300" @@ -88,7 +84,6 @@ /datum/reagent/copper name = "Copper" - id = "copper" description = "A highly ductile metal." color = "#6E3B08" taste_description = "copper" @@ -100,7 +95,6 @@ /datum/reagent/alcohol //Parent class for all alcoholic reagents, though this one shouldn't be used anywhere. name = null // This null name should prevent alcohol from being added to global lists. - id = "alcohol" description = "An abstract type you shouldn't be able to see." reagent_state = LIQUID color = "#404030" @@ -145,7 +139,7 @@ /datum/reagent/alcohol/affect_blood(mob/living/carbon/M, alien, removed) if(prob(10*(strength/100))) - to_chat(M, span("danger","Your insides are burning!")) // it would be quite painful to inject alcohol or otherwise get it in your bloodstream directly, without metabolising any + to_chat(M, SPAN_DANGER("Your insides are burning!")) // it would be quite painful to inject alcohol or otherwise get it in your bloodstream directly, without metabolising any M.adjustToxLoss(removed * blood_to_ingest_scale * (strength/100) ) affect_ingest(M,alien,removed * blood_to_ingest_scale) return @@ -173,7 +167,6 @@ /datum/reagent/alcohol/ethanol name = "Ethanol" - id = "ethanol" description = "A well-known alcohol with a variety of applications." flammability_divisor = 10 @@ -224,7 +217,6 @@ // Most behavior is inherited from alcohol. /datum/reagent/alcohol/butanol name = "Butanol" - id = "butanol" description = "A fairly harmless alcohol that has intoxicating effects on certain species." reagent_state = LIQUID color = "#404030" @@ -258,7 +250,6 @@ /datum/reagent/hydrazine name = "Hydrazine" - id = "hydrazine" description = "A toxic, colorless, flammable liquid with a strong ammonia-like odor, in hydrate form." reagent_state = LIQUID color = "#808080" @@ -290,7 +281,6 @@ /datum/reagent/iron name = "Iron" - id = "iron" description = "Pure iron is a metal." reagent_state = SOLID color = "#353535" @@ -304,7 +294,6 @@ /datum/reagent/lithium name = "Lithium" - id = "lithium" description = "A chemical element, used as antidepressant." reagent_state = SOLID color = "#808080" @@ -320,7 +309,6 @@ /datum/reagent/mercury name = "Mercury" - id = "mercury" description = "A chemical element." reagent_state = LIQUID color = "#484848" @@ -339,7 +327,6 @@ /datum/reagent/phosphorus name = "Phosphorus" - id = "phosphorus" description = "A chemical element, the backbone of biological energy carriers." reagent_state = SOLID color = "#832828" @@ -349,7 +336,6 @@ /datum/reagent/potassium name = "Potassium" - id = "potassium" description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water." reagent_state = SOLID color = "#A0A0A0" @@ -365,7 +351,6 @@ /datum/reagent/radium name = "Radium" - id = "radium" description = "Radium is an alkaline earth metal. It is extremely radioactive." reagent_state = SOLID color = "#C7C7C7" @@ -388,7 +373,6 @@ /datum/reagent/acid name = "Sulphuric acid" - id = "sacid" description = "A very corrosive mineral acid with the molecular formula H2SO4." reagent_state = LIQUID color = "#DB5008" @@ -480,7 +464,6 @@ /datum/reagent/acid/hydrochloric //Like sulfuric, but less toxic and more acidic. name = "Hydrochloric Acid" - id = "hclacid" description = "A very corrosive mineral acid with the molecular formula HCl." reagent_state = LIQUID color = "#808080" @@ -491,7 +474,6 @@ /datum/reagent/acid/polyacid //Not in dispensers, but it should be here name = "Polytrinic acid" - id = "pacid" description = "Polytrinic acid is a an extremely corrosive chemical substance." reagent_state = LIQUID color = "#8E18A9" @@ -501,14 +483,12 @@ /datum/reagent/acid/stomach name = "stomach acid" - id = "stomachacid" taste_description = "coppery foulness" power = 2 color = "#d8ff00" /datum/reagent/silicon name = "Silicon" - id = "silicon" description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon." reagent_state = SOLID color = "#A8A8A8" @@ -517,7 +497,6 @@ /datum/reagent/sodium name = "Sodium" - id = "sodium" description = "A chemical element, readily reacts with water." reagent_state = SOLID color = "#808080" @@ -526,7 +505,6 @@ /datum/reagent/sugar name = "Sugar" - id = "sugar" description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste." reagent_state = SOLID color = "#FFFFFF" @@ -538,13 +516,15 @@ glass_desc = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste." fallback_specific_heat = 0.332 + condiment_name = "sugar" + condiment_desc = "Tasty space sugar!" + condiment_icon_state = "sugar" /datum/reagent/sugar/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.adjustNutritionLoss(-removed*3) /datum/reagent/sulfur name = "Sulfur" - id = "sulfur" description = "A chemical element with a pungent smell." reagent_state = SOLID color = "#BF8C00" @@ -558,7 +538,6 @@ /datum/reagent/tungsten name = "Tungsten" - id = "tungsten" description = "A chemical element, and a strong oxidising agent." reagent_state = SOLID color = "#DCDCDC" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm index 9fc838d5e56..1933e8e4de4 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm @@ -1,6 +1,5 @@ /datum/reagent/space_drugs name = "Space drugs" - id = "space_drugs" description = "Mercury Monolithium Sucrose, or space drugs, is a potent relaxant commonly found in Ambrosia plants. Lasts twice as long when inhaled." reagent_state = LIQUID color = "#60A584" @@ -29,7 +28,7 @@ M.adjustNutritionLoss(power*removed*nutrition_percent) var/hunger_strength = 1 - nutrition_percent if(prob( round(hunger_strength*removed) )) - to_chat(M,span("notice",pick("You could really go for some munchies.","You feel the need to eat more.","You crave chips for some reason.","You kind of really want pizza."))) + to_chat(M, SPAN_NOTICE(pick("You could really go for some munchies.","You feel the need to eat more.","You crave chips for some reason.","You kind of really want pizza."))) if(power > 20) var/probmod = 5 + (power-20) @@ -45,7 +44,6 @@ /datum/reagent/serotrotium name = "Serotrotium" - id = "serotrotium" description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans." reagent_state = LIQUID color = "#202040" @@ -64,7 +62,6 @@ /datum/reagent/cryptobiolin name = "Cryptobiolin" - id = "cryptobiolin" description = "Cryptobiolin causes confusion and dizzyness." reagent_state = LIQUID color = "#000055" @@ -83,7 +80,6 @@ /datum/reagent/impedrezene name = "Impedrezene" - id = "impedrezene" description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions." reagent_state = LIQUID color = "#C8A5DC" @@ -101,7 +97,6 @@ /datum/reagent/mindbreaker name = "Mindbreaker Toxin" - id = "mindbreaker" description = "A powerful hallucinogen, it can cause fatal effects in users." reagent_state = LIQUID color = "#B31008" @@ -115,7 +110,6 @@ /datum/reagent/psilocybin name = "Psilocybin" - id = "psilocybin" description = "A strong psycotropic derived from certain species of mushroom." color = "#E700E7" overdose = REAGENTS_OVERDOSE @@ -153,7 +147,6 @@ /datum/reagent/raskara_dust name = "Raskara Dust" - id = "raskara_dust" description = "A powdery narcotic found in the gang-ridden slums of Biesel and Sol. Known for it's relaxing poperties that cause trance-like states when inhaled. Casual users tend to snort or inhale, while hardcore users inject." reagent_state = SOLID color = "#AABBAA" @@ -181,7 +174,6 @@ /datum/reagent/night_juice name = "Nightlife" - id = "night_juice" description = "A liquid narcotic commonly used by the more wealthy drug-abusing citizens of the Eridani Federation. Works as a potent stimulant that causes extreme awakefulness. Lethal in high doses." reagent_state = LIQUID color = "#FFFF44" @@ -213,7 +205,6 @@ /datum/reagent/guwan_painkillers name = "Tremble" - id = "guwan_painkillers" description = "An ancient tribal Unathi narcotic based on the outer gel layer of the seeds of a poisonous flower. The chemical itself acts as a very potent omni-healer when consumed, however as the chemical metabolizes, it causes immense and cripling pain." reagent_state = LIQUID color = "#FFFF44" @@ -238,7 +229,6 @@ /datum/reagent/toxin/stimm //Homemade Hyperzine, ported from Polaris name = "Stimm" - id = "stimm" description = "A homemade stimulant with some serious side-effects." taste_description = "sweetness" taste_mult = 1.8 @@ -267,7 +257,6 @@ /datum/reagent/toxin/lean name = "Lean" - id = "lean" description = "A mixture of cough syrup, space-up, and sugar." taste_description = "sickly-sweet soda" taste_mult = 1.5 @@ -285,7 +274,7 @@ // doesn't make you vomit, though if(prob(7)) M.emote(pick("twitch", "drool", "moan", "giggle")) - to_chat(M, span("warning", pick("You feel great!", "You don't have a care in the world.", "You couldn't care less about anything.", "You feel so relaxed..."))) + to_chat(M, SPAN_WARNING(pick("You feel great!", "You don't have a care in the world.", "You couldn't care less about anything.", "You feel so relaxed..."))) M.adjustOxyLoss(0.01 * removed) if(M.losebreath < 5) M.losebreath++ @@ -294,7 +283,6 @@ /datum/reagent/toxin/krok name = "Krok Juice" - id = "krok" description = "An Eridanian variant of krokodil, known for causing prosthetic malfunctions." strength = 3 metabolism = REM @@ -324,7 +312,6 @@ /datum/reagent/wulumunusha name = "Wulumunusha Extract" - id = "wulumunusha" description = "The extract of the wulumunusha fruit, it can cause hallucinations and muteness." color = "#61E2EC" taste_description = "sourness" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 4cb9c78ec7a..492e4d0099e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1,7 +1,6 @@ /* Food */ /datum/reagent/kois name = "K'ois" - id = "koispaste" description = "A thick goopy substance, rich in K'ois nutrients." metabolism = REM * 4 var/nutriment_factor = 10 @@ -46,7 +45,6 @@ /datum/reagent/kois/clean name = "Filtered K'ois" - id = "koispasteclean" description = "A strange, ketchup-like substance, filled with K'ois nutrients." color = "#ece9dd" taste_description = "cabbage soup" @@ -55,7 +53,6 @@ /datum/reagent/kois/black name = "Modified K'ois" - id = "blackkois" description = "A thick goopy substance, rich in K'ois nutrients. This sample appears to be modified." color = "#31004A" taste_description = "tar" @@ -65,7 +62,6 @@ /* Food */ /datum/reagent/nutriment name = "Nutriment" - id = "nutriment" description = "All the vitamins, minerals, and carbohydrates the body needs in pure form." taste_mult = 4 reagent_state = SOLID @@ -84,7 +80,6 @@ /datum/reagent/nutriment/synthetic name = "Synthetic Nutriment" - id = "synnutriment" description = "A cheaper alternative to actual nutriment." taste_description = "cheap food" nutriment_factor = 10 @@ -184,11 +179,12 @@ data["cooked"] = newdata["cooked"] + return ..() + /datum/reagent/nutriment/coating/batter name = "batter mix" cooked_name = "batter" - id = "batter" color = "#f5f4e9" reagent_state = LIQUID icon_raw = "batter_raw" @@ -199,7 +195,6 @@ /datum/reagent/nutriment/coating/beerbatter name = "beer batter mix" cooked_name = "beer batter" - id = "beerbatter" color = "#f5f4e9" reagent_state = LIQUID icon_raw = "batter_raw" @@ -214,7 +209,6 @@ //============================== /datum/reagent/nutriment/protein // Bad for Skrell! name = "animal protein" - id = "protein" color = "#440000" blood_factor = 3 taste_description = "meat" @@ -227,19 +221,16 @@ /datum/reagent/nutriment/protein/tofu //Good for Skrell! name = "tofu protein" - id = "tofu" color = "#fdffa8" taste_description = "tofu" /datum/reagent/nutriment/protein/seafood // Good for Skrell! name = "seafood protein" - id = "seafood" color = "#f5f4e9" taste_description = "fish" /datum/reagent/nutriment/protein/egg // Also bad for skrell. name = "egg yolk" - id = "egg" color = "#FFFFAA" taste_description = "egg" @@ -251,7 +242,6 @@ /datum/reagent/nutriment/protein/cheese // Also bad for skrell. name = "cheese" - id = "cheese" color = "#EDB91F" taste_description = "cheese" @@ -259,7 +249,6 @@ //========================= /datum/reagent/nutriment/triglyceride name = "triglyceride" - id = "triglyceride" description = "More commonly known as fat, the third macronutrient, with over double the energy content of carbs and protein" reagent_state = SOLID @@ -277,7 +266,6 @@ /datum/reagent/nutriment/triglyceride/oil //Having this base class incase we want to add more variants of oil name = "Oil" - id = "oil" description = "Oils are liquid fats" reagent_state = LIQUID color = "#c79705" @@ -355,19 +343,21 @@ M.take_organ_damage(0, removed * 1.5 * dfactor) data["temperature"] -= (6 * removed) / (1 + volume*0.1)//Cools off as it burns you if (lastburnmessage+100 < world.time ) - to_chat(M, span("danger", "Searing hot oil burns you, wash it off quick!")) + to_chat(M, SPAN_DANGER("Searing hot oil burns you, wash it off quick!")) lastburnmessage = world.time /datum/reagent/nutriment/triglyceride/oil/corn name = "Corn Oil" - id = "cornoil" description = "An oil derived from various types of corn." taste_description = "corn oil" + condiment_name = "corn oil" + condiment_desc = "A delicious oil used in cooking. Made from corn." + condiment_icon_state = "oliveoil" + /datum/reagent/nutriment/honey name = "Honey" - id = "honey" description = "A golden yellow syrup, loaded with sugary sweetness." nutriment_factor = 10 color = "#FFFF00" @@ -376,12 +366,13 @@ /datum/reagent/nutriment/flour name = "flour" - id = "flour" description = "This is what you rub all over yourself to pretend to be a ghost." reagent_state = SOLID nutriment_factor = 1 color = "#FFFFFF" taste_description = "chalky wheat" + condiment_name = "flour sack" + condiment_icon_state = "flour" /datum/reagent/nutriment/flour/touch_turf(var/turf/simulated/T) if(!istype(T, /turf/space)) @@ -392,7 +383,6 @@ /datum/reagent/nutriment/coco name = "Coco Powder" - id = "coco" description = "A fatty, bitter paste made from coco beans." reagent_state = SOLID nutriment_factor = 5 @@ -402,26 +392,28 @@ /datum/reagent/nutriment/soysauce name = "Soysauce" - id = "soysauce" description = "A salty sauce made from the soy plant." reagent_state = LIQUID nutriment_factor = 2 color = "#792300" taste_description = "umami" taste_mult = 1.1 + condiment_name = "soy sauce" + condiment_icon_state = "soysauce" /datum/reagent/nutriment/ketchup name = "Ketchup" - id = "ketchup" description = "Ketchup, catsup, whatever. It's tomato paste." reagent_state = LIQUID nutriment_factor = 5 color = "#731008" taste_description = "ketchup" + condiment_name = "ketchup" + condiment_icon_state = "ketchup" + condiment_center_of_mass = list("x"=16, "y"=6) /datum/reagent/nutriment/rice name = "Rice" - id = "rice" description = "Enjoy the great taste of nothing." reagent_state = SOLID nutriment_factor = 1 @@ -431,7 +423,6 @@ /datum/reagent/nutriment/cherryjelly name = "Cherry Jelly" - id = "cherryjelly" description = "Totally the best. Only to be spread on foods with excellent lateral symmetry." reagent_state = LIQUID nutriment_factor = 1 @@ -439,9 +430,8 @@ taste_description = "cherry" taste_mult = 1.3 -/datum/reagent/nutriment/virus_food +/datum/reagent/nutriment/virusfood name = "Virus Food" - id = "virusfood" description = "A mixture of water, milk, and oxygen. Virus cells can use this mixture to reproduce." reagent_state = LIQUID nutriment_factor = 2 @@ -451,7 +441,6 @@ /datum/reagent/nutriment/sprinkles name = "Sprinkles" - id = "sprinkles" description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." nutriment_factor = 1 color = "#FF00FF" @@ -459,7 +448,6 @@ /datum/reagent/nutriment/mint name = "Mint" - id = "mint" description = "Also known as Mentha." reagent_state = LIQUID color = "#CF3600" @@ -467,14 +455,12 @@ /datum/reagent/nutriment/glucose name = "Glucose" - id = "glucose" color = "#FFFFFF" injectable = 1 taste_description = "sweetness" /datum/reagent/lipozine // The anti-nutriment. name = "Lipozine" - id = "lipozine" description = "A chemical compound that causes a powerful fat-burning reaction." reagent_state = LIQUID color = "#BBEDA4" @@ -487,32 +473,35 @@ /datum/reagent/nutriment/barbecue name = "Barbecue Sauce" - id = "barbecue" description = "Barbecue sauce for barbecues and long shifts." taste_description = "barbecue" reagent_state = LIQUID nutriment_factor = 5 color = "#4F330F" + condiment_name = "barbecue sauce" + condiment_icon_state = "barbecue" /datum/reagent/nutriment/garlicsauce name = "Garlic Sauce" - id = "garlicsauce" description = "Garlic sauce, perfect for spicing up a plate of garlic." taste_description = "garlic" reagent_state = LIQUID nutriment_factor = 4 color = "#d8c045" + condiment_name = "garlic sauce" /* Non-food stuff like condiments */ /datum/reagent/sodiumchloride name = "Salt" - id = "sodiumchloride" description = "A salt made of sodium chloride. Commonly used to season food." reagent_state = SOLID color = "#FFFFFF" overdose = REAGENTS_OVERDOSE taste_description = "salt" + condiment_name = "salt shaker" + condiment_icon_state = "saltshakersmall" + condiment_center_of_mass = list("x"=17, "y"=11) /datum/reagent/sodiumchloride/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) M.intoxication -= min(M.intoxication,removed*2) //Salt absorbs alcohol @@ -525,16 +514,17 @@ /datum/reagent/blackpepper name = "Black Pepper" - id = "blackpepper" - description = "A powder ground from peppercorns. *AAAACHOOO*" + description = "Often used to flavor food or make people sneeze." reagent_state = SOLID color = "#000000" taste_description = "pepper" fallback_specific_heat = 1.25 + condiment_name = "pepper mill" + condiment_icon_state = "peppermillsmall" + condiment_center_of_mass = list("x"=17, "y"=11) /datum/reagent/enzyme name = "Universal Enzyme" - id = "enzyme" description = "A universal enzyme used in the preperation of certain chemicals and foods." reagent_state = LIQUID color = "#365E30" @@ -542,10 +532,11 @@ taste_description = "sweetness" taste_mult = 0.7 fallback_specific_heat = 1 + condiment_name = "universal enzyme" + condiment_icon_state = "enzyme" /datum/reagent/frostoil name = "Frost Oil" - id = "frostoil" description = "A special oil that chemically chills the body. Extracted from Ice Peppers." reagent_state = LIQUID color = "#B31008" @@ -554,6 +545,9 @@ fallback_specific_heat = 15 default_temperature = T0C - 20 + condiment_name = "coldsauce" + condiment_desc = "Leaves the tongue numb in its passage." + condiment_icon_state = "coldsauce" /datum/reagent/frostoil/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.bodytemperature = max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0) @@ -561,17 +555,19 @@ M.emote("shiver") if(istype(M, /mob/living/carbon/slime)) M.bodytemperature = max(M.bodytemperature - rand(10,20), 0) - holder.remove_reagent("capsaicin", 5) + holder.remove_reagent(/datum/reagent/capsaicin, 5) /datum/reagent/capsaicin name = "Capsaicin Oil" - id = "capsaicin" description = "This is what makes chilis hot." reagent_state = LIQUID color = "#B31008" taste_description = "hot peppers" taste_mult = 1.5 fallback_specific_heat = 2 + condiment_name = "hotsauce" + condiment_desc = "You can almost TASTE the stomach ulcers now!" + condiment_icon_state = "hotsauce" var/agony_dose = 5 var/agony_amount = 1 @@ -597,14 +593,13 @@ to_chat(M, "You feel like your insides are burning!") if(istype(M, /mob/living/carbon/slime)) M.bodytemperature += rand(0, 15) + slime_temp_adj - holder.remove_reagent("frostoil", 5) + holder.remove_reagent(/datum/reagent/frostoil, 5) #define EYES_PROTECTED 1 #define EYES_MECH 2 /datum/reagent/capsaicin/condensed name = "Condensed Capsaicin" - id = "condensedcapsaicin" description = "A chemical agent used for self-defense and in police work." taste_mult = 10 reagent_state = LIQUID @@ -685,24 +680,25 @@ M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]", "You feel like your insides are burning!") if(istype(M, /mob/living/carbon/slime)) M.bodytemperature += rand(15, 30) - holder.remove_reagent("frostoil", 5) + holder.remove_reagent(/datum/reagent/frostoil, 5) #undef EYES_PROTECTED #undef EYES_MECH /datum/reagent/spacespice name = "Space Spice" - id = "spacespice" description = "An exotic blend of spices for cooking. It must flow." reagent_state = SOLID color = "#e08702" taste_description = "spices" taste_mult = 1.5 fallback_specific_heat = 2 + condiment_name = "bottle of space spice" + condiment_icon_state = "spacespicebottle" + condiment_center_of_mass = list("x"=16, "y"=10) /datum/reagent/browniemix name = "Brownie Mix" - id = "browniemix" description = "A dry mix for making delicious brownies." reagent_state = SOLID color = "#441a03" @@ -712,7 +708,6 @@ /datum/reagent/drink name = "Drink" - id = "drink" description = "Uh, some kind of drink." reagent_state = LIQUID metabolism = REM * 10 @@ -762,7 +757,6 @@ // Juices /datum/reagent/drink/banana name = "Banana Juice" - id = "banana" description = "The raw essence of a banana." color = "#C3AF00" taste_description = "banana" @@ -773,7 +767,6 @@ /datum/reagent/drink/berryjuice name = "Berry Juice" - id = "berryjuice" description = "A delicious blend of several different kinds of berries." color = "#990066" taste_description = "berries" @@ -784,7 +777,6 @@ /datum/reagent/drink/carrotjuice name = "Carrot juice" - id = "carrotjuice" description = "It is just like a carrot but without crunching." color = "#FF8C00" // rgb: 255, 140, 0 taste_description = "carrots" @@ -796,11 +788,10 @@ /datum/reagent/drink/carrotjuice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(alien != IS_DIONA) - M.reagents.add_reagent("imidazoline", removed * 0.2) + M.reagents.add_reagent(/datum/reagent/imidazoline, removed * 0.2) /datum/reagent/drink/grapejuice name = "Grape Juice" - id = "grapejuice" description = "It's grrrrrape!" color = "#863333" taste_description = "grapes" @@ -811,7 +802,6 @@ /datum/reagent/drink/lemonjuice name = "Lemon Juice" - id = "lemonjuice" description = "This juice is VERY sour." color = "#AFAF00" taste_description = "sourness" @@ -822,7 +812,6 @@ /datum/reagent/drink/limejuice name = "Lime Juice" - id = "limejuice" description = "The sweet-sour juice of limes." color = "#365E30" taste_description = "tart citrus" @@ -834,7 +823,6 @@ /datum/reagent/drink/orangejuice name = "Orange juice" - id = "orangejuice" description = "Both delicious AND rich in Vitamin C, what more do you need?" color = "#E78108" taste_description = "oranges" @@ -850,7 +838,6 @@ /datum/reagent/toxin/poisonberryjuice // It has more in common with toxins than drinks... but it's a juice name = "Poison Berry Juice" - id = "poisonberryjuice" description = "A tasty juice blended from various kinds of very deadly and toxic berries." color = "#863353" strength = 5 @@ -860,9 +847,8 @@ glass_name = "glass of poison berry juice" glass_desc = "A glass of deadly juice." -/datum/reagent/drink/potato_juice +/datum/reagent/drink/potatojuice name = "Potato Juice" - id = "potato" description = "Juice of the potato. Bleh." nutrition = 2 color = "#302000" @@ -874,7 +860,6 @@ /datum/reagent/drink/tomatojuice name = "Tomato Juice" - id = "tomatojuice" description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?" color = "#731008" taste_description = "tomatoes" @@ -889,7 +874,6 @@ /datum/reagent/drink/watermelonjuice name = "Watermelon Juice" - id = "watermelonjuice" description = "Delicious juice made from watermelon." color = "#B83333" taste_description = "watermelon" @@ -900,7 +884,6 @@ /datum/reagent/drink/pineapplejuice name = "Pineapple Juice" - id = "pineapplejuice" description = "From freshly canned pineapples." color = "#FFFF00" taste_description = "pineapple" @@ -911,7 +894,6 @@ /datum/reagent/drink/earthenrootjuice name = "Earthen-Root Juice" - id = "earthenrootjuice" description = "Juice extracted from earthen-root, a plant native to Adhomai." color = "#4D8F53" taste_description = "sweetness" @@ -920,9 +902,8 @@ glass_name = "glass of earthen-root juice" glass_desc = "Juice extracted from earthen-root, a plant native to Adhomai." -/datum/reagent/drink/juice/garlic +/datum/reagent/drink/garlicjuice name = "Garlic Juice" - id = "garlicjuice" description = "Who would even drink this?" taste_description = "garlic" nutrition = 1 @@ -933,9 +914,8 @@ germ_adjust = 7.5 // has allicin, an antibiotic -/datum/reagent/drink/juice/onion +/datum/reagent/drink/onionjuice name = "Onion Juice" - id = "onionjuice" description = "Juice from an onion, for when you need to cry." taste_description = "onion" nutrition = 1 @@ -946,7 +926,6 @@ /datum/reagent/drink/applejuice name = "Apple Juice" - id = "applejuice" description = "Juice from an apple. The most basic beverage you can imagine." taste_description = "apple juice" color = "#f2d779" @@ -957,7 +936,6 @@ /datum/reagent/drink/dynjuice name = "Dyn Juice" - id = "dynjuice" description = "Juice from a dyn leaf. Good for you, but normally not consumed undiluted." taste_description = "astringent menthol" color = "#00e0e0" @@ -968,7 +946,6 @@ /datum/reagent/drink/dynjuice/hot name = "Dyn Tea" - id = "dynhot" taste_description = "peppermint water" description = "An old-fashioned, but traditional Skrell drink with documented medicinal properties." @@ -978,7 +955,6 @@ /datum/reagent/drink/dynjuice/cold name = "Dyn Ice Tea" - id = "dyncold" taste_description = "fizzy mint tea" description = "A modern spin on an old formula, popular among Skrell youngsters. Good for you." @@ -990,7 +966,6 @@ /datum/reagent/drink/milk name = "Milk" - id = "milk" description = "An opaque white liquid produced by the mammary glands of mammals." color = "#DFDFDF" taste_description = "milk" @@ -1005,11 +980,10 @@ ..() if(alien != IS_DIONA) M.heal_organ_damage(0.1 * removed, 0) - holder.remove_reagent("capsaicin", 10 * removed) + holder.remove_reagent(/datum/reagent/capsaicin, 10 * removed) /datum/reagent/drink/milk/cream name = "Cream" - id = "cream" description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" color = "#DFD7AF" taste_description = "creamy milk" @@ -1020,7 +994,6 @@ /datum/reagent/drink/milk/soymilk name = "Soy Milk" - id = "soymilk" description = "An opaque white liquid made from soybeans." color = "#DFDFC7" taste_description = "soy milk" @@ -1031,7 +1004,6 @@ /datum/reagent/drink/milk/adhomai name = "Fatshouters Milk" - id = "fatshouter_milk" description = "An opaque white liquid produced by the mammary glands of native adhomian animal." taste_description = "fatty milk" @@ -1044,7 +1016,6 @@ /datum/reagent/drink/milk/adhomai/fermented name = "Fermented Fatshouters Milk" - id = "adhomai_milk" description = "A tajaran made fermented dairy product, traditionally consumed by nomadic population of Adhomai." taste_description = "sour milk" @@ -1053,7 +1024,6 @@ /datum/reagent/drink/milk/beetle name = "Hakhma Milk" - id = "beetle_milk" description = "A milky substance extracted from the brood sac of the viviparous Hakhma, often consumed by Offworlders and Scarabs." nutrition = 4 color = "#FFF8AD" @@ -1064,7 +1034,6 @@ /datum/reagent/drink/tea name = "Tea" - id = "tea" description = "Tasty black tea, it has antioxidants, it's good for you!" color = "#101000" adj_dizzy = -2 @@ -1086,9 +1055,8 @@ metabolism = REM * 0.33 M.adjustToxLoss(1.5 * removed) -/datum/reagent/drink/tea/icetea +/datum/reagent/drink/icetea name = "Iced Tea" - id = "icetea" description = "No relation to a certain rap artist/ actor." color = "#984707" taste_description = "sweet tea" @@ -1102,7 +1070,6 @@ /datum/reagent/drink/tea/chaitea name = "Chai Tea" - id = "chaitea" description = "A tea spiced with cinnamon and cloves." color = "#DBAD81" taste_description = "creamy cinnamon and spice" @@ -1113,7 +1080,6 @@ /datum/reagent/drink/tea/coco_chaitea name = "Chocolate Chai" - id = "coco_chaitea" description = "A surprisingly pleasant mix of chocolate and spice." color = "#664300" taste_description = "creamy spiced cocoa" @@ -1122,9 +1088,8 @@ glass_name = "cup of chocolate chai tea" glass_desc = "A surprisingly pleasant mix of chocolate and spice." -/datum/reagent/drink/tea/chailatte +/datum/reagent/drink/tea/chaitealatte name = "Chai Latte" - id = "chailatte" description = "A frothy spiced tea." color = "#DBAD81" taste_description = "spiced milk foam" @@ -1133,16 +1098,15 @@ glass_name = "cup of chai latte" glass_desc = "For when you need the energy to yell at the barista for making your drink wrong." -/datum/reagent/drink/tea/chailatte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) //milk effects +/datum/reagent/drink/tea/chaitealatte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) //milk effects ..() if(alien != IS_DIONA) M.heal_organ_damage(0.1 * removed, 0) - holder.remove_reagent("capsaicin", 10 * removed) + holder.remove_reagent(/datum/reagent/capsaicin, 10 * removed) /datum/reagent/drink/tea/coco_chailatte name = "Chocolate Chai Latte" - id = "coco_chailatte" description = "Sweet, liquid chocolate. Have a cup of this and maybe you'll calm down." color = "#664300" taste_description = "spiced milk chocolate" @@ -1155,11 +1119,10 @@ ..() if(alien != IS_DIONA) M.heal_organ_damage(0.1 * removed, 0) - holder.remove_reagent("capsaicin", 10 * removed) + holder.remove_reagent(/datum/reagent/capsaicin, 10 * removed) /datum/reagent/drink/tea/cofftea name = "Cofftea" - id = "cofftea" description = "The only neutral ground in the tea versus coffee debate." color = "#292303" adj_dizzy = -3 @@ -1174,7 +1137,6 @@ /datum/reagent/drink/tea/bureacratea name = "Bureacratea" - id = "bureacratea" description = "An Eridani favorite for long nights of contract review." color = "#2B1902" adj_dizzy = -2 @@ -1189,7 +1151,6 @@ /datum/reagent/drink/tea/desert_tea //not in butanol path since xuizi is strength 5 by itself so the alcohol content is negligible when mixed name = "Desert Blossom Tea" - id = "desert_tea" description = "A simple, semi-sweet tea from Moghes, that uses a little xuizi juice for flavor." color = "#A8F062" taste_description = "sweet cactus water" @@ -1200,7 +1161,6 @@ /datum/reagent/drink/tea/greentea name = "Green Tea" - id = "greentea" description = "Tasty green tea. It's good for you!" color = "#B7C49D" taste_description = "light, refreshing tea" @@ -1211,7 +1171,6 @@ /datum/reagent/drink/tea/halfandhalf name = "Half and Half" - id = "halfandhalf" description = "Tea and lemonade; not to be confused with the dairy creamer." color = "#997207" taste_description = "refreshing tea mixed with crisp lemonade" @@ -1222,7 +1181,6 @@ /datum/reagent/drink/tea/heretic_tea name = "Heretics' Tea" - id = "heretic_tea" description = "A non-alcoholic take on a bloody brew." color = "#820000" taste_description = "fizzy, heretically sweet iron" @@ -1234,7 +1192,6 @@ /datum/reagent/drink/tea/kira_tea name = "Kira Tea" - id = "kira_tea" description = "A sweet take on a fizzy favorite." color = "#8A8A57" taste_description = "fizzy citrus tea" @@ -1246,7 +1203,6 @@ /datum/reagent/drink/tea/librarian_special name = "Librarian Special" - id = "librarian_special" description = "Shhhhhh!" color = "#101000" taste_description = "peace and quiet" @@ -1261,7 +1217,6 @@ /datum/reagent/drink/tea/mars_tea name = "Martian Tea" - id = "mars_tea" description = "A foul-smelling brew that you probably don't want to try." color = "#101000" taste_description = "bitter tea, pungent black pepper and just a hint of shaky politics" @@ -1272,7 +1227,6 @@ /datum/reagent/drink/tea/mendell_tea name = "Mendell Afternoon Tea" - id = "mendell_tea" description = "A simple, minty tea." color = "#859466" taste_description = "minty tea with a hint of lemon" @@ -1283,7 +1237,6 @@ /datum/reagent/drink/tea/berry_tea name = "Mixed Berry Tea" - id = "berry_tea" description = "Hot tea with a sweet, fruity taste!" color = "#2E0206" taste_description = "tart, fruity tea" @@ -1294,7 +1247,6 @@ /datum/reagent/drink/tea/pomegranate_icetea name = "Pomegranate Iced Tea" - id = "pomegranate_icetea" description = "A refreshing, fruity tea. No fruit was harmed in the making of this drink." color = "#302109" taste_description = "sweet pomegranate" @@ -1305,7 +1257,6 @@ /datum/reagent/drink/tea/portsvilleminttea name = "Portsville Mint Tea" - id = "portsvilleminttea" description = "A popular iced pick-me-up originating from a city in Eos, on Biesel." color = "#b6f442" taste_description = "cool minty tea" @@ -1316,7 +1267,6 @@ /datum/reagent/drink/tea/potatea name = "Potatea" - id = "potatea" description = "Why would you ever drink this?" color = "#2B2710" nutrition = 0.2 @@ -1328,7 +1278,6 @@ /datum/reagent/drink/tea/securitea name = "Securitea" - id = "securitea" description = "The safest drink around." color = "#030B36" taste_description = "freshly polished boots" @@ -1339,7 +1288,6 @@ /datum/reagent/drink/tea/sleepytime_tea name = "Sleepytime Tea" - id = "sleepytime_tea" description = "The perfect drink to enjoy before falling asleep in your favorite chair." color = "#101000" adj_drowsy = 1 @@ -1352,7 +1300,6 @@ /datum/reagent/drink/tea/hakhma_tea name = "Spiced Hakhma Tea" - id = "hakhma_tea" description = "A tea often brewed by Offworlders and Scarabs during important meals." color = "#8F6742" nutrition = 1 //hakhma milk has nutrition 4 @@ -1366,11 +1313,10 @@ ..() if(alien != IS_DIONA) M.heal_organ_damage(0.1 * removed, 0) - holder.remove_reagent("capsaicin", 10 * removed) + holder.remove_reagent(/datum/reagent/capsaicin, 10 * removed) /datum/reagent/drink/tea/sweet_tea name = "Sweet Tea" - id = "sweet_tea" description = "Hope you have a good dentist!" color = "#984707" taste_description = "sweet sugary comfort" @@ -1381,7 +1327,6 @@ /datum/reagent/drink/dynjuice/thewake //dyn properties name = "The Wake" - id = "thewake" description = "The tea-based alternative to a Sromshine." color = "#00E0E0" adj_dizzy = -3 @@ -1395,7 +1340,6 @@ /datum/reagent/drink/tea/tomatea name = "Tomatea" - id = "tomatea" description = "Basically tomato soup in a mug." color = "#9F3400" taste_description = "sad tomato soup" @@ -1410,7 +1354,6 @@ /datum/reagent/drink/tea/tropical_icetea name = "Tropical Iced Tea" - id = "tropical_icetea" description = "For maximum enjoyment, drink while at the beach on a warm summer day." color = "#773404" taste_description = "sweet beachside fruit" @@ -1425,7 +1368,6 @@ /datum/reagent/drink/coffee name = "Coffee" - id = "coffee" description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant." color = "#482000" adj_dizzy = -5 @@ -1443,7 +1385,7 @@ /datum/reagent/drink/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(adj_temp > 0) - holder.remove_reagent("frostoil", 10 * removed) + holder.remove_reagent(/datum/reagent/frostoil, 10 * removed) if(M.bodytemperature > 310) M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) @@ -1460,7 +1402,6 @@ /datum/reagent/drink/coffee/icecoffee name = "Frappe Coffee" - id = "icecoffee" description = "Coffee and ice, refreshing and cool." color = "#102838" @@ -1470,7 +1411,6 @@ /datum/reagent/drink/coffee/soy_latte name = "Soy Latte" - id = "soy_latte" description = "A nice and tasty beverage to enjoy while reading your hippie books." color = "#664300" taste_description = "creamy coffee" @@ -1486,7 +1426,6 @@ /datum/reagent/drink/coffee/cafe_latte name = "Cafe Latte" - id = "cafe_latte" description = "A nice, strong and tasty beverage to enjoy while reading." color = "#664300" // rgb: 102, 67, 0 taste_description = "bitter cream" @@ -1502,7 +1441,6 @@ /datum/reagent/drink/coffee/espresso name = "Espresso" - id = "espresso" description = "A strong coffee made by passing nearly boiling water through coffee seeds at high pressure." color = "#664300" // rgb: 102, 67, 0 taste_description = "bitter coffee" @@ -1514,7 +1452,6 @@ /datum/reagent/drink/coffee/freddo_espresso name = "Freddo espresso" - id = "freddo_espresso" description = "Espresso with ice cubes poured over ice." color = "#664300" // rgb: 102, 67, 0 taste_description = "cold and bitter coffee" @@ -1526,7 +1463,6 @@ /datum/reagent/drink/coffee/caffe_americano name = "Caffe Americano" - id = "caffe_americano" description = "Espresso diluted with hot water." color = "#664300" // rgb: 102, 67, 0 taste_description = "delicious coffee" @@ -1538,7 +1474,6 @@ /datum/reagent/drink/coffee/flat_white name = "Flat White Espresso" - id = "flat_white" description = "Espresso with a bit of steamy hot milk." color = "#664300" // rgb: 102, 67, 0 taste_description = "bitter coffee and milk" @@ -1550,7 +1485,6 @@ /datum/reagent/drink/coffee/latte name = "Latte" - id = "latte" description = "A nice, strong, and refreshing beverage to enjoy while reading." color = "#664300" // rgb: 102, 67, 0 taste_description = "bitter cream" @@ -1566,7 +1500,6 @@ /datum/reagent/drink/coffee/cappuccino name = "Cappuccino" - id = "cappuccino" description = "Espresso with steamed milk foam." color = "#664300" // rgb: 102, 67, 0 taste_description = "bitter milk foam" @@ -1578,7 +1511,6 @@ /datum/reagent/drink/coffee/freddo_cappuccino name = "Freddo Cappuccino" - id = "freddo_cappuccino" description = "Espresso with steamed milk foam, on ice." color = "#664300" // rgb: 102, 67, 0 taste_description = "cold and bitter milk foam" @@ -1590,7 +1522,6 @@ /datum/reagent/drink/coffee/macchiato name = "Macchiato" - id = "macchiato" description = "Espresso with milk foam." color = "#664300" // rgb: 102, 67, 0 taste_description = "bitter milk foam" @@ -1602,7 +1533,6 @@ /datum/reagent/drink/coffee/mocacchino name = "Mocacchino" - id = "mocacchino" description = "Espresso with hot milk and chocolate." color = "#664300" // rgb: 102, 67, 0 taste_description = "sweet milk and bitter coffee" @@ -1614,7 +1544,6 @@ /datum/reagent/drink/coffee/icecoffee/psfrappe name = "Pumpkin Spice Frappe" - id = "psfrappe" description = "A seasonal treat popular around the autumn times." color = "#9C6B19" taste_description = "autumn bliss and coffee" @@ -1625,7 +1554,6 @@ /datum/reagent/drink/coffee/pslatte name = "Pumpkin Spice Latte" - id = "pslatte" description = "A seasonal drink favored in autumn." color = "#9C6B19" taste_description = "hot creamy coffee and autumn bliss" @@ -1636,7 +1564,6 @@ /datum/reagent/drink/coffee/sadpslatte name = "Processed Pumpkin Latte" - id = "sadpslatte" description = "A processed drink vaguely reminicent of autumn bliss." color = "#9C6B19" taste_description = "a disappointing approximation of autumn bliss" @@ -1647,7 +1574,6 @@ /datum/reagent/drink/coffee/mars name = "Martian Special" - id = "mars_coffee" description = "Black coffee, heavily peppered." taste_description = "bitter coffee, pungent black pepper and just a hint of shaky politics" @@ -1657,7 +1583,6 @@ /datum/reagent/drink/hot_coco name = "Hot Chocolate" - id = "hot_coco" description = "Made with love! And cocoa beans." reagent_state = LIQUID color = "#403010" @@ -1670,7 +1595,6 @@ /datum/reagent/drink/sodawater name = "Soda Water" - id = "sodawater" description = "A can of club soda. Why not make a scotch and soda?" color = "#619494" adj_dizzy = -5 @@ -1684,7 +1608,6 @@ /datum/reagent/drink/grapesoda name = "Grape Soda" - id = "grapesoda" description = "Grapes made into a fine drank." color = "#421C52" adj_drowsy = -3 @@ -1697,7 +1620,6 @@ /datum/reagent/drink/tonic name = "Tonic Water" - id = "tonic" description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." color = "#664300" adj_dizzy = -5 @@ -1713,7 +1635,6 @@ /datum/reagent/drink/lemonade name = "Lemonade" description = "Oh the nostalgia..." - id = "lemonade" color = "#FFFF00" taste_description = "tartness" @@ -1724,7 +1645,6 @@ /datum/reagent/drink/lemonade/pink name = "Pink Lemonade" description = "A fruity pink citrus drink." - id = "pinklemonade" color = "#FFC0CB" taste_description = "girly tartness" @@ -1735,7 +1655,6 @@ /datum/reagent/drink/kiraspecial name = "Kira Special" description = "Long live the guy who everyone had mistaken for a girl. Baka!" - id = "kiraspecial" color = "#CCCC99" taste_description = "fruity sweetness" carbonated = TRUE @@ -1748,7 +1667,6 @@ /datum/reagent/drink/brownstar name = "Brown Star" description = "It's not what it sounds like..." - id = "brownstar" color = "#9F3400" taste_description = "orange and cola soda" carbonated = TRUE @@ -1760,7 +1678,6 @@ /datum/reagent/drink/mintsyrup name = "Mint Syrup" description = "A simple syrup that tastes strongly of mint." - id = "mintsyrup" color = "#539830" taste_description = "mint" @@ -1772,7 +1689,6 @@ /datum/reagent/drink/milkshake name = "Milkshake" description = "Glorious brainfreezing mixture." - id = "milkshake" color = "#AEE5E4" taste_description = "creamy vanilla" @@ -1784,7 +1700,6 @@ /datum/reagent/drink/rewriter name = "Rewriter" description = "The secret of the sanctuary of the Libarian..." - id = "rewriter" color = "#485000" caffeine = 0.4 taste_description = "soda and coffee" @@ -1802,7 +1717,6 @@ /datum/reagent/drink/nuka_cola name = "Nuka Cola" - id = "nuka_cola" description = "Cola, cola never changes." color = "#100800" adj_sleepy = -2 @@ -1826,7 +1740,6 @@ /datum/reagent/drink/grenadine name = "Grenadine Syrup" - id = "grenadine" description = "Made in the modern day with proper pomegranate substitute. Who uses real fruit, anyways?" color = "#FF004F" taste_description = "100% pure pomegranate" @@ -1838,7 +1751,6 @@ /datum/reagent/drink/space_cola name = "Space Cola" - id = "cola" description = "A refreshing beverage." reagent_state = LIQUID color = "#100800" @@ -1852,7 +1764,6 @@ /datum/reagent/drink/spacemountainwind name = "Mountain Wind" - id = "spacemountainwind" description = "Blows right through you like a space wind." color = "#102000" adj_drowsy = -7 @@ -1866,7 +1777,6 @@ /datum/reagent/drink/dr_gibb name = "Dr. Gibb" - id = "dr_gibb" description = "A delicious blend of 42 different flavours" color = "#102000" adj_drowsy = -6 @@ -1879,7 +1789,6 @@ /datum/reagent/drink/root_beer name = "R&D Root Beer" - id = "root_beer" description = "A classic Earth drink from the United Americas province." color = "#211100" adj_drowsy = -6 @@ -1890,9 +1799,8 @@ glass_name = "glass of R&D Root Beer" glass_desc = "A glass of bubbly R&D Root Beer." -/datum/reagent/drink/space_up +/datum/reagent/drink/spaceup name = "Space-Up" - id = "space_up" description = "Tastes like a hull breach in your mouth." color = "#202800" taste_description = "a hull breach" @@ -1905,7 +1813,6 @@ /datum/reagent/drink/lemon_lime name = "Lemon Lime" description = "A tangy substance made of 0.5% natural citrus!" - id = "lemon_lime" color = "#878F00" taste_description = "tangy lime and lemon soda" @@ -1913,9 +1820,8 @@ glass_name = "glass of lemon lime soda" glass_desc = "A tangy substance made of 0.5% natural citrus!" -/datum/reagent/drink/doctor_delight +/datum/reagent/drink/doctorsdelight name = "The Doctor's Delight" - id = "doctorsdelight" description = "A gulp a day keeps the MediBot away. That's probably for the best." reagent_state = LIQUID color = "#FF8CFF" @@ -1929,7 +1835,7 @@ blood_to_ingest_scale = 1 -/datum/reagent/drink/doctor_delight/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/drink/doctorsdelight/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(alien != IS_DIONA) M.adjustOxyLoss(-4 * removed) @@ -1941,7 +1847,6 @@ /datum/reagent/drink/dry_ramen name = "Dry Ramen" - id = "dry_ramen" description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." reagent_state = SOLID nutrition = 1 @@ -1951,7 +1856,6 @@ /datum/reagent/drink/hot_ramen name = "Hot Ramen" - id = "hot_ramen" description = "The noodles are boiled, the flavors are artificial, just like being back in school." reagent_state = LIQUID color = "#302000" @@ -1962,7 +1866,6 @@ /datum/reagent/drink/hell_ramen name = "Hell Ramen" - id = "hell_ramen" description = "The noodles are boiled, the flavors are artificial, just like being back in school." reagent_state = LIQUID color = "#302000" @@ -1973,7 +1876,6 @@ /datum/reagent/drink/ice name = "Ice" - id = "ice" description = "Frozen water, your dentist wouldn't like you chewing this." reagent_state = SOLID color = "#619494" @@ -1989,7 +1891,6 @@ /datum/reagent/drink/nothing name = "Nothing" - id = "nothing" description = "Absolutely nothing." taste_description = "nothing" @@ -1999,7 +1900,6 @@ /datum/reagent/drink/meatshake name = "Meatshake" - id = "meatshake" color = "#874c20" description = "Blended meat and cream for those who want crippling heart failure down the road." taste_description = "liquified meat" @@ -2010,7 +1910,6 @@ /datum/reagent/drink/ciderhot name = "Apple Cider" - id = "ciderhot" description = "A great drink to warm up a crisp autumn afternoon!" color = "#664300" taste_description = "fresh apples mixed with cinnamon" @@ -2021,7 +1920,6 @@ /datum/reagent/drink/cidercold name = "Apple Cider" - id = "cidercold" description = "A refreshing mug of fresh apples and cinnamon." color = "#664300" taste_description = "fresh apples mixed with cinnamon" @@ -2032,7 +1930,6 @@ /datum/reagent/drink/cidercheap name = "Apple Cider Juice" - id = "cidercheap" description = "It's just spiced up apple juice. Ugh." color = "#664300" taste_description = "sad apple juice with cinnamon" @@ -2043,7 +1940,6 @@ /datum/reagent/drink/toothpaste name = "Toothpaste" - id = "toothpaste" description = "A paste commonly used in oral hygiene." reagent_state = LIQUID color = "#b1eae8" @@ -2066,7 +1962,6 @@ /datum/reagent/drink/toothpaste/cold_gate name = "Cold Gate" - id = "cold_gate" description = "A C'thur Favorite, guaranteed to make even the bloodiest of warriors mandibles shimmer." strength = 25 taste_description = "mint" @@ -2078,7 +1973,6 @@ /datum/reagent/drink/toothpaste/waterfresh name = "Waterfresh" - id = "waterfresh" description = "A concoction of toothpaste and mouthwash, for when you need to show your pearly whites." strength = 40 taste_description = "bubble bath" @@ -2090,7 +1984,6 @@ /datum/reagent/drink/toothpaste/sedantian_firestorm name = "Sedantian Firestorm" - id = "sedantian_firestorm" description = "Florinated phoron, is the drink suppose to be on fire?" strength = 80 taste_description = "melting asphalt" @@ -2104,7 +1997,6 @@ /datum/reagent/drink/toothpaste/kois_odyne name = "Kois Odyne" - id = "kois_odyne" description = "A favourite among the younger vaurca, born from an accident involving nanopaste and the repair of internal augments." strength = 60 taste_description = "chalk" @@ -2116,7 +2008,6 @@ /datum/reagent/drink/toothpaste/teathpaste name = "Teathpaste" - id = "teathpaste" description = "A sad attempt to reduce the effects of sugary tea on your teeth." color = "#45615A" strength = 20 @@ -2143,7 +2034,6 @@ /datum/reagent/alcohol/ethanol/absinthe name = "Absinthe" - id = "absinthe" description = "Watch out that the Green Fairy doesn't come for you!" color = "#33EE00" strength = 75 @@ -2156,7 +2046,6 @@ /datum/reagent/alcohol/ethanol/ale name = "Ale" - id = "ale" description = "A dark alchoholic beverage made by malted barley and yeast." color = "#664300" strength = 6 @@ -2170,7 +2059,6 @@ /datum/reagent/alcohol/ethanol/beer name = "Beer" - id = "beer" description = "An alcoholic beverage made from malted grains, hops, yeast, and water." color = "#664300" strength = 5 @@ -2190,7 +2078,6 @@ /datum/reagent/alcohol/ethanol/bitters name = "Aromatic Bitters" - id = "bitters" description = "A very, very concentrated and bitter herbal alcohol." color = "#223319" strength = 40 @@ -2203,7 +2090,6 @@ /datum/reagent/alcohol/ethanol/bluecuracao name = "Blue Curacao" - id = "bluecuracao" description = "Exotically blue, fruity drink, distilled from oranges." color = "#0000CD" strength = 25 @@ -2216,7 +2102,6 @@ /datum/reagent/alcohol/ethanol/champagne name = "Champagne" - id = "champagne" description = "A classy sparkling wine, usually found in meeting rooms and basements." color = "#EBECC0" strength = 15 @@ -2230,7 +2115,6 @@ /datum/reagent/alcohol/ethanol/cognac name = "Cognac" - id = "cognac" description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication." color = "#AB3C05" strength = 40 @@ -2243,7 +2127,6 @@ /datum/reagent/alcohol/ethanol/deadrum name = "Deadrum" - id = "deadrum" description = "Popular with the sailors. Not very popular with everyone else." color = "#664300" strength = 40 @@ -2261,7 +2144,6 @@ /datum/reagent/alcohol/ethanol/gin name = "Gin" - id = "gin" description = "It's gin. In space. I say, good sir." color = "#664300" strength = 30 @@ -2274,7 +2156,6 @@ /datum/reagent/alcohol/ethanol/victorygin name = "Victory Gin" - id = "victorygin" description = "An oily Adhomai-based gin." color = "#664300" strength = 18 @@ -2304,7 +2185,6 @@ /datum/reagent/alcohol/ethanol/coffee/kahlua name = "Kahlua" - id = "kahlua" description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!" color = "#664300" strength = 20 @@ -2318,7 +2198,6 @@ /datum/reagent/alcohol/ethanol/melonliquor name = "Melon Liquor" - id = "melonliquor" description = "A relatively sweet and fruity 46 proof liquor." color = "#138808" // rgb: 19, 136, 8 strength = 23 @@ -2331,7 +2210,6 @@ /datum/reagent/alcohol/ethanol/rum name = "Rum" - id = "rum" description = "Yohoho and all that." color = "#664300" strength = 40 @@ -2344,7 +2222,6 @@ /datum/reagent/alcohol/ethanol/sake name = "Sake" - id = "sake" description = "Anime's favorite drink." color = "#664300" strength = 20 @@ -2355,22 +2232,20 @@ glass_desc = "A glass of sake." glass_center_of_mass = list("x"=16, "y"=12) -/datum/reagent/alcohol/ethanol/tequilla +/datum/reagent/alcohol/ethanol/tequila name = "Tequila" - id = "tequilla" description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?" color = "#FFFF91" strength = 40 taste_description = "paint stripper" - glass_icon_state = "tequillaglass" - glass_name = "glass of Tequilla" + glass_icon_state = "tequilaglass" + glass_name = "glass of tequila" glass_desc = "Now all that's missing is the weird colored shades!" glass_center_of_mass = list("x"=16, "y"=12) /datum/reagent/alcohol/ethanol/thirteenloko name = "Thirteen Loko" - id = "thirteenloko" description = "A potent mixture of caffeine and alcohol." color = "#102000" strength = 10 @@ -2396,7 +2271,6 @@ /datum/reagent/alcohol/ethanol/vermouth name = "Vermouth" - id = "vermouth" description = "You suddenly feel a craving for a martini..." color = "#91FF91" // rgb: 145, 255, 145 strength = 17 @@ -2410,7 +2284,6 @@ /datum/reagent/alcohol/ethanol/vodka name = "Vodka" - id = "vodka" description = "Number one drink AND fueling choice for Russians worldwide." color = "#0064C8" // rgb: 0, 100, 200 strength = 50 @@ -2427,7 +2300,6 @@ /datum/reagent/alcohol/ethanol/whiskey name = "Whiskey" - id = "whiskey" description = "A superb and well-aged single-malt whiskey. Damn." color = "#664300" strength = 40 @@ -2440,7 +2312,6 @@ /datum/reagent/alcohol/ethanol/wine name = "Wine" - id = "wine" description = "A premium alchoholic beverage made from distilled grape juice." color = "#7E4043" // rgb: 126, 64, 67 strength = 15 @@ -2455,7 +2326,6 @@ /datum/reagent/alcohol/ethanol/acid_spit name = "Acid Spit" - id = "acidspit" description = "A drink for the daring, can be deadly if incorrectly prepared!" reagent_state = LIQUID color = "#365000" @@ -2469,7 +2339,6 @@ /datum/reagent/alcohol/ethanol/alliescocktail name = "Allies Cocktail" - id = "alliescocktail" description = "A drink made from your allies, not as sweet as when made from your enemies." color = "#664300" strength = 25 @@ -2482,7 +2351,6 @@ /datum/reagent/alcohol/ethanol/aloe name = "Aloe" - id = "aloe" description = "So very, very, very good." color = "#664300" strength = 15 @@ -2495,7 +2363,6 @@ /datum/reagent/alcohol/ethanol/amasec name = "Amasec" - id = "amasec" description = "Official drink of the Gun Club!" reagent_state = LIQUID color = "#664300" @@ -2509,7 +2376,6 @@ /datum/reagent/alcohol/ethanol/andalusia name = "Andalusia" - id = "andalusia" description = "A nice, strangely named drink." color = "#664300" strength = 35 @@ -2522,7 +2388,6 @@ /datum/reagent/alcohol/ethanol/antifreeze name = "Anti-freeze" - id = "antifreeze" description = "Ultimate refreshment." color = "#664300" strength = 20 @@ -2537,7 +2402,6 @@ /datum/reagent/alcohol/ethanol/atomicbomb name = "Atomic Bomb" - id = "atomicbomb" description = "Nuclear proliferation never tasted so good." reagent_state = LIQUID color = "#666300" @@ -2552,7 +2416,6 @@ /datum/reagent/alcohol/ethanol/coffee/b52 name = "B-52" - id = "b52" description = "Coffee, Irish Cream, and cognac. You will get bombed." color = "#664300" strength = 35 @@ -2564,7 +2427,6 @@ /datum/reagent/alcohol/ethanol/bahama_mama name = "Bahama mama" - id = "bahama_mama" description = "Tropical cocktail." color = "#FF7F3B" strength = 15 @@ -2577,7 +2439,6 @@ /datum/reagent/alcohol/ethanol/bananahonk name = "Banana Mama" - id = "bananahonk" description = "A drink from Clown Heaven." nutriment_factor = 1 color = "#FFFF91" @@ -2591,7 +2452,6 @@ /datum/reagent/alcohol/ethanol/barefoot name = "Barefoot" - id = "barefoot" description = "Barefoot and pregnant" color = "#664300" strength = 15 @@ -2604,7 +2464,6 @@ /datum/reagent/alcohol/ethanol/beepsky_smash name = "Beepsky Smash" - id = "beepskysmash" description = "Deny drinking this and prepare for THE LAW." reagent_state = LIQUID color = "#664300" @@ -2616,14 +2475,13 @@ glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." glass_center_of_mass = list("x"=18, "y"=10) -/datum/reagent/alcohol/ethanol/beepsky_smash/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/alcohol/ethanol/beepskysmash/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(alien != IS_DIONA) M.Stun(2) /datum/reagent/alcohol/ethanol/bilk name = "Bilk" - id = "bilk" description = "This appears to be beer mixed with milk. Disgusting." color = "#895C4C" strength = 4 @@ -2634,9 +2492,8 @@ glass_name = "glass of bilk" glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." -/datum/reagent/alcohol/ethanol/black_russian +/datum/reagent/alcohol/ethanol/blackrussian name = "Black Russian" - id = "blackrussian" description = "For the lactose-intolerant. Still as classy as a White Russian." color = "#360000" strength = 20 @@ -2647,9 +2504,8 @@ glass_desc = "For the lactose-intolerant. Still as classy as a White Russian." glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/alcohol/ethanol/bloody_mary +/datum/reagent/alcohol/ethanol/bloodymary name = "Bloody Mary" - id = "bloodymary" description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." color = "#664300" strength = 20 @@ -2661,7 +2517,6 @@ /datum/reagent/alcohol/ethanol/booger name = "Booger" - id = "booger" description = "Ewww..." color = "#8CFF8C" strength = 20 @@ -2673,7 +2528,6 @@ /datum/reagent/alcohol/ethanol/coffee/brave_bull name = "Brave Bull" - id = "bravebull" description = "It's just as effective as Dutch-Courage!" color = "#664300" strength = 30 @@ -2682,12 +2536,11 @@ glass_icon_state = "bravebullglass" glass_name = "glass of Brave Bull" - glass_desc = "Tequilla and coffee liquor, brought together in a mouthwatering mixture. Drink up." + glass_desc = "Tequila and coffee liquor, brought together in a mouthwatering mixture. Drink up." glass_center_of_mass = list("x"=15, "y"=8) /datum/reagent/alcohol/ethanol/cmojito name = "Champagne Mojito" - id = "cmojito" description = "A fizzy, minty and sweet drink." color = "#5DBA40" strength = 15 @@ -2697,21 +2550,20 @@ glass_name = "glass of champagne mojito" glass_desc = "Looks fun!" -/datum/reagent/alcohol/ethanol/changelingsting - name = "Changeling Sting" - id = "changelingsting" - description = "You take a tiny sip and feel a burning sensation..." - color = "#2E6671" +/datum/reagent/alcohol/ethanol/gibsonpunch + name = "Gibson Punch" + description = "An alcoholic fruit punch. It seems horribly sour at first, but a sweetly bitter aftertaste lingers in the mouth." + color = "#5f712e" strength = 40 - taste_description = "your brain coming out your nose" + taste_description = "sour and bitter fruit" - glass_icon_state = "changelingsting" - glass_name = "glass of Changeling Sting" - glass_desc = "A stingy drink." + glass_icon_state = "gibsonpunch" + glass_name = "glass of Gibson Punch" + glass_desc = "An alcoholic fruit punch." + glass_center_of_mass = list("x"=16, "y"=8) /datum/reagent/alcohol/ethanol/classic name = "The Classic" - id = "classic" description = "The classic bitter lemon cocktail." color = "#9a8922" strength = 20 @@ -2725,7 +2577,6 @@ /datum/reagent/alcohol/ethanol/martini name = "Classic Martini" - id = "martini" description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." color = "#664300" strength = 25 @@ -2738,7 +2589,6 @@ /datum/reagent/alcohol/ethanol/corkpopper name = "Cork Popper" - id = "corkpopper" description = "A fancy cocktail with a hint of lemon." color = "#766818" strength = "30" @@ -2749,9 +2599,8 @@ glass_desc = "The confusing scent only proves all the more alluring." glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/alcohol/ethanol/cuba_libre +/datum/reagent/alcohol/ethanol/cubalibre name = "Cuba Libre" - id = "cubalibre" description = "Rum, mixed with cola. Viva la revolucion." color = "#3E1B00" strength = 10 @@ -2765,7 +2614,6 @@ /datum/reagent/alcohol/ethanol/demonsblood name = "Demons Blood" - id = "demonsblood" description = "AHHHH!!!!" color = "#820000" strength = 15 @@ -2779,7 +2627,6 @@ /datum/reagent/alcohol/ethanol/devilskiss name = "Devils Kiss" - id = "devilskiss" description = "Creepy time!" color = "#A68310" strength = 15 @@ -2792,7 +2639,6 @@ /datum/reagent/alcohol/ethanol/driestmartini name = "Driest Martini" - id = "driestmartini" description = "Only for the experienced. You think you see sand floating in the glass." nutriment_factor = 1 color = "#2E6671" @@ -2806,7 +2652,6 @@ /datum/reagent/alcohol/ethanol/french75 name = "French 75" - id = "french75" description = "A sharp and classy cocktail." color = "#F4E68D" strength = 25 @@ -2820,7 +2665,6 @@ /datum/reagent/alcohol/ethanol/ginfizz name = "Gin Fizz" - id = "ginfizz" description = "Refreshingly lemony, deliciously dry." color = "#664300" strength = 20 @@ -2834,7 +2678,6 @@ /datum/reagent/alcohol/ethanol/grog name = "Grog" - id = "grog" description = "Watered-down rum, pirate approved!" reagent_state = LIQUID color = "#664300" @@ -2847,7 +2690,6 @@ /datum/reagent/alcohol/ethanol/erikasurprise name = "Erika Surprise" - id = "erikasurprise" description = "The surprise is, it's green!" color = "#2E6671" strength = 15 @@ -2858,9 +2700,8 @@ glass_desc = "The surprise is, it's green!" glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/alcohol/ethanol/gargle_blaster +/datum/reagent/alcohol/ethanol/gargleblaster name = "Pan-Galactic Gargle Blaster" - id = "gargleblaster" description = "Whoah, this stuff looks volatile!" reagent_state = LIQUID color = "#664300" @@ -2874,7 +2715,6 @@ /datum/reagent/alcohol/ethanol/gintonic name = "Gin and Tonic" - id = "gintonic" description = "An all time classic, mild cocktail." color = "#664300" strength = 12 @@ -2888,7 +2728,6 @@ /datum/reagent/alcohol/ethanol/goldschlager name = "Goldschlager" - id = "goldschlager" description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break." color = "#664300" strength = 50 @@ -2899,9 +2738,8 @@ glass_desc = "100 proof that teen girls will drink anything with gold in it." glass_center_of_mass = list("x"=16, "y"=12) -/datum/reagent/alcohol/ethanol/hippies_delight +/datum/reagent/alcohol/ethanol/hippiesdelight name = "Hippies' Delight" - id = "hippiesdelight" description = "You just don't get it maaaan." reagent_state = LIQUID color = "#664300" @@ -2916,7 +2754,6 @@ /datum/reagent/alcohol/ethanol/hooch name = "Hooch" - id = "hooch" description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" color = "#664300" strength = 65 @@ -2928,7 +2765,6 @@ /datum/reagent/alcohol/ethanol/iced_beer name = "Iced Beer" - id = "iced_beer" description = "A beer which is so cold the air around it freezes." color = "#664300" strength = 5 @@ -2943,7 +2779,6 @@ /datum/reagent/alcohol/ethanol/irishcarbomb name = "Irish Car Bomb" - id = "irishcarbomb" description = "Mmm, tastes like chocolate cake..." color = "#2E6671" strength = 50 @@ -2957,7 +2792,6 @@ /datum/reagent/alcohol/ethanol/coffee/irishcoffee name = "Irish Coffee" - id = "irishcoffee" description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." color = "#664300" strength = 50 @@ -2969,9 +2803,8 @@ glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." glass_center_of_mass = list("x"=15, "y"=10) -/datum/reagent/alcohol/ethanol/irish_cream +/datum/reagent/alcohol/ethanol/irishcream name = "Irish Cream" - id = "irishcream" description = "Whiskey-imbued cream, what else would you expect from the Irish." color = "#664300" strength = 25 @@ -2984,7 +2817,6 @@ /datum/reagent/alcohol/ethanol/longislandicedtea name = "Long Island Iced Tea" - id = "longislandicedtea" description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." color = "#664300" strength = 40 @@ -2998,7 +2830,6 @@ /datum/reagent/alcohol/ethanol/manhattan name = "Manhattan" - id = "manhattan" description = "The Detective's undercover drink of choice. He never could stomach gin..." color = "#664300" strength = 30 @@ -3011,7 +2842,6 @@ /datum/reagent/alcohol/ethanol/manhattan_proj name = "Manhattan Project" - id = "manhattan_proj" description = "A scientist's drink of choice, for pondering ways to blow up the station." color = "#664300" strength = 30 @@ -3025,7 +2855,6 @@ /datum/reagent/alcohol/ethanol/manly_dorf name = "The Manly Dorf" - id = "manlydorf" description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." color = "#664300" strength = 45 @@ -3038,7 +2867,6 @@ /datum/reagent/alcohol/ethanol/margarita name = "Margarita" - id = "margarita" description = "On the rocks with salt on the rim. Arriba~!" color = "#8CFF8C" strength = 30 @@ -3051,7 +2879,6 @@ /datum/reagent/alcohol/ethanol/mead name = "Mead" - id = "mead" description = "A Viking's drink, though a cheap one." reagent_state = LIQUID color = "#664300" @@ -3066,7 +2893,6 @@ /datum/reagent/alcohol/ethanol/moonshine name = "Moonshine" - id = "moonshine" description = "You've really hit rock bottom now... your liver packed its bags and left last night." color = "#664300" strength = 65 @@ -3078,7 +2904,6 @@ /datum/reagent/alcohol/ethanol/muscmule name = "Muscovite Mule" - id = "muscmule" description = "A surprisingly gentle cocktail, with a hidden punch." color = "#8EEC5F" strength = 40 @@ -3091,7 +2916,6 @@ /datum/reagent/alcohol/ethanol/neurotoxin name = "Neurotoxin" - id = "neurotoxin" description = "A strong neurotoxin that puts the subject into a death-like state." reagent_state = LIQUID color = "#2E2E61" @@ -3115,7 +2939,6 @@ /datum/reagent/alcohol/ethanol/omimosa name = "Orange Mimosa" - id = "omimosa" description = "Wonderful start to any day." color = "#F4A121" strength = 15 @@ -3128,7 +2951,6 @@ /datum/reagent/alcohol/ethanol/patron name = "Patron" - id = "patron" description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." color = "#585840" strength = 20 @@ -3141,7 +2963,6 @@ /datum/reagent/alcohol/ethanol/pinkgin name = "Pink Gin" - id = "pinkgin" description = "Bitters and Gin." color = "#DB80B2" strength = 25 @@ -3154,7 +2975,6 @@ /datum/reagent/alcohol/ethanol/pinkgintonic name = "Pink Gin and Tonic." - id = "pinkgintonic" description = "Bitterer gin and tonic." color = "#F4BDDB" strength = 25 @@ -3167,7 +2987,6 @@ /datum/reagent/alcohol/ethanol/piratepunch name = "Pirate's Punch" - id = "piratepunch" description = "Nautical punch!" color = "#ECE1A0" strength = 25 @@ -3180,7 +2999,6 @@ /datum/reagent/alcohol/ethanol/planterpunch name = "Planter's Punch" - id = "planterpunch" description = "A popular beach cocktail." color = "#FFA700" strength = 25 @@ -3193,7 +3011,6 @@ /datum/reagent/alcohol/ethanol/pwine name = "Poison Wine" - id = "pwine" description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!" color = "#000000" strength = 15 @@ -3224,7 +3041,6 @@ /datum/reagent/alcohol/ethanol/red_mead name = "Red Mead" - id = "red_mead" description = "The true Viking's drink! Even though it has a strange red color." color = "#C73C00" strength = 21 @@ -3237,7 +3053,6 @@ /datum/reagent/alcohol/ethanol/sbiten name = "Sbiten" - id = "sbiten" description = "A spicy mix of mead and spices! Might be a little hot for the little guys!" color = "#664300" strength = 40 @@ -3252,7 +3067,6 @@ /datum/reagent/alcohol/ethanol/screwdrivercocktail name = "Screwdriver" - id = "screwdrivercocktail" description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." color = "#A68310" strength = 15 @@ -3265,7 +3079,6 @@ /datum/reagent/alcohol/ethanol/silencer name = "Silencer" - id = "silencer" description = "A drink from Mime Heaven." nutriment_factor = 1 color = "#664300" @@ -3279,7 +3092,6 @@ /datum/reagent/alcohol/ethanol/singulo name = "Singulo" - id = "singulo" description = "A blue-space beverage!" color = "#2E6671" strength = 50 @@ -3292,7 +3104,6 @@ /datum/reagent/alcohol/ethanol/snowwhite name = "Snow White" - id = "snowwhite" description = "A cold refreshment" color = "#FFFFFF" strength = 7 @@ -3306,7 +3117,6 @@ /datum/reagent/alcohol/ethanol/ssroyale name = "Southside Royale" - id = "ssroyale" description = "Classy cocktail containing citrus." color = "#66F446" strength = 20 @@ -3319,7 +3129,6 @@ /datum/reagent/alcohol/ethanol/suidream name = "Sui Dream" - id = "suidream" description = "Comprised of: White soda, blue curacao, melon liquor." color = "#00A86B" strength = 5 @@ -3331,35 +3140,32 @@ glass_desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame." glass_center_of_mass = list("x"=16, "y"=5) -/datum/reagent/alcohol/ethanol/syndicatebomb - name = "Syndicate Bomb" - id = "syndicatebomb" - description = "Tastes like terrorism!" - color = "#2E6671" +/datum/reagent/alcohol/ethanol/gibsonhooch + name = "Gibson Hooch" + description = "A disgusting concoction of cheap alcohol and soda - just what you need after a busy day at the factories." + color = "#5f641d" strength = 65 - taste_description = "purified antagonism" + taste_description = "cheap labor" carbonated = TRUE - glass_icon_state = "syndicatebomb" - glass_name = "glass of Syndicate Bomb" - glass_desc = "Tastes like terrorism!" - glass_center_of_mass = list("x"=16, "y"=4) + glass_icon_state = "gibsonhooch" + glass_name = "glass of Gibson Hooch" + glass_desc = "A factory worker's favorite... Because they can't afford much else." + glass_center_of_mass = list("x"=16, "y"=10) -/datum/reagent/alcohol/ethanol/tequilla_sunrise +/datum/reagent/alcohol/ethanol/tequila_sunrise name = "Tequila Sunrise" - id = "tequillasunrise" description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~" color = "#FFE48C" strength = 15 taste_description = "oranges" - glass_icon_state = "tequillasunriseglass" - glass_name = "glass of Tequilla Sunrise" + glass_icon_state = "tequilasunriseglass" + glass_name = "glass of Tequila Sunrise" glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..." /datum/reagent/alcohol/ethanol/threemileisland name = "Three Mile Island Iced Tea" - id = "threemileisland" description = "Made for a woman, strong enough for a man." color = "#666340" strength = 60 @@ -3374,7 +3180,6 @@ /datum/reagent/alcohol/ethanol/toxins_special name = "Toxins Special" - id = "phoronspecial" description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!" reagent_state = LIQUID color = "#664300" @@ -3389,7 +3194,6 @@ /datum/reagent/alcohol/ethanol/vodkamartini name = "Vodka Martini" - id = "vodkamartini" description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." color = "#664300" strength = 32 @@ -3402,7 +3206,6 @@ /datum/reagent/alcohol/ethanol/vodkatonic name = "Vodka and Tonic" - id = "vodkatonic" description = "For when a gin and tonic isn't russian enough." color = "#0064C8" // rgb: 0, 100, 200 strength = 35 @@ -3415,7 +3218,6 @@ /datum/reagent/alcohol/ethanol/white_russian name = "White Russian" - id = "whiterussian" description = "That's just, like, your opinion, man..." color = "#A68340" strength = 30 @@ -3426,9 +3228,8 @@ glass_desc = "A very nice looking drink. But that's just, like, your opinion, man." glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/alcohol/ethanol/whiskey_cola +/datum/reagent/alcohol/ethanol/whiskeycola name = "Whiskey Cola" - id = "whiskeycola" description = "Whiskey, mixed with cola. Surprisingly refreshing." color = "#3E1B00" strength = 15 @@ -3442,7 +3243,6 @@ /datum/reagent/alcohol/ethanol/whiskeysoda name = "Whiskey Soda" - id = "whiskeysoda" description = "For the more refined griffon." color = "#664300" strength = 15 @@ -3456,7 +3256,6 @@ /datum/reagent/alcohol/ethanol/specialwhiskey // I have no idea what this is and where it comes from name = "Special Blend Whiskey" - id = "specialwhiskey" description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." color = "#664300" strength = 45 @@ -3470,7 +3269,6 @@ // Snowflake drinks /datum/reagent/drink/dr_gibb_diet name = "Diet Dr. Gibb" - id = "dr_gibb_diet" description = "A delicious blend of 42 different flavours, one of which is water." color = "#102000" taste_description = "watered down liquid sunshine" @@ -3482,7 +3280,6 @@ /datum/reagent/alcohol/ethanol/drdaniels name = "Dr. Daniels" - id = "dr_daniels" description = "A limited edition tallboy of Dr. Gibb's Infusions." color = "#8e6227" caffeine = 0.2 @@ -3500,7 +3297,6 @@ /datum/reagent/alcohol/ethanol/daiquiri name = "Daiquiri" - id = "daiquiri" description = "Exotically blue, fruity drink, distilled from oranges." color = "#664300" strength = 15 @@ -3512,7 +3308,6 @@ /datum/reagent/alcohol/ethanol/icepick name = "Ice Pick" - id = "icepick" description = "Big. And red. Hmm...." color = "#664300" strength = 10 @@ -3524,7 +3319,6 @@ /datum/reagent/alcohol/ethanol/poussecafe name = "Pousse-Cafe" - id = "poussecafe" description = "Smells of French and liquore." color = "#664300" strength = 15 @@ -3536,7 +3330,6 @@ /datum/reagent/alcohol/ethanol/mintjulep name = "Mint Julep" - id = "mintjulep" description = "As old as time itself, but how does it taste?" color = "#664300" strength = 25 @@ -3548,7 +3341,6 @@ /datum/reagent/alcohol/ethanol/johncollins name = "John Collins" - id = "johncollins" description = "Crystal clear, yellow, and smells of whiskey. How could this go wrong?" color = "#664300" strength = 25 @@ -3561,7 +3353,6 @@ /datum/reagent/alcohol/ethanol/gimlet name = "Gimlet" - id = "gimlet" description = "Small, elegant, and kicks." color = "#664300" strength = 20 @@ -3574,7 +3365,6 @@ /datum/reagent/alcohol/ethanol/starsandstripes name = "Stars and Stripes" - id = "starsandstripes" description = "Someone, somewhere, is saluting." color = "#664300" strength = 10 @@ -3586,7 +3376,6 @@ /datum/reagent/alcohol/ethanol/metropolitan name = "Metropolitan" - id = "metropolitan" description = "What more could you ask for?" color = "#664300" strength = 27 @@ -3598,7 +3387,6 @@ /datum/reagent/alcohol/ethanol/caruso name = "Caruso" - id = "caruso" description = "Green, almost alien." color = "#664300" strength = 25 @@ -3610,7 +3398,6 @@ /datum/reagent/alcohol/ethanol/aprilshower name = "April Shower" - id = "aprilshower" description = "Smells of brandy." color = "#664300" strength = 25 @@ -3622,7 +3409,6 @@ /datum/reagent/alcohol/ethanol/carthusiansazerac name = "Carthusian Sazerac" - id = "carthusiansazerac" description = "Whiskey and... Syrup?" color = "#664300" strength = 15 @@ -3634,7 +3420,6 @@ /datum/reagent/alcohol/ethanol/deweycocktail name = "Dewey Cocktail" - id = "deweycocktail" description = "Colours, look at all the colours!" color = "#664300" strength = 25 @@ -3646,7 +3431,6 @@ /datum/reagent/alcohol/ethanol/chartreusegreen name = "Green Chartreuse" - id = "chartreusegreen" description = "A green, strong liqueur." color = "#664300" strength = 40 @@ -3658,7 +3442,6 @@ /datum/reagent/alcohol/ethanol/chartreuseyellow name = "Yellow Chartreuse" - id = "chartreuseyellow" description = "A yellow, strong liqueur." color = "#664300" strength = 40 @@ -3670,7 +3453,6 @@ /datum/reagent/alcohol/ethanol/cremewhite name = "White Creme de Menthe" - id = "cremewhite" description = "Mint-flavoured alcohol, in a bottle." color = "#664300" strength = 20 @@ -3682,7 +3464,6 @@ /datum/reagent/alcohol/ethanol/cremeyvette name = "Creme de Yvette" - id = "cremeyvette" description = "Berry-flavoured alcohol, in a bottle." color = "#664300" strength = 20 @@ -3694,7 +3475,6 @@ /datum/reagent/alcohol/ethanol/brandy name = "Brandy" - id = "brandy" description = "Cheap knock off for cognac." color = "#664300" strength = 40 @@ -3706,7 +3486,6 @@ /datum/reagent/alcohol/ethanol/guinness name = "Guinness" - id = "guinness" description = "Special Guinnes drink." color = "#2E6671" strength = 8 @@ -3719,7 +3498,6 @@ /datum/reagent/alcohol/ethanol/drambuie name = "Drambuie" - id = "drambuie" description = "A drink that smells like whiskey but tastes different." color = "#2E6671" strength = 40 @@ -3731,7 +3509,6 @@ /datum/reagent/alcohol/ethanol/oldfashioned name = "Old Fashioned" - id = "oldfashioned" description = "That looks like it's from the sixties." color = "#2E6671" strength = 30 @@ -3743,7 +3520,6 @@ /datum/reagent/alcohol/ethanol/blindrussian name = "Blind Russian" - id = "blindrussian" description = "You can't see?" color = "#2E6671" strength = 40 @@ -3755,7 +3531,6 @@ /datum/reagent/alcohol/ethanol/rustynail name = "Rusty Nail" - id = "rustynail" description = "Smells like lemon." color = "#2E6671" strength = 25 @@ -3767,7 +3542,6 @@ /datum/reagent/alcohol/ethanol/tallrussian name = "Tall Black Russian" - id = "tallrussian" description = "Just like black russian but taller." color = "#2E6671" strength = 25 @@ -3784,7 +3558,6 @@ /datum/reagent/alcohol/ethanol/badtouch name = "Bad Touch" - id = "badtouch" description = "We're nothing but mammals, after all." color = "#42f456" strength = 50 @@ -3796,7 +3569,6 @@ /datum/reagent/alcohol/ethanol/bluelagoon name = "Blue Lagoon" - id = "bluelagoon" description = "Because lagoons shouldn't come in other colors." color = "#51b8ef" strength = 25 @@ -3808,7 +3580,6 @@ /datum/reagent/alcohol/ethanol/boukha name = "Boukha" - id = "boukha" description = "A distillation of figs, popular in the Serene Republic of Elyra." color = "#efd0d0" strength = 40 @@ -3820,7 +3591,6 @@ /datum/reagent/alcohol/ethanol/fireball name = "Fireball" - id = "fireball" description = "Whiskey that's been infused with cinnamon and hot pepper. Meant for mixing." color = "#773404" strength = 35 @@ -3854,11 +3624,10 @@ to_chat(M, "You feel like your insides are burning!") if(istype(M, /mob/living/carbon/slime)) M.bodytemperature += rand(0, 15) + slime_temp_adj - holder.remove_reagent("frostoil", 2) + holder.remove_reagent(/datum/reagent/frostoil, 2) /datum/reagent/alcohol/ethanol/cherrytreefireball name = "Cherry Tree Fireball" - id = "cherrytreefireball" description = "An iced fruit cocktail shaken with cinnamon whiskey. Hot, cold and sweet all at once." color = "#e87727" strength = 15 @@ -3870,7 +3639,6 @@ /datum/reagent/alcohol/ethanol/cobaltvelvet name = "Cobalt Velvet" - id = "cobaltvelvet" description = "An electric blue champagne cocktail that's popular on the club scene." color = "#a3ecf7" strength = 25 @@ -3883,7 +3651,6 @@ /datum/reagent/alcohol/ethanol/fringeweaver name = "Fringe Weaver" - id = "fringeweaver" description = "Effectively pure alcohol with a dose of sugar. It's as simple as it is strong." color = "#f78888" strength = 65 @@ -3895,7 +3662,6 @@ /datum/reagent/alcohol/ethanol/junglejuice name = "Jungle Juice" - id = "junglejuice" description = "You're in the jungle now, baby." color = "#773404" strength = 35 @@ -3907,7 +3673,6 @@ /datum/reagent/alcohol/ethanol/marsarita name = "Marsarita" - id = "marsarita" description = "The margarita with a Martian twist. They call it something less embarrassing there." color = "#3eb7c9" strength = 30 @@ -3919,7 +3684,6 @@ /datum/reagent/drink/meloncooler name = "Melon Cooler" - id = "meloncooler" description = "Summertime on the beach, in liquid form." color = "#d8457b" taste_description = "minty melon" @@ -3930,7 +3694,6 @@ /datum/reagent/alcohol/ethanol/midnightkiss name = "Midnight Kiss" - id = "midnightkiss" description = "A champagne cocktail, quietly bubbling in a slender glass." color = "#13144c" strength = 25 @@ -3943,7 +3706,6 @@ /datum/reagent/drink/millionairesour name = "Millionaire Sour" - id = "millionairesour" description = "It's a good mix, a great mix. The best mix in known space. It's terrific, you're gonna love it." color = "#13144c" taste_description = "tart fruit" @@ -3954,7 +3716,6 @@ /datum/reagent/alcohol/ethanol/olympusmons name = "Olympus Mons" - id = "olympusmons" description = "Another, stronger version of the Black Russian. It's popular in some Martian arcologies." color = "#020407" strength = 30 @@ -3966,7 +3727,6 @@ /datum/reagent/alcohol/ethanol/europanail name = "Europa Nail" - id = "europanail" description = "Named for Jupiter's moon. It looks about as crusty." color = "#785327" strength = 30 @@ -3978,7 +3738,6 @@ /datum/reagent/drink/shirleytemple name = "Shirley Temple" - id = "shirleytemple" description = "Straight from the good ship Lollipop." color = "#ce2727" taste_description = "innocence" @@ -3989,7 +3748,6 @@ /datum/reagent/alcohol/ethanol/sugarrush name = "Sugar Rush" - id = "sugarrush" description = "Sweet, light and fruity. As girly as it gets." color = "#d51d5d" strength = 15 @@ -4002,7 +3760,6 @@ /datum/reagent/alcohol/ethanol/sangria name = "Sangria" - id = "sangria" description = "Red wine, splashed with brandy and infused with fruit." color = "#960707" strength = 30 @@ -4014,7 +3771,6 @@ /datum/reagent/alcohol/ethanol/bassline name = "Bassline" - id = "bassline" description = "A vodka cocktail from Vega De Rosa, Mendell City's entertainment district. Purple and deep." color = "#6807b2" strength = 25 @@ -4026,7 +3782,6 @@ /datum/reagent/alcohol/ethanol/bluebird name = "Bluebird" - id = "bluebird" description = "A gin drink popularized by a spy thriller in 2452." color = "#4286f4" strength = 30 @@ -4038,7 +3793,6 @@ /datum/reagent/alcohol/ethanol/whitewine name = "White Wine" - id = "whitewine" description = "A premium alchoholic beverage made from distilled grape juice." color = "#e5d272" strength = 15 @@ -4049,9 +3803,8 @@ glass_desc = "A very classy looking drink." glass_center_of_mass = list("x"=15, "y"=7) -/datum/reagent/alcohol/messa_mead +/datum/reagent/alcohol/ethanol/messa_mead name = "Messa's Mead" - id = "messa_mead" description = "A sweet alcoholic adhomian drink. Produced with Messa's tears and earthen-root." color = "#664300" strength = 25 @@ -4061,9 +3814,8 @@ glass_name = "glass of Messa's Mead" glass_desc = "A sweet alcoholic adhomian drink. Produced with Messa's tears." -/datum/reagent/alcohol/winter_offensive +/datum/reagent/alcohol/ethanol/winter_offensive name = "Winter Offensive" - id = "winter_offensive" description = "An alcoholic tajaran cocktail, named after the famous military campaign." color = "#664300" strength = 15 @@ -4074,9 +3826,8 @@ glass_name = "glass of Winter Offensive" glass_desc = "An alcoholic tajaran cocktail, named after the famous military campaign." -/datum/reagent/alcohol/mountain_marauder +/datum/reagent/alcohol/ethanol/mountain_marauder name = "Mountain Marauder" - id = "mountain_marauder" description = "An adhomian beverage made from fermented fatshouters milk and victory gin." color = "#DFDFDF" strength = 15 @@ -4086,7 +3837,7 @@ glass_name = "glass of Mountain Marauder" glass_desc = "An adhomian beverage made from fermented fatshouters milk and victory gin." -/datum/reagent/alcohol/mountain_marauder/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/alcohol/ethanol/mountain_marauder/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(ishuman(M)) var/mob/living/carbon/human/H = M @@ -4095,7 +3846,6 @@ /datum/reagent/alcohol/ethanol/cinnamonapplewhiskey name = "Cinnamon Apple Whiskey" - id = "cinnamonapplewhiskey" description = "Cider with cinnamon whiskey. It's like drinking a hot apple pie!" color = "#664300" strength = 20 @@ -4111,7 +3861,6 @@ /datum/reagent/alcohol/ethanol/thirdincident name = "The Third Incident" - id = "thirdincident" color = "#1936a0" strength = 10 description = "A controversial drink popular with the punk youth of the Jargon Federation. Represents blood, eggs, and tears." @@ -4123,7 +3872,6 @@ /datum/reagent/drink/upsidedowncup name = "Upside-Down Cup" - id = "upsidedowncup" color = "#B2110A" description = "An age-old part of Skrell culture. Even children know of the humor." taste_description = "esoteric humor" @@ -4134,7 +3882,6 @@ /datum/reagent/drink/smokinglizard name = "Cigarette Lizard" - id = "cigarettelizard" color = "#80C274" description = "The amusement of Cigarette Lizard, now in a cup!" taste_description = "minty sass" @@ -4145,7 +3892,6 @@ /datum/reagent/drink/coffee/sromshine name = "Sromshine" - id = "sromshine" color = "#A14702" description = "The best part of waking up." taste_description = "bitter citrus" @@ -4156,7 +3902,6 @@ /datum/reagent/alcohol/ethanol/cbsc name = "Complex Bluespace Calculation" - id = "cbsc" color = "#000000" strength = 25 description = "A loud bang. No, really, that's the joke. Skrell get a kick out of it." @@ -4173,7 +3918,6 @@ /datum/reagent/drink/algaesuprise name = "Pl'iuop Algae Surprise" - id = "algaesuprise" color = "#FFFF80" description = "This bubbling drink gives off a faint moldy aroma." taste_description = "swamp fungus" @@ -4184,7 +3928,6 @@ /datum/reagent/drink/xrim name = "Xrim Garden" - id = "xrim" color = "#F6668E" description = "A colorful drink that smells a lot like rotten fruit." taste_description = "sweet, fruity slime" @@ -4195,7 +3938,6 @@ /datum/reagent/alcohol/ethanol/rixulin_sundae name = "Rixulin Sundae" - id = "rixulin_sundae" color = "#83E2C6" description = "A fizzing drink that looks like a really great time." taste_description = "spacetime and warbling music" @@ -4213,7 +3955,6 @@ /datum/reagent/alcohol/butanol/xuizijuice name = "Xuizi Juice" - id = "xuizijuice" description = "Blended flower buds from a Moghean Xuizi cactus. Has a mild butanol content and is a staple recreational beverage in Unathi culture." color = "#91de47" strength = 5 @@ -4225,7 +3966,6 @@ /datum/reagent/alcohol/butanol/sarezhiwine name = "Sarezhi Wine" - id = "sarezhiwine" description = "An alcoholic beverage made from lightly fermented Sareszhi berries, considered an upper class delicacy on Moghes. Significant butanol content indicates intoxicating effects on Unathi." color = "#bf8fbc" strength = 20 @@ -4240,7 +3980,6 @@ //What an exciting time we live in, that lizards may drink fruity girl drinks. /datum/reagent/alcohol/butanol/moghesmargarita name = "Moghes Margarita" - id = "moghesmargarita" description = "A classic human cocktail, now ruined with cactus juice instead of tequila." color = "#8CFF8C" strength = 30 @@ -4253,7 +3992,6 @@ /datum/reagent/alcohol/butanol/cactuscreme name = "Cactus Creme" - id = "cactuscreme" description = "A tasty mix of berries and cream with xuizi juice, for the discerning unathi." color = "#664300" strength = 15 @@ -4266,7 +4004,6 @@ /datum/reagent/alcohol/butanol/bahamalizard name = "Bahama Lizard" - id = "bahamalizard" description = "A tropical cocktail containing cactus juice from Moghes, but no actual alcohol." color = "#FF7F3B" strength = 15 @@ -4279,7 +4016,6 @@ /datum/reagent/alcohol/butanol/lizardphlegm name = "Lizard Phlegm" - id = "lizardphlegm" description = "Looks gross, but smells fruity." color = "#8CFF8C" strength = 20 @@ -4291,7 +4027,6 @@ /datum/reagent/alcohol/butanol/cactustea name = "Cactus Tea" - id = "cactustea" description = "Tea flavored with xuizi juice." color = "#664300" strength = 10 @@ -4303,7 +4038,6 @@ /datum/reagent/alcohol/butanol/moghespolitan name = "Moghespolitan" - id = "moghespolitan" description = "Pomegranate syrup and cactus juice, with a splash of Sarezhi Wine. Delicious!" color = "#664300" strength = 27 @@ -4315,7 +4049,6 @@ /datum/reagent/alcohol/butanol/wastelandheat name = "Wasteland Heat" - id = "wastelandheat" description = "A mix of spicy cactus juice to warm you up." color = "#664300" strength = 40 @@ -4328,9 +4061,8 @@ glass_desc = "A mix of spicy cactus juice to warm you up. Maybe a little too warm for non-unathi, though." glass_center_of_mass = list("x"=17, "y"=8) -/datum/reagent/alcohol/butanol/Sandgria +/datum/reagent/alcohol/butanol/sandgria name = "Sandgria" - id = "sandgria" description = "Sarezhi wine, blended with citrus and a splash of cactus juice." color = "#960707" strength = 30 @@ -4342,7 +4074,6 @@ /datum/reagent/alcohol/butanol/contactwine name = "Contact Wine" - id = "contactwine" description = "A perfectly good glass of Sarezhi wine, ruined by adding radioactive material. It reminds you of something..." color = "#2E6671" strength = 50 @@ -4355,7 +4086,6 @@ /datum/reagent/alcohol/butanol/hereticblood name = "Heretics Blood" - id = "hereticblood" description = "A fizzy cocktail made with cactus juice and heresy." color = "#820000" strength = 15 @@ -4368,7 +4098,6 @@ /datum/reagent/alcohol/butanol/sandpit name = "Sandpit" - id = "sandpit" description = "An unusual mix of cactus and orange juice, mostly favored by unathi." color = "#A68310" strength = 15 @@ -4381,7 +4110,6 @@ /datum/reagent/alcohol/butanol/cactuscola name = "Cactus Cola" - id = "cactuscola" description = "Cactus juice splashed with cola, on ice. Simple and delicious." color = "#3E1B00" strength = 15 @@ -4395,7 +4123,6 @@ /datum/reagent/alcohol/butanol/bloodwine name = "Bloodwine" - id = "bloodwine" description = "A traditional unathi drink said to strengthen one before a battle." color = "#C73C00" strength = 21 @@ -4408,7 +4135,6 @@ /datum/reagent/alcohol/butanol/crocodile_booze name = "Crocodile Guwan" - id = "crocodile_booze" description = "A highly alcoholic butanol based beverage typically fermented using the venom of a zerl'ock and cheaply made Sarezhi Wine. A popular drink among Unathi troublemakers, conviently housed in a 2L plastic bottle." color = "#b0f442" strength = 50 @@ -4420,7 +4146,6 @@ /datum/reagent/alcohol/butanol/trizkizki_tea name = "Trizkizki Tea" - id = "trizkizki_tea" description = "A popular drink from Ouerea that smells of crisp sea air." color = "#876185" strength = 5 @@ -4445,7 +4170,6 @@ /datum/reagent/drink/zorasoda name = "Zo'ra Soda Cherry" - id = "zora_cherry" description = "Zo'ra Soda, cherry edition. All good drinks come in cherry." color = "#102000" adj_sleepy = -2 @@ -4455,7 +4179,6 @@ /datum/reagent/drink/zorasoda/phoron name = "Zo'ra Soda Phoron Passion" - id = "zora_phoron" description = "Reported to taste nothing like phoron, but everything like grapes." color = "#863333" adj_sleepy = -2 @@ -4465,7 +4188,6 @@ /datum/reagent/drink/zorasoda/kois name = "Zo'ra Soda K'ois Twist" - id = "zora_kois" description = "Whoever approved this in marketing needs to be drawn and quartered." color = "#dcd9cd" adj_sleepy = -2 @@ -4480,7 +4202,6 @@ /datum/reagent/drink/zorasoda/hozm name = "Zo'ra Soda High Octane Zorane Might" - id = "zora_hozm" description = "It feels like someone is just driving a freezing cold spear through the bottom of your mouth." color = "#365000" adj_sleepy = -3 @@ -4497,7 +4218,6 @@ /datum/reagent/drink/zorasoda/venomgrass name = "Zo'ra Soda Sour Venom Grass" - id = "zora_venom" description = "The 'diet' version of High Energy Zorane Might, still tastes like a cloud of stinging polytrinic bees." color = "#100800" adj_sleepy = -3 @@ -4512,7 +4232,6 @@ /datum/reagent/drink/zorasoda/klax name = "Klaxan Energy Crush" - id = "zora_klax" description = "An orange, cream soda. It's a wonder it got here." color = "#E78108" adj_sleepy = -3 @@ -4528,7 +4247,6 @@ /datum/reagent/drink/zorasoda/cthur name = "C'thur Rockin' Raspberry" - id = "zora_cthur" description = "A raspberry concoction you're pretty sure is already on recall." color = "#0000CD" adj_sleepy = -3 @@ -4543,7 +4261,6 @@ /datum/reagent/drink/zorasoda/drone name = "Drone Fuel" - id = "zora_drone" description = "It's thick as syrup and smells of gas. Why." color = "#31004A" adj_sleepy = -3 @@ -4568,7 +4285,6 @@ /datum/reagent/drink/zorasoda/jelly name = "Royal Jelly" - id = "zora_jelly" description = "It looks of mucus, but tastes like Heaven." color = "#FFFF00" adj_sleepy = -3 @@ -4585,14 +4301,12 @@ /datum/reagent/nutriment/pumpkinpulp name = "Pumpkin Pulp" - id = "pumpkinpulp" description = "The gooey insides of a slain pumpkin" color = "#f9ab28" taste_description = "gooey pumpkin" /datum/reagent/spacespice/pumpkinspice name = "Pumpkin Spice" - id = "pumpkinspice" description = "A delicious seasonal flavoring." color = "#AE771C" taste_description = "autumn bliss" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index bbad9f96c81..baf5c353105 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -2,7 +2,6 @@ /datum/reagent/norepinephrine name = "Norepinephrine" - id = "norepinephrine" description = "Norepinephrine is a chemical that narrows blood vessels, raises blood pressure, and helps the blood pump more efficiently. Commonly used to stabilize patients." reagent_state = LIQUID color = "#00BFFF" @@ -19,7 +18,6 @@ /datum/reagent/bicaridine name = "Bicaridine" - id = "bicaridine" description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma. Lasts twice as long when inhaled, however it is generally twice as weak." reagent_state = LIQUID color = "#BF0000" @@ -41,7 +39,6 @@ /datum/reagent/kelotane name = "Kelotane" - id = "kelotane" description = "Kelotane is a drug used to treat burns." reagent_state = LIQUID color = "#FFA800" @@ -56,7 +53,6 @@ /datum/reagent/dermaline name = "Dermaline" - id = "dermaline" description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue." reagent_state = LIQUID color = "#FF8000" @@ -71,7 +67,6 @@ /datum/reagent/dylovene name = "Dylovene" - id = "dylovene" description = "Dylovene is a broad-spectrum antitoxin." reagent_state = LIQUID color = "#00A000" @@ -97,16 +92,15 @@ var/datum/reagents/ingested = M.get_ingested_reagents() for(var/datum/reagent/R in ingested.reagent_list) if((remove_generic && istype(R, /datum/reagent/toxin)) || (R.type in remove_toxins)) - ingested.remove_reagent(R.id, removing) + ingested.remove_reagent(R.type, removing) return for(var/datum/reagent/R in M.reagents.reagent_list) if((remove_generic && istype(R, /datum/reagent/toxin)) || (R.type in remove_toxins)) - M.reagents.remove_reagent(R.id, removing) + M.reagents.remove_reagent(R.type, removing) return /datum/reagent/dexalin name = "Dexalin" - id = "dexalin" description = "Dexalin is used in the treatment of oxygen deprivation. The medication is twice as powerful and lasts twice as long when inhaled." reagent_state = LIQUID color = "#0080FF" @@ -122,7 +116,7 @@ if(alien == IS_VOX) M.adjustToxLoss(removed * strength) M.add_chemical_effect(CE_OXYGENATED, strength/6) // 1 for dexalin, 2 for dexplus - holder.remove_reagent("lexorin", strength/3 * removed) + holder.remove_reagent(/datum/reagent/lexorin, strength/3 * removed) //Hyperoxia causes brain and eye damage /datum/reagent/dexalin/overdose(var/mob/living/carbon/M, var/alien, var/removed) @@ -135,7 +129,6 @@ /datum/reagent/dexalin/plus name = "Dexalin Plus" - id = "dexalinp" fallback_specific_heat = 1 description = "Dexalin Plus is used in the treatment of oxygen deprivation. It is highly effective, and is twice as powerful and lasts twice as long when inhaled." color = "#0040FF" @@ -144,7 +137,6 @@ /datum/reagent/tricordrazine name = "Tricordrazine" - id = "tricordrazine" description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries, however it does not work when inhaled. Has different healing properties depending on the chemical's temperature." reagent_state = LIQUID color = "#8040FF" @@ -162,7 +154,6 @@ /datum/reagent/cryoxadone name = "Cryoxadone" - id = "cryoxadone" description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly." reagent_state = LIQUID color = "#8080FF" @@ -179,7 +170,6 @@ /datum/reagent/clonexadone name = "Clonexadone" - id = "clonexadone" description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' the cloning process when used in conjunction with a cryo tube. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly." reagent_state = LIQUID color = "#80BFFF" @@ -198,7 +188,6 @@ /datum/reagent/paracetamol name = "Paracetamol" - id = "paracetamol" description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller. Does not work when inhaled." reagent_state = LIQUID color = "#C8A5DC" @@ -221,7 +210,6 @@ /datum/reagent/tramadol name = "Tramadol" - id = "tramadol" description = "Tramadol is a very effective painkiller designed for victims of heavy physical trauma. Does not work when inhaled." reagent_state = LIQUID color = "#CB68FC" @@ -243,7 +231,6 @@ /datum/reagent/oxycodone name = "Oxycodone" - id = "oxycodone" description = "Oxycodone is incredibly potent and very addictive painkiller. Do not mix with alcohol. Does not work when inhaled." reagent_state = LIQUID color = "#800080" @@ -274,7 +261,6 @@ /datum/reagent/synaptizine name = "Synaptizine" - id = "synaptizine" description = "Synaptizine is used to treat a robust array of conditions, such as drowsyness, paralysis, weakness, LSD overdose, hallucinations, and pain. Moderately poisonous, and should only be used as a last resort." reagent_state = LIQUID color = "#99CCFF" @@ -290,7 +276,7 @@ M.AdjustParalysis(-1) M.AdjustStunned(-1) M.AdjustWeakened(-1) - holder.remove_reagent("mindbreaker", 5) + holder.remove_reagent(/datum/reagent/mindbreaker, 5) M.hallucination = max(0, M.hallucination - 10) M.adjustToxLoss(5 * removed) // It used to be incredibly deadly due to an oversight. Not anymore! M.add_chemical_effect(CE_PAINKILLER, 40) @@ -304,7 +290,6 @@ /datum/reagent/alkysine name = "Alkysine" - id = "alkysine" description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." reagent_state = LIQUID color = "#FFFF66" @@ -324,7 +309,6 @@ /datum/reagent/imidazoline name = "Imidazoline" - id = "imidazoline" description = "Heals eye damage" reagent_state = LIQUID color = "#C8A5DC" @@ -349,7 +333,6 @@ /datum/reagent/peridaxon name = "Peridaxon" - id = "peridaxon" description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." reagent_state = LIQUID color = "#561EC3" @@ -370,7 +353,6 @@ /datum/reagent/ryetalyn name = "Ryetalyn" - id = "ryetalyn" description = "Ryetalyn can cure all genetic abnomalities via a catalytic process." reagent_state = SOLID color = "#004000" @@ -393,7 +375,6 @@ /datum/reagent/hyperzine name = "Hyperzine" - id = "hyperzine" description = "Hyperzine is a highly effective, long lasting, muscle stimulant. Lasts twice as long when inhaled." reagent_state = LIQUID color = "#FF3300" @@ -423,7 +404,6 @@ //Once all alcohol in the body is neutralised, it will then cure intoxication and sober the patient up /datum/reagent/ethylredoxrazine name = "Ethylredoxrazine" - id = "ethylredoxrazine" description = "A powerful oxidizer that reacts with ethanol." reagent_state = SOLID color = "#605048" @@ -447,7 +427,7 @@ for(var/datum/reagent/R in ingested.reagent_list) if(istype(R, /datum/reagent/alcohol/ethanol)) var/amount = min(P, R.volume) - ingested.remove_reagent(R.id, amount) + ingested.remove_reagent(R.type, amount) P -= amount if (P <= 0) return @@ -458,7 +438,7 @@ for(var/datum/reagent/R in M.bloodstr.reagent_list) if(istype(R, /datum/reagent/alcohol/ethanol)) var/amount = min(P, R.volume) - M.bloodstr.remove_reagent(R.id, amount) + M.bloodstr.remove_reagent(R.type, amount) P -= amount if (P <= 0) return @@ -470,7 +450,6 @@ /datum/reagent/hyronalin name = "Hyronalin" - id = "hyronalin" description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." reagent_state = LIQUID color = "#408000" @@ -493,7 +472,6 @@ /datum/reagent/arithrazine name = "Arithrazine" - id = "arithrazine" description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." reagent_state = LIQUID color = "#008000" @@ -518,7 +496,6 @@ /datum/reagent/thetamycin name = "Thetamycin" - id = "thetamycin" description = "A theta-lactam antibiotic, effective against wound and organ bacterial infections." reagent_state = LIQUID color = "#41C141" @@ -536,7 +513,6 @@ /datum/reagent/ondansetron name = "Ondansetron" - id = "ondansetron" description = "Ondansetron is a medication used to prevent nausea and vomiting." color = "#f5f2d0" taste_description = "bitterness" @@ -550,7 +526,6 @@ /datum/reagent/coughsyrup name = "Cough Syrup" - id = "coughsyrup" description = "A chemical that is used as a cough suppressant in low doses, and in higher doses it can be recreationally (ab)used." scannable = 1 reagent_state = LIQUID @@ -580,7 +555,6 @@ /datum/reagent/antihistamine name = "Diphenhydramine" - id = "diphenhydramine" description = "A common antihistamine medication, also known as Benadryl. Known for causing drowsiness in larger doses." scannable = 1 reagent_state = LIQUID @@ -598,7 +572,6 @@ /datum/reagent/sterilizine name = "Sterilizine" - id = "sterilizine" description = "Sterilizes wounds in preparation for surgery and thoroughly removes blood." reagent_state = LIQUID color = "#C8A5DC" @@ -632,7 +605,6 @@ /datum/reagent/leporazine name = "Leporazine" - id = "leporazine" description = "Leporazine can be use to stabilize an individual's body temperature." reagent_state = LIQUID color = "#C8A5DC" @@ -652,7 +624,6 @@ /datum/reagent/mental name = null //Just like alcohol - id = "mental" description = "Some nameless, experimental antidepressant that you should obviously not have your hands on." reagent_state = LIQUID color = "#FFFFFF" @@ -736,7 +707,6 @@ /datum/reagent/mental/nicotine name = "Nicotine" - id = "nicotine" description = "Nicotine is a stimulant and relaxant commonly found in tobacco products. It is very poisonous, unless at very low doses." reagent_state = LIQUID color = "#333333" @@ -765,40 +735,8 @@ M.Weaken(10 * removed * scale) M.add_chemical_effect(CE_PULSE, 0.5) -/datum/reagent/tobacco - name = "Tobacco" - id = "tobacco" - description = "Cut and processed tobacco leaves." - taste_description = "tobacco" - reagent_state = SOLID - color = "#684b3c" - data = 0 - scannable = 1 - var/nicotine = REM * 0.2 - fallback_specific_heat = 1 - value = 3 - -/datum/reagent/tobacco/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - ..() - M.reagents.add_reagent("nicotine") - -/datum/reagent/tobacco/fine - name = "Fine Tobacco" - id = "tobaccofine" - taste_description = "fine tobacco" - data = 0 - value = 5 - -/datum/reagent/tobacco/bad - name = "Terrible Tobacco" - id = "tobaccobad" - taste_description = "acrid smoke" - data = 0 - value = 0 - /datum/reagent/mental/methylphenidate name = "Methylphenidate" - id = "methylphenidate" description = "Methylphenidate is an AHDH treatment drug that treats basic distractions such as phobias and hallucinations at moderate doses. Withdrawl effects are rare. Side effects are rare, and include hallucinations." reagent_state = LIQUID color = "#8888AA" @@ -827,7 +765,6 @@ /datum/reagent/mental/fluvoxamine name = "Fluvoxamine" - id = "fluvoxamine" description = "Fluvoxamine is safe and effective at treating basic phobias, as well as schizophrenia and muscle weakness at higher doses. Withdrawl effects are rare. Side effects are rare, and include hallucinations." reagent_state = LIQUID color = "#888888" @@ -853,7 +790,6 @@ /datum/reagent/mental/sertraline name = "Sertraline" - id = "sertraline" description = "Sertraline is cheap, safe, and effective at treating basic phobias, however it does not last as long as other drugs of it's class. Withdrawl effects are uncommon. Side effects are rare." reagent_state = LIQUID color = "#88AA88" @@ -877,7 +813,6 @@ /datum/reagent/mental/escitalopram name = "Escitalopram" - id = "escitalopram" description = "Escitalopram is expensive, safe and very effective at treating basic phobias as well as advanced phobias like monophobia. A common side effect is drowsiness, and a rare side effect is hallucinations. Withdrawl effects are uncommon." reagent_state = LIQUID color = "#FF8888" @@ -905,7 +840,6 @@ /datum/reagent/mental/paroxetine name = "Paroxetine" - id = "paroxetine" description = "Paroxetine is effective at treating basic phobias while also preventing the body from overheating. Side effects are rare, and include hallucinations. Withdrawl effects are frequent and unsafe." reagent_state = LIQUID color = "#AA8866" @@ -939,7 +873,6 @@ /datum/reagent/mental/duloxetine name = "Duloxetine" - id = "duloxetine" description = "Duloxetine is effective at treating basic phobias and concussions. A rare side effect is hallucinations. Withdrawl effects are common." reagent_state = LIQUID color = "#88FFFF" @@ -971,7 +904,6 @@ /datum/reagent/mental/venlafaxine name = "Venlafaxine" - id = "venlafaxine" description = "Venlafaxine is effective at treating basic phobias, monophobia, and stuttering. Side effects are uncommon and include hallucinations. Withdrawl effects are common." reagent_state = LIQUID color = "#FF88FF" @@ -1004,7 +936,6 @@ /datum/reagent/mental/risperidone name = "Risperidone" - id = "risperidone" description = "Risperidone is a potent antipsychotic medication used to treat schizophrenia, stuttering, speech impediment, monophobia, hallucinations, tourettes, and muscle spasms. Side effects are common and include pacifism. Withdrawl symptoms are dangerous and almost always occur." reagent_state = LIQUID color = "#FF4444" @@ -1048,7 +979,6 @@ /datum/reagent/mental/olanzapine name = "Olanzapine" - id = "olanzapine" description = "Olanzapine is a high-strength, expensive antipsychotic medication used to treat schizophrenia, stuttering, speech impediment, monophobia, hallucinations, tourettes, and muscle spasms. Side effects are common and include pacifism. The medication metabolizes quickly, and withdrawl is dangerous." reagent_state = LIQUID color = "#FF8844" @@ -1089,7 +1019,6 @@ /datum/reagent/mental/truthserum name = "Truth serum" - id = "truthserum" description = "This highly illegal, expensive, military strength truth serum is a must have for secret corporate interrogations. Do not ingest." reagent_state = LIQUID color = "#888888" @@ -1109,9 +1038,8 @@ messagedelay = 30 ingest_mul = 0 //Stomach acid will melt the nanobots -/datum/reagent/mental/bugjuice +/datum/reagent/mental/vaam name = "V'krexi Amino Acid Mixture" - id = "vaam" description = "A mixture of several high-energy amino acids, based on the secretions and saliva of V'krexi larvae." reagent_state = LIQUID color = "#bcd827" @@ -1129,12 +1057,12 @@ ) var/datum/modifier/modifier -/datum/reagent/mental/bugjuice/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/mental/vaam/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) . = ..() M.add_chemical_effect(CE_PAINKILLER, 5) M.drowsyness = 0 -/datum/reagent/mental/bugjuice/overdose(var/mob/living/carbon/human/M, var/alien, var/removed, var/scale) +/datum/reagent/mental/vaam/overdose(var/mob/living/carbon/human/M, var/alien, var/removed, var/scale) . = ..() M.adjustOxyLoss(1 * removed * scale) M.Weaken(10 * removed * scale) @@ -1150,7 +1078,6 @@ /datum/reagent/mental/kokoreed name = "Koko Reed Juice" - id = "kokoreed" description = "Juice from the Koko reed plant. Causes unique mental effects in Unathi." reagent_state = LIQUID color = "#008000" @@ -1179,7 +1106,6 @@ /datum/reagent/mannitol name = "Mannitol" - id = "mannitol" description = "Mannitol is a super strength chemical that heals brain tissue damage and cures dumbness, cerebral blindness, cerebral paralysis, colorblindness, and aphasia. More effective when the patient's body temperature is less than 170K." reagent_state = LIQUID color = "#FFFF00" @@ -1221,7 +1147,6 @@ /datum/reagent/calomel name = "Calomel" - id = "calomel" description = "A highly toxic medicine that quickly purges most chemicals from the bloodstream. Overdose causes bloodloss and more toxin buildup, however works twice as fast." color = "#222244" metabolism = 0.5 * REM @@ -1241,10 +1166,10 @@ for(var/datum/reagent/selected in M.reagents.reagent_list) if(selected == src) continue - if(selected.id == "blood" && !is_overdosed) + if(selected.type == /datum/reagent/blood && !is_overdosed) continue var/local_amount = min(amount_to_purge, selected.volume) - M.reagents.remove_reagent(selected.id, local_amount) + M.reagents.remove_reagent(selected.type, local_amount) amount_to_purge -= local_amount amount_purged += local_amount if(amount_to_purge <= 0) @@ -1256,7 +1181,6 @@ /datum/reagent/pulmodeiectionem name = "Pulmodeiectionem" - id = "pulmodeiectionem" description = "A powdery chemical that damages the mucus lining in the the main broncus and the trachea, allowing particles to easily escape the lungs. Only works when inhaled. May cause long term damage to the lungs, and oxygen deprevation." color = "#550055" metabolism = 2 * REM @@ -1274,7 +1198,7 @@ if(selected == src) continue var/local_amount = min(amount_to_purge, selected.volume) - H.breathing.remove_reagent(selected.id, local_amount) + H.breathing.remove_reagent(selected.type, local_amount) amount_to_purge -= local_amount if(amount_to_purge <= 0) break @@ -1287,7 +1211,6 @@ /datum/reagent/pneumalin name = "Pneumalin" - id = "pneumalin" description = "A chemical that, when inhaled, restores tearing and bruising of the lungs. Overdosing can lower a patient's pulse to dangerous levels." color = "#8154b4" overdose = 15 @@ -1306,7 +1229,6 @@ /datum/reagent/rezadone name = "Rezadone" - id = "rezadone" description = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." reagent_state = SOLID color = "#669900" @@ -1327,7 +1249,6 @@ /datum/reagent/ipecac name = "Ipecac" - id = "ipecac" description = "A simple emetic, Induces vomiting in the patient, emptying stomach contents" reagent_state = LIQUID color = "#280f0b" @@ -1346,7 +1267,6 @@ /datum/reagent/azoth name = "Azoth" - id = "azoth" description = "Azoth is a miraculous medicine, capable of healing internal injuries." reagent_state = LIQUID color = "#BF0000" @@ -1378,7 +1298,6 @@ /datum/reagent/adipemcina //Based on quinapril name = "Adipemcina" - id = "adipemcina" description = "Adipemcina is a heart medication used for treating high blood pressure, heart failure, and diabetes. Causes vomiting and liver damage when overdosed." reagent_state = LIQUID color = "#008000" @@ -1398,7 +1317,6 @@ /datum/reagent/saline name = "Saline" - id = "saline" description = "A liquid compound that restores hydration when injected directly into the bloodstream. Excellent at solving severe hydration problems. Yes, it's literally just saline." reagent_state = LIQUID color = "#1ca9c9" @@ -1413,7 +1331,6 @@ /datum/reagent/coagulant name = "Coagulant" - id = "coagulant" description = "A chemical that can temporarily stop the blood loss caused by internal wounds." reagent_state = LIQUID color = "#8b0000" @@ -1423,7 +1340,6 @@ /datum/reagent/adrenaline name = "Adrenaline" - id = "adrenaline" description = "Adrenaline is a hormone used as a drug to treat cardiac arrest and other cardiac dysrhythmias resulting in diminished or absent cardiac output." taste_description = "rush" fallback_specific_heat = 1 @@ -1454,7 +1370,6 @@ //Secret Chems /datum/reagent/elixir name = "Elixir of Life" - id = "elixir_life" description = "A mythical substance, the cure for the ultimate illness." color = "#ffd700" affects_dead = 1 @@ -1470,7 +1385,6 @@ /datum/reagent/pacifier name = "Paxazide" - id = "paxazide" description = "A mind altering chemical compound capable of suppressing violent tendencies." reagent_state = LIQUID color = "#1ca9c9" @@ -1481,7 +1395,6 @@ /datum/reagent/rmt name = "Regenerative-Muscular Tissue Supplements" - id = "rmt" description = "A chemical rampantly used by those seeking to remedy the effects of prolonged zero-gravity adaptations." reagent_state = LIQUID color = "#AA8866" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm index 4d8530c0cb5..be8c304eb8b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm @@ -2,7 +2,6 @@ /datum/reagent/crayon_dust name = "Crayon dust" - id = "crayon_dust" description = "Intensely coloured powder obtained by grinding crayons." reagent_state = LIQUID color = "#888888" @@ -12,55 +11,46 @@ /datum/reagent/crayon_dust/red name = "Red crayon dust" - id = "crayon_dust_red" color = "#FE191A" taste_description = "chalky strawberry wax" /datum/reagent/crayon_dust/orange name = "Orange crayon dust" - id = "crayon_dust_orange" color = "#FFBE4F" taste_description = "chalky orange peels" /datum/reagent/crayon_dust/yellow name = "Yellow crayon dust" - id = "crayon_dust_yellow" color = "#FDFE7D" taste_description = "chalky lemon rinds" /datum/reagent/crayon_dust/green name = "Green crayon dust" - id = "crayon_dust_green" color = "#18A31A" taste_description = "chalky lime rinds" /datum/reagent/crayon_dust/blue name = "Blue crayon dust" - id = "crayon_dust_blue" color = "#247CFF" taste_description = "chalky blueberry skins" /datum/reagent/crayon_dust/purple name = "Purple crayon dust" - id = "crayon_dust_purple" color = "#CC0099" taste_description = "chalky grape skins" /datum/reagent/crayon_dust/grey //Mime name = "Grey crayon dust" - id = "crayon_dust_grey" color = "#808080" taste_description = "chalky crushed dreams" /datum/reagent/crayon_dust/brown //Rainbow name = "Brown crayon dust" - id = "crayon_dust_brown" color = "#846F35" taste_description = "raw, powerful creativity" /datum/reagent/paint name = "Paint" - id = "paint" description = "This paint will stick to almost any object." reagent_state = LIQUID color = "#808080" @@ -133,7 +123,6 @@ /datum/reagent/adminordrazine //An OP chemical for admins name = "Adminordrazine" - id = "adminordrazine" description = "It's magic, I ain't gotta explain shit." reagent_state = LIQUID color = "#C8A5DC" @@ -176,7 +165,6 @@ /datum/reagent/gold name = "Gold" - id = "gold" description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known." reagent_state = SOLID color = "#F7C430" @@ -185,7 +173,6 @@ /datum/reagent/silver name = "Silver" - id = "silver" description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal." reagent_state = SOLID color = "#D0D0D0" @@ -194,7 +181,6 @@ /datum/reagent/uranium name = "Uranium" - id = "uranium" description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive." reagent_state = SOLID color = "#B8B8C0" @@ -217,7 +203,6 @@ /datum/reagent/platinum name ="Platinum" - id = "platinum" description = "Platinum is a naturally occuring silvery metalic element." reagent_state = SOLID color = "#E0E0E0" @@ -226,7 +211,6 @@ /datum/reagent/water/holywater name = "Holy Water" - id = "holywater" description = "An ashen-obsidian-water mix, this solution will alter certain sections of the brain's rationality." color = "#E0E8EF" @@ -258,7 +242,6 @@ /datum/reagent/diethylamine name = "Diethylamine" - id = "diethylamine" description = "A secondary amine, mildly corrosive." reagent_state = LIQUID color = "#604030" @@ -266,7 +249,6 @@ /datum/reagent/surfactant // Foam precursor name = "Azosurfactant" - id = "surfactant" description = "A isocyanate liquid that forms a foam when mixed with water." reagent_state = LIQUID color = "#9E6B38" @@ -274,7 +256,6 @@ /datum/reagent/foaming_agent // Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually. name = "Foaming agent" - id = "foaming_agent" description = "A agent that yields metallic foam when mixed with light metal and a strong acid." reagent_state = SOLID color = "#664B63" @@ -282,7 +263,6 @@ /datum/reagent/thermite name = "Thermite" - id = "thermite" description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls." reagent_state = SOLID color = "#673910" @@ -306,9 +286,8 @@ /datum/reagent/thermite/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.adjustFireLoss(3 * removed) -/datum/reagent/space_cleaner +/datum/reagent/spacecleaner name = "Space cleaner" - id = "cleaner" description = "A compound used to clean things. Now with 50% more sodium hypochlorite!" reagent_state = LIQUID color = "#A5F0EE" @@ -316,17 +295,17 @@ taste_description = "sourness" germ_adjust = 10 -/datum/reagent/space_cleaner/touch_obj(var/obj/O) +/datum/reagent/spacecleaner/touch_obj(var/obj/O) O.clean_blood() -/datum/reagent/space_cleaner/touch_turf(var/turf/T) +/datum/reagent/spacecleaner/touch_turf(var/turf/T) if(volume >= 1) if(istype(T, /turf/simulated)) var/turf/simulated/S = T S.dirt = 0 T.clean_blood() -/datum/reagent/space_cleaner/affect_touch(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/spacecleaner/affect_touch(var/mob/living/carbon/M, var/alien, var/removed) if(M.r_hand) M.r_hand.clean_blood() if(M.l_hand) @@ -362,11 +341,10 @@ S.target = null ++S.discipline if(dose == removed) - S.visible_message(span("warning", "[S]'s flesh sizzles where the space cleaner touches it!"), span("danger", "Your flesh burns in the space cleaner!")) + S.visible_message(SPAN_WARNING("[S]'s flesh sizzles where the space cleaner touches it!"), SPAN_DANGER("Your flesh burns in the space cleaner!")) /datum/reagent/lube name = "Space Lube" - id = "lube" description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them." reagent_state = LIQUID color = "#009CA8" @@ -380,7 +358,6 @@ /datum/reagent/silicate name = "Silicate" - id = "silicate" description = "A compound that can be used to reinforce glass." reagent_state = LIQUID color = "#C7FFFF" @@ -395,7 +372,6 @@ /datum/reagent/glycerol name = "Glycerol" - id = "glycerol" description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity." reagent_state = LIQUID color = "#808080" @@ -403,7 +379,6 @@ /datum/reagent/nitroglycerin name = "Nitroglycerin" - id = "nitroglycerin" description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol." reagent_state = LIQUID color = "#808080" @@ -453,7 +428,6 @@ /datum/reagent/coolant name = "Coolant" - id = "coolant" description = "Industrial cooling substance." reagent_state = LIQUID color = "#C8A5DC" @@ -462,7 +436,6 @@ /datum/reagent/ultraglue name = "Ultra Glue" - id = "glue" description = "An extremely powerful bonding agent." color = "#FFFFCC" taste_description = "a special education class" @@ -470,7 +443,6 @@ /datum/reagent/woodpulp name = "Wood Pulp" - id = "woodpulp" description = "A mass of wood fibers." reagent_state = LIQUID color = "#B97A57" @@ -479,7 +451,6 @@ /datum/reagent/luminol name = "Luminol" - id = "luminol" description = "A compound that interacts with blood on the molecular level." reagent_state = LIQUID color = "#F2F3F4" @@ -494,7 +465,6 @@ /datum/reagent/pyrosilicate name = "Pyrosilicate" - id = "pyrosilicate" description = "A bright orange powder consisting of strange self-heating properties that reacts when exposed to sodium chloride." reagent_state = SOLID color = "#FFFF00" @@ -503,7 +473,6 @@ /datum/reagent/cryosurfactant name = "Cryosurfactant" - id = "cryosurfactant" description = "A bright cyan liquid consisting of strange self-cooling properties that reacts when exposed to water." reagent_state = LIQUID color = "#00FFFF" @@ -512,7 +481,6 @@ /datum/reagent/mutone name = "Mutone" - id = "mutone" description = "A strange green powder with even stranger properties." reagent_state = SOLID color = "#11AA11" @@ -526,7 +494,7 @@ /datum/reagent/mutone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) stored_value += removed if(stored_value >= 5) - to_chat(M,span("notice","You feel strange...")) + to_chat(M, SPAN_NOTICE("You feel strange...")) if(prob(25)) randmutb(M) else @@ -536,7 +504,6 @@ /datum/reagent/plexium name = "Plexium" - id = "plexium" description = "A yellow, fowl smelling liquid that seems to affect the brain in strange ways." reagent_state = LIQUID color = "#888822" @@ -562,7 +529,6 @@ /datum/reagent/venenum name = "Venenum" - id = "venenum" description = "A thick tar like liquid that seems to move around on it's own every now and then. Limited data shows it only works when injected into the bloodstream." reagent_state = LIQUID color = "#000000" @@ -578,7 +544,7 @@ /datum/reagent/venenum/initial_effect(var/mob/living/carbon/M, var/alien) stored_value = metabolism stored_dna = M.dna.Clone() - to_chat(M,span("warning","Your skin starts crawling...")) + to_chat(M, SPAN_WARNING("Your skin starts crawling...")) /datum/reagent/venenum/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) stored_value += removed @@ -601,11 +567,10 @@ M.real_name = M.dna.real_name M.UpdateAppearance() - to_chat(M,span("warning","You seem back to your normal self.")) + to_chat(M, SPAN_WARNING("You seem back to your normal self.")) /datum/reagent/fuel/zoragel name = "Inert Gel" - id = "zoragel" description = "A particularly adhesive but otherwise inert and harmless gel." reagent_state = LIQUID color = "#D35908" @@ -614,7 +579,6 @@ /datum/reagent/fuel/napalm name = "Zo'rane Fire" - id = "greekfire" description = "A highly flammable and cohesive gel once used commonly in the tunnels of Sedantis. Napalm sticks to kids." reagent_state = LIQUID color = "#D35908" @@ -642,7 +606,6 @@ //Shhh don't tell no one. /datum/reagent/estus name = "Liquid Light" - id = "estus" description = "This impossible substance slowly converts from a liquid into actual light." reagent_state = LIQUID color = "#ffff40" @@ -673,7 +636,6 @@ /datum/reagent/liquid_fire name = "Liquid Fire" - id = "liquid_fire" description = "A dangerous flammable chemical, capable of causing fires when in contact with organic matter." reagent_state = LIQUID color = "#E25822" @@ -695,7 +657,6 @@ /datum/reagent/black_matter name = "Unstable Black Matter" - id = "black_matter" description = "A pitch black blend of cosmic origins, handle with care." color = "#000000" taste_description = "emptyness" @@ -720,7 +681,6 @@ /datum/reagent/bluespace_dust name = "Bluespace Dust" - id = "bluespace_dust" description = "A dust composed of microscopic bluespace crystals." color = "#1f8999" taste_description = "fizzling blue" @@ -741,7 +701,6 @@ /datum/reagent/philosopher_stone name = "Philosopher's Stone" - id = "philosopher_stone" description = "A mythical compound, rumored to be the catalyst of fantastic reactions." color = "#f4c430" taste_description = "heavenly knowledge" @@ -749,7 +708,6 @@ /datum/reagent/sglue name = "Sovereign Glue" - id = "sglue" description = "A very potent adhesive which can be applied to inanimate surfaces." reagent_state = LIQUID color = "#EDE8E2" @@ -766,7 +724,6 @@ /datum/reagent/usolve name = "Universal Solvent" - id = "usolve" description = "A very potent solvent which can be applied to inanimate surfaces." reagent_state = LIQUID color = "#EDE8E2" @@ -783,7 +740,6 @@ /datum/reagent/shapesand name = "Shapesand" - id = "shapesand" description = "A strangely animate clump of sand which can shift its color and consistency." reagent_state = SOLID color = "#c2b280" @@ -820,7 +776,6 @@ /datum/reagent/love_potion name = "Philter of Love" - id = "love" description = "A sickly sweet compound that induces chemical dependency on the first person the subject sees." reagent_state = LIQUID color = "#ff69b4" @@ -838,7 +793,6 @@ /datum/reagent/bottle_lightning name = "Bottled Lightning" - id = "lightning" description = "A mysterious compound capable of producing electrical discharges." reagent_state = LIQUID color = "#70838A" @@ -852,7 +806,6 @@ /datum/reagent/stone_dust name = "Stone Dust" - id = "stone_dust" description = "Crystalline silica dust, harmful when inhaled." reagent_state = SOLID color = "#5a4d41" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index 97146b12e19..f62308154de 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -2,7 +2,6 @@ /datum/reagent/toxin name = "Toxin" - id = "toxin" description = "A toxic chemical." reagent_state = LIQUID color = "#CF3600" @@ -34,7 +33,6 @@ /datum/reagent/toxin/plasticide name = "Plasticide" - id = "plasticide" description = "Liquid plastic, do not eat." reagent_state = LIQUID color = "#CF3600" @@ -43,7 +41,6 @@ /datum/reagent/toxin/amatoxin name = "Amatoxin" - id = "amatoxin" description = "A powerful poison derived from certain species of mushroom." reagent_state = LIQUID color = "#792300" @@ -52,7 +49,6 @@ /datum/reagent/toxin/carpotoxin name = "Carpotoxin" - id = "carpotoxin" description = "A deadly neurotoxin produced by the dreaded space carp." reagent_state = LIQUID color = "#003333" @@ -67,7 +63,6 @@ /datum/reagent/toxin/panotoxin name = "Panotoxin" - id = "panotoxin" description = "A strange poison from the strange panocelium mushroom that causes intense pain when injected." reagent_state = LIQUID color = "#008844" @@ -79,7 +74,6 @@ /datum/reagent/toxin/phoron name = "Phoron" - id = "phoron" description = "Phoron in its liquid form. Twice as potent when breathed in." reagent_state = LIQUID color = "#9D14DB" @@ -145,7 +139,6 @@ /datum/reagent/toxin/phoron_salt //Remember to exclude in RNG chems. name = "Phoron Salts" - id = "phoron_salt" description = "A mysterious molten mixture with strange chemical properties. Incredibly deadly to all lifeforms, especially Vaurca." reagent_state = SOLID color = "#7C4876" @@ -154,7 +147,6 @@ /datum/reagent/toxin/cardox name = "Cardox" - id = "cardox" description = "Cardox is a mildly toxic, expensive, NanoTrasen designed cleaner intended to eliminate liquid phoron stains from suits." reagent_state = LIQUID color = "#EEEEEE" @@ -175,7 +167,7 @@ /datum/reagent/toxin/cardox/affect_conflicting(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagent/conflicting) var/amount = min(removed, conflicting.volume) - holder.remove_reagent(conflicting.id, amount) + holder.remove_reagent(conflicting.type, amount) /datum/reagent/toxin/cardox/touch_turf(var/turf/T, var/amount) if(amount >= 1) @@ -198,7 +190,6 @@ /datum/reagent/toxin/cyanide //Fast and Lethal name = "Cyanide" - id = "cyanide" description = "A highly toxic chemical." reagent_state = LIQUID color = "#CF3600" @@ -217,7 +208,6 @@ /datum/reagent/toxin/potassium_chloride name = "Potassium Chloride" - id = "potassium_chloride" description = "A delicious salt that stops the heart when injected into cardiac muscle." reagent_state = SOLID color = "#FFFFFF" @@ -239,7 +229,6 @@ /datum/reagent/toxin/potassium_chlorophoride name = "Potassium Chlorophoride" - id = "potassium_chlorophoride" description = "A specific chemical based on Potassium Chloride to stop the heart for surgery. Not safe to eat!" reagent_state = SOLID color = "#FFFFFF" @@ -261,7 +250,6 @@ /datum/reagent/toxin/zombiepowder name = "Zombie Powder" - id = "zombiepowder" description = "A strong neurotoxin that puts the subject into a death-like state." reagent_state = SOLID color = "#669900" @@ -290,7 +278,6 @@ /datum/reagent/toxin/fertilizer //Reagents used for plant fertilizers. name = "fertilizer" - id = "fertilizer" description = "A chemical mix good for growing plants with." reagent_state = LIQUID strength = 0.5 // It's not THAT poisonous. @@ -308,19 +295,15 @@ /datum/reagent/toxin/fertilizer/eznutrient name = "EZ Nutrient" - id = "eznutrient" /datum/reagent/toxin/fertilizer/left4zed name = "Left-4-Zed" - id = "left4zed" /datum/reagent/toxin/fertilizer/robustharvest name = "Robust Harvest" - id = "robustharvest" /datum/reagent/toxin/fertilizer/monoammoniumphosphate name = "Monoammonium Phosphate" - id = "monoammoniumphosphate" strength = 0.25 description = "Commonly found in fire extinguishers, also works as a fertilizer." reagent_state = SOLID @@ -361,11 +344,10 @@ S.target = null ++S.discipline if(dose == removed) - S.visible_message(span("warning", "[S]'s flesh sizzles where the foam touches it!"), span("danger", "Your flesh burns in the foam!")) + S.visible_message(SPAN_WARNING("[S]'s flesh sizzles where the foam touches it!"), SPAN_DANGER("Your flesh burns in the foam!")) /datum/reagent/toxin/plantbgone name = "Plant-B-Gone" - id = "plantbgone" description = "A harmful toxic mixture to kill plantlife. Do not ingest!" reagent_state = LIQUID color = "#49002E" @@ -402,7 +384,6 @@ /datum/reagent/lexorin name = "Lexorin" - id = "lexorin" description = "Lexorin temporarily stops respiration. Causes tissue damage." reagent_state = LIQUID color = "#C8A5DC" @@ -419,7 +400,6 @@ /datum/reagent/mutagen name = "Unstable mutagen" - id = "mutagen" description = "Might cause unpredictable mutations. Keep away from children." reagent_state = LIQUID color = "#13BC5E" @@ -452,7 +432,6 @@ /datum/reagent/slimejelly name = "Slime Jelly" - id = "slimejelly" description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL." reagent_state = LIQUID color = "#801E28" @@ -471,7 +450,6 @@ /datum/reagent/soporific name = "Soporific" - id = "stoxin" description = "An effective hypnotic used to treat insomnia, can act as a sedative. Lasts three times longer when inhaled." reagent_state = LIQUID color = "#009CA8" @@ -501,7 +479,6 @@ /datum/reagent/chloralhydrate name = "Chloral Hydrate" - id = "chloralhydrate" description = "A powerful sedative. Lasts two times longer when inhaled." reagent_state = SOLID color = "#000067" @@ -528,7 +505,6 @@ /datum/reagent/chloralhydrate/beer2 //disguised as normal beer for use by emagged brobots name = "Beer" - id = "beer2" description = "An alcoholic beverage made from malted grains, hops, yeast, and water. The fermentation appears to be incomplete." //If the players manage to analyze this, they deserve to know something is wrong. reagent_state = LIQUID color = "#664300" @@ -545,7 +521,6 @@ /datum/reagent/slimetoxin name = "Mutation Toxin" - id = "mutationtoxin" description = "A corruptive toxin produced by slimes." reagent_state = LIQUID color = "#13BC5E" @@ -560,7 +535,6 @@ /datum/reagent/aslimetoxin name = "Advanced Mutation Toxin" - id = "amutationtoxin" description = "An advanced corruptive toxin produced by slimes." reagent_state = LIQUID color = "#13BC5E" @@ -583,7 +557,7 @@ W.forceMove(M.loc) W.dropped(M) var/mob/living/carbon/slime/new_mob = new /mob/living/carbon/slime(M.loc) - new_mob.a_intent = "hurt" + new_mob.set_intent(I_HURT) new_mob.universal_speak = 1 if(M.mind) M.mind.transfer_to(new_mob) @@ -593,7 +567,6 @@ /datum/reagent/toxin/nanites name = "Nanomachines" - id = "nanites" description = "Microscopic construction robots." reagent_state = LIQUID color = "#535E66" @@ -602,7 +575,6 @@ /datum/reagent/toxin/undead name = "Undead Ichor" - id = "undead_ichor" description = "A wicked liquid with unknown origins and uses." color = "#b2beb5" strength = 25 @@ -616,39 +588,34 @@ /datum/reagent/toxin/tobacco name = "Space Tobacco" - id = "tobacco" description = "Low-grade space tobacco." - reagent_state = LIQUID + reagent_state = SOLID color = "#333300" data = 0 - taste_description = "low-grade tobacco" + taste_description = "cheap tobacco" strength = 0.004 taste_mult = 10 + var/nicotine = 0.2 -/datum/reagent/toxin/tobacco/affect_blood(var/mob/living/carbon/human/M, var/alien, var/removed) - if(istype(M)) - var/obj/item/organ/H = M.internal_organs_by_name[BP_HEART] - if(istype(H)) - H.take_damage(removed * strength * 0.5,1) - var/obj/item/organ/L = M.internal_organs_by_name[BP_LUNGS] - if(istype(L)) - L.take_damage(removed * strength,1) - var/obj/item/organ/A = M.internal_organs_by_name[BP_LIVER] - if(istype(A)) - A.take_damage(removed * strength * 0.25,1) +/datum/reagent/toxin/tobacco/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + M.reagents.add_reagent(/datum/reagent/mental/nicotine, removed * nicotine) /datum/reagent/toxin/tobacco/rich name = "Earth Tobacco" - id = "tobaccorich" - description = "Nicknamed 'Earth Tobacco', this plant is much higher quality than it's space fairing counterpart." - reagent_state = LIQUID - data = 0 - taste_description = "quality tobacco" + description = "Nicknamed 'Earth Tobacco', this plant is much higher quality than its spacefaring counterpart." + taste_description = "luxury tobacco" strength = 0.002 + nicotine = 0.5 + +/datum/reagent/toxin/tobacco/fake + name = "Cheap Tobacco" + description = "This actually appears to be mostly ground up leaves masquerading as tobacco. There's maybe some nicotine in there somewhere..." + taste_description = "acrid smoke" + strength = 0.008 + nicotine = 0.1 /datum/reagent/toxin/berserk name = "Red Nightshade" - id = "berserk" description = "An illegal chemical enhancer, may cause aggressive and violent behavior." reagent_state = LIQUID color = "#AF111C" @@ -675,7 +642,6 @@ /datum/reagent/toxin/spectrocybin name = "Spectrocybin" - id = "spectrocybin" description = "A hallucinogen chemical, rumored to be used by mystics and religious figures in their rituals." reagent_state = LIQUID color = "#800080" @@ -692,7 +658,6 @@ /datum/reagent/toxin/trioxin name = "Trioxin" - id = "trioxin" description = "A synthetic compound of unknown origins, designated originally as a performance enhancing substance." reagent_state = LIQUID color = "#E7E146" @@ -707,7 +672,7 @@ if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M - if(H.reagents.has_reagent("thetamycin", 15)) + if(H.reagents.has_reagent(/datum/reagent/thetamycin, 15)) return if(!H.internal_organs_by_name["zombie"] && prob(15)) @@ -739,7 +704,6 @@ /datum/reagent/toxin/dextrotoxin name = "Dextrotoxin" - id = "dextrotoxin" description = "A complicated to make and highly illegal drug that cause paralysis mostly focused on the limbs." reagent_state = LIQUID color = "#002067" @@ -753,7 +717,7 @@ if(istype(H) && (H.species.flags & NO_SCAN)) return if (!(CE_UNDEXTROUS in M.chem_effects)) - to_chat(M, span("warning", "Your limbs start to feel numb and weak, and your legs wobble as it becomes hard to stand...")) + to_chat(M, SPAN_WARNING("Your limbs start to feel numb and weak, and your legs wobble as it becomes hard to stand...")) M.confused = max(M.confused, 250) M.add_chemical_effect(CE_UNDEXTROUS, 1) if(dose > 0.2) @@ -762,5 +726,5 @@ /datum/reagent/toxin/dextrotoxin/Destroy() if(holder && holder.my_atom && ismob(holder.my_atom)) var/mob/M = holder.my_atom - to_chat(M, span("warning", "You can feel sensation creeping back into your limbs...")) + to_chat(M, SPAN_WARNING("You can feel sensation creeping back into your limbs...")) return ..() diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index dc2bb0b9dee..da2351500c7 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -36,6 +36,7 @@ var/reaction_sound = 'sound/effects/bubbles.ogg' var/log_is_important = 0 // If this reaction should be considered important for logging. Important recipes message admins when mixed, non-important ones just log to file. + /datum/chemical_reaction/proc/can_happen(var/datum/reagents/holder) //check that all the required reagents are present if(!holder.has_all_reagents(required_reagents)) @@ -141,501 +142,501 @@ /datum/chemical_reaction/norepinephrine name = "Norepinephrine" id = "norepinephrine" - result = "norepinephrine" - required_reagents = list("acetone" = 1, "carbon" = 1, "sugar" = 1) + result = /datum/reagent/norepinephrine + required_reagents = list(/datum/reagent/acetone = 1, /datum/reagent/carbon = 1, /datum/reagent/sugar = 1) result_amount = 3 /datum/chemical_reaction/dylovene name = "Dylovene" id = "dylovene" - result = "dylovene" - required_reagents = list("silicon" = 1, "potassium" = 1, "ammonia" = 1) + result = /datum/reagent/dylovene + required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/potassium = 1, /datum/reagent/ammonia = 1) result_amount = 3 /datum/chemical_reaction/tramadol name = "Tramadol" id = "tramadol" - result = "tramadol" - required_reagents = list("norepinephrine" = 1, "ethanol" = 1, "acetone" = 1) + result = /datum/reagent/tramadol + required_reagents = list(/datum/reagent/norepinephrine = 1, /datum/reagent/alcohol/ethanol = 1, /datum/reagent/acetone = 1) result_amount = 3 /datum/chemical_reaction/paracetamol name = "Paracetamol" id = "paracetamol" - result = "paracetamol" - required_reagents = list("tramadol" = 1, "sugar" = 1, "water" = 1) + result = /datum/reagent/paracetamol + required_reagents = list(/datum/reagent/tramadol = 1, /datum/reagent/sugar = 1, /datum/reagent/water = 1) result_amount = 3 /datum/chemical_reaction/oxycodone name = "Oxycodone" id = "oxycodone" - result = "oxycodone" - required_reagents = list("ethanol" = 1, "tramadol" = 1) - catalysts = list("phoron" = 5) + result = /datum/reagent/oxycodone + required_reagents = list(/datum/reagent/alcohol/ethanol = 1, /datum/reagent/tramadol = 1) + catalysts = list(/datum/reagent/toxin/phoron = 5) result_amount = 1 /datum/chemical_reaction/sterilizine name = "Sterilizine" id = "sterilizine" - result = "sterilizine" - required_reagents = list("ethanol" = 1, "dylovene" = 1, "hclacid" = 1) + result = /datum/reagent/sterilizine + required_reagents = list(/datum/reagent/alcohol/ethanol = 1, /datum/reagent/dylovene = 1, /datum/reagent/acid/hydrochloric = 1) result_amount = 3 /datum/chemical_reaction/silicate name = "Silicate" id = "silicate" - result = "silicate" - required_reagents = list("aluminum" = 1, "silicon" = 1, "acetone" = 1) + result = /datum/reagent/silicate + required_reagents = list(/datum/reagent/aluminum = 1, /datum/reagent/silicon = 1, /datum/reagent/acetone = 1) result_amount = 3 /datum/chemical_reaction/mutagen name = "Unstable mutagen" id = "mutagen" - result = "mutagen" - required_reagents = list("radium" = 1, "phosphorus" = 1, "hclacid" = 1) + result = /datum/reagent/mutagen + required_reagents = list(/datum/reagent/radium = 1, /datum/reagent/phosphorus = 1, /datum/reagent/acid/hydrochloric = 1) result_amount = 3 /datum/chemical_reaction/thermite name = "Thermite" id = "thermite" - result = "thermite" - required_reagents = list("aluminum" = 1, "iron" = 1, "acetone" = 1) + result = /datum/reagent/thermite + required_reagents = list(/datum/reagent/aluminum = 1, /datum/reagent/iron = 1, /datum/reagent/acetone = 1) result_amount = 3 /datum/chemical_reaction/space_drugs name = "Space Drugs" id = "space_drugs" - result = "space_drugs" - required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1) + result = /datum/reagent/space_drugs + required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/sugar = 1, /datum/reagent/lithium = 1) result_amount = 3 /datum/chemical_reaction/lube name = "Space Lube" id = "lube" - result = "lube" - required_reagents = list("water" = 1, "silicon" = 1, "acetone" = 1) + result = /datum/reagent/lube + required_reagents = list(/datum/reagent/water = 1, /datum/reagent/silicon = 1, /datum/reagent/acetone = 1) result_amount = 4 /datum/chemical_reaction/pacid name = "Polytrinic acid" id = "pacid" - result = "pacid" - required_reagents = list("sacid" = 1, "hclacid" = 1, "potassium" = 1) + result = /datum/reagent/acid/polyacid + required_reagents = list(/datum/reagent/acid = 1, /datum/reagent/acid/hydrochloric = 1, /datum/reagent/potassium = 1) result_amount = 3 /datum/chemical_reaction/synaptizine name = "Synaptizine" id = "synaptizine" - result = "synaptizine" - required_reagents = list("sugar" = 1, "lithium" = 1, "water" = 1) + result = /datum/reagent/synaptizine + required_reagents = list(/datum/reagent/sugar = 1, /datum/reagent/lithium = 1, /datum/reagent/water = 1) result_amount = 3 /datum/chemical_reaction/hyronalin name = "Hyronalin" id = "hyronalin" - result = "hyronalin" - required_reagents = list("radium" = 1, "dylovene" = 1) + result = /datum/reagent/hyronalin + required_reagents = list(/datum/reagent/radium = 1, /datum/reagent/dylovene = 1) result_amount = 2 /datum/chemical_reaction/arithrazine name = "Arithrazine" id = "arithrazine" - result = "arithrazine" - required_reagents = list("hyronalin" = 1, "hydrazine" = 1) + result = /datum/reagent/arithrazine + required_reagents = list(/datum/reagent/hyronalin = 1, /datum/reagent/hydrazine = 1) result_amount = 2 /datum/chemical_reaction/impedrezene name = "Impedrezene" id = "impedrezene" - result = "impedrezene" - required_reagents = list("mercury" = 1, "acetone" = 1, "sugar" = 1) + result = /datum/reagent/impedrezene + required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/acetone = 1, /datum/reagent/sugar = 1) result_amount = 2 /datum/chemical_reaction/kelotane name = "Kelotane" id = "kelotane" - result = "kelotane" - required_reagents = list("silicon" = 1, "carbon" = 1) + result = /datum/reagent/kelotane + required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/carbon = 1) result_amount = 2 log_is_important = 1 /datum/chemical_reaction/peridaxon name = "Peridaxon" id = "peridaxon" - result = "peridaxon" - required_reagents = list("bicaridine" = 1, "clonexadone" = 1) - catalysts = list("phoron" = 5) + result = /datum/reagent/peridaxon + required_reagents = list(/datum/reagent/bicaridine = 1, /datum/reagent/clonexadone = 1) + catalysts = list(/datum/reagent/toxin/phoron = 5) result_amount = 1 /datum/chemical_reaction/virus_food name = "Virus Food" id = "virusfood" - result = "virusfood" - required_reagents = list("water" = 1, "milk" = 1) + result = /datum/reagent/nutriment/virusfood + required_reagents = list(/datum/reagent/water = 1, /datum/reagent/drink/milk = 1) result_amount = 5 /datum/chemical_reaction/leporazine name = "Leporazine" id = "leporazine" - result = "leporazine" - required_reagents = list("silicon" = 1, "copper" = 1) - catalysts = list("phoron" = 5) + result = /datum/reagent/leporazine + required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/copper = 1) + catalysts = list(/datum/reagent/toxin/phoron = 5) result_amount = 2 /datum/chemical_reaction/cryptobiolin name = "Cryptobiolin" id = "cryptobiolin" - result = "cryptobiolin" - required_reagents = list("potassium" = 1, "acetone" = 1, "sugar" = 1) + result = /datum/reagent/cryptobiolin + required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/acetone = 1, /datum/reagent/sugar = 1) result_amount = 3 /datum/chemical_reaction/tricordrazine name = "Tricordrazine" id = "tricordrazine" - result = "tricordrazine" - required_reagents = list("norepinephrine" = 1, "dylovene" = 1) + result = /datum/reagent/tricordrazine + required_reagents = list(/datum/reagent/norepinephrine = 1, /datum/reagent/dylovene = 1) result_amount = 2 /datum/chemical_reaction/alkysine name = "Alkysine" id = "alkysine" - result = "alkysine" - required_reagents = list("hclacid" = 1, "ammonia" = 1, "dylovene" = 1) + result = /datum/reagent/alkysine + required_reagents = list(/datum/reagent/acid/hydrochloric = 1, /datum/reagent/ammonia = 1, /datum/reagent/dylovene = 1) result_amount = 2 /datum/chemical_reaction/dexalin name = "Dexalin" id = "dexalin" - result = "dexalin" - required_reagents = list("acetone" = 2, "phoron" = 0.1) - catalysts = list("phoron" = 1) - inhibitors = list("water" = 1) // Messes with cryox + result = /datum/reagent/dexalin + required_reagents = list(/datum/reagent/acetone = 2, /datum/reagent/toxin/phoron = 0.1) + catalysts = list(/datum/reagent/toxin/phoron = 1) + inhibitors = list(/datum/reagent/water = 1) // Messes with cryox result_amount = 1 /datum/chemical_reaction/dermaline name = "Dermaline" id = "dermaline" - result = "dermaline" - required_reagents = list("acetone" = 1, "phosphorus" = 1, "kelotane" = 1) + result = /datum/reagent/dermaline + required_reagents = list(/datum/reagent/acetone = 1, /datum/reagent/phosphorus = 1, /datum/reagent/kelotane = 1) result_amount = 3 /datum/chemical_reaction/dexalinp name = "Dexalin Plus" id = "dexalinp" - result = "dexalinp" - required_reagents = list("dexalin" = 1, "carbon" = 1, "iron" = 1) + result = /datum/reagent/dexalin/plus + required_reagents = list(/datum/reagent/dexalin = 1, /datum/reagent/carbon = 1, /datum/reagent/iron = 1) result_amount = 3 /datum/chemical_reaction/bicaridine name = "Bicaridine" id = "bicaridine" - result = "bicaridine" - required_reagents = list("norepinephrine" = 1, "carbon" = 1) - inhibitors = list("sugar" = 1) // Messes with norepinephrine + result = /datum/reagent/bicaridine + required_reagents = list(/datum/reagent/norepinephrine = 1, /datum/reagent/carbon = 1) + inhibitors = list(/datum/reagent/sugar = 1) // Messes with norepinephrine result_amount = 2 /datum/chemical_reaction/hyperzine name = "Hyperzine" id = "hyperzine" - result = "hyperzine" - required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1) + result = /datum/reagent/hyperzine + required_reagents = list(/datum/reagent/sugar = 1, /datum/reagent/phosphorus = 1, /datum/reagent/sulfur = 1) result_amount = 3 /datum/chemical_reaction/ryetalyn name = "Ryetalyn" id = "ryetalyn" - result = "ryetalyn" - required_reagents = list("arithrazine" = 1, "carbon" = 1) + result = /datum/reagent/ryetalyn + required_reagents = list(/datum/reagent/arithrazine = 1, /datum/reagent/carbon = 1) result_amount = 2 /datum/chemical_reaction/cryoxadone name = "Cryoxadone" id = "cryoxadone" - result = "cryoxadone" - required_reagents = list("dexalin" = 1, "water" = 1, "acetone" = 1) + result = /datum/reagent/cryoxadone + required_reagents = list(/datum/reagent/dexalin = 1, /datum/reagent/water = 1, /datum/reagent/acetone = 1) result_amount = 3 /datum/chemical_reaction/clonexadone name = "Clonexadone" id = "clonexadone" - result = "clonexadone" - required_reagents = list("cryoxadone" = 1, "sodium" = 1, "phoron" = 0.1) - catalysts = list("phoron" = 5) + result = /datum/reagent/clonexadone + required_reagents = list(/datum/reagent/cryoxadone = 1, /datum/reagent/sodium = 1, /datum/reagent/toxin/phoron = 0.1) + catalysts = list(/datum/reagent/toxin/phoron = 5) result_amount = 2 /datum/chemical_reaction/thetamycin name = "Thetamycin" id = "thetamycin" - result = "thetamycin" - required_reagents = list("cryptobiolin" = 1, "dylovene" = 1) + result = /datum/reagent/thetamycin + required_reagents = list(/datum/reagent/cryptobiolin = 1, /datum/reagent/dylovene = 1) result_amount = 2 /datum/chemical_reaction/antihistamine name = "Diphenhydramine" id = "diphenhydramine" - result = "diphenhydramine" - required_reagents = list("cryptobiolin" = 1, "norepinephrine" = 1) + result = /datum/reagent/antihistamine + required_reagents = list(/datum/reagent/cryptobiolin = 1, /datum/reagent/norepinephrine = 1) result_amount = 2 /datum/chemical_reaction/ondansetron name = "Ondansetron" id = "ondansetron" - result = "ondansetron" - required_reagents = list("diphenhydramine" = 1, "synaptizine" = 1, "water" = 3) - catalysts = list("tungsten" = 5) + result = /datum/reagent/ondansetron + required_reagents = list(/datum/reagent/antihistamine = 1, /datum/reagent/synaptizine = 1, /datum/reagent/water = 3) + catalysts = list(/datum/reagent/tungsten = 5) result_amount = 3 /datum/chemical_reaction/imidazoline name = "imidazoline" id = "imidazoline" - result = "imidazoline" - required_reagents = list("carbon" = 1, "hydrazine" = 1, "dylovene" = 1) + result = /datum/reagent/imidazoline + required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/hydrazine = 1, /datum/reagent/dylovene = 1) result_amount = 2 /datum/chemical_reaction/ethylredoxrazine name = "Ethylredoxrazine" id = "ethylredoxrazine" - result = "ethylredoxrazine" - required_reagents = list("acetone" = 1, "dylovene" = 1, "carbon" = 1) + result = /datum/reagent/ethylredoxrazine + required_reagents = list(/datum/reagent/acetone = 1, /datum/reagent/dylovene = 1, /datum/reagent/carbon = 1) result_amount = 3 /datum/chemical_reaction/ipecac name = "Ipecac" id = "ipecac" - result = "ipecac" - required_reagents = list("hydrazine" = 1, "dylovene" = 1, "ethanol" = 1) + result = /datum/reagent/ipecac + required_reagents = list(/datum/reagent/hydrazine = 1, /datum/reagent/dylovene = 1, /datum/reagent/alcohol/ethanol = 1) result_amount = 3 /datum/chemical_reaction/adipemcina name = "Adipemcina" id = "adipemcina" - result = "adipemcina" - required_reagents = list("lithium" = 1, "dylovene" = 1, "potassium" = 1) + result = /datum/reagent/adipemcina + required_reagents = list(/datum/reagent/lithium = 1, /datum/reagent/dylovene = 1, /datum/reagent/potassium = 1) result_amount = 3 /datum/chemical_reaction/soporific name = "Soporific" id = "stoxin" - result = "stoxin" - required_reagents = list("chloralhydrate" = 1, "sugar" = 4) - inhibitors = list("phosphorus") // Messes with the smoke + result = /datum/reagent/soporific + required_reagents = list(/datum/reagent/chloralhydrate = 1, /datum/reagent/sugar = 4) + inhibitors = list(/datum/reagent/phosphorus) // Messes with the smoke result_amount = 5 /datum/chemical_reaction/chloralhydrate name = "Chloral Hydrate" id = "chloralhydrate" - result = "chloralhydrate" - required_reagents = list("ethanol" = 1, "hclacid" = 3, "water" = 1) + result = /datum/reagent/chloralhydrate + required_reagents = list(/datum/reagent/alcohol/ethanol = 1, /datum/reagent/acid/hydrochloric = 3, /datum/reagent/water = 1) result_amount = 1 /datum/chemical_reaction/potassium_chloride name = "Potassium Chloride" id = "potassium_chloride" - result = "potassium_chloride" - required_reagents = list("sodiumchloride" = 1, "potassium" = 1) + result = /datum/reagent/toxin/potassium_chloride + required_reagents = list(/datum/reagent/sodiumchloride = 1, /datum/reagent/potassium = 1) result_amount = 2 /datum/chemical_reaction/potassium_chlorophoride name = "Potassium Chlorophoride" id = "potassium_chlorophoride" - result = "potassium_chlorophoride" - required_reagents = list("potassium_chloride" = 1, "phoron" = 1, "chloralhydrate" = 1) + result = /datum/reagent/toxin/potassium_chlorophoride + required_reagents = list(/datum/reagent/toxin/potassium_chloride = 1, /datum/reagent/toxin/phoron = 1, /datum/reagent/chloralhydrate = 1) result_amount = 4 /datum/chemical_reaction/zombiepowder name = "Zombie Powder" id = "zombiepowder" - result = "zombiepowder" - required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5) + result = /datum/reagent/toxin/zombiepowder + required_reagents = list(/datum/reagent/toxin/carpotoxin = 5, /datum/reagent/soporific = 5, /datum/reagent/copper = 5) result_amount = 2 /datum/chemical_reaction/dextrotoxin name = "Dextrotoxin" id = "dextrotoxin" - result = "dextrotoxin" - required_reagents = list("carpotoxin" = 3, "stoxin" = 10, "phoron" = 5) + result = /datum/reagent/toxin/dextrotoxin + required_reagents = list(/datum/reagent/toxin/carpotoxin = 3, /datum/reagent/soporific = 10, /datum/reagent/toxin/phoron = 5) result_amount = 5 /datum/chemical_reaction/mindbreaker name = "Mindbreaker Toxin" id = "mindbreaker" - result = "mindbreaker" - required_reagents = list("silicon" = 1, "hydrazine" = 1, "dylovene" = 1) + result = /datum/reagent/mindbreaker + required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/hydrazine = 1, /datum/reagent/dylovene = 1) result_amount = 3 /datum/chemical_reaction/lipozine name = "Lipozine" id = "Lipozine" - result = "lipozine" - required_reagents = list("sodiumchloride" = 1, "ethanol" = 1, "radium" = 1) + result = /datum/reagent/lipozine + required_reagents = list(/datum/reagent/sodiumchloride = 1, /datum/reagent/alcohol/ethanol = 1, /datum/reagent/radium = 1) result_amount = 3 /datum/chemical_reaction/surfactant name = "Azosurfactant" id = "surfactant" - result = "surfactant" - required_reagents = list("hydrazine" = 2, "carbon" = 2, "sacid" = 1) + result = /datum/reagent/surfactant + required_reagents = list(/datum/reagent/hydrazine = 2, /datum/reagent/carbon = 2, /datum/reagent/acid = 1) result_amount = 5 /datum/chemical_reaction/diethylamine name = "Diethylamine" id = "diethylamine" - result = "diethylamine" - required_reagents = list ("ammonia" = 1, "ethanol" = 1) + result = /datum/reagent/diethylamine + required_reagents = list (/datum/reagent/ammonia = 1, /datum/reagent/alcohol/ethanol = 1) result_amount = 2 /datum/chemical_reaction/space_cleaner name = "Space cleaner" id = "cleaner" - result = "cleaner" - required_reagents = list("ammonia" = 1, "water" = 1) + result = /datum/reagent/spacecleaner + required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/water = 1) result_amount = 2 /datum/chemical_reaction/plantbgone name = "Plant-B-Gone" id = "plantbgone" - result = "plantbgone" - required_reagents = list("toxin" = 1, "water" = 4) + result = /datum/reagent/toxin/plantbgone + required_reagents = list(/datum/reagent/toxin = 1, /datum/reagent/water = 4) result_amount = 5 /datum/chemical_reaction/foaming_agent name = "Foaming Agent" id = "foaming_agent" - result = "foaming_agent" - required_reagents = list("lithium" = 1, "hydrazine" = 1) + result = /datum/reagent/foaming_agent + required_reagents = list(/datum/reagent/lithium = 1, /datum/reagent/hydrazine = 1) result_amount = 1 /datum/chemical_reaction/glycerol name = "Glycerol" id = "glycerol" - result = "glycerol" - required_reagents = list("triglyceride" = 1, "ethanol" = 2) // transesterification of triglycerides into butanol and glycerol - catalysts = list("sacid" = 5) // using acid as a catalyst + result = /datum/reagent/glycerol + required_reagents = list(/datum/reagent/nutriment/triglyceride = 1, /datum/reagent/alcohol/ethanol = 2) // transesterification of triglycerides into butanol and glycerol + catalysts = list(/datum/reagent/acid = 5) // using acid as a catalyst result_amount = 3 //each triglyceride has 3 glycerin chains. /datum/chemical_reaction/glycerol/butanol name = "Glycerol" id = "glycerol-butane" - result = "glycerol" - required_reagents = list("triglyceride" = 1, "butanol" = 2) + result = /datum/reagent/glycerol + required_reagents = list(/datum/reagent/nutriment/triglyceride = 1, /datum/reagent/alcohol/butanol = 2) /datum/chemical_reaction/glycerol/on_reaction(var/datum/reagents/holder, var/created_volume) - holder.add_reagent("acetone", 2 * created_volume / 3) // closest we can get to biofuel, sorry + holder.add_reagent(/datum/reagent/acetone, 2 * created_volume / 3) // closest we can get to biofuel, sorry /datum/chemical_reaction/glucose name = "Glucose" id = "glucose" - result = "glucose" - required_reagents = list("nutriment" = 5) // thank you, Gottlieb Kirchhoff - catalysts = list("sacid" = 5 )//starch into sugar with sulfuric acid catalyst + result = /datum/reagent/nutriment/glucose + required_reagents = list(/datum/reagent/nutriment = 5) // thank you, Gottlieb Kirchhoff + catalysts = list(/datum/reagent/acid = 5 )//starch into sugar with sulfuric acid catalyst /datum/chemical_reaction/sodiumchloride name = "Sodium Chloride" id = "sodiumchloride" - result = "sodiumchloride" - required_reagents = list("sodium" = 1, "hclacid" = 1) + result = /datum/reagent/sodiumchloride + required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/acid/hydrochloric = 1) result_amount = 2 /datum/chemical_reaction/condensedcapsaicin name = "Condensed Capsaicin" id = "condensedcapsaicin" - result = "condensedcapsaicin" - required_reagents = list("capsaicin" = 2) - catalysts = list("phoron" = 5) + result = /datum/reagent/capsaicin/condensed + required_reagents = list(/datum/reagent/capsaicin = 2) + catalysts = list(/datum/reagent/toxin/phoron = 5) result_amount = 1 /datum/chemical_reaction/coolant name = "Coolant" id = "coolant" - result = "coolant" - required_reagents = list("tungsten" = 1, "acetone" = 1, "water" = 1) + result = /datum/reagent/coolant + required_reagents = list(/datum/reagent/tungsten = 1, /datum/reagent/acetone = 1, /datum/reagent/water = 1) result_amount = 3 log_is_important = 1 /datum/chemical_reaction/rezadone name = "Rezadone" id = "rezadone" - result = "rezadone" - required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1) + result = /datum/reagent/rezadone + required_reagents = list(/datum/reagent/toxin/carpotoxin = 1, /datum/reagent/cryptobiolin = 1, /datum/reagent/copper = 1) result_amount = 3 /datum/chemical_reaction/lexorin name = "Lexorin" id = "lexorin" - result = "lexorin" - required_reagents = list("tungsten" = 1, "hydrazine" = 1, "ammonia" = 1) - catalysts = list("phoron" = 5) + result = /datum/reagent/lexorin + required_reagents = list(/datum/reagent/tungsten = 1, /datum/reagent/hydrazine = 1, /datum/reagent/ammonia = 1) + catalysts = list(/datum/reagent/toxin/phoron = 5) result_amount = 3 /datum/chemical_reaction/calomel name = "Calomel" id = "calomel" - result = "calomel" - required_reagents = list("mercury" = 1, "sodiumchloride" = 1, "ammonia" = 1) + result = /datum/reagent/calomel + required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/sodiumchloride = 1, /datum/reagent/ammonia = 1) result_amount = 3 /datum/chemical_reaction/cardox name = "Cardox" id = "cardox" - result = "cardox" - required_reagents = list("platinum" = 1, "carbon" = 1, "sterilizine" = 1) + result = /datum/reagent/toxin/cardox + required_reagents = list(/datum/reagent/platinum = 1, /datum/reagent/carbon = 1, /datum/reagent/sterilizine = 1) result_amount = 3 /datum/chemical_reaction/cardox_removal name = "Cardox Removal" id = "cardox_removal" - result = "carbon" - required_reagents = list("cardox" = 0.1, "phoron" = 1) + result = /datum/reagent/carbon + required_reagents = list(/datum/reagent/toxin/cardox = 0.1, /datum/reagent/toxin/phoron = 1) result_amount = 0 /datum/chemical_reaction/monoammoniumphosphate name = "Monoammoniumphosphate" id = "monoammoniumphosphate" - result = "monoammoniumphosphate" - required_reagents = list("ammonia" = 1, "sacid" = 1, "sodium" = 1, "phosphorus" = 1) + result = /datum/reagent/toxin/fertilizer/monoammoniumphosphate + required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/acid = 1, /datum/reagent/sodium = 1, /datum/reagent/phosphorus = 1) result_amount = 4 /datum/chemical_reaction/koispasteclean name = "Filtered K'ois" id = "koispasteclean" - result = "koispasteclean" - required_reagents = list("koispaste" = 2,"cardox" = 0.1) - catalysts = list("cardox" = 5) + result = /datum/reagent/kois/clean + required_reagents = list(/datum/reagent/kois = 2,/datum/reagent/toxin/cardox = 0.1) + catalysts = list(/datum/reagent/toxin/cardox = 5) result_amount = 1 /datum/chemical_reaction/pulmodeiectionem name = "Pulmodeiectionem" id = "pulmodeiectionem" - result = "pulmodeiectionem" - required_reagents = list("calomel" = 1, "lexorin" = 1) + result = /datum/reagent/pulmodeiectionem + required_reagents = list(/datum/reagent/calomel = 1, /datum/reagent/lexorin = 1) result_amount = 2 /datum/chemical_reaction/pneumalin name = "Pneumalin" id = "pneumalin" - result = "pneumalin" - required_reagents = list("coughsyrup" = 1, "copper" = 1, "pulmodeiectionem" = 1) + result = /datum/reagent/pneumalin + required_reagents = list(/datum/reagent/coughsyrup = 1, /datum/reagent/copper = 1, /datum/reagent/pulmodeiectionem = 1) result_amount = 2 /datum/chemical_reaction/saline name = "Saline" id = "saline" - result = "saline" - required_reagents = list("sugar" = 0.4, "water" = 1, "sodiumchloride" = 0.9) + result = /datum/reagent/saline + required_reagents = list(/datum/reagent/sugar = 0.4, /datum/reagent/water = 1, /datum/reagent/sodiumchloride = 0.9) result_amount = 1 /datum/chemical_reaction/mannitol name = "Mannitol" id = "mannitol" - result = "mannitol" - required_reagents = list("phoron" = 0.1, "alkysine" = 1, "cryoxadone" = 0.1) + result = /datum/reagent/mannitol + required_reagents = list(/datum/reagent/toxin/phoron = 0.1, /datum/reagent/alkysine = 1, /datum/reagent/cryoxadone = 0.1) result_amount = 1 /datum/chemical_reaction/coughsyrup name = "Cough Syrup" id = "coughsyrup" - result = "coughsyrup" - required_reagents = list("carbon" = 1, "ammonia" = 1, "water" = 1) + result = /datum/reagent/coughsyrup + required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/ammonia = 1, /datum/reagent/water = 1) result_amount = 3 //Mental Medication @@ -643,98 +644,91 @@ /datum/chemical_reaction/methylphenidate name = "Methylphenidate" id = "methylphenidate" - result = "methylphenidate" - required_reagents = list("mindbreaker" = 1, "hydrazine" = 1) + result = /datum/reagent/mental/methylphenidate + required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/hydrazine = 1) result_amount = 2 /datum/chemical_reaction/escitalopram name = "Escitalopram" id = "escitalopram" - result = "escitalopram" - required_reagents = list("mindbreaker" = 1, "carbon" = 1) + result = /datum/reagent/mental/escitalopram + required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/carbon = 1) result_amount = 2 /datum/chemical_reaction/adrenaline name = "Adrenaline" - result = "adrenaline" - required_reagents = list("norepinephrine" = 1, "hyperzine" = 1, "dexalinp" = 1) + result = /datum/reagent/adrenaline + required_reagents = list(/datum/reagent/norepinephrine = 1, /datum/reagent/hyperzine = 1, /datum/reagent/dexalin/plus = 1) result_amount = 3 /datum/chemical_reaction/paroxetine name = "Paroxetine" id = "paroxetine" - result = "paroxetine" - required_reagents = list("mindbreaker" = 1, "acetone" = 1, "norepinephrine" = 1) + result = /datum/reagent/mental/paroxetine + required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/ammonia = 1, /datum/reagent/copper = 1) result_amount = 3 /datum/chemical_reaction/fluvoxamine name = "Fluvoxamine" id = "fluvoxamine" - result = "fluvoxamine" - required_reagents = list("mindbreaker" = 1, "iron" = 1, "potassium" = 1) + result = /datum/reagent/mental/fluvoxamine + required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/iron = 1, /datum/reagent/potassium = 1) result_amount = 3 /datum/chemical_reaction/sertraline name = "Sertraline" id = "sertraline" - result = "sertraline" - required_reagents = list("mindbreaker" = 1, "aluminum" = 1, "potassium" = 1) - result_amount = 3 - -/datum/chemical_reaction/paroxetine - name = "Paroxetine" - id = "paroxetine" - result = "paroxetine" - required_reagents = list("mindbreaker" = 1, "ammonia" = 1, "copper" = 1) + result = /datum/reagent/mental/sertraline + required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/aluminum = 1, /datum/reagent/potassium = 1) result_amount = 3 /datum/chemical_reaction/duloxetine name = "Duloxetine" id = "duloxetine" - result = "duloxetine" - required_reagents = list("mindbreaker" = 1, "silicon" = 1, "ethanol" = 1) + result = /datum/reagent/mental/duloxetine + required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/silicon = 1, /datum/reagent/alcohol/ethanol = 1) result_amount = 3 /datum/chemical_reaction/venlafaxine name = "Venlafaxine" id = "venlafaxine" - result = "venlafaxine" - required_reagents = list("mindbreaker" = 1, "sodium" = 1, "tungsten" = 1) + result = /datum/reagent/mental/venlafaxine + required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/sodium = 1, /datum/reagent/tungsten = 1) result_amount = 3 /datum/chemical_reaction/risperidone name = "Risperidone" id = "risperidone" - result = "risperidone" - required_reagents = list("mindbreaker" = 1, "space_drugs" = 1, "ethanol" = 1) + result = /datum/reagent/mental/risperidone + required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/space_drugs = 1, /datum/reagent/alcohol/ethanol = 1) result_amount = 3 /datum/chemical_reaction/olanzapine name = "Olanzapine" id = "olanzapine" - result = "olanzapine" - required_reagents = list("mindbreaker" = 1, "space_drugs" = 1, "silicon" = 1) + result = /datum/reagent/mental/olanzapine + required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/space_drugs = 1, /datum/reagent/silicon = 1) result_amount = 3 /datum/chemical_reaction/truthserum name = "Truthserum" id = "truthserum" - result = "truthserum" - required_reagents = list("mindbreaker" = 1, "synaptizine" = 1, "phoron" = 0.1) + result = /datum/reagent/mental/truthserum + required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/synaptizine = 1, /datum/reagent/toxin/phoron = 0.1) result_amount = 2 /datum/chemical_reaction/pacifier name = "Paxazide" id = "paxazide" - result = "paxazide" - required_reagents = list("truthserum" = 1, "sertraline" = 1) + result = /datum/reagent/pacifier + required_reagents = list(/datum/reagent/mental/truthserum = 1, /datum/reagent/mental/sertraline = 1) result_amount = 1 /datum/chemical_reaction/berserk name = "Red Nightshade" id = "berserk" - result = "berserk" - required_reagents = list("psilocybin" = 1, "moonshine" = 1) + result = /datum/reagent/toxin/berserk + required_reagents = list(/datum/reagent/psilocybin = 1, /datum/reagent/alcohol/ethanol/moonshine = 1) result_amount = 1 /* Makeshift Chemicals and Drugs */ @@ -742,38 +736,38 @@ /datum/chemical_reaction/stimm name = "Stimm" id = "stimm" - result = "stimm" - required_reagents = list("fuel" = 1, "rewriter" = 5) + result = /datum/reagent/toxin/stimm + required_reagents = list(/datum/reagent/fuel = 1, /datum/reagent/drink/rewriter = 5) result_amount = 6 /datum/chemical_reaction/lean name = "Lean" id = "lean" - result = "lean" - required_reagents = list("space_up" = 2, "coughsyrup" = 2, "sugar" = 1) + result = /datum/reagent/toxin/lean + required_reagents = list(/datum/reagent/drink/spaceup = 2, /datum/reagent/coughsyrup = 2, /datum/reagent/sugar = 1) result_amount = 5 /datum/chemical_reaction/krokjuice name = "Krok Juice" id = "krok" - result = "krok" - required_reagents = list("orangejuice" = 2, "fuel" = 1, "iron" = 1) + result = /datum/reagent/toxin/krok + required_reagents = list(/datum/reagent/drink/orangejuice = 2, /datum/reagent/fuel = 1, /datum/reagent/iron = 1) result_amount = 4 /datum/chemical_reaction/raskara_dust name = "Raskara Dust" id = "raskara_dust" - result = "raskara_dust" - required_reagents = list("monoammoniumphosphate" = 1, "cleaner" = 1, "sodiumchloride" = 2) // extinguisher, cleaner, salt - required_temperatures_min = list("monoammoniumphosphate" = 400, "cleaner" = 400, "sodiumchloride" = 400) // barely over boiling point of water + result = /datum/reagent/raskara_dust + required_reagents = list(/datum/reagent/toxin/fertilizer/monoammoniumphosphate = 1, /datum/reagent/spacecleaner = 1, /datum/reagent/sodiumchloride = 2) // extinguisher, cleaner, salt + required_temperatures_min = list(/datum/reagent/toxin/fertilizer/monoammoniumphosphate = 400, /datum/reagent/spacecleaner = 400, /datum/reagent/sodiumchloride = 400) // barely over boiling point of water result_amount = 2 /datum/chemical_reaction/nightjuice name = "Nightlife" id = "night_juice" - result = "night_juice" - required_reagents = list("methylphenidate" = 1, "synaptizine" = 1, "nitroglycerin" = 1) - required_temperatures_min = list("methylphenidate" = T0C+200, "synaptizine" = T0C+200, "nitroglycerin" = T0C+200) + result = /datum/reagent/night_juice + required_reagents = list(/datum/reagent/mental/methylphenidate = 1, /datum/reagent/synaptizine = 1, /datum/reagent/nitroglycerin = 1) + required_temperatures_min = list(/datum/reagent/mental/methylphenidate = T0C+200, /datum/reagent/synaptizine = T0C+200, /datum/reagent/nitroglycerin = T0C+200) result_amount = 3 /* Solidification */ @@ -782,7 +776,7 @@ name = "Solid Phoron" id = "solidphoron" result = null - required_reagents = list("iron" = 5, "frostoil" = 5, "phoron" = 20) + required_reagents = list(/datum/reagent/iron = 5, /datum/reagent/frostoil = 5, /datum/reagent/toxin/phoron = 20) result_amount = 1 /datum/chemical_reaction/phoronsolidification/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -793,7 +787,7 @@ name = "Plastic" id = "solidplastic" result = null - required_reagents = list("pacid" = 1, "plasticide" = 2) + required_reagents = list(/datum/reagent/acid/polyacid = 1, /datum/reagent/toxin/plasticide = 2) result_amount = 1 /datum/chemical_reaction/plastication/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -806,7 +800,7 @@ name = "Explosion" id = "explosion_potassium" result = null - required_reagents = list("water" = 1, "potassium" = 1) + required_reagents = list(/datum/reagent/water = 1, /datum/reagent/potassium = 1) result_amount = 2 mix_message = null @@ -827,7 +821,7 @@ name = "Flash powder" id = "flash_powder" result = null - required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1 ) + required_reagents = list(/datum/reagent/aluminum = 1, /datum/reagent/potassium = 1, /datum/reagent/sulfur = 1 ) result_amount = null /datum/chemical_reaction/flash_powder/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -855,7 +849,7 @@ name = "EMP Pulse" id = "emp_pulse" result = null - required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense + required_reagents = list(/datum/reagent/uranium = 1, /datum/reagent/iron = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense result_amount = 2 /datum/chemical_reaction/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -869,15 +863,15 @@ /datum/chemical_reaction/nitroglycerin name = "Nitroglycerin" id = "nitroglycerin" - result = "nitroglycerin" - required_reagents = list("glycerol" = 1, "pacid" = 1, "sacid" = 1) + result = /datum/reagent/nitroglycerin + required_reagents = list(/datum/reagent/glycerol = 1, /datum/reagent/acid/polyacid = 1, /datum/reagent/acid = 1) result_amount = 2 /datum/chemical_reaction/napalm name = "Napalm" id = "napalm" result = null - required_reagents = list("aluminum" = 1, "phoron" = 1, "sacid" = 1 ) + required_reagents = list(/datum/reagent/aluminum = 1, /datum/reagent/toxin/phoron = 1, /datum/reagent/acid = 1 ) result_amount = 1 /datum/chemical_reaction/napalm/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -885,21 +879,21 @@ for(var/turf/simulated/floor/target_tile in range(0,location)) target_tile.assume_gas("phoron", created_volume, 400+T0C) spawn (0) target_tile.hotspot_expose(700, 400) - holder.del_reagent("napalm") + holder.del_reagent(/datum/reagent/fuel/napalm) return /datum/chemical_reaction/zoragel name = "Inert Gel" id = "zoragel" - result = "zoragel" - required_reagents = list("sacid" = 1, "aluminum" = 1, "sugar" = 1, "surfactant" = 3) + result = /datum/reagent/fuel/zoragel + required_reagents = list(/datum/reagent/acid = 1, /datum/reagent/aluminum = 1, /datum/reagent/sugar = 1, /datum/reagent/surfactant = 3) result_amount = 1 /datum/chemical_reaction/zorafire name = "Zo'rane Fire" id = "greekfire" - result = "greekfire" - required_reagents = list("nitroglycerin" = 2, "pyrosilicate" = 2, "phoron" = 3, "zoragel" = 3) + result = /datum/reagent/fuel/napalm + required_reagents = list(/datum/reagent/nitroglycerin = 2, /datum/reagent/pyrosilicate = 2, /datum/reagent/toxin/phoron = 3, /datum/reagent/fuel/zoragel = 3) result_amount = 1 log_is_important = 1 @@ -907,7 +901,7 @@ name = "Chemsmoke" id = "chemsmoke" result = null - required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1) + required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/sugar = 1, /datum/reagent/phosphorus = 1) result_amount = 0.4 /datum/chemical_reaction/chemsmoke/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -925,7 +919,7 @@ name = "Foam" id = "foam" result = null - required_reagents = list("surfactant" = 1, "water" = 1) + required_reagents = list(/datum/reagent/surfactant = 1, /datum/reagent/water = 1) result_amount = 2 mix_message = "The solution violently bubbles!" @@ -945,7 +939,7 @@ name = "Metal Foam" id = "metalfoam" result = null - required_reagents = list("aluminum" = 3, "foaming_agent" = 1, "pacid" = 1) + required_reagents = list(/datum/reagent/aluminum = 3, /datum/reagent/foaming_agent = 1, /datum/reagent/acid/polyacid = 1) result_amount = 5 /datum/chemical_reaction/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -963,7 +957,7 @@ name = "Iron Foam" id = "ironlfoam" result = null - required_reagents = list("iron" = 3, "foaming_agent" = 1, "pacid" = 1) + required_reagents = list(/datum/reagent/iron = 3, /datum/reagent/foaming_agent = 1, /datum/reagent/acid/polyacid = 1) result_amount = 5 /datum/chemical_reaction/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -980,8 +974,8 @@ /datum/chemical_reaction/luminol name = "Luminol" id = "luminol" - result = "luminol" - required_reagents = list("hydrazine" = 2, "carbon" = 2, "ammonia" = 2) + result = /datum/reagent/luminol + required_reagents = list(/datum/reagent/hydrazine = 2, /datum/reagent/carbon = 2, /datum/reagent/ammonia = 2) result_amount = 6 /* Paint */ @@ -989,8 +983,8 @@ /datum/chemical_reaction/red_paint name = "Red paint" id = "red_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_red" = 1) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/crayon_dust/red = 1) result_amount = 5 /datum/chemical_reaction/red_paint/send_data() @@ -999,8 +993,8 @@ /datum/chemical_reaction/orange_paint name = "Orange paint" id = "orange_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_orange" = 1) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/crayon_dust/orange = 1) result_amount = 5 /datum/chemical_reaction/orange_paint/send_data() @@ -1009,8 +1003,8 @@ /datum/chemical_reaction/yellow_paint name = "Yellow paint" id = "yellow_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_yellow" = 1) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/crayon_dust/yellow = 1) result_amount = 5 /datum/chemical_reaction/yellow_paint/send_data() @@ -1019,8 +1013,8 @@ /datum/chemical_reaction/green_paint name = "Green paint" id = "green_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_green" = 1) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/crayon_dust/green = 1) result_amount = 5 /datum/chemical_reaction/green_paint/send_data() @@ -1029,8 +1023,8 @@ /datum/chemical_reaction/blue_paint name = "Blue paint" id = "blue_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_blue" = 1) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/crayon_dust/blue = 1) result_amount = 5 /datum/chemical_reaction/blue_paint/send_data() @@ -1039,8 +1033,8 @@ /datum/chemical_reaction/purple_paint name = "Purple paint" id = "purple_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_purple" = 1) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/crayon_dust/purple = 1) result_amount = 5 /datum/chemical_reaction/purple_paint/send_data() @@ -1049,8 +1043,8 @@ /datum/chemical_reaction/grey_paint //mime name = "Grey paint" id = "grey_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_grey" = 1) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/crayon_dust/grey = 1) result_amount = 5 /datum/chemical_reaction/grey_paint/send_data() @@ -1059,8 +1053,8 @@ /datum/chemical_reaction/brown_paint name = "Brown paint" id = "brown_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_brown" = 1) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/crayon_dust/brown = 1) result_amount = 5 /datum/chemical_reaction/brown_paint/send_data() @@ -1069,12 +1063,12 @@ /datum/chemical_reaction/blood_paint name = "Blood paint" id = "blood_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "blood" = 2) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/blood = 2) result_amount = 5 /datum/chemical_reaction/blood_paint/send_data(var/datum/reagents/T) - var/t = T.get_data("blood") + var/t = T.get_data(/datum/reagent/blood) if(t && t["blood_colour"]) return t["blood_colour"] return "#FE191A" // Probably red @@ -1082,8 +1076,8 @@ /datum/chemical_reaction/milk_paint name = "Milk paint" id = "milk_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "milk" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/drink/milk = 5) result_amount = 5 /datum/chemical_reaction/milk_paint/send_data() @@ -1092,8 +1086,8 @@ /datum/chemical_reaction/orange_juice_paint name = "Orange juice paint" id = "orange_juice_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "orangejuice" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/drink/orangejuice = 5) result_amount = 5 /datum/chemical_reaction/orange_juice_paint/send_data() @@ -1102,8 +1096,8 @@ /datum/chemical_reaction/tomato_juice_paint name = "Tomato juice paint" id = "tomato_juice_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "tomatojuice" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/drink/tomatojuice = 5) result_amount = 5 /datum/chemical_reaction/tomato_juice_paint/send_data() @@ -1112,8 +1106,8 @@ /datum/chemical_reaction/lime_juice_paint name = "Lime juice paint" id = "lime_juice_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "limejuice" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/drink/limejuice = 5) result_amount = 5 /datum/chemical_reaction/lime_juice_paint/send_data() @@ -1122,8 +1116,8 @@ /datum/chemical_reaction/carrot_juice_paint name = "Carrot juice paint" id = "carrot_juice_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "carrotjuice" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/drink/carrotjuice = 5) result_amount = 5 /datum/chemical_reaction/carrot_juice_paint/send_data() @@ -1132,8 +1126,8 @@ /datum/chemical_reaction/berry_juice_paint name = "Berry juice paint" id = "berry_juice_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "berryjuice" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/drink/berryjuice = 5) result_amount = 5 /datum/chemical_reaction/berry_juice_paint/send_data() @@ -1142,8 +1136,8 @@ /datum/chemical_reaction/grape_juice_paint name = "Grape juice paint" id = "grape_juice_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "grapejuice" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/drink/grapejuice = 5) result_amount = 5 /datum/chemical_reaction/grape_juice_paint/send_data() @@ -1152,8 +1146,8 @@ /datum/chemical_reaction/poisonberry_juice_paint name = "Poison berry juice paint" id = "poisonberry_juice_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "poisonberryjuice" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/toxin/poisonberryjuice = 5) result_amount = 5 /datum/chemical_reaction/poisonberry_juice_paint/send_data() @@ -1162,8 +1156,8 @@ /datum/chemical_reaction/watermelon_juice_paint name = "Watermelon juice paint" id = "watermelon_juice_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "watermelonjuice" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/drink/watermelonjuice = 5) result_amount = 5 /datum/chemical_reaction/watermelon_juice_paint/send_data() @@ -1172,8 +1166,8 @@ /datum/chemical_reaction/lemon_juice_paint name = "Lemon juice paint" id = "lemon_juice_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "lemonjuice" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/drink/lemonjuice = 5) result_amount = 5 /datum/chemical_reaction/lemon_juice_paint/send_data() @@ -1182,8 +1176,8 @@ /datum/chemical_reaction/banana_juice_paint name = "Banana juice paint" id = "banana_juice_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "banana" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/drink/banana = 5) result_amount = 5 /datum/chemical_reaction/banana_juice_paint/send_data() @@ -1192,8 +1186,8 @@ /datum/chemical_reaction/potato_juice_paint name = "Potato juice paint" id = "potato_juice_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "potatojuice" = 5) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/drink/potatojuice = 5) result_amount = 5 /datum/chemical_reaction/potato_juice_paint/send_data() @@ -1202,8 +1196,8 @@ /datum/chemical_reaction/carbon_paint name = "Carbon paint" id = "carbon_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "carbon" = 1) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/carbon = 1) result_amount = 5 /datum/chemical_reaction/carbon_paint/send_data() @@ -1212,8 +1206,8 @@ /datum/chemical_reaction/aluminum_paint name = "Aluminum paint" id = "aluminum_paint" - result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "aluminum" = 1) + result = /datum/reagent/paint + required_reagents = list(/datum/reagent/toxin/plasticide = 1, /datum/reagent/water = 3, /datum/reagent/aluminum = 1) result_amount = 5 /datum/chemical_reaction/aluminum_paint/send_data() @@ -1244,7 +1238,7 @@ name = "Slime Spawn" id = "m_spawn" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/grey @@ -1257,7 +1251,7 @@ name = "Slime Monkey" id = "m_monkey" result = null - required_reagents = list("blood" = 1) + required_reagents = list(/datum/reagent/blood = 1) result_amount = 1 required = /obj/item/slime_extract/grey @@ -1269,8 +1263,8 @@ /datum/chemical_reaction/slime/mutate name = "Mutation Toxin" id = "mutationtoxin" - result = "mutationtoxin" - required_reagents = list("phoron" = 1) + result = /datum/reagent/slimetoxin + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/green @@ -1279,7 +1273,7 @@ name = "Slime Metal" id = "m_metal" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/metal @@ -1292,7 +1286,7 @@ name = "Slime Crit" id = "m_tele" result = null - required_reagents = list("water" = 5) + required_reagents = list(/datum/reagent/water = 5) result_amount = 1 required = /obj/item/slime_extract/gold @@ -1357,7 +1351,7 @@ name = "Slime Rare Metal" id = "rm_metal" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/gold @@ -1370,7 +1364,7 @@ name = "Slime Bork" id = "m_tele2" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/silver @@ -1429,8 +1423,8 @@ /datum/chemical_reaction/slime/frost name = "Slime Frost Oil" id = "m_frostoil" - result = "frostoil" - required_reagents = list("phoron" = 1) + result = /datum/reagent/frostoil + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 10 required = /obj/item/slime_extract/blue @@ -1439,7 +1433,7 @@ name = "Slime Freeze" id = "m_freeze" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/darkblue mix_message = "The slime extract begins to vibrate violently!" @@ -1458,8 +1452,8 @@ /datum/chemical_reaction/slime/casp name = "Slime Capsaicin Oil" id = "m_capsaicinoil" - result = "capsaicin" - required_reagents = list("blood" = 1) + result = /datum/reagent/capsaicin + required_reagents = list(/datum/reagent/blood = 1) result_amount = 10 required = /obj/item/slime_extract/orange @@ -1467,7 +1461,7 @@ name = "Slime fire" id = "m_fire" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/orange mix_message = "The slime extract begins to vibrate violently!" @@ -1487,7 +1481,7 @@ name = "Slime EMP" id = "m_emp" result = null - required_reagents = list("blood" = 1) + required_reagents = list(/datum/reagent/blood = 1) result_amount = 1 required = /obj/item/slime_extract/yellow mix_message = "The slime extract begins to vibrate violently!" @@ -1500,7 +1494,7 @@ name = "Slime Powercell" id = "m_cell" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/yellow mix_message = "A small sparking part of the extract core falls onto the floor." @@ -1512,7 +1506,7 @@ name = "Slime Glow" id = "m_glow" result = null - required_reagents = list("water" = 1) + required_reagents = list(/datum/reagent/water = 1) result_amount = 1 required = /obj/item/slime_extract/yellow mix_message = "The contents of the slime core harden and begin to emit a warm, bright light." @@ -1526,7 +1520,7 @@ name = "Slime Steroid" id = "m_steroid" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/purple @@ -1537,8 +1531,8 @@ /datum/chemical_reaction/slime/jam name = "Slime Jam" id = "m_jam" - result = "slimejelly" - required_reagents = list("sugar" = 1) + result = /datum/reagent/slimejelly + required_reagents = list(/datum/reagent/sugar = 1) result_amount = 10 required = /obj/item/slime_extract/purple @@ -1547,7 +1541,7 @@ name = "Slime Plasma" id = "m_plasma" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/darkpurple @@ -1559,8 +1553,8 @@ /datum/chemical_reaction/slime/glycerol name = "Slime Glycerol" id = "m_glycerol" - result = "glycerol" - required_reagents = list("phoron" = 1) + result = /datum/reagent/glycerol + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 8 required = /obj/item/slime_extract/red @@ -1568,7 +1562,7 @@ name = "Bloodlust" id = "m_bloodlust" result = null - required_reagents = list("blood" = 1) + required_reagents = list(/datum/reagent/blood = 1) result_amount = 1 required = /obj/item/slime_extract/red @@ -1583,7 +1577,7 @@ name = "Slime Potion" id = "m_potion" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/pink @@ -1595,8 +1589,8 @@ /datum/chemical_reaction/slime/mutate2 name = "Advanced Mutation Toxin" id = "mutationtoxin2" - result = "amutationtoxin" - required_reagents = list("phoron" = 1) + result = /datum/reagent/aslimetoxin + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/black @@ -1605,7 +1599,7 @@ name = "Slime Explosion" id = "m_explosion" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/oil mix_message = "The slime extract begins to vibrate violently!" @@ -1621,7 +1615,7 @@ result = null result_amount = 1 required = /obj/item/slime_extract/lightpink - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) /datum/chemical_reaction/slime/potion2/on_reaction(var/datum/reagents/holder) ..() @@ -1632,7 +1626,7 @@ name = "Slime Golem" id = "m_golem" result = null - required_reagents = list("phoron" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1) result_amount = 1 required = /obj/item/slime_extract/adamantine mix_message = "A soft fizzle is heard within the slime extract, and mystic runes suddenly appear on the floor beneath it!" @@ -1645,7 +1639,7 @@ name = "Soap Key" id = "skey" result = null - required_reagents = list("triglyceride" = 2, "water" = 2, "cleaner" = 3) + required_reagents = list(/datum/reagent/nutriment/triglyceride = 2, /datum/reagent/water = 2, /datum/reagent/spacecleaner = 3) var/strength = 3 /datum/chemical_reaction/soap_key/can_happen(var/datum/reagents/holder) @@ -1670,8 +1664,8 @@ name = "Tofu" id = "tofu" result = null - required_reagents = list("soymilk" = 10) - catalysts = list("enzyme" = 5) + required_reagents = list(/datum/reagent/drink/milk/soymilk = 10) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 1 /datum/chemical_reaction/tofu/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -1684,7 +1678,7 @@ name = "Chocolate Bar" id = "chocolate_bar" result = null - required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2) + required_reagents = list(/datum/reagent/drink/milk/soymilk = 2, /datum/reagent/nutriment/coco = 2, /datum/reagent/sugar = 2) result_amount = 1 /datum/chemical_reaction/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -1697,7 +1691,7 @@ name = "Chocolate Bar" id = "chocolate_bar" result = null - required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2) + required_reagents = list(/datum/reagent/drink/milk = 2, /datum/reagent/nutriment/coco = 2, /datum/reagent/sugar = 2) result_amount = 1 /datum/chemical_reaction/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -1709,44 +1703,44 @@ /datum/chemical_reaction/hot_coco name = "Hot Coco" id = "hot_coco" - result = "hot_coco" - required_reagents = list("water" = 5, "coco" = 1) + result = /datum/reagent/drink/hot_coco + required_reagents = list(/datum/reagent/water = 5, /datum/reagent/nutriment/coco = 1) result_amount = 5 /datum/chemical_reaction/soysauce name = "Soy Sauce" id = "soysauce" - result = "soysauce" - required_reagents = list("soymilk" = 4, "sacid" = 1) + result = /datum/reagent/nutriment/soysauce + required_reagents = list(/datum/reagent/drink/milk/soymilk = 4, /datum/reagent/acid = 1) result_amount = 5 /datum/chemical_reaction/ketchup name = "Ketchup" id = "ketchup" - result = "ketchup" - required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1) + result = /datum/reagent/nutriment/ketchup + required_reagents = list(/datum/reagent/drink/tomatojuice = 2, /datum/reagent/water = 1, /datum/reagent/sugar = 1) result_amount = 4 /datum/chemical_reaction/barbecue name = "Barbecue Sauce" id = "barbecue" - result = "barbecue" - required_reagents = list("ketchup" = 2, "garlicsauce" = 1, "sugar" = 1) + result = /datum/reagent/nutriment/barbecue + required_reagents = list(/datum/reagent/nutriment/ketchup = 2, /datum/reagent/nutriment/garlicsauce = 1, /datum/reagent/sugar = 1) result_amount = 4 /datum/chemical_reaction/garlicsauce name = "Garlic Sauce" id = "garlicsauce" - result = "garlicsauce" - required_reagents = list("garlicjuice" = 1, "cornoil" = 1) + result = /datum/reagent/nutriment/garlicsauce + required_reagents = list(/datum/reagent/drink/garlicjuice = 1, /datum/reagent/nutriment/triglyceride/oil/corn = 1) result_amount = 2 /datum/chemical_reaction/cheesewheel name = "Cheesewheel" id = "cheesewheel" result = null - required_reagents = list("milk" = 40) - catalysts = list("enzyme" = 5) + required_reagents = list(/datum/reagent/drink/milk = 40) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 1 /datum/chemical_reaction/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -1759,7 +1753,7 @@ name = "Meatball" id = "meatball" result = null - required_reagents = list("protein" = 3, "flour" = 5) + required_reagents = list(/datum/reagent/nutriment/protein = 3, /datum/reagent/nutriment/flour = 5) result_amount = 3 /datum/chemical_reaction/meatball/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -1772,8 +1766,8 @@ name = "Dough" id = "dough" result = null - required_reagents = list("egg" = 3, "flour" = 10) - inhibitors = list("water" = 1, "beer" = 1) //To prevent it messing with batter recipes + required_reagents = list(/datum/reagent/nutriment/protein/egg = 3, /datum/reagent/nutriment/flour = 10) + inhibitors = list(/datum/reagent/water = 1, /datum/reagent/alcohol/ethanol/beer = 1) //To prevent it messing with batter recipes result_amount = 1 /datum/chemical_reaction/dough/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -1786,7 +1780,7 @@ name = "Syntiflesh" id = "syntiflesh" result = null - required_reagents = list("blood" = 5, "clonexadone" = 1) + required_reagents = list(/datum/reagent/blood = 5, /datum/reagent/clonexadone = 1) result_amount = 1 /datum/chemical_reaction/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -1798,43 +1792,43 @@ /datum/chemical_reaction/hot_ramen name = "Hot Ramen" id = "hot_ramen" - result = "hot_ramen" - required_reagents = list("water" = 1, "dry_ramen" = 3) + result = /datum/reagent/drink/hot_ramen + required_reagents = list(/datum/reagent/water = 1, /datum/reagent/drink/dry_ramen = 3) result_amount = 3 /datum/chemical_reaction/hell_ramen name = "Hell Ramen" id = "hell_ramen" - result = "hell_ramen" - required_reagents = list("capsaicin" = 1, "hot_ramen" = 6) + result = /datum/reagent/drink/hell_ramen + required_reagents = list(/datum/reagent/capsaicin = 1, /datum/reagent/drink/hot_ramen = 6) result_amount = 6 /datum/chemical_reaction/coating/batter name = "Batter" id = "batter" - result = "batter" - required_reagents = list("egg" = 3, "flour" = 10, "water" = 5, "sodiumchloride" = 2) + result = /datum/reagent/nutriment/coating/batter + required_reagents = list(/datum/reagent/nutriment/protein/egg = 3, /datum/reagent/nutriment/flour = 10, /datum/reagent/water = 5, /datum/reagent/sodiumchloride = 2) result_amount = 20 /datum/chemical_reaction/coating/beerbatter name = "Beer Batter" id = "beerbatter" - result = "beerbatter" - required_reagents = list("egg" = 3, "flour" = 10, "beer" = 5, "sodiumchloride" = 2) + result = /datum/reagent/nutriment/coating/beerbatter + required_reagents = list(/datum/reagent/nutriment/protein/egg = 3, /datum/reagent/nutriment/flour = 10, /datum/reagent/alcohol/ethanol/beer = 5, /datum/reagent/sodiumchloride = 2) result_amount = 20 /datum/chemical_reaction/browniemix name = "Brownie Mix" id = "browniemix" - result = "browniemix" - required_reagents = list("flour" = 5, "coco" = 5, "sugar" = 5) + result = /datum/reagent/browniemix + required_reagents = list(/datum/reagent/nutriment/flour = 5, /datum/reagent/nutriment/coco = 5, /datum/reagent/sugar = 5) result_amount = 15 /datum/chemical_reaction/butter name = "Butter" id = "butter" result = null - required_reagents = list("cream" = 20, "sodiumchloride" = 1) + required_reagents = list(/datum/reagent/drink/milk/cream = 20, /datum/reagent/sodiumchloride = 1) result_amount = 1 /datum/chemical_reaction/butter/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -1871,8 +1865,8 @@ /datum/chemical_reaction/drink name = "Goldschlager" id = "goldschlager" - result = "goldschlager" - required_reagents = list("vodka" = 10, MATERIAL_GOLD = 1) + result = /datum/reagent/alcohol/ethanol/goldschlager + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 10, /datum/reagent/gold = 1) mix_message = null reaction_sound = 'sound/effects/pour.ogg' result_amount = 10 @@ -1880,735 +1874,735 @@ /datum/chemical_reaction/drink/patron name = "Patron" id = "patron" - result = "patron" - required_reagents = list("tequilla" = 10, MATERIAL_SILVER = 1) + result = /datum/reagent/alcohol/ethanol/patron + required_reagents = list(/datum/reagent/alcohol/ethanol/tequila = 10, /datum/reagent/silver = 1) result_amount = 10 /datum/chemical_reaction/drink/bilk name = "Bilk" id = "bilk" - result = "bilk" - required_reagents = list("milk" = 1, "beer" = 1) + result = /datum/reagent/alcohol/ethanol/bilk + required_reagents = list(/datum/reagent/drink/milk = 1, /datum/reagent/alcohol/ethanol/beer = 1) result_amount = 2 /datum/chemical_reaction/drink/icetea name = "Iced Tea" id = "icetea" - result = "icetea" - required_reagents = list("ice" = 1, "tea" = 2) + result = /datum/reagent/drink/icetea + required_reagents = list(/datum/reagent/drink/ice = 1, /datum/reagent/drink/tea = 2) result_amount = 3 /datum/chemical_reaction/drink/icecoffee name = "Iced Coffee" id = "icecoffee" - result = "icecoffee" - required_reagents = list("ice" = 1, "coffee" = 2) + result = /datum/reagent/drink/coffee/icecoffee + required_reagents = list(/datum/reagent/drink/ice = 1, /datum/reagent/drink/coffee = 2) result_amount = 3 /datum/chemical_reaction/drink/nuka_cola name = "Nuka Cola" id = "nuka_cola" - result = "nuka_cola" - required_reagents = list("uranium" = 1, "cola" = 5) + result = /datum/reagent/drink/nuka_cola + required_reagents = list(/datum/reagent/uranium = 1, /datum/reagent/drink/space_cola = 5) result_amount = 5 /datum/chemical_reaction/moonshine name = "Moonshine" id = "moonshine" - result = "moonshine" - required_reagents = list("nutriment" = 10) - catalysts = list("enzyme" = 5) + result = /datum/reagent/alcohol/ethanol/moonshine + required_reagents = list(/datum/reagent/nutriment = 10) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 10 /datum/chemical_reaction/butanol name = "Butanol" id = "butanol" - result = "butanol" - required_reagents = list("cornoil" = 10, "sugar" = 10) - catalysts = list("enzyme" = 5) + result = /datum/reagent/alcohol/butanol + required_reagents = list(/datum/reagent/nutriment/triglyceride/oil/corn = 10, /datum/reagent/sugar = 10) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 5 /datum/chemical_reaction/grenadine name = "Grenadine Syrup" id = "grenadine" - result = "grenadine" - required_reagents = list("berryjuice" = 10) - catalysts = list("enzyme" = 5) + result = /datum/reagent/drink/grenadine + required_reagents = list(/datum/reagent/drink/berryjuice = 10) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 10 /datum/chemical_reaction/wine name = "Wine" id = "wine" - result = "wine" - required_reagents = list("grapejuice" = 10) - catalysts = list("enzyme" = 5) + result = /datum/reagent/alcohol/ethanol/wine + required_reagents = list(/datum/reagent/drink/grapejuice = 10) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 10 /datum/chemical_reaction/pwine name = "Poison Wine" id = "pwine" - result = "pwine" - required_reagents = list("poisonberryjuice" = 10) - catalysts = list("enzyme" = 5) + result = /datum/reagent/alcohol/ethanol/pwine + required_reagents = list(/datum/reagent/toxin/poisonberryjuice = 10) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 10 /datum/chemical_reaction/melonliquor name = "Melon Liquor" id = "melonliquor" - result = "melonliquor" - required_reagents = list("watermelonjuice" = 10) - catalysts = list("enzyme" = 5) + result = /datum/reagent/alcohol/ethanol/melonliquor + required_reagents = list(/datum/reagent/drink/watermelonjuice = 10) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 10 /datum/chemical_reaction/bluecuracao name = "Blue Curacao" id = "bluecuracao" - result = "bluecuracao" - required_reagents = list("orangejuice" = 10) - catalysts = list("enzyme" = 5) + result = /datum/reagent/alcohol/ethanol/bluecuracao + required_reagents = list(/datum/reagent/drink/orangejuice = 10) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 10 /datum/chemical_reaction/spacebeer name = "Space Beer" id = "spacebeer" - result = "beer" - required_reagents = list("cornoil" = 10) - catalysts = list("enzyme" = 5) + result = /datum/reagent/alcohol/ethanol/beer + required_reagents = list(/datum/reagent/nutriment/triglyceride/oil/corn = 10) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 10 /datum/chemical_reaction/vodka name = "Vodka" id = "vodka" - result = "vodka" - required_reagents = list("potato" = 10) - catalysts = list("enzyme" = 5) + result = /datum/reagent/alcohol/ethanol/vodka + required_reagents = list(/datum/reagent/drink/potatojuice = 10) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 10 /datum/chemical_reaction/sake name = "Sake" id = "sake" - result = "sake" - required_reagents = list("rice" = 10) - catalysts = list("enzyme" = 5) + result = /datum/reagent/alcohol/ethanol/sake + required_reagents = list(/datum/reagent/nutriment/rice = 10) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 10 /datum/chemical_reaction/kahlua name = "Kahlua" id = "kahlua" - result = "kahlua" - required_reagents = list("coffee" = 5, "sugar" = 5) - catalysts = list("enzyme" = 5) + result = /datum/reagent/alcohol/ethanol/coffee/kahlua + required_reagents = list(/datum/reagent/drink/coffee = 5, /datum/reagent/sugar = 5) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 5 /datum/chemical_reaction/drink/gin_tonic name = "Gin and Tonic" id = "gintonic" - result = "gintonic" - required_reagents = list("gin" = 2, "tonic" = 1) + result = /datum/reagent/alcohol/ethanol/gintonic + required_reagents = list(/datum/reagent/alcohol/ethanol/gin = 2, /datum/reagent/drink/tonic = 1) result_amount = 3 /datum/chemical_reaction/drink/cuba_libre name = "Cuba Libre" id = "cubalibre" - result = "cubalibre" - required_reagents = list("rum" = 2, "cola" = 1) + result = /datum/reagent/alcohol/ethanol/cubalibre + required_reagents = list(/datum/reagent/alcohol/ethanol/rum = 2, /datum/reagent/drink/space_cola = 1) result_amount = 3 /datum/chemical_reaction/drink/martini name = "Classic Martini" id = "martini" - result = "martini" - required_reagents = list("gin" = 2, "vermouth" = 1) + result = /datum/reagent/alcohol/ethanol/martini + required_reagents = list(/datum/reagent/alcohol/ethanol/gin = 2, /datum/reagent/alcohol/ethanol/vermouth = 1) result_amount = 3 /datum/chemical_reaction/drink/vodkamartini name = "Vodka Martini" id = "vodkamartini" - result = "vodkamartini" - required_reagents = list("vodka" = 2, "vermouth" = 1) + result = /datum/reagent/alcohol/ethanol/vodkamartini + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 2, /datum/reagent/alcohol/ethanol/vermouth = 1) result_amount = 3 /datum/chemical_reaction/drink/white_russian name = "White Russian" id = "whiterussian" - result = "whiterussian" - required_reagents = list("blackrussian" = 2, "cream" = 1) + result = /datum/reagent/alcohol/ethanol/white_russian + required_reagents = list(/datum/reagent/alcohol/ethanol/blackrussian = 2, /datum/reagent/drink/milk/cream = 1) result_amount = 3 /datum/chemical_reaction/drink/whiskey_cola name = "Whiskey Cola" id = "whiskeycola" - result = "whiskeycola" - required_reagents = list("whiskey" = 2, "cola" = 1) + result = /datum/reagent/alcohol/ethanol/whiskeycola + required_reagents = list(/datum/reagent/alcohol/ethanol/whiskey = 2, /datum/reagent/drink/space_cola = 1) result_amount = 3 /datum/chemical_reaction/drink/screwdriver name = "Screwdriver" id = "screwdrivercocktail" - result = "screwdrivercocktail" - required_reagents = list("vodka" = 2, "orangejuice" = 1) + result = /datum/reagent/alcohol/ethanol/screwdrivercocktail + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 2, /datum/reagent/drink/orangejuice = 1) result_amount = 3 /datum/chemical_reaction/drink/bloody_mary name = "Bloody Mary" id = "bloodymary" - result = "bloodymary" - required_reagents = list("vodka" = 2, "tomatojuice" = 3, "limejuice" = 1) + result = /datum/reagent/alcohol/ethanol/bloodymary + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 2, /datum/reagent/drink/tomatojuice = 3, /datum/reagent/drink/limejuice = 1) result_amount = 6 /datum/chemical_reaction/drink/gargle_blaster name = "Pan-Galactic Gargle Blaster" id = "gargleblaster" - result = "gargleblaster" - required_reagents = list("vodka" = 2, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1) + result = /datum/reagent/alcohol/ethanol/gargleblaster + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 2, /datum/reagent/alcohol/ethanol/gin = 1, /datum/reagent/alcohol/ethanol/whiskey = 1, /datum/reagent/alcohol/ethanol/cognac = 1, /datum/reagent/drink/limejuice = 1) result_amount = 6 /datum/chemical_reaction/drink/brave_bull name = "Brave Bull" id = "bravebull" - result = "bravebull" - required_reagents = list("tequilla" = 2, "kahlua" = 1) + result = /datum/reagent/alcohol/ethanol/coffee/brave_bull + required_reagents = list(/datum/reagent/alcohol/ethanol/tequila = 2, /datum/reagent/alcohol/ethanol/coffee/kahlua = 1) result_amount = 3 -/datum/chemical_reaction/drink/tequilla_sunrise - name = "Tequilla Sunrise" - id = "tequillasunrise" - result = "tequillasunrise" - required_reagents = list("tequilla" = 2, "orangejuice" = 1) +/datum/chemical_reaction/drink/tequila_sunrise + name = "Tequila Sunrise" + id = "tequilasunrise" + result = /datum/reagent/alcohol/ethanol/tequila_sunrise + required_reagents = list(/datum/reagent/alcohol/ethanol/tequila = 2, /datum/reagent/drink/orangejuice = 1) result_amount = 3 /datum/chemical_reaction/drink/phoron_special name = "Toxins Special" id = "phoronspecial" - result = "phoronspecial" - required_reagents = list("rum" = 2, "vermouth" = 2, "phoron" = 2) + result = /datum/reagent/alcohol/ethanol/toxins_special + required_reagents = list(/datum/reagent/alcohol/ethanol/rum = 2, /datum/reagent/alcohol/ethanol/vermouth = 2, /datum/reagent/toxin/phoron = 2) result_amount = 6 /datum/chemical_reaction/drink/beepsky_smash name = "Beepksy Smash" id = "beepksysmash" - result = "beepskysmash" - required_reagents = list("limejuice" = 1, "whiskey" = 1, "iron" = 1) + result = /datum/reagent/alcohol/ethanol/beepskysmash + required_reagents = list(/datum/reagent/drink/limejuice = 1, /datum/reagent/alcohol/ethanol/whiskey = 1, /datum/reagent/iron = 1) result_amount = 2 /datum/chemical_reaction/drink/doctor_delight name = "The Doctor's Delight" id = "doctordelight" - result = "doctorsdelight" - required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 2, "tricordrazine" = 1) + result = /datum/reagent/drink/doctorsdelight + required_reagents = list(/datum/reagent/drink/limejuice = 1, /datum/reagent/drink/tomatojuice = 1, /datum/reagent/drink/orangejuice = 1, /datum/reagent/drink/milk/cream = 2, /datum/reagent/tricordrazine = 1) result_amount = 6 /datum/chemical_reaction/drink/irish_cream name = "Irish Cream" id = "irishcream" - result = "irishcream" - required_reagents = list("whiskey" = 2, "cream" = 1) + result = /datum/reagent/alcohol/ethanol/irishcream + required_reagents = list(/datum/reagent/alcohol/ethanol/whiskey = 2, /datum/reagent/drink/milk/cream = 1) result_amount = 3 /datum/chemical_reaction/drink/manly_dorf name = "The Manly Dorf" id = "manlydorf" - result = "manlydorf" - required_reagents = list ("beer" = 1, "ale" = 2) + result = /datum/reagent/alcohol/ethanol/manly_dorf + required_reagents = list (/datum/reagent/alcohol/ethanol/beer = 1, /datum/reagent/alcohol/ethanol/ale = 2) result_amount = 3 /datum/chemical_reaction/drink/hooch name = "Hooch" id = "hooch" - result = "hooch" - required_reagents = list ("sugar" = 1, "moonshine" = 1, "fuel" = 1) + result = /datum/reagent/alcohol/ethanol/hooch + required_reagents = list (/datum/reagent/sugar = 1, /datum/reagent/alcohol/ethanol/moonshine = 1, /datum/reagent/fuel = 1) result_amount = 3 /datum/chemical_reaction/drink/irish_coffee name = "Irish Coffee" id = "irishcoffee" - result = "irishcoffee" - required_reagents = list("irishcream" = 1, "coffee" = 1) + result = /datum/reagent/alcohol/ethanol/coffee/irishcoffee + required_reagents = list(/datum/reagent/alcohol/ethanol/irishcream = 1, /datum/reagent/drink/coffee = 1) result_amount = 2 /datum/chemical_reaction/drink/b52 name = "B-52" id = "b52" - result = "b52" - required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1) + result = /datum/reagent/alcohol/ethanol/coffee/b52 + required_reagents = list(/datum/reagent/alcohol/ethanol/irishcream = 1, /datum/reagent/alcohol/ethanol/coffee/kahlua = 1, /datum/reagent/alcohol/ethanol/cognac = 1) result_amount = 3 /datum/chemical_reaction/drink/atomicbomb name = "Atomic Bomb" id = "atomicbomb" - result = "atomicbomb" - required_reagents = list("b52" = 10, "uranium" = 1) + result = /datum/reagent/alcohol/ethanol/atomicbomb + required_reagents = list(/datum/reagent/alcohol/ethanol/coffee/b52 = 10, /datum/reagent/uranium = 1) result_amount = 10 /datum/chemical_reaction/drink/margarita name = "Margarita" id = "margarita" - result = "margarita" - required_reagents = list("tequilla" = 2, "limejuice" = 1) + result = /datum/reagent/alcohol/ethanol/margarita + required_reagents = list(/datum/reagent/alcohol/ethanol/tequila = 2, /datum/reagent/drink/limejuice = 1) result_amount = 3 /datum/chemical_reaction/drink/longislandicedtea name = "Long Island Iced Tea" id = "longislandicedtea" - result = "longislandicedtea" - required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 3) + result = /datum/reagent/alcohol/ethanol/longislandicedtea + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 1, /datum/reagent/alcohol/ethanol/gin = 1, /datum/reagent/alcohol/ethanol/tequila = 1, /datum/reagent/alcohol/ethanol/cubalibre = 3) result_amount = 6 /datum/chemical_reaction/drink/icedtea name = "Long Island Iced Tea" id = "longislandicedtea" - result = "longislandicedtea" - required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 3) + result = /datum/reagent/alcohol/ethanol/longislandicedtea + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 1, /datum/reagent/alcohol/ethanol/gin = 1, /datum/reagent/alcohol/ethanol/tequila = 1, /datum/reagent/alcohol/ethanol/cubalibre = 3) result_amount = 6 /datum/chemical_reaction/drink/threemileisland name = "Three Mile Island Iced Tea" id = "threemileisland" - result = "threemileisland" - required_reagents = list("longislandicedtea" = 10, "uranium" = 1) + result = /datum/reagent/alcohol/ethanol/threemileisland + required_reagents = list(/datum/reagent/alcohol/ethanol/longislandicedtea = 10, /datum/reagent/uranium = 1) result_amount = 10 /datum/chemical_reaction/drink/whiskeysoda name = "Whiskey Soda" id = "whiskeysoda" - result = "whiskeysoda" - required_reagents = list("whiskey" = 2, "sodawater" = 1) + result = /datum/reagent/alcohol/ethanol/whiskeysoda + required_reagents = list(/datum/reagent/alcohol/ethanol/whiskey = 2, /datum/reagent/drink/sodawater = 1) result_amount = 3 /datum/chemical_reaction/drink/black_russian name = "Black Russian" id = "blackrussian" - result = "blackrussian" - required_reagents = list("vodka" = 2, "kahlua" = 1) + result = /datum/reagent/alcohol/ethanol/blackrussian + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 2, /datum/reagent/alcohol/ethanol/coffee/kahlua = 1) result_amount = 3 /datum/chemical_reaction/drink/manhattan name = "Manhattan" id = "manhattan" - result = "manhattan" - required_reagents = list("whiskey" = 2, "vermouth" = 1) + result = /datum/reagent/alcohol/ethanol/manhattan + required_reagents = list(/datum/reagent/alcohol/ethanol/whiskey = 2, /datum/reagent/alcohol/ethanol/vermouth = 1) result_amount = 3 /datum/chemical_reaction/drink/manhattan_proj name = "Manhattan Project" id = "manhattan_proj" - result = "manhattan_proj" - required_reagents = list("manhattan" = 10, "uranium" = 1) + result = /datum/reagent/alcohol/ethanol/manhattan_proj + required_reagents = list(/datum/reagent/alcohol/ethanol/manhattan = 10, /datum/reagent/uranium = 1) result_amount = 10 /datum/chemical_reaction/drink/vodka_tonic name = "Vodka and Tonic" id = "vodkatonic" - result = "vodkatonic" - required_reagents = list("vodka" = 2, "tonic" = 1) + result = /datum/reagent/alcohol/ethanol/vodkatonic + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 2, /datum/reagent/drink/tonic = 1) result_amount = 3 /datum/chemical_reaction/drink/gin_fizz name = "Gin Fizz" id = "ginfizz" - result = "ginfizz" - required_reagents = list("gin" = 1, "sodawater" = 1, "limejuice" = 1) + result = /datum/reagent/alcohol/ethanol/ginfizz + required_reagents = list(/datum/reagent/alcohol/ethanol/gin = 1, /datum/reagent/drink/sodawater = 1, /datum/reagent/drink/limejuice = 1) result_amount = 3 /datum/chemical_reaction/drink/bahama_mama name = "Bahama mama" id = "bahama_mama" - result = "bahama_mama" - required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1) + result = /datum/reagent/alcohol/ethanol/bahama_mama + required_reagents = list(/datum/reagent/alcohol/ethanol/rum = 2, /datum/reagent/drink/orangejuice = 2, /datum/reagent/drink/limejuice = 1, /datum/reagent/drink/ice = 1) result_amount = 6 /datum/chemical_reaction/drink/singulo name = "Singulo" id = "singulo" - result = "singulo" - required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5) + result = /datum/reagent/alcohol/ethanol/singulo + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 5, /datum/reagent/radium = 1, /datum/reagent/alcohol/ethanol/wine = 5) result_amount = 10 /datum/chemical_reaction/drink/alliescocktail name = "Allies Cocktail" id = "alliescocktail" - result = "alliescocktail" - required_reagents = list("martini" = 1, "vodka" = 1) + result = /datum/reagent/alcohol/ethanol/alliescocktail + required_reagents = list(/datum/reagent/alcohol/ethanol/martini = 1, /datum/reagent/alcohol/ethanol/vodka = 1) result_amount = 2 /datum/chemical_reaction/drink/demonsblood name = "Demons Blood" id = "demonsblood" - result = "demonsblood" - required_reagents = list("rum" = 3, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1) + result = /datum/reagent/alcohol/ethanol/demonsblood + required_reagents = list(/datum/reagent/alcohol/ethanol/rum = 3, /datum/reagent/drink/spacemountainwind = 1, /datum/reagent/blood = 1, /datum/reagent/drink/dr_gibb = 1) result_amount = 6 /datum/chemical_reaction/drink/booger name = "Booger" id = "booger" - result = "booger" - required_reagents = list("cream" = 2, "banana" = 1, "rum" = 1, "watermelonjuice" = 1) + result = /datum/reagent/alcohol/ethanol/booger + required_reagents = list(/datum/reagent/drink/milk/cream = 2, /datum/reagent/drink/banana = 1, /datum/reagent/alcohol/ethanol/rum = 1, /datum/reagent/drink/watermelonjuice = 1) result_amount = 5 /datum/chemical_reaction/drink/antifreeze name = "Anti-freeze" id = "antifreeze" - result = "antifreeze" - required_reagents = list("vodka" = 1, "cream" = 1, "ice" = 1) + result = /datum/reagent/alcohol/ethanol/antifreeze + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 1, /datum/reagent/drink/milk/cream = 1, /datum/reagent/drink/ice = 1) result_amount = 3 /datum/chemical_reaction/drink/barefoot name = "Barefoot" id = "barefoot" - result = "barefoot" - required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1) + result = /datum/reagent/alcohol/ethanol/barefoot + required_reagents = list(/datum/reagent/drink/berryjuice = 1, /datum/reagent/drink/milk/cream = 1, /datum/reagent/alcohol/ethanol/vermouth = 1) result_amount = 3 /datum/chemical_reaction/drink/grapesoda name = "Grape Soda" id = "grapesoda" - result = "grapesoda" - required_reagents = list("grapejuice" = 2, "cola" = 1) + result = /datum/reagent/drink/grapesoda + required_reagents = list(/datum/reagent/drink/grapejuice = 2, /datum/reagent/drink/space_cola = 1) result_amount = 3 /datum/chemical_reaction/drink/sbiten name = "Sbiten" id = "sbiten" - result = "sbiten" - required_reagents = list("mead" = 10, "capsaicin" = 1) + result = /datum/reagent/alcohol/ethanol/sbiten + required_reagents = list(/datum/reagent/alcohol/ethanol/mead = 10, /datum/reagent/capsaicin = 1) result_amount = 10 /datum/chemical_reaction/drink/red_mead name = "Red Mead" id = "red_mead" - result = "red_mead" - required_reagents = list("blood" = 1, "mead" = 1) + result = /datum/reagent/alcohol/ethanol/red_mead + required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/alcohol/ethanol/mead = 1) result_amount = 2 /datum/chemical_reaction/drink/mead name = "Mead" id = "mead" - result = "mead" - required_reagents = list("sugar" = 1, "water" = 1) - catalysts = list("enzyme" = 5) + result = /datum/reagent/alcohol/ethanol/mead + required_reagents = list(/datum/reagent/sugar = 1, /datum/reagent/water = 1) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 2 /datum/chemical_reaction/drink/iced_beer name = "Iced Beer" - id = "iced_beer" - result = "iced_beer" - required_reagents = list("beer" = 10, "frostoil" = 1) + id = "frosted_beer" + result = /datum/reagent/alcohol/ethanol/iced_beer + required_reagents = list(/datum/reagent/alcohol/ethanol/beer = 10, /datum/reagent/frostoil = 1) result_amount = 10 /datum/chemical_reaction/drink/iced_beer2 name = "Iced Beer" id = "iced_beer" - result = "iced_beer" - required_reagents = list("beer" = 5, "ice" = 1) + result = /datum/reagent/alcohol/ethanol/iced_beer + required_reagents = list(/datum/reagent/alcohol/ethanol/beer = 5, /datum/reagent/drink/ice = 1) result_amount = 6 /datum/chemical_reaction/drink/grog name = "Grog" id = "grog" - result = "grog" - required_reagents = list("rum" = 1, "water" = 1) + result = /datum/reagent/alcohol/ethanol/grog + required_reagents = list(/datum/reagent/alcohol/ethanol/rum = 1, /datum/reagent/water = 1) result_amount = 2 /datum/chemical_reaction/drink/soy_latte name = "Soy Latte" id = "soy_latte" - result = "soy_latte" - required_reagents = list("coffee" = 1, "soymilk" = 1) + result = /datum/reagent/drink/coffee/soy_latte + required_reagents = list(/datum/reagent/drink/coffee = 1, /datum/reagent/drink/milk/soymilk = 1) result_amount = 2 /datum/chemical_reaction/drink/cafe_latte name = "Cafe Latte" id = "cafe_latte" - result = "cafe_latte" - required_reagents = list("coffee" = 1, "milk" = 1) + result = /datum/reagent/drink/coffee/cafe_latte + required_reagents = list(/datum/reagent/drink/coffee = 1, /datum/reagent/drink/milk = 1) result_amount = 2 /datum/chemical_reaction/drink/freddo_espresso name = "Freddo Espresso" id = "freddo_espresso" - result = "freddo_espresso" - required_reagents = list("espresso" = 1, "ice" = 1) + result = /datum/reagent/drink/coffee/freddo_espresso + required_reagents = list(/datum/reagent/drink/coffee/espresso = 1, /datum/reagent/drink/ice = 1) result_amount = 2 /datum/chemical_reaction/drink/caffe_americano name = "Caffe Americano" id = "caffe_americano" - result = "caffe_americano" - required_reagents = list("espresso" = 1, "water" = 1) + result = /datum/reagent/drink/coffee/caffe_americano + required_reagents = list(/datum/reagent/drink/coffee/espresso = 1, /datum/reagent/water = 1) result_amount = 2 /datum/chemical_reaction/drink/flat_white name = "Flat White" id = "flat_white" - result = "flat_white" - required_reagents = list("espresso" = 1, "milk" = 1) + result = /datum/reagent/drink/coffee/flat_white + required_reagents = list(/datum/reagent/drink/coffee/espresso = 1, /datum/reagent/drink/milk = 1) result_amount = 2 /datum/chemical_reaction/drink/latte name = "Latte" id = "latte" - result = "latte" - required_reagents = list("flat_white" = 1, "milk" = 1) + result = /datum/reagent/drink/coffee/latte + required_reagents = list(/datum/reagent/drink/coffee/flat_white = 1, /datum/reagent/drink/milk = 1) result_amount = 2 /datum/chemical_reaction/drink/cappuccino name = "Cappuccino" id = "cappuccino" - result = "cappuccino" - required_reagents = list("espresso" = 1, "cream" = 1) + result = /datum/reagent/drink/coffee/cappuccino + required_reagents = list(/datum/reagent/drink/coffee/espresso = 1, /datum/reagent/drink/milk/cream = 1) result_amount = 2 /datum/chemical_reaction/drink/freddo_cappuccino name = "Freddo cappuccino" id = "freddo_cappuccino" - result = "freddo_cappuccino" - required_reagents = list("cappuccino" = 1, "ice" = 1) + result = /datum/reagent/drink/coffee/freddo_cappuccino + required_reagents = list(/datum/reagent/drink/coffee/cappuccino = 1, /datum/reagent/drink/ice = 1) result_amount = 2 /datum/chemical_reaction/drink/macchiato name = "Macchiato" id = "macchiato" - result = "macchiato" - required_reagents = list("cappuccino" = 1, "espresso" = 1) + result = /datum/reagent/drink/coffee/macchiato + required_reagents = list(/datum/reagent/drink/coffee/cappuccino = 1, /datum/reagent/drink/coffee/espresso = 1) result_amount = 2 /datum/chemical_reaction/drink/mocacchino name = "Mocacchino" id = "mocacchino" - result = "mocacchino" - required_reagents = list("flat_white" = 1, "coco" = 1) + result = /datum/reagent/drink/coffee/mocacchino + required_reagents = list(/datum/reagent/drink/coffee/flat_white = 1, /datum/reagent/nutriment/coco = 1) result_amount = 2 /datum/chemical_reaction/drink/acidspit name = "Acid Spit" id = "acidspit" - result = "acidspit" - required_reagents = list("sacid" = 1, "wine" = 5) + result = /datum/reagent/alcohol/ethanol/acid_spit + required_reagents = list(/datum/reagent/acid = 1, /datum/reagent/alcohol/ethanol/wine = 5) result_amount = 6 /datum/chemical_reaction/drink/amasec name = "Amasec" id = "amasec" - result = "amasec" - required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5) + result = /datum/reagent/alcohol/ethanol/amasec + required_reagents = list(/datum/reagent/iron = 1, /datum/reagent/alcohol/ethanol/wine = 5, /datum/reagent/alcohol/ethanol/vodka = 5) result_amount = 10 -/datum/chemical_reaction/drink/changelingsting - name = "Changeling Sting" - id = "changelingsting" - result = "changelingsting" - required_reagents = list("screwdrivercocktail" = 1, "limejuice" = 1, "lemonjuice" = 1) +/datum/chemical_reaction/drink/gibsonpunch + name = "Gibson Punch" + id = "gibsonpunch" + result = /datum/reagent/alcohol/ethanol/gibsonpunch + required_reagents = list(/datum/reagent/alcohol/ethanol/screwdrivercocktail = 1, /datum/reagent/drink/limejuice = 1, /datum/reagent/drink/lemonjuice = 1) result_amount = 3 /datum/chemical_reaction/drink/aloe name = "Aloe" id = "aloe" - result = "aloe" - required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1) + result = /datum/reagent/alcohol/ethanol/aloe + required_reagents = list(/datum/reagent/drink/milk/cream = 1, /datum/reagent/alcohol/ethanol/whiskey = 1, /datum/reagent/drink/watermelonjuice = 1) result_amount = 3 /datum/chemical_reaction/drink/andalusia name = "Andalusia" id = "andalusia" - result = "andalusia" - required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1) + result = /datum/reagent/alcohol/ethanol/andalusia + required_reagents = list(/datum/reagent/alcohol/ethanol/rum = 1, /datum/reagent/alcohol/ethanol/whiskey = 1, /datum/reagent/drink/lemonjuice = 1) result_amount = 3 /datum/chemical_reaction/drink/neurotoxin name = "Neurotoxin" id = "neurotoxin" - result = "neurotoxin" - required_reagents = list("gargleblaster" = 1, "stoxin" = 1) + result = /datum/reagent/alcohol/ethanol/neurotoxin + required_reagents = list(/datum/reagent/alcohol/ethanol/gargleblaster = 1, /datum/reagent/soporific = 1) result_amount = 2 /datum/chemical_reaction/drink/snowwhite name = "Snow White" id = "snowwhite" - result = "snowwhite" - required_reagents = list("beer" = 1, "lemon_lime" = 1) + result = /datum/reagent/alcohol/ethanol/snowwhite + required_reagents = list(/datum/reagent/alcohol/ethanol/beer = 1, /datum/reagent/drink/lemon_lime = 1) result_amount = 2 /datum/chemical_reaction/drink/irishcarbomb name = "Irish Car Bomb" id = "irishcarbomb" - result = "irishcarbomb" - required_reagents = list("ale" = 1, "irishcream" = 1) + result = /datum/reagent/alcohol/ethanol/irishcarbomb + required_reagents = list(/datum/reagent/alcohol/ethanol/ale = 1, /datum/reagent/alcohol/ethanol/irishcream = 1) result_amount = 2 -/datum/chemical_reaction/drink/syndicatebomb - name = "Syndicate Bomb" - id = "syndicatebomb" - result = "syndicatebomb" - required_reagents = list("beer" = 1, "whiskeycola" = 1) +/datum/chemical_reaction/drink/gibsonhooch + name = "Gibson Hooch" + id = "gibsonhooch" + result = /datum/reagent/alcohol/ethanol/gibsonhooch + required_reagents = list(/datum/reagent/alcohol/ethanol/beer = 1, /datum/reagent/alcohol/ethanol/whiskeycola = 1) result_amount = 2 /datum/chemical_reaction/drink/erikasurprise name = "Erika Surprise" id = "erikasurprise" - result = "erikasurprise" - required_reagents = list("ale" = 2, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1) + result = /datum/reagent/alcohol/ethanol/erikasurprise + required_reagents = list(/datum/reagent/alcohol/ethanol/ale = 2, /datum/reagent/drink/limejuice = 1, /datum/reagent/alcohol/ethanol/whiskey = 1, /datum/reagent/drink/banana = 1, /datum/reagent/drink/ice = 1) result_amount = 6 /datum/chemical_reaction/drink/devilskiss name = "Devils Kiss" id = "devilskiss" - result = "devilskiss" - required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1) + result = /datum/reagent/alcohol/ethanol/devilskiss + required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/alcohol/ethanol/coffee/kahlua = 1, /datum/reagent/alcohol/ethanol/rum = 1) result_amount = 3 /datum/chemical_reaction/drink/hippiesdelight name = "Hippies Delight" id = "hippiesdelight" - result = "hippiesdelight" - required_reagents = list("psilocybin" = 1, "gargleblaster" = 1) + result = /datum/reagent/alcohol/ethanol/hippiesdelight + required_reagents = list(/datum/reagent/psilocybin = 1, /datum/reagent/alcohol/ethanol/gargleblaster = 1) result_amount = 2 /datum/chemical_reaction/drink/bananahonk name = "Banana Honk" id = "bananahonk" - result = "bananahonk" - required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1) + result = /datum/reagent/alcohol/ethanol/bananahonk + required_reagents = list(/datum/reagent/drink/banana = 1, /datum/reagent/drink/milk/cream = 1, /datum/reagent/sugar = 1) result_amount = 3 /datum/chemical_reaction/drink/silencer name = "Silencer" id = "silencer" - result = "silencer" - required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1) + result = /datum/reagent/alcohol/ethanol/silencer + required_reagents = list(/datum/reagent/drink/nothing = 1, /datum/reagent/drink/milk/cream = 1, /datum/reagent/sugar = 1) result_amount = 3 /datum/chemical_reaction/drink/driestmartini name = "Driest Martini" id = "driestmartini" - result = "driestmartini" - required_reagents = list("nothing" = 1, "gin" = 1) + result = /datum/reagent/alcohol/ethanol/driestmartini + required_reagents = list(/datum/reagent/drink/nothing = 1, /datum/reagent/alcohol/ethanol/gin = 1) result_amount = 2 /datum/chemical_reaction/drink/lemonade name = "Lemonade" id = "lemonade" - result = "lemonade" - required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1) + result = /datum/reagent/drink/lemonade + required_reagents = list(/datum/reagent/drink/lemonjuice = 1, /datum/reagent/sugar = 1, /datum/reagent/water = 1) result_amount = 3 /datum/chemical_reaction/drink/lemonade/pink name = "Pink Lemonade" id = "pinklemonade" - result = "pinklemonade" - required_reagents = list("lemonade" = 8, "grenadine" = 2) + result = /datum/reagent/drink/lemonade/pink + required_reagents = list(/datum/reagent/drink/lemonade = 8, /datum/reagent/drink/grenadine = 2) result_amount = 10 /datum/chemical_reaction/drink/kiraspecial name = "Kira Special" id = "kiraspecial" - result = "kiraspecial" - required_reagents = list("orangejuice" = 1, "limejuice" = 1, "sodawater" = 1) + result = /datum/reagent/drink/kiraspecial + required_reagents = list(/datum/reagent/drink/orangejuice = 1, /datum/reagent/drink/limejuice = 1, /datum/reagent/drink/sodawater = 1) result_amount = 3 /datum/chemical_reaction/drink/brownstar name = "Brown Star" id = "brownstar" - result = "brownstar" - required_reagents = list("orangejuice" = 2, "cola" = 1) + result = /datum/reagent/drink/brownstar + required_reagents = list(/datum/reagent/drink/orangejuice = 2, /datum/reagent/drink/space_cola = 1) result_amount = 3 /datum/chemical_reaction/drink/milkshake name = "Milkshake" id = "milkshake" - result = "milkshake" - required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2) + result = /datum/reagent/drink/milkshake + required_reagents = list(/datum/reagent/drink/milk/cream = 1, /datum/reagent/drink/ice = 2, /datum/reagent/drink/milk = 2) result_amount = 5 /datum/chemical_reaction/drink/cmojito name = "Champagne Mojito" id = "cmojito" - result = "cmojito" - required_reagents = list("mintsyrup" = 1, "champagne" = 1, "rum" = 1) + result = /datum/reagent/alcohol/ethanol/cmojito + required_reagents = list(/datum/reagent/drink/mintsyrup = 1, /datum/reagent/alcohol/ethanol/champagne = 1, /datum/reagent/alcohol/ethanol/rum = 1) result_amount = 3 /datum/chemical_reaction/drink/classic name = "The Classic" id = "classic" - result = "classic" - required_reagents = list("champagne" = 2, "bitters" = 1, "lemonjuice" = 1) + result = /datum/reagent/alcohol/ethanol/classic + required_reagents = list(/datum/reagent/alcohol/ethanol/champagne = 2, /datum/reagent/alcohol/ethanol/bitters = 1, /datum/reagent/drink/lemonjuice = 1) result_amount = 4 /datum/chemical_reaction/drink/corkpopper name = "Cork Popper" id = "corkpopper" - result = "corkpopper" - required_reagents = list("whiskey" = 1, "champagne" = 1, "lemonjuice" = 1) + result = /datum/reagent/alcohol/ethanol/corkpopper + required_reagents = list(/datum/reagent/alcohol/ethanol/whiskey = 1, /datum/reagent/alcohol/ethanol/champagne = 1, /datum/reagent/drink/lemonjuice = 1) result_amount = 3 /datum/chemical_reaction/drink/french75 name = "French 75" id = "french75" - result = "french75" - required_reagents = list("champagne" = 2, "gin" = 1, "lemonjuice" = 1) + result = /datum/reagent/alcohol/ethanol/french75 + required_reagents = list(/datum/reagent/alcohol/ethanol/champagne = 2, /datum/reagent/alcohol/ethanol/gin = 1, /datum/reagent/drink/lemonjuice = 1) result_amount = 4 /datum/chemical_reaction/drink/muscmule name = "Muscovite Mule" id = "muscmule" - result = "muscmule" - required_reagents = list("vodka" = 1, "limejuice" = 1, "mintsyrup" = 1) + result = /datum/reagent/alcohol/ethanol/muscmule + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 1, /datum/reagent/drink/limejuice = 1, /datum/reagent/drink/mintsyrup = 1) result_amount = 3 /datum/chemical_reaction/drink/omimosa name = "Orange Mimosa" id = "omimosa" - result = "omimosa" - required_reagents = list("orangejuice" = 1, "champagne" = 1) + result = /datum/reagent/alcohol/ethanol/omimosa + required_reagents = list(/datum/reagent/drink/orangejuice = 1, /datum/reagent/alcohol/ethanol/champagne = 1) result_amount = 2 /datum/chemical_reaction/drink/pinkgin name = "Pink Gin" id = "pinkgin" - result = "pinkgin" - required_reagents = list("gin" = 2, "bitters" = 1) + result = /datum/reagent/alcohol/ethanol/pinkgin + required_reagents = list(/datum/reagent/alcohol/ethanol/gin = 2, /datum/reagent/alcohol/ethanol/bitters = 1) result_amount = 3 /datum/chemical_reaction/drink/pinkgintonic name = "Pink Gin and Tonic" id = "pinkgintonic" - result = "pinkgintonic" - required_reagents = list("pinkgin" = 2, "tonic" = 1) + result = /datum/reagent/alcohol/ethanol/pinkgintonic + required_reagents = list(/datum/reagent/alcohol/ethanol/pinkgin = 2, /datum/reagent/drink/tonic = 1) result_amount = 3 /datum/chemical_reaction/drink/piratepunch name = "Pirate's Punch" id = "piratepunch" - result = "piratepunch" - required_reagents = list("rum" = 1, "lemonjuice" = 1, "mintsyrup" = 1, "grenadine" = 1, "bitters" = 1) + result = /datum/reagent/alcohol/ethanol/piratepunch + required_reagents = list(/datum/reagent/alcohol/ethanol/rum = 1, /datum/reagent/drink/lemonjuice = 1, /datum/reagent/drink/mintsyrup = 1, /datum/reagent/drink/grenadine = 1, /datum/reagent/alcohol/ethanol/bitters = 1) result_amount = 5 /datum/chemical_reaction/drink/planterpunch name = "Planter's Punch" id = "planterpunch" - result = "planterpunch" - required_reagents = list("rum" = 2, "orangejuice" = 1, "grenadine" = 1) + result = /datum/reagent/alcohol/ethanol/planterpunch + required_reagents = list(/datum/reagent/alcohol/ethanol/rum = 2, /datum/reagent/drink/orangejuice = 1, /datum/reagent/drink/grenadine = 1) result_amount = 4 /datum/chemical_reaction/drink/ssroyale name = "Southside Royale" id = "ssroyale" - result = "ssroyale" - required_reagents = list("mintsyrup" = 1, "gin" = 1, "limejuice" = 1, "champagne" = 1) + result = /datum/reagent/alcohol/ethanol/ssroyale + required_reagents = list(/datum/reagent/drink/mintsyrup = 1, /datum/reagent/alcohol/ethanol/gin = 1, /datum/reagent/drink/limejuice = 1, /datum/reagent/alcohol/ethanol/champagne = 1) result_amount = 4 /datum/chemical_reaction/drink/rewriter name = "Rewriter" id = "rewriter" - result = "rewriter" - required_reagents = list("spacemountainwind" = 1, "coffee" = 1) + result = /datum/reagent/drink/rewriter + required_reagents = list(/datum/reagent/drink/spacemountainwind = 1, /datum/reagent/drink/coffee = 1) result_amount = 2 /datum/chemical_reaction/drink/suidream name = "Sui Dream" id = "suidream" - result = "suidream" - required_reagents = list("space_up" = 1, "bluecuracao" = 1, "melonliquor" = 1) + result = /datum/reagent/alcohol/ethanol/suidream + required_reagents = list(/datum/reagent/drink/spaceup = 1, /datum/reagent/alcohol/ethanol/bluecuracao = 1, /datum/reagent/alcohol/ethanol/melonliquor = 1) result_amount = 3 //aurora's drinks @@ -2616,149 +2610,149 @@ /datum/chemical_reaction/drink/daiquiri name = "Daiquiri" id = "daiquiri" - result = "daiquiri" - required_reagents = list("limejuice" = 1, "rum" = 1) + result = /datum/reagent/alcohol/ethanol/daiquiri + required_reagents = list(/datum/reagent/drink/limejuice = 1, /datum/reagent/alcohol/ethanol/rum = 1) result_amount = 2 /datum/chemical_reaction/drink/icepick name = "Ice Pick" id = "icepick" - result = "icepick" - required_reagents = list("icetea" = 1, "vodka" = 1) + result = /datum/reagent/alcohol/ethanol/icepick + required_reagents = list(/datum/reagent/drink/icetea = 1, /datum/reagent/alcohol/ethanol/vodka = 1) result_amount = 2 /datum/chemical_reaction/drink/poussecafe name = "Pousse-Cafe" id = "poussecafe" - result = "poussecafe" - required_reagents = list("brandy" = 1, "chartreusegreen" = 1, "chartreuseyellow" = 1, "cremewhite" = 1, "grenadine" = 1) + result = /datum/reagent/alcohol/ethanol/poussecafe + required_reagents = list(/datum/reagent/alcohol/ethanol/brandy = 1, /datum/reagent/alcohol/ethanol/chartreusegreen = 1, /datum/reagent/alcohol/ethanol/chartreuseyellow = 1, /datum/reagent/alcohol/ethanol/cremewhite = 1, /datum/reagent/drink/grenadine = 1) result_amount = 5 /datum/chemical_reaction/drink/mintjulep name = "Mint Julep" id = "mintjulep" - result = "mintjulep" - required_reagents = list("water" = 1, "whiskey" = 1, "ice" = 1) + result = /datum/reagent/alcohol/ethanol/mintjulep + required_reagents = list(/datum/reagent/water = 1, /datum/reagent/alcohol/ethanol/whiskey = 1, /datum/reagent/drink/ice = 1) result_amount = 2 /datum/chemical_reaction/drink/johncollins name = "John Collins" id = "johncollins" - result = "johncollins" - required_reagents = list("whiskeysoda" = 2, "lemonjuice" = 1, "grenadine" = 1, "ice" = 1) + result = /datum/reagent/alcohol/ethanol/johncollins + required_reagents = list(/datum/reagent/alcohol/ethanol/whiskeysoda = 2, /datum/reagent/drink/lemonjuice = 1, /datum/reagent/drink/grenadine = 1, /datum/reagent/drink/ice = 1) result_amount = 5 /datum/chemical_reaction/drink/gimlet name = "Gimlet" id = "gimlet" - result = "gimlet" - required_reagents = list("limejuice" = 1, "gin" = 1, "sodawater" = 1) + result = /datum/reagent/alcohol/ethanol/gimlet + required_reagents = list(/datum/reagent/drink/limejuice = 1, /datum/reagent/alcohol/ethanol/gin = 1, /datum/reagent/drink/grenadine = 1) result_amount = 3 /datum/chemical_reaction/drink/starsandstripes name = "Stars and Stripes" id = "starsandstripes" - result = "starsandstripes" - required_reagents = list("cream" = 1, "cremeyvette" = 1, "grenadine" = 1) + result = /datum/reagent/alcohol/ethanol/starsandstripes + required_reagents = list(/datum/reagent/drink/milk/cream = 1, /datum/reagent/alcohol/ethanol/cremeyvette = 1, /datum/reagent/drink/grenadine = 1) result_amount = 3 /datum/chemical_reaction/drink/metropolitan name = "Metropolitan" id = "metropolitan" - result = "metropolitan" - required_reagents = list("brandy" = 1, "vermouth" = 1, "grenadine" = 1) + result = /datum/reagent/alcohol/ethanol/metropolitan + required_reagents = list(/datum/reagent/alcohol/ethanol/brandy = 1, /datum/reagent/alcohol/ethanol/vermouth = 1, /datum/reagent/drink/grenadine = 1) result_amount = 3 /datum/chemical_reaction/drink/caruso name = "Caruso" id = "caruso" - result = "caruso" - required_reagents = list("martini" = 2, "cremewhite" = 1) + result = /datum/reagent/alcohol/ethanol/caruso + required_reagents = list(/datum/reagent/alcohol/ethanol/martini = 2, /datum/reagent/alcohol/ethanol/cremewhite = 1) result_amount = 3 /datum/chemical_reaction/drink/aprilshower name = "April Shower" id = "aprilshower" - result = "aprilshower" - required_reagents = list("brandy" = 1, "chartreuseyellow" = 1, "orangejuice" = 1) + result = /datum/reagent/alcohol/ethanol/aprilshower + required_reagents = list(/datum/reagent/alcohol/ethanol/brandy = 1, /datum/reagent/alcohol/ethanol/chartreuseyellow = 1, /datum/reagent/drink/orangejuice = 1) result_amount = 3 /datum/chemical_reaction/drink/carthusiansazerac name = "Carthusian Sazerac" id = "carthusiansazerac" - result = "carthusiansazerac" - required_reagents = list("whiskey" = 1, "chartreusegreen" = 1, "grenadine" = 1, "absinthe" = 1) + result = /datum/reagent/alcohol/ethanol/carthusiansazerac + required_reagents = list(/datum/reagent/alcohol/ethanol/whiskey = 1, /datum/reagent/alcohol/ethanol/chartreusegreen = 1, /datum/reagent/drink/grenadine = 1, /datum/reagent/alcohol/ethanol/absinthe = 1) result_amount = 4 /datum/chemical_reaction/drink/deweycocktail name = "Dewey Cocktail" id = "deweycocktail" - result = "deweycocktail" - required_reagents = list("cremeyvette" = 1, "gin" = 1, "grenadine" = 1) + result = /datum/reagent/alcohol/ethanol/deweycocktail + required_reagents = list(/datum/reagent/alcohol/ethanol/cremeyvette = 1, /datum/reagent/alcohol/ethanol/gin = 1, /datum/reagent/drink/grenadine = 1) result_amount = 3 /datum/chemical_reaction/drink/rustynail name = "Rusty Nail" id = "rustynail" - result = "rustynail" - required_reagents = list("whiskey" = 1, "drambuie" = 1) + result = /datum/reagent/alcohol/ethanol/rustynail + required_reagents = list(/datum/reagent/alcohol/ethanol/whiskey = 1, /datum/reagent/alcohol/ethanol/drambuie = 1) result_amount = 2 /datum/chemical_reaction/drink/oldfashioned name = "Old Fashioned" id = "oldfashioned" - result = "oldfashioned" - required_reagents = list("whiskeysoda" = 3, "bitters" = 1, "sugar" = 1) + result = /datum/reagent/alcohol/ethanol/oldfashioned + required_reagents = list(/datum/reagent/alcohol/ethanol/whiskeysoda = 3, /datum/reagent/alcohol/ethanol/bitters = 1, /datum/reagent/sugar = 1) result_amount = 5 /datum/chemical_reaction/drink/blindrussian name = "Blind Russian" id = "blindrussian" - result = "blindrussian" - required_reagents = list("kahlua" = 1, "irishcream" = 1, "cream" = 1) + result = /datum/reagent/alcohol/ethanol/blindrussian + required_reagents = list(/datum/reagent/alcohol/ethanol/coffee/kahlua = 1, /datum/reagent/alcohol/ethanol/irishcream = 1, /datum/reagent/drink/milk/cream = 1) result_amount = 3 /datum/chemical_reaction/drink/tallrussian name = "Tall Black Russian" id = "tallrussian" - result = "tallrussian" - required_reagents = list("blackrussian" = 1, "cola" = 1) + result = /datum/reagent/alcohol/ethanol/tallrussian + required_reagents = list(/datum/reagent/alcohol/ethanol/blackrussian = 1, /datum/reagent/drink/space_cola = 1) result_amount = 2 /datum/chemical_reaction/drink/cold_gate name = "Cold Gate" id = "cold_gate" - result = "cold_gate" + result = /datum/reagent/drink/toothpaste/cold_gate result_amount = 3 - required_reagents = list("mintsyrup" = 1, "ice" = 1, "toothpaste" = 1) + required_reagents = list(/datum/reagent/drink/mintsyrup = 1, /datum/reagent/drink/ice = 1, /datum/reagent/drink/toothpaste = 1) /datum/chemical_reaction/drink/waterfresh name = "Waterfresh" id = "waterfresh" - result = "waterfresh" + result = /datum/reagent/drink/toothpaste/waterfresh result_amount = 3 - required_reagents = list("tonic" = 1, "sodawater" = 1, "toothpaste" = 1) + required_reagents = list(/datum/reagent/drink/tonic = 1, /datum/reagent/drink/sodawater = 1, /datum/reagent/drink/toothpaste = 1) /datum/chemical_reaction/drink/sedantian_firestorm name = "Sedantian Firestorm" id = "sedantian_firestorm" - result = "sedantian_firestorm" + result = /datum/reagent/drink/toothpaste/sedantian_firestorm result_amount = 2 - required_reagents = list("phoron" = 1, "toothpaste" = 1) + required_reagents = list(/datum/reagent/toxin/phoron = 1, /datum/reagent/drink/toothpaste = 1) /datum/chemical_reaction/drink/kois_odyne name = "Kois Odyne" id = "kois_odyne" - result = "kois_odyne" + result = /datum/reagent/drink/toothpaste/kois_odyne result_amount = 3 - required_reagents = list("tonic" = 1, "koispaste" = 1, "toothpaste" = 1) + required_reagents = list(/datum/reagent/drink/tonic = 1, /datum/reagent/kois = 1, /datum/reagent/drink/toothpaste = 1) /datum/chemical_reaction/adhomai_milk name = "Fermented Fatshouters Milk" id = "adhomai_milk" - result = "adhomai_milk" - required_reagents = list("fatshouter_milk" = 1) - catalysts = list("enzyme" = 5) + result = /datum/reagent/drink/milk/adhomai/fermented + required_reagents = list(/datum/reagent/drink/milk/adhomai = 1) + catalysts = list(/datum/reagent/enzyme = 5) result_amount = 1 // Synnono Meme Drinks @@ -2768,184 +2762,184 @@ /datum/chemical_reaction/drink/badtouch name = "Bad Touch" id = "badtouch" - result = "badtouch" - required_reagents = list("vodka" = 2, "rum" = 2, "absinthe" = 1, "lemon_lime" = 1) + result = /datum/reagent/alcohol/ethanol/badtouch + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 2, /datum/reagent/alcohol/ethanol/rum = 2, /datum/reagent/alcohol/ethanol/absinthe = 1, /datum/reagent/drink/lemon_lime = 1) result_amount = 6 /datum/chemical_reaction/drink/bluelagoon name = "Blue Lagoon" id = "bluelagooon" - result = "bluelagoon" - required_reagents = list("lemonade" = 3, "vodka" = 1, "bluecuracao" = 1, "ice" = 1) + result = /datum/reagent/alcohol/ethanol/bluelagoon + required_reagents = list(/datum/reagent/drink/lemonade = 3, /datum/reagent/alcohol/ethanol/vodka = 1, /datum/reagent/alcohol/ethanol/bluecuracao = 1, /datum/reagent/drink/ice = 1) result_amount = 6 /datum/chemical_reaction/cherrytreefireball name = "Cherry Tree Fireball" id = "cherrytreefireball" - result = "cherrytreefireball" - required_reagents = list("lemonade" = 3, "fireball" = 1, "cherryjelly" = 1, "ice" = 1) + result = /datum/reagent/alcohol/ethanol/cherrytreefireball + required_reagents = list(/datum/reagent/drink/lemonade = 3, /datum/reagent/alcohol/ethanol/fireball = 1, /datum/reagent/nutriment/cherryjelly = 1, /datum/reagent/drink/ice = 1) result_amount = 6 /datum/chemical_reaction/drink/cobaltvelvet name = "Cobalt Velvet" id = "cobaltvelvet" - result = "cobaltvelvet" - required_reagents = list("champagne" = 3, "bluecuracao" = 2, "cola" = 1) + result = /datum/reagent/alcohol/ethanol/cobaltvelvet + required_reagents = list(/datum/reagent/alcohol/ethanol/champagne = 3, /datum/reagent/alcohol/ethanol/bluecuracao = 2, /datum/reagent/drink/space_cola = 1) result_amount = 6 /datum/chemical_reaction/drink/fringeweaver name = "Fringe Weaver" id = "fringeweaver" - result = "fringeweaver" - required_reagents = list("ethanol" = 2, "sugar" = 1) + result = /datum/reagent/alcohol/ethanol/fringeweaver + required_reagents = list(/datum/reagent/alcohol/ethanol = 2, /datum/reagent/sugar = 1) result_amount = 3 /datum/chemical_reaction/drink/junglejuice name = "Jungle Juice" id = "junglejuice" - result = "junglejuice" - required_reagents = list("lemonjuice" = 1, "orangejuice" = 1, "lemon_lime" = 1, "vodka" = 1, "rum" = 1) + result = /datum/reagent/alcohol/ethanol/junglejuice + required_reagents = list(/datum/reagent/drink/lemonjuice = 1, /datum/reagent/drink/orangejuice = 1, /datum/reagent/drink/lemon_lime = 1, /datum/reagent/alcohol/ethanol/vodka = 1, /datum/reagent/alcohol/ethanol/rum = 1) result_amount = 5 /datum/chemical_reaction/drink/marsarita name = "Marsarita" id = "marsarita" - result = "marsarita" - required_reagents = list("margarita" = 4, "bluecuracao" = 1, "capsaicin" = 1) + result = /datum/reagent/alcohol/ethanol/marsarita + required_reagents = list(/datum/reagent/alcohol/ethanol/margarita = 4, /datum/reagent/alcohol/ethanol/bluecuracao = 1, /datum/reagent/capsaicin = 1) result_amount = 6 /datum/chemical_reaction/drink/meloncooler name = "Melon Cooler" id = "meloncooler" - result = "meloncooler" - required_reagents = list("watermelonjuice" = 2, "sodawater" = 2, "mintsyrup" = 1, "ice" = 1) + result = /datum/reagent/drink/meloncooler + required_reagents = list(/datum/reagent/drink/watermelonjuice = 2, /datum/reagent/drink/sodawater = 2, /datum/reagent/drink/mintsyrup = 1, /datum/reagent/drink/ice = 1) result_amount = 6 /datum/chemical_reaction/drink/midnightkiss name = "Midnight Kiss" id = "midnightkiss" - result = "midnightkiss" - required_reagents = list("champagne" = 3, "vodka" = 1, "bluecuracao" = 1) + result = /datum/reagent/alcohol/ethanol/midnightkiss + required_reagents = list(/datum/reagent/alcohol/ethanol/champagne = 3, /datum/reagent/alcohol/ethanol/vodka = 1, /datum/reagent/alcohol/ethanol/bluecuracao = 1) result_amount = 5 /datum/chemical_reaction/drink/millionairesour name = "Millionaire Sour" id = "millionairesour" - result = "millionairesour" - required_reagents = list("spacemountainwind" = 3, "grenadine" = 1, "limejuice" = 1) + result = /datum/reagent/drink/millionairesour + required_reagents = list(/datum/reagent/drink/spacemountainwind = 3, /datum/reagent/drink/grenadine = 1, /datum/reagent/drink/limejuice = 1) result_amount = 5 /datum/chemical_reaction/drink/olympusmons name = "Olympus Mons" id = "olympusmons" - result = "olympusmons" - required_reagents = list("blackrussian" = 1, "whiskey" = 1, "rum" = 1) + result = /datum/reagent/alcohol/ethanol/olympusmons + required_reagents = list(/datum/reagent/alcohol/ethanol/blackrussian = 1, /datum/reagent/alcohol/ethanol/whiskey = 1, /datum/reagent/alcohol/ethanol/rum = 1) result_amount = 3 /datum/chemical_reaction/drink/europanail name = "Europa Nail" id = "europanail" - result = "europanail" - required_reagents = list("rustynail" = 2, "kahlua" = 2, "cream" = 2) + result = /datum/reagent/alcohol/ethanol/europanail + required_reagents = list(/datum/reagent/alcohol/ethanol/rustynail = 2, /datum/reagent/alcohol/ethanol/coffee/kahlua = 2, /datum/reagent/drink/milk/cream = 2) result_amount = 6 /datum/chemical_reaction/drink/portsvilleminttea name = "Portsville Mint Tea" id = "portsvilleminttea" - result = "portsvilleminttea" - required_reagents = list("icetea" = 3, "berryjuice" = 1, "mintsyrup" = 1, "sugar" = 1) + result = /datum/reagent/drink/tea/portsvilleminttea + required_reagents = list(/datum/reagent/drink/icetea = 3, /datum/reagent/drink/berryjuice = 1, /datum/reagent/drink/mintsyrup = 1, /datum/reagent/sugar = 1) result_amount = 6 /datum/chemical_reaction/drink/shirleytemple name = "Shirley Temple" id = "shirleytemple" - result = "shirleytemple" - required_reagents = list("space_up" = 4, "grenadine" = 2) + result = /datum/reagent/drink/shirleytemple + required_reagents = list(/datum/reagent/drink/spaceup = 4, /datum/reagent/drink/grenadine = 2) result_amount = 6 /datum/chemical_reaction/drink/sugarrush name = "Sugar Rush" id = "sugarrush" - result = "sugarrush" - required_reagents = list("brownstar" = 4, "grenadine" = 1, "vodka" = 1) + result = /datum/reagent/alcohol/ethanol/sugarrush + required_reagents = list(/datum/reagent/drink/brownstar = 4, /datum/reagent/drink/grenadine = 1, /datum/reagent/alcohol/ethanol/vodka = 1) result_amount = 6 /datum/chemical_reaction/drink/sangria name = "Sangria" id = "sangria" - result = "sangria" - required_reagents = list("wine" = 3, "orangejuice" = 1, "lemonjuice" = 1, "brandy" = 1) + result = /datum/reagent/alcohol/ethanol/sangria + required_reagents = list(/datum/reagent/alcohol/ethanol/wine = 3, /datum/reagent/drink/orangejuice = 1, /datum/reagent/drink/lemonjuice = 1, /datum/reagent/alcohol/ethanol/brandy = 1) result_amount = 6 /datum/chemical_reaction/drink/bassline name = "Bassline" id = "bassline" - result = "bassline" - required_reagents = list("vodka" = 2, "bluecuracao" = 1, "limejuice" = 1, "grapejuice" = 2) + result = /datum/reagent/alcohol/ethanol/bassline + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 2, /datum/reagent/alcohol/ethanol/bluecuracao = 1, /datum/reagent/drink/limejuice = 1, /datum/reagent/drink/grapejuice = 2) result_amount = 6 /datum/chemical_reaction/drink/bluebird name = "Bluebird" id = "bluebird" - result = "bluebird" - required_reagents = list("gintonic" = 3, "bluecuracao" = 1) + result = /datum/reagent/alcohol/ethanol/bluebird + required_reagents = list(/datum/reagent/alcohol/ethanol/gintonic = 3, /datum/reagent/alcohol/ethanol/bluecuracao = 1) result_amount = 4 //Snowflake drinks /datum/chemical_reaction/drink/dr_gibb_diet name = "Diet Dr. Gibb" id = "dr_gibb_diet" - result = "dr_gibb_diet" - required_reagents = list("dr_gibb" = 1, "water" = 1) + result = /datum/reagent/drink/dr_gibb_diet + required_reagents = list(/datum/reagent/drink/dr_gibb = 1, /datum/reagent/water = 1) result_amount = 2 /datum/chemical_reaction/drink/dr_daniels name = "Dr. Daniels" id = "dr_daniels" - result = "dr_daniels" - required_reagents = list("dr_gibb_diet" = 3, "whiskey" = 1, "honey" = 1) + result = /datum/reagent/alcohol/ethanol/drdaniels + required_reagents = list(/datum/reagent/drink/dr_gibb_diet = 3, /datum/reagent/alcohol/ethanol/whiskey = 1, /datum/reagent/honey = 1) result_amount = 5 /datum/chemical_reaction/drink/meatshake name = "Meatshake" id = "meatshake" - result = "meatshake" - required_reagents = list("cream" = 1, "protein" = 1,"water" = 1) + result = /datum/reagent/drink/meatshake + required_reagents = list(/datum/reagent/drink/milk/cream = 1, /datum/reagent/nutriment/protein = 1,/datum/reagent/water = 1) result_amount = 3 /datum/chemical_reaction/drink/crocodile_booze name = "Crocodile Guwan" id = "crocodile_booze" - result = "crocodile_booze" - required_reagents = list("sarezhiwine" = 5, "toxin" = 1) + result = /datum/reagent/alcohol/butanol/crocodile_booze + required_reagents = list(/datum/reagent/alcohol/butanol/sarezhiwine = 5, /datum/reagent/toxin = 1) result_amount = 6 /datum/chemical_reaction/drink/messa_mead name = "Messa's Mead" id = "messa_mead" - result = "messa_mead" - required_reagents = list("honey" = 1, "earthenrootjuice" = 1) + result = /datum/reagent/alcohol/ethanol/messa_mead + required_reagents = list(/datum/reagent/honey = 1, /datum/reagent/drink/earthenrootjuice = 1) result_amount = 2 /datum/chemical_reaction/drink/winter_offensive name = "Winter Offensive" id = "winter_offensive" - result = "winter_offensive" - required_reagents = list("ice" = 1, "victorygin" = 1) + result = /datum/reagent/alcohol/ethanol/winter_offensive + required_reagents = list(/datum/reagent/drink/ice = 1, /datum/reagent/alcohol/ethanol/victorygin = 1) result_amount = 2 /datum/chemical_reaction/drink/mars_coffee name = "Martian Special" id = "mars_coffee" - result = "mars_coffee" - required_reagents = list("coffee" = 4, "blackpepper" = 1) + result = /datum/reagent/drink/coffee/mars + required_reagents = list(/datum/reagent/drink/coffee = 4, /datum/reagent/blackpepper = 1) result_amount = 5 /datum/chemical_reaction/drink/mountain_marauder name = "Mountain Marauder" id = "mountain_marauder" - result = "mountain_marauder" - required_reagents = list("adhomai_milk" = 1, "victorygin" = 1) + result = /datum/reagent/alcohol/ethanol/mountain_marauder + required_reagents = list(/datum/reagent/drink/milk/adhomai/fermented = 1, /datum/reagent/alcohol/ethanol/victorygin = 1) result_amount = 2 //Kaed's Unathi cocktails @@ -2954,114 +2948,114 @@ /datum/chemical_reaction/drink/moghesmargarita name = "Moghes Margarita" id = "moghesmargarita" - result = "moghesmargarita" - required_reagents = list("xuizijuice" = 2, "limejuice" = 3) + result = /datum/reagent/alcohol/butanol/moghesmargarita + required_reagents = list(/datum/reagent/alcohol/butanol/xuizijuice = 2, /datum/reagent/drink/limejuice = 3) result_amount = 5 /datum/chemical_reaction/drink/bahamalizard name = "Bahama Lizard" id = "bahamalizard" - result = "bahamalizard" - required_reagents = list("xuizijuice" = 2, "lemonjuice" = 2, "cream" = 1, "ice" = 1) + result = /datum/reagent/alcohol/butanol/bahamalizard + required_reagents = list(/datum/reagent/alcohol/butanol/xuizijuice = 2, /datum/reagent/drink/lemonjuice = 2, /datum/reagent/drink/milk/cream = 1, /datum/reagent/drink/ice = 1) result_amount = 6 /datum/chemical_reaction/drink/cactuscreme name = "Cactus Creme" id = "cactuscreme" - result = "cactuscreme" - required_reagents = list("berryjuice" = 2, "cream" = 1, "xuizijuice" = 2) + result = /datum/reagent/alcohol/butanol/cactuscreme + required_reagents = list(/datum/reagent/drink/berryjuice = 2, /datum/reagent/drink/milk/cream = 1, /datum/reagent/alcohol/butanol/xuizijuice = 2) result_amount = 5 /datum/chemical_reaction/drink/lizardplegm name = "Lizard Phlegm" id = "lizardphlegm" - result = "lizardphlegm" - required_reagents = list("cream" = 2, "banana" = 1, "xuizijuice" = 1, "watermelonjuice" = 1) + result = /datum/reagent/alcohol/butanol/lizardphlegm + required_reagents = list(/datum/reagent/drink/milk/cream = 2, /datum/reagent/drink/banana = 1, /datum/reagent/alcohol/butanol/xuizijuice = 1, /datum/reagent/drink/watermelonjuice = 1) result_amount = 5 /datum/chemical_reaction/drink/cactustea name = "Cactus Tea" id = "cactustea" - result = "cactustea" - required_reagents = list("icetea" = 1, "xuizijuice" = 1) + result = /datum/reagent/alcohol/butanol/cactustea + required_reagents = list(/datum/reagent/drink/icetea = 1, /datum/reagent/alcohol/butanol/xuizijuice = 1) result_amount = 2 /datum/chemical_reaction/drink/moghespolitan name = "Moghespolitan" id = "moghespolitan" - result = "moghespolitan" - required_reagents = list("sarezhiwine" = 2, "xuizijuice" = 1, "grenadine" = 5) + result = /datum/reagent/alcohol/butanol/moghespolitan + required_reagents = list(/datum/reagent/alcohol/butanol/sarezhiwine = 2, /datum/reagent/alcohol/butanol/xuizijuice = 1, /datum/reagent/drink/grenadine = 5) result_amount = 5 /datum/chemical_reaction/drink/wastelandheat name = "Wasteland Heat" id = "wastelandheat" - result = "wastelandheat" - required_reagents = list("xuizijuice" = 10, "capsaicin" = 3) + result = /datum/reagent/alcohol/butanol/wastelandheat + required_reagents = list(/datum/reagent/alcohol/butanol/xuizijuice = 10, /datum/reagent/capsaicin = 3) result_amount = 10 /datum/chemical_reaction/drink/sandgria name = "Sandgria" id = "sandgria" - result = "sandgria" - required_reagents = list("sarezhiwine" = 3, "orangejuice" = 1, "lemonjuice" = 1, "xuizijuice" = 1) + result = /datum/reagent/alcohol/butanol/sandgria + required_reagents = list(/datum/reagent/alcohol/butanol/sarezhiwine = 3, /datum/reagent/drink/orangejuice = 1, /datum/reagent/drink/lemonjuice = 1, /datum/reagent/alcohol/butanol/xuizijuice = 1) result_amount = 6 /datum/chemical_reaction/drink/contactwine name = "Contact Wine" id = "contactwine" - result = "contactwine" - required_reagents = list("xuizijuice" = 5, "radium" = 1, "sarezhiwine" = 5) + result = /datum/reagent/alcohol/butanol/contactwine + required_reagents = list(/datum/reagent/alcohol/butanol/xuizijuice = 5, /datum/reagent/radium = 1, /datum/reagent/alcohol/butanol/sarezhiwine = 5) result_amount = 10 /datum/chemical_reaction/drink/hereticblood name = "Heretics' Blood" id = "hereticblood" - result = "hereticblood" - required_reagents = list("xuizijuice" = 3, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1) + result = /datum/reagent/alcohol/butanol/hereticblood + required_reagents = list(/datum/reagent/alcohol/butanol/xuizijuice = 3, /datum/reagent/drink/spacemountainwind = 1, /datum/reagent/blood = 1, /datum/reagent/drink/dr_gibb = 1) result_amount = 6 /datum/chemical_reaction/drink/sandpit name = "Sandpit" id = "sandpit" - result = "sandpit" - required_reagents = list("xuizijuice" = 2, "orangejuice" = 2) + result = /datum/reagent/alcohol/butanol/sandpit + required_reagents = list(/datum/reagent/alcohol/butanol/xuizijuice = 2, /datum/reagent/drink/orangejuice = 2) result_amount = 4 /datum/chemical_reaction/drink/cactuscola name = "Cactus Cola" id = "cactuscola" - result = "cactuscola" - required_reagents = list("xuizijuice" = 2, "cola" = 2, "ice" = 1) + result = /datum/reagent/alcohol/butanol/cactuscola + required_reagents = list(/datum/reagent/alcohol/butanol/xuizijuice = 2, /datum/reagent/drink/space_cola = 2, /datum/reagent/drink/ice = 1) result_amount = 5 /datum/chemical_reaction/drink/bloodwine name = "Bloodwine" id = "bloodwine" - result = "bloodwine" - required_reagents = list("blood" = 2, "sarezhiwine" = 3) + result = /datum/reagent/alcohol/butanol/bloodwine + required_reagents = list(/datum/reagent/blood = 2, /datum/reagent/alcohol/butanol/sarezhiwine = 3) result_amount = 5 /datum/chemical_reaction/pumpkinspice name = "Pumpkin Spice" id = "pumpkinspce" - result = "pumpkinspice" + result = /datum/reagent/spacespice/pumpkinspice mix_message = "The spice brightens up." - required_reagents = list("spacespice" = 8, "pumpkinpulp" = 2) + required_reagents = list(/datum/reagent/spacespice = 8, /datum/reagent/nutriment/pumpkinpulp = 2) result_amount = 10 /datum/chemical_reaction/drink/psfrappe name = "Pumpkin Spice Frappe" id = "psfrappe" - result = "psfrappe" - required_reagents = list("icecoffee" = 6, "pumpkinspice" = 2, "cream" = 2) + result = /datum/reagent/drink/coffee/icecoffee/psfrappe + required_reagents = list(/datum/reagent/drink/coffee/icecoffee = 6, /datum/reagent/spacespice/pumpkinspice = 2, /datum/reagent/drink/milk/cream = 2) result_amount = 10 /datum/chemical_reaction/drink/pslatte name = "Pumpkin Spice Latte" id = "pslatte" - result = "pslatte" - required_reagents = list("coffee" = 6, "pumpkinspice" = 2, "cream" = 2) + result = /datum/reagent/drink/coffee/pslatte + required_reagents = list(/datum/reagent/drink/coffee = 6, /datum/reagent/spacespice/pumpkinspice = 2, /datum/reagent/drink/milk/cream = 2) result_amount = 10 //Skrell drinks. Bring forth the culture. @@ -3070,71 +3064,71 @@ /datum/chemical_reaction/drink/thirdincident name = "The Third Incident" id = "thirdincident" - result = "thirdincident" - required_reagents = list("egg" = 3, "bluecuracao" = 10, "grapejuice" = 10) + result = /datum/reagent/alcohol/ethanol/thirdincident + required_reagents = list(/datum/reagent/nutriment/protein/egg = 3, /datum/reagent/alcohol/ethanol/bluecuracao = 10, /datum/reagent/drink/grapejuice = 10) result_amount = 20 /datum/chemical_reaction/drink/upsidedowncup name = "Upside-Down Cup" id = "upsidedowncup" - result = "upsidedowncup" - required_reagents = list("dr_gibb" = 3, "ice" = 1, "lemonjuice" = 1) + result = /datum/reagent/drink/upsidedowncup + required_reagents = list(/datum/reagent/drink/dr_gibb = 3, /datum/reagent/drink/ice = 1, /datum/reagent/drink/lemonjuice = 1) result_amount = 5 /datum/chemical_reaction/drink/cigarettelizard name = "Cigarette Lizard" id = "cigarettelizard" - result = "cigarettelizard" - required_reagents = list("limejuice" = 2, "sodawater" = 2, "mintsyrup" = 1, "ice" = 1) + result = /datum/reagent/drink/smokinglizard + required_reagents = list(/datum/reagent/drink/limejuice = 2, /datum/reagent/drink/sodawater = 2, /datum/reagent/drink/mintsyrup = 1, /datum/reagent/drink/ice = 1) result_amount = 6 /datum/chemical_reaction/drink/sromshine name = "Sromshine" id = "sromshine" - result = "sromshine" - required_reagents = list("coffee" = 2, "orangejuice" = 1) + result = /datum/reagent/drink/coffee/sromshine + required_reagents = list(/datum/reagent/drink/coffee = 2, /datum/reagent/drink/orangejuice = 1) result_amount = 3 /datum/chemical_reaction/drink/cbsc name = "Complex Bluespace Calculation" id = "cbsc" - result = "cbsc" - required_reagents = list("wine" = 4, "vodka" = 2, "sodawater" = 3, "radium" = 1 ) + result = /datum/reagent/alcohol/ethanol/cbsc + required_reagents = list(/datum/reagent/alcohol/ethanol/wine = 4, /datum/reagent/alcohol/ethanol/vodka = 2, /datum/reagent/drink/sodawater = 3, /datum/reagent/radium = 1 ) result_amount = 10 /datum/chemical_reaction/drink/dynhot name = "Dyn Tea" id = "dynhot" - result = "dynhot" - required_reagents = list("dynjuice" = 1, "water" = 4) + result = /datum/reagent/drink/dynjuice/hot + required_reagents = list(/datum/reagent/drink/dynjuice = 1, /datum/reagent/water = 4) result_amount = 5 /datum/chemical_reaction/drink/dyncold name = "Dyn Ice Tea" id = "dyncold" - result = "dyncold" - required_reagents = list("dynjuice" = 1, "ice" = 2, "sodawater" = 2) + result = /datum/reagent/drink/dynjuice/cold + required_reagents = list(/datum/reagent/drink/dynjuice = 1, /datum/reagent/drink/ice = 2, /datum/reagent/drink/sodawater = 2) result_amount = 5 /datum/chemical_reaction/drink/algaesuprise name = "Pl'iuop Algae Surprise" id = "algaesuprise" - result = "algaesuprise" - required_reagents = list("virusfood" = 2, "banana" = 1) + result = /datum/reagent/drink/algaesuprise + required_reagents = list(/datum/reagent/nutriment/virusfood = 2, /datum/reagent/drink/banana = 1) result_amount = 3 /datum/chemical_reaction/drink/xrim name = "Xrim Garden" id = "xrim" - result = "xrim" - required_reagents = list("virusfood" = 2, "watermelonjuice" = 1, "orangejuice" = 1, "limejuice" = 1, "zora_cthur" = 1) + result = /datum/reagent/drink/xrim + required_reagents = list(/datum/reagent/nutriment/virusfood = 2, /datum/reagent/drink/watermelonjuice = 1, /datum/reagent/drink/orangejuice = 1, /datum/reagent/drink/limejuice = 1, /datum/reagent/drink/zorasoda/cthur = 1) result_amount = 6 /datum/chemical_reaction/drink/rixulin_sundae name = "Rixulin Sundae" id = "rixulin_sundae" - result = "rixulin_sundae" - required_reagents = list("virusfood" = 3, "wulumunusha" = 1, "whitewine" = 2) + result = /datum/reagent/alcohol/ethanol/rixulin_sundae + required_reagents = list(/datum/reagent/nutriment/virusfood = 3, /datum/reagent/wulumunusha = 1, /datum/reagent/alcohol/ethanol/whitewine = 2) result_amount = 6 //Tea and cider @@ -3143,215 +3137,226 @@ /datum/chemical_reaction/drink/cidercheap name = "Apple Cider Juice" id = "cidercheap" - result = "cidercheap" - required_reagents = list("applejuice" = 2, "sugar" = 1, "spacespice" = 1) + result = /datum/reagent/drink/cidercheap + required_reagents = list(/datum/reagent/drink/applejuice = 2, /datum/reagent/sugar = 1, /datum/reagent/spacespice = 1) result_amount = 4 /datum/chemical_reaction/cinnamonapplewhiskey name = "Cinnamon Apple Whiskey" id = "cinnamonapplewhiskey" - result = "cinnamonapplewhiskey" - required_reagents = list("ciderhot" = 3, "fireball" = 1) + result = /datum/reagent/alcohol/ethanol/cinnamonapplewhiskey + required_reagents = list(/datum/reagent/drink/ciderhot = 3, /datum/reagent/alcohol/ethanol/fireball = 1) result_amount = 4 /datum/chemical_reaction/drink/chailatte name = "Chai Latte" id = "chailatte" - result = "chailatte" - required_reagents = list("chaitea" = 1, "milk" = 1) + result = /datum/reagent/drink/tea/chaitealatte + required_reagents = list(/datum/reagent/drink/tea/chaitea = 1, /datum/reagent/drink/milk = 1) result_amount = 2 /datum/chemical_reaction/drink/chailatte/soy - required_reagents = list("chaitea" = 1, "soymilk" = 1) + id = "chailattesoy" + required_reagents = list(/datum/reagent/drink/tea/chaitea = 1, /datum/reagent/drink/milk/soymilk = 1) /datum/chemical_reaction/drink/coco_chaitea name = "Chocolate Chai" id = "coco_chaitea" - result = "coco_chaitea" - required_reagents = list("chaitea" = 2, "coco" = 1) + result = /datum/reagent/drink/tea/coco_chaitea + required_reagents = list(/datum/reagent/drink/tea/chaitea = 2, /datum/reagent/nutriment/coco = 1) result_amount = 3 /datum/chemical_reaction/drink/coco_chailatte name = "Chocolate Chai Latte" id = "coco_chailatte" - result = "coco_chailatte" - required_reagents = list("coco_chaitea" = 1, "milk" = 1) + result = /datum/reagent/drink/tea/coco_chailatte + required_reagents = list(/datum/reagent/drink/tea/coco_chaitea = 1, /datum/reagent/drink/milk = 1) result_amount = 2 /datum/chemical_reaction/drink/coco_chailatte/soy - required_reagents = list("coco_chaitea" = 1, "soymilk" = 1) + id = "coco_chailatte_soy" + required_reagents = list(/datum/reagent/drink/tea/coco_chaitea = 1, /datum/reagent/drink/milk/soymilk = 1) /datum/chemical_reaction/drink/cofftea name = "Cofftea" id = "cofftea" - result = "cofftea" - required_reagents = list("tea" = 1, "coffee" = 1) + result = /datum/reagent/drink/tea/cofftea + required_reagents = list(/datum/reagent/drink/tea = 1, /datum/reagent/drink/coffee = 1) result_amount = 2 /datum/chemical_reaction/drink/bureacratea name = "Bureacratea" id = "bureacratea" - result = "bureacratea" - required_reagents = list("tea" = 1, "espresso" = 1) + result = /datum/reagent/drink/tea/bureacratea + required_reagents = list(/datum/reagent/drink/tea = 1, /datum/reagent/drink/coffee/espresso = 1) result_amount = 2 /datum/chemical_reaction/drink/desert_tea name = "Desert Blossom Tea" id = "desert_tea" - result = "desert_tea" - required_reagents = list("greentea" = 2, "xuizijuice" = 1, "sugar" = 1) + result = /datum/reagent/drink/tea/desert_tea + required_reagents = list(/datum/reagent/drink/tea/greentea = 2, /datum/reagent/alcohol/butanol/xuizijuice = 1, /datum/reagent/sugar = 1) result_amount = 4 /datum/chemical_reaction/drink/halfandhalf name = "Half and Half" id = "halfandhalf" - result = "halfandhalf" - required_reagents = list("icetea" = 1, "lemonade" = 1) + result = /datum/reagent/drink/tea/halfandhalf + required_reagents = list(/datum/reagent/drink/icetea = 1, /datum/reagent/drink/lemonade = 1) result_amount = 2 /datum/chemical_reaction/drink/heretic_tea name = "Heretics Tea" id = "heretic_tea" - result = "heretic_tea" - required_reagents = list("icetea" = 3, "blood" = 1, "spacemountainwind" = 1, "dr_gibb" = 1) + result = /datum/reagent/drink/tea/heretic_tea + required_reagents = list(/datum/reagent/drink/icetea = 3, /datum/reagent/blood = 1, /datum/reagent/drink/spacemountainwind = 1, /datum/reagent/drink/dr_gibb = 1) result_amount = 6 /datum/chemical_reaction/drink/kira_tea name = "Kira tea" id = "kira_tea" - result = "kira_tea" - required_reagents = list("icetea" = 1, "kiraspecial" = 1) + result = /datum/reagent/drink/tea/kira_tea + required_reagents = list(/datum/reagent/drink/icetea = 1, /datum/reagent/drink/kiraspecial = 1) result_amount = 2 /datum/chemical_reaction/drink/librarian_special name = "Librarian Special" id = "librarian_special" - result = "librarian_special" - required_reagents = list("tea" = 2, "nothing" = 1) + result = /datum/reagent/drink/tea/librarian_special + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/drink/nothing = 1) result_amount = 3 /datum/chemical_reaction/drink/mars_tea name = "Martian Tea" id = "mars_tea" - result = "mars_tea" - required_reagents = list("tea" = 4, "blackpepper" = 1) + result = /datum/reagent/drink/tea/mars_tea + required_reagents = list(/datum/reagent/drink/tea = 4, /datum/reagent/blackpepper = 1) result_amount = 5 /datum/chemical_reaction/drink/mars_tea/green - required_reagents = list("greentea" = 4, "blackpepper" = 1) + required_reagents = list(/datum/reagent/drink/tea/greentea = 4, /datum/reagent/blackpepper = 1) /datum/chemical_reaction/drink/mendell_tea name = "Mendell Afternoon Tea" id = "mendell_tea" - result = "mendell_tea" - required_reagents = list("greentea" = 4, "mintsyrup" = 1, "lemonjuice" = 1) + result = /datum/reagent/drink/tea/mendell_tea + required_reagents = list(/datum/reagent/drink/tea/greentea = 4, /datum/reagent/drink/mintsyrup = 1, /datum/reagent/drink/lemonjuice = 1) result_amount = 6 /datum/chemical_reaction/drink/berry_tea name = "Mixed Berry Tea" id = "berry_tea" - result = "berry_tea" - required_reagents = list("tea" = 2, "berryjuice" = 1) + result = /datum/reagent/drink/tea/berry_tea + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/drink/berryjuice = 1) result_amount = 3 /datum/chemical_reaction/drink/berry_tea/green - required_reagents = list("greentea" = 2, "berryjuice" = 1) + required_reagents = list(/datum/reagent/drink/tea/greentea = 2, /datum/reagent/drink/berryjuice = 1) /datum/chemical_reaction/drink/pomegranate_icetea name = "Pomegranate Iced Tea" id = "pomegranate_icetea" - result = "pomegranate_icetea" - required_reagents = list("icetea" = 1, "grenadine" = 1) + result = /datum/reagent/drink/tea/pomegranate_icetea + required_reagents = list(/datum/reagent/drink/icetea = 1, /datum/reagent/drink/grenadine = 1) result_amount = 2 /datum/chemical_reaction/drink/potatea name = "Potatea" id = "potatea" - result = "potatea" - required_reagents = list("tea" = 2, "potato" = 1) + result = /datum/reagent/drink/tea/potatea + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/drink/potatojuice = 1) result_amount = 3 /datum/chemical_reaction/drink/securitea name = "Securitea" id = "securitea" - result = "securitea" - required_reagents = list("tea" = 2, "crayon_dust" = 1) + result = /datum/reagent/drink/tea/securitea + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/crayon_dust = 1) result_amount = 3 /datum/chemical_reaction/drink/securitea/red - required_reagents = list("tea" = 2, "crayon_dust_red" = 1) + id = "securitea_red" + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/crayon_dust/red = 1) /datum/chemical_reaction/drink/securitea/orange - required_reagents = list("tea" = 2, "crayon_dust_orange" = 1) + id = "securitea_orange" + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/crayon_dust/orange = 1) /datum/chemical_reaction/drink/securitea/yellow - required_reagents = list("tea" = 2, "crayon_dust_yellow" = 1) + id = "securitea_yellow" + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/crayon_dust/yellow = 1) /datum/chemical_reaction/drink/securitea/green - required_reagents = list("tea" = 2, "crayon_dust_green" = 1) + id = "securitea_green" + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/crayon_dust/green = 1) /datum/chemical_reaction/drink/securitea/blue - required_reagents = list("tea" = 2, "crayon_dust_blue" = 1) + id = "securitea_blue" + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/crayon_dust/blue = 1) /datum/chemical_reaction/drink/securitea/purple - required_reagents = list("tea" = 2, "crayon_dust_purple" = 1) + id = "securitea_purple" + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/crayon_dust/purple = 1) /datum/chemical_reaction/drink/securitea/grey - required_reagents = list("tea" = 2, "crayon_dust_grey" = 1) + id = "securitea_grey" + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/crayon_dust/grey = 1) /datum/chemical_reaction/drink/securitea/brown - required_reagents = list("tea" = 2, "crayon_dust_brown" = 1) + id = "securitea_brown" + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/crayon_dust/brown = 1) /datum/chemical_reaction/drink/sleepytime_tea name = "Sleepytime Tea" id = "sleepytime_tea" - result = "sleepytime_tea" - required_reagents = list("tea" = 5, "stoxin" = 1) + result = /datum/reagent/drink/tea/sleepytime_tea + required_reagents = list(/datum/reagent/drink/tea = 5, /datum/reagent/soporific = 1) result_amount = 6 /datum/chemical_reaction/drink/sleepytime_tea/green - required_reagents = list("greentea" = 5, "stoxin" = 1) + id = "sleepytime_greentea" + required_reagents = list(/datum/reagent/drink/tea/greentea = 5, /datum/reagent/soporific = 1) /datum/chemical_reaction/drink/hakhma_tea name = "Spiced Hakhma Tea" id = "hakhma_tea" - result = "hakhma_tea" - required_reagents = list("tea" = 2, "beetle_milk" = 2, "spacespice" = 1) + result = /datum/reagent/drink/tea/hakhma_tea + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/drink/milk/beetle = 2, /datum/reagent/spacespice = 1) result_amount = 5 /datum/chemical_reaction/drink/sweet_tea name = "Sweet Tea" id = "sweet_tea" - result = "sweet_tea" - required_reagents = list("icetea" = 1, "sugar" = 1) + result = /datum/reagent/drink/tea/sweet_tea + required_reagents = list(/datum/reagent/drink/icetea = 1, /datum/reagent/sugar = 1) result_amount = 2 /datum/chemical_reaction/drink/teathpaste name = "Teathpaste" id = "teathpaste" - result = "teathpaste" - required_reagents = list("tea" = 2, "toothpaste" = 1) + result = /datum/reagent/drink/toothpaste/teathpaste + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/drink/toothpaste = 1) result_amount = 3 /datum/chemical_reaction/drink/thewake name = "The Wake" id = "thewake" - result = "thewake" - required_reagents = list("dynjuice" = 1, "orangejuice" = 1, "tea" = 1) + result = /datum/reagent/drink/dynjuice/thewake + required_reagents = list(/datum/reagent/drink/dynjuice = 1, /datum/reagent/drink/orangejuice = 1, /datum/reagent/drink/tea = 1) result_amount = 3 /datum/chemical_reaction/drink/tomatea name = "Tomatea" id = "tomatea" - result = "tomatea" - required_reagents = list("tea" = 2, "tomatojuice" = 1) + result = /datum/reagent/drink/tea/tomatea + required_reagents = list(/datum/reagent/drink/tea = 2, /datum/reagent/drink/tomatojuice = 1) result_amount = 3 /datum/chemical_reaction/drink/trizkizki_tea name = "Trizkizki Tea" id = "trizkizki_tea" - result = "trizkizki_tea" - required_reagents = list("greentea" = 1, "sarezhiwine" = 1, "grenadine" = 1) + result = /datum/reagent/alcohol/butanol/trizkizki_tea + required_reagents = list(/datum/reagent/drink/tea/greentea = 1, /datum/reagent/alcohol/butanol/sarezhiwine = 1, /datum/reagent/drink/grenadine = 1) result_amount = 3 /datum/chemical_reaction/drink/tropical_icetea name = "Tropical Iced Tea" id = "tropical_icetea" - result = "tropical_icetea" - required_reagents = list("icetea" = 3, "limejuice" = 1, "orangejuice" = 1, "watermelonjuice" = 1) + result = /datum/reagent/drink/tea/tropical_icetea + required_reagents = list(/datum/reagent/drink/icetea = 3, /datum/reagent/drink/limejuice = 1, /datum/reagent/drink/orangejuice = 1, /datum/reagent/drink/watermelonjuice = 1) result_amount = 6 //transmutation @@ -3360,8 +3365,8 @@ name = "Transmutation: Silver" id = "transmutation_silver" result = null - required_reagents = list("iron" = 5, "copper" = 5) - catalysts = list("philosopher_stone" = 1) + required_reagents = list(/datum/reagent/iron = 5, /datum/reagent/copper = 5) + catalysts = list(/datum/reagent/philosopher_stone = 1) result_amount = 1 /datum/chemical_reaction/transmutation_silver/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -3374,8 +3379,8 @@ name = "Transmutation: Gold" id = "transmutation_gold" result = null - required_reagents = list("aluminum" = 5, MATERIAL_SILVER = 5) - catalysts = list("philosopher_stone" = 1) + required_reagents = list(/datum/reagent/aluminum = 5, MATERIAL_SILVER = 5) + catalysts = list(/datum/reagent/philosopher_stone = 1) result_amount = 1 /datum/chemical_reaction/transmutation_gold/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -3388,8 +3393,8 @@ name = "Transmutation: Diamond" id = "transmutation_diamond" result = null - required_reagents = list("carbon" = 5, MATERIAL_GOLD = 5) - catalysts = list("philosopher_stone" = 1) + required_reagents = list(/datum/reagent/carbon = 5, MATERIAL_GOLD = 5) + catalysts = list(/datum/reagent/philosopher_stone = 1) result_amount = 1 /datum/chemical_reaction/transmutation_diamond/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -3402,9 +3407,9 @@ /datum/chemical_reaction/water_to_ice name = "Water to Ice" id = "water_to_ice" - result = "ice" - required_reagents = list("water" = 1) - required_temperatures_max = list("water" = T0C) + result = /datum/reagent/drink/ice + required_reagents = list(/datum/reagent/water = 1) + required_temperatures_max = list(/datum/reagent/water = T0C) result_amount = 1 mix_message = "The water freezes." reaction_sound = "" @@ -3412,9 +3417,9 @@ /datum/chemical_reaction/ice_to_water name = "Ice to Water" id = "ice_to_water" - result = "water" - required_reagents = list("ice" = 1) - required_temperatures_min = list("ice" = T0C + 25) // stop-gap fix to allow recipes requiring ice to be made without breaking the server with HALF_LIFE + result = /datum/reagent/water + required_reagents = list(/datum/reagent/drink/ice = 1) + required_temperatures_min = list(/datum/reagent/drink/ice = T0C + 25) // stop-gap fix to allow recipes requiring ice to be made without breaking the server with HALF_LIFE result_amount = 1 mix_message = "The ice melts." reaction_sound = "" @@ -3422,26 +3427,26 @@ /datum/chemical_reaction/phoron_salt name = "Phoron Salt" id = "phoron_salt" - result = "phoron_salt" - required_reagents = list("sodiumchloride" = 1, "phoron" = 2) - required_temperatures_min = list("sodiumchloride" = 678, "phoron" = 73) - required_temperatures_max = list("phoron" = 261) + result = /datum/reagent/toxin/phoron_salt + required_reagents = list(/datum/reagent/sodiumchloride = 1, /datum/reagent/toxin/phoron = 2) + required_temperatures_min = list(/datum/reagent/sodiumchloride = 678, /datum/reagent/toxin/phoron = 73) + required_temperatures_max = list(/datum/reagent/toxin/phoron = 261) result_amount = 1 /datum/chemical_reaction/pyrosilicate name = "Pyrosilicate" id = "pyrosilicate" - result = "pyrosilicate" + result = /datum/reagent/pyrosilicate result_amount = 4 - required_reagents = list("silicate" = 1, "sacid" = 1, "hydrazine" = 1, "iron" = 1) + required_reagents = list(/datum/reagent/silicate = 1, /datum/reagent/acid = 1, /datum/reagent/hydrazine = 1, /datum/reagent/iron = 1) /datum/chemical_reaction/cryosurfactant name = "Cryosurfactant" id = "cryosurfactant" - result = "cryosurfactant" + result = /datum/reagent/cryosurfactant result_amount = 3 - required_reagents = list("surfactant" = 1, "ice" = 1, "sodium" = 1) + required_reagents = list(/datum/reagent/surfactant = 1, /datum/reagent/drink/ice = 1, /datum/reagent/sodium = 1) //WATER /datum/chemical_reaction/cryosurfactant_cooling_water @@ -3449,13 +3454,13 @@ id = "cryosurfactant_cooling_water" result = null result_amount = 1 - required_reagents = list("cryosurfactant" = 1) - inhibitors = list("pyrosilicate" = 1) - catalysts = list("water" = 1) + required_reagents = list(/datum/reagent/cryosurfactant = 1) + inhibitors = list(/datum/reagent/pyrosilicate = 1) + catalysts = list(/datum/reagent/water = 1) mix_message = "The solution begins to freeze." /datum/chemical_reaction/cryosurfactant_cooling_water/on_reaction(var/datum/reagents/holder, var/created_volume, var/created_thermal_energy) - holder.del_reagent("cryosurfactant") + holder.del_reagent(/datum/reagent/cryosurfactant) holder.add_thermal_energy(-created_volume*500) //ICE @@ -3464,13 +3469,13 @@ id = "cryosurfactant_cooling_ice" result = null result_amount = 1 - required_reagents = list("cryosurfactant" = 1) - inhibitors = list("pyrosilicate" = 1) - catalysts = list("ice" = 1) + required_reagents = list(/datum/reagent/cryosurfactant = 1) + inhibitors = list(/datum/reagent/pyrosilicate = 1) + catalysts = list(/datum/reagent/drink/ice = 1) mix_message = "The solution begins to freeze." /datum/chemical_reaction/cryosurfactant_cooling_ice/on_reaction(var/datum/reagents/holder, var/created_volume, var/created_thermal_energy) - holder.del_reagent("cryosurfactant") + holder.del_reagent(/datum/reagent/cryosurfactant) holder.add_thermal_energy(-created_volume*500) /datum/chemical_reaction/pyrosilicate_heating @@ -3478,20 +3483,20 @@ id = "pyrosilicate_heating" result = null result_amount = 1 - required_reagents = list("pyrosilicate" = 1) - inhibitors = list("cryosurfactant" = 1) - catalysts = list("sodiumchloride" = 1) + required_reagents = list(/datum/reagent/pyrosilicate = 1) + inhibitors = list(/datum/reagent/cryosurfactant = 1) + catalysts = list(/datum/reagent/sodiumchloride = 1) /datum/chemical_reaction/pyrosilicate_heating/on_reaction(var/datum/reagents/holder, var/created_volume) - holder.del_reagent("pyrosilicate") + holder.del_reagent(/datum/reagent/pyrosilicate) holder.add_thermal_energy(created_volume*1000) /datum/chemical_reaction/pyrosilicate_cryosurfactant name = "Pyrosilicate Cryosurfactant Reaction" id = "pyrosilicate_cryosurfactant" result = null - required_reagents = list("pyrosilicate" = 1, "cryosurfactant" = 1) - required_temperatures_min = list("pyrosilicate" = T0C, "cryosurfactant" = T0C) //Does not react when below these temperatures. + required_reagents = list(/datum/reagent/pyrosilicate = 1, /datum/reagent/cryosurfactant = 1) + required_temperatures_min = list(/datum/reagent/pyrosilicate = T0C, /datum/reagent/cryosurfactant = T0C) //Does not react when below these temperatures. result_amount = 1 /datum/chemical_reaction/pyrosilicate_cryosurfactant/on_reaction(var/datum/reagents/holder, var/created_volume, var/created_thermal_energy) @@ -3505,8 +3510,8 @@ id = "phoron_salt_fire" result = null result_amount = 1 - required_reagents = list("phoron_salt" = 1) - required_temperatures_min = list("phoron_salt" = 134) //If it's above this temperature, then cause hellfire. + required_reagents = list(/datum/reagent/toxin/phoron_salt = 1) + required_temperatures_min = list(/datum/reagent/toxin/phoron_salt = 134) //If it's above this temperature, then cause hellfire. mix_message = "The solution begins to vibrate!" /datum/chemical_reaction/phoron_salt_fire/on_reaction(var/datum/reagents/holder, var/created_volume, var/created_thermal_energy) @@ -3514,7 +3519,7 @@ for(var/turf/simulated/floor/target_tile in range(0,location)) target_tile.assume_gas("phoron", created_volume*2, created_thermal_energy / 25) //2 because there is 2 phoron in 1u of phoron salts addtimer(CALLBACK(target_tile, /turf/simulated/floor/.proc/hotspot_expose, 700, 400), 1) - holder.del_reagent("phoron_salt") + holder.del_reagent(/datum/reagent/toxin/phoron_salt) return /datum/chemical_reaction/phoron_salt_coldfire @@ -3522,8 +3527,8 @@ id = "phoron_salt_coldfire" result = null result_amount = 1 - required_reagents = list("phoron_salt" = 1) - required_temperatures_max = list("phoron_salt" = 113) //if it's below this temperature, then make a boom + required_reagents = list(/datum/reagent/toxin/phoron_salt = 1) + required_temperatures_max = list(/datum/reagent/toxin/phoron_salt = 113) //if it's below this temperature, then make a boom mix_message = "The solution begins to shrink!" /datum/chemical_reaction/phoron_salt_coldfire/on_reaction(var/datum/reagents/holder, var/created_volume, var/created_thermal_energy) @@ -3534,33 +3539,33 @@ var/datum/effect/effect/system/reagents_explosion/e = new() e.set_up(explosion_mod, location, 0, 0) e.start() - holder.del_reagent("phoron_salt") + holder.del_reagent(/datum/reagent/toxin/phoron_salt) return /datum/chemical_reaction/mutone name = "Mutone" id = "mutone" - result = "mutone" + result = /datum/reagent/mutone result_amount = 1 - required_reagents = list("phoron_salt" = 1, "mutagen" = 1) + required_reagents = list(/datum/reagent/toxin/phoron_salt = 1, /datum/reagent/mutagen = 1) /datum/chemical_reaction/plexium name = "Plexium" id = "plexium" - result = "plexium" + result = /datum/reagent/plexium result_amount = 1 - required_reagents = list("phoron_salt" = 1, "alkysine" = 1) + required_reagents = list(/datum/reagent/toxin/phoron_salt = 1, /datum/reagent/alkysine = 1) /datum/chemical_reaction/venenum name = "Venenum" id = "venenum" - result = "venenum" + result = /datum/reagent/venenum result_amount = 1 - required_reagents = list("phoron_salt" = 1, "ryetalyn" = 1) + required_reagents = list(/datum/reagent/toxin/phoron_salt = 1, /datum/reagent/ryetalyn = 1) /datum/chemical_reaction/rmt name = "RMT" id = "rmt" - result = "rmt" + result = /datum/reagent/rmt result_amount = 1 - required_reagents = list("potassium" = 1, "norepinephrine" = 1) + required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/norepinephrine = 1) diff --git a/code/modules/reagents/Chemistry-Temperature.dm b/code/modules/reagents/Chemistry-Temperature.dm index 5e38d6972ac..a4e530c471d 100644 --- a/code/modules/reagents/Chemistry-Temperature.dm +++ b/code/modules/reagents/Chemistry-Temperature.dm @@ -120,13 +120,13 @@ var/current_temperature = current.get_temperature() - if(current.id in required_temperatures_min) //The current temperature must be greater than this temperature - var/required_temperature = required_temperatures_min[current.id] + if(current.type in required_temperatures_min) //The current temperature must be greater than this temperature + var/required_temperature = required_temperatures_min[current.type] if(current_temperature < required_temperature) //Current temperature is less than the required temperature, return FALSE - if(current.id in required_temperatures_max) //The current temperature must be less than this temperature. - var/required_temperature = required_temperatures_max[current.id] + if(current.type in required_temperatures_max) //The current temperature must be less than this temperature. + var/required_temperature = required_temperatures_max[current.type] if(current_temperature > required_temperature) //Current temperature is greater than the required temperature. return FALSE diff --git a/code/modules/reagents/dispenser/cartridge_presets.dm b/code/modules/reagents/dispenser/cartridge_presets.dm index 274aa5a2bba..0d74043f56f 100644 --- a/code/modules/reagents/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/dispenser/cartridge_presets.dm @@ -6,108 +6,108 @@ volume = CARTRIDGE_VOLUME_MEDIUM // Multiple - water spawn_reagent = "water" - sugar spawn_reagent = "sugar" + sugar spawn_reagent = /datum/reagent/sugar + water spawn_reagent = /datum/reagent/water // Chemistry - hydrazine spawn_reagent = "hydrazine" - lithium spawn_reagent = "lithium" - carbon spawn_reagent = "carbon" - ammonia spawn_reagent = "ammonia" - acetone spawn_reagent = "acetone" - sodium spawn_reagent = "sodium" - aluminum spawn_reagent = "aluminum" - silicon spawn_reagent = "silicon" - phosphorus spawn_reagent = "phosphorus" - sulfur spawn_reagent = "sulfur" - hclacid spawn_reagent = "hclacid" - potassium spawn_reagent = "potassium" - iron spawn_reagent = "iron" - copper spawn_reagent = "copper" - mercury spawn_reagent = "mercury" - radium spawn_reagent = "radium" - ethanol spawn_reagent = "ethanol" - butanol spawn_reagent = "butanol" - sacid spawn_reagent = "sacid" - tungsten spawn_reagent = "tungsten" + acetone spawn_reagent = /datum/reagent/acetone + aluminum spawn_reagent = /datum/reagent/aluminum + ammonia spawn_reagent = /datum/reagent/ammonia + butanol spawn_reagent = /datum/reagent/alcohol/butanol + carbon spawn_reagent = /datum/reagent/carbon + copper spawn_reagent = /datum/reagent/copper + ethanol spawn_reagent = /datum/reagent/alcohol/ethanol + hclacid spawn_reagent = /datum/reagent/acid/hydrochloric + hydrazine spawn_reagent = /datum/reagent/hydrazine + iron spawn_reagent = /datum/reagent/iron + lithium spawn_reagent = /datum/reagent/lithium + mercury spawn_reagent = /datum/reagent/mercury + phosphorus spawn_reagent = /datum/reagent/phosphorus + potassium spawn_reagent = /datum/reagent/potassium + radium spawn_reagent = /datum/reagent/radium + sacid spawn_reagent = /datum/reagent/acid + silicon spawn_reagent = /datum/reagent/silicon + sodium spawn_reagent = /datum/reagent/sodium + sulfur spawn_reagent = /datum/reagent/sulfur + tungsten spawn_reagent = /datum/reagent/tungsten // Bar, alcoholic - beer spawn_reagent = "beer" - kahlua spawn_reagent = "kahlua" - whiskey spawn_reagent = "whiskey" - wine spawn_reagent = "wine" - vodka spawn_reagent = "vodka" - gin spawn_reagent = "gin" - rum spawn_reagent = "rum" - tequila spawn_reagent = "tequilla" - vermouth spawn_reagent = "vermouth" - cognac spawn_reagent = "cognac" - ale spawn_reagent = "ale" - mead spawn_reagent = "mead" - champagne spawn_reagent = "champagne" + ale spawn_reagent = /datum/reagent/alcohol/ethanol/ale + beer spawn_reagent = /datum/reagent/alcohol/ethanol/beer + champagne spawn_reagent = /datum/reagent/alcohol/ethanol/champagne + cognac spawn_reagent = /datum/reagent/alcohol/ethanol/cognac + gin spawn_reagent = /datum/reagent/alcohol/ethanol/gin + kahlua spawn_reagent = /datum/reagent/alcohol/ethanol/coffee/kahlua + mead spawn_reagent = /datum/reagent/alcohol/ethanol/mead + rum spawn_reagent = /datum/reagent/alcohol/ethanol/rum + tequila spawn_reagent = /datum/reagent/alcohol/ethanol/tequila + vermouth spawn_reagent = /datum/reagent/alcohol/ethanol/vermouth + vodka spawn_reagent = /datum/reagent/alcohol/ethanol/vodka + whiskey spawn_reagent = /datum/reagent/alcohol/ethanol/whiskey + wine spawn_reagent = /datum/reagent/alcohol/ethanol/wine // Bar, soft - ice spawn_reagent = "ice" - tea spawn_reagent = "tea" - icetea spawn_reagent = "icetea" - cola spawn_reagent = "cola" - smw spawn_reagent = "spacemountainwind" - dr_gibb spawn_reagent = "dr_gibb" - clean_kois spawn_reagent = "koispasteclean" - spaceup spawn_reagent = "space_up" - brownstar spawn_reagent = "brownstar" - tonic spawn_reagent = "tonic" - sodawater spawn_reagent = "sodawater" - lemon_lime spawn_reagent = "lemon_lime" - orange spawn_reagent = "orangejuice" - lime spawn_reagent = "limejuice" - watermelon spawn_reagent = "watermelonjuice" - apple spawn_reagent = "applejuice" - banana spawn_reagent = "banana" - root_beer spawn_reagent = "root_beer" + apple spawn_reagent = /datum/reagent/drink/applejuice + banana spawn_reagent = /datum/reagent/drink/banana + brownstar spawn_reagent = /datum/reagent/drink/brownstar + clean_kois spawn_reagent = /datum/reagent/kois/clean + cola spawn_reagent = /datum/reagent/drink/space_cola + dr_gibb spawn_reagent = /datum/reagent/drink/dr_gibb + ice spawn_reagent = /datum/reagent/drink/ice + icetea spawn_reagent = /datum/reagent/drink/icetea + lemon_lime spawn_reagent = /datum/reagent/drink/lemon_lime + lime spawn_reagent = /datum/reagent/drink/limejuice + orange spawn_reagent = /datum/reagent/drink/orangejuice + root_beer spawn_reagent = /datum/reagent/drink/root_beer + smw spawn_reagent = /datum/reagent/drink/spacemountainwind + sodawater spawn_reagent = /datum/reagent/drink/sodawater + spaceup spawn_reagent = /datum/reagent/drink/spaceup + tea spawn_reagent = /datum/reagent/drink/tea + tonic spawn_reagent = /datum/reagent/drink/tonic + watermelon spawn_reagent = /datum/reagent/drink/watermelonjuice // Bar, coffee and tea - coffee spawn_reagent = "coffee" - espresso spawn_reagent = "espresso" - cream spawn_reagent = "cream" - milk spawn_reagent = "milk" - soymilk spawn_reagent = "soymilk" - greentea spawn_reagent = "greentea" - chaitea spawn_reagent = "chaitea" - ciderhot spawn_reagent = "ciderhot" - hot_coco spawn_reagent = "hot_coco" - fatshouter_milk spawn_reagent = "fatshouter_milk" + chaitea spawn_reagent = /datum/reagent/drink/tea/chaitea + ciderhot spawn_reagent = /datum/reagent/drink/ciderhot + coffee spawn_reagent = /datum/reagent/drink/coffee + cream spawn_reagent = /datum/reagent/drink/milk/cream + espresso spawn_reagent = /datum/reagent/drink/coffee/espresso + fatshouter_milk spawn_reagent = /datum/reagent/drink/milk/adhomai + greentea spawn_reagent = /datum/reagent/drink/tea/greentea + hot_coco spawn_reagent = /datum/reagent/drink/hot_coco + milk spawn_reagent = /datum/reagent/drink/milk + soymilk spawn_reagent = /datum/reagent/drink/milk/soymilk // ERT - norepi spawn_reagent = "norepinephrine" - ryetalyn spawn_reagent = "ryetalyn" - paracetamol spawn_reagent = "paracetamol" - tramadol spawn_reagent = "tramadol" - oxycodone spawn_reagent = "oxycodone" - sterilizine spawn_reagent = "sterilizine" - leporazine spawn_reagent = "leporazine" - kelotane spawn_reagent = "kelotane" - dermaline spawn_reagent = "dermaline" - dexalin spawn_reagent = "dexalin" + alkysine spawn_reagent = /datum/reagent/alkysine + arithrazine spawn_reagent = /datum/reagent/arithrazine + benadryl spawn_reagent = /datum/reagent/antihistamine + bicaridine spawn_reagent = /datum/reagent/bicaridine + chloral spawn_reagent = /datum/reagent/chloralhydrate + clonexadone spawn_reagent = /datum/reagent/clonexadone + coughsyrup spawn_reagent = /datum/reagent/coughsyrup + cryoxadone spawn_reagent = /datum/reagent/cryoxadone + dermaline spawn_reagent = /datum/reagent/dermaline + dexalin spawn_reagent = /datum/reagent/dexalin dexalin/small volume = CARTRIDGE_VOLUME_SMALL // For the medicine cartridge crate, so it's not too easy to get large amounts of dexalin - dexalin_p spawn_reagent = "dexalinp" - tricord spawn_reagent = "tricordrazine" - dylovene spawn_reagent = "dylovene" - synaptizine spawn_reagent = "synaptizine" - hyronalin spawn_reagent = "hyronalin" - arithrazine spawn_reagent = "arithrazine" - alkysine spawn_reagent = "alkysine" - imidazoline spawn_reagent = "imidazoline" - peridaxon spawn_reagent = "peridaxon" - bicaridine spawn_reagent = "bicaridine" - hyperzine spawn_reagent = "hyperzine" - rezadone spawn_reagent = "rezadone" - thetamycin spawn_reagent = "thetamycin" - coughsyrup spawn_reagent = "coughsyrup" - benadryl spawn_reagent = "diphenhydramine" - ethylredox spawn_reagent = "ethylredoxrazine" - sleeptox spawn_reagent = "stoxin" - chloral spawn_reagent = "chloralhydrate" - cryoxadone spawn_reagent = "cryoxadone" - clonexadone spawn_reagent = "clonexadone" - pneumalin spawn_reagent = "pneumalin" + dexalin_p spawn_reagent = /datum/reagent/dexalin/plus + dylovene spawn_reagent = /datum/reagent/dylovene + ethylredox spawn_reagent = /datum/reagent/ethylredoxrazine + hyperzine spawn_reagent = /datum/reagent/hyperzine + hyronalin spawn_reagent = /datum/reagent/hyronalin + imidazoline spawn_reagent = /datum/reagent/imidazoline + kelotane spawn_reagent = /datum/reagent/kelotane + leporazine spawn_reagent = /datum/reagent/leporazine + norepi spawn_reagent = /datum/reagent/norepinephrine + oxycodone spawn_reagent = /datum/reagent/oxycodone + paracetamol spawn_reagent = /datum/reagent/paracetamol + peridaxon spawn_reagent = /datum/reagent/peridaxon + pneumalin spawn_reagent = /datum/reagent/pneumalin + rezadone spawn_reagent = /datum/reagent/rezadone + ryetalyn spawn_reagent = /datum/reagent/ryetalyn + sleeptox spawn_reagent = /datum/reagent/soporific + sterilizine spawn_reagent = /datum/reagent/sterilizine + synaptizine spawn_reagent = /datum/reagent/synaptizine + thetamycin spawn_reagent = /datum/reagent/thetamycin + tramadol spawn_reagent = /datum/reagent/tramadol + tricord spawn_reagent = /datum/reagent/tricordrazine diff --git a/code/modules/reagents/dispenser/coffeebeans.dm b/code/modules/reagents/dispenser/coffeebeans.dm index 269dcec313d..3953ff9614e 100644 --- a/code/modules/reagents/dispenser/coffeebeans.dm +++ b/code/modules/reagents/dispenser/coffeebeans.dm @@ -12,5 +12,5 @@ possible_transfer_amounts = list(20, 40) unacidable = 1 - spawn_reagent = "espresso" + spawn_reagent = /datum/reagent/drink/coffee/espresso diff --git a/code/modules/reagents/dispenser/dispenser_presets.dm b/code/modules/reagents/dispenser/dispenser_presets.dm index ce22b097a93..ae3a0f6b199 100644 --- a/code/modules/reagents/dispenser/dispenser_presets.dm +++ b/code/modules/reagents/dispenser/dispenser_presets.dm @@ -57,7 +57,7 @@ /obj/machinery/chemical_dispenser/ert/attackby(obj/item/W, mob/user) if(W.iswrench()) - to_chat(user, span("notice","This dispenser is riveted to the floor and cannot be unanchored.")) + to_chat(user, SPAN_NOTICE("This dispenser is riveted to the floor and cannot be unanchored.")) return else return ..() diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 07de83c9f84..e108c4fd2c6 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -30,7 +30,7 @@ . = ..() if(blood_type != null) name = "blood pack [blood_type]" - reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null)) + reagents.add_reagent(/datum/reagent/blood, 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null)) update_icon() /obj/item/reagent_containers/blood/on_reagent_change() @@ -48,7 +48,7 @@ if (being_feed) to_chat(user, "You are already feeding on \the [src].") return - if (reagents.get_reagent_amount("blood")) + if (reagents.get_reagent_amount(/datum/reagent/blood)) user.visible_message("[user] raises \the [src] up to their mouth and bites into it.", "You raise \the [src] up to your mouth and bite into it, starting to drain its contents.
You need to stand still.") being_feed = TRUE vampire_marks = TRUE @@ -58,15 +58,15 @@ while (do_after(user, 25, 5, 1)) var/blood_taken = 0 - blood_taken = min(5, reagents.get_reagent_amount("blood")/4) + blood_taken = min(5, reagents.get_reagent_amount(/datum/reagent/blood)/4) - reagents.remove_reagent("blood", blood_taken*4) + reagents.remove_reagent(/datum/reagent/blood, blood_taken*4) user.mind.vampire.blood_usable += blood_taken if (blood_taken) to_chat(user, "You have accumulated [user.mind.vampire.blood_usable] [user.mind.vampire.blood_usable > 1 ? "units" : "unit"] of usable blood. It tastes quite stale.") - if (reagents.get_reagent_amount("blood") < 1) + if (reagents.get_reagent_amount(/datum/reagent/blood) < 1) break user.visible_message("[user] licks \his fangs dry, lowering \the [src].", "You lick your fangs clean of the tasteless blood.") being_feed = FALSE @@ -81,7 +81,7 @@ /obj/item/reagent_containers/blood/attackby(obj/item/P as obj, mob/user as mob) ..() if (P.ispen()) - if (reagents.get_reagent_amount("blood") && name != "empty blood pack") //Stops people mucking with bloodpacks that are filled + if (reagents.get_reagent_amount(/datum/reagent/blood) && name != "empty blood pack") //Stops people mucking with bloodpacks that are filled to_chat(usr, "You can't relabel [name] until it is empty!") return var/blood_name = input(usr, "What blood type would you like to label it as?", "Blood Types") in list("A+", "A-", "B+", "B-", "O+", "O-", "AB+", "AB-", "Cancel") @@ -98,11 +98,11 @@ if(LAZYLEN(P.attack_verb)) user.visible_message("[src] has been [pick(P.attack_verb)] with \the [P] by [user]!") var/atkmsg_filled = null - if (reagents.get_reagent_amount("blood")) + if (reagents.get_reagent_amount(/datum/reagent/blood)) atkmsg_filled = " and the contents spray everywhere" if (src.loc != usr) var/strength - var/percent = round((reagents.get_reagent_amount("blood") / volume) * 100) //the amount of blood changes the strength of spray + var/percent = round((reagents.get_reagent_amount(/datum/reagent/blood) / volume) * 100) //the amount of blood changes the strength of spray switch(percent) if(1 to 9) strength = 2 if(10 to 50) strength = 3 @@ -149,7 +149,7 @@ H.bloody_body() // Line below will do a check where the target bloodbag is located and create a new one accordingly var/obj/item/reagent_containers/I = src.loc != usr ? new/obj/item/reagent_containers/blood/ripped(src.loc) : new/obj/item/reagent_containers/blood/ripped(usr.loc) - if (reagents.get_reagent_amount("blood")) + if (reagents.get_reagent_amount(/datum/reagent/blood)) I.add_blood() var/atkmsg = "\The [src] rips apart[atkmsg_filled]!" user.visible_message(atkmsg) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 64534946ffb..1c06223eb6f 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -13,17 +13,17 @@ var/charge_tick = 0 var/recharge_time = 5 //Time it takes for shots to recharge (in seconds) - var/list/reagent_ids = list("tricordrazine", "norepinephrine") + var/list/reagent_ids = list(/datum/reagent/tricordrazine, /datum/reagent/norepinephrine) var/list/reagent_volumes = list() var/list/reagent_names = list() center_of_mass = null /obj/item/reagent_containers/borghypo/medical - reagent_ids = list("bicaridine", "kelotane", "dylovene", "dexalin", "norepinephrine", "tramadol", "thetamycin") + reagent_ids = list(/datum/reagent/bicaridine, /datum/reagent/kelotane, /datum/reagent/dylovene, /datum/reagent/dexalin, /datum/reagent/norepinephrine, /datum/reagent/tramadol, /datum/reagent/thetamycin) /obj/item/reagent_containers/borghypo/rescue - reagent_ids = list("tricordrazine", "norepinephrine", "tramadol", "adrenaline") + reagent_ids = list(/datum/reagent/tricordrazine, /datum/reagent/norepinephrine, /datum/reagent/tramadol, /datum/reagent/adrenaline) /obj/item/reagent_containers/borghypo/Initialize() . = ..() @@ -103,7 +103,7 @@ /obj/item/reagent_containers/borghypo/Topic(var/href, var/list/href_list) if(href_list["reagent"]) - var/t = reagent_ids.Find(href_list["reagent"]) + var/t = reagent_ids.Find(text2path(href_list["reagent"])) if(t) playsound(loc, 'sound/effects/pop.ogg', 50, 0) mode = t @@ -127,7 +127,7 @@ recharge_time = 3 volume = 60 possible_transfer_amounts = list(5, 10, 20, 30) - reagent_ids = list("beer", "kahlua", "whiskey", "wine", "vodka", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "water", "sugar", "ice", "tea", "icetea", "cola", "spacemountainwind", "dr_gibb", "space_up", "tonic", "sodawater", "lemon_lime", "orangejuice", "limejuice", "watermelonjuice", "coffee", "espresso") + reagent_ids = list(/datum/reagent/alcohol/ethanol/beer, /datum/reagent/alcohol/ethanol/coffee/kahlua, /datum/reagent/alcohol/ethanol/whiskey, /datum/reagent/alcohol/ethanol/wine, /datum/reagent/alcohol/ethanol/vodka, /datum/reagent/alcohol/ethanol/gin, /datum/reagent/alcohol/ethanol/rum, /datum/reagent/alcohol/ethanol/tequila, /datum/reagent/alcohol/ethanol/vermouth, /datum/reagent/alcohol/ethanol/cognac, /datum/reagent/alcohol/ethanol/ale, /datum/reagent/alcohol/ethanol/mead, /datum/reagent/water, /datum/reagent/sugar, /datum/reagent/drink/ice, /datum/reagent/drink/tea, /datum/reagent/drink/icetea, /datum/reagent/drink/space_cola, /datum/reagent/drink/spacemountainwind, /datum/reagent/drink/dr_gibb, /datum/reagent/drink/spaceup, /datum/reagent/drink/tonic, /datum/reagent/drink/sodawater, /datum/reagent/drink/lemon_lime, /datum/reagent/drink/orangejuice, /datum/reagent/drink/limejuice, /datum/reagent/drink/watermelonjuice, /datum/reagent/drink/coffee, /datum/reagent/drink/coffee/espresso) /obj/item/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user) return diff --git a/code/modules/reagents/reagent_containers/food.dm b/code/modules/reagents/reagent_containers/food.dm index f9d7d523088..c6a66e871c5 100644 --- a/code/modules/reagents/reagent_containers/food.dm +++ b/code/modules/reagents/reagent_containers/food.dm @@ -31,5 +31,5 @@ var/obj/item/trash_item = new trash(user) user.put_in_hands(trash_item) target.visible_message("[target] finishes [is_liquid ? "drinking" : "eating"] \the [src].", - span("notice","You finish [is_liquid ? "drinking" : "eating"] \the [src].")) + SPAN_NOTICE("You finish [is_liquid ? "drinking" : "eating"] \the [src].")) qdel(src) diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 5e3441fb3fe..39602789bfb 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -12,10 +12,7 @@ desc = "Cola. in space." icon_state = "cola" center_of_mass = list("x"=16, "y"=10) - -/obj/item/reagent_containers/food/drinks/cans/cola/Initialize() - . = ..() - reagents.add_reagent("cola", 30) + reagents_to_add = list(/datum/reagent/drink/space_cola = 30) /obj/item/reagent_containers/food/drinks/cans/waterbottle name = "bottled water" @@ -25,9 +22,7 @@ drop_sound = 'sound/items/drop/disk.ogg' pickup_sound = 'sound/items/pickup/disk.ogg' -/obj/item/reagent_containers/food/drinks/cans/waterbottle/Initialize() - . = ..() - reagents.add_reagent("water", 30) + reagents_to_add = list(/datum/reagent/water = 30) /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind name = "\improper Space Mountain Wind" @@ -35,9 +30,7 @@ icon_state = "space_mountain_wind" center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind/Initialize() - . = ..() - reagents.add_reagent("spacemountainwind", 30) + reagents_to_add = list(/datum/reagent/drink/spacemountainwind = 30) /obj/item/reagent_containers/food/drinks/cans/thirteenloko name = "thirteen loko" @@ -45,9 +38,7 @@ icon_state = "thirteen_loko" center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/drinks/cans/thirteenloko/Initialize() - . = ..() - reagents.add_reagent("thirteenloko", 30) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/thirteenloko = 30) /obj/item/reagent_containers/food/drinks/cans/dr_gibb name = "\improper Dr. Gibb" @@ -55,9 +46,7 @@ icon_state = "dr_gibb" center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/drinks/cans/dr_gibb/Initialize() - . = ..() - reagents.add_reagent("dr_gibb", 30) + reagents_to_add = list(/datum/reagent/drink/dr_gibb = 30) /obj/item/reagent_containers/food/drinks/cans/starkist name = "\improper Star-kist" @@ -65,9 +54,7 @@ icon_state = "starkist" center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/drinks/cans/starkist/Initialize() - . = ..() - reagents.add_reagent("brownstar", 30) + reagents_to_add = list(/datum/reagent/drink/brownstar = 30) /obj/item/reagent_containers/food/drinks/cans/space_up name = "\improper Space-Up" @@ -75,9 +62,7 @@ icon_state = "space-up" center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/drinks/cans/space_up/Initialize() - . = ..() - reagents.add_reagent("space_up", 30) + reagents_to_add = list(/datum/reagent/drink/spaceup = 30) /obj/item/reagent_containers/food/drinks/cans/lemon_lime name = "\improper Lemon-Lime" @@ -85,9 +70,7 @@ icon_state = "lemon-lime" center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/drinks/cans/lemon_lime/Initialize() - . = ..() - reagents.add_reagent("lemon_lime", 30) + reagents_to_add = list(/datum/reagent/drink/lemon_lime = 30) /obj/item/reagent_containers/food/drinks/cans/iced_tea name = "\improper Vrisk Serket iced tea" @@ -95,9 +78,7 @@ icon_state = "ice_tea_can" center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/drinks/cans/iced_tea/Initialize() - . = ..() - reagents.add_reagent("icetea", 30) + reagents_to_add = list(/datum/reagent/drink/icetea = 30) /obj/item/reagent_containers/food/drinks/cans/grape_juice name = "\improper Grapel juice" @@ -105,9 +86,7 @@ icon_state = "grapesoda" center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/drinks/cans/grape_juice/Initialize() - . = ..() - reagents.add_reagent("grapejuice", 30) + reagents_to_add = list(/datum/reagent/drink/grapejuice = 30) /obj/item/reagent_containers/food/drinks/cans/tonic name = "\improper T-Borg's tonic water" @@ -115,9 +94,7 @@ icon_state = "tonic" center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/drinks/cans/tonic/Initialize() - . = ..() - reagents.add_reagent("tonic", 50) + reagents_to_add = list(/datum/reagent/drink/tonic = 50) /obj/item/reagent_containers/food/drinks/cans/sodawater name = "soda water" @@ -125,9 +102,7 @@ icon_state = "sodawater" center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/drinks/cans/sodawater/Initialize() - . = ..() - reagents.add_reagent("sodawater", 50) + reagents_to_add = list(/datum/reagent/drink/sodawater = 50) /obj/item/reagent_containers/food/drinks/cans/koispunch name = "\improper Phoron Punch!" @@ -135,10 +110,7 @@ icon_state = "phoron_punch" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/cans/koispunch/Initialize() - . = ..() - reagents.add_reagent("koispasteclean", 10) - reagents.add_reagent("phoron", 5) + reagents_to_add = list(/datum/reagent/kois/clean = 10, /datum/reagent/toxin/phoron = 5) /obj/item/reagent_containers/food/drinks/cans/root_beer name = "\improper R&D Root Beer" @@ -146,9 +118,7 @@ icon_state = "root_beer" center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/drinks/cans/root_beer/Initialize() - . = ..() - reagents.add_reagent("root_beer", 30) + reagents_to_add = list(/datum/reagent/drink/root_beer = 30) //zoda @@ -158,10 +128,7 @@ icon_state = "zoracherry" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/cans/zorasoda/Initialize() - . = ..() - reagents.add_reagent("zora_cherry", 20) - reagents.add_reagent("vaam", 15) + reagents_to_add = list(/datum/reagent/drink/zorasoda = 20, /datum/reagent/mental/vaam = 15) /obj/item/reagent_containers/food/drinks/cans/zorakois name = "\improper Zo'ra Soda Kois Twist" @@ -169,10 +136,7 @@ icon_state = "koistwist" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/cans/zorakois/Initialize() - . = ..() - reagents.add_reagent("zora_kois", 20) - reagents.add_reagent("vaam", 15) + reagents_to_add = list(/datum/reagent/drink/zorasoda/kois = 20, /datum/reagent/mental/vaam = 15) /obj/item/reagent_containers/food/drinks/cans/zoraphoron name = "\improper Zo'ra Soda Phoron Passion" @@ -180,10 +144,7 @@ icon_state = "phoronpassion" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/cans/zoraphoron/Initialize() - . = ..() - reagents.add_reagent("zora_phoron", 20) - reagents.add_reagent("vaam", 15) + reagents_to_add = list(/datum/reagent/drink/zorasoda/phoron = 20, /datum/reagent/mental/vaam = 15) /obj/item/reagent_containers/food/drinks/cans/zorahozm name = "\improper High Octane Zorane Might" @@ -191,10 +152,7 @@ icon_state = "hozm" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/cans/zorahozm/Initialize() - . = ..() - reagents.add_reagent("zora_hozm", 20) - reagents.add_reagent("vaam", 15) + reagents_to_add = list(/datum/reagent/drink/zorasoda/hozm = 20, /datum/reagent/mental/vaam = 15) /obj/item/reagent_containers/food/drinks/cans/zoravenom name = "\improper Zo'ra Soda Sour Venom Grass (Diet!)" @@ -202,10 +160,7 @@ icon_state = "sourvenomgrass" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/cans/zoravenom/Initialize() - . = ..() - reagents.add_reagent("zora_venom", 20) - reagents.add_reagent("vaam", 15) + reagents_to_add = list(/datum/reagent/drink/zorasoda/venomgrass = 20, /datum/reagent/mental/vaam = 15) /obj/item/reagent_containers/food/drinks/cans/zoraklax name = "\improper Klaxan Energy Crush" @@ -213,10 +168,7 @@ icon_state = "klaxancrush" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/cans/zoraklax/Initialize() - . = ..() - reagents.add_reagent("zora_klax", 20) - reagents.add_reagent("vaam", 15) + reagents_to_add = list(/datum/reagent/drink/zorasoda/klax = 20, /datum/reagent/mental/vaam = 15) /obj/item/reagent_containers/food/drinks/cans/zoracthur name = "\improper C'thur Rockin' Raspberry" @@ -224,10 +176,7 @@ icon_state = "cthurberry" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/cans/zoracthur/Initialize() - . = ..() - reagents.add_reagent("zora_cthur", 20) - reagents.add_reagent("vaam", 15) + reagents_to_add = list(/datum/reagent/drink/zorasoda/cthur = 20, /datum/reagent/mental/vaam = 15) /obj/item/reagent_containers/food/drinks/cans/zoradrone name = "\improper Drone Fuel" @@ -235,10 +184,7 @@ icon_state = "dronefuel" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/cans/zoradrone/Initialize() - . = ..() - reagents.add_reagent("zora_drone", 30) - reagents.add_reagent("vaam", 10) + reagents_to_add = list(/datum/reagent/drink/zorasoda/drone = 30, /datum/reagent/mental/vaam = 10) /obj/item/reagent_containers/food/drinks/cans/zorajelly name = "\improper Royal Jelly" @@ -246,9 +192,7 @@ icon_state = "royaljelly" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/cans/zorajelly/Initialize() - . = ..() - reagents.add_reagent("zora_jelly", 30) + reagents_to_add = list(/datum/reagent/drink/zorasoda/jelly = 30) /obj/item/reagent_containers/food/drinks/cans/adhomai_milk name = "fermented fatshouters milk" @@ -257,27 +201,18 @@ center_of_mass = list("x"=16, "y"=10) desc_fluff = "Fermend fatshouters milk is a drink that originated among the nomadic populations of Rhazar'Hrujmagh, and it has spread to the rest of Adhomai." -/obj/item/reagent_containers/food/drinks/cans/adhomai_milk/Initialize() - . = ..() - reagents.add_reagent("adhomai_milk", 30) + reagents_to_add = list(/datum/reagent/drink/milk/adhomai/fermented = 30) /obj/item/reagent_containers/food/drinks/cans/beetle_milk name = "\improper Hakhma Milk" desc = "A can of Hakhma beetle milk, sourced from Scarab and Drifter communities." icon_state = "beetlemilk" center_of_mass = list("x"=17, "y"=10) - -/obj/item/reagent_containers/food/drinks/cans/beetle_milk/Initialize() - . = ..() - reagents.add_reagent("beetle_milk", 30) + reagents_to_add = list(/datum/reagent/drink/milk/beetle = 30) /obj/item/reagent_containers/food/drinks/cans/dyn name = "Cooling Breeze" desc = "The most refreshing thing you can find on the market, based on a Skrell medicinal plant. No salt or sugar. " icon_state = "dyncan" center_of_mass = list("x"=16, "y"=10) - -/obj/item/reagent_containers/food/drinks/cans/dyn/Initialize() - . = ..() - reagents.add_reagent("dyncold", 30) - + reagents_to_add = list(/datum/reagent/drink/dynjuice/cold = 30) diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index cee57d12a17..9c0db75caa3 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -15,6 +15,11 @@ center_of_mass = list("x"=16, "y"=6) volume = 50 var/next_shake + var/fixed_state = FALSE + +/obj/item/reagent_containers/food/condiment/Initialize() + . = ..() + on_reagent_change(force = TRUE) /obj/item/reagent_containers/food/condiment/proc/shake(var/mob/user) if(world.time >= next_shake) @@ -31,130 +36,51 @@ /obj/item/reagent_containers/food/condiment/self_feed_message(var/mob/user) to_chat(user, "You swallow some of contents of \the [src].") -/obj/item/reagent_containers/food/condiment/on_reagent_change() - if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "flour" || icon_state == "spacespicebottle") +/obj/item/reagent_containers/food/condiment/on_reagent_change(var/force = FALSE) + if(fixed_state && !force) return - if(reagents.reagent_list.len > 0) - switch(reagents.get_master_reagent_id()) - if("ketchup") - name = "ketchup" - desc = "You feel more American already." - icon_state = "ketchup" - center_of_mass = list("x"=16, "y"=6) - if("capsaicin") - name = "hotsauce" - desc = "You can almost TASTE the stomach ulcers now!" - icon_state = "hotsauce" - center_of_mass = list("x"=16, "y"=6) - if("enzyme") - name = "universal enzyme" - desc = "Used in cooking various dishes." - icon_state = "enzyme" - center_of_mass = list("x"=16, "y"=6) - if("soysauce") - name = "soy sauce" - desc = "A salty soy-based flavoring." - icon_state = "soysauce" - center_of_mass = list("x"=16, "y"=6) - if("frostoil") - name = "coldsauce" - desc = "Leaves the tongue numb in its passage." - icon_state = "coldsauce" - center_of_mass = list("x"=16, "y"=6) - if("sodiumchloride") - name = "salt shaker" - desc = "Salt. From space oceans, presumably." - icon_state = "saltshaker" - center_of_mass = list("x"=17, "y"=11) - if("blackpepper") - name = "pepper mill" - desc = "Often used to flavor food or make people sneeze." - icon_state = "peppermillsmall" - center_of_mass = list("x"=17, "y"=11) - if("cornoil") - name = "corn oil" - desc = "A delicious oil used in cooking. Made from corn." - icon_state = "oliveoil" - center_of_mass = list("x"=16, "y"=6) - if("sugar") - name = "sugar" - desc = "Tastey space sugar!" - center_of_mass = list("x"=16, "y"=6) - if("spacespice") - name = "bottle of space spice" - desc = "An exotic blend of spices for cooking. It must flow." - icon_state = "spacespicebottle" - center_of_mass = list("x"=16, "y"=10) - if("barbecue") - name = "barbecue sauce" - desc = "Barbecue sauce, it's labeled 'sweet and spicy'." - icon_state = "barbecue" - center_of_mass = list("x"=16, "y"=6) - if("garlicsauce") - name = "garlic sauce" - desc = "Garlic sauce, perfect for spicing up a plate of garlic." - center_of_mass = list("x"=16, "y"=6) - else - desc = "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them." - icon_state = "mixedcondiments" - center_of_mass = list("x"=16, "y"=6) - else + if(!LAZYLEN(reagents.reagent_list)) icon_state = "emptycondiment" name = "condiment bottle" desc = "An empty condiment bottle." center_of_mass = list("x"=16, "y"=6) return -/obj/item/reagent_containers/food/condiment/enzyme - name = "universal enzyme" - desc = "Used in cooking various dishes." - icon_state = "enzyme" - center_of_mass = list("x"=16, "y"=6) + var/datum/reagent/master = reagents.get_master_reagent() + name = master.condiment_name || (reagents.reagent_list.len == 1) ? "[master.name] bottle" : "condiment bottle" + desc = master.condiment_desc || (reagents.reagent_list.len == 1) ? master.description : "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them." + icon_state = master.condiment_icon_state || "mixedcondiments" + center_of_mass = master.condiment_center_of_mass || list("x"=16, "y"=6) -/obj/item/reagent_containers/food/condiment/enzyme/Initialize() - . = ..() - reagents.add_reagent("enzyme", 50) +/obj/item/reagent_containers/food/condiment/enzyme + fixed_state = TRUE + reagents_to_add = list(/datum/reagent/enzyme = 50) /obj/item/reagent_containers/food/condiment/sugar - name = "sugar" - desc = "Tastey space sugar!" - center_of_mass = list("x"=16, "y"=6) + fixed_state = TRUE + reagents_to_add = list(/datum/reagent/sugar = 50) -/obj/item/reagent_containers/food/condiment/sugar/Initialize() - . = ..() - reagents.add_reagent("sugar", 50) - -/obj/item/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then - name = "salt shaker" // a large one. - desc = "Salt. From space oceans, presumably." - icon_state = "saltshakersmall" +/obj/item/reagent_containers/food/condiment/shaker + name = "shaker" center_of_mass = list("x"=17, "y"=11) - possible_transfer_amounts = list(1,20) //for clown turning the lid off amount_per_transfer_from_this = 1 - volume = 20 + fixed_state = TRUE -/obj/item/reagent_containers/food/condiment/saltshaker/attack_self(mob/user) +/obj/item/reagent_containers/food/condiment/shaker/Initialize() + . = ..() + possible_transfer_amounts = list(1, volume) + +/obj/item/reagent_containers/food/condiment/shaker/attack_self(mob/user) shake(user) -/obj/item/reagent_containers/food/condiment/saltshaker/Initialize() - . = ..() - reagents.add_reagent("sodiumchloride", 20) - -/obj/item/reagent_containers/food/condiment/peppermill - name = "pepper mill" - desc = "Often used to flavor food or make people sneeze." - icon_state = "peppermillsmall" - center_of_mass = list("x"=17, "y"=11) - possible_transfer_amounts = list(1,20) //for clown turning the lid off - amount_per_transfer_from_this = 1 +/obj/item/reagent_containers/food/condiment/shaker/salt volume = 20 + fixed_state = TRUE + reagents_to_add = list(/datum/reagent/sodiumchloride = 20) -/obj/item/reagent_containers/food/condiment/peppermill/attack_self(mob/user) - shake(user) - -/obj/item/reagent_containers/food/condiment/peppermill/Initialize() - . = ..() - reagents.add_reagent("blackpepper", 20) +/obj/item/reagent_containers/food/condiment/shaker/peppermill + volume = 20 + reagents_to_add = list(/datum/reagent/blackpepper = 20) /obj/item/reagent_containers/food/condiment/flour name = "flour sack" @@ -164,43 +90,23 @@ item_state = "flour" center_of_mass = list("x"=16, "y"=8) volume = 220 + fixed_state = TRUE + reagents_to_add = list(/datum/reagent/nutriment/flour = 200) /obj/item/reagent_containers/food/condiment/flour/Initialize() . = ..() - reagents.add_reagent("flour", 200) randpixel_xy() -/obj/item/reagent_containers/food/condiment/spacespice - name = "space spices" - desc = "An exotic blend of spices for cooking. It must flow." +/obj/item/reagent_containers/food/condiment/shaker/spacespice icon_state = "spacespicebottle" - center_of_mass = list("x"=16, "y"=10) - possible_transfer_amounts = list(1,40) //for clown turning the lid off - amount_per_transfer_from_this = 1 volume = 40 - -/obj/item/reagent_containers/food/condiment/spacespice/attack_self(mob/user) - shake(user) - -/obj/item/reagent_containers/food/condiment/spacespice/Initialize() - . = ..() - reagents.add_reagent("spacespice", 40) + reagents_to_add = list(/datum/reagent/spacespice = 40) /obj/item/reagent_containers/food/condiment/barbecue - name = "barbecue sauce" - desc = "Barbecue sauce, it's labeled 'sweet and spicy'." icon_state = "barbecue" - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/condiment/barbecue/Initialize() - ..() - reagents.add_reagent("barbecue", 50) + fixed_state = TRUE + reagents_to_add = list(/datum/reagent/nutriment/barbecue = 20) /obj/item/reagent_containers/food/condiment/garlicsauce - name = "garlic sauce" - desc = "Garlic sauce, perfect for spicing up a plate of garlic." - center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/condiment/garlicsauce/Initialize() - ..() - reagents.add_reagent("garlicsauce", 50) + fixed_state = TRUE + reagents_to_add = list(/datum/reagent/nutriment/garlicsauce = 50) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 335250afaf0..5330e81fb1e 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -144,10 +144,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' center_of_mass = list("x"=16, "y"=9) - -/obj/item/reagent_containers/food/drinks/milk/Initialize() - . = ..() - reagents.add_reagent("milk", 50) + reagents_to_add = list(/datum/reagent/drink/milk = 50) /obj/item/reagent_containers/food/drinks/soymilk name = "soymilk" @@ -157,10 +154,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' center_of_mass = list("x"=16, "y"=9) - -/obj/item/reagent_containers/food/drinks/soymilk/Initialize() - . = ..() - reagents.add_reagent("soymilk", 50) + reagents_to_add = list(/datum/reagent/drink/milk/soymilk = 50) /obj/item/reagent_containers/food/drinks/coffee name = "robust coffee" @@ -172,10 +166,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' center_of_mass = list("x"=16, "y"=11) - -/obj/item/reagent_containers/food/drinks/coffee/Initialize() - . = ..() - reagents.add_reagent("coffee", 30) + reagents_to_add = list(/datum/reagent/drink/coffee = 30) /obj/item/reagent_containers/food/drinks/pslatte name = "seasonal pumpkin spice latte" @@ -188,10 +179,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' center_of_mass = list("x"=16, "y"=11) - -/obj/item/reagent_containers/food/drinks/pslatte/Initialize() - . = ..() - reagents.add_reagent("sadpslatte", 30) + reagents_to_add = list(/datum/reagent/drink/coffee/sadpslatte = 30) /obj/item/reagent_containers/food/drinks/tea name = "duke purple tea" @@ -203,10 +191,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' center_of_mass = list("x"=16, "y"=14) - -/obj/item/reagent_containers/food/drinks/tea/Initialize() - . = ..() - reagents.add_reagent("tea", 30) + reagents_to_add = list(/datum/reagent/drink/tea = 30) /obj/item/reagent_containers/food/drinks/greentea name = "green tea" @@ -219,10 +204,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' center_of_mass = list("x"=16, "y"=14) - -/obj/item/reagent_containers/food/drinks/greentea/Initialize() - . = ..() - reagents.add_reagent("greentea", 30) + reagents_to_add = list(/datum/reagent/drink/tea/greentea = 30) /obj/item/reagent_containers/food/drinks/hotcider name = "hot cider" @@ -235,10 +217,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' center_of_mass = list("x"=16, "y"=14) - -/obj/item/reagent_containers/food/drinks/hotcider/Initialize() - . = ..() - reagents.add_reagent("ciderhot", 30) + reagents_to_add = list(/datum/reagent/drink/ciderhot = 30) /obj/item/reagent_containers/food/drinks/chaitea name = "chai tea" @@ -251,10 +230,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' center_of_mass = list("x"=16, "y"=14) - -/obj/item/reagent_containers/food/drinks/chaitea/Initialize() - . = ..() - reagents.add_reagent("chaitea", 30) + reagents_to_add = list(/datum/reagent/drink/tea/chaitea = 30) /obj/item/reagent_containers/food/drinks/ice name = "ice cup" @@ -266,10 +242,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' center_of_mass = list("x"=15, "y"=10) - -/obj/item/reagent_containers/food/drinks/ice/Initialize() - . = ..() - reagents.add_reagent("ice", 30) + reagents_to_add = list(/datum/reagent/drink/ice = 30) /obj/item/reagent_containers/food/drinks/h_chocolate name = "dutch hot coco" @@ -281,10 +254,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' center_of_mass = list("x"=15, "y"=13) - -/obj/item/reagent_containers/food/drinks/h_chocolate/Initialize() - . = ..() - reagents.add_reagent("hot_coco", 30) + reagents_to_add = list(/datum/reagent/drink/hot_coco = 30) /obj/item/reagent_containers/food/drinks/dry_ramen name = "cup ramen" @@ -296,11 +266,15 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/datum/reagent/drink/dry_ramen = 30) + is_liquid = FALSE -/obj/item/reagent_containers/food/drinks/dry_ramen/Initialize() - . = ..() - reagents.add_reagent("dry_ramen", 30) - +/obj/item/reagent_containers/food/drinks/dry_ramen/on_reagent_change() + ..() + if(reagents.has_reagent("dry_ramen")) + is_liquid = FALSE + else + is_liquid = TRUE /obj/item/reagent_containers/food/drinks/sillycup name = "paper cup" @@ -375,63 +349,49 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I desc = "Full of vitamins and deliciousness!" icon_state = "orangejuice" -/obj/item/reagent_containers/food/drinks/carton/orangejuice/Initialize() - . = ..() - reagents.add_reagent("orangejuice", 100) + reagents_to_add = list(/datum/reagent/drink/orangejuice = 100) /obj/item/reagent_containers/food/drinks/carton/cream name = "milk cream" desc = "It's cream. Made from milk. What else did you think you'd find in there?" icon_state = "cream" -/obj/item/reagent_containers/food/drinks/carton/cream/Initialize() - . = ..() - reagents.add_reagent("cream", 100) + reagents_to_add = list(/datum/reagent/drink/milk/cream = 100) /obj/item/reagent_containers/food/drinks/carton/tomatojuice name = "tomato juice" desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." icon_state = "tomatojuice" -/obj/item/reagent_containers/food/drinks/carton/tomatojuice/Initialize() - . = ..() - reagents.add_reagent("tomatojuice", 100) + reagents_to_add = list(/datum/reagent/drink/tomatojuice = 100) /obj/item/reagent_containers/food/drinks/carton/limejuice name = "lime juice" desc = "Sweet-sour goodness." icon_state = "limejuice" -/obj/item/reagent_containers/food/drinks/carton/limejuice/Initialize() - . = ..() - reagents.add_reagent("limejuice", 100) + reagents_to_add = list(/datum/reagent/drink/limejuice = 100) /obj/item/reagent_containers/food/drinks/carton/lemonjuice name = "lemon juice" desc = "This juice is VERY sour." icon_state = "lemoncarton" -/obj/item/reagent_containers/food/drinks/carton/lemonjuice/Initialize() - . = ..() - reagents.add_reagent("lemonjuice", 100) + reagents_to_add = list(/datum/reagent/drink/lemonjuice = 100) /obj/item/reagent_containers/food/drinks/carton/dynjuice name = "dyn juice" desc = "Juice from a Skrell medicinal herb. It's supposed to be diluted." icon_state = "dyncarton" -/obj/item/reagent_containers/food/drinks/carton/dynjuice/Initialize() - . = ..() - reagents.add_reagent("dynjuice", 100) + reagents_to_add = list(/datum/reagent/drink/dynjuice = 100) /obj/item/reagent_containers/food/drinks/carton/applejuice name = "apple juice" desc = "Juice from an apple. Yes." icon_state = "applejuice" -/obj/item/reagent_containers/food/drinks/carton/applejuice/Initialize() - . = ..() - reagents.add_reagent("applejuice", 100) + reagents_to_add = list(/datum/reagent/drink/applejuice = 100) //////////////////////////drinkingglass and shaker// //Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 4689d1526fd..f72366d7b98 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -78,7 +78,7 @@ if(!rag && istype(W, /obj/item/reagent_containers/glass/rag)) insert_rag(W, user) return - if(rag && istype(W, /obj/item/flame)) + if(rag && W.isFlameSource()) rag.attackby(W, user) return ..() @@ -193,10 +193,7 @@ desc = "A bottle of high quality gin, produced in the New London Space Station." icon_state = "ginbottle" center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/gin/Initialize() - . = ..() - reagents.add_reagent("gin", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/gin = 100) /obj/item/reagent_containers/food/drinks/bottle/victorygin name = "Victory gin" @@ -206,10 +203,7 @@ desc_fluff = "Adhomian beverages are commonly made with fermented grains or vegetables, if alcoholic, or juices mixed with sugar or honey. Victory gin is the most \ widespread alcoholic drink in Adhomai, the result of the fermentation of honey extracted from Messa's tears, but its production and consumption is slowly declining due to the \ People's Republic situation in the current conflict." - -/obj/item/reagent_containers/food/drinks/bottle/victorygin/Initialize() - . = ..() - reagents.add_reagent("victorygin", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/victorygin = 100) /obj/item/reagent_containers/food/drinks/bottle/whiskey name = "Uncle Git's Special Reserve" @@ -218,47 +212,35 @@ center_of_mass = list("x"=16, "y"=4) Initialize() . = ..() - reagents.add_reagent("whiskey", 100) + reagents.add_reagent(/datum/reagent/alcohol/ethanol/whiskey, 100) /obj/item/reagent_containers/food/drinks/bottle/fireball name = "Uncle Git's Cinnamon Fireball" desc = "A premium single-malt whiskey, infused with cinnamon and hot pepper inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES." icon_state = "whiskeybottle" center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/fireball/Initialize() - . = ..() - reagents.add_reagent("fireball", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/fireball = 100) /obj/item/reagent_containers/food/drinks/bottle/vodka name = "Tunguska Triple Distilled" desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide." icon_state = "vodkabottle" center_of_mass = list("x"=17, "y"=4) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/vodka = 100) -/obj/item/reagent_containers/food/drinks/bottle/vodka/Initialize() - . = ..() - reagents.add_reagent("vodka", 100) - -/obj/item/reagent_containers/food/drinks/bottle/tequilla +/obj/item/reagent_containers/food/drinks/bottle/tequila name = "Caccavo Guaranteed Quality tequila" desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" - icon_state = "tequillabottle" + icon_state = "tequilabottle" center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/tequilla/Initialize() - . = ..() - reagents.add_reagent("tequilla", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/tequila = 100) /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing name = "bottle of nothing" desc = "A bottle filled with nothing" icon_state = "bottleofnothing" center_of_mass = list("x"=16, "y"=5) - -/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/Initialize() - . = ..() - reagents.add_reagent("nothing", 100) + reagents_to_add = list(/datum/reagent/drink/nothing = 100) /obj/item/reagent_containers/food/drinks/bottle/bitters name = "Angstra Aromatic Bitters" @@ -268,7 +250,7 @@ /obj/item/reagent_containers/food/drinks/bottle/bitters/Initialize() . = ..() - reagents.add_reagent("bitters",40) + reagents.add_reagent(/datum/reagent/alcohol/ethanol/bitters,40) /obj/item/reagent_containers/food/drinks/bottle/champagne name = "Tailfeather's Bubbliest champagne" @@ -278,37 +260,28 @@ /obj/item/reagent_containers/food/drinks/bottle/champagne/Initialize() . = ..() - reagents.add_reagent("champagne",100) + reagents.add_reagent(/datum/reagent/alcohol/ethanol/champagne,100) /obj/item/reagent_containers/food/drinks/bottle/mintsyrup name = "Wintergreen Mint Syrup" desc = "Minty fresh. NOTE: Do not use as a replacement for breath fresheners." icon_state = "mint_syrup" center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/mintsyrup/Initialize() - . = ..() - reagents.add_reagent("mintsyrup", 100) + reagents_to_add = list(/datum/reagent/drink/mintsyrup = 100) /obj/item/reagent_containers/food/drinks/bottle/patron name = "Wrapp Artiste patron" - desc = "Silver laced tequilla, served in space night clubs across the galaxy." + desc = "Silver laced tequila, served in space night clubs across the galaxy." icon_state = "patronbottle" center_of_mass = list("x"=16, "y"=7) - -/obj/item/reagent_containers/food/drinks/bottle/patron/Initialize() - . = ..() - reagents.add_reagent("patron", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/patron = 100) /obj/item/reagent_containers/food/drinks/bottle/rum name = "Captain Pete's Cuban Spiced rum" desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle." icon_state = "rumbottle" center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/rum/Initialize() - . = ..() - reagents.add_reagent("rum", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/rum = 100) /obj/item/reagent_containers/food/drinks/bottle/holywater name = "flask of holy water" @@ -316,70 +289,49 @@ icon_state = "holyflask" center_of_mass = list("x"=17, "y"=10) drink_flags = NO_EMPTY_ICON - -/obj/item/reagent_containers/food/drinks/bottle/holywater/Initialize() - . = ..() - reagents.add_reagent("holywater", 100) + reagents_to_add = list(/datum/reagent/water/holywater = 100) /obj/item/reagent_containers/food/drinks/bottle/vermouth name = "Goldeneye vermouth" desc = "Sweet, sweet dryness~" icon_state = "vermouthbottle" center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/vermouth/Initialize() - . = ..() - reagents.add_reagent("vermouth", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/vermouth = 100) /obj/item/reagent_containers/food/drinks/bottle/kahlua name = "Robert Robust's coffee liqueur" desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK" icon_state = "kahluabottle" center_of_mass = list("x"=16, "y"=5) - -/obj/item/reagent_containers/food/drinks/bottle/kahlua/Initialize() - . = ..() - reagents.add_reagent("kahlua", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/coffee/kahlua = 100) /obj/item/reagent_containers/food/drinks/bottle/goldschlager name = "College Girl goldschlager" desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." icon_state = "goldschlagerbottle" center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/goldschlager/Initialize() - . = ..() - reagents.add_reagent("goldschlager", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/goldschlager = 100) /obj/item/reagent_containers/food/drinks/bottle/cognac name = "Chateau De Baton Premium cognac" desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." icon_state = "cognacbottle" center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/cognac/Initialize() - . = ..() - reagents.add_reagent("cognac", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/cognac = 100) /obj/item/reagent_containers/food/drinks/bottle/wine name = "Doublebeard Bearded Red Wine" desc = "A faint aura of unease and asspainery surrounds the bottle." icon_state = "winebottle" center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/wine/Initialize() - . = ..() - reagents.add_reagent("wine", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/wine = 100) /obj/item/reagent_containers/food/drinks/bottle/absinthe name = "Jailbreaker Verte" desc = "One sip of this and you just know you're gonna have a good time." icon_state = "absinthebottle" center_of_mass = list("x"=16, "y"=7) - -/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize() - . = ..() - reagents.add_reagent("absinthe", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/absinthe = 100) /obj/item/reagent_containers/food/drinks/bottle/melonliquor name = "Emeraldine melon liquor" @@ -388,10 +340,7 @@ center_of_mass = list("x"=16, "y"=6) drink_flags = IS_GLASS | UNIQUE_EMPTY_ICON empty_icon_state = "alco-blue_empty" - -/obj/item/reagent_containers/food/drinks/bottle/melonliquor/Initialize() - . = ..() - reagents.add_reagent("melonliquor", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/melonliquor = 100) /obj/item/reagent_containers/food/drinks/bottle/bluecuracao name = "Miss blue curacao" @@ -399,10 +348,7 @@ icon_state = "alco-blue" //Placeholder. empty_icon_state = "alco-clear" center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/bluecuracao/Initialize() - . = ..() - reagents.add_reagent("bluecuracao", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/bluecuracao = 100) /obj/item/reagent_containers/food/drinks/bottle/grenadine name = "Briar Rose grenadine syrup" @@ -410,10 +356,7 @@ icon_state = "grenadinebottle" drink_flags = IS_GLASS | NO_EMPTY_ICON center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/grenadine/Initialize() - . = ..() - reagents.add_reagent("grenadine", 100) + reagents_to_add = list(/datum/reagent/drink/grenadine = 100) /obj/item/reagent_containers/food/drinks/bottle/cola name = "space cola" @@ -423,10 +366,7 @@ drink_flags = NO_EMPTY_ICON drop_sound = 'sound/items/drop/shoes.ogg' pickup_sound = 'sound/items/pickup/shoes.ogg' - -/obj/item/reagent_containers/food/drinks/bottle/cola/Initialize() - . = ..() - reagents.add_reagent("cola", 100) + reagents_to_add = list(/datum/reagent/drink/space_cola = 100) /obj/item/reagent_containers/food/drinks/bottle/space_up name = "\improper Space-Up" @@ -436,10 +376,7 @@ drink_flags = NO_EMPTY_ICON drop_sound = 'sound/items/drop/shoes.ogg' pickup_sound = 'sound/items/pickup/shoes.ogg' - -/obj/item/reagent_containers/food/drinks/bottle/space_up/Initialize() - . = ..() - reagents.add_reagent("space_up", 100) + reagents_to_add = list(/datum/reagent/drink/spaceup = 100) /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind name = "\improper Space Mountain Wind" @@ -449,20 +386,14 @@ drink_flags = NO_EMPTY_ICON drop_sound = 'sound/items/drop/shoes.ogg' pickup_sound = 'sound/items/pickup/shoes.ogg' - -/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize() - . = ..() - reagents.add_reagent("spacemountainwind", 100) + reagents_to_add = list(/datum/reagent/drink/spacemountainwind = 100) /obj/item/reagent_containers/food/drinks/bottle/pwine name = "Warlock's Velvet" desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!" icon_state = "pwinebottle" center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/pwine/Initialize() - . = ..() - reagents.add_reagent("pwine", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/pwine = 100) //Small bottles /obj/item/reagent_containers/food/drinks/bottle/small @@ -480,9 +411,7 @@ icon_state = "beer" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/bottle/small/beer/Initialize() - . = ..() - reagents.add_reagent("beer", 30) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/beer = 30) /obj/item/reagent_containers/food/drinks/bottle/small/ale name = "\improper Magm-ale" @@ -491,9 +420,7 @@ item_state = "beer" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/bottle/small/ale/Initialize() - . = ..() - reagents.add_reagent("ale", 30) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/ale = 30) //aurora's drinks @@ -502,80 +429,56 @@ desc = "A green, strong liqueur." icon_state = "chartreusegreenbottle" center_of_mass = list("x" = 15,"y" = 5) - -/obj/item/reagent_containers/food/drinks/bottle/chartreusegreen/Initialize() - . = ..() - reagents.add_reagent("chartreusegreen", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/chartreusegreen = 100) /obj/item/reagent_containers/food/drinks/bottle/chartreuseyellow name = "yellow chartreuse" desc = "A yellow, strong liqueur." icon_state = "chartreuseyellowbottle" center_of_mass = list("x" = 15,"y" = 5) - -/obj/item/reagent_containers/food/drinks/bottle/chartreuseyellow/Initialize() - . = ..() - reagents.add_reagent("chartreuseyellow", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/chartreuseyellow = 100) /obj/item/reagent_containers/food/drinks/bottle/cremewhite name = "white creme de menthe" desc = "Mint-flavoured alcohol, in a bottle." icon_state = "whitecremebottle" center_of_mass = list("x" = 16,"y" = 5) - -/obj/item/reagent_containers/food/drinks/bottle/cremewhite/Initialize() - . = ..() - reagents.add_reagent("cremewhite", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/cremewhite = 100) /obj/item/reagent_containers/food/drinks/bottle/cremeyvette name = "Creme de Yvette" desc = "Berry-flavoured alcohol, in a bottle." icon_state = "cremedeyvettebottle" center_of_mass = list("x" = 16,"y" = 6) - -/obj/item/reagent_containers/food/drinks/bottle/cremeyvette/Initialize() - . = ..() - reagents.add_reagent("cremeyvette", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/cremeyvette = 100) /obj/item/reagent_containers/food/drinks/bottle/brandy name = "brandy" desc = "Cheap knock off for cognac." icon_state = "brandybottle" center_of_mass = list("x" = 15,"y" = 8) - -/obj/item/reagent_containers/food/drinks/bottle/brandy/Initialize() - . = ..() - reagents.add_reagent("brandy", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/brandy = 100) /obj/item/reagent_containers/food/drinks/bottle/guinness name = "Guinness" desc = "A bottle of good old Guinness." icon_state = "guinness_bottle" center_of_mass = list("x" = 15,"y" = 4) - -/obj/item/reagent_containers/food/drinks/bottle/guinness/Initialize() - . = ..() - reagents.add_reagent("guinness", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/guinness = 100) /obj/item/reagent_containers/food/drinks/bottle/drambuie name = "Drambuie" desc = "A bottle of Drambuie." icon_state = "drambuie_bottle" center_of_mass = list("x" = 16,"y" = 6) - -/obj/item/reagent_containers/food/drinks/bottle/drambuie/Initialize() - . = ..() - reagents.add_reagent("drambuie", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/drambuie = 100) /obj/item/reagent_containers/food/drinks/bottle/sbiten name = "sbiten" desc = "A bottle full of sweet sbiten." icon_state = "sbitenbottle" center_of_mass = list("x" = 16,"y" = 7) - -/obj/item/reagent_containers/food/drinks/bottle/sbiten/Initialize() - . = ..() - reagents.add_reagent("sbiten", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/sbiten = 100) /obj/item/reagent_containers/food/drinks/bottle/messa_mead name = "messa's mead" @@ -585,10 +488,7 @@ desc_fluff = "Adhomian beverages are commonly made with fermented grains or vegetables, if alcoholic, or juices mixed with sugar or honey. Victory gin is the most \ widespread alcoholic drink in Adhomai, the result of the fermentation of honey extracted from Messa's tears, but its production and consumption is slowly declining due to the \ People's Republic situation in the current conflict. Messa's mead is also another more traditional alternative, made with honey and fermented Earthen-Root juice." - -/obj/item/reagent_containers/food/drinks/bottle/messa_mead/Initialize() - . = ..() - reagents.add_reagent("messa_mead", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/messa_mead = 100) // Butanol-based alcoholic drinks //===================================== @@ -600,19 +500,14 @@ icon_state = "xuizibottle" center_of_mass = list("x"=16, "y"=8) -/obj/item/reagent_containers/food/drinks/bottle/small/xuizijuice/Initialize() - . = ..() - reagents.add_reagent("xuizijuice", 30) + reagents_to_add = list(/datum/reagent/alcohol/butanol/xuizijuice = 30) /obj/item/reagent_containers/food/drinks/bottle/sarezhiwine name = "Sarezhi Wine" desc = "A premium Moghean wine made from Sareszhi berries. Bottled by the Arizi Guild for over 200 years." icon_state = "sarezhibottle" center_of_mass = list("x" = 16,"y" = 6) - -/obj/item/reagent_containers/food/drinks/bottle/sarezhiwine/Initialize() - . = ..() - reagents.add_reagent("sarezhiwine", 100) + reagents_to_add = list(/datum/reagent/alcohol/butanol/sarezhiwine = 100) // Synnono Meme (Bottled) Drinks //====================================== @@ -623,17 +518,11 @@ desc = "A distillation of figs, imported from the Serene Republic of Elyra. Makes an excellent apertif or digestif." icon_state = "boukhabottle" center_of_mass = list("x"=16, "y"=6) - -/obj/item/reagent_containers/food/drinks/bottle/boukha/Initialize() - . = ..() - reagents.add_reagent("boukha", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/boukha = 100) /obj/item/reagent_containers/food/drinks/bottle/whitewine name = "Doublebeard Bearded White Wine" desc = "A faint aura of unease and asspainery surrounds the bottle." icon_state = "whitewinebottle" center_of_mass = list("x"=16, "y"=4) - -/obj/item/reagent_containers/food/drinks/bottle/whitewine/Initialize() - . = ..() - reagents.add_reagent("whitewine", 100) + reagents_to_add = list(/datum/reagent/alcohol/ethanol/whitewine = 100) diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index 6e6a9f83910..512c8cbd855 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -20,7 +20,7 @@ desc = "Two or more drinks, mixed together."*/ /*else if(reagents.reagent_list.len == 1) for(var/datum/reagent/R in reagents.reagent_list) - switch(R.id)*/ + switch(R.type)*/ if (reagents.reagent_list.len > 0) var/datum/reagent/R = reagents.get_master_reagent() @@ -54,11 +54,11 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/soda Initialize() . = ..() - reagents.add_reagent("sodawater", 50) + reagents.add_reagent(/datum/reagent/drink/sodawater, 50) on_reagent_change() /obj/item/reagent_containers/food/drinks/drinkingglass/cola Initialize() . = ..() - reagents.add_reagent("cola", 50) + reagents.add_reagent(/datum/reagent/drink/space_cola, 50) on_reagent_change() diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 742e1ea9ae0..7e6fdc3a8e9 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -71,7 +71,7 @@ var/list/lunchables_drinks_ = list( // This default list is a bit different, it contains items we don't want var/list/lunchables_drink_reagents_ = list( /datum/reagent/drink/nothing, - /datum/reagent/drink/doctor_delight, + /datum/reagent/drink/doctorsdelight, /datum/reagent/drink/dry_ramen, /datum/reagent/drink/hell_ramen, /datum/reagent/drink/hot_ramen, @@ -135,6 +135,6 @@ var/list/lunchables_alcohol_reagents_ = list( if(reagent_type in banned_reagents) continue var/datum/reagent/reagent = reagent_type - .[initial(reagent.name)] = initial(reagent.id) + .[initial(reagent.name)] = reagent_type sortTim(., /proc/cmp_text_asc) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index d362e618d44..4523da48b0a 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1,6 +1,3 @@ -#define NUTRIMENT_GOOD "nutriment" -#define NUTRIMENT_BAD "synnutriment" - //Food items that are eaten normally and don't leave anything behind. /obj/item/reagent_containers/food/snacks name = "snack" @@ -16,9 +13,6 @@ var/slices_num var/dried_type = null var/dry = 0 - var/nutriment_amt = 0 - var/nutriment_type = NUTRIMENT_GOOD - var/list/nutriment_desc = list("food" = 1) var/datum/reagent/nutriment/coating/coating = null var/icon/flat_icon = null //Used to cache a flat icon generated from dipping in batter. This is used again to make the cooked-batter-overlay var/do_coating_prefix = 1 @@ -32,11 +26,6 @@ //Placeholder for effect that trigger on eating that aren't tied to reagents. var/flavor = null // set_flavor() -/obj/item/reagent_containers/food/snacks/Initialize() - . = ..() - if (nutriment_amt) - reagents.add_reagent(nutriment_type, nutriment_amt, nutriment_desc) - /obj/item/reagent_containers/food/snacks/standard_splash_mob(var/mob/user, var/mob/target) return 1 //Returning 1 will cancel everything else in a long line of things it should do. @@ -68,7 +57,7 @@ m_bitesize = min(m_bitesize, reagents.total_volume) if (!SA.can_eat() || ((user.reagents.maximum_volume - user.reagents.total_volume) < m_bitesize * 0.5)) - to_chat(user,span("danger","\The [target.name] can't stomach anymore food!")) + to_chat(user, SPAN_DANGER("\The [target.name] can't stomach anymore food!")) return amount_eaten = reagents.trans_to_mob(SA, min(reagents.total_volume,m_bitesize), CHEM_INGEST) @@ -76,18 +65,18 @@ if (amount_eaten) bitecount++ if (amount_eaten >= m_bitesize) - user.visible_message(span("notice","\The [user] feeds \the [target] \the [src].")) + user.visible_message(SPAN_NOTICE("\The [user] feeds \the [target] \the [src].")) if (!istype(target.loc, /turf))//held mobs don't see visible messages - to_chat(target,span("notice","\The [user] feeds you \the [src].")) + to_chat(target, SPAN_NOTICE("\The [user] feeds you \the [src].")) else - user.visible_message(span("notice","\The [user] feeds \the [target] a tiny bit of \the [src]. It looks full.")) + user.visible_message(SPAN_NOTICE("\The [user] feeds \the [target] a tiny bit of \the [src]. It looks full.")) if (!istype(target.loc, /turf)) - to_chat(target,span("notice","\The [user] feeds you a tiny bit of \the [src]. You feel pretty full!")) + to_chat(target, SPAN_NOTICE("\The [user] feeds you a tiny bit of \the [src]. You feel pretty full!")) return 1 else var/fullness = 0 if(!istype(user, /mob/living/carbon)) - fullness = user.max_nutrition > 0 ? (user.nutrition + (user.reagents.get_reagent_amount("nutriment") * 25)) / user.max_nutrition : CREW_NUTRITION_OVEREATEN + 0.01 + fullness = user.max_nutrition > 0 ? (user.nutrition + (user.reagents.get_reagent_amount(/datum/reagent/nutriment) * 25)) / user.max_nutrition : CREW_NUTRITION_OVEREATEN + 0.01 else var/mob/living/carbon/eater = user fullness = eater.get_fullness() @@ -114,14 +103,14 @@ feedback_message = "You unwillingly [is_liquid ? "sip" : "chew"] a bit of \the [src]." if(is_full) - to_chat(user,span("danger",feedback_message)) + to_chat(user, SPAN_DANGER(feedback_message)) return reagents.trans_to_mob(target, min(reagents.total_volume,bitesize), CHEM_INGEST) else if(!target.can_force_feed(user, src)) return if(is_full) - to_chat(user,span("warning","\The [target] can't stomach any more food!")) + to_chat(user, SPAN_WARNING("\The [target] can't stomach any more food!")) return other_feed_message_start(user,target) @@ -145,17 +134,17 @@ if(!..(user, 1)) return if(name != initial(name)) - to_chat(user, span("notice", "You know the item as [initial(name)], however a little piece of propped up paper indicates it's \a [name].")) + to_chat(user, SPAN_NOTICE("You know the item as [initial(name)], however a little piece of propped up paper indicates it's \a [name].")) if (coating) - to_chat(user, span("notice", "It's coated in [coating.name]!")) + to_chat(user, SPAN_NOTICE("It's coated in [coating.name]!")) if (bitecount==0) return else if (bitecount==1) - to_chat(user, span("notice", "\The [src] was bitten by someone!")) + to_chat(user, SPAN_NOTICE("\The [src] was bitten by someone!")) else if (bitecount<=3) - to_chat(user, span("notice", "\The [src] was bitten [bitecount] time\s!")) + to_chat(user, SPAN_NOTICE("\The [src] was bitten [bitecount] time\s!")) else - to_chat(user, span("notice", "\The [src] was bitten multiple times!")) + to_chat(user, SPAN_NOTICE("\The [src] was bitten multiple times!")) /obj/item/reagent_containers/food/snacks/attackby(obj/item/W, mob/living/user) @@ -165,14 +154,14 @@ if(selection == "Name") var/input_clean_name = sanitize(input(user,"What is the name of this food?", "Set Food Name") as text|null, MAX_LNAME_LEN) if(input_clean_name) - user.visible_message(span("notice", "\The [user] labels \the [name] as \"[input_clean_name]\".")) + user.visible_message(SPAN_NOTICE("\The [user] labels \the [name] as \"[input_clean_name]\".")) name = input_clean_name else name = initial(name) else if(selection == "Description") var/input_clean_desc = sanitize(input(user,"What is the description of this food?", "Set Food Description") as text|null, MAX_MESSAGE_LEN) if(input_clean_desc) - user.visible_message(span("notice", "\The [user] adds a note to \the [name].")) + user.visible_message(SPAN_NOTICE("\The [user] adds a note to \the [name].")) desc = input_clean_desc else desc = initial(desc) @@ -186,7 +175,7 @@ if(istype(W,/obj/item/material/kitchen/utensil)) var/obj/item/material/kitchen/utensil/U = W if(istype(W,/obj/item/material/kitchen/utensil/fork)&&(is_liquid)) - to_chat(user, span("notice", "You uselessly pass \the [U] through \the [src].")) + to_chat(user, SPAN_NOTICE("You uselessly pass \the [U] through \the [src].")) playsound(user.loc, 'sound/effects/pour.ogg', 10, 1) return else @@ -195,12 +184,12 @@ U.create_reagents(5) if (U.reagents.total_volume > 0) - to_chat(user, span("warning", "You already have \the [src] on \the [U].")) + to_chat(user, SPAN_WARNING("You already have \the [src] on \the [U].")) return user.visible_message( \ "\The [user] scoops up some of \the [src] with \the [U]!", \ - span("notice", "You scoop up some of \the [src] with \the [U]!") \ + SPAN_NOTICE("You scoop up some of \the [src] with \the [U]!") \ ) bitecount++ @@ -229,7 +218,7 @@ if (W.w_class >= src.w_class || is_robot_module(W)) return - to_chat(user, span("warning", "You slip \the [W] inside \the [src].")) + to_chat(user, SPAN_WARNING("You slip \the [W] inside \the [src].")) user.remove_from_mob(W) W.dropped(user) add_fingerprint(user) @@ -238,15 +227,15 @@ if(has_edge(W)) if (!can_slice_here) - to_chat(user, span("warning", "You cannot slice \the [src] here! You need a table or at least a tray to do it.")) + to_chat(user, SPAN_WARNING("You cannot slice \the [src] here! You need a table or at least a tray to do it.")) return var/slices_lost = 0 if(W.w_class > 3) - user.visible_message(span("notice", "\The [user] crudely slices \the [src] with [W]!"), span("notice", "You crudely slice \the [src] with your [W]!")) + user.visible_message(SPAN_NOTICE("\The [user] crudely slices \the [src] with [W]!"), SPAN_NOTICE("You crudely slice \the [src] with your [W]!")) slices_lost = rand(1,min(1,round(slices_num/2))) else - user.visible_message(span("notice", "\The [user] slices \the [src]!"), span("notice", "You slice \the [src]!")) + user.visible_message(SPAN_NOTICE("\The [user] slices \the [src]!"), SPAN_NOTICE("You slice \the [src]!")) var/reagents_per_slice = reagents.total_volume/slices_num for(var/i=1 to (slices_num-slices_lost)) @@ -299,10 +288,10 @@ return 0 if (C.volume < req) - to_chat(user, span("warning", "There's not enough [C.name] to coat the [src]!")) + to_chat(user, SPAN_WARNING("There's not enough [C.name] to coat the [src]!")) return 0 - var/id = C.id + var/id = C.type //First make sure there's space for our batter if (reagents.get_free_space() < req+5) @@ -334,7 +323,7 @@ add_overlay(J) if (user) - user.visible_message(span("notice", "[user] dips \the [src] into \the [coating.name]"), span("notice", "You dip \the [src] into \the [coating.name]")) + user.visible_message(SPAN_NOTICE("[user] dips \the [src] into \the [coating.name]"), SPAN_NOTICE("You dip \the [src] into \the [coating.name]")) return 1 @@ -393,13 +382,13 @@ var/mob/living/simple_animal/SA = user m_bitesize = bitesize * SA.bite_factor //Modified bitesize based on creature size if(!SA.can_eat()) - to_chat(user, span("danger", "You're too full to eat anymore!")) + to_chat(user, SPAN_DANGER("You're too full to eat anymore!")) return if(reagents && user.reagents) m_bitesize = min(m_bitesize, reagents.total_volume) if(((user.reagents.maximum_volume - user.reagents.total_volume) < m_bitesize * 0.5)) //If the creature can't even stomach half a bite, then it eats nothing - to_chat(user, span("danger", "You're too full to eat anymore!")) + to_chat(user, SPAN_DANGER("You're too full to eat anymore!")) return reagents.trans_to_mob(user, m_bitesize, CHEM_INGEST) @@ -434,10 +423,7 @@ // name = "xenoburger" //Name that displays in the UI. // desc = "Smells caustic. Tastes like heresy." //Duh // icon_state = "xburger" //Refers to an icon in food.dmi -//obj/item/reagent_containers/food/snacks/burger/xeno/Initialize() //Don't mess with this. And always use Full Path Structure -// . = ..() //Same here. -// reagents.add_reagent("xenomicrobes", 10) //This is what is in the food item. you may copy/paste -// reagents.add_reagent("nutriment", 2) // this line of code for all the contents. +// reagents_to_add = list(/datum/reagent/xenomicrobes = 10, /datum/reagent/nutriment = 2) //This is what is in the food item. // bitesize = 3 //This is the amount each bite consumes. /obj/item/reagent_containers/food/snacks/koisbar_clean @@ -447,11 +433,7 @@ trash = /obj/item/trash/koisbar filling_color = "#dcd9cd" bitesize = 5 - -/obj/item/reagent_containers/food/snacks/koisbar_clean/Initialize() - . = ..() - reagents.add_reagent("koispasteclean", 10) - reagents.add_reagent("phoron", 15) + reagents_to_add = list(/datum/reagent/kois/clean = 10, /datum/reagent/toxin/phoron = 15) /obj/item/reagent_containers/food/snacks/koisbar name = "organic k'ois bar" @@ -460,12 +442,7 @@ trash = /obj/item/trash/koisbar filling_color = "#dcd9cd" bitesize = 5 - -/obj/item/reagent_containers/food/snacks/koisbar/Initialize() - . = ..() - reagents.add_reagent("koispaste", 10) - reagents.add_reagent("phoron", 15) - reagents.add_reagent("hfcs", 2) + reagents_to_add = list(/datum/reagent/kois = 10, /datum/reagent/toxin/phoron = 15) /obj/item/reagent_containers/food/snacks/salad/aesirsalad name = "aesir salad" @@ -473,14 +450,13 @@ icon_state = "aesirsalad" trash = /obj/item/trash/snack_bowl filling_color = "#468C00" - nutriment_amt = 8 - nutriment_desc = list("apples" = 3,"salad" = 5) + + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("apples" = 3,"salad" = 5)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/salad/aesirsalad/Initialize() - . = ..() - reagents.add_reagent("doctorsdelight", 8) - reagents.add_reagent("tricordrazine", 8) + reagents_to_add = list(/datum/reagent/drink/doctorsdelight = 8) + reagents_to_add = list(/datum/reagent/tricordrazine = 8) /obj/item/reagent_containers/food/snacks/candy name = "candy" @@ -488,13 +464,12 @@ icon_state = "candy" trash = /obj/item/trash/candy filling_color = "#7D5F46" - nutriment_amt = 3 - nutriment_desc = list("chocolate" = 2, "nougat" = 1) + + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("chocolate" = 2, "nougat" = 1)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/candy/Initialize() - . = ..() - reagents.add_reagent("sugar", 3) + reagents_to_add = list(/datum/reagent/sugar = 3) /obj/item/reagent_containers/food/snacks/candy/koko name = "\improper koko bar" @@ -502,40 +477,36 @@ icon_state = "kokobar" trash = /obj/item/trash/kokobar filling_color = "#7D5F46" - nutriment_amt = 4 - nutriment_desc = list("koko reed" = 2, "fibers" = 1) + + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("koko reed" = 2, "fibers" = 1)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/candy/koko/Initialize() - . = ..() - reagents.add_reagent("sugar", 3) - reagents.add_reagent("kokoreed", 7) + reagents_to_add = list(/datum/reagent/sugar = 3) + reagents_to_add = list(/datum/reagent/mental/kokoreed = 7) /obj/item/reagent_containers/food/snacks/candy/donor name = "donor candy" icon_state = "candy" desc = "A little treat for blood donors. Made with real sugar!" trash = /obj/item/trash/candy - nutriment_desc = list("candy" = 10) + reagent_data = list(/datum/reagent/nutriment = list("candy" = 10)) bitesize = 5 -/obj/item/reagent_containers/food/snacks/candy/donor/Initialize() - . = ..() - reagents.add_reagent("nutriment", 10) - reagents.add_reagent("sugar", 3) + reagents_to_add = list(/datum/reagent/nutriment = 10) + reagents_to_add = list(/datum/reagent/sugar = 3) /obj/item/reagent_containers/food/snacks/candy_corn name = "candy corn" desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas." icon_state = "candy_corn" filling_color = "#FFFCB0" - nutriment_amt = 4 - nutriment_desc = list("candy corn" = 4) + + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("candy corn" = 4)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/candy_corn/Initialize() - . = ..() - reagents.add_reagent("sugar", 2) + reagents_to_add = list(/datum/reagent/sugar = 2) /obj/item/reagent_containers/food/snacks/chips name = "chips" @@ -543,9 +514,8 @@ icon_state = "chips" trash = /obj/item/trash/chips filling_color = "#E8C31E" - nutriment_amt = 3 - nutriment_type = NUTRIMENT_BAD - nutriment_desc = list("chips" = 3) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 3) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("chips" = 3)) bitesize = 1 /obj/item/reagent_containers/food/snacks/cookie @@ -553,8 +523,8 @@ desc = "COOKIE!!!" icon_state = "COOKIE!!!" filling_color = "#DBC94F" - nutriment_amt = 5 - nutriment_desc = list("sweetness" = 3, "cookie" = 2) + reagents_to_add = list(/datum/reagent/nutriment = 2, /datum/reagent/sugar = 3) + reagent_data = list(/datum/reagent/nutriment = list("cookie" = 2)) bitesize = 1 /obj/item/reagent_containers/food/snacks/cookiesnack @@ -563,9 +533,8 @@ icon_state = "cookiesnack" trash = /obj/item/trash/cookiesnack filling_color = "#DBC94F" - nutriment_amt = 3 - nutriment_type = NUTRIMENT_BAD - nutriment_desc = list("sweetness" = 1, "stale cookie" = 2) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 2, /datum/reagent/sugar = 1) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("stale cookie" = 2)) bitesize = 1 /obj/item/reagent_containers/food/snacks/chocolatebar @@ -573,8 +542,9 @@ desc = "Such sweet, fattening food." icon_state = "chocolatebar" filling_color = "#7D5F46" - nutriment_amt = 2 - nutriment_desc = list("chocolate" = 5) + + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("chocolate" = 5)) bitesize = 2 /obj/item/reagent_containers/food/snacks/chocolateegg @@ -582,8 +552,9 @@ desc = "Eggcellent." icon_state = "chocolateegg" filling_color = "#7D5F46" - nutriment_amt = 3 - nutriment_desc = list("chocolate" = 5) + + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("chocolate" = 5)) bitesize = 2 //a random egg that can spawn only on easter. It has really good food values because it's rare @@ -592,8 +563,9 @@ desc = "It's the golden egg!" icon_state = "egg-yellow" filling_color = "#7D5F46" - nutriment_amt = 12 - nutriment_desc = list("chocolate" = 5) + + reagents_to_add = list(/datum/reagent/nutriment = 12) + reagent_data = list(/datum/reagent/nutriment = list("chocolate" = 5)) bitesize = 6 /obj/item/reagent_containers/food/snacks/donut @@ -602,71 +574,71 @@ icon_state = "donut1" filling_color = "#D9C386" overlay_state = "box-donut1" - nutriment_desc = list("sweetness" = 1, "donut" = 2) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 1, "donut" = 2)) /obj/item/reagent_containers/food/snacks/donut/normal name = "donut" desc = "Goes great with Robust Coffee." icon_state = "donut1" - nutriment_desc = list("sweetness" = 1, "donut" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 1, "donut" = 2)) bitesize = 3 /obj/item/reagent_containers/food/snacks/donut/normal/psdonut name = "pumpkin spice donut" desc = "A limited edition seasonal pastry." icon_state = "donut_ps" - nutriment_desc = list("pumpkin spice" = 1, "donut" = 2) + reagent_data = list(/datum/reagent/nutriment = list("pumpkin spice" = 1, "donut" = 2)) + reagents_to_add = list(/datum/reagent/nutriment/sprinkles = 1) /obj/item/reagent_containers/food/snacks/donut/normal/Initialize() . = ..() - reagents.add_reagent("sprinkles", 1) if(prob(30)) src.icon_state = "donut2" src.overlay_state = "box-donut2" src.name = "frosted donut" - reagents.add_reagent("sprinkles", 2) + reagents.add_reagent(/datum/reagent/nutriment/sprinkles, 2) /obj/item/reagent_containers/food/snacks/donut/chaos name = "chaos donut" desc = "Like life, it never quite tastes the same." icon_state = "donut1" filling_color = "#ED11E6" - nutriment_desc = list("sweetness" = 1, "donut" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 1, "donut" = 2)) bitesize = 10 + reagents_to_add = list(/datum/reagent/nutriment = 5, /datum/reagent/nutriment/sprinkles = 1) + /obj/item/reagent_containers/food/snacks/donut/chaos/Initialize() . = ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("sprinkles", 1) - var/chaosselect = pick(1,2,3,4,5,6,7,8,9,10) + var/chaosselect = pick(1, 2, 3, 4, 5, 6, 7, 8, 9, 10) switch(chaosselect) if(1) - reagents.add_reagent("nutriment", 3) + reagents.add_reagent(/datum/reagent/nutriment, 3) if(2) - reagents.add_reagent("capsaicin", 3) + reagents.add_reagent(/datum/reagent/capsaicin, 3) if(3) - reagents.add_reagent("frostoil", 3) + reagents.add_reagent(/datum/reagent/frostoil, 3) if(4) - reagents.add_reagent("sprinkles", 3) + reagents.add_reagent(/datum/reagent/nutriment/sprinkles, 3) if(5) - reagents.add_reagent("phoron", 3) + reagents.add_reagent(/datum/reagent/toxin/phoron, 3) if(6) - reagents.add_reagent("coco", 3) + reagents.add_reagent(/datum/reagent/nutriment/coco, 3) if(7) - reagents.add_reagent("slimejelly", 3) + reagents.add_reagent(/datum/reagent/slimejelly, 3) if(8) - reagents.add_reagent("banana", 3) + reagents.add_reagent(/datum/reagent/drink/banana, 3) if(9) - reagents.add_reagent("berryjuice", 3) + reagents.add_reagent(/datum/reagent/drink/berryjuice, 3) if(10) - reagents.add_reagent("tricordrazine", 3) + reagents.add_reagent(/datum/reagent/tricordrazine, 3) if(prob(30)) src.icon_state = "donut2" src.overlay_state = "box-donut2" src.name = "Frosted Chaos Donut" - reagents.add_reagent("sprinkles", 2) + reagents.add_reagent(/datum/reagent/nutriment/sprinkles, 2) /obj/item/reagent_containers/food/snacks/donut/jelly @@ -674,58 +646,55 @@ desc = "You jelly?" icon_state = "jdonut1" filling_color = "#ED1169" - nutriment_desc = list("sweetness" = 1, "donut" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 1, "donut" = 2)) bitesize = 5 + reagents_to_add = list(/datum/reagent/nutriment/sprinkles = 1, /datum/reagent/drink/berryjuice = 5) /obj/item/reagent_containers/food/snacks/donut/jelly/Initialize() - . = ..() - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("berryjuice", 5) if(prob(30)) src.icon_state = "jdonut2" src.overlay_state = "box-donut2" src.name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) + reagents_to_add += list(/datum/reagent/nutriment/sprinkles = 2) + . = ..() /obj/item/reagent_containers/food/snacks/donut/slimejelly name = "jelly donut" desc = "You jelly?" icon_state = "jdonut1" filling_color = "#ED1169" - nutriment_desc = list("sweetness" = 1, "donut" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 1, "donut" = 2)) bitesize = 5 + reagents_to_add = list(/datum/reagent/nutriment/sprinkles = 1, /datum/reagent/slimejelly = 5) + /obj/item/reagent_containers/food/snacks/donut/slimejelly/Initialize() - . = ..() - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("slimejelly", 5) if(prob(30)) src.icon_state = "jdonut2" src.overlay_state = "box-donut2" src.name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) + reagents_to_add += list(/datum/reagent/nutriment/sprinkles = 2) + . = ..() /obj/item/reagent_containers/food/snacks/donut/cherryjelly name = "jelly donut" desc = "You jelly?" icon_state = "jdonut1" filling_color = "#ED1169" - nutriment_desc = list("sweetness" = 1, "donut" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 1, "donut" = 2)) bitesize = 5 + reagents_to_add = list(/datum/reagent/nutriment = 3, /datum/reagent/nutriment/sprinkles = 1, /datum/reagent/nutriment/cherryjelly = 5) /obj/item/reagent_containers/food/snacks/donut/cherryjelly/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("cherryjelly", 5) if(prob(30)) src.icon_state = "jdonut2" src.overlay_state = "box-donut2" src.name = "Frosted Jelly Donut" - reagents.add_reagent("sprinkles", 2) + reagents_to_add += list(/datum/reagent/nutriment/sprinkles = 2) + . = ..() /obj/item/reagent_containers/food/snacks/funnelcake name = "funnel cake" @@ -734,11 +703,7 @@ filling_color = "#Ef1479" do_coating_prefix = 0 bitesize = 2 - -/obj/item/reagent_containers/food/snacks/funnelcake/Initialize() - . = ..() - reagents.add_reagent("batter", 10) - reagents.add_reagent("sugar", 5) + reagents_to_add = list(/datum/reagent/nutriment/coating/batter = 10, /datum/reagent/sugar = 5) /obj/item/reagent_containers/food/snacks/egg name = "egg" @@ -746,10 +711,7 @@ icon_state = "egg" filling_color = "#FDFFD1" volume = 10 - -/obj/item/reagent_containers/food/snacks/egg/Initialize() - . = ..() - reagents.add_reagent("egg", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/egg = 3) /obj/item/reagent_containers/food/snacks/egg/afterattack(obj/O as obj, mob/user as mob, proximity) if(istype(O,/obj/machinery/microwave)) @@ -764,7 +726,7 @@ ..() new/obj/effect/decal/cleanable/egg_smudge(src.loc) src.reagents.splash(hit_atom, reagents.total_volume) - src.visible_message(span("warning", "\The [src] has been squashed!"),span("warning", "You hear a smack.")) + src.visible_message(SPAN_WARNING("\The [src] has been squashed!"), SPAN_WARNING("You hear a smack.")) qdel(src) /obj/item/reagent_containers/food/snacks/egg/attackby(obj/item/W as obj, mob/user as mob) @@ -773,10 +735,10 @@ var/clr = C.colourName if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow"))) - to_chat(usr, span("notice", "The egg refuses to take on this color!")) + to_chat(usr, SPAN_NOTICE("The egg refuses to take on this color!")) return - to_chat(usr, span("notice", "You color \the [src] [clr]")) + to_chat(usr, SPAN_NOTICE("You color \the [src] [clr]")) icon_state = "egg-[clr]" else ..() @@ -811,12 +773,7 @@ icon_state = "friedegg" filling_color = "#FFDF78" bitesize = 1 - -/obj/item/reagent_containers/food/snacks/friedegg/Initialize() - . = ..() - reagents.add_reagent("egg", 3) - reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("blackpepper", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein/egg = 3, /datum/reagent/sodiumchloride = 1, /datum/reagent/blackpepper = 1) /obj/item/reagent_containers/food/snacks/boiledegg name = "boiled egg" @@ -824,9 +781,7 @@ icon_state = "egg" filling_color = "#FFFFFF" -/obj/item/reagent_containers/food/snacks/boiledegg/Initialize() - . = ..() - reagents.add_reagent("egg", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein/egg = 2) /obj/item/reagent_containers/food/snacks/organ name = "organ" @@ -838,8 +793,8 @@ /obj/item/reagent_containers/food/snacks/organ/Initialize() . = ..() - reagents.add_reagent("protein", rand(3,5)) - reagents.add_reagent("toxin", rand(1,3)) + reagents.add_reagent(/datum/reagent/nutriment/protein, rand(3,5)) + reagents.add_reagent(/datum/reagent/toxin, rand(1,3)) /obj/item/reagent_containers/food/snacks/tofu name = "tofu" @@ -849,31 +804,27 @@ center_of_mass = list("x"=17, "y"=10) bitesize = 3 -/obj/item/reagent_containers/food/snacks/tofu/Initialize() - . = ..() - reagents.add_reagent("tofu", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/tofu = 3) /obj/item/reagent_containers/food/snacks/tofurkey name = "tofurkey" desc = "A fake turkey made from tofu." icon_state = "tofurkey" filling_color = "#FFFEE0" - nutriment_amt = 6 - nutriment_desc = list("turkey" = 3) - bitesize = 3 -/obj/item/reagent_containers/food/snacks/tofurkey/Initialize() - . = ..() - reagents.add_reagent("tofu", 6) - reagents.add_reagent("stoxin", 3) + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("turkey" = 3)) + bitesize = 3 + reagents_to_add = list(/datum/reagent/nutriment/protein/tofu = 6, /datum/reagent/soporific = 3) /obj/item/reagent_containers/food/snacks/stuffing name = "stuffing" desc = "Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in!" icon_state = "stuffing" filling_color = "#C9AC83" - nutriment_amt = 3 - nutriment_desc = list("dryness" = 2, "bread" = 2) + + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("dryness" = 2, "bread" = 2)) bitesize = 1 /obj/item/reagent_containers/food/snacks/carpmeat @@ -882,11 +833,7 @@ icon_state = "fishfillet" filling_color = "#FFDEFE" bitesize = 6 - -/obj/item/reagent_containers/food/snacks/carpmeat/Initialize() - . = ..() - reagents.add_reagent("seafood", 3) - reagents.add_reagent("carpotoxin", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 3, /datum/reagent/toxin/carpotoxin = 3) /obj/item/reagent_containers/food/snacks/dwellermeat name = "worm fillet" @@ -894,12 +841,7 @@ icon_state = "fishfillet" filling_color = "#FFDEFE" bitesize = 6 - -/obj/item/reagent_containers/food/snacks/dwellermeat/Initialize() - . = ..() - reagents.add_reagent("seafood", 6) - reagents.add_reagent("hyperzine", 15) - reagents.add_reagent("pacid",6) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 6, /datum/reagent/hyperzine = 15, /datum/reagent/acid/polyacid = 6) /obj/item/reagent_containers/food/snacks/fishfingers name = "fish fingers" @@ -907,32 +849,28 @@ icon_state = "fishfingers" filling_color = "#FFDEFE" bitesize = 3 - -/obj/item/reagent_containers/food/snacks/fishfingers/Initialize() - . = ..() - reagents.add_reagent("seafood", 4) - reagents.add_reagent("carpotoxin", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 4, /datum/reagent/toxin/carpotoxin = 3) /obj/item/reagent_containers/food/snacks/hugemushroomslice name = "huge mushroom slice" desc = "There wasn't much room for that mushroom." icon_state = "hugemushroomslice" filling_color = "#E0D7C5" - nutriment_amt = 3 - nutriment_desc = list("raw" = 2, "mushroom" = 2) + + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("raw" = 2, "mushroom" = 2)) bitesize = 6 -/obj/item/reagent_containers/food/snacks/hugemushroomslice/Initialize() - . = ..() - reagents.add_reagent("psilocybin", 3) + reagents_to_add = list(/datum/reagent/psilocybin = 3) /obj/item/reagent_containers/food/snacks/tomatomeat name = "tomato slice" desc = "A slice from a huge tomato." icon_state = "tomatomeat" filling_color = "#DB0000" - nutriment_amt = 3 - nutriment_desc = list("raw" = 2, "tomato" = 3) + + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("raw" = 2, "tomato" = 3)) bitesize = 6 /obj/item/reagent_containers/food/snacks/bearmeat @@ -941,11 +879,7 @@ icon_state = "bearmeat" filling_color = "#DB0000" bitesize = 3 - -/obj/item/reagent_containers/food/snacks/bearmeat/Initialize() - . = ..() - reagents.add_reagent("protein", 12) - reagents.add_reagent("hyperzine", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 12, /datum/reagent/hyperzine = 5) /obj/item/reagent_containers/food/snacks/xenomeat name = "meat" @@ -954,10 +888,7 @@ filling_color = "#43DE18" bitesize = 6 -/obj/item/reagent_containers/food/snacks/xenomeat/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("pacid",6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/acid/polyacid = 6) /obj/item/reagent_containers/food/snacks/meatball name = "meatball" @@ -966,9 +897,7 @@ filling_color = "#DB0000" bitesize = 2 -/obj/item/reagent_containers/food/snacks/meatball/Initialize() - . = ..() - reagents.add_reagent("protein", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3) /obj/item/reagent_containers/food/snacks/sausage name = "sausage" @@ -977,9 +906,7 @@ filling_color = "#DB0000" bitesize = 2 -/obj/item/reagent_containers/food/snacks/sausage/Initialize() - . = ..() - reagents.add_reagent("protein", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6) /obj/item/reagent_containers/food/snacks/sausage/battered name = "battered sausage" @@ -988,12 +915,10 @@ filling_color = "#DB0000" do_coating_prefix = 0 bitesize = 2 + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/nutriment/coating/batter = 1.7, /datum/reagent/nutriment/triglyceride/oil = 1.5) /obj/item/reagent_containers/food/snacks/sausage/battered/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("batter", 1.7) - reagents.add_reagent("oil", 1.5) + coating = reagents.get_reagent(/datum/reagent/nutriment/coating/batter) /obj/item/reagent_containers/food/snacks/jalapeno_poppers name = "jalapeno popper" @@ -1001,14 +926,14 @@ icon_state = "popper" filling_color = "#00AA00" do_coating_prefix = 0 - nutriment_amt = 2 - nutriment_desc = list("chilli pepper" = 2) + + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("chilli pepper" = 2)) bitesize = 1 + reagents_to_add = list(/datum/reagent/nutriment/coating/batter = 2, /datum/reagent/nutriment/triglyceride/oil = 2) /obj/item/reagent_containers/food/snacks/jalapeno_poppers/Initialize() - . = ..() - reagents.add_reagent("batter", 2) - reagents.add_reagent("oil", 2) + coating = reagents.get_reagent(/datum/reagent/nutriment/coating/batter) /obj/item/reagent_containers/food/snacks/donkpocket name = "Donk-pocket" @@ -1016,47 +941,40 @@ icon_state = "donkpocket" filling_color = "#DEDEAB" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("heartiness" = 1, "dough" = 2) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("heartiness" = 1, "dough" = 2)) -/obj/item/reagent_containers/food/snacks/donkpocket/Initialize() - . = ..() - reagents.add_reagent("protein", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 2) /obj/item/reagent_containers/food/snacks/donkpocket/warm name = "cooked Donk-pocket" desc = "The cooked, reheatable food of choice for the seasoned spaceman." - nutriment_desc = list("warm heartiness" = 1, "dough" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("warm heartiness" = 1, "dough" = 2)) -/obj/item/reagent_containers/food/snacks/donkpocket/warm/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - reagents.add_reagent("tricordrazine", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 1) + reagents_to_add = list(/datum/reagent/tricordrazine = 5) /obj/item/reagent_containers/food/snacks/donkpocket/sinpocket name = "\improper Sin-pocket" desc = "The food of choice for the veteran. Do NOT overconsume. Use it in hand to heat and release chemicals." - nutriment_desc = list("delicious cruelty" = 1, "dough" = 2) + reagent_data = list(/datum/reagent/nutriment = list("delicious cruelty" = 1, "dough" = 2)) filling_color = "#6D6D00" - nutriment_amt = 3 var/has_been_heated = FALSE -/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket/Initialize() - . = ..() - reagents.add_reagent("protein", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein = 1, /datum/reagent/nutriment = 3) /obj/item/reagent_containers/food/snacks/donkpocket/sinpocket/attack_self(mob/user) if(has_been_heated) - to_chat(user, span("notice", "The heating chemicals have already been spent.")) + to_chat(user, SPAN_NOTICE("The heating chemicals have already been spent.")) return has_been_heated = TRUE - user.visible_message(span("notice", "[user] crushes \the [src] package."), "You crush \the [src] package and feel it rapidly heat up.") + user.visible_message(SPAN_NOTICE("[user] crushes \the [src] package."), "You crush \the [src] package and feel it rapidly heat up.") name = "cooked Sin-pocket" desc = "The food of choice for the veteran. Do NOT overconsume." - reagents.add_reagent("doctorsdelight", 5) - reagents.add_reagent("hyperzine", 1.5) - reagents.add_reagent("synaptizine", 1.25) + reagents.add_reagent(/datum/reagent/drink/doctorsdelight, 5) + reagents.add_reagent(/datum/reagent/hyperzine, 1.5) + reagents.add_reagent(/datum/reagent/synaptizine, 1.25) /obj/item/reagent_containers/food/snacks/burger/brain name = "brainburger" @@ -1066,10 +984,8 @@ center_of_mass = list("x"=15, "y"=11) bitesize = 2 -/obj/item/reagent_containers/food/snacks/burger/brain/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("alkysine", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6) + reagents_to_add = list(/datum/reagent/alkysine = 6) /obj/item/reagent_containers/food/snacks/burger/ghost name = "ghost burger" @@ -1077,8 +993,9 @@ icon_state = "ghostburger" filling_color = "#FFF2FF" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("buns" = 3, "spookiness" = 3) - nutriment_amt = 2 + + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("buns" = 3, "spookiness" = 3)) bitesize = 2 /obj/item/reagent_containers/food/snacks/human @@ -1093,22 +1010,18 @@ center_of_mass = list("x"=16, "y"=11) bitesize = 2 -/obj/item/reagent_containers/food/snacks/human/burger/Initialize() - . = ..() - reagents.add_reagent("protein", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6) /obj/item/reagent_containers/food/snacks/burger/cheese name = "cheeseburger" desc = "The cheese adds a good flavor." icon_state = "cheeseburger" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("bun" = 2) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("bun" = 2)) -/obj/item/reagent_containers/food/snacks/burger/cheese/Initialize() - . = ..() - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("cheese", 2) + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 2) /obj/item/reagent_containers/food/snacks/burger/monkey name = "burger" @@ -1116,13 +1029,11 @@ icon_state = "hburger" filling_color = "#D63C3C" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("bun" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("bun" = 2)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/burger/monkey/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3) + reagents_to_add = list(/datum/reagent/nutriment = 3) /obj/item/reagent_containers/food/snacks/burger/fish name = "fillet -o- carp sandwich" @@ -1132,10 +1043,8 @@ center_of_mass = list("x"=16, "y"=10) bitesize = 3 -/obj/item/reagent_containers/food/snacks/burger/fish/Initialize() - . = ..() - reagents.add_reagent("seafood", 6) - reagents.add_reagent("carpotoxin", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 6) + reagents_to_add = list(/datum/reagent/toxin/carpotoxin = 3) /obj/item/reagent_containers/food/snacks/burger/tofu name = "tofu burger" @@ -1143,13 +1052,12 @@ icon_state = "tofuburger" filling_color = "#FFFEE0" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("bun" = 2) - nutriment_amt = 3 + + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("bun" = 2)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/burger/tofu/Initialize() - . = ..() - reagents.add_reagent("tofu", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/tofu = 3) /obj/item/reagent_containers/food/snacks/burger/robo name = "roburger" @@ -1157,14 +1065,14 @@ icon_state = "roburger" filling_color = "#CCCCCC" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("bun" = 2, "metal" = 3) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("bun" = 2, "metal" = 3)) bitesize = 2 /obj/item/reagent_containers/food/snacks/burger/robo/Initialize() . = ..() if(prob(5)) - reagents.add_reagent("nanites", 2) + reagents.add_reagent(/datum/reagent/toxin/nanites, 2) /obj/item/reagent_containers/food/snacks/burger/robobig name = "roburger" @@ -1175,9 +1083,7 @@ center_of_mass = list("x"=16, "y"=11) bitesize = 0.1 -/obj/item/reagent_containers/food/snacks/burger/robobig/Initialize() - . = ..() - reagents.add_reagent("nanites", 100) + reagents_to_add = list(/datum/reagent/toxin/nanites = 100) /obj/item/reagent_containers/food/snacks/burger/xeno name = "xenoburger" @@ -1187,9 +1093,7 @@ center_of_mass = list("x"=16, "y"=11) bitesize = 2 -/obj/item/reagent_containers/food/snacks/burger/xeno/Initialize() - . = ..() - reagents.add_reagent("protein", 8) + reagents_to_add = list(/datum/reagent/nutriment/protein = 8) /obj/item/reagent_containers/food/snacks/burger/clown name = "clown burger" @@ -1197,8 +1101,8 @@ icon_state = "clownburger" filling_color = "#FF00FF" center_of_mass = list("x"=17, "y"=12) - nutriment_desc = list("bun" = 2, "crayons" = 3) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("bun" = 2, "crayons" = 3)) bitesize = 2 /obj/item/reagent_containers/food/snacks/burger/mime @@ -1207,8 +1111,8 @@ icon_state = "mimeburger" filling_color = "#FFFFFF" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("bun" = 2, "paint" = 3) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("bun" = 2, "paint" = 3)) bitesize = 2 /obj/item/reagent_containers/food/snacks/burger/mouse @@ -1218,9 +1122,7 @@ center_of_mass = list("x"=16, "y"=11) bitesize = 2 -/obj/item/reagent_containers/food/snacks/burger/mouse/Initialize() - . = ..() - reagents.add_reagent("protein", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 5) /obj/item/reagent_containers/food/snacks/omelette name = "omelette du fromage" @@ -1231,9 +1133,7 @@ center_of_mass = list("x"=16, "y"=13) bitesize = 1 -/obj/item/reagent_containers/food/snacks/omelette/Initialize() - . = ..() - reagents.add_reagent("egg", 8) + reagents_to_add = list(/datum/reagent/nutriment/protein/egg = 8) /obj/item/reagent_containers/food/snacks/muffin name = "muffin" @@ -1241,8 +1141,8 @@ icon_state = "muffin" filling_color = "#E0CF9B" center_of_mass = list("x"=17, "y"=4) - nutriment_desc = list("sweetness" = 3, "muffin" = 3) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 3, "muffin" = 3)) bitesize = 2 /obj/item/reagent_containers/food/snacks/pie @@ -1252,18 +1152,15 @@ trash = /obj/item/trash/plate filling_color = "#FBFFB8" center_of_mass = list("x"=16, "y"=13) - nutriment_desc = list("pie" = 3, "cream" = 2) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("pie" = 3, "cream" = 2)) bitesize = 3 - -/obj/item/reagent_containers/food/snacks/pie/Initialize() - . = ..() - reagents.add_reagent("banana",5) + reagents_to_add = list(/datum/reagent/drink/banana = 5) /obj/item/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom) ..() new/obj/effect/decal/cleanable/pie_smudge(src.loc) - src.visible_message(span("danger", "\The [src.name] splats."),span("danger", "You hear a splat.")) + src.visible_message(SPAN_DANGER("\The [src.name] splats."), SPAN_DANGER("You hear a splat.")) qdel(src) /obj/item/reagent_containers/food/snacks/berryclafoutis @@ -1272,13 +1169,11 @@ icon_state = "berryclafoutis" trash = /obj/item/trash/plate center_of_mass = list("x"=16, "y"=13) - nutriment_desc = list("sweetness" = 2, "pie" = 3) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 2, "pie" = 3)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/berryclafoutis/Initialize() - . = ..() - reagents.add_reagent("berryjuice", 5) + reagents_to_add = list(/datum/reagent/drink/berryjuice = 5) /obj/item/reagent_containers/food/snacks/waffles name = "waffles" @@ -1288,8 +1183,8 @@ drop_sound = 'sound/items/trayhit1.ogg' filling_color = "#E6DEB5" center_of_mass = list("x"=15, "y"=11) - nutriment_desc = list("waffle" = 8) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("waffle" = 8)) bitesize = 2 /obj/item/reagent_containers/food/snacks/eggplantparm @@ -1299,13 +1194,11 @@ trash = /obj/item/trash/plate filling_color = "#4D2F5E" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("eggplant" = 3) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("eggplant" = 3)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/eggplantparm/Initialize() - . = ..() - reagents.add_reagent("cheese", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 5) /obj/item/reagent_containers/food/snacks/soywafers name = "Soy Wafers" @@ -1315,8 +1208,8 @@ drop_sound = 'sound/items/trayhit1.ogg' filling_color = "#E6FA61" center_of_mass = list("x"=15, "y"=11) - nutriment_desc = list("bland dry soy" = 5) - nutriment_amt = 10 + reagents_to_add = list(/datum/reagent/nutriment = 10) + reagent_data = list(/datum/reagent/nutriment = list("bland dry soy" = 5)) bitesize = 2 /obj/item/reagent_containers/food/snacks/meatpie @@ -1328,9 +1221,7 @@ center_of_mass = list("x"=16, "y"=13) bitesize = 2 -/obj/item/reagent_containers/food/snacks/meatpie/Initialize() - . = ..() - reagents.add_reagent("protein", 10) + reagents_to_add = list(/datum/reagent/nutriment/protein = 10) /obj/item/reagent_containers/food/snacks/tofupie name = "tofu-pie" @@ -1339,13 +1230,11 @@ trash = /obj/item/trash/plate filling_color = "#FFFEE0" center_of_mass = list("x"=16, "y"=13) - nutriment_desc = list("pie" = 8) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("pie" = 8)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/tofupie/Initialize() - . = ..() - reagents.add_reagent("tofu", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/tofu = 3) /obj/item/reagent_containers/food/snacks/amanita_pie name = "amanita pie" @@ -1353,14 +1242,10 @@ icon_state = "amanita_pie" filling_color = "#FFCCCC" center_of_mass = list("x"=17, "y"=9) - nutriment_desc = list("sweetness" = 3, "mushroom" = 3, "pie" = 2) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 3, "mushroom" = 3, "pie" = 2)) bitesize = 3 - -/obj/item/reagent_containers/food/snacks/amanita_pie/Initialize() - . = ..() - reagents.add_reagent("amatoxin", 3) - reagents.add_reagent("psilocybin", 1) + reagents_to_add = list(/datum/reagent/toxin/amatoxin = 3, /datum/reagent/psilocybin = 1) /obj/item/reagent_containers/food/snacks/plump_pie name = "plump pie" @@ -1368,8 +1253,8 @@ icon_state = "plump_pie" filling_color = "#B8279B" center_of_mass = list("x"=17, "y"=9) - nutriment_desc = list("heartiness" = 2, "mushroom" = 3, "pie" = 3) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("heartiness" = 2, "mushroom" = 3, "pie" = 3)) bitesize = 2 /obj/item/reagent_containers/food/snacks/plump_pie/Initialize() @@ -1377,7 +1262,7 @@ if(prob(10)) name = "exceptional plump pie" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" - reagents.add_reagent("tricordrazine", 5) + reagents.add_reagent(/datum/reagent/tricordrazine, 5) /obj/item/reagent_containers/food/snacks/xemeatpie name = "xeno-pie" @@ -1388,9 +1273,7 @@ center_of_mass = list("x"=16, "y"=13) bitesize = 2 -/obj/item/reagent_containers/food/snacks/xemeatpie/Initialize() - . = ..() - reagents.add_reagent("protein", 10) + reagents_to_add = list(/datum/reagent/nutriment/protein = 10) /obj/item/reagent_containers/food/snacks/wingfangchu name = "wing fang chu" @@ -1401,9 +1284,7 @@ center_of_mass = list("x"=17, "y"=9) bitesize = 2 -/obj/item/reagent_containers/food/snacks/wingfangchu/Initialize() - . = ..() - reagents.add_reagent("protein", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6) /obj/item/reagent_containers/food/snacks/human/kabob name = "-kabob" @@ -1414,9 +1295,7 @@ center_of_mass = list("x"=17, "y"=15) bitesize = 2 -/obj/item/reagent_containers/food/snacks/human/kabob/Initialize() - . = ..() - reagents.add_reagent("protein", 8) + reagents_to_add = list(/datum/reagent/nutriment/protein = 8) /obj/item/reagent_containers/food/snacks/monkeykabob name = "meat-kabob" @@ -1427,9 +1306,7 @@ center_of_mass = list("x"=17, "y"=15) bitesize = 2 -/obj/item/reagent_containers/food/snacks/monkeykabob/Initialize() - . = ..() - reagents.add_reagent("protein", 8) + reagents_to_add = list(/datum/reagent/nutriment/protein = 8) /obj/item/reagent_containers/food/snacks/tofukabob name = "tofu-kabob" @@ -1440,9 +1317,7 @@ center_of_mass = list("x"=17, "y"=15) bitesize = 2 -/obj/item/reagent_containers/food/snacks/tofukabob/Initialize() - . = ..() - reagents.add_reagent("tofu", 8) + reagents_to_add = list(/datum/reagent/nutriment/protein/tofu = 8) /obj/item/reagent_containers/food/snacks/cubancarp name = "cuban carp" @@ -1452,13 +1327,7 @@ filling_color = "#E9ADFF" center_of_mass = list("x"=12, "y"=5) bitesize = 3 - -/obj/item/reagent_containers/food/snacks/cubancarp/Initialize() - . = ..() - reagents.add_reagent("seafood", 3) - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("carpotoxin", 3) - reagents.add_reagent("capsaicin", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 3, /datum/reagent/nutriment = 3, /datum/reagent/toxin/carpotoxin = 3, /datum/reagent/capsaicin = 3) /obj/item/reagent_containers/food/snacks/chickenkatsu name = "chicken katsu" @@ -1469,12 +1338,7 @@ center_of_mass = list("x"=16, "y"=16) do_coating_prefix = 0 bitesize = 1.5 - -/obj/item/reagent_containers/food/snacks/chickenkatsu/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("beerbatter", 2) - reagents.add_reagent("oil", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/nutriment/coating/beerbatter = 2, /datum/reagent/nutriment/triglyceride/oil = 1) /obj/item/reagent_containers/food/snacks/popcorn name = "popcorn" @@ -1484,17 +1348,17 @@ var/unpopped = 0 filling_color = "#FFFAD4" center_of_mass = list("x"=16, "y"=8) - nutriment_desc = list("popcorn" = 3) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("popcorn" = 3)) bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 /obj/item/reagent_containers/food/snacks/popcorn/Initialize() - ..() + . = ..() unpopped = rand(1,10) /obj/item/reagent_containers/food/snacks/popcorn/on_consume() if(prob(unpopped)) //lol ...what's the point? // IMPLEMENT DENTISTRY WHEN? - to_chat(usr, span("warning", "You bite down on an un-popped kernel!")) + to_chat(usr, SPAN_WARNING("You bite down on an un-popped kernel!")) unpopped = max(0, unpopped-1) ..() @@ -1505,13 +1369,9 @@ trash = /obj/item/trash/sosjerky filling_color = "#631212" center_of_mass = list("x"=15, "y"=9) - nutriment_type = NUTRIMENT_BAD bitesize = 3 -/obj/item/reagent_containers/food/snacks/sosjerky/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - reagents.add_reagent("sodiumchloride",3) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4, /datum/reagent/sodiumchloride = 3) /obj/item/reagent_containers/food/snacks/no_raisin name = "4no Raisins" @@ -1520,9 +1380,8 @@ trash = /obj/item/trash/raisins filling_color = "#343834" center_of_mass = list("x"=15, "y"=4) - nutriment_desc = list("dried raisins" = 6) - nutriment_type = NUTRIMENT_BAD - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 6) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("dried raisins" = 6)) bitesize = 3 /obj/item/reagent_containers/food/snacks/spacetwinkie @@ -1532,15 +1391,10 @@ trash = /obj/item/trash/space_twinkie filling_color = "#FFE591" center_of_mass = list("x"=15, "y"=11) - nutriment_desc = list("cake" = 3, "cream filling" = 1) - nutriment_type = NUTRIMENT_BAD - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 4) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("cake" = 3, "cream filling" = 1)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/spacetwinkie/Initialize() - . = ..() - reagents.add_reagent("sugar", 4) - /obj/item/reagent_containers/food/snacks/cheesiehonkers name = "Cheesie Honkers" icon_state = "cheesie_honkers" @@ -1548,16 +1402,10 @@ trash = /obj/item/trash/cheesie filling_color = "#FFA305" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("chips" = 2) - nutriment_type = NUTRIMENT_BAD - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/nutriment/protein/cheese = 3, /datum/reagent/sodiumchloride = 6) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("chips" = 2)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/cheesiehonkers/Initialize() - . = ..() - reagents.add_reagent("cheese", 3) - reagents.add_reagent("sodiumchloride",6) - /obj/item/reagent_containers/food/snacks/syndicake name = "Syndi-Cakes" icon_state = "syndi_cakes" @@ -1565,13 +1413,11 @@ filling_color = "#FF5D05" center_of_mass = list("x"=16, "y"=10) trash = /obj/item/trash/syndi_cakes - nutriment_desc = list("cake" = 1,"cream filling" = 3, ) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 1,"cream filling" = 3, )) bitesize = 3 -/obj/item/reagent_containers/food/snacks/syndicake/Initialize() - . = ..() - reagents.add_reagent("doctorsdelight", 5) + reagents_to_add = list(/datum/reagent/drink/doctorsdelight = 5) /obj/item/reagent_containers/food/snacks/loadedbakedpotato name = "loaded baked potato" @@ -1579,13 +1425,11 @@ icon_state = "loadedbakedpotato" filling_color = "#9C7A68" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("baked potato" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("baked potato" = 3)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/loadedbakedpotato/Initialize() - . = ..() - reagents.add_reagent("protein", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3) /obj/item/reagent_containers/food/snacks/fries name = "space fries" @@ -1594,13 +1438,10 @@ trash = /obj/item/trash/plate filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("fresh fries" = 4) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("fresh fries" = 4)) bitesize = 2 - -/obj/item/reagent_containers/food/snacks/fries/Initialize() - . = ..() - reagents.add_reagent("oil", 1.2)//This is mainly for the benefit of adminspawning + reagents_to_add = list(/datum/reagent/nutriment/triglyceride/oil = 1.2)//This is mainly for the benefit of adminspawning /obj/item/reagent_containers/food/snacks/microchips name = "micro chips" @@ -1609,8 +1450,8 @@ trash = /obj/item/trash/plate filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("fresh fries" = 4) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("fresh fries" = 4)) bitesize = 2 /obj/item/reagent_containers/food/snacks/ovenchips @@ -1620,8 +1461,8 @@ trash = /obj/item/trash/plate filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("fresh fries" = 4) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("fresh fries" = 4)) bitesize = 2 /obj/item/reagent_containers/food/snacks/soydope @@ -1631,8 +1472,8 @@ trash = /obj/item/trash/plate filling_color = "#C4BF76" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("soy" = 2) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("soy" = 2)) bitesize = 2 /obj/item/reagent_containers/food/snacks/spagetti @@ -1641,8 +1482,8 @@ icon_state = "spagetti" filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("noodles" = 2) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("noodles" = 2)) bitesize = 1 /obj/item/reagent_containers/food/snacks/cheesyfries @@ -1652,13 +1493,11 @@ trash = /obj/item/trash/plate filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("fresh fries" = 3) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("fresh fries" = 3)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/cheesyfries/Initialize() - . = ..() - reagents.add_reagent("cheese", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 3) /obj/item/reagent_containers/food/snacks/fortunecookie name = "fortune cookie" @@ -1666,8 +1505,8 @@ icon_state = "fortune_cookie" filling_color = "#E8E79E" center_of_mass = list("x"=15, "y"=14) - nutriment_desc = list("fortune cookie" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("fortune cookie" = 2)) bitesize = 2 /obj/item/reagent_containers/food/snacks/badrecipe @@ -1677,11 +1516,7 @@ filling_color = "#211F02" center_of_mass = list("x"=16, "y"=12) bitesize = 2 - -/obj/item/reagent_containers/food/snacks/badrecipe/Initialize() - . = ..() - reagents.add_reagent("toxin", 1) - reagents.add_reagent("carbon", 3) + reagents_to_add = list(/datum/reagent/toxin = 1, /datum/reagent/carbon = 3) /obj/item/reagent_containers/food/snacks/meatsteak name = "meat steak" @@ -1691,13 +1526,7 @@ filling_color = "#7A3D11" center_of_mass = list("x"=16, "y"=13) bitesize = 2 - -/obj/item/reagent_containers/food/snacks/meatsteak/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("triglyceride", 2) - reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("blackpepper", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/nutriment/triglyceride = 2, /datum/reagent/sodiumchloride = 1, /datum/reagent/blackpepper = 1) /obj/item/reagent_containers/food/snacks/meatsteak/update_icon() var/percent = round((reagents.total_volume / 10) * 100) @@ -1722,13 +1551,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#42B873" center_of_mass = list("x"=16, "y"=8) - nutriment_desc = list("mushroom" = 6) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("mushroom" = 6)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/spacylibertyduff/Initialize() - . = ..() - reagents.add_reagent("psilocybin", 6) + reagents_to_add = list(/datum/reagent/psilocybin = 6) /obj/item/reagent_containers/food/snacks/amanitajelly name = "amanita jelly" @@ -1737,14 +1564,10 @@ trash = /obj/item/trash/snack_bowl filling_color = "#ED0758" center_of_mass = list("x"=16, "y"=5) - nutriment_desc = list("jelly" = 3, "mushroom" = 3) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("jelly" = 3, "mushroom" = 3)) bitesize = 3 - -/obj/item/reagent_containers/food/snacks/amanitajelly/Initialize() - . = ..() - reagents.add_reagent("amatoxin", 6) - reagents.add_reagent("psilocybin", 3) + reagents_to_add = list(/datum/reagent/toxin/amatoxin = 6, /datum/reagent/psilocybin = 3) /obj/item/reagent_containers/food/snacks/poppypretzel name = "poppy pretzel" @@ -1753,15 +1576,15 @@ bitesize = 2 filling_color = "#916E36" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("poppy seeds" = 2, "pretzel" = 3) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("poppy seeds" = 2, "pretzel" = 3)) bitesize = 2 /obj/item/reagent_containers/food/snacks/soup name = "water soup" desc = "Water. And it tastes...fuck all." icon_state = "wishsoup" - nutriment_desc = list("soup" = 5) + reagent_data = list(/datum/reagent/nutriment = list("soup" = 5)) trash = /obj/item/trash/snack_bowl center_of_mass = list("x"=16, "y"=8) bitesize = 5 @@ -1773,20 +1596,16 @@ icon_state = "meatballsoup" filling_color = "#785210" -/obj/item/reagent_containers/food/snacks/soup/meatball/Initialize() - . = ..() - reagents.add_reagent("protein", 8) - reagents.add_reagent("water", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 8) + reagents_to_add = list(/datum/reagent/water = 5) /obj/item/reagent_containers/food/snacks/soup/slime name = "slime soup" desc = "If no water is available, you may substitute tears." filling_color = "#C4DBA0" -/obj/item/reagent_containers/food/snacks/soup/slime/Initialize() - . = ..() - reagents.add_reagent("slimejelly", 5) - reagents.add_reagent("water", 10) + reagents_to_add = list(/datum/reagent/slimejelly = 5) + reagents_to_add = list(/datum/reagent/water = 10) /obj/item/reagent_containers/food/snacks/soup/blood name = "tomato soup" @@ -1794,95 +1613,84 @@ icon_state = "tomatosoup" filling_color = "#FF0000" -/obj/item/reagent_containers/food/snacks/soup/blood/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - reagents.add_reagent("blood", 10) - reagents.add_reagent("water", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 2) + reagents_to_add = list(/datum/reagent/blood = 10, /datum/reagent/water = 5) /obj/item/reagent_containers/food/snacks/clownstears name = "clown's tears" desc = "Not very funny." icon_state = "clownstears" filling_color = "#C4FBFF" - nutriment_desc = list("salt" = 1, "the worst joke" = 3) - nutriment_amt = 4 - -/obj/item/reagent_containers/food/snacks/clownstears/Initialize() - . = ..() - reagents.add_reagent("banana", 5) - reagents.add_reagent("water", 10) + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("salt" = 1, "the worst joke" = 3)) + reagents_to_add = list(/datum/reagent/drink/banana = 5, /datum/reagent/water = 10) /obj/item/reagent_containers/food/snacks/soup/vegetable name = "vegetable soup" desc = "A true vegan meal" //TODO icon_state = "vegetablesoup" filling_color = "#AFC4B5" - nutriment_desc = list("carrot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("carrot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2)) -/obj/item/reagent_containers/food/snacks/soup/vegetable/Initialize() - . = ..() - reagents.add_reagent("water", 5) + reagents_to_add = list(/datum/reagent/water = 5) /obj/item/reagent_containers/food/snacks/soup/nettle name = "nettle soup" desc = "To think, the botanist would've beat you to death with one of these." icon_state = "nettlesoup" filling_color = "#AFC4B5" - nutriment_desc = list("salad" = 4, "egg" = 2, "potato" = 2) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("salad" = 4, "egg" = 2, "potato" = 2)) -/obj/item/reagent_containers/food/snacks/soup/nettle/Initialize() - . = ..() - reagents.add_reagent("water", 5) - reagents.add_reagent("tricordrazine", 5) + reagents_to_add = list(/datum/reagent/water = 5) + reagents_to_add = list(/datum/reagent/tricordrazine = 5) /obj/item/reagent_containers/food/snacks/soup/mystery name = "mystery soup" desc = "The mystery is, why aren't you eating it?" icon_state = "mysterysoup" filling_color = "#F082FF" - nutriment_desc = list("backwash" = 1) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("backwash" = 1)) /obj/item/reagent_containers/food/snacks/soup/mystery/Initialize() . = ..() switch(rand(1,10)) if(1) - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("capsaicin", 3) - reagents.add_reagent("tomatojuice", 2) + reagents.add_reagent(/datum/reagent/nutriment, 6) + reagents.add_reagent(/datum/reagent/capsaicin, 3) + reagents.add_reagent(/datum/reagent/drink/tomatojuice, 2) if(2) - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("frostoil", 3) - reagents.add_reagent("tomatojuice", 2) + reagents.add_reagent(/datum/reagent/nutriment, 6) + reagents.add_reagent(/datum/reagent/frostoil, 3) + reagents.add_reagent(/datum/reagent/drink/tomatojuice, 2) if(3) - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("water", 5) - reagents.add_reagent("tricordrazine", 5) + reagents.add_reagent(/datum/reagent/nutriment, 5) + reagents.add_reagent(/datum/reagent/water, 5) + reagents.add_reagent(/datum/reagent/tricordrazine, 5) if(4) - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent(/datum/reagent/nutriment, 5) + reagents.add_reagent(/datum/reagent/water, 10) if(5) - reagents.add_reagent("nutriment", 2) - reagents.add_reagent("banana", 10) + reagents.add_reagent(/datum/reagent/nutriment, 2) + reagents.add_reagent(/datum/reagent/drink/banana, 10) if(6) - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("blood", 10) + reagents.add_reagent(/datum/reagent/nutriment, 6) + reagents.add_reagent(/datum/reagent/blood, 10) if(7) - reagents.add_reagent("slimejelly", 10) - reagents.add_reagent("water", 10) + reagents.add_reagent(/datum/reagent/slimejelly, 10) + reagents.add_reagent(/datum/reagent/water, 10) if(8) - reagents.add_reagent("carbon", 10) - reagents.add_reagent("toxin", 10) + reagents.add_reagent(/datum/reagent/carbon, 10) + reagents.add_reagent(/datum/reagent/toxin, 10) if(9) - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("tomatojuice", 10) + reagents.add_reagent(/datum/reagent/nutriment, 5) + reagents.add_reagent(/datum/reagent/drink/tomatojuice, 10) if(10) - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("tomatojuice", 5) - reagents.add_reagent("imidazoline", 5) + reagents.add_reagent(/datum/reagent/nutriment, 6) + reagents.add_reagent(/datum/reagent/drink/tomatojuice, 5) + reagents.add_reagent(/datum/reagent/imidazoline, 5) /obj/item/reagent_containers/food/snacks/soup/wish name = "wish soup" @@ -1890,12 +1698,12 @@ icon_state = "wishsoup" filling_color = "#D1F4FF" + reagents_to_add = list(/datum/reagent/water = 10) /obj/item/reagent_containers/food/snacks/soup/wish/Initialize() . = ..() - reagents.add_reagent("water", 10) if(prob(25)) src.desc = "A wish come true!" - reagents.add_reagent("nutriment", 8, list("something good" = 8)) + reagents.add_reagent(/datum/reagent/nutriment, 8, list("something good" = 8)) /obj/item/reagent_containers/food/snacks/hotchili name = "hot chili" @@ -1904,15 +1712,10 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FF3C00" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("chilli peppers" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("chilli peppers" = 3)) bitesize = 5 - -/obj/item/reagent_containers/food/snacks/hotchili/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("capsaicin", 3) - reagents.add_reagent("tomatojuice", 2) + reagents_to_add = list(/datum/reagent/nutriment = 3, /datum/reagent/capsaicin = 3, /datum/reagent/drink/tomatojuice = 2) /obj/item/reagent_containers/food/snacks/coldchili name = "cold chili" @@ -1921,15 +1724,10 @@ filling_color = "#2B00FF" center_of_mass = list("x"=15, "y"=9) trash = /obj/item/trash/snack_bowl - nutriment_desc = list("ice peppers" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("ice peppers" = 3)) bitesize = 5 - -/obj/item/reagent_containers/food/snacks/coldchili/Initialize() - . = ..() - reagents.add_reagent("nutriment", 3) - reagents.add_reagent("frostoil", 3) - reagents.add_reagent("tomatojuice", 2) + reagents_to_add = list(/datum/reagent/nutriment = 3, /datum/reagent/frostoil = 3, /datum/reagent/drink/tomatojuice = 2) /obj/item/reagent_containers/food/snacks/monkeycube name = "monkey cube" @@ -1943,9 +1741,7 @@ var/wrapped = 0 var/monkey_type = "Monkey" -/obj/item/reagent_containers/food/snacks/monkeycube/Initialize() - . = ..() - reagents.add_reagent("protein", 10) + reagents_to_add = list(/datum/reagent/nutriment/protein = 10) /obj/item/reagent_containers/food/snacks/monkeycube/afterattack(obj/O as obj, var/mob/living/carbon/human/user as mob, proximity) if(!proximity) return @@ -1962,7 +1758,7 @@ Unwrap(user) /obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand() - src.visible_message(span("notice", "\The [src] expands!")) + src.visible_message(SPAN_NOTICE("\The [src] expands!")) if(istype(loc, /obj/item/gripper)) // fixes ghost cube when using syringe var/obj/item/gripper/G = loc G.drop_item() @@ -2024,8 +1820,8 @@ desc = "This is absolutely Ei Nath." icon_state = "spellburger" filling_color = "#D505FF" - nutriment_desc = list("magic" = 3, "buns" = 3) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("magic" = 3, "buns" = 3)) bitesize = 2 /obj/item/reagent_containers/food/snacks/burger/bigbite @@ -2034,13 +1830,11 @@ icon_state = "bigbiteburger" filling_color = "#E3D681" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("buns" = 4) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("buns" = 4)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/burger/bigbite/Initialize() - . = ..() - reagents.add_reagent("protein", 10) + reagents_to_add = list(/datum/reagent/nutriment/protein = 10) /obj/item/reagent_containers/food/snacks/enchiladas name = "enchiladas" @@ -2049,14 +1843,10 @@ trash = /obj/item/trash/tray filling_color = "#A36A1F" center_of_mass = list("x"=16, "y"=13) - nutriment_desc = list("tortilla" = 3, "corn" = 3) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("tortilla" = 3, "corn" = 3)) bitesize = 4 - -/obj/item/reagent_containers/food/snacks/enchiladas/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("capsaicin", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/capsaicin = 6) /obj/item/reagent_containers/food/snacks/monkeysdelight name = "monkey's delight" @@ -2066,13 +1856,7 @@ filling_color = "#5C3C11" center_of_mass = list("x"=16, "y"=13) bitesize = 6 - -/obj/item/reagent_containers/food/snacks/monkeysdelight/Initialize() - . = ..() - reagents.add_reagent("protein", 10) - reagents.add_reagent("banana", 5) - reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("sodiumchloride", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein = 10, /datum/reagent/drink/banana = 5, /datum/reagent/blackpepper = 1, /datum/reagent/sodiumchloride = 1) /obj/item/reagent_containers/food/snacks/baguette name = "baguette" @@ -2080,14 +1864,10 @@ icon_state = "baguette" filling_color = "#E3D796" center_of_mass = list("x"=18, "y"=12) - nutriment_desc = list("french bread" = 6) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("french bread" = 6)) bitesize = 3 - -/obj/item/reagent_containers/food/snacks/baguette/Initialize() - . = ..() - reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("sodiumchloride", 1) + reagents_to_add = list(/datum/reagent/blackpepper = 1, /datum/reagent/sodiumchloride = 1) /obj/item/reagent_containers/food/snacks/fishandchips name = "fish and chips" @@ -2095,14 +1875,10 @@ icon_state = "fishandchips" filling_color = "#E3D796" center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("salt" = 1, "chips" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("salt" = 1, "chips" = 3)) bitesize = 3 - -/obj/item/reagent_containers/food/snacks/fishandchips/Initialize() - . = ..() - reagents.add_reagent("seafood", 3) - reagents.add_reagent("carpotoxin", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 3, /datum/reagent/toxin/carpotoxin = 3) /obj/item/reagent_containers/food/snacks/sandwich name = "sandwich" @@ -2111,13 +1887,11 @@ trash = /obj/item/trash/plate filling_color = "#D9BE29" center_of_mass = list("x"=16, "y"=4) - nutriment_desc = list("bread" = 3, "cheese" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 3, "cheese" = 3)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sandwich/Initialize() - . = ..() - reagents.add_reagent("protein", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3) /obj/item/reagent_containers/food/snacks/toastedsandwich name = "toasted sandwich" @@ -2126,14 +1900,10 @@ trash = /obj/item/trash/plate filling_color = "#D9BE29" center_of_mass = list("x"=16, "y"=4) - nutriment_desc = list("toasted bread" = 3, "cheese" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("toasted bread" = 3, "cheese" = 3)) bitesize = 2 - -/obj/item/reagent_containers/food/snacks/toastedsandwich/Initialize() - . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("carbon", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3, /datum/reagent/carbon = 2) /obj/item/reagent_containers/food/snacks/grilledcheese name = "grilled cheese sandwich" @@ -2141,37 +1911,28 @@ icon_state = "toastedsandwich" trash = /obj/item/trash/plate filling_color = "#D9BE29" - nutriment_desc = list("toasted bread" = 3, "cheese" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("toasted bread" = 3, "cheese" = 3)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/grilledcheese/Initialize() - . = ..() - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/soup/tomato name = "tomato soup" desc = "Drinking this feels like being a vampire! A tomato vampire..." icon_state = "tomatosoup" filling_color = "#D92929" - nutriment_amt = 5 bitesize = 3 - -/obj/item/reagent_containers/food/snacks/soup/tomato/Initialize() - . = ..() - reagents.add_reagent("tomatojuice", 10) + reagents_to_add = list(/datum/reagent/drink/tomatojuice = 10, /datum/reagent/nutriment = 5) /obj/item/reagent_containers/food/snacks/soup/bluespace name = "bluespace tomato soup" desc = "A scientific experiment turned into a possibly unsafe meal." icon_state = "spiral_soup" filling_color = "#0066FF" - nutriment_amt = 5 bitesize = 3 -/obj/item/reagent_containers/food/snacks/soup/bluespace/Initialize() - . = ..() - reagents.add_reagent("bluespace_dust", 5) + reagents_to_add = list(/datum/reagent/bluespace_dust = 5, /datum/reagent/nutriment = 5) /obj/item/reagent_containers/food/snacks/rofflewaffles name = "roffle waffles" @@ -2181,13 +1942,11 @@ drop_sound = 'sound/items/trayhit1.ogg' filling_color = "#FF00F7" center_of_mass = list("x"=15, "y"=11) - nutriment_desc = list("waffle" = 7, "sweetness" = 1) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("waffle" = 7, "sweetness" = 1)) bitesize = 4 -/obj/item/reagent_containers/food/snacks/rofflewaffles/Initialize() - . = ..() - reagents.add_reagent("psilocybin", 8) + reagents_to_add = list(/datum/reagent/psilocybin = 8) /obj/item/reagent_containers/food/snacks/stew name = "stew" @@ -2198,17 +1957,11 @@ pickup_sound = 'sound/items/pickup/shovel.ogg' filling_color = "#9E673A" center_of_mass = list("x"=16, "y"=5) - nutriment_desc = list("potato" = 2, "carrot" = 2, "eggplant" = 2, "mushroom" = 2) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("potato" = 2, "carrot" = 2, "eggplant" = 2, "mushroom" = 2)) bitesize = 10 is_liquid = TRUE - -/obj/item/reagent_containers/food/snacks/stew/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - reagents.add_reagent("tomatojuice", 5) - reagents.add_reagent("imidazoline", 5) - reagents.add_reagent("water", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4, /datum/reagent/drink/tomatojuice = 5, /datum/reagent/imidazoline = 5, /datum/reagent/water = 5) /obj/item/reagent_containers/food/snacks/jelliedtoast name = "jellied toast" @@ -2217,21 +1970,13 @@ trash = /obj/item/trash/plate filling_color = "#B572AB" center_of_mass = list("x"=16, "y"=8) - nutriment_desc = list("toasted bread" = 2) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("toasted bread" = 2)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry +/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry/reagents_to_add = list(/datum/reagent/nutriment/cherryjelly = 5) -/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry/Initialize() - . = ..() - reagents.add_reagent("cherryjelly", 5) - -/obj/item/reagent_containers/food/snacks/jelliedtoast/slime - -/obj/item/reagent_containers/food/snacks/jelliedtoast/slime/Initialize() - . = ..() - reagents.add_reagent("slimejelly", 5) +/obj/item/reagent_containers/food/snacks/jelliedtoast/slime/reagents_to_add = list(/datum/reagent/slimejelly = 5) /obj/item/reagent_containers/food/snacks/burger/jelly name = "jelly burger" @@ -2239,33 +1984,23 @@ icon_state = "jellyburger" filling_color = "#B572AB" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("buns" = 5) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("buns" = 5)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/burger/jelly/slime +/obj/item/reagent_containers/food/snacks/burger/jelly/slime/reagents_to_add = list(/datum/reagent/slimejelly = 5) -/obj/item/reagent_containers/food/snacks/burger/jelly/slime/Initialize() - . = ..() - reagents.add_reagent("slimejelly", 5) - -/obj/item/reagent_containers/food/snacks/burger/jelly/cherry - -/obj/item/reagent_containers/food/snacks/burger/jelly/cherry/Initialize() - . = ..() - reagents.add_reagent("cherryjelly", 5) +/obj/item/reagent_containers/food/snacks/burger/jelly/cherry/reagents_to_add = list(/datum/reagent/nutriment/cherryjelly = 5) /obj/item/reagent_containers/food/snacks/soup/milo name = "milosoup" desc = "The universes best soup! Yum!!!" icon_state = "milosoup" - nutriment_desc = list("soy" = 8) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("soy" = 8)) bitesize = 4 -/obj/item/reagent_containers/food/snacks/soup/milo/Initialize() - . = ..() - reagents.add_reagent("water", 5) + reagents_to_add = list(/datum/reagent/water = 5) /obj/item/reagent_containers/food/snacks/stewedsoymeat name = "stewed soy meat" @@ -2273,8 +2008,8 @@ icon_state = "stewedsoymeat" trash = /obj/item/trash/plate center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("soy" = 4, "tomato" = 4) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("soy" = 4, "tomato" = 4)) bitesize = 2 /obj/item/reagent_containers/food/snacks/boiledspagetti @@ -2284,8 +2019,8 @@ trash = /obj/item/trash/plate filling_color = "#FCEE81" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("noodles" = 2) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("noodles" = 2)) bitesize = 2 /obj/item/reagent_containers/food/snacks/boiledrice @@ -2295,8 +2030,8 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" center_of_mass = list("x"=17, "y"=11) - nutriment_desc = list("rice" = 2) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("rice" = 2)) bitesize = 2 /obj/item/reagent_containers/food/snacks/ricepudding @@ -2306,8 +2041,8 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" center_of_mass = list("x"=17, "y"=11) - nutriment_desc = list("rice" = 2) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("rice" = 2)) bitesize = 2 /obj/item/reagent_containers/food/snacks/pudding @@ -2316,8 +2051,8 @@ desc = "Bring it to me." trash = /obj/item/trash/plate filling_color = "#FFFEE0" - nutriment_desc = list("fruit cake" = 4) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("fruit cake" = 4)) bitesize = 2 /obj/item/reagent_containers/food/snacks/pastatomato @@ -2327,13 +2062,11 @@ trash = /obj/item/trash/plate filling_color = "#DE4545" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("tomato" = 3, "noodles" = 3) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("tomato" = 3, "noodles" = 3)) bitesize = 4 -/obj/item/reagent_containers/food/snacks/pastatomato/Initialize() - . = ..() - reagents.add_reagent("tomatojuice", 10) + reagents_to_add = list(/datum/reagent/drink/tomatojuice = 10) /obj/item/reagent_containers/food/snacks/meatballspagetti name = "spaghetti and meatballs" @@ -2342,13 +2075,11 @@ trash = /obj/item/trash/plate filling_color = "#DE4545" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("noodles" = 4) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("noodles" = 4)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/meatballspagetti/Initialize() - . = ..() - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/spesslaw name = "spesslaw" @@ -2356,13 +2087,11 @@ icon_state = "spesslaw" filling_color = "#DE4545" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("noodles" = 4) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("noodles" = 4)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/spesslaw/Initialize() - . = ..() - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/carrotfries name = "carrot fries" @@ -2371,13 +2100,11 @@ trash = /obj/item/trash/plate filling_color = "#FAA005" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("carrot" = 3, "salt" = 1) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("carrot" = 3, "salt" = 1)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/carrotfries/Initialize() - . = ..() - reagents.add_reagent("imidazoline", 3) + reagents_to_add = list(/datum/reagent/imidazoline = 3) /obj/item/reagent_containers/food/snacks/burger/superbite name = "super bite burger" @@ -2385,13 +2112,11 @@ icon_state = "superbiteburger" filling_color = "#CCA26A" center_of_mass = list("x"=16, "y"=3) - nutriment_desc = list("buns" = 25) - nutriment_amt = 25 + reagents_to_add = list(/datum/reagent/nutriment = 25) + reagent_data = list(/datum/reagent/nutriment = list("buns" = 25)) bitesize = 10 -/obj/item/reagent_containers/food/snacks/burger/superbite/Initialize() - . = ..() - reagents.add_reagent("protein", 25) + reagents_to_add = list(/datum/reagent/nutriment/protein = 25) /obj/item/reagent_containers/food/snacks/candiedapple name = "candied apple" @@ -2399,8 +2124,8 @@ icon_state = "candiedapple" filling_color = "#F21873" center_of_mass = list("x"=15, "y"=13) - nutriment_desc = list("apple" = 3, "caramel" = 3, "sweetness" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("apple" = 3, "caramel" = 3, "sweetness" = 2)) bitesize = 3 /obj/item/reagent_containers/food/snacks/applepie @@ -2409,8 +2134,8 @@ icon_state = "applepie" filling_color = "#E0EDC5" center_of_mass = list("x"=16, "y"=13) - nutriment_desc = list("sweetness" = 2, "apple" = 2, "pie" = 2) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 2, "apple" = 2, "pie" = 2)) bitesize = 3 /obj/item/reagent_containers/food/snacks/cherrypie @@ -2419,8 +2144,8 @@ icon_state = "cherrypie" filling_color = "#FF525A" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("sweetness" = 2, "cherry" = 2, "pie" = 2) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 2, "cherry" = 2, "pie" = 2)) bitesize = 3 /obj/item/reagent_containers/food/snacks/twobread @@ -2429,8 +2154,8 @@ icon_state = "twobread" filling_color = "#DBCC9A" center_of_mass = list("x"=15, "y"=12) - nutriment_desc = list("sourness" = 2, "bread" = 2) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("sourness" = 2, "bread" = 2)) bitesize = 3 /obj/item/reagent_containers/food/snacks/jellysandwich @@ -2440,21 +2165,13 @@ trash = /obj/item/trash/plate filling_color = "#9E3A78" center_of_mass = list("x"=16, "y"=8) - nutriment_desc = list("bread" = 2) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 2)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/jellysandwich/slime +/obj/item/reagent_containers/food/snacks/jellysandwich/slime/reagents_to_add = list(/datum/reagent/slimejelly = 5) -/obj/item/reagent_containers/food/snacks/jellysandwich/slime/Initialize() - . = ..() - reagents.add_reagent("slimejelly", 5) - -/obj/item/reagent_containers/food/snacks/jellysandwich/cherry - -/obj/item/reagent_containers/food/snacks/jellysandwich/cherry/Initialize() - . = ..() - reagents.add_reagent("cherryjelly", 5) +/obj/item/reagent_containers/food/snacks/jellysandwich/cherry/reagents_to_add = list(/datum/reagent/nutriment/cherryjelly = 5) /obj/item/reagent_containers/food/snacks/mint name = "mint" @@ -2464,9 +2181,7 @@ center_of_mass = list("x"=16, "y"=14) bitesize = 1 -/obj/item/reagent_containers/food/snacks/mint/Initialize() - . = ..() - reagents.add_reagent("mint", 1) + reagents_to_add = list(/datum/reagent/nutriment/mint = 1) /obj/item/reagent_containers/food/snacks/mint/admints desc = "Spearmint, peppermint's non-festive cousin." @@ -2482,7 +2197,7 @@ w_class = 1 starts_with = list(/obj/item/reagent_containers/food/snacks/mint/admints = 6) can_hold = list(/obj/item/reagent_containers/food/snacks/mint/admints) - use_sound = 'sound/items/drop/paper.ogg' + use_sound = 'sound/items/drop/wrapper.ogg' drop_sound = 'sound/items/drop/wrapper.ogg' pickup_sound = 'sound/items/pickup/wrapper.ogg' max_storage_space = 6 @@ -2493,8 +2208,8 @@ desc = "A delicious and hearty mushroom soup." icon_state = "mushroomsoup" filling_color = "#E386BF" - nutriment_desc = list("mushroom" = 8, "milk" = 2) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("mushroom" = 8, "milk" = 2)) bitesize = 3 /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit @@ -2503,8 +2218,8 @@ icon_state = "phelmbiscuit" filling_color = "#CFB4C4" center_of_mass = list("x"=16, "y"=13) - nutriment_desc = list("mushroom" = 4) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("mushroom" = 4)) bitesize = 2 /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize() @@ -2512,8 +2227,8 @@ if(prob(10)) name = "exceptional plump helmet biscuit" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" - reagents.add_reagent("nutriment", 8) - reagents.add_reagent("tricordrazine", 5) + reagents.add_reagent(/datum/reagent/nutriment, 8) + reagents.add_reagent(/datum/reagent/tricordrazine, 5) /obj/item/reagent_containers/food/snacks/chawanmushi name = "chawanmushi" @@ -2524,17 +2239,15 @@ center_of_mass = list("x"=17, "y"=10) bitesize = 1 -/obj/item/reagent_containers/food/snacks/chawanmushi/Initialize() - . = ..() - reagents.add_reagent("protein", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 5) /obj/item/reagent_containers/food/snacks/soup/beet name = "beet soup" desc = "Wait, how do you spell it again..?" icon_state = "beetsoup" filling_color = "#FAC9FF" - nutriment_desc = list("tomato" = 4, "beet" = 4) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("tomato" = 4, "beet" = 4)) bitesize = 2 /obj/item/reagent_containers/food/snacks/soup/beet/Initialize() @@ -2548,8 +2261,8 @@ trash = /obj/item/trash/snack_bowl filling_color = "#76B87F" center_of_mass = list("x"=17, "y"=11) - nutriment_desc = list("salad" = 2, "tomato" = 2, "carrot" = 2, "apple" = 2) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("salad" = 2, "tomato" = 2, "carrot" = 2, "apple" = 2)) bitesize = 3 /obj/item/reagent_containers/food/snacks/salad/validsalad @@ -2559,13 +2272,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#76B87F" center_of_mass = list("x"=17, "y"=11) - nutriment_desc = list("potato" = 4, "herbs" = 4) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("potato" = 4, "herbs" = 4)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/salad/validsalad/Initialize() - . = ..() - reagents.add_reagent("protein", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 2) /obj/item/reagent_containers/food/snacks/appletart name = "golden apple streusel tart" @@ -2574,13 +2285,11 @@ trash = /obj/item/trash/plate filling_color = "#FFFF00" center_of_mass = list("x"=16, "y"=18) - nutriment_desc = list("apple" = 8) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("apple" = 8)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/appletart/Initialize() - . = ..() - reagents.add_reagent("gold", 5) + reagents_to_add = list(/datum/reagent/gold = 5) /obj/item/reagent_containers/food/snacks/redcurry name = "red curry" @@ -2590,14 +2299,10 @@ trash = /obj/item/trash/snack_bowl filling_color = "#f73333" center_of_mass = list("x"=16, "y"=8) - nutriment_desc = list("rice" = 4, "curry" = 4) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("rice" = 4, "curry" = 4)) bitesize = 3 - -/obj/item/reagent_containers/food/snacks/redcurry/Initialize() - . = ..() - reagents.add_reagent("protein", 7) - reagents.add_reagent("spacespice", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 7, /datum/reagent/spacespice = 2) /obj/item/reagent_containers/food/snacks/greencurry name = "green curry" @@ -2607,15 +2312,10 @@ trash = /obj/item/trash/snack_bowl filling_color = "#58b76c" center_of_mass = list("x"=16, "y"=8) - nutriment_desc = list("rice" = 2, "curry" = 4, "tofu" = 4) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("rice" = 2, "curry" = 4, "tofu" = 4)) bitesize = 3 - -/obj/item/reagent_containers/food/snacks/greencurry/Initialize() - . = ..() - reagents.add_reagent("tofu", 5) - reagents.add_reagent("spacespice", 2) - reagents.add_reagent("capsaicin", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein/tofu = 5, /datum/reagent/spacespice = 2, /datum/reagent/capsaicin = 2) /obj/item/reagent_containers/food/snacks/yellowcurry name = "yellow curry" @@ -2625,13 +2325,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#bc9509" center_of_mass = list("x"=16, "y"=8) - nutriment_desc = list("rice" = 2, "curry" = 2, "potato" = 2, "peanut" = 2) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("rice" = 2, "curry" = 2, "potato" = 2, "peanut" = 2)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/yellowcurry/Initialize() - . = ..() - reagents.add_reagent("spacespice", 2) + reagents_to_add = list(/datum/reagent/spacespice = 2) /obj/item/reagent_containers/food/snacks/burger/bear name = "bearburger" @@ -2641,10 +2339,8 @@ center_of_mass = list("x"=15, "y"=11) bitesize = 3 -/obj/item/reagent_containers/food/snacks/burger/bear/Initialize() - . = ..() - reagents.add_reagent("protein", 10) - reagents.add_reagent("hyperzine", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 10) + reagents_to_add = list(/datum/reagent/hyperzine = 5) /obj/item/reagent_containers/food/snacks/bearchili name = "bear chili" @@ -2654,32 +2350,21 @@ trash = /obj/item/trash/snack_bowl filling_color = "#702708" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("chilli peppers" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("chilli peppers" = 3)) bitesize = 5 - -/obj/item/reagent_containers/food/snacks/bearchili/Initialize() - . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("capsaicin", 3) - reagents.add_reagent("tomatojuice", 2) - reagents.add_reagent("hyperzine", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3, /datum/reagent/capsaicin = 3, /datum/reagent/drink/tomatojuice = 2, /datum/reagent/hyperzine = 5) /obj/item/reagent_containers/food/snacks/stew/bear name = "bear stew" gender = PLURAL desc = "A thick, dark stew of bear meat and vegetables." icon_state = "bearstew" - nutriment_desc = list("mushroom" = 2, "potato" = 2, "carrot" = 2) + reagent_data = list(/datum/reagent/nutriment = list("mushroom" = 2, "potato" = 2, "carrot" = 2)) bitesize = 6 -/obj/item/reagent_containers/food/snacks/stew/bear/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - reagents.add_reagent("hyperzine", 5) - reagents.add_reagent("tomatojuice", 5) - reagents.add_reagent("imidazoline", 5) - reagents.add_reagent("water", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) + reagents_to_add = list(/datum/reagent/hyperzine = 5, /datum/reagent/drink/tomatojuice = 5, /datum/reagent/imidazoline = 5, /datum/reagent/water = 5) /obj/item/reagent_containers/food/snacks/bibimbap name = "bibimbap bowl" @@ -2688,16 +2373,10 @@ trash = /obj/item/trash/snack_bowl filling_color = "#4f2100" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("rice" = 2, "mushroom" = 2, "carrot" = 2) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("rice" = 2, "mushroom" = 2, "carrot" = 2)) bitesize = 4 - -/obj/item/reagent_containers/food/snacks/bibimbap/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("imidazoline", 3) - reagents.add_reagent("spacespice", 2) - reagents.add_reagent("egg", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/imidazoline = 3, /datum/reagent/spacespice = 2, /datum/reagent/nutriment/protein/egg = 3) /obj/item/reagent_containers/food/snacks/lomein name = "lo mein" @@ -2707,15 +2386,10 @@ trash = /obj/item/trash/plate filling_color = "#FCEE81" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("rice" = 2, "mushroom" = 2, "cabbage" = 2) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("rice" = 2, "mushroom" = 2, "cabbage" = 2)) bitesize = 2 - -/obj/item/reagent_containers/food/snacks/lomein/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - reagents.add_reagent("carrotjuice", 3) - reagents.add_reagent("imidazoline", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein = 2, /datum/reagent/drink/carrotjuice = 3, /datum/reagent/imidazoline = 1) /obj/item/reagent_containers/food/snacks/friedrice name = "fried rice" @@ -2725,15 +2399,10 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" center_of_mass = list("x"=17, "y"=11) - nutriment_desc = list("soy" = 2,) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("soy" = 2,)) bitesize = 2 - -/obj/item/reagent_containers/food/snacks/friedrice/Initialize() - . = ..() - reagents.add_reagent("rice", 5) - reagents.add_reagent("carrotjuice", 3) - reagents.add_reagent("imidazoline", 1) + reagents_to_add = list(/datum/reagent/nutriment/rice = 5, /datum/reagent/drink/carrotjuice = 3, /datum/reagent/imidazoline = 1) /obj/item/reagent_containers/food/snacks/chickenfillet name = "chicken fillet sandwich" @@ -2741,13 +2410,11 @@ icon_state = "chickenfillet" filling_color = "#E9ADFF" center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("buns" = 2) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("buns" = 2)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/chickenfillet/Initialize() - . = ..() - reagents.add_reagent("protein", 8) + reagents_to_add = list(/datum/reagent/nutriment/protein = 8) /obj/item/reagent_containers/food/snacks/chilicheesefries name = "chili cheese fries" @@ -2757,14 +2424,10 @@ trash = /obj/item/trash/plate filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("fresh fries" = 4, "cheese" = 2, "chilli peppers" = 2) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("fresh fries" = 4, "cheese" = 2, "chilli peppers" = 2)) bitesize = 4 - -/obj/item/reagent_containers/food/snacks/chilicheesefries/Initialize() - . = ..() - reagents.add_reagent("protein", 2) - reagents.add_reagent("capsaicin", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 2, /datum/reagent/capsaicin = 2) /obj/item/reagent_containers/food/snacks/friedmushroom name = "fried mushroom" @@ -2772,13 +2435,11 @@ icon_state = "friedmushroom" filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("fried mushroom" = 4) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("fried mushroom" = 4)) bitesize = 5 -/obj/item/reagent_containers/food/snacks/friedmushroom/Initialize() - . = ..() - reagents.add_reagent("protein", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 2) /obj/item/reagent_containers/food/snacks/pisanggoreng name = "pisang goreng" @@ -2788,8 +2449,8 @@ trash = /obj/item/trash/plate filling_color = "#301301" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("fried bananas" = 4) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("fried bananas" = 4)) bitesize = 3 /obj/item/reagent_containers/food/snacks/meatbun @@ -2798,13 +2459,11 @@ icon_state = "meatbun" filling_color = "#edd7d7" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("buns" = 2, "spices" = 2) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("buns" = 2, "spices" = 2)) bitesize = 5 -/obj/item/reagent_containers/food/snacks/meatbun/Initialize() - . = ..() - reagents.add_reagent("protein", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3) /obj/item/reagent_containers/food/snacks/custardbun name = "custard bun" @@ -2812,14 +2471,10 @@ icon_state = "meatbun" filling_color = "#ebedc2" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("buns" = 2, "spices" = 2) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("buns" = 2, "spices" = 2)) bitesize = 6 - -/obj/item/reagent_containers/food/snacks/custardbun/Initialize() - . = ..() - reagents.add_reagent("egg", 2) - reagents.add_reagent("protein", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein/egg = 2, /datum/reagent/nutriment/protein = 2) /obj/item/reagent_containers/food/snacks/chickenmomo name = "chicken momo" @@ -2829,14 +2484,10 @@ trash = /obj/item/trash/snacktray filling_color = "#edd7d7" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("buns" = 4) - nutriment_amt = 9 + reagents_to_add = list(/datum/reagent/nutriment = 9) + reagent_data = list(/datum/reagent/nutriment = list("buns" = 4)) bitesize = 3 - -/obj/item/reagent_containers/food/snacks/chickenmomo/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("spacespice", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/spacespice = 2) /obj/item/reagent_containers/food/snacks/veggiemomo name = "veggie momo" @@ -2846,15 +2497,10 @@ trash = /obj/item/trash/snacktray filling_color = "#edd7d7" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("buns" = 2, "cabbage" = 4) - nutriment_amt = 13 + reagents_to_add = list(/datum/reagent/nutriment = 13) + reagent_data = list(/datum/reagent/nutriment = list("buns" = 2, "cabbage" = 4)) bitesize = 3 - -/obj/item/reagent_containers/food/snacks/veggiemomo/Initialize() - . = ..() - reagents.add_reagent("spacespice", 4) - reagents.add_reagent("carrotjuice", 3) - reagents.add_reagent("imidazoline", 1) + reagents_to_add = list(/datum/reagent/spacespice = 4, /datum/reagent/drink/carrotjuice = 3, /datum/reagent/imidazoline = 1) /obj/item/reagent_containers/food/snacks/risotto name = "risotto" @@ -2864,13 +2510,11 @@ trash = /obj/item/trash/snack_bowl filling_color = "#edd7d7" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("rich" = 2, "spices" = 2, "mushroom" = 4) - nutriment_amt = 9 + reagents_to_add = list(/datum/reagent/nutriment = 9) + reagent_data = list(/datum/reagent/nutriment = list("rich" = 2, "spices" = 2, "mushroom" = 4)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/risotto/Initialize() - . = ..() - reagents.add_reagent("protein", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein = 1) /obj/item/reagent_containers/food/snacks/risottoballs name = "risotto balls" @@ -2880,15 +2524,10 @@ trash = /obj/item/trash/snack_bowl filling_color = "#edd7d7" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("spices" = 2, "mushroom" = 2) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("spices" = 2, "mushroom" = 2)) bitesize = 3 - -/obj/item/reagent_containers/food/snacks/risottoballs/Initialize() - . = ..() - reagents.add_reagent("sodiumchlorid", 1) - reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("rice", 4) + reagents_to_add = list(/datum/reagent/sodiumchloride = 1, /datum/reagent/blackpepper = 1, /datum/reagent/nutriment/rice = 4) /obj/item/reagent_containers/food/snacks/honeytoast name = "piece of honeyed toast" @@ -2897,13 +2536,11 @@ trash = /obj/item/trash/plate filling_color = "#EDE5AD" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("bread" = 3) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 3)) bitesize = 4 -/obj/item/reagent_containers/food/snacks/honeytoast/Initialize() - . = ..() - reagents.add_reagent("honey", 2) + reagents_to_add = list(/datum/reagent/honey = 2) /obj/item/reagent_containers/food/snacks/poachedegg name = "poached egg" @@ -2912,13 +2549,11 @@ trash = /obj/item/trash/plate filling_color = "#FFDF78" center_of_mass = list("x"=16, "y"=14) - nutriment_desc = list("egg" = 3) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("egg" = 3)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/poachedegg/Initialize() - . = ..() - reagents.add_reagent("blackpepper", 1) + reagents_to_add = list(/datum/reagent/blackpepper = 1) /obj/item/reagent_containers/food/snacks/ribplate name = "plate of ribs" @@ -2928,13 +2563,7 @@ filling_color = "#7A3D11" center_of_mass = list("x"=16, "y"=13) bitesize = 4 - -/obj/item/reagent_containers/food/snacks/ribplate/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("triglyceride", 2) - reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("honey", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/nutriment/triglyceride = 2, /datum/reagent/blackpepper = 1, /datum/reagent/honey = 5) /////////////////////////////////////////////////Sliceable//////////////////////////////////////// @@ -2953,13 +2582,11 @@ slices_num = 5 filling_color = "#FF7575" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("bread" = 10) - nutriment_amt = 10 + reagents_to_add = list(/datum/reagent/nutriment = 10) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 10)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/meatbread/Initialize() - . = ..() - reagents.add_reagent("protein", 20) + reagents_to_add = list(/datum/reagent/nutriment/protein = 20) /obj/item/reagent_containers/food/snacks/meatbreadslice name = "meatbread slice" @@ -2971,14 +2598,11 @@ center_of_mass = list("x"=16, "y"=13) /obj/item/reagent_containers/food/snacks/meatbreadslice/filled - nutriment_desc = list("bread" = 5) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 5)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/meatbreadslice/filled/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - reagents.add_reagent("nutriment", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4, /datum/reagent/nutriment = 2) /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread name = "xenomeatbread loaf" @@ -2988,13 +2612,11 @@ slices_num = 5 filling_color = "#8AFF75" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("bread" = 10) - nutriment_amt = 10 + reagents_to_add = list(/datum/reagent/nutriment = 10) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 10)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread/Initialize() - . = ..() - reagents.add_reagent("protein", 20) + reagents_to_add = list(/datum/reagent/nutriment/protein = 20) /obj/item/reagent_containers/food/snacks/xenomeatbreadslice name = "xenomeatbread slice" @@ -3006,13 +2628,11 @@ center_of_mass = list("x"=16, "y"=13) /obj/item/reagent_containers/food/snacks/xenomeatbreadslice/filled - nutriment_desc = list("bread" = 5) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 5)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/xenomeatbreadslice/filled/Initialize() - . = ..() - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/sliceable/bananabread name = "banana-nut bread" @@ -3022,13 +2642,11 @@ slices_num = 5 filling_color = "#EDE5AD" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("bread" = 10) - nutriment_amt = 20 + reagents_to_add = list(/datum/reagent/nutriment = 20) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 10)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/bananabread/Initialize() - . = ..() - reagents.add_reagent("banana", 20) + reagents_to_add = list(/datum/reagent/drink/banana = 20) /obj/item/reagent_containers/food/snacks/bananabreadslice name = "banana-nut bread slice" @@ -3040,13 +2658,11 @@ center_of_mass = list("x"=16, "y"=8) /obj/item/reagent_containers/food/snacks/bananabreadslice/filled - nutriment_desc = list("bread" = 5) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 5)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/bananabreadslice/filled/Initialize() - . = ..() - reagents.add_reagent("banana", 4) + reagents_to_add = list(/datum/reagent/drink/banana = 4) /obj/item/reagent_containers/food/snacks/sliceable/tofubread name = "tofubread" @@ -3056,8 +2672,8 @@ slices_num = 5 filling_color = "#F7FFE0" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("tofu" = 10) - nutriment_amt = 30 + reagents_to_add = list(/datum/reagent/nutriment = 30) + reagent_data = list(/datum/reagent/nutriment = list("tofu" = 10)) bitesize = 2 /obj/item/reagent_containers/food/snacks/tofubreadslice @@ -3070,8 +2686,8 @@ center_of_mass = list("x"=16, "y"=13) /obj/item/reagent_containers/food/snacks/tofubreadslice/filled - nutriment_desc = list("tofu" = 5) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("tofu" = 5)) bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/cake/carrot @@ -3082,13 +2698,11 @@ slices_num = 5 filling_color = "#FFD675" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "carrot" = 15) - nutriment_amt = 25 + reagents_to_add = list(/datum/reagent/nutriment = 25) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 10, "sweetness" = 10, "carrot" = 15)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/cake/carrot/Initialize() - . = ..() - reagents.add_reagent("imidazoline", 10) + reagents_to_add = list(/datum/reagent/imidazoline = 10) /obj/item/reagent_containers/food/snacks/cakeslice/carrot name = "carrot cake slice" @@ -3100,13 +2714,11 @@ center_of_mass = list("x"=16, "y"=14) /obj/item/reagent_containers/food/snacks/cakeslice/carrot/filled - nutriment_desc = list("cake" = 5, "sweetness" = 5, "carrot" = 5) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 5, "sweetness" = 5, "carrot" = 5)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/cakeslice/carrot/filled/Initialize() - . = ..() - reagents.add_reagent("imidazoline", 1) + reagents_to_add = list(/datum/reagent/imidazoline = 1) /obj/item/reagent_containers/food/snacks/sliceable/cake/brain name = "brain cake" @@ -3116,14 +2728,11 @@ slices_num = 5 filling_color = "#E6AEDB" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "slime" = 15) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 10, "sweetness" = 10, "slime" = 15)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/cake/brain/Initialize() - . = ..() - reagents.add_reagent("protein", 25) - reagents.add_reagent("alkysine", 10) + reagents_to_add = list(/datum/reagent/nutriment/protein = 25, /datum/reagent/alkysine = 10) /obj/item/reagent_containers/food/snacks/cakeslice/brain name = "brain cake slice" @@ -3135,14 +2744,11 @@ center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/cakeslice/brain/filled - nutriment_desc = list("cake" = 2, "sweetness" = 2, "slime" = 3) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 2, "sweetness" = 2, "slime" = 3)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/cakeslice/brain/filled/Initialize() - . = ..() - reagents.add_reagent("protein", 5) - reagents.add_reagent("alkysine", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 5, /datum/reagent/alkysine = 2) /obj/item/reagent_containers/food/snacks/sliceable/cake/cheese name = "cheese cake" @@ -3152,13 +2758,11 @@ slices_num = 5 filling_color = "#FAF7AF" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "cream" = 10) - nutriment_amt = 10 + reagents_to_add = list(/datum/reagent/nutriment = 10) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 10, "cream" = 10)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/cake/cheese/Initialize() - . = ..() - reagents.add_reagent("cheese", 15) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 15) /obj/item/reagent_containers/food/snacks/cakeslice/cheese name = "cheese cake slice" @@ -3170,13 +2774,11 @@ center_of_mass = list("x"=16, "y"=14) /obj/item/reagent_containers/food/snacks/cakeslice/cheese/filled - nutriment_desc = list("cake" = 5, "cream" = 5) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 5, "cream" = 5)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/cakeslice/cheese/filled/Initialize() - . = ..() - reagents.add_reagent("cheese", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 3) /obj/item/reagent_containers/food/snacks/sliceable/cake/plain name = "vanilla cake" @@ -3186,11 +2788,9 @@ slices_num = 5 filling_color = "#F7EDD5" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "vanilla" = 15) - nutriment_amt = 20 + reagents_to_add = list(/datum/reagent/nutriment = 20) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 10, "sweetness" = 10, "vanilla" = 15)) -/obj/item/reagent_containers/food/snacks/sliceable/cake/plain/Initialize() - . = ..() /obj/item/reagent_containers/food/snacks/cakeslice/plain name = "vanilla cake slice" @@ -3202,8 +2802,8 @@ center_of_mass = list("x"=16, "y"=14) /obj/item/reagent_containers/food/snacks/cakeslice/plain/filled - nutriment_desc = list("cake" = 5, "sweetness" = 5, "vanilla" = 5) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 5, "sweetness" = 5, "vanilla" = 5)) /obj/item/reagent_containers/food/snacks/sliceable/cake/orange name = "orange cake" @@ -3213,8 +2813,8 @@ slices_num = 5 filling_color = "#FADA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "orange" = 15) - nutriment_amt = 20 + reagents_to_add = list(/datum/reagent/nutriment = 20) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 10, "sweetness" = 10, "orange" = 15)) /obj/item/reagent_containers/food/snacks/cakeslice/orange name = "orange cake slice" @@ -3226,8 +2826,8 @@ center_of_mass = list("x"=16, "y"=14) /obj/item/reagent_containers/food/snacks/cakeslice/orange/filled - nutriment_desc = list("cake" = 5, "sweetness" = 5, "orange" = 5) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 5, "sweetness" = 5, "orange" = 5)) /obj/item/reagent_containers/food/snacks/sliceable/cake/lime name = "lime cake" @@ -3237,8 +2837,8 @@ slices_num = 5 filling_color = "#CBFA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "lime" = 15) - nutriment_amt = 20 + reagents_to_add = list(/datum/reagent/nutriment = 20) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 10, "sweetness" = 10, "lime" = 15)) /obj/item/reagent_containers/food/snacks/cakeslice/lime name = "lime cake slice" @@ -3250,8 +2850,8 @@ center_of_mass = list("x"=16, "y"=14) /obj/item/reagent_containers/food/snacks/cakeslice/lime/filled - nutriment_desc = list("cake" = 5, "sweetness" = 5, "lime" = 5) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 5, "sweetness" = 5, "lime" = 5)) /obj/item/reagent_containers/food/snacks/sliceable/cake/lemon name = "lemon cake" @@ -3261,8 +2861,8 @@ slices_num = 5 filling_color = "#FAFA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "lemon" = 15) - nutriment_amt = 20 + reagents_to_add = list(/datum/reagent/nutriment = 20) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 10, "sweetness" = 10, "lemon" = 15)) /obj/item/reagent_containers/food/snacks/cakeslice/lemon name = "lemon cake slice" @@ -3274,8 +2874,8 @@ center_of_mass = list("x"=16, "y"=14) /obj/item/reagent_containers/food/snacks/cakeslice/lemon/filled - nutriment_desc = list("cake" = 5, "sweetness" = 5, "lemon" = 5) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 5, "sweetness" = 5, "lemon" = 5)) /obj/item/reagent_containers/food/snacks/sliceable/cake/chocolate name = "chocolate cake" @@ -3285,8 +2885,8 @@ slices_num = 5 filling_color = "#805930" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "chocolate" = 15) - nutriment_amt = 20 + reagents_to_add = list(/datum/reagent/nutriment = 20) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 10, "sweetness" = 10, "chocolate" = 15)) /obj/item/reagent_containers/food/snacks/cakeslice/chocolate name = "chocolate cake slice" @@ -3298,8 +2898,8 @@ center_of_mass = list("x"=16, "y"=14) /obj/item/reagent_containers/food/snacks/cakeslice/chocolate/filled - nutriment_desc = list("cake" = 5, "sweetness" = 5, "chocolate" = 5) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 5, "sweetness" = 5, "chocolate" = 5)) /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel name = "cheese wheel" @@ -3311,9 +2911,7 @@ center_of_mass = list("x"=16, "y"=10) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/cheesewheel/Initialize() - . = ..() - reagents.add_reagent("cheese", 20) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 20) /obj/item/reagent_containers/food/snacks/cheesewedge name = "cheese wedge" @@ -3323,11 +2921,7 @@ bitesize = 2 center_of_mass = list("x"=16, "y"=10) -/obj/item/reagent_containers/food/snacks/cheesewedge/filled - -/obj/item/reagent_containers/food/snacks/cheesewedge/filled/Initialize() - . = ..() - reagents.add_reagent("cheese", 4) +/obj/item/reagent_containers/food/snacks/cheesewedge/filled/reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 4) /obj/item/reagent_containers/food/snacks/sliceable/cake/birthday name = "birthday cake" @@ -3337,13 +2931,11 @@ slices_num = 5 filling_color = "#FFD6D6" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10) - nutriment_amt = 20 + reagents_to_add = list(/datum/reagent/nutriment = 20) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 10, "sweetness" = 10)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/sliceable/cake/birthday/Initialize() - . = ..() - reagents.add_reagent("sprinkles", 10) + reagents_to_add = list(/datum/reagent/nutriment/sprinkles = 10) /obj/item/reagent_containers/food/snacks/cakeslice/birthday name = "birthday cake slice" @@ -3355,13 +2947,11 @@ center_of_mass = list("x"=16, "y"=14) /obj/item/reagent_containers/food/snacks/cakeslice/birthdaye/filled - nutriment_desc = list("cake" = 5, "sweetness" = 5) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 5, "sweetness" = 5)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/cakeslice/birthday/filled/Initialize() - . = ..() - reagents.add_reagent("sprinkles", 2) +/obj/item/reagent_containers/food/snacks/cakeslice/birthday/filled/reagents_to_add = list(/datum/reagent/nutriment/sprinkles = 2) /obj/item/reagent_containers/food/snacks/sliceable/bread name = "bread" @@ -3371,13 +2961,11 @@ slices_num = 8 filling_color = "#FFE396" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("bread" = 6) - nutriment_amt = 15 + reagents_to_add = list(/datum/reagent/nutriment = 15) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 6)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/bread/Initialize() - . = ..() - reagents.add_reagent("protein", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 5) /obj/item/reagent_containers/food/snacks/breadslice name = "bread slice" @@ -3389,8 +2977,8 @@ center_of_mass = list("x"=16, "y"=4) /obj/item/reagent_containers/food/snacks/breadslice/filled - nutriment_desc = list("bread" = 2) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 2)) /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread name = "cream cheese bread" @@ -3400,13 +2988,11 @@ slices_num = 5 filling_color = "#FFF896" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("bread" = 6, "cream" = 3) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 6, "cream" = 3)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread/Initialize() - . = ..() - reagents.add_reagent("cheese", 15) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 15) /obj/item/reagent_containers/food/snacks/creamcheesebreadslice name = "cream cheese bread slice" @@ -3418,13 +3004,11 @@ center_of_mass = list("x"=16, "y"=13) /obj/item/reagent_containers/food/snacks/creamcheesebreadslice/filled - nutriment_desc = list("bread" = 3, "cream" = 2) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 3, "cream" = 2)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/creamcheesebreadslice/filled/Initialize() - . = ..() - reagents.add_reagent("cheese", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 3) /obj/item/reagent_containers/food/snacks/watermelonslice name = "watermelon slice" @@ -3435,8 +3019,8 @@ center_of_mass = list("x"=16, "y"=10) /obj/item/reagent_containers/food/snacks/watermelonslice/filled - nutriment_desc = list("watermelon" = 2) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("watermelon" = 2)) /obj/item/reagent_containers/food/snacks/sliceable/cake/apple name = "apple cake" @@ -3446,8 +3030,8 @@ slices_num = 5 filling_color = "#EBF5B8" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "apple" = 15) - nutriment_amt = 15 + reagents_to_add = list(/datum/reagent/nutriment = 15) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 10, "sweetness" = 10, "apple" = 15)) /obj/item/reagent_containers/food/snacks/cakeslice/apple name = "apple cake slice" @@ -3459,8 +3043,8 @@ center_of_mass = list("x"=16, "y"=14) /obj/item/reagent_containers/food/snacks/cakeslice/apple/filled - nutriment_desc = list("cake" = 5, "sweetness" = 5, "apple" = 5) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("cake" = 5, "sweetness" = 5, "apple" = 5)) /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie name = "pumpkin pie" @@ -3470,8 +3054,8 @@ slices_num = 5 filling_color = "#F5B951" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("pie" = 5, "cream" = 5, "pumpkin" = 5) - nutriment_amt = 15 + reagents_to_add = list(/datum/reagent/nutriment = 15) + reagent_data = list(/datum/reagent/nutriment = list("pie" = 5, "cream" = 5, "pumpkin" = 5)) /obj/item/reagent_containers/food/snacks/pumpkinpieslice name = "pumpkin pie slice" @@ -3483,8 +3067,8 @@ center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/pumpkinpieslice/filled - nutriment_desc = list("pie" = 2, "cream" = 2, "pumpkin" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("pie" = 2, "cream" = 2, "pumpkin" = 2)) /obj/item/reagent_containers/food/snacks/cracker name = "cracker" @@ -3492,8 +3076,8 @@ icon_state = "cracker" filling_color = "#F5DEB8" center_of_mass = list("x"=17, "y"=6) - nutriment_desc = list("salt" = 1, "cracker" = 2) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("salt" = 1, "cracker" = 2)) /obj/item/reagent_containers/food/snacks/sliceable/keylimepie name = "key lime pie" @@ -3503,8 +3087,8 @@ slices_num = 5 filling_color = "#F5B951" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("pie" = 10, "cream" = 10, "lime" = 15) - nutriment_amt = 16 + reagents_to_add = list(/datum/reagent/nutriment = 16) + reagent_data = list(/datum/reagent/nutriment = list("pie" = 10, "cream" = 10, "lime" = 15)) /obj/item/reagent_containers/food/snacks/keylimepieslice name = "slice of key lime pie" @@ -3516,8 +3100,8 @@ center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/keylimepieslice/filled - nutriment_desc = list("pie" = 5, "cream" = 5, "lime" = 5) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("pie" = 5, "cream" = 5, "lime" = 5)) /obj/item/reagent_containers/food/snacks/sliceable/quiche name = "quiche" @@ -3527,12 +3111,10 @@ slices_num = 5 filling_color = "#F5B951" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("pie" = 5, "cheese" = 5) - nutriment_amt = 10 + reagents_to_add = list(/datum/reagent/nutriment = 10) + reagent_data = list(/datum/reagent/nutriment = list("pie" = 5, "cheese" = 5)) -/obj/item/reagent_containers/food/snacks/sliceable/quiche/Initialize() - . = ..() - reagents.add_reagent("cheese", 10) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 10) /obj/item/reagent_containers/food/snacks/quicheslice name = "slice of quiche" @@ -3544,12 +3126,10 @@ center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/quicheslice/filled - nutriment_desc = list("pie" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("pie" = 2)) -/obj/item/reagent_containers/food/snacks/quicheslice/filled/Initialize() - . = ..() - reagents.add_reagent("cheese", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 3) /obj/item/reagent_containers/food/snacks/sliceable/brownies name = "brownies" @@ -3561,13 +3141,11 @@ trash = /obj/item/trash/brownies filling_color = "#301301" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("brownies" = 5) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("brownies" = 5)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/brownies/Initialize() - . = ..() - reagents.add_reagent("browniemix", 2) + reagents_to_add = list(/datum/reagent/browniemix = 2) /obj/item/reagent_containers/food/snacks/browniesslice name = "brownie" @@ -3579,12 +3157,10 @@ center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/browniesslice/filled - nutriment_desc = list("brownies" = 2) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("brownies" = 2)) -/obj/item/reagent_containers/food/snacks/browniesslice/filled/Initialize() - . = ..() - reagents.add_reagent("browniemix", 1) + reagents_to_add = list(/datum/reagent/browniemix = 1) /obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies name = "cosmic brownies" @@ -3596,17 +3172,12 @@ trash = /obj/item/trash/brownies filling_color = "#301301" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("brownies" = 5) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("brownies" = 5)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize() - . = ..() - reagents.add_reagent("browniemix", 4) - reagents.add_reagent("space_drugs", 4) - reagents.add_reagent("bicaridine", 2) - reagents.add_reagent("kelotane", 2) - reagents.add_reagent("toxin", 2) + reagents_to_add = list(/datum/reagent/browniemix = 4) + reagents_to_add = list(/datum/reagent/space_drugs = 4, /datum/reagent/bicaridine = 2, /datum/reagent/kelotane = 2, /datum/reagent/toxin = 2) /obj/item/reagent_containers/food/snacks/cosmicbrowniesslice name = "cosmic brownie slice" @@ -3618,16 +3189,11 @@ center_of_mass = list("x"=16, "y"=12) /obj/item/reagent_containers/food/snacks/cosmicbrowniesslice/filled - nutriment_desc = list("brownies" = 2) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("brownies" = 2)) -/obj/item/reagent_containers/food/snacks/cosmicbrowniesslice/filled/Initialize() - . = ..() - reagents.add_reagent("browniemix", 1) - reagents.add_reagent("space_drugs", 1) - reagents.add_reagent("bicaridine", 1) - reagents.add_reagent("kelotane", 1) - reagents.add_reagent("toxin", 1) + reagents_to_add = list(/datum/reagent/browniemix = 1) + reagents_to_add = list(/datum/reagent/space_drugs = 1, /datum/reagent/bicaridine = 1, /datum/reagent/kelotane = 1, /datum/reagent/toxin = 1) /////////////////////////////////////////////////PIZZA//////////////////////////////////////// @@ -3642,14 +3208,11 @@ slice_path = /obj/item/reagent_containers/food/snacks/margheritaslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10) - nutriment_amt = 35 + reagents_to_add = list(/datum/reagent/nutriment = 35) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 10, "tomato" = 10)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita/Initialize() - . = ..() - reagents.add_reagent("cheese", 5) - reagents.add_reagent("tomatojuice", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 5, /datum/reagent/drink/tomatojuice = 6) /obj/item/reagent_containers/food/snacks/margheritaslice name = "margherita slice" @@ -3660,13 +3223,11 @@ center_of_mass = list("x"=18, "y"=13) /obj/item/reagent_containers/food/snacks/margheritaslice/filled - nutriment_desc = list("pizza crust" = 5, "tomato" = 5) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 5, "tomato" = 5)) -/obj/item/reagent_containers/food/snacks/margheritaslice/filled/Initialize() - . = ..() - reagents.add_reagent("cheese", 1) - reagents.add_reagent("tomatojuice", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 1) + reagents_to_add = list(/datum/reagent/drink/tomatojuice = 2) /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza name = "meatpizza" @@ -3675,15 +3236,11 @@ slice_path = /obj/item/reagent_containers/food/snacks/meatpizzaslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10) - nutriment_amt = 10 + reagents_to_add = list(/datum/reagent/nutriment = 10) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 10, "tomato" = 10)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza/Initialize() - . = ..() - reagents.add_reagent("protein", 44) - reagents.add_reagent("cheese", 10) - reagents.add_reagent("tomatojuice", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 44, /datum/reagent/nutriment/protein/cheese = 10, /datum/reagent/drink/tomatojuice = 6) /obj/item/reagent_containers/food/snacks/meatpizzaslice name = "meatpizza slice" @@ -3694,14 +3251,11 @@ center_of_mass = list("x"=18, "y"=13) /obj/item/reagent_containers/food/snacks/meatpizzaslice/filled - nutriment_desc = list("pizza crust" = 5, "tomato" = 5) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 5, "tomato" = 5)) -/obj/item/reagent_containers/food/snacks/meatpizzaslice/filled/Initialize() - . = ..() - reagents.add_reagent("protein", 7) - reagents.add_reagent("cheese", 2) - reagents.add_reagent("tomatojuice", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 7) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 2, /datum/reagent/drink/tomatojuice = 2) /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza name = "mushroompizza" @@ -3710,13 +3264,11 @@ slice_path = /obj/item/reagent_containers/food/snacks/mushroompizzaslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "mushroom" = 10) - nutriment_amt = 35 + reagents_to_add = list(/datum/reagent/nutriment = 35) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 10, "tomato" = 10, "mushroom" = 10)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/Initialize() - . = ..() - reagents.add_reagent("cheese", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 5) /obj/item/reagent_containers/food/snacks/mushroompizzaslice name = "mushroompizza slice" @@ -3727,13 +3279,11 @@ center_of_mass = list("x"=18, "y"=13) /obj/item/reagent_containers/food/snacks/mushroompizzaslice/filled - nutriment_desc = list("pizza crust" = 5, "tomato" = 5, "mushroom" = 5) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 5, "tomato" = 5, "mushroom" = 5)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/mushroompizzaslice/filled/Initialize() - . = ..() - reagents.add_reagent("cheese", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein/cheese = 1) /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza name = "vegetable pizza" @@ -3742,14 +3292,11 @@ slice_path = /obj/item/reagent_containers/food/snacks/vegetablepizzaslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "eggplant" = 5, "carrot" = 5, "corn" = 5) - nutriment_amt = 25 + reagents_to_add = list(/datum/reagent/nutriment = 25) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 10, "eggplant" = 5, "carrot" = 5, "corn" = 5)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/Initialize() - . = ..() - reagents.add_reagent("tomatojuice", 6) - reagents.add_reagent("imidazoline", 12) + reagents_to_add = list(/datum/reagent/drink/tomatojuice = 6, /datum/reagent/imidazoline = 12) /obj/item/reagent_containers/food/snacks/vegetablepizzaslice name = "vegetable pizza slice" @@ -3760,13 +3307,11 @@ center_of_mass = list("x"=18, "y"=13) /obj/item/reagent_containers/food/snacks/vegetablepizzaslice/filled - nutriment_desc = list("pizza crust" = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5)) -/obj/item/reagent_containers/food/snacks/vegetablepizzaslice/filled/Initialize() - . = ..() - reagents.add_reagent("tomatojuice", 2) - reagents.add_reagent("imidazoline", 2) + reagents_to_add = list(/datum/reagent/drink/tomatojuice = 2) + reagents_to_add = list(/datum/reagent/imidazoline = 2) /obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch name = "pizza crunch" @@ -3775,15 +3320,15 @@ slice_path = /obj/item/reagent_containers/food/snacks/pizzacrunchslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 15) - nutriment_amt = 25 + reagents_to_add = list(/datum/reagent/nutriment = 25) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 15)) bitesize = 2 + reagents_to_add = list(/datum/reagent/nutriment/coating/batter = 6, /datum/reagent/nutriment/triglyceride/oil = 4) + /obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch/Initialize() . = ..() - reagents.add_reagent("batter", 6) - coating = reagents.get_reagent("batter") - reagents.add_reagent("oil", 4) + coating = reagents.get_reagent(/datum/reagent/nutriment/coating/batter) /obj/item/reagent_containers/food/snacks/pizzacrunchslice name = "pizza crunch" @@ -3792,14 +3337,14 @@ filling_color = "#BAA14C" bitesize = 2 center_of_mass = list("x"=18, "y"=13) - nutriment_desc = list("pizza crust" = 5) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 5)) -/obj/item/reagent_containers/food/snacks/pizzacrunchslice/Initialize() + reagents_to_add = list(/datum/reagent/nutriment/coating/batter = 2, /datum/reagent/nutriment/triglyceride/oil = 1) + +/obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch/Initialize() . = ..() - reagents.add_reagent("batter", 2) - coating = reagents.get_reagent("batter") - reagents.add_reagent("oil", 1) + coating = reagents.get_reagent(/datum/reagent/nutriment/coating/batter) /obj/item/pizzabox name = "pizza box" @@ -3875,7 +3420,7 @@ if( open && pizza ) user.put_in_hands( pizza ) - to_chat(user, span("warning", "You take \the [src.pizza] out of \the [src].")) + to_chat(user, SPAN_WARNING("You take \the [src.pizza] out of \the [src].")) src.pizza = null update_icon() return @@ -3889,7 +3434,7 @@ boxes -= box user.put_in_hands( box ) - to_chat(user, span("warning", "You remove the topmost [src] from your hand.")) + to_chat(user, SPAN_WARNING("You remove the topmost [src] from your hand.")) box.update_icon() update_icon() return @@ -3926,11 +3471,11 @@ box.update_icon() update_icon() - to_chat(user, span("warning", "You put \the [box] ontop of \the [src]!")) + to_chat(user, SPAN_WARNING("You put \the [box] ontop of \the [src]!")) else - to_chat(user, span("warning", "The stack is too high!")) + to_chat(user, SPAN_WARNING("The stack is too high!")) else - to_chat(user, span("warning", "Close \the [box] first!")) + to_chat(user, SPAN_WARNING("Close \the [box] first!")) return @@ -3942,9 +3487,9 @@ update_icon() - to_chat(user, span("warning", "You put \the [I] in \the [src]!")) + to_chat(user, SPAN_WARNING("You put \the [I] in \the [src]!")) else - to_chat(user, span("warning", "You try to push \the [I] through the lid but it doesn't work!")) + to_chat(user, SPAN_WARNING("You try to push \the [I] through the lid but it doesn't work!")) return if( I.ispen() ) @@ -3987,12 +3532,10 @@ trash = /obj/item/trash/plate filling_color = "#75754B" center_of_mass = list("x"=16, "y"=7) - nutriment_desc = list("dionae delicacy" = 3) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("dionae delicacy" = 3)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/dionaroast/Initialize() - . = ..() /////////////////////////////////////////// // new old food stuff from bs12 @@ -4004,8 +3547,8 @@ icon_state = "dough" bitesize = 2 center_of_mass = list("x"=16, "y"=13) - nutriment_desc = list("uncooked dough" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("uncooked dough" = 3)) // Dough + rolling pin = flat dough /obj/item/reagent_containers/food/snacks/dough/attackby(obj/item/W as obj, mob/user as mob) @@ -4023,8 +3566,8 @@ slice_path = /obj/item/reagent_containers/food/snacks/doughslice slices_num = 3 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("uncooked dough" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("uncooked dough" = 3)) /obj/item/reagent_containers/food/snacks/doughslice name = "dough slice" @@ -4035,8 +3578,8 @@ slices_num = 1 bitesize = 2 center_of_mass = list("x"=17, "y"=19) - nutriment_desc = list("uncooked dough" = 1) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("uncooked dough" = 1)) /obj/item/reagent_containers/food/snacks/bun name = "bun" @@ -4045,8 +3588,8 @@ icon_state = "bun" bitesize = 2 center_of_mass = list("x"=16, "y"=12) - nutriment_desc = list("bun" = 3) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("bun" = 3)) /obj/item/reagent_containers/food/snacks/bun/attackby(obj/item/W as obj, mob/user as mob) var/obj/item/reagent_containers/food/snacks/result = null @@ -4122,12 +3665,10 @@ icon_state = "taco" bitesize = 3 center_of_mass = list("x"=21, "y"=12) - nutriment_desc = list("taco shell with cheese") - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("taco shell with cheese")) -/obj/item/reagent_containers/food/snacks/taco/Initialize() - . = ..() - reagents.add_reagent("protein", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3) /obj/item/reagent_containers/food/snacks/rawcutlet name = "raw cutlet" @@ -4148,9 +3689,7 @@ bitesize = 2 center_of_mass = list("x"=17, "y"=20) -/obj/item/reagent_containers/food/snacks/cutlet/Initialize() - . = ..() - reagents.add_reagent("protein", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 2) /obj/item/reagent_containers/food/snacks/rawmeatball name = "raw meatball" @@ -4160,9 +3699,7 @@ bitesize = 2 center_of_mass = list("x"=16, "y"=15) -/obj/item/reagent_containers/food/snacks/rawmeatball/Initialize() - . = ..() - reagents.add_reagent("protein", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 2) /obj/item/reagent_containers/food/snacks/hotdog name = "hotdog" @@ -4171,9 +3708,7 @@ bitesize = 2 center_of_mass = list("x"=16, "y"=17) -/obj/item/reagent_containers/food/snacks/hotdog/Initialize() - . = ..() - reagents.add_reagent("protein", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6) /obj/item/reagent_containers/food/snacks/flatbread name = "flatbread" @@ -4182,8 +3717,8 @@ icon_state = "flatbread" bitesize = 2 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("bread" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 3)) // potato + knife = raw sticks /obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W as obj, mob/user as mob) @@ -4201,8 +3736,8 @@ icon_state = "rawsticks" bitesize = 2 center_of_mass = list("x"=16, "y"=12) - nutriment_desc = list("uncooked potatos" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("uncooked potatos" = 3)) /obj/item/reagent_containers/food/snacks/liquidfood name = "LiquidFood ration" @@ -4213,17 +3748,17 @@ center_of_mass = list("x"=16, "y"=15) bitesize = 4 is_liquid = TRUE + reagents_to_add = list(/datum/reagent/nutriment = 10, /datum/reagent/iron = 3) + reagent_data = list(/datum/reagent/nutriment = list("chalk" = 1)) /obj/item/reagent_containers/food/snacks/liquidfood/Initialize() - . = ..() set_flavor() - reagents.add_reagent("nutriment", 9, list("[flavor]" = 9)) - reagents.add_reagent("nutriment", 1, list("chalk" = 1)) - reagents.add_reagent("iron", 3) + reagent_data[/datum/reagent/nutriment][flavor] = 9 + return ..() /obj/item/reagent_containers/food/snacks/liquidfood/set_flavor() flavor = pick("chocolate", "peanut butter cookie", "scrambled eggs", "beef taco", "tofu", "pizza", "spaghetti", "cheesy potatoes", "hamburger", "baked beans", "maple sausage", "chili macaroni", "veggie burger") - . = ..() + return ..() /obj/item/reagent_containers/food/snacks/tastybread name = "bread tube" @@ -4232,13 +3767,8 @@ trash = /obj/item/trash/tastybread filling_color = "#A66829" center_of_mass = list("x"=17, "y"=16) - nutriment_desc = list("stale bread" = 4) - nutriment_type = NUTRIMENT_BAD - nutriment_amt = 6 - -/obj/item/reagent_containers/food/snacks/tastybread/Initialize() - . = ..() - reagents.add_reagent("sodiumchloride",3) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("stale bread" = 4)) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 6, /datum/reagent/sodiumchloride = 3) /obj/item/reagent_containers/food/snacks/skrellsnacks name = "\improper SkrellSnax" @@ -4247,9 +3777,8 @@ trash = /obj/item/trash/skrellsnacks filling_color = "#A66829" center_of_mass = list("x"=15, "y"=12) - nutriment_desc = list("alien fungus" = 10) - nutriment_type = NUTRIMENT_BAD - nutriment_amt = 10 + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 10) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("alien fungus" = 10)) bitesize = 3 /obj/item/reagent_containers/food/snacks/friedkois @@ -4258,11 +3787,7 @@ icon_state = "friedkois" filling_color = "#E6E600" bitesize = 3 - -/obj/item/reagent_containers/food/snacks/friedkois/Initialize() - . = ..() - reagents.add_reagent("koispaste", 6) - reagents.add_reagent("phoron", 9) + reagents_to_add = list(/datum/reagent/kois = 6, /datum/reagent/toxin/phoron = 9) /obj/item/reagent_containers/food/snacks/friedkois/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/stack/rods)) @@ -4282,11 +3807,7 @@ trash = /obj/item/stack/rods filling_color = "#E6E600" bitesize = 3 - -/obj/item/reagent_containers/food/snacks/koiskebab1/Initialize() - . = ..() - reagents.add_reagent("koispaste", 8) - reagents.add_reagent("phoron", 12) + reagents_to_add = list(/datum/reagent/kois = 8, /datum/reagent/toxin/phoron = 12) /obj/item/reagent_containers/food/snacks/koiskebab1/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/reagent_containers/food/snacks/friedkois)) @@ -4302,11 +3823,7 @@ trash = /obj/item/stack/rods filling_color = "#E6E600" bitesize = 6 - -/obj/item/reagent_containers/food/snacks/koiskebab2/Initialize() - . = ..() - reagents.add_reagent("koispaste", 12) - reagents.add_reagent("phoron", 16) + reagents_to_add = list(/datum/reagent/kois = 12, /datum/reagent/toxin/phoron = 16) /obj/item/reagent_containers/food/snacks/koiskebab2/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/reagent_containers/food/snacks/friedkois)) @@ -4322,11 +3839,7 @@ trash = /obj/item/stack/rods filling_color = "#E6E600" bitesize = 9 - -/obj/item/reagent_containers/food/snacks/koiskebab3/Initialize() - . = ..() - reagents.add_reagent("koispaste", 16) - reagents.add_reagent("phoron", 20) + reagents_to_add = list(/datum/reagent/kois = 16, /datum/reagent/toxin/phoron = 20) /obj/item/reagent_containers/food/snacks/soup/kois name = "k'ois paste" @@ -4335,10 +3848,8 @@ filling_color = "#4E6E600" bitesize = 2 -/obj/item/reagent_containers/food/snacks/soup/kois/Initialize() - . = ..() - reagents.add_reagent("koispaste", 15) - reagents.add_reagent("phoron", 15) + reagents_to_add = list(/datum/reagent/kois = 15) + reagents_to_add = list(/datum/reagent/toxin/phoron = 15) /obj/item/reagent_containers/food/snacks/koiswaffles name = "k'ois waffles" @@ -4348,11 +3859,7 @@ drop_sound = 'sound/items/trayhit1.ogg' filling_color = "#E6E600" bitesize = 5 - -/obj/item/reagent_containers/food/snacks/koiswaffles/Initialize() - . = ..() - reagents.add_reagent("koispaste", 25) - reagents.add_reagent("phoron", 15) + reagents_to_add = list(/datum/reagent/kois = 25, /datum/reagent/toxin/phoron = 15) /obj/item/reagent_containers/food/snacks/koisjelly name = "k'ois jelly" @@ -4360,12 +3867,7 @@ icon_state = "koisjelly" filling_color = "#E6E600" bitesize = 5 - -/obj/item/reagent_containers/food/snacks/koisjelly/Initialize() - . = ..() - reagents.add_reagent("koispaste", 25) - reagents.add_reagent("imidazoline", 20) - reagents.add_reagent("phoron", 25) + reagents_to_add = list(/datum/reagent/kois = 25, /datum/reagent/imidazoline = 20, /datum/reagent/toxin/phoron = 25) //unathi snacks - sprites by Araskael @@ -4375,15 +3877,9 @@ desc = "Made from stok meat, packed into a crispy crust." trash = /obj/item/trash/meatsnack filling_color = "#631212" - nutriment_desc = list("pie crust" = 2) - nutriment_type = NUTRIMENT_BAD - nutriment_amt = 2 bitesize = 5 - -/obj/item/reagent_containers/food/snacks/meatsnack/Initialize() - . = ..() - reagents.add_reagent("protein", 12) - reagents.add_reagent("sodiumchloride",4) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 2, /datum/reagent/nutriment/protein = 12, /datum/reagent/sodiumchloride = 4) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("pie crust" = 2)) /obj/item/reagent_containers/food/snacks/maps name = "maps salty ham" @@ -4391,28 +3887,17 @@ desc = "Various processed meat from Moghes with 600% the amount of recommended daily sodium per can." trash = /obj/item/trash/maps filling_color = "#631212" - nutriment_type = NUTRIMENT_BAD bitesize = 3 - -/obj/item/reagent_containers/food/snacks/maps/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("sodiumchloride", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/sodiumchloride = 6) /obj/item/reagent_containers/food/snacks/nathisnack name = "razi-snack corned beef" icon_state = "cbeef" desc = "Delicious corned beef and preservatives. Imported from Earth, canned on Ourea." trash = /obj/item/trash/nathisnack - nutriment_type = NUTRIMENT_BAD filling_color = "#631212" bitesize = 4 - -/obj/item/reagent_containers/food/snacks/nathisnack/Initialize() - . = ..() - reagents.add_reagent("protein", 10) - reagents.add_reagent("iron", 3) - reagents.add_reagent("sodiumchloride",6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 10, /datum/reagent/iron = 3, /datum/reagent/sodiumchloride = 6) /obj/item/reagent_containers/food/snacks/pancakes name = "pancakes" @@ -4420,8 +3905,8 @@ icon_state = "pancakes" trash = /obj/item/trash/plate center_of_mass = "x=15;y=11" - nutriment_desc = list("pancake" = 8) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("pancake" = 8)) bitesize = 2 /obj/item/reagent_containers/food/snacks/classichotdog @@ -4431,9 +3916,7 @@ center_of_mass = "x=16;y=17" bitesize = 6 -/obj/item/reagent_containers/food/snacks/classichotdog/Initialize() - . = ..() - reagents.add_reagent("protein", 16) + reagents_to_add = list(/datum/reagent/nutriment/protein = 16) /obj/item/reagent_containers/food/snacks/lasagna name = "lasagna" @@ -4442,25 +3925,23 @@ trash = /obj/item/trash/grease drop_sound = 'sound/items/trayhit1.ogg' center_of_mass = list("x"=16, "y"=17) - nutriment_amt = 12 - nutriment_desc = list("pasta" = 4, "tomato" = 2) + + reagents_to_add = list(/datum/reagent/nutriment = 12) + reagent_data = list(/datum/reagent/nutriment = list("pasta" = 4, "tomato" = 2)) bitesize = 6 -/obj/item/reagent_containers/food/snacks/lasagna/Initialize() - . = ..() - reagents.add_reagent("protein", 12) + reagents_to_add = list(/datum/reagent/nutriment/protein = 12) /obj/item/reagent_containers/food/snacks/donerkebab name = "doner kebab" desc = "A delicious sandwich-like food from ancient Earth. The meat is typically cooked on a vertical rotisserie." icon_state = "doner_kebab" - nutriment_amt = 5 - nutriment_desc = list("dough" = 4, "cabbage" = 2) + + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("dough" = 4, "cabbage" = 2)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/donerkebab/Initialize() - . = ..() - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/sashimi name = "carp sashimi" @@ -4471,11 +3952,7 @@ filling_color = "#FFDEFE" center_of_mass = list("x"=17, "y"=13) bitesize = 4 - -/obj/item/reagent_containers/food/snacks/sashimi/Initialize() - . = ..() - reagents.add_reagent("seafood", 3) - reagents.add_reagent("carpotoxin", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 3, /datum/reagent/toxin/carpotoxin = 3) /obj/item/reagent_containers/food/snacks/nugget name = "chicken nugget" @@ -4487,7 +3964,7 @@ var/shape = pick("lump", "star", "lizard", "corgi") desc = "A chicken nugget vaguely shaped like a [shape]." icon_state = "nugget_[shape]" - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/icecreamsandwich name = "ice cream sandwich" @@ -4495,20 +3972,18 @@ icon_state = "icecreamsandwich" filling_color = "#343834" center_of_mass = list("x"=15, "y"=4) - nutriment_desc = list("ice cream" = 4) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("ice cream" = 4)) /obj/item/reagent_containers/food/snacks/honeybun name = "honey bun" desc = "A sticky pastry bun glazed with honey." icon_state = "honeybun" - nutriment_desc = list("pastry" = 1) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("pastry" = 1)) bitesize = 3 -/obj/item/reagent_containers/food/snacks/honeybun/Initialize() - . = ..() - reagents.add_reagent("honey", 3) + reagents_to_add = list(/datum/reagent/honey = 3) // Chip update. /obj/item/reagent_containers/food/snacks/tortilla @@ -4516,9 +3991,9 @@ desc = "A thin, flour-based tortilla that can be used in a variety of dishes, or can be served as is." icon_state = "tortilla" bitesize = 3 - nutriment_desc = list("tortilla" = 1) + reagent_data = list(/datum/reagent/nutriment = list("tortilla" = 1)) center_of_mass = list("x"=16, "y"=16) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) //chips /obj/item/reagent_containers/food/snacks/chip @@ -4528,8 +4003,8 @@ var/bitten_state = "chip_half" bitesize = 1 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("nacho chips" = 1) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("nacho chips" = 1)) /obj/item/reagent_containers/food/snacks/chip/on_consume(mob/M as mob) if(reagents && reagents.total_volume) @@ -4585,9 +4060,9 @@ icon_state = "chip_basket" trash = /obj/item/trash/chipbasket var/vendingobject = /obj/item/reagent_containers/food/snacks/chip - nutriment_desc = list("tortilla chips" = 10) + reagent_data = list(/datum/reagent/nutriment = list("tortilla chips" = 10)) bitesize = 1 - nutriment_amt = 10 + reagents_to_add = list(/datum/reagent/nutriment = 10) var/unitname = "chip" /obj/item/reagent_containers/food/snacks/chipplate/attack_hand(mob/user as mob) @@ -4618,9 +4093,9 @@ icon_state = "nachos" trash = /obj/item/trash/plate vendingobject = /obj/item/reagent_containers/food/snacks/chip/nacho - nutriment_desc = list("tortilla chips" = 10) + reagent_data = list(/datum/reagent/nutriment = list("tortilla chips" = 10)) bitesize = 1 - nutriment_amt = 10 + reagents_to_add = list(/datum/reagent/nutriment = 10) //dips /obj/item/reagent_containers/food/snacks/dip @@ -4631,9 +4106,9 @@ icon_state = "dip_cheese" trash = /obj/item/trash/dipbowl bitesize = 1 - nutriment_desc = list("queso" = 20) + reagent_data = list(/datum/reagent/nutriment = list("queso" = 20)) center_of_mass = list("x"=16, "y"=16) - nutriment_amt = 20 + reagents_to_add = list(/datum/reagent/nutriment = 20) /obj/item/reagent_containers/food/snacks/dip/attackby(obj/item/reagent_containers/food/snacks/item as obj, mob/user as mob) . = ..() @@ -4677,8 +4152,8 @@ nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/salsa chiptrans = /obj/item/reagent_containers/food/snacks/chip/salsa icon_state = "dip_salsa" - nutriment_desc = list("salsa" = 20) - nutriment_amt = 20 + reagents_to_add = list(/datum/reagent/nutriment = 20) + reagent_data = list(/datum/reagent/nutriment = list("salsa" = 20)) /obj/item/reagent_containers/food/snacks/dip/guac name = "guac dip" @@ -4686,8 +4161,8 @@ nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/guac chiptrans = /obj/item/reagent_containers/food/snacks/chip/guac icon_state = "dip_guac" - nutriment_desc = list("guacmole" = 20) - nutriment_amt = 20 + reagents_to_add = list(/datum/reagent/nutriment = 20) + reagent_data = list(/datum/reagent/nutriment = list("guacmole" = 20)) //burritos /obj/item/reagent_containers/food/snacks/burrito @@ -4696,12 +4171,10 @@ icon_state = "burrito" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("tortilla" = 6)) -/obj/item/reagent_containers/food/snacks/burrito/Initialize() - . = ..() - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/burrito_vegan @@ -4710,12 +4183,10 @@ icon_state = "burrito_vegan" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("tortilla" = 6)) -/obj/item/reagent_containers/food/snacks/burrito_vegan/Initialize() - . = ..() - reagents.add_reagent("tofu", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein/tofu = 6) /obj/item/reagent_containers/food/snacks/burrito_spicy name = "spicy meat burrito" @@ -4723,12 +4194,10 @@ icon_state = "burrito_spicy" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("tortilla" = 6)) -/obj/item/reagent_containers/food/snacks/burrito_spicy/Initialize() - . = ..() - reagents.add_reagent("protein", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6) /obj/item/reagent_containers/food/snacks/burrito_cheese name = "meat cheese burrito" @@ -4736,12 +4205,10 @@ icon_state = "burrito_cheese" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("tortilla" = 6)) -/obj/item/reagent_containers/food/snacks/burrito_cheese/Initialize() - . = ..() - reagents.add_reagent("protein", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6) /obj/item/reagent_containers/food/snacks/burrito_cheese_spicy name = "spicy cheese meat burrito" @@ -4749,12 +4216,10 @@ icon_state = "burrito_cheese_spicy" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("tortilla" = 6)) -/obj/item/reagent_containers/food/snacks/burrito_cheese_spicy/Initialize() - . = ..() - reagents.add_reagent("protein", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6) /obj/item/reagent_containers/food/snacks/burrito_hell name = "el diablo" @@ -4762,8 +4227,8 @@ icon_state = "burrito_hell" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("hellfire" = 6) - nutriment_amt = 24// 10 Chilis is a lot. + reagent_data = list(/datum/reagent/nutriment = list("hellfire" = 6)) + reagents_to_add = list(/datum/reagent/nutriment = 24)// 10 Chilis is a lot. /obj/item/reagent_containers/food/snacks/breakfast_wrap name = "breakfast wrap" @@ -4771,13 +4236,9 @@ icon_state = "breakfast_wrap" bitesize = 4 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) - nutriment_amt = 6 - -/obj/item/reagent_containers/food/snacks/burrito_hell/Initialize() - . = ..() - reagents.add_reagent("protein", 9) - reagents.add_reagent("condensedcapsaicin", 20) //what could possibly go wrong + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("tortilla" = 6)) + reagents_to_add = list(/datum/reagent/nutriment/protein = 9, /datum/reagent/capsaicin/condensed = 20) //what could possibly go wrong /obj/item/reagent_containers/food/snacks/burrito_mystery name = "mystery meat burrito" @@ -4785,8 +4246,8 @@ icon_state = "burrito_mystery" bitesize = 5 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("regret" = 6) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("regret" = 6)) // Ligger food and also bacon /obj/item/reagent_containers/food/snacks/rawbacon @@ -4821,33 +4282,21 @@ icon_state = "bacon" bitesize = 2 center_of_mass = list("x"=16, "y"=16) - -/obj/item/reagent_containers/food/snacks/bacon/Initialize() - . = ..() - reagents.add_reagent("protein", 0.33) - reagents.add_reagent("triglyceride", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein = 0.33, /datum/reagent/nutriment/triglyceride = 1) /obj/item/reagent_containers/food/snacks/chilied_eggs name = "chilied eggs" desc = "Three deviled eggs floating in a bowl of meat chili. A popular lunchtime meal for Unathi in Ouerea." icon_state = "chilied_eggs" trash = /obj/item/trash/snack_bowl - -/obj/item/reagent_containers/food/snacks/chilied_eggs/Initialize() - . = ..() - reagents.add_reagent("egg", 6) - reagents.add_reagent("protein", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein/egg = 6, /datum/reagent/nutriment/protein = 2) /obj/item/reagent_containers/food/snacks/hatchling_suprise name = "hatchling suprise" desc = "A poached egg on top of three slices of bacon. A typical breakfast for hungry Unathi children." icon_state = "hatchling_suprise" trash = /obj/item/trash/snack_bowl - -/obj/item/reagent_containers/food/snacks/hatchling_suprise/Initialize() - . = ..() - reagents.add_reagent("egg", 2) - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein/egg = 2, /datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/red_sun_special name = "red sun special" @@ -4855,9 +4304,7 @@ icon_state = "red_sun_special" trash = /obj/item/trash/plate -/obj/item/reagent_containers/food/snacks/red_sun_special/Initialize() - . = ..() - reagents.add_reagent("protein", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 2) /obj/item/reagent_containers/food/snacks/riztizkzi_sea name = "moghresian sea delight" @@ -4865,40 +4312,27 @@ icon_state = "riztizkzi_sea" trash = /obj/item/trash/snack_bowl -/obj/item/reagent_containers/food/snacks/riztizkzi_sea/Initialize() - . = ..() - reagents.add_reagent("egg", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein/egg = 4) /obj/item/reagent_containers/food/snacks/father_breakfast name = "breakfast of champions" desc = "A sausage and an omelette on top of a grilled steak." icon_state = "father_breakfast" trash = /obj/item/trash/plate - -/obj/item/reagent_containers/food/snacks/father_breakfast/Initialize() - . = ..() - reagents.add_reagent("egg", 4) - reagents.add_reagent("protein", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein/egg = 4, /datum/reagent/nutriment/protein = 6) /obj/item/reagent_containers/food/snacks/stuffed_meatball name = "stuffed meatball" //YES desc = "A meatball loaded with cheese." icon_state = "stuffed_meatball" - -/obj/item/reagent_containers/food/snacks/stuffed_meatball/Initialize() - . = ..() - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/egg_pancake name = "meat pancake" desc = "An omelette baked on top of a giant meat patty. This monstrousity is typically shared between four people during a dinnertime meal." icon_state = "egg_pancake" trash = /obj/item/trash/tray - -/obj/item/reagent_containers/food/snacks/stuffed_meatball/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("egg", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/nutriment/protein/egg = 2) /obj/item/reagent_containers/food/snacks/sliceable/grilled_carp name = "korlaaskak" @@ -4908,9 +4342,7 @@ slices_num = 6 trash = /obj/item/trash/snacktray -/obj/item/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize() - . = ..() - reagents.add_reagent("seafood", 12) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 12) /obj/item/reagent_containers/food/snacks/grilled_carp_slice name = "korlaaskak slice" @@ -4925,9 +4357,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/sushi_serve slices_num = 3 -/obj/item/reagent_containers/food/snacks/sliceable/sushi_roll/Initialize() - . = ..() - reagents.add_reagent("seafood", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 6) /obj/item/reagent_containers/food/snacks/sushi_serve name = "ouerean carp cake" @@ -4940,8 +4370,8 @@ icon_state = "marge" bitesize = 2 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("margarine" = 1) - nutriment_amt = 20 + reagents_to_add = list(/datum/reagent/nutriment = 20) + reagent_data = list(/datum/reagent/nutriment = list("margarine" = 1)) /obj/item/reagent_containers/food/snacks/spreads/butter name = "butter" @@ -4949,75 +4379,58 @@ icon_state = "marge" bitesize = 2 center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("butter" = 1) - nutriment_amt = 0 + reagents_to_add = list(/datum/reagent/nutriment = 0) + reagent_data = list(/datum/reagent/nutriment = list("butter" = 1)) -/obj/item/reagent_containers/food/snacks/spreads/Initialize() - . = ..() - reagents.add_reagent("triglyceride", 20) - reagents.add_reagent("sodiumchloride",1) + reagents_to_add = list(/datum/reagent/nutriment/triglyceride = 20, /datum/reagent/sodiumchloride = 1) /obj/item/reagent_containers/food/snacks/bacon_stick name = "eggpop" desc = "A bacon wrapped boiled egg, conviently skewered on a wooden stick." icon_state = "bacon_stick" - -/obj/item/reagent_containers/food/snacks/bacon_stick/Initialize() - . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("egg", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3, /datum/reagent/nutriment/protein/egg = 1) /obj/item/reagent_containers/food/snacks/cheese_cracker name = "supreme cheese toast" desc = "A piece of toast lathered with butter, cheese, spices, and herbs." icon_state = "cheese_cracker" - nutriment_desc = list("cheese toast" = 8) - nutriment_amt = 8 + reagents_to_add = list(/datum/reagent/nutriment = 8) + reagent_data = list(/datum/reagent/nutriment = list("cheese toast" = 8)) /obj/item/reagent_containers/food/snacks/bacon_and_eggs name = "bacon and eggs" desc = "A piece of bacon and two fried eggs." icon_state = "bacon_and_eggs" trash = /obj/item/trash/plate - -/obj/item/reagent_containers/food/snacks/bacon_and_eggs/Initialize() - . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("egg", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3, /datum/reagent/nutriment/protein/egg = 1) /obj/item/reagent_containers/food/snacks/sweet_and_sour name = "sweet and sour pork" desc = "A traditional ancient sol recipie with a few liberties taken with meat selection." icon_state = "sweet_and_sour" - nutriment_desc = list("sweet and sour" = 6) - nutriment_amt = 6 + reagents_to_add = list(/datum/reagent/nutriment = 6) + reagent_data = list(/datum/reagent/nutriment = list("sweet and sour" = 6)) trash = /obj/item/trash/plate -/obj/item/reagent_containers/food/snacks/sweet_and_sour/Initialize() - . = ..() - reagents.add_reagent("protein", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3) /obj/item/reagent_containers/food/snacks/corn_dog name = "corn dog" desc = "A cornbread covered sausage deepfried in oil." icon_state = "corndog" - nutriment_desc = list("corn batter" = 4) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("corn batter" = 4)) -/obj/item/reagent_containers/food/snacks/corn_dog/Initialize() - . = ..() - reagents.add_reagent("protein", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3) /obj/item/reagent_containers/food/snacks/truffle name = "chocolate truffle" desc = "Rich bite-sized chocolate." icon_state = "truffle" - nutriment_amt = 0 + reagents_to_add = list(/datum/reagent/nutriment = 0) bitesize = 4 -/obj/item/reagent_containers/food/snacks/truffle/Initialize() - . = ..() - reagents.add_reagent("coco", 6) + reagents_to_add = list(/datum/reagent/nutriment/coco = 6) /obj/item/reagent_containers/food/snacks/truffle/random name = "mystery chocolate truffle" @@ -5025,63 +4438,52 @@ /obj/item/reagent_containers/food/snacks/truffle/random/Initialize() . = ..() - var/reagent_string = pick(list("cream","cherryjelly","mint","frostoil","capsaicin","cream","coffee","milkshake")) - reagents.add_reagent(reagent_string, 4) + var/reagent_type = pick(list(/datum/reagent/drink/milk/cream,/datum/reagent/nutriment/cherryjelly,/datum/reagent/nutriment/mint,/datum/reagent/frostoil,/datum/reagent/capsaicin,/datum/reagent/drink/milk/cream,/datum/reagent/drink/coffee,/datum/reagent/drink/milkshake)) + reagents.add_reagent(reagent_type, 4) /obj/item/reagent_containers/food/snacks/bacon_flatbread name = "bacon cheese flatbread" desc = "Not a pizza." icon_state = "bacon_pizza" - nutriment_desc = list("flatbread" = 5) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("flatbread" = 5)) -/obj/item/reagent_containers/food/snacks/bacon_flatbread/Initialize() - . = ..() - reagents.add_reagent("protein", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 5) /obj/item/reagent_containers/food/snacks/meat_pocket name = "meat pocket" desc = "Meat and cheese stuffed in a flatbread pocket, grilled to perfection." icon_state = "meat_pocket" - nutriment_desc = list("flatbread" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("flatbread" = 3)) -/obj/item/reagent_containers/food/snacks/meat_pocket/Initialize() - . = ..() - reagents.add_reagent("protein", 3) + reagents_to_add = list(/datum/reagent/nutriment/protein = 3) /obj/item/reagent_containers/food/snacks/fish_taco name = "carp taco" desc = "A questionably cooked fish taco decorated with herbs, spices, and special sauce." icon_state = "fish_taco" - nutriment_desc = list("flatbread" = 3) - nutriment_amt = 3 - -/obj/item/reagent_containers/food/snacks/fish_taco/Initialize() - . = ..() - reagents.add_reagent("seafood",3) + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("flatbread" = 3)) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 3) /obj/item/reagent_containers/food/snacks/nt_muffin name = "\improper NtMuffin" desc = "A NanoTrasen sponsered biscuit with egg, cheese, and sausage." icon_state = "nt_muffin" - nutriment_desc = list("biscuit" = 3) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("biscuit" = 3)) -/obj/item/reagent_containers/food/snacks/nt_muffin/Initialize() - . = ..() - reagents.add_reagent("protein",5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 5) /obj/item/reagent_containers/food/snacks/pineapple_ring name = "pineapple ring" desc = "What the hell is this?" icon_state = "pineapple_ring" - nutriment_desc = list("sweetness" = 2) - nutriment_amt = 2 + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 2)) -/obj/item/reagent_containers/food/snacks/pineapple_ring/Initialize() - . = ..() - reagents.add_reagent("pineapplejuice",3) + reagents_to_add = list(/datum/reagent/drink/pineapplejuice = 3) /obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple name = "ham & pineapple pizza" @@ -5090,15 +4492,11 @@ slice_path = /obj/item/reagent_containers/food/snacks/pineappleslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "ham" = 10) - nutriment_amt = 30 + reagents_to_add = list(/datum/reagent/nutriment = 30) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 10, "tomato" = 10, "ham" = 10)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - reagents.add_reagent("cheese", 5) - reagents.add_reagent("tomatojuice", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4, /datum/reagent/nutriment/protein/cheese = 5, /datum/reagent/drink/tomatojuice = 6) /obj/item/reagent_containers/food/snacks/pineappleslice name = "ham & pineapple pizza slice" @@ -5109,8 +4507,8 @@ center_of_mass = list("x"=18, "y"=13) /obj/item/reagent_containers/food/snacks/pineappleslice/filled - nutriment_desc = list("pizza crust" = 5, "tomato" = 5) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 5, "tomato" = 5)) /obj/item/reagent_containers/food/snacks/burger/bacon name = "bacon burger" @@ -5118,13 +4516,11 @@ icon_state = "hburger" filling_color = "#D63C3C" center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("bun" = 2) - nutriment_amt = 3 + reagents_to_add = list(/datum/reagent/nutriment = 3) + reagent_data = list(/datum/reagent/nutriment = list("bun" = 2)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/burger/bacon/Initialize() - . = ..() - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/blt name = "BLT" @@ -5132,13 +4528,11 @@ icon_state = "blt" filling_color = "#D63C3C" center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("bread" = 4) - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 4)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/blt/Initialize() - . = ..() - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/clam name = "Ras'val clam" @@ -5148,9 +4542,7 @@ desc_fluff = "Fishing and shellfish has a part in the diet of the population at the coastal areas, even if the ice can be an obstacle to most experienced fisherman. \ Spicy Ras'val clams, named after the sea, are a famous treat, being appreciated in other system besides S'rand'marr." -/obj/item/reagent_containers/food/snacks/clam/Initialize() - . = ..() - reagents.add_reagent("seafood", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 2) /obj/item/reagent_containers/food/snacks/spicy_clams name = "spicy Ras'val clams" @@ -5160,19 +4552,16 @@ trash = /obj/item/trash/snack_bowl desc_fluff = "Fishing and shellfish has a part in the diet of the population at the coastal areas, even if the ice can be an obstacle to most experienced fisherman. \ Spicy Ras'val clams, named after the sea, are a famous treat, being appreciated in other system besides S'rand'marr." - -/obj/item/reagent_containers/food/snacks/spicy_clams/Initialize() - . = ..() - reagents.add_reagent("seafood", 4) - reagents.add_reagent("capsaicin", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 4, /datum/reagent/capsaicin = 1) /obj/item/reagent_containers/food/snacks/tajaran_bread name = "adhomian bread" desc = "A traditional tajaran bread, usually baked with blizzard ears' flour." icon_state = "tajaran_bread" bitesize = 2 - nutriment_amt = 5 - nutriment_desc = list("bread" = 2) + + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("bread" = 2)) desc_fluff = "While the People's republic territory includes several different regional cultures, it is possible to find common culinary traditions among its population. \ Bread, baked with flour produced from a variation of the Blizzard Ears, is considered an essential part of a worker's breakfast." @@ -5181,7 +4570,7 @@ desc = "A soup made with earthen-root, a traditional dish from Northern Harr'masir." icon_state = "tajaran_soup" bitesize = 2 - nutriment_amt = 4 + reagents_to_add = list(/datum/reagent/nutriment = 4) desc_fluff = "The Earth-Root soup is a common sight on the tables, of all social sectors, in the Northern Harr'masir. Prepared traditionally with water, Earth-Root and \ other plants, such as the Nif-Berries." @@ -5190,15 +4579,14 @@ desc = "An adhomian stew, made with nav'twir meat and native plants." icon_state = "tajaran_stew" bitesize = 2 - nutriment_amt = 4 - nutriment_desc = list("sweetness" = 2) + + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 2)) desc_fluff = "Traditional adhomian stews are made with diced vegetables, such as Nif-Berries, and meat, Snow Strider is commonly used by the rural population, while \ industrialized Fatshouters's beef is prefered by the city's inhabitants." -/obj/item/reagent_containers/food/snacks/stew/tajaran/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - reagents.add_reagent("water", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4) + reagents_to_add = list(/datum/reagent/water = 4) /obj/item/reagent_containers/food/snacks/adhomian_can name = "canned fatshouters meat" @@ -5208,11 +4596,7 @@ trash = /obj/item/trash/can desc_fluff = "While the People's republic territory includes several different regional cultures, it is possible to find common culinary traditions among its population. \ Salt-cured Fatshouters's meat also has been introduced widely, facilitated by the recent advances in the livestock husbandry techniques." - -/obj/item/reagent_containers/food/snacks/adhomian_can/Initialize() - . = ..() - reagents.add_reagent("protein", 5) - reagents.add_reagent("sodiumchloride", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein = 5, /datum/reagent/sodiumchloride = 2) /obj/item/reagent_containers/food/snacks/onionrings name = "onion rings" @@ -5221,8 +4605,8 @@ trash = /obj/item/trash/plate filling_color = "#eddd00" center_of_mass = "x=16;y=11" - nutriment_desc = list("fried onions" = 5) - nutriment_amt = 5 + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("fried onions" = 5)) bitesize = 2 /obj/item/reagent_containers/food/snacks/berrymuffin @@ -5231,8 +4615,9 @@ icon_state = "berrymuffin" filling_color = "#E0CF9B" center_of_mass = list("x"=17, "y"=4) - nutriment_amt = 5 - nutriment_desc = list("sweetness" = 1, "muffin" = 2, "berries" = 2) + + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "berries" = 2)) bitesize = 2 /obj/item/reagent_containers/food/snacks/soup/onion @@ -5240,8 +4625,9 @@ desc = "A soup with layers." icon_state = "onionsoup" filling_color = "#E0C367" - nutriment_amt = 5 - nutriment_desc = list("onion" = 2, "soup" = 2) + + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("onion" = 2, "soup" = 2)) bitesize = 3 /obj/item/reagent_containers/food/snacks/porkbowl @@ -5252,10 +4638,7 @@ filling_color = "#FFFBDB" bitesize = 2 -/obj/item/reagent_containers/food/snacks/porkbowl/Initialize() - ..() - reagents.add_reagent("rice", 6) - reagents.add_reagent("protein", 4) + reagents_to_add = list(/datum/reagent/nutriment/rice = 6, /datum/reagent/nutriment/protein = 4) /obj/item/reagent_containers/food/snacks/mashedpotato name = "mashed potato" @@ -5264,8 +4647,9 @@ trash = /obj/item/trash/plate filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 4 - nutriment_desc = list("mashed potatoes" = 4) + + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("mashed potatoes" = 4)) bitesize = 2 /obj/item/reagent_containers/food/snacks/croissant @@ -5273,8 +4657,9 @@ desc = "True french cuisine." filling_color = "#E3D796" icon_state = "croissant" - nutriment_amt = 4 - nutriment_desc = list("french bread" = 4) + + reagents_to_add = list(/datum/reagent/nutriment = 4) + reagent_data = list(/datum/reagent/nutriment = list("french bread" = 4)) bitesize = 2 /obj/item/reagent_containers/food/snacks/crabmeat @@ -5283,36 +4668,30 @@ icon_state = "crabmeat" bitesize = 1 -/obj/item/reagent_containers/food/snacks/crabmeat/Initialize() - . = ..() - reagents.add_reagent("seafood", 2) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 2) /obj/item/reagent_containers/food/snacks/crab_legs name = "steamed crab legs" desc = "Crab legs steamed and buttered to perfection. One day when the boss gets hungry..." icon_state = "crablegs" - nutriment_amt = 2 - nutriment_desc = list("savory butter" = 2) + + reagents_to_add = list(/datum/reagent/nutriment = 2) + reagent_data = list(/datum/reagent/nutriment = list("savory butter" = 2)) bitesize = 2 trash = /obj/item/trash/plate - -/obj/item/reagent_containers/food/snacks/crab_legs/Initialize() - . = ..() - reagents.add_reagent("seafood", 6) - reagents.add_reagent("sodiumchloride", 1) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 6, /datum/reagent/sodiumchloride = 1) /obj/item/reagent_containers/food/snacks/banana_split name = "banana split" desc = "A dessert made with icecream and a banana." icon_state = "banana_split" - nutriment_amt = 5 - nutriment_desc = list("icecream" = 2) + + reagents_to_add = list(/datum/reagent/nutriment = 5) + reagent_data = list(/datum/reagent/nutriment = list("icecream" = 2)) bitesize = 2 trash = /obj/item/trash/snack_bowl -/obj/item/reagent_containers/food/snacks/banana_split/Initialize() - . = ..() - reagents.add_reagent("banana", 3) + reagents_to_add = list(/datum/reagent/drink/banana = 3) /obj/item/reagent_containers/food/snacks/tuna name = "\improper Tuna Snax" @@ -5321,170 +4700,122 @@ filling_color = "#FFDEFE" center_of_mass = list("x"=17, "y"=13) bitesize = 2 - nutriment_type = NUTRIMENT_BAD trash = /obj/item/trash/tuna -/obj/item/reagent_containers/food/snacks/tuna/Initialize() - . = ..() - reagents.add_reagent("seafood", 4) + reagents_to_add = list(/datum/reagent/nutriment/protein/seafood = 4) /obj/item/reagent_containers/food/snacks/cb01 name = "tau ceti bar" desc = "A dark chocolate caramel and nougat bar made famous in Biesel." filling_color = "#552200" icon_state = "cb01" - nutriment_amt = 4 - nutriment_desc = list("chocolate" = 2, "nougat" = 1, "caramel" = 1) - bitesize = 2 - nutriment_type = NUTRIMENT_BAD - w_class = 1 -/obj/item/reagent_containers/food/snacks/cb01/Initialize() - . = ..() - reagents.add_reagent("sugar", 1) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "nougat" = 1, "caramel" = 1)) + bitesize = 2 + w_class = 1 /obj/item/reagent_containers/food/snacks/cb02 name = "hundred thousand credit bar" desc = "An ironically cheap puffed rice caramel milk chocolate bar." filling_color = "#552200" icon_state = "cb02" - nutriment_amt = 4 - nutriment_desc = list("chocolate" = 2, "caramel" = 1, "puffed rice" = 1) - bitesize = 2 - nutriment_type = NUTRIMENT_BAD - w_class = 1 -/obj/item/reagent_containers/food/snacks/cb02/Initialize() - . = ..() - reagents.add_reagent("sugar", 1) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "caramel" = 1, "puffed rice" = 1)) + bitesize = 2 + w_class = 1 /obj/item/reagent_containers/food/snacks/cb03 name = "spacewind bar" desc = "Bubbly milk chocolate." filling_color = "#552200" icon_state = "cb03" - nutriment_amt = 4 - nutriment_desc = list("chocolate" = 4) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 4)) bitesize = 2 - nutriment_type = NUTRIMENT_BAD w_class = 1 -/obj/item/reagent_containers/food/snacks/cb03/Initialize() - . = ..() - reagents.add_reagent("sugar", 1) - /obj/item/reagent_containers/food/snacks/cb04 name = "crunchy crisp" desc = "An almond flake bar covered in milk chocolate." filling_color = "#552200" icon_state = "cb04" - nutriment_amt = 4 - nutriment_desc = list("chocolate" = 3, "almonds" = 1) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 3, "almonds" = 1)) bitesize = 2 - nutriment_type = NUTRIMENT_BAD w_class = 1 -/obj/item/reagent_containers/food/snacks/cb04/Initialize() - . = ..() - reagents.add_reagent("sugar", 1) - /obj/item/reagent_containers/food/snacks/cb05 name = "hearsay bar" desc = "A cheap milk chocolate bar loaded with sugar." filling_color = "#552200" icon_state = "cb05" - nutriment_amt = 3 - nutriment_desc = list("chocolate" = 2, "vomit" = 1) - bitesize = 3 - nutriment_type = NUTRIMENT_BAD - w_class = 1 -/obj/item/reagent_containers/food/snacks/cb05/Initialize() - . = ..() - reagents.add_reagent("sugar", 3) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 3, /datum/reagent/sugar = 3) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "vomit" = 1)) + bitesize = 3 + w_class = 1 /obj/item/reagent_containers/food/snacks/cb06 name = "latte crunch" desc = "A large latte flavored wafer chocolate bar." filling_color = "#552200" icon_state = "cb06" - nutriment_amt = 4 - nutriment_desc = list("chocolate" = 2, "coffee" = 1, "vanilla wafer" = 1) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "coffee" = 1, "vanilla wafer" = 1)) bitesize = 3 - nutriment_type = NUTRIMENT_BAD w_class = 1 -/obj/item/reagent_containers/food/snacks/cb06/Initialize() - . = ..() - reagents.add_reagent("sugar", 1) - /obj/item/reagent_containers/food/snacks/cb07 name = "martian bar" desc = "Dark chocolate with a nougat and caramel center. Known as the first chocolate bar grown and produced on Mars." filling_color = "#552200" icon_state = "cb07" - nutriment_amt = 4 - nutriment_desc = list("chocolate" = 2, "caramel" = 1, "nougat" = 1) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "caramel" = 1, "nougat" = 1)) bitesize = 3 - nutriment_type = NUTRIMENT_BAD w_class = 1 -/obj/item/reagent_containers/food/snacks/cb07/Initialize() - . = ..() - reagents.add_reagent("sugar", 1) - /obj/item/reagent_containers/food/snacks/cb08 name = "crisp bar" desc = "A large puffed rice milk chocolate bar." filling_color = "#552200" icon_state = "cb08" - nutriment_amt = 3 - nutriment_desc = list("chocolate" = 2, "puffed rice" = 1) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 4, /datum/reagent/sugar = 1) + reagent_data = list(/datum/reagent/nutriment/synthetic = list("chocolate" = 2, "puffed rice" = 1)) bitesize = 3 - nutriment_type = NUTRIMENT_BAD w_class = 1 -/obj/item/reagent_containers/food/snacks/cb08/Initialize() - . = ..() - reagents.add_reagent("sugar", 2) - /obj/item/reagent_containers/food/snacks/cb09 name = "oh daddy bar" desc = "A massive cluster of peanuts covered in caramel and chocolate." filling_color = "#552200" icon_state = "cb09" - nutriment_amt = 6 - nutriment_desc = list("chocolate" = 3, "caramel" = 1, "peanuts" = 2) - bitesize = 3 - nutriment_type = NUTRIMENT_BAD - w_class = 1 -/obj/item/reagent_containers/food/snacks/cb09/Initialize() - . = ..() - reagents.add_reagent("sugar", 1) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 6, /datum/reagent/sugar = 1) + reagent_data = list(/datum/reagent/nutriment = list("chocolate" = 3, "caramel" = 1, "peanuts" = 2)) + bitesize = 3 + w_class = 1 /obj/item/reagent_containers/food/snacks/cb10 name = "laughter bar" desc = "Nuts, nougat, peanuts, and caramel covered in chocolate." filling_color = "#552200" icon_state = "cb10" - nutriment_amt = 5 - nutriment_desc = list("chocolate" = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1) - bitesize = 3 - nutriment_type = NUTRIMENT_BAD - w_class = 1 -/obj/item/reagent_containers/food/snacks/cb10/Initialize() - . = ..() - reagents.add_reagent("sugar", 1) + reagents_to_add = list(/datum/reagent/nutriment/synthetic = 5, /datum/reagent/sugar = 1) + reagent_data = list(/datum/reagent/nutriment = list("chocolate" = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1)) + bitesize = 3 + w_class = 1 /obj/item/reagent_containers/food/snacks/hardbread name = "adhomian hard bread" desc = "A long-lasting tajaran bread. It is usually prepared for long journeys, hard winters or military campaigns." icon_state = "loaf" bitesize = 1 - nutriment_desc = list("crusty bread" = 2) - nutriment_amt = 15 + reagents_to_add = list(/datum/reagent/nutriment = 15) + reagent_data = list(/datum/reagent/nutriment = list("crusty bread" = 2)) throw_range = 5 throwforce = 10 w_class = 3 @@ -5498,10 +4829,7 @@ icon_state = "lard" bitesize = 2 center_of_mass = list("x"=16, "y"=16) - -/obj/item/reagent_containers/food/snacks/spreads/lard/Initialize() - . = ..() - reagents.add_reagent("triglyceride", 5) + reagents_to_add = list(/datum/reagent/nutriment/triglyceride = 5) /obj/item/reagent_containers/food/snacks/chipplate/tajcandy name = "plate of sugar tree candy" @@ -5509,9 +4837,9 @@ icon_state = "cubes26" trash = /obj/item/trash/candybowl vendingobject = /obj/item/reagent_containers/food/snacks/tajcandy - nutriment_desc = list("candy" = 1) + reagent_data = list(/datum/reagent/nutriment = list("candy" = 1)) bitesize = 1 - nutriment_amt = 26 + reagents_to_add = list(/datum/reagent/nutriment = 26) unitname = "candy" /obj/item/reagent_containers/food/snacks/chipplate/tajcandy/update_icon() @@ -5535,25 +4863,15 @@ name = "sugar tree candy" desc = "An adhomian candy made from the sugar tree fruit." icon_state = "tajcandy" - nutriment_desc = list("candy" = 3) - nutriment_amt = 1 + reagents_to_add = list(/datum/reagent/nutriment = 1) + reagent_data = list(/datum/reagent/nutriment = list("candy" = 3)) bitesize = 1 - -/obj/item/reagent_containers/food/snacks/tajcandy/Initialize() - . = ..() - reagents.add_reagent("sugar", 3) + reagents_to_add = list(/datum/reagent/sugar = 3) /obj/item/reagent_containers/food/snacks/lardwich name = "hro'zamal lard sandwhich" desc = "A lard sandwhich prepared in the style of Hro'zamal, usually made from Schlorrgo lard." icon_state = "lardwich" - nutriment_desc = list("bread" = 2) - nutriment_amt = 6 + reagent_data = list(/datum/reagent/nutriment = list("bread" = 2)) + reagents_to_add = list(/datum/reagent/nutriment = 6, /datum/reagent/nutriment/triglyceride = 5) bitesize = 2 - -/obj/item/reagent_containers/food/snacks/lardwich/Initialize() - . = ..() - reagents.add_reagent("triglyceride", 5) - -#undef NUTRIMENT_GOOD -#undef NUTRIMENT_BAD diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index 47a8449577c..3a2c76394c7 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -8,12 +8,8 @@ cooked_icon = "meatstake" slice_path = /obj/item/reagent_containers/food/snacks/rawcutlet slices_num = 3 - -/obj/item/reagent_containers/food/snacks/meat/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("triglyceride", 2) - src.bitesize = 1.5 + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/nutriment/triglyceride = 2) + bitesize = 1.5 /obj/item/reagent_containers/food/snacks/meat/cook() @@ -34,11 +30,8 @@ /obj/item/reagent_containers/food/snacks/meat/bug filling_color = "#E6E600" -/obj/item/reagent_containers/food/snacks/meat/bug/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("phoron", 27) - src.bitesize = 1.5 + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/nutriment/triglyceride = 2, /datum/reagent/toxin/phoron = 27) + bitesize = 1.5 /obj/item/reagent_containers/food/snacks/meat/monkey //same as plain meat @@ -52,32 +45,20 @@ icon_state = "chickenbreast" cooked_icon = "chickenbreast_cooked" filling_color = "#BBBBAA" + reagents_to_add = list(/datum/reagent/nutriment/protein = 6) //Chicken is low fat. Less total calories than other meats /obj/item/reagent_containers/food/snacks/meat/biogenerated name = "bio meat" desc = "Did this come from the Biogenerator, or is it a biohazard? Perhaps it is both." icon_state = "plantmeat" filling_color = "#A8AA00" - -/obj/item/reagent_containers/food/snacks/meat/biogenerated/Initialize() - . = ..() - reagents.clear_reagents() - reagents.add_reagent("nutriment",6) - -/obj/item/reagent_containers/food/snacks/meat/chicken/Initialize() - . = ..() - reagents.remove_reagent("triglyceride", INFINITY) - //Chicken is low fat. Less total calories than other meats + reagents_to_add = list(/datum/reagent/nutriment = 6) /obj/item/reagent_containers/food/snacks/meat/undead name = "rotten meat" desc = "A slab of rotten meat." icon_state = "shadowmeat" - -/obj/item/reagent_containers/food/snacks/meat/undead/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("undead_ichor", 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/toxin/undead = 5) /obj/item/reagent_containers/food/snacks/meat/adhomai name = "adhomian meat" @@ -93,18 +74,11 @@ name = "rat meat" icon_state = "chickenbreast" desc = "You have reached the epitome of poorness: eating the station's vermin." - - -/obj/item/reagent_containers/food/snacks/meat/rat/Initialize() - . = ..() - reagents.add_reagent("protein", 5) - src.bitesize = 1.5 + reagents_to_add = list(/datum/reagent/nutriment/protein = 5, /datum/reagent/nutriment/triglyceride = 2) + bitesize = 1.5 /obj/item/reagent_containers/food/snacks/meat/dionanymph name = "diona nymph meat" desc = "A slab of weird green meat." icon_state = "plantmeat" - -/obj/item/reagent_containers/food/snacks/meat/dionanymph/Initialize() - . = ..() - reagents.add_reagent("protein", 6) + reagents_to_add = list(/datum/reagent/nutriment/protein = 6) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index db84e299a5e..b0edd8f2075 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -61,7 +61,7 @@ /obj/item/reagent_containers/glass/proc/shatter(var/mob/user) if(reagents.total_volume) reagents.splash(src.loc, reagents.total_volume) // splashes the mob holding it or the turf it's on - audible_message(span("warning", "\The [src] shatters with a resounding crash!"), span("warning", "\The [src] breaks.")) + audible_message(SPAN_WARNING("\The [src] shatters with a resounding crash!"), SPAN_WARNING("\The [src] breaks.")) playsound(src, "shatter", 70, 1) new /obj/item/material/shard(loc, "glass") qdel(src) @@ -211,17 +211,9 @@ flags = OPENCONTAINER fragile = 1 -/obj/item/reagent_containers/glass/beaker/cryoxadone -/obj/item/reagent_containers/glass/beaker/cryoxadone/Initialize() - . = ..() - reagents.add_reagent("cryoxadone", 30) - update_icon() +/obj/item/reagent_containers/glass/beaker/cryoxadone/reagents_to_add = list(/datum/reagent/cryoxadone = 30) -/obj/item/reagent_containers/glass/beaker/sulphuric -/obj/item/reagent_containers/glass/beaker/sulphuric/Initialize() - . = ..() - reagents.add_reagent("sacid", 60) - update_icon() +/obj/item/reagent_containers/glass/beaker/sulphuric/reagents_to_add = list(/datum/reagent/acid = 60) /obj/item/reagent_containers/glass/bucket desc = "A blue plastic bucket." diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 6b85d55f8b1..f26535afd65 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -16,7 +16,6 @@ flags = 0 volume = 60 fragile = 4 - var/list/reagents_to_add /obj/item/reagent_containers/glass/bottle/on_reagent_change() update_icon() @@ -38,9 +37,6 @@ if(!icon_state) icon_state = "bottle-[rand(1,4)]" - for(var/v in reagents_to_add) - reagents.add_reagent(v, reagents_to_add[v]) - update_icon() /obj/item/reagent_containers/glass/bottle/update_icon() @@ -69,119 +65,119 @@ name = "norepinephrine bottle" desc = "A small bottle. Contains norepinephrine - used to stabilize patients." icon_state = "bottle-4" - reagents_to_add = list("norepinephrine" = 60) + reagents_to_add = list(/datum/reagent/norepinephrine = 60) /obj/item/reagent_containers/glass/bottle/toxin name = "toxin bottle" desc = "A small bottle of toxins. Do not drink, it is poisonous." icon_state = "bottle-3" - reagents_to_add = list("toxin" = 60) + reagents_to_add = list(/datum/reagent/toxin = 60) /obj/item/reagent_containers/glass/bottle/cyanide name = "cyanide bottle" desc = "A small bottle of cyanide. Bitter almonds?" icon_state = "bottle-3" - reagents_to_add = list("cyanide" = 30) + reagents_to_add = list(/datum/reagent/toxin/cyanide = 30) /obj/item/reagent_containers/glass/bottle/stoxin name = "soporific bottle" desc = "A small bottle of soporific. Just the fumes make you sleepy." icon_state = "bottle-3" - reagents_to_add = list("stoxin" = 60) + reagents_to_add = list(/datum/reagent/soporific = 60) /obj/item/reagent_containers/glass/bottle/chloralhydrate name = "chloral hydrate bottle" desc = "A small bottle of Choral Hydrate. Mickey's Favorite!" icon_state = "bottle-3" - reagents_to_add = list("chloralhydrate" = 30) + reagents_to_add = list(/datum/reagent/chloralhydrate = 30) /obj/item/reagent_containers/glass/bottle/antitoxin name = "dylovene bottle" desc = "A small bottle of dylovene. Counters poisons, and repairs damage. A wonder drug." icon_state = "bottle-4" - reagents_to_add = list("dylovene" = 60) + reagents_to_add = list(/datum/reagent/dylovene = 60) /obj/item/reagent_containers/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_state = "bottle-1" - reagents_to_add = list("mutagen" = 60) + reagents_to_add = list(/datum/reagent/mutagen = 60) /obj/item/reagent_containers/glass/bottle/ammonia name = "ammonia bottle" desc = "A small bottle." icon_state = "bottle-1" - reagents_to_add = list("ammonia" = 60) + reagents_to_add = list(/datum/reagent/ammonia = 60) /obj/item/reagent_containers/glass/bottle/diethylamine name = "diethylamine bottle" desc = "A small bottle." icon_state = "bottle-4" - reagents_to_add = list("diethylamine" = 60) + reagents_to_add = list(/datum/reagent/diethylamine = 60) /obj/item/reagent_containers/glass/bottle/pacid name = "Polytrinic Acid Bottle" desc = "A small bottle. Contains a small amount of Polytrinic Acid" icon_state = "bottle-4" - reagents_to_add = list("pacid" = 60) + reagents_to_add = list(/datum/reagent/acid/polyacid = 60) /obj/item/reagent_containers/glass/bottle/adminordrazine name = "Adminordrazine Bottle" desc = "A small bottle. Contains the liquid essence of the gods." icon = 'icons/obj/drinks.dmi' icon_state = "holyflask" - reagents_to_add = list("adminordrazine" = 60) + reagents_to_add = list(/datum/reagent/adminordrazine = 60) /obj/item/reagent_containers/glass/bottle/capsaicin name = "capsaicin bottle" desc = "A small bottle. Contains hot sauce." icon_state = "bottle-4" - reagents_to_add = list("capsaicin" = 60) + reagents_to_add = list(/datum/reagent/capsaicin = 60) /obj/item/reagent_containers/glass/bottle/frostoil name = "frost oil bottle" desc = "A small bottle. Contains cold sauce." icon_state = "bottle-4" - reagents_to_add = list("frostoil" = 60) + reagents_to_add = list(/datum/reagent/frostoil = 60) /obj/item/reagent_containers/glass/bottle/pyrosilicate name = "pyrosilicate bottle" desc = "A small bottle. Contains pyrosilicate - used to heat up reagents." icon_state = "bottle-4" - reagents_to_add = list("pyrosilicate" = 60) + reagents_to_add = list(/datum/reagent/pyrosilicate = 60) /obj/item/reagent_containers/glass/bottle/cryosurfactant name = "cryosurfactant bottle" desc = "A small bottle. Contains cryosurfactant - used to cool down reagents." icon_state = "bottle-4" - reagents_to_add = list("cryosurfactant" = 60) + reagents_to_add = list(/datum/reagent/cryosurfactant = 60) /obj/item/reagent_containers/glass/bottle/phoron_salt name = "phoron salt bottle" desc = "A small bottle. Contains phoron salt - a mysterious and unstable chemical." icon_state = "bottle-4" - reagents_to_add = list("phoron_salt" = 60) + reagents_to_add = list(/datum/reagent/toxin/phoron_salt = 60) /obj/item/reagent_containers/glass/bottle/epinephrine name = "epinephrine bottle" desc = "A small bottle. Contains epinephrine. Epinephrine, also known as adrenaline, is a super strength stimulant and painkiller intended to keep a patient alive while in critical condition. Overdose causes heart damage and an energy boost equivelent to hyperzine." icon_state = "bottle-4" - reagents_to_add = list("adrenaline" = 60) + reagents_to_add = list(/datum/reagent/adrenaline = 60) /obj/item/reagent_containers/glass/bottle/dexalin_plus name = "dexalin plus bottle" desc = "A small bottle. Contains Dexalin Plus that is used in the treatment of oxygen deprivation. It is highly effective, and is twice as powerful and lasts twice as long when inhaled." icon_state = "bottle-4" - reagents_to_add = list("dexalinp" = 60) + reagents_to_add = list(/datum/reagent/dexalin/plus = 60) /obj/item/reagent_containers/glass/bottle/coughsyrup name = "cough syrup bottle" desc = "A small bottle of cough syrup. Don't take too much!" icon_state = "bottle-3" - reagents_to_add = list("coughsyrup" = 60) + reagents_to_add = list(/datum/reagent/coughsyrup = 60) /obj/item/reagent_containers/glass/bottle/thetamycin name = "thetamycin bottle" desc = "A small bottle of thetamycin. Used for disinfecting whatever wounds security caused." icon_state = "bottle-4" - reagents_to_add = list("thetamycin" = 60) + reagents_to_add = list(/datum/reagent/thetamycin = 60) diff --git a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm index ff64f3b7445..0402b9dce8b 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm @@ -5,7 +5,7 @@ flags = OPENCONTAINER volume = 60 fragile = 0 // do NOT shatter - var/reagent = "" + var/reagent = /datum/reagent/ /obj/item/reagent_containers/glass/bottle/robot/norepinephrine @@ -13,23 +13,13 @@ desc = "A small bottle. Contains norepinephrine - used to stabilize patients." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-4" - reagent = "norepinephrine" - - New() - ..() - reagents.add_reagent("norepinephrine", 60) - update_icon() - + reagent = /datum/reagent/norepinephrine + reagents_to_add = list(/datum/reagent/norepinephrine = 60) /obj/item/reagent_containers/glass/bottle/robot/antitoxin name = "internal anti-toxin bottle" desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-4" - reagent = "dylovene" - - New() - ..() - reagents.add_reagent("dylovene", 60) - update_icon() - + reagent = /datum/reagent/dylovene + reagents_to_add = list(/datum/reagent/dylovene = 60) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 6aebac0b069..6c9690cc5d6 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -48,7 +48,7 @@ . = ..() var/mob/living/carbon/human/H = M if(istype(H)) - user.visible_message(span("warning", "\The [user] is trying to inject \the [M] with \the [src]!"),span("notice", "You are trying to inject \the [M] with \the [src].")) + user.visible_message(SPAN_WARNING("\The [user] is trying to inject \the [M] with \the [src]!"), SPAN_NOTICE("You are trying to inject \the [M] with \the [src].")) var/inj_time = time if(armorcheck && H.run_armor_check(target_zone,"melee",0,"Your armor slows down the injection!","Your armor slows down the injection!")) inj_time += 6 SECONDS @@ -78,13 +78,13 @@ return if(!reagents.total_volume) - to_chat(user,span("warning", "\The [src] is empty.")) + to_chat(user, SPAN_WARNING("\The [src] is empty.")) return user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) user.do_attack_animation(M) - to_chat(user,span("notice", "You inject \the [M] with \the [src].")) - to_chat(M,span("notice", "You feel a tiny prick!")) + to_chat(user, SPAN_NOTICE("You inject \the [M] with \the [src].")) + to_chat(M, SPAN_NOTICE("You feel a tiny prick!")) playsound(src, 'sound/items/hypospray.ogg',25) if(M.reagents) @@ -92,7 +92,7 @@ var/temp = reagents.get_temperature() var/trans = reagents.trans_to_mob(M, amount_per_transfer_from_this, CHEM_BLOOD) admin_inject_log(user, M, src, contained, temp, trans) - to_chat(user,span("notice", "[trans] units injected. [reagents.total_volume] units remaining in \the [src].")) + to_chat(user, SPAN_NOTICE("[trans] units injected. [reagents.total_volume] units remaining in \the [src].")) update_icon() return TRUE @@ -116,25 +116,25 @@ /obj/item/reagent_containers/hypospray/autoinjector/attack(var/mob/M, var/mob/user, target_zone) if(is_open_container()) - to_chat(user,span("notice", "You must secure the reagents inside \the [src] before using it!")) + to_chat(user, SPAN_NOTICE("You must secure the reagents inside \the [src] before using it!")) return FALSE . = ..() /obj/item/reagent_containers/hypospray/autoinjector/attack_self(mob/user as mob) if(is_open_container()) if(reagents && reagents.reagent_list.len) - to_chat(user,span("notice", "With a quick twist of \the [src]'s lid, you secure the reagents inside.")) + to_chat(user, SPAN_NOTICE("With a quick twist of \the [src]'s lid, you secure the reagents inside.")) flags &= ~OPENCONTAINER update_icon() else - to_chat(user,span("notice", "You can't secure \the [src] without putting reagents in!")) + to_chat(user, SPAN_NOTICE("You can't secure \the [src] without putting reagents in!")) else - to_chat(user,span("notice", "The reagents inside \the [src] are already secured.")) + to_chat(user, SPAN_NOTICE("The reagents inside \the [src] are already secured.")) return /obj/item/reagent_containers/hypospray/autoinjector/attackby(obj/item/W, mob/user) if(W.isscrewdriver() && !is_open_container()) - to_chat(user,span("notice", "Using \the [W], you unsecure the autoinjector's lid.")) // it locks shut after being secured + to_chat(user, SPAN_NOTICE("Using \the [W], you unsecure the autoinjector's lid.")) // it locks shut after being secured flags |= OPENCONTAINER update_icon() return @@ -151,9 +151,9 @@ /obj/item/reagent_containers/hypospray/autoinjector/examine(mob/user) ..(user) if(reagents && reagents.reagent_list.len) - to_chat(user, span("notice", "It is currently loaded.")) + to_chat(user, SPAN_NOTICE("It is currently loaded.")) else - to_chat(user, span("notice", "It is empty.")) + to_chat(user, SPAN_NOTICE("It is empty.")) /obj/item/reagent_containers/hypospray/autoinjector/norepinephrine @@ -164,7 +164,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/norepinephrine/Initialize() . =..() - reagents.add_reagent("norepinephrine", 5) + reagents.add_reagent(/datum/reagent/norepinephrine, 5) update_icon() return @@ -174,11 +174,7 @@ volume = 20 amount_per_transfer_from_this = 20 -/obj/item/reagent_containers/hypospray/autoinjector/stimpack/Initialize() - . = ..() - reagents.add_reagent("hyperzine", 12) - reagents.add_reagent("tramadol", 8) - update_icon() + reagents_to_add = list(/datum/reagent/hyperzine = 12, /datum/reagent/tramadol = 8) /obj/item/reagent_containers/hypospray/autoinjector/survival name = "survival autoinjector" @@ -186,14 +182,7 @@ volume = 35 amount_per_transfer_from_this = 35 -/obj/item/reagent_containers/hypospray/autoinjector/survival/Initialize() - . = ..() - reagents.add_reagent("tricordrazine", 15) - reagents.add_reagent("norepinephrine", 5) - reagents.add_reagent("dexalinp", 5) - reagents.add_reagent("oxycodone", 5) - reagents.add_reagent("methylphenidate", 5) - update_icon() + reagents_to_add = list(/datum/reagent/tricordrazine = 15, /datum/reagent/norepinephrine = 5, /datum/reagent/dexalin/plus = 5, /datum/reagent/oxycodone = 5, /datum/reagent/mental/methylphenidate = 5) /obj/item/reagent_containers/hypospray/combat name = "combat hypospray" @@ -204,10 +193,4 @@ armorcheck = 0 time = 0 -/obj/item/reagent_containers/hypospray/combat/Initialize() - . = ..() - reagents.add_reagent("oxycodone", 5) - reagents.add_reagent("synaptizine", 5) - reagents.add_reagent("hyperzine", 5) - reagents.add_reagent("arithrazine", 5) - update_icon() + reagents_to_add = list(/datum/reagent/oxycodone = 5, /datum/reagent/synaptizine = 5, /datum/reagent/hyperzine = 5, /datum/reagent/arithrazine = 5) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/inhaler.dm b/code/modules/reagents/reagent_containers/inhaler.dm index e1ff24a1f5f..07a58c74896 100644 --- a/code/modules/reagents/reagent_containers/inhaler.dm +++ b/code/modules/reagents/reagent_containers/inhaler.dm @@ -132,7 +132,7 @@ Initialize() . =..() - reagents.add_reagent("dexalin", volume) + reagents.add_reagent(/datum/reagent/dexalin, volume) update_icon() return @@ -142,7 +142,7 @@ Initialize() . =..() - reagents.add_reagent("peridaxon", volume) + reagents.add_reagent(/datum/reagent/peridaxon, volume) update_icon() return @@ -152,7 +152,7 @@ Initialize() . =..() - reagents.add_reagent("hyperzine", volume) + reagents.add_reagent(/datum/reagent/hyperzine, volume) update_icon() return @@ -162,7 +162,7 @@ Initialize() . =..() - reagents.add_reagent("phoron", volume) + reagents.add_reagent(/datum/reagent/toxin/phoron, volume) update_icon() return @@ -174,7 +174,7 @@ volume = 10 Initialize() . =..() - reagents.add_reagent("phoron", volume) + reagents.add_reagent(/datum/reagent/toxin/phoron, volume) update_icon() return @@ -187,7 +187,7 @@ Initialize() . =..() - reagents.add_reagent("stoxin", volume) + reagents.add_reagent(/datum/reagent/soporific, volume) update_icon() return @@ -197,7 +197,7 @@ Initialize() . =..() - reagents.add_reagent("space_drugs", volume) + reagents.add_reagent(/datum/reagent/space_drugs, volume) update_icon() return @@ -207,7 +207,7 @@ Initialize() . =..() - reagents.add_reagent("ammonia", volume) + reagents.add_reagent(/datum/reagent/ammonia, volume) update_icon() return @@ -217,7 +217,7 @@ Initialize() . =..() - reagents.add_reagent("pulmodeiectionem", volume) + reagents.add_reagent(/datum/reagent/pulmodeiectionem, volume) update_icon() return diff --git a/code/modules/reagents/reagent_containers/inhaler_advanced.dm b/code/modules/reagents/reagent_containers/inhaler_advanced.dm index f18a5f3e810..2bea07710c2 100644 --- a/code/modules/reagents/reagent_containers/inhaler_advanced.dm +++ b/code/modules/reagents/reagent_containers/inhaler_advanced.dm @@ -191,7 +191,7 @@ name = "large inhaler cartridge (hyperzine)" Initialize() . =..() - reagents.add_reagent("hyperzine", 30) + reagents.add_reagent(/datum/reagent/hyperzine, 30) flags ^= OPENCONTAINER update_icon() return @@ -200,7 +200,7 @@ name = "large inhaler cartridge (norepinephrine)" Initialize() . =..() - reagents.add_reagent("norepinephrine", 30) + reagents.add_reagent(/datum/reagent/norepinephrine, 30) flags ^= OPENCONTAINER update_icon() return diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 1fb8a8c3cfe..6cdfa83f58e 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -30,7 +30,7 @@ if(!M.can_eat(src)) return - M.visible_message("[M] swallows a pill.", span("notice", "You swallow \the [src]."), null, 2) + M.visible_message("[M] swallows a pill.", SPAN_NOTICE("You swallow \the [src]."), null, 2) if(reagents.total_volume) reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST) qdel(src) @@ -40,13 +40,13 @@ if(!M.can_force_feed(user, src)) return - user.visible_message(span("warning", "[user] attempts to force [M] to swallow \the [src]!")) + user.visible_message(SPAN_WARNING("[user] attempts to force [M] to swallow \the [src]!")) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(!do_mob(user, M)) return - user.visible_message(span("warning", "[user] forces [M] to swallow \the [src].")) + user.visible_message(SPAN_WARNING("[user] forces [M] to swallow \the [src].")) var/contained = reagentlist() M.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [key_name(user)] Reagents: [contained]") @@ -65,16 +65,16 @@ if(proximity && target.is_open_container() && target.reagents) if(!target.reagents.total_volume) - to_chat(user, span("notice", "[target] is empty. Can't dissolve \the [src].")) + to_chat(user, SPAN_NOTICE("[target] is empty. Can't dissolve \the [src].")) return - to_chat(user, span("notice", "You dissolve \the [src] in [target].")) + to_chat(user, SPAN_NOTICE("You dissolve \the [src] in [target].")) user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagentlist()]") msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (JMP)",ckey=key_name(user),ckey_target=key_name(target)) reagents.trans_to(target, reagents.total_volume) for(var/mob/O in viewers(2, user)) - O.show_message(span("warning", "[user] puts something in \the [target]."), 1) + O.show_message(SPAN_WARNING("[user] puts something in \the [target]."), 1) qdel(src) return @@ -90,189 +90,135 @@ name = "Anti-toxins pill" desc = "Neutralizes many common toxins." icon_state = "pill17" - Initialize() - . = ..() - reagents.add_reagent("dylovene", 25) + reagents_to_add = list(/datum/reagent/dylovene = 25) /obj/item/reagent_containers/pill/tox name = "Toxins pill" desc = "Highly toxic." icon_state = "pill5" - Initialize() - . = ..() - reagents.add_reagent("toxin", 50) + reagents_to_add = list(/datum/reagent/toxin = 50) /obj/item/reagent_containers/pill/cyanide name = "Cyanide pill" desc = "Don't swallow this." icon_state = "pill5" - Initialize() - . = ..() - reagents.add_reagent("cyanide", 50) + reagents_to_add = list(/datum/reagent/toxin/cyanide = 50) /obj/item/reagent_containers/pill/adminordrazine name = "Adminordrazine pill" desc = "It's magic. We don't have to explain it." icon_state = "pill16" - Initialize() - . = ..() - reagents.add_reagent("adminordrazine", 50) + reagents_to_add = list(/datum/reagent/adminordrazine = 50) /obj/item/reagent_containers/pill/stox name = "Sleeping pill" desc = "Commonly used to treat insomnia." icon_state = "pill8" - Initialize() - . = ..() - reagents.add_reagent("stoxin", 15) + reagents_to_add = list(/datum/reagent/soporific = 15) /obj/item/reagent_containers/pill/kelotane name = "Kelotane pill" desc = "Used to treat burns." icon_state = "pill11" - Initialize() - . = ..() - reagents.add_reagent("kelotane", 15) + reagents_to_add = list(/datum/reagent/kelotane = 15) /obj/item/reagent_containers/pill/paracetamol name = "Paracetamol pill" desc = "Tylenol! A painkiller for the ages. Chewables!" icon_state = "pill8" - Initialize() - . = ..() - reagents.add_reagent("paracetamol", 15) + reagents_to_add = list(/datum/reagent/paracetamol = 15) /obj/item/reagent_containers/pill/tramadol name = "Tramadol pill" desc = "A simple painkiller." icon_state = "pill8" - Initialize() - . = ..() - reagents.add_reagent("tramadol", 15) + reagents_to_add = list(/datum/reagent/tramadol = 15) /obj/item/reagent_containers/pill/methylphenidate name = "Methylphenidate pill" desc = "Improves the ability to concentrate." icon_state = "pill8" - Initialize() - . = ..() - reagents.add_reagent("methylphenidate", 15) + reagents_to_add = list(/datum/reagent/mental/methylphenidate = 15) /obj/item/reagent_containers/pill/escitalopram name = "Escitalopram pill" desc = "Mild anti-depressant." icon_state = "pill8" - Initialize() - . = ..() - reagents.add_reagent("escitalopram", 15) - -/obj/item/reagent_containers/pill/escitalopram - name = "Escitalopram pill" - desc = "Mild anti-depressant." - icon_state = "pill8" - Initialize() - . = ..() - reagents.add_reagent("escitalopram", 15) + reagents_to_add = list(/datum/reagent/mental/escitalopram = 15) /obj/item/reagent_containers/pill/norepinephrine name = "norepinephrine pill" desc = "Used to stabilize patients." icon_state = "pill20" - Initialize() - . = ..() - reagents.add_reagent("norepinephrine", 30) + reagents_to_add = list(/datum/reagent/norepinephrine = 30) /obj/item/reagent_containers/pill/dexalin name = "Dexalin pill" desc = "Used to treat oxygen deprivation." icon_state = "pill16" - Initialize() - . = ..() - reagents.add_reagent("dexalin", 15) + reagents_to_add = list(/datum/reagent/dexalin = 15) /obj/item/reagent_containers/pill/dexalin_plus name = "Dexalin Plus pill" desc = "Used to treat extreme oxygen deprivation." icon_state = "pill8" - Initialize() - . = ..() - reagents.add_reagent("dexalinp", 15) + reagents_to_add = list(/datum/reagent/dexalin/plus = 15) /obj/item/reagent_containers/pill/dermaline name = "Dermaline pill" desc = "Used to treat burn wounds." icon_state = "pill12" - Initialize() - . = ..() - reagents.add_reagent("dermaline", 15) + reagents_to_add = list(/datum/reagent/dermaline = 15) /obj/item/reagent_containers/pill/dylovene name = "Dylovene pill" desc = "A broad-spectrum anti-toxin." icon_state = "pill13" - Initialize() - . = ..() - reagents.add_reagent("dylovene", 15) + reagents_to_add = list(/datum/reagent/dylovene = 15) /obj/item/reagent_containers/pill/bicaridine name = "Bicaridine pill" desc = "Used to treat physical injuries." icon_state = "pill18" - Initialize() - . = ..() - reagents.add_reagent("bicaridine", 20) + reagents_to_add = list(/datum/reagent/bicaridine = 20) /obj/item/reagent_containers/pill/happy name = "Happy pill" desc = "Happy happy joy joy!" icon_state = "pill18" - Initialize() - . = ..() - reagents.add_reagent("space_drugs", 15) - reagents.add_reagent("sugar", 15) + reagents_to_add = list(/datum/reagent/space_drugs = 15, /datum/reagent/sugar = 15) /obj/item/reagent_containers/pill/zoom name = "Zoom pill" desc = "Zoooom!" icon_state = "pill18" - Initialize() - . = ..() - reagents.add_reagent("impedrezene", 10) - reagents.add_reagent("synaptizine", 5) - reagents.add_reagent("hyperzine", 5) + reagents_to_add = list(/datum/reagent/impedrezene = 10, /datum/reagent/synaptizine = 5, /datum/reagent/hyperzine = 5) /obj/item/reagent_containers/pill/thetamycin name = "thetamycin pill" desc = "Contains theta-lactam antibiotics." icon_state = "pill19" - Initialize() - . = ..() - reagents.add_reagent("thetamycin", 15) + reagents_to_add = list(/datum/reagent/thetamycin = 15) /obj/item/reagent_containers/pill/bio_vitamin name = "Vitamin pill" desc = "Contains a meal's worth of nutrients." icon_state = "pill11" - Initialize() - . = ..() - reagents.add_reagent("nutriment", 20) - reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),1) + reagents_to_add = list(/datum/reagent/nutriment = 20) + +/obj/item/reagent_containers/pill/bio_vitamin/Initialize() + reagents_to_add += list(pick(/datum/reagent/drink/banana, /datum/reagent/drink/berryjuice, /datum/reagent/drink/grapejuice, /datum/reagent/drink/lemonjuice, /datum/reagent/drink/limejuice, /datum/reagent/drink/orangejuice, /datum/reagent/drink/watermelonjuice) = 1) + . = ..() /obj/item/reagent_containers/pill/rmt name = "RMT pill" desc = "Contains chemical rampantly used by those seeking to remedy the effects of prolonged zero-gravity adaptations." icon_state = "pill19" - -/obj/item/reagent_containers/pill/rmt/Initialize() - . = ..() - reagents.add_reagent("rmt", 15) + reagents_to_add = list(/datum/reagent/rmt = 15) /obj/item/reagent_containers/pill/antihistamine name = "antihistamine" desc = "Contains diphenhydramine, also known as Benadryl. Helps with sneezing, can cause drowsiness." icon_state = "pill19" - -/obj/item/reagent_containers/pill/antihistamine/Initialize() - . = ..() - reagents.add_reagent("diphenhydramine", 5) + reagents_to_add = list(/datum/reagent/antihistamine = 5) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 91c44b3bc7d..d3b1d50aead 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -69,13 +69,13 @@ playsound(src.loc, spray_sound, 50, 1, -6) - if(reagents.has_reagent("sacid")) + if(reagents.has_reagent(/datum/reagent/acid)) message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].") log_game("[key_name(user)] fired sulphuric acid from \a [src].",ckey=key_name(user)) - if(reagents.has_reagent("pacid")) + if(reagents.has_reagent(/datum/reagent/acid/polyacid)) message_admins("[key_name_admin(user)] fired Polyacid from \a [src].") log_game("[key_name(user)] fired Polyacid from \a [src].",ckey=key_name(user)) - if(reagents.has_reagent("lube")) + if(reagents.has_reagent(/datum/reagent/lube)) message_admins("[key_name_admin(user)] fired Space lube from \a [src].") log_game("[key_name(user)] fired Space lube from \a [src].",ckey=key_name(user)) return @@ -139,7 +139,7 @@ /obj/item/reagent_containers/spray/cleaner/Initialize() . = ..() - reagents.add_reagent("cleaner", volume) + reagents.add_reagent(/datum/reagent/spacecleaner, volume) /obj/item/reagent_containers/spray/sterilizine name = "sterilizine" @@ -147,7 +147,7 @@ /obj/item/reagent_containers/spray/sterilizine/Initialize() . = ..() - reagents.add_reagent("sterilizine", volume) + reagents.add_reagent(/datum/reagent/sterilizine, volume) /obj/item/reagent_containers/spray/pepper name = "pepperspray" @@ -160,10 +160,7 @@ volume = 40 safety = 1 hitsound = "swing_hit" - -/obj/item/reagent_containers/spray/pepper/Initialize() - . = ..() - reagents.add_reagent("condensedcapsaicin", 40) + reagents_to_add = list(/datum/reagent/capsaicin/condensed = 40) /obj/item/reagent_containers/spray/pepper/examine(mob/user) if(..(user, 1)) @@ -193,9 +190,7 @@ possible_transfer_amounts = null volume = 10 -/obj/item/reagent_containers/spray/waterflower/Initialize() - . = ..() - reagents.add_reagent("water", 10) + reagents_to_add = list(/datum/reagent/water = 10) /obj/item/reagent_containers/spray/chemsprayer name = "chem sprayer" @@ -257,9 +252,7 @@ item_state = "plantbgone" volume = 100 -/obj/item/reagent_containers/spray/plantbgone/Initialize() - . = ..() - reagents.add_reagent("plantbgone", 100) + reagents_to_add = list(/datum/reagent/toxin/plantbgone = 100) /obj/item/reagent_containers/spray/plantbgone/afterattack(atom/A as mob|obj, mob/user as mob, proximity) if(!proximity) return diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 88abb775179..4892d28d10e 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -88,7 +88,7 @@ switch(mode) if(SYRINGE_CAPPED) mode = SYRINGE_DRAW - to_chat(user, span("notice", "You uncap the syringe.")) + to_chat(user, SPAN_NOTICE("You uncap the syringe.")) if(SYRINGE_DRAW) mode = SYRINGE_INJECT if(SYRINGE_INJECT) @@ -109,10 +109,10 @@ return if(mode == SYRINGE_CAPPED) - to_chat(user, span("notice", "This syringe is capped!")) + to_chat(user, SPAN_NOTICE("This syringe is capped!")) return if(mode == SYRINGE_BROKEN) - to_chat(user, span("warning", "This syringe is broken!")) + to_chat(user, SPAN_WARNING("This syringe is broken!")) return if(user.a_intent == I_GRAB && ishuman(user) && ishuman(target)) // we could add other things here eventually. trepanation maybe @@ -120,10 +120,10 @@ if (check_zone(user.zone_sel.selecting) == BP_CHEST) // impromptu needle thoracostomy, re-inflate a collapsed lung var/P = (user == target) ? "their" : (target.name + "\'s") var/SM = (user == target) ? "your" : (target.name + "\'s") - user.visible_message(span("danger", "[user] aims \the [src] between [P] ribs!"), span("danger", "You aim \the [src] between [SM] ribs!")) + user.visible_message(SPAN_DANGER("[user] aims \the [src] between [P] ribs!"), SPAN_DANGER("You aim \the [src] between [SM] ribs!")) if(!do_mob(user, target, 1.5 SECONDS)) return - user.visible_message(span("warning", "[user] jabs \the [src] between [P] ribs with \the [src]!"), span("warning", "You jab \the [src] between [SM] ribs!")) + user.visible_message(SPAN_WARNING("[user] jabs \the [src] between [P] ribs with \the [src]!"), SPAN_WARNING("You jab \the [src] between [SM] ribs!")) if(H.is_lung_ruptured()) var/obj/item/organ/internal/lungs/L = H.internal_organs_by_name[BP_LUNGS] if(!L.rescued) @@ -144,25 +144,25 @@ if(SYRINGE_DRAW) if(!reagents.get_free_space()) - to_chat(user, span("warning", "The syringe is full.")) + to_chat(user, SPAN_WARNING("The syringe is full.")) mode = SYRINGE_INJECT return if(ismob(target))//Blood! - if(reagents.has_reagent("blood")) - to_chat(user, span("notice", "There is already a blood sample in this syringe.")) + if(reagents.has_reagent(/datum/reagent/blood)) + to_chat(user, SPAN_NOTICE("There is already a blood sample in this syringe.")) return if(istype(target, /mob/living/carbon)) if(istype(target, /mob/living/carbon/slime)) - to_chat(user, span("warning", "You are unable to locate any blood.")) + to_chat(user, SPAN_WARNING("You are unable to locate any blood.")) return var/amount = reagents.get_free_space() var/mob/living/carbon/T = target if(!T.dna) - to_chat(user, span("warning", "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum).")) + to_chat(user, SPAN_WARNING("You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum).")) return if(NOCLONE in T.mutations) //target done been et, no more blood in him - to_chat(user, span("warning", "You are unable to locate any blood.")) + to_chat(user, SPAN_WARNING("You are unable to locate any blood.")) return var/datum/reagent/B @@ -180,21 +180,21 @@ reagents.update_total() on_reagent_change() reagents.handle_reactions() - to_chat(user, span("notice", "You take a blood sample from [target].")) + to_chat(user, SPAN_NOTICE("You take a blood sample from [target].")) for(var/mob/O in viewers(4, user)) - O.show_message(span("notice", "[user] takes a blood sample from [target]."), 1) + O.show_message(SPAN_NOTICE("[user] takes a blood sample from [target]."), 1) else //if not mob if(!target.reagents.total_volume) - to_chat(user, span("notice", "[target] is empty.")) + to_chat(user, SPAN_NOTICE("[target] is empty.")) return if(!target.is_open_container() && !istype(target, /obj/structure/reagent_dispensers) && !istype(target, /obj/item/slime_extract)) - to_chat(user, span("notice", "You cannot directly remove reagents from this object.")) + to_chat(user, SPAN_NOTICE("You cannot directly remove reagents from this object.")) return var/trans = target.reagents.trans_to_obj(src, amount_per_transfer_from_this) - to_chat(user, span("notice", "You fill the syringe with [trans] units of the solution.")) + to_chat(user, SPAN_NOTICE("You fill the syringe with [trans] units of the solution.")) update_icon() if(!reagents.get_free_space()) @@ -203,17 +203,17 @@ if(SYRINGE_INJECT) if(!reagents.total_volume) - to_chat(user, span("notice", "The syringe is empty.")) + to_chat(user, SPAN_NOTICE("The syringe is empty.")) mode = SYRINGE_DRAW return if(istype(target, /obj/item/implantcase/chem)) return if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/smokable/cigarette) && !istype(target, /obj/item/storage/fancy/cigarettes)) - to_chat(user, span("notice", "You cannot directly fill this object.")) + to_chat(user, SPAN_NOTICE("You cannot directly fill this object.")) return if(!target.reagents.get_free_space()) - to_chat(user, span("notice", "[target] is full.")) + to_chat(user, SPAN_NOTICE("[target] is full.")) return var/mob/living/carbon/human/H = target @@ -221,10 +221,10 @@ if(istype(H)) affected = H.get_organ(user.zone_sel.selecting) if(!affected) - to_chat(user, span("danger", "\The [H] is missing that limb!")) + to_chat(user, SPAN_DANGER("\The [H] is missing that limb!")) return else if(affected.status & ORGAN_ROBOT) - to_chat(user, span("danger", "You cannot inject a robotic limb.")) + to_chat(user, SPAN_DANGER("You cannot inject a robotic limb.")) return if(ismob(target) && target != user) @@ -247,12 +247,12 @@ return if(injtime == time) - user.visible_message(span("warning", "[user] is trying to inject [target] with [visible_name]!")) + user.visible_message(SPAN_WARNING("[user] is trying to inject [target] with [visible_name]!")) else if(isvaurca(H)) - user.visible_message(span("warning", "[user] begins hunting for an injection port on [target]'s carapace!")) + user.visible_message(SPAN_WARNING("[user] begins hunting for an injection port on [target]'s carapace!")) else - user.visible_message(span("warning", "[user] begins hunting for an injection port on [target]'s suit!")) + user.visible_message(SPAN_WARNING("[user] begins hunting for an injection port on [target]'s suit!")) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) user.do_attack_animation(target) @@ -260,7 +260,7 @@ if(!do_mob(user, target, injtime)) return - user.visible_message(span("warning", "[user] injects [target] with the syringe!")) + user.visible_message(SPAN_WARNING("[user] injects [target] with the syringe!")) var/trans if(ismob(target)) @@ -270,7 +270,7 @@ admin_inject_log(user, target, src, contained, reagents.get_temperature(), trans) else trans = reagents.trans_to(target, amount_per_transfer_from_this) - to_chat(user, span("notice", "You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.")) + to_chat(user, SPAN_NOTICE("You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.")) if (reagents.total_volume <= 0 && mode == SYRINGE_INJECT) mode = SYRINGE_DRAW update_icon() @@ -316,7 +316,7 @@ /obj/item/reagent_containers/syringe/proc/syringestab(mob/living/carbon/target as mob, mob/living/carbon/user as mob) if(mode == SYRINGE_CAPPED) - to_chat(user, span("danger", "You can't stab someone with a capped syringe!")) + to_chat(user, SPAN_DANGER("You can't stab someone with a capped syringe!")) if(istype(target, /mob/living/carbon/human)) @@ -326,7 +326,7 @@ var/obj/item/organ/external/affecting = H.get_organ(target_zone) if (!affecting || affecting.is_stump()) - to_chat(user, span("danger", "They are missing that limb!")) + to_chat(user, SPAN_DANGER("They are missing that limb!")) return var/hit_area = affecting.name @@ -336,7 +336,7 @@ if (target != user && H.getarmor(target_zone, "melee") > 5 && prob(50)) for(var/mob/O in viewers(world.view, user)) - O.show_message(text(span("danger", "[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!")), 1) + O.show_message(text(SPAN_DANGER("[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!")), 1) user.remove_from_mob(src) qdel(src) @@ -346,13 +346,13 @@ return - user.visible_message(span("danger", "[user] stabs [target] in \the [hit_area] with [src.name]!")) + user.visible_message(SPAN_DANGER("[user] stabs [target] in \the [hit_area] with [src.name]!")) if(affecting.take_damage(3)) H.UpdateDamageIcon() else - user.visible_message(span("danger", "[user] stabs [target] with [src.name]!")) + user.visible_message(SPAN_DANGER("[user] stabs [target] with [src.name]!")) target.take_organ_damage(3)// 7 is the same as crowbar punch var/syringestab_amount_transferred = rand(0, (reagents.total_volume - 5)) //nerfed by popular demand @@ -381,10 +381,10 @@ /obj/item/reagent_containers/syringe/ld50_syringe/afterattack(obj/target, mob/user, flag) if(mode == SYRINGE_DRAW && ismob(target)) // No drawing 50 units of blood at once - to_chat(user, span("notice", "This needle isn't designed for drawing blood.")) + to_chat(user, SPAN_NOTICE("This needle isn't designed for drawing blood.")) return if(user.a_intent == "hurt" && ismob(target)) // No instant injecting - to_chat(user, span("notice", "This syringe is too big to stab someone with it.")) + to_chat(user, SPAN_NOTICE("This syringe is too big to stab someone with it.")) ..() //////////////////////////////////////////////////////////////////////////////// @@ -394,57 +394,58 @@ /obj/item/reagent_containers/syringe/norepinephrine name = "Syringe (norepinephrine)" desc = "Contains norepinephrine - used to stabilize patients." + reagents_to_add = list(/datum/reagent/norepinephrine = 15) /obj/item/reagent_containers/syringe/norepinephrine/Initialize() . = ..() - reagents.add_reagent("norepinephrine", 15) mode = SYRINGE_INJECT update_icon() /obj/item/reagent_containers/syringe/dylovene name = "Syringe (dylovene)" desc = "Contains anti-toxins." + reagents_to_add = list(/datum/reagent/dylovene = 15) /obj/item/reagent_containers/syringe/dylovene/Initialize() . = ..() - reagents.add_reagent("dylovene", 15) mode = SYRINGE_INJECT update_icon() /obj/item/reagent_containers/syringe/antibiotic name = "Syringe (thetamycin)" desc = "Contains antibiotics." + reagents_to_add = list(/datum/reagent/thetamycin = 15) /obj/item/reagent_containers/syringe/antibiotic/Initialize() . = ..() - reagents.add_reagent("thetamycin", 15) mode = SYRINGE_INJECT update_icon() /obj/item/reagent_containers/syringe/drugs name = "Syringe (drugs)" desc = "Contains aggressive drugs meant for torture." + reagents_to_add = list(/datum/reagent/toxin/panotoxin = 5, /datum/reagent/mindbreaker = 10) /obj/item/reagent_containers/syringe/drugs/Initialize() . = ..() - reagents.add_reagent("panotoxin", 5) - reagents.add_reagent("mindbreaker", 10) mode = SYRINGE_INJECT update_icon() /obj/item/reagent_containers/syringe/calomel name = "Syringe (calomel)" desc = "Contains purging medicine." + reagents_to_add = list(/datum/reagent/calomel = 15) /obj/item/reagent_containers/syringe/calomel/Initialize() . = ..() - reagents.add_reagent("calomel", 15) mode = SYRINGE_INJECT update_icon() +/obj/item/reagent_containers/syringe/ld50_syringe/chloral + reagents_to_add = list(/datum/reagent/chloralhydrate = 60) + /obj/item/reagent_containers/syringe/ld50_syringe/chloral/Initialize() . = ..() - reagents.add_reagent("chloralhydrate", 60) mode = SYRINGE_INJECT update_icon() \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/tooth_paste.dm b/code/modules/reagents/reagent_containers/tooth_paste.dm index 9d7e53a4754..184d8b648f5 100644 --- a/code/modules/reagents/reagent_containers/tooth_paste.dm +++ b/code/modules/reagents/reagent_containers/tooth_paste.dm @@ -7,10 +7,7 @@ possible_transfer_amounts = null amount_per_transfer_from_this = 5 volume = 20 - -/obj/item/reagent_containers/toothpaste/Initialize() - . = ..() - reagents.add_reagent("toothpaste", 20) + reagents_to_add = list(/datum/reagent/drink/toothpaste = 20) /obj/item/reagent_containers/toothpaste/on_reagent_change() update_icon() @@ -41,7 +38,7 @@ /obj/item/reagent_containers/toothbrush/update_icon() cut_overlays() - if(reagents.has_reagent("toothpaste")) + if(reagents.has_reagent(/datum/reagent/drink/toothpaste)) add_overlay("toothpaste_overlay") /obj/item/reagent_containers/toothbrush/attack_self(mob/user as mob) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 4f85f822720..646a2023dca 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -34,7 +34,7 @@ /obj/structure/reagent_dispensers/ex_act(severity) reagents.splash_turf(get_turf(src), reagents.total_volume) - visible_message(span("danger", "\The [src] bursts open, spreading reagents all over the area!")) + visible_message(SPAN_DANGER("\The [src] bursts open, spreading reagents all over the area!")) qdel(src) /obj/structure/reagent_dispensers/attackby(obj/item/O as obj, mob/user as mob) @@ -95,10 +95,7 @@ desc = "A tank filled with extinguisher fluid." icon_state = "extinguisher_tank" amount_per_transfer_from_this = 10 - -/obj/structure/reagent_dispensers/extinguisher/Initialize() - . = ..() - reagents.add_reagent("monoammoniumphosphate",capacity) + reagents_to_add = list(/datum/reagent/toxin/fertilizer/monoammoniumphosphate = 1000) // Tanks /obj/structure/reagent_dispensers/watertank @@ -106,20 +103,14 @@ desc = "A tank filled with water." icon_state = "watertank" amount_per_transfer_from_this = 10 - -/obj/structure/reagent_dispensers/watertank/Initialize() - . = ..() - reagents.add_reagent("water",capacity) + reagents_to_add = list(/datum/reagent/water = 1000) /obj/structure/reagent_dispensers/lube name = "lube tank" desc = "A tank filled with a silly amount of lube." icon_state = "lubetank" amount_per_transfer_from_this = 10 - -/obj/structure/reagent_dispensers/lube/Initialize() - . = ..() - reagents.add_reagent("lube",capacity) + reagents_to_add = list(/datum/reagent/lube = 1000) /obj/structure/reagent_dispensers/fueltank name = "fuel tank" @@ -130,10 +121,7 @@ var/defuse = 0 var/armed = 0 var/obj/item/device/assembly_holder/rig = null - -/obj/structure/reagent_dispensers/fueltank/Initialize() - . = ..() - reagents.add_reagent("fuel",capacity) + reagents_to_add = list(/datum/reagent/fuel = 1000) /obj/structure/reagent_dispensers/fueltank/examine(mob/user) if(!..(user, 2)) @@ -240,6 +228,7 @@ density = 0 amount_per_transfer_from_this = 45 can_tamper = FALSE + reagents_to_add = list(/datum/reagent/capsaicin/condensed = 1000) /obj/structure/reagent_dispensers/virusfood name = "virus food dispenser" @@ -249,10 +238,7 @@ anchored = 1 density = 0 can_tamper = FALSE - -/obj/structure/reagent_dispensers/virusfood/Initialize() - . = ..() - reagents.add_reagent("virusfood", capacity) + reagents_to_add = list(/datum/reagent/nutriment/virusfood = 1000) /obj/structure/reagent_dispensers/acid name = "sulphuric acid dispenser" @@ -262,14 +248,7 @@ anchored = 1 density = 0 can_tamper = FALSE - -/obj/structure/reagent_dispensers/acid/Initialize() - . = ..() - reagents.add_reagent("sacid", capacity) - -/obj/structure/reagent_dispensers/peppertank/Initialize() - . = ..() - reagents.add_reagent("condensedcapsaicin",capacity) + reagents_to_add = list(/datum/reagent/acid = 1000) //Water Cooler @@ -283,10 +262,7 @@ anchored = 1 capacity = 500 can_tamper = FALSE - -/obj/structure/reagent_dispensers/water_cooler/Initialize() - . = ..() - reagents.add_reagent("water",capacity) + reagents_to_add = list(/datum/reagent/water = 500) /obj/structure/reagent_dispensers/water_cooler/attackby(obj/item/W as obj, mob/user as mob) if (W.isscrewdriver()) @@ -312,19 +288,12 @@ desc = "An empty keg." icon_state = "beertankTEMP" amount_per_transfer_from_this = 10 - var/reagentid = "beer" - var/filled = FALSE - -/obj/structure/reagent_dispensers/keg/Initialize() - . = ..() - if(filled) - reagents.add_reagent(src.reagentid,capacity) /obj/structure/reagent_dispensers/keg/attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/stack/rods)) var/obj/item/stack/rods/R = W if(!R.can_use(3)) // like a tripod - to_chat(user, span("notice", "You need three rods to make a still!")) + to_chat(user, SPAN_NOTICE("You need three rods to make a still!")) return if(do_after(user, 20)) if (QDELETED(src)) @@ -332,10 +301,10 @@ R.use(3) new /obj/structure/distillery(src.loc) if(reagents) - to_chat(user, span("notice", "As you prop the still up on the rods, the reagents inside are spilled. However, you successfully make the still.")) + to_chat(user, SPAN_NOTICE("As you prop the still up on the rods, the reagents inside are spilled. However, you successfully make the still.")) reagents.trans_to_turf(get_turf(src), reagents.total_volume) else - to_chat(user, span("notice", "You successfully build a still.")) + to_chat(user, SPAN_NOTICE("You successfully build a still.")) qdel(src) return . = ..() @@ -343,21 +312,19 @@ /obj/structure/reagent_dispensers/keg/beerkeg name = "beer keg" desc = "A beer keg" - filled = TRUE + reagents_to_add = list(/datum/reagent/alcohol/ethanol/beer = 1000) /obj/structure/reagent_dispensers/keg/xuizikeg name = "xuizi juice keg" desc = "A keg full of Xuizi juice, blended flower buds from the Moghean Xuizi cactus. The export stamp of the Arizi Guild is imprinted on the side." icon_state = "keg_xuizi" - reagentid = "xuizijuice" - filled = TRUE + reagents_to_add = list(/datum/reagent/alcohol/butanol/xuizijuice = 1000) /obj/structure/reagent_dispensers/keg/mead name = "mead barrel" desc = "A wooden mead barrel." icon_state = "woodkeg" - reagentid = "messa_mead" - filled = TRUE + reagents_to_add = list(/datum/reagent/alcohol/ethanol/messa_mead = 1000) //Cooking oil tank /obj/structure/reagent_dispensers/cookingoil @@ -366,10 +333,7 @@ icon_state = "oiltank" amount_per_transfer_from_this = 120 capacity = 5000 - -/obj/structure/reagent_dispensers/cookingoil/Initialize() - . = ..() - reagents.add_reagent("cornoil",capacity) + reagents_to_add = list(/datum/reagent/nutriment/triglyceride/oil/corn = 5000) /obj/structure/reagent_dispensers/cookingoil/bullet_act(var/obj/item/projectile/Proj) if(Proj.get_structure_damage()) @@ -382,10 +346,7 @@ desc = "A tank of industrial coolant" icon_state = "coolanttank" amount_per_transfer_from_this = 10 - -/obj/structure/reagent_dispensers/coolanttank/Initialize() - . = ..() - reagents.add_reagent("coolant",1000) + reagents_to_add = list(/datum/reagent/coolant = 1000) /obj/structure/reagent_dispensers/coolanttank/bullet_act(var/obj/item/projectile/Proj) if(Proj.get_structure_damage()) diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index 69357e56368..79901fa07e6 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -81,6 +81,9 @@ base_state = "pipe-tagger-partial" dpdir = dir | flip + if(15) + base_state = "disposal_small" + ///// Z-Level stuff if(!(ptype in list(6, 7, 8, 11, 12, 13, 14))) ///// Z-Level stuff @@ -204,6 +207,8 @@ if(14) nicetype = "partial tagging pipe" ispipe = 1 + if(15) + nicetype = "compact disposal bin" else nicetype = "pipe" ispipe = 1 @@ -221,11 +226,11 @@ if(ispipe) level = 2 density = 0 - else + else if(ptype != 15) density = 1 to_chat(user, "You detach the [nicetype] from the underfloor.") else - if(ptype>=6 && ptype <= 8) // Disposal or outlet + if(ptype>=6 && ptype <= 8 || ptype == 15) // Disposal bin, outlet or small disposal bin if(CP) // There's something there if(!istype(CP,/obj/structure/disposalpipe/trunk)) to_chat(user, "The [nicetype] requires a trunk underneath it in order to work.") @@ -247,7 +252,7 @@ if(ispipe) level = 1 // We don't want disposal bins to disappear under the floors density = 0 - else + else if(ptype != 15) density = 1 // We don't want disposal bins or outlets to go density 0 to_chat(user, "You attach the [nicetype] to the underfloor.") playsound(src.loc, I.usesound, 100, 1) @@ -300,6 +305,11 @@ src.transfer_fingerprints_to(P) P.set_dir(dir) + else if(ptype==15) // Small Disposal bin + var/obj/machinery/disposal/small/P = new /obj/machinery/disposal/small(src.loc, dir, 1) + src.transfer_fingerprints_to(P) + P.mode = 0 // start with pump off + qdel(src) return else diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 108a3f8e6d3..1113deff08b 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -27,6 +27,33 @@ active_power_usage = 2200 //the pneumatic pump power. 3 HP ~ 2200W idle_power_usage = 100 +/obj/machinery/disposal/small + desc = "A compact pneumatic waste disposal unit." + icon_state = "disposal_small" + density = 0 + +/obj/machinery/disposal/small/Initialize() + . = ..() + if(pixel_x || pixel_y) + return + else + switch(dir) + if(1) + pixel_y = -13 + layer = MOB_LAYER + 0.1 + if(2) + pixel_y = 20 + layer = OBJ_LAYER + 0.3 + if(4) + pixel_x = -12 + if(8) + pixel_x = 11 + +/obj/machinery/disposal/small/check_mob_size(mob/target) + if(target.mob_size > MOB_SMALL) + return 0 + return 1 + // create a new disposal // find the attached trunk (if present) and init gas resvr. /obj/machinery/disposal/Initialize() @@ -80,12 +107,19 @@ if(do_after(user,20/W.toolspeed)) if(!src || !W.isOn()) return to_chat(user, "You sliced the floorweld off the disposal unit.") - var/obj/structure/disposalconstruct/C = new (src.loc) - src.transfer_fingerprints_to(C) - C.ptype = 6 // 6 = disposal unit - C.anchored = 1 - C.density = 1 - C.update() + if(!istype(src, /obj/machinery/disposal/small)) + var/obj/structure/disposalconstruct/C = new (src.loc) + src.transfer_fingerprints_to(C) + C.ptype = 6 // 6 = disposal unit + C.anchored = 1 + C.density = 1 + C.update() + else + var/obj/structure/disposalconstruct/C = new (src.loc) + src.transfer_fingerprints_to(C) + C.ptype = 15 // 15 = small disposal unit + C.anchored = 1 + C.update() qdel(src) return else @@ -123,6 +157,9 @@ if(istype(G)) // handle grabbed mob if(ismob(G.affecting)) var/mob/GM = G.affecting + if(!check_mob_size(GM)) + to_chat(user, SPAN_NOTICE("The opening is too narrow for [G.affecting] to fit!")) + return for (var/mob/V in viewers(usr)) V.show_message("[usr] starts putting [GM.name] into the disposal.", 3) if(do_after(usr, 20)) @@ -165,6 +202,10 @@ if(isanimal(user) && target != user) return + if(!check_mob_size(target)) + to_chat(user, SPAN_NOTICE("The opening is too narrow for [target] to fit!")) + return + src.add_fingerprint(user) var/target_loc = target.loc var/msg @@ -205,6 +246,9 @@ update() return +/obj/machinery/disposal/proc/check_mob_size(mob/target) + return 1 + // attempt to move while inside /obj/machinery/disposal/relaymove(mob/user as mob) if(user.stat || src.flushing) @@ -336,14 +380,14 @@ /obj/machinery/disposal/proc/update() cut_overlays() if(stat & BROKEN) - icon_state = "disposal-broken" + icon_state = "[icon_state]-broken" mode = 0 flush = 0 return // flush handle if(flush) - add_overlay("dispover-handle") + add_overlay("[icon_state]-handle") // only handle is shown if no power if(stat & NOPOWER || mode == -1) @@ -351,13 +395,13 @@ // check for items in disposal - occupied light if(contents.len > 0) - add_overlay("dispover-full") + add_overlay("[icon_state]-full") // charging and ready light if(mode == 1) - add_overlay("dispover-charge") + add_overlay("[icon_state]-charge") else if(mode == 2) - add_overlay("dispover-ready") + add_overlay("[icon_state]-ready") // timed process // charge the gas reservoir and perform flush if ready @@ -471,10 +515,10 @@ qdel(H) /obj/machinery/disposal/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if (istype(mover,/obj/item) && mover.throwing) + if(istype(mover, /obj/item/projectile)) + return 1 + if(istype(mover,/obj/item) && mover.throwing) var/obj/item/I = mover - if(istype(I, /obj/item/projectile)) - return if(prob(75)) I.forceMove(src) for(var/mob/M in viewers(src)) diff --git a/code/modules/research/designs/circuit/circuits.dm b/code/modules/research/designs/circuit/circuits.dm index ea819a5b7e9..a2ed8d74ecc 100644 --- a/code/modules/research/designs/circuit/circuits.dm +++ b/code/modules/research/designs/circuit/circuits.dm @@ -2,7 +2,7 @@ build_type = IMPRINTER req_tech = list(TECH_DATA = 2) materials = list(MATERIAL_GLASS = 2000) - chemicals = list("sacid" = 20) + chemicals = list(/datum/reagent/acid = 20) design_order = 0 /datum/design/circuit/AssembleDesignName() diff --git a/code/modules/research/designs/protolathe/modular_computer_designs.dm b/code/modules/research/designs/protolathe/modular_computer_designs.dm index 3417f8e3529..ea650a105ac 100644 --- a/code/modules/research/designs/protolathe/modular_computer_designs.dm +++ b/code/modules/research/designs/protolathe/modular_computer_designs.dm @@ -48,7 +48,7 @@ req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 1) build_type = IMPRINTER materials = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 100) - chemicals = list("sacid" = 20) + chemicals = list(/datum/reagent/acid = 20) build_path = /obj/item/computer_hardware/network_card /datum/design/item/modularcomponent/netcard/advanced @@ -56,7 +56,7 @@ req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 2) build_type = IMPRINTER materials = list(DEFAULT_WALL_MATERIAL = 500, MATERIAL_GLASS = 200) - chemicals = list("sacid" = 20) + chemicals = list(/datum/reagent/acid = 20) build_path = /obj/item/computer_hardware/network_card/advanced /datum/design/item/modularcomponent/netcard/wired @@ -64,7 +64,7 @@ req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 3) build_type = IMPRINTER materials = list(DEFAULT_WALL_MATERIAL = 2500, MATERIAL_GLASS = 400) - chemicals = list("sacid" = 20) + chemicals = list(/datum/reagent/acid = 20) build_path = /obj/item/computer_hardware/network_card/wired // Data crystals (USB flash drives) @@ -73,7 +73,7 @@ req_tech = list(TECH_DATA = 1) build_type = IMPRINTER materials = list(MATERIAL_GLASS = 800) - chemicals = list("sacid" = 20) + chemicals = list(/datum/reagent/acid = 20) build_path = /obj/item/computer_hardware/hard_drive/portable /datum/design/item/modularcomponent/portabledrive/advanced @@ -81,7 +81,7 @@ req_tech = list(TECH_DATA = 2) build_type = IMPRINTER materials = list(MATERIAL_GLASS = 1600) - chemicals = list("sacid" = 20) + chemicals = list(/datum/reagent/acid = 20) build_path = /obj/item/computer_hardware/hard_drive/portable/advanced /datum/design/item/modularcomponent/portabledrive/super @@ -89,7 +89,7 @@ req_tech = list(TECH_DATA = 4) build_type = IMPRINTER materials = list(MATERIAL_GLASS = 3200) - chemicals = list("sacid" = 20) + chemicals = list(/datum/reagent/acid = 20) build_path = /obj/item/computer_hardware/hard_drive/portable/super // Card slot @@ -157,7 +157,7 @@ req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2) build_type = IMPRINTER materials = list(DEFAULT_WALL_MATERIAL = 1600) - chemicals = list("sacid" = 20) + chemicals = list(/datum/reagent/acid = 20) build_path = /obj/item/computer_hardware/processor_unit /datum/design/item/modularcomponent/cpu/small @@ -165,7 +165,7 @@ req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) build_type = IMPRINTER materials = list(DEFAULT_WALL_MATERIAL = 800) - chemicals = list("sacid" = 20) + chemicals = list(/datum/reagent/acid = 20) build_path = /obj/item/computer_hardware/processor_unit/small /datum/design/item/modularcomponent/cpu/photonic @@ -173,7 +173,7 @@ req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 4) build_type = IMPRINTER materials = list(DEFAULT_WALL_MATERIAL = 6400, MATERIAL_GLASS = 2000) - chemicals = list("sacid" = 40) + chemicals = list(/datum/reagent/acid = 40) build_path = /obj/item/computer_hardware/processor_unit/photonic /datum/design/item/modularcomponent/cpu/photonic/small @@ -181,7 +181,7 @@ req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3) build_type = IMPRINTER materials = list(DEFAULT_WALL_MATERIAL = 3200, MATERIAL_GLASS = 1000) - chemicals = list("sacid" = 20) + chemicals = list(/datum/reagent/acid = 20) build_path = /obj/item/computer_hardware/processor_unit/photonic/small // AI Slot diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 8755063dcc7..f88f1136247 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -702,7 +702,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Chemical Storage
" for(var/datum/reagent/R in linked_lathe.reagents.reagent_list) dat += "Name: [R.name] | Units: [R.volume] " - dat += "(Purge)
" + dat += "(Purge)
" dat += "Disposal All Chemicals in Storage
" if(3.4) // Protolathe queue @@ -759,7 +759,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Chemical Storage
" for(var/datum/reagent/R in linked_imprinter.reagents.reagent_list) dat += "Name: [R.name] | Units: [R.volume] " - dat += "(Purge)
" + dat += "(Purge)
" dat += "Disposal All Chemicals in Storage
" if(4.3) diff --git a/code/modules/research/weaponsanalyzer.dm b/code/modules/research/weaponsanalyzer.dm index e5dc9f7d42b..d296fcebd5d 100644 --- a/code/modules/research/weaponsanalyzer.dm +++ b/code/modules/research/weaponsanalyzer.dm @@ -111,7 +111,7 @@ update_icon() else - to_chat(usr, span("warning", "There is nothing in \the [src].")) + to_chat(usr, SPAN_WARNING("There is nothing in \the [src].")) /obj/machinery/weapons_analyzer/update_icon() icon_state = initial(icon_state) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm index 6e5ec86c83b..5345522a6a8 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm @@ -212,22 +212,22 @@ /obj/machinery/artifact/attackby(obj/item/W as obj, mob/living/user as mob) if (istype(W, /obj/item/reagent_containers/)) - if(W.reagents.has_reagent("hydrazine", 1) || W.reagents.has_reagent("water", 1)) + if(W.reagents.has_reagent(/datum/reagent/hydrazine, 1) || W.reagents.has_reagent(/datum/reagent/water, 1)) if(my_effect.trigger == TRIGGER_WATER) my_effect.ToggleActivate() if(secondary_effect?.trigger == TRIGGER_WATER) secondary_effect.ToggleActivate() - else if(W.reagents.has_reagent("sacid", 1) || W.reagents.has_reagent("pacid", 1) || W.reagents.has_reagent("diethylamine", 1)) + else if(W.reagents.has_reagent(/datum/reagent/acid, 1) || W.reagents.has_reagent(/datum/reagent/acid/polyacid, 1) || W.reagents.has_reagent(/datum/reagent/diethylamine, 1)) if(my_effect.trigger == TRIGGER_ACID) my_effect.ToggleActivate() if(secondary_effect?.trigger == TRIGGER_ACID) secondary_effect.ToggleActivate() - else if(W.reagents.has_reagent("phoron", 1) || W.reagents.has_reagent("thermite", 1)) + else if(W.reagents.has_reagent(/datum/reagent/toxin/phoron, 1) || W.reagents.has_reagent(/datum/reagent/thermite, 1)) if(my_effect.trigger == TRIGGER_VOLATILE) my_effect.ToggleActivate() if(secondary_effect?.trigger == TRIGGER_VOLATILE) secondary_effect.ToggleActivate() - else if(W.reagents.has_reagent("toxin", 1) || W.reagents.has_reagent("cyanide", 1) || W.reagents.has_reagent("amanitin", 1) || W.reagents.has_reagent("neurotoxin", 1)) + else if(W.reagents.has_reagent(/datum/reagent/toxin, 1) || W.reagents.has_reagent(/datum/reagent/toxin/cyanide, 1) || W.reagents.has_reagent(/datum/reagent/toxin/amatoxin, 1) || W.reagents.has_reagent(/datum/reagent/alcohol/ethanol/neurotoxin, 1)) if(my_effect.trigger == TRIGGER_TOXIN) my_effect.ToggleActivate() if(secondary_effect?.trigger == TRIGGER_TOXIN) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm index 7dd9018d0cc..5082f9d8f87 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm @@ -17,7 +17,7 @@ if(affecting && istype(affecting)) affecting.heal_damage(25 * weakness, 25 * weakness) //H:heal_organ_damage(25, 25) - H.vessel.add_reagent("blood",5) + H.vessel.add_reagent(/datum/reagent/blood,5) H.adjustNutritionLoss(-50 * weakness) H.adjustHydrationLoss(-50 * weakness) H.adjustBrainLoss(-25 * weakness) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm index d51d4e6bf26..49b70b3c0d9 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm @@ -6,7 +6,7 @@ /datum/artifact_effect/teleport/DoEffectTouch(var/mob/user) var/weakness = GetAnomalySusceptibility(user) if(prob(100 * weakness)) - to_chat(user, span("alert", "You are suddenly zapped away elsewhere!")) + to_chat(user, SPAN_ALERT("You are suddenly zapped away elsewhere!")) if (user.buckled) user.buckled.unbuckle_mob() @@ -22,7 +22,7 @@ for (var/mob/living/M in range(src.effectrange,T)) var/weakness = GetAnomalySusceptibility(M) if(prob(100 * weakness)) - to_chat(M, span("alert", "You are displaced by a strange force!")) + to_chat(M, SPAN_ALERT("You are displaced by a strange force!")) if(M.buckled) M.buckled.unbuckle_mob() @@ -38,7 +38,7 @@ for (var/mob/living/M in range(src.effectrange, T)) var/weakness = GetAnomalySusceptibility(M) if(prob(100 * weakness)) - to_chat(M, span("alert", "You are displaced by a strange force!")) + to_chat(M, SPAN_ALERT("You are displaced by a strange force!")) if(M.buckled) M.buckled.unbuckle_mob() diff --git a/code/modules/research/xenoarchaeology/chemistry.dm b/code/modules/research/xenoarchaeology/chemistry.dm index dda5b802edc..caf7c5c2bd9 100644 --- a/code/modules/research/xenoarchaeology/chemistry.dm +++ b/code/modules/research/xenoarchaeology/chemistry.dm @@ -40,21 +40,21 @@ obj/item/reagent_containers/glass/solution_tray/attackby(obj/item/W as obj, mob/ name = "beaker 'tungsten'" Initialize() . = ..() - reagents.add_reagent("tungsten",50) + reagents.add_reagent(/datum/reagent/tungsten,50) update_icon() /obj/item/reagent_containers/glass/beaker/oxygen name = "beaker 'oxygen'" Initialize() . = ..() - reagents.add_reagent("acetone",50) + reagents.add_reagent(/datum/reagent/acetone,50) update_icon() /obj/item/reagent_containers/glass/beaker/sodium name = "beaker 'sodium'" Initialize() . = ..() - reagents.add_reagent("sodium",50) + reagents.add_reagent(/datum/reagent/sodium,50) update_icon() /obj/item/reagent_containers/glass/beaker/lithium @@ -62,7 +62,7 @@ obj/item/reagent_containers/glass/solution_tray/attackby(obj/item/W as obj, mob/ Initialize() . = ..() - reagents.add_reagent("lithium",50) + reagents.add_reagent(/datum/reagent/lithium,50) update_icon() /obj/item/reagent_containers/glass/beaker/water @@ -70,7 +70,7 @@ obj/item/reagent_containers/glass/solution_tray/attackby(obj/item/W as obj, mob/ Initialize() . = ..() - reagents.add_reagent("water",50) + reagents.add_reagent(/datum/reagent/water,50) update_icon() /obj/item/reagent_containers/glass/beaker/fuel @@ -78,5 +78,5 @@ obj/item/reagent_containers/glass/solution_tray/attackby(obj/item/W as obj, mob/ Initialize() . = ..() - reagents.add_reagent("fuel",50) + reagents.add_reagent(/datum/reagent/fuel,50) update_icon() diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm index 34604c5dcf8..328f72d8c65 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_special.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm @@ -8,7 +8,7 @@ /obj/item/reagent_containers/glass/replenishing/Initialize() . = ..() START_PROCESSING(SSprocessing, src) - spawning_id = pick("blood","holywater","lube","stoxin","ethanol","ice","glycerol","fuel","cleaner") + spawning_id = pick(/datum/reagent/blood,/datum/reagent/water/holywater,/datum/reagent/lube,/datum/reagent/soporific,/datum/reagent/alcohol/ethanol,/datum/reagent/drink/ice,/datum/reagent/glycerol,/datum/reagent/fuel,/datum/reagent/spacecleaner) /obj/item/reagent_containers/glass/replenishing/process() @@ -150,7 +150,7 @@ B.target_turf = pick(range(1, src)) B.blood_DNA = list() B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type - M.vessel.remove_reagent("blood",rand(25,50)) + M.vessel.remove_reagent(/datum/reagent/blood,rand(25,50)) //animated blood 2 SPOOKY /obj/effect/decal/cleanable/blood/splatter/animated diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm index c59d251dac3..3e1eb7a7904 100644 --- a/code/modules/research/xenoarchaeology/geosample.dm +++ b/code/modules/research/xenoarchaeology/geosample.dm @@ -30,7 +30,7 @@ icon_state = "sliver[rand(1,3)]" randpixel_xy() create_reagents(50) - reagents.add_reagent("ground_rock",50) + reagents.add_reagent(/datum/reagent/stone_dust,50) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Geosample datum diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index b5423c49d5d..774cf12054c 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -48,18 +48,18 @@ /obj/machinery/radiocarbon_spectrometer/Initialize() . = ..() create_reagents(500) - coolant_reagents_purity["water"] = 0.5 - coolant_reagents_purity["icecoffee"] = 0.6 - coolant_reagents_purity["icetea"] = 0.6 - coolant_reagents_purity["milkshake"] = 0.6 - coolant_reagents_purity["leporazine"] = 0.7 - coolant_reagents_purity["kelotane"] = 0.7 - coolant_reagents_purity["sterilizine"] = 0.7 - coolant_reagents_purity["dermaline"] = 0.7 - coolant_reagents_purity["hyperzine"] = 0.8 - coolant_reagents_purity["cryoxadone"] = 0.9 - coolant_reagents_purity["coolant"] = 1 - coolant_reagents_purity["adminordrazine"] = 2 + coolant_reagents_purity[/datum/reagent/water] = 0.5 + coolant_reagents_purity[/datum/reagent/drink/coffee/icecoffee] = 0.6 + coolant_reagents_purity[/datum/reagent/drink/icetea] = 0.6 + coolant_reagents_purity[/datum/reagent/drink/milkshake] = 0.6 + coolant_reagents_purity[/datum/reagent/leporazine] = 0.7 + coolant_reagents_purity[/datum/reagent/kelotane] = 0.7 + coolant_reagents_purity[/datum/reagent/sterilizine] = 0.7 + coolant_reagents_purity[/datum/reagent/dermaline] = 0.7 + coolant_reagents_purity[/datum/reagent/hyperzine] = 0.8 + coolant_reagents_purity[/datum/reagent/cryoxadone] = 0.9 + coolant_reagents_purity[/datum/reagent/coolant] = 1 + coolant_reagents_purity[/datum/reagent/adminordrazine] = 2 /obj/machinery/radiocarbon_spectrometer/attack_hand(var/mob/user as mob) ui_interact(user) @@ -107,7 +107,7 @@ for (var/datum/reagent/current_reagent in src.reagents.reagent_list) if (!current_reagent) continue - var/cur_purity = coolant_reagents_purity[current_reagent.id] + var/cur_purity = coolant_reagents_purity[current_reagent.type] if(!cur_purity) cur_purity = 0.1 else if(cur_purity > 1) diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index 9047c27b78b..92ccfb5a233 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -47,10 +47,10 @@ to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]") updateDialog() else - to_chat(user, span("alert", "Access denied.")) + to_chat(user, SPAN_ALERT("Access denied.")) else if(W.iswrench()) src.anchored = !src.anchored - src.visible_message(span("notice", "\The [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by \the [user].")) + src.visible_message(SPAN_NOTICE("\The [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by \the [user].")) if(anchored) spawn(0) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index 755aa0c9e6f..895af5dd1d4 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -61,10 +61,10 @@ to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]") updateDialog() else - to_chat(user, span("alert", "Access denied.")) + to_chat(user, SPAN_ALERT("Access denied.")) else if(W.iswrench()) src.anchored = !src.anchored - src.visible_message(span("notice", "\The [src] has been [anchored ? "bolted to the floor":"unbolted from the floor"] by \the [user].")) + src.visible_message(SPAN_NOTICE("\The [src] has been [anchored ? "bolted to the floor":"unbolted from the floor"] by \the [user].")) if(active) toggle() diff --git a/code/modules/shuttles/antagonist.dm b/code/modules/shuttles/antagonist.dm index 3a577c8c6ec..cac49e2d70c 100644 --- a/code/modules/shuttles/antagonist.dm +++ b/code/modules/shuttles/antagonist.dm @@ -4,6 +4,12 @@ shuttle_tag = "Skipjack" light_color = LIGHT_COLOR_RED +/obj/machinery/computer/shuttle_control/multi/burglar + name = "pod control console" + req_access = list(access_syndicate) + shuttle_tag = "Burglar Pod" + light_color = LIGHT_COLOR_RED + /obj/machinery/computer/shuttle_control/multi/antag/syndicate name = "mercenary shuttle control console" req_access = list(access_syndicate) diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index c2cbe813b65..70f86297158 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -229,7 +229,7 @@ /datum/shuttle/autodock/ferry/legion/launch(var/user) if(!location && earliest_departure_time > world.time) var/obj/machinery/computer/shuttle_control/legion/L = user - L.visible_message(span("notice","The dropship's skipthrusters will be done recharging in approximately [round((earliest_departure_time - world.time)/600)] minute\s."),null,3) + L.visible_message(SPAN_NOTICE("The dropship's skipthrusters will be done recharging in approximately [round((earliest_departure_time - world.time)/600)] minute\s."),null,3) return else ..() diff --git a/code/modules/spell_system/artifacts/items/lich_phylactery.dm b/code/modules/spell_system/artifacts/items/lich_phylactery.dm index 7b506f7e8a1..533886aa6b6 100644 --- a/code/modules/spell_system/artifacts/items/lich_phylactery.dm +++ b/code/modules/spell_system/artifacts/items/lich_phylactery.dm @@ -15,7 +15,7 @@ . = ..() world_phylactery += src create_reagents(120) - reagents.add_reagent("undead_ichor", 120) + reagents.add_reagent(/datum/reagent/toxin/undead, 120) /obj/item/phylactery/Destroy() to_chat(lich, "Your phylactery was destroyed, your soul is cast into the abyss as your immortality vanishes away!") diff --git a/code/modules/spell_system/artifacts/items/poppet.dm b/code/modules/spell_system/artifacts/items/poppet.dm index c96ca45fc51..1ca38cc7b68 100644 --- a/code/modules/spell_system/artifacts/items/poppet.dm +++ b/code/modules/spell_system/artifacts/items/poppet.dm @@ -78,7 +78,7 @@ if(H && cooldown < world.time) var/target_zone = user.zone_sel.selecting - if(isflamesource(W)) + if(W.isFlameSource()) fire_act() if(istype(W, /obj/item/melee/baton)) diff --git a/code/modules/spell_system/spells/spell_list/others/generic/entangle.dm b/code/modules/spell_system/spells/spell_list/others/generic/entangle.dm index ca935dee495..4634c59ec75 100644 --- a/code/modules/spell_system/spells/spell_list/others/generic/entangle.dm +++ b/code/modules/spell_system/spells/spell_list/others/generic/entangle.dm @@ -28,7 +28,7 @@ seed.name = "heirlooms" seed.seed_name = "heirloom" seed.display_name = "vines" - seed.chems = list("nutriment" = list(1,20)) + seed.chems = list(/datum/reagent/nutriment = list(1,20)) /spell/targeted/entangle/cast(var/list/targets) for(var/mob/M in targets) diff --git a/code/modules/spell_system/spells/spell_list/others/generic/heal_target.dm b/code/modules/spell_system/spells/spell_list/others/generic/heal_target.dm index 7e4028efe78..9b8b3162e14 100644 --- a/code/modules/spell_system/spells/spell_list/others/generic/heal_target.dm +++ b/code/modules/spell_system/spells/spell_list/others/generic/heal_target.dm @@ -17,6 +17,7 @@ amt_dam_brute = -15 amt_dam_fire = -15 + amt_organ = -2 message = "You feel a pleasant rush of heat move through your body." @@ -25,5 +26,6 @@ return 0 amt_dam_brute -= 5 amt_dam_fire -= 5 + amt_organ -= 2 return "[src] will now heal more." \ No newline at end of file diff --git a/code/modules/spell_system/spells/spell_list/others/generic/heal_target_area.dm b/code/modules/spell_system/spells/spell_list/others/generic/heal_target_area.dm index 93f185187f7..8dd0c616236 100644 --- a/code/modules/spell_system/spells/spell_list/others/generic/heal_target_area.dm +++ b/code/modules/spell_system/spells/spell_list/others/generic/heal_target_area.dm @@ -13,12 +13,14 @@ amt_dam_brute = -10 amt_dam_fire = -10 + amt_organ = -2 /spell/targeted/heal_target/area/empower_spell() if(!..()) return 0 amt_dam_brute -= 5 amt_dam_fire -= 5 + amt_organ -= 1 range += 2 return "[src] now heals more in a wider area." \ No newline at end of file diff --git a/code/modules/spell_system/spells/spell_list/others/generic/heal_target_major.dm b/code/modules/spell_system/spells/spell_list/others/generic/heal_target_major.dm index 32513785844..51d02f9de5a 100644 --- a/code/modules/spell_system/spells/spell_list/others/generic/heal_target_major.dm +++ b/code/modules/spell_system/spells/spell_list/others/generic/heal_target_major.dm @@ -12,6 +12,7 @@ amt_dam_brute = -35 amt_dam_fire = -35 + amt_organ = -5 message = "Your body feels like a furnace." @@ -20,5 +21,6 @@ return 0 amt_dam_tox = -20 amt_dam_oxy = -20 + amt_organ = -5 return "[src] now heals oxygen loss and toxic damage." \ No newline at end of file diff --git a/code/modules/spell_system/spells/spell_list/others/generic/heal_target_sacrifice.dm b/code/modules/spell_system/spells/spell_list/others/generic/heal_target_sacrifice.dm index e7956b67277..2876c66bea9 100644 --- a/code/modules/spell_system/spells/spell_list/others/generic/heal_target_sacrifice.dm +++ b/code/modules/spell_system/spells/spell_list/others/generic/heal_target_sacrifice.dm @@ -13,6 +13,7 @@ amt_dam_fire = -50 amt_dam_oxy = -50 amt_dam_tox = -50 + amt_organ = -15 hud_state = "gen_dissolve" @@ -26,5 +27,6 @@ amt_dam_fire *= 2 amt_dam_oxy *= 2 amt_dam_tox *= 2 + amt_organ *= 2 return "You will now heal twice as much, but take twice as much damage. It will probably kill you." \ No newline at end of file diff --git a/code/modules/spell_system/spells/spell_list/self/conjure/plant_sanctuary.dm b/code/modules/spell_system/spells/spell_list/self/conjure/plant_sanctuary.dm index ec858d341c2..653527afc74 100644 --- a/code/modules/spell_system/spells/spell_list/self/conjure/plant_sanctuary.dm +++ b/code/modules/spell_system/spells/spell_list/self/conjure/plant_sanctuary.dm @@ -27,7 +27,7 @@ name = "merlin tears" seed_name = "merlin tears" display_name = "merlin tears" - chems = list("bicaridine" = list(3,7), "dermaline" = list(3,7), "dylovene" = list(3,7), "tricordrazine" = list(3,7), "alkysine" = list(1,2), "imidazoline" = list(1,2), "peridaxon" = list(4,5)) + chems = list(/datum/reagent/bicaridine = list(3,7), /datum/reagent/dermaline = list(3,7), /datum/reagent/dylovene = list(3,7), /datum/reagent/tricordrazine = list(3,7), /datum/reagent/alkysine = list(1,2), /datum/reagent/imidazoline = list(1,2), /datum/reagent/peridaxon = list(4,5)) kitchen_tag = "berries" /datum/seed/merlin_tear/setup_traits() diff --git a/code/modules/spell_system/spells/spell_list/self/generic/rune_write.dm b/code/modules/spell_system/spells/spell_list/self/generic/rune_write.dm index 1599721c1ae..edc41db17e1 100644 --- a/code/modules/spell_system/spells/spell_list/self/generic/rune_write.dm +++ b/code/modules/spell_system/spells/spell_list/self/generic/rune_write.dm @@ -18,11 +18,11 @@ /spell/rune_write/cast(null, mob/user = usr) if(!isturf(user.loc)) - to_chat(user, span("warning", "You do not have enough space to write a proper rune.")) + to_chat(user, SPAN_WARNING("You do not have enough space to write a proper rune.")) var/rune = input(user, "Choose a rune to scribe", "Rune Scribing") as null|anything in SScult.runes_by_name//not cancellable. if(locate(/obj/effect/rune) in get_turf(user)) - to_chat(user, span("warning", "There is already a rune in this location.")) + to_chat(user, SPAN_WARNING("There is already a rune in this location.")) return if(!rune) diff --git a/code/modules/spell_system/spells/spell_list/targeted_spells.dm b/code/modules/spell_system/spells/spell_list/targeted_spells.dm index ff68b74b522..76a7f061388 100644 --- a/code/modules/spell_system/spells/spell_list/targeted_spells.dm +++ b/code/modules/spell_system/spells/spell_list/targeted_spells.dm @@ -23,6 +23,8 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp var/amt_dam_oxy = 0 var/amt_dam_tox = 0 + var/amt_organ = 0 + var/amt_eye_blind = 0 var/amt_eye_blurry = 0 @@ -142,4 +144,11 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp target.eye_blurry += amt_eye_blurry target.dizziness += amt_dizziness target.confused += amt_confused - target.stuttering += amt_stuttering \ No newline at end of file + target.stuttering += amt_stuttering + if(ishuman(target)) + var/mob/living/carbon/human/H = target + for(var/obj/item/organ/O in H.internal_organs) + if(amt_organ > 0) + O.take_damage(amt_organ) + else + O.heal_damage(-(amt_organ)) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 6928c0c2a56..a602fd25058 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -137,6 +137,10 @@ affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1) user.drop_item() affected.implants += tool + if(istype(tool, /obj/item/device/gps)) + var/obj/item/device/gps/gps = tool + moved_event.register(target, gps, /obj/item/device/gps/proc/update_position) + gps.implanted_into = target tool.forceMove(affected) affected.cavity = 0 @@ -200,6 +204,10 @@ worm.detach() worm.leave_host() + else if(istype(obj, /obj/item/device/gps)) + var/obj/item/device/gps/gps = obj + moved_event.unregister(target, gps) + gps.implanted_into = null playsound(target.loc, 'sound/effects/squelch1.ogg', 50, 1) else user.visible_message("[user] removes \the [tool] from [target]'s [affected.name].", \ diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 442e2a3797e..6ef8778768d 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -76,7 +76,7 @@ if(!organ) return if(organ.damage >= organ.max_damage) - to_chat(user, span("warning", "\The [organ] is too damaged. Repair it first.")) + to_chat(user, SPAN_WARNING("\The [organ] is too damaged. Repair it first.")) return 0 return organ && affected.open >= 2 && (organ.status & ORGAN_DEAD) @@ -131,7 +131,7 @@ return 0 var/obj/item/reagent_containers/container = tool - if(!container.reagents.has_reagent("peridaxon")) + if(!container.reagents.has_reagent(/datum/reagent/peridaxon)) return 0 if(!ishuman(target)) @@ -159,7 +159,7 @@ var/trans = container.reagents.trans_to_mob(target, container.amount_per_transfer_from_this, CHEM_BLOOD) //technically it's contact, but the reagents are being applied to internal tissue if (trans > 0) - if(container.reagents.has_reagent("peridaxon")) + if(container.reagents.has_reagent(/datum/reagent/peridaxon)) affected.status &= ~ORGAN_DEAD affected.owner.update_body(1) diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index f9c5ef6ac9c..3aaf6c5e356 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -15,7 +15,7 @@ pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) create_reagents(10) - reagents.add_reagent("bluespace_dust", blink_range) + reagents.add_reagent(/datum/reagent/bluespace_dust, blink_range) /obj/item/bluespace_crystal/attack_self(mob/user) user.visible_message("[user] crushes [src]!", "You crush [src]!") diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index d0aca8c421f..30427eebc29 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -12,6 +12,7 @@ var/list/GPS_list = list() var/gpstag = "COM0" var/emped = 0 var/held_by = null + var/implanted_into = null var/turf/locked_location var/list/tracking = list() var/list/static/gps_count = list() @@ -33,6 +34,9 @@ var/list/GPS_list = list() if(held_by) moved_event.unregister(held_by, src) held_by = null + if(implanted_into) + moved_event.unregister(implanted_into, src) + implanted_into = null return ..() /obj/item/device/gps/pickup(var/mob/user) @@ -114,7 +118,7 @@ var/list/GPS_list = list() if(was_tracked) tracking |= gpstag else - to_chat(usr, span("warning", "GPS tag already assigned, choose another.")) + to_chat(usr, SPAN_WARNING("GPS tag already assigned, choose another.")) return TRUE diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index f6fc9279651..a7d55483496 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -1,6 +1,7 @@ /obj/vehicle/bike name = "space-bike" - desc = "Space wheelies! Woo! " + desc = "Space wheelies! Woo!" + desc_info = "Drag yourself onto the bike to mount it, toggle the engine to be able to drive around. Deploy the kickstand to prevent movement by driving and dragging. Drag it onto yourself to access its mounted storage. Resist to get off." icon = 'icons/obj/bike.dmi' icon_state = "bike_off" dir = SOUTH @@ -14,10 +15,12 @@ brute_dam_coeff = 0.5 var/protection_percent = 60 - var/land_speed = 10 //if 0 it can't go on turf + var/land_speed = 5 //if 0 it can't go on turf var/space_speed = 1 var/bike_icon = "bike" + var/storage_type = /obj/item/storage/toolbox/bike_storage + var/obj/item/storage/storage_compartment var/datum/effect_system/ion_trail/ion var/kickstand = TRUE var/can_hover = TRUE @@ -28,6 +31,8 @@ turn_off() add_overlay(image('icons/obj/bike.dmi', "[icon_state]_off_overlay", MOB_LAYER + 1)) icon_state = "[bike_icon]_off" + if(storage_type) + storage_compartment = new storage_type(src) /obj/vehicle/bike/verb/toggle() set name = "Toggle Engine" @@ -75,6 +80,11 @@ return 0 return ..(M) +/obj/vehicle/bike/MouseDrop(atom/over) + if(usr == over && ishuman(over)) + var/mob/living/carbon/human/H = over + storage_compartment.open(H) + /obj/vehicle/bike/MouseDrop_T(var/atom/movable/C, mob/user as mob) if(!load(C)) to_chat(user, "You were unable to load \the [C] onto \the [src].") @@ -224,11 +234,13 @@ fire_dam_coeff = 0.5 brute_dam_coeff = 0.4 + storage_type = /obj/item/storage/toolbox/bike_storage/speeder bike_icon = "speeder" /obj/vehicle/bike/monowheel name = "adhomian monowheel" desc = "A one-wheeled vehicle, fairly popular with Little Adhomai's greasers." + desc_info = "Drag yourself onto the monowheel to mount it, toggle the engine to be able to drive around. Deploy the kickstand to prevent movement by driving and dragging. Drag it onto yourself to access its mounted storage. Resist to get off." icon_state = "monowheel_off" health = 250 @@ -239,6 +251,7 @@ mob_offset_y = 1 + storage_type = /obj/item/storage/toolbox/bike_storage/monowheel bike_icon = "monowheel" dir = EAST @@ -265,3 +278,15 @@ return TRUE else return FALSE + +/obj/item/storage/toolbox/bike_storage + name = "bike storage" + max_w_class = ITEMSIZE_LARGE + max_storage_space = 50 + care_about_storage_depth = FALSE + +/obj/item/storage/toolbox/bike_storage/speeder + name = "speeder storage" + +/obj/item/storage/toolbox/bike_storage/monowheel + name = "monowheel storage" \ No newline at end of file diff --git a/code/modules/vehicles/droppod.dm b/code/modules/vehicles/droppod.dm index 41896a722c0..a06efa7ddda 100644 --- a/code/modules/vehicles/droppod.dm +++ b/code/modules/vehicles/droppod.dm @@ -43,9 +43,9 @@ if(I.iswelder() && status == USED && !humanload && !passenger) var/obj/item/weldingtool/W = I if(W.welding) - src.visible_message(span("notice","[user] starts cutting \the [src] apart.")) + src.visible_message(SPAN_NOTICE("[user] starts cutting \the [src] apart.")) if(do_after(user, 200)) - src.visible_message(span("danger","\The [src] is cut apart by [user]!")) + src.visible_message(SPAN_DANGER("\The [src] is cut apart by [user]!")) playsound(src, 'sound/items/Welder.ogg', 100, 1) new /obj/item/stack/material/titanium(src.loc, 10) new /obj/item/stack/material/plasteel(src.loc, 10) @@ -184,11 +184,6 @@ /area/sconference_room = 2 ) A = pickweight(cargo_destination_list) - if("tcoms") - var/tcoms_destination_list = list( - /area/tcommsat/lounge = 1 - ) - A = pickweight(tcoms_destination_list) if("commandescape") var/commandescape_destination_list = list( /area/bridge/levela = 2, @@ -198,8 +193,11 @@ ) A = pickweight(commandescape_destination_list) if(A) - status = LAUNCHING var/mob/user = usr + if(!(user in src)) + if(alert(user, "WARNING: You are not in the droppod! Are you sure you wish to launch?", "Launch Confirmation", "Yes", "No") == "No") + return + status = LAUNCHING var/datum/nanoui/ui = SSnanoui.get_open_ui(user, src, "main") if(ui) ui.close() @@ -227,7 +225,7 @@ var/target_turf = pick(turf_selection) if(!target_turf) playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) - visible_message(span("warning","\The [src]'s screen displays an error: Targeting module malfunction. Attempt relaunch.")) + visible_message(SPAN_WARNING("\The [src]'s screen displays an error: Targeting module malfunction. Attempt relaunch.")) status = READY if(connected_blastdoor) blastdoor_interact(TRUE) @@ -237,7 +235,7 @@ /obj/vehicle/droppod/proc/fire(var/turf/A) if(!isturf(A)) playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) - visible_message(span("warning","\The [src]'s screen displays an error: Targeting module malfunction. Attempt relaunch.")) + visible_message(SPAN_WARNING("\The [src]'s screen displays an error: Targeting module malfunction. Attempt relaunch.")) status = READY if(connected_blastdoor) blastdoor_interact(TRUE) @@ -245,7 +243,7 @@ if(!(src.z in validfirelocations)) playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) - visible_message(span("warning","\The [src]'s screen displays an error: Pod cannot be launched from this position.")) + visible_message(SPAN_WARNING("\The [src]'s screen displays an error: Pod cannot be launched from this position.")) status = READY if(connected_blastdoor) blastdoor_interact(TRUE) @@ -267,11 +265,11 @@ var/mob/M = humanload shake_camera(M, 5, 1) forceMove(A) - A.visible_message(span("danger","\The [src] crashes through the roof!")) + A.visible_message(SPAN_DANGER("\The [src] crashes through the roof!")) var/turf/belowturf = GetBelow(A) if(belowturf) - belowturf.visible_message(span("danger","You hear something crash into the ceiling above!")) + belowturf.visible_message(SPAN_DANGER("You hear something crash into the ceiling above!")) status = USED @@ -279,11 +277,11 @@ for(var/mob/T in A) if(T.simulated) T.gib() - T.visible_message(span("danger","[T] is squished by the drop pod!")) + T.visible_message(SPAN_DANGER("[T] is squished by the drop pod!")) for(var/obj/B in A) if(B.simulated && B.density) qdel(B) - B.visible_message(span("danger","[B] is destroyed by the drop pod!")) + B.visible_message(SPAN_DANGER("[B] is destroyed by the drop pod!")) /obj/vehicle/droppod/proc/blastdoor_interact(var/open) var/datum/wifi/sender/door/wifi_sender_blast = new(connected_blastdoor, src) diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index 4c8295e6c25..45305a0c55f 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -32,7 +32,7 @@ var/global/list/can_enter_vent_with = list( /mob/living/carbon/slime/can_ventcrawl() if(victim) - to_chat(src, span("warning", "You cannot ventcrawl while feeding.")) + to_chat(src, SPAN_WARNING("You cannot ventcrawl while feeding.")) return FALSE return TRUE diff --git a/code/modules/ventcrawl/ventcrawl_atmospherics.dm b/code/modules/ventcrawl/ventcrawl_atmospherics.dm index 4795bfa27b4..41e1b6f4931 100644 --- a/code/modules/ventcrawl/ventcrawl_atmospherics.dm +++ b/code/modules/ventcrawl/ventcrawl_atmospherics.dm @@ -59,7 +59,7 @@ var/reagent_amount = L.mob_size * 2 //Blend the Mob - to_chat(AM, span("danger","\The [src] blends you to a fine dust.")) + to_chat(AM, SPAN_DANGER("\The [src] blends you to a fine dust.")) L.death() qdel(L) @@ -74,7 +74,7 @@ if(istype(V, /obj/machinery/atmospherics/unary/vent_pump) && vent.loc && !vent.is_welded()) var/datum/reagents/R = new/datum/reagents(reagent_amount) R.my_atom = vent - R.add_reagent("blood", reagent_amount, list("blood_colour" = blood_color)) + R.add_reagent(/datum/reagent/blood, reagent_amount, list("blood_colour" = blood_color)) var/datum/effect/effect/system/smoke_spread/chem/smoke = new smoke.show_log = 0 // This displays a log on creation @@ -87,7 +87,7 @@ else var/datum/reagents/R = new/datum/reagents(reagent_amount) R.my_atom = src - R.add_reagent("blood", reagent_amount, list("blood_colour" = blood_color)) + R.add_reagent(/datum/reagent/blood, reagent_amount, list("blood_colour" = blood_color)) var/datum/effect/effect/system/smoke_spread/chem/smoke = new smoke.show_log = 0 // This displays a log on creation @@ -187,9 +187,9 @@ obj/machinery/atmospherics/trinary/isConnectable(var/obj/machinery/atmospherics/ return /obj/machinery/atmospherics/pipe/zpipe/handle_z_crawl(var/mob/living/L, var/direction) - to_chat(L, span("notice", "You start climbing [travel_direction_name] the pipe. This will take a while...")) + to_chat(L, SPAN_NOTICE("You start climbing [travel_direction_name] the pipe. This will take a while...")) playsound(loc, 'sound/machines/ventcrawl.ogg', 100, 1, 3) if(!do_after(L, 100, needhand = 0, act_target = get_turf(src)) || !can_z_crawl(L, direction)) - to_chat(L, span("danger", "You gave up on climbing [travel_direction_name] the pipe.")) + to_chat(L, SPAN_DANGER("You gave up on climbing [travel_direction_name] the pipe.")) return FALSE return ventcrawl_to(L, node2, null) diff --git a/code/unit_tests/chemistry_tests.dm b/code/unit_tests/chemistry_tests.dm index da299acaa8e..fe9fb973e9f 100644 --- a/code/unit_tests/chemistry_tests.dm +++ b/code/unit_tests/chemistry_tests.dm @@ -14,7 +14,7 @@ datum/unit_test/specific_heat/start_test() for(var/type_found in subtypesof(/datum/reagent/)) var/datum/reagent/R = new type_found - if(istype(R) && R.id && R.name) + if(istype(R) && R.name) if(!SSchemistry.has_valid_specific_heat(R)) log_unit_test("[ascii_red][R.type] lacks a proper specific heat value![ascii_reset]") error_count++ diff --git a/config/example/config.txt b/config/example/config.txt index bd3f8787e10..5310ce11c59 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -127,6 +127,8 @@ PROBABILITY S MERCENARY 1 PROBABILITY S WIZARD 1 PROBABILITY S CHANGELING 1 PROBABILITY S CULT 1 +PROBABILITY S BURGLARS 1 +PROBABILITY S CONFLICT 1 PROBABILITY S NINJA 1 PROBABILITY S HEIST 1 PROBABILITY S VAMPIRE 1 @@ -151,6 +153,7 @@ PROBABILITY MS PARANOIA 1 PROBABILITY MS UPRISING 1 PROBABILITY MS VISITORS 1 PROBABILITY MS INTRIGUE 1 +PROBABILITY MS CONFLICT 1 PROBABILITY MS SIEGE 1 PROBABILITY MS EXTENDED 1 PROBABILITY MS INFILTRATION 1 @@ -341,6 +344,8 @@ REQ_CULT_GHOSTWRITER 6 ## Sets the number of available character slots CHARACTER_SLOTS 10 +## Sets the number of available loadout slots +LOADOUT_SLOTS 3 ## Expected round length in minutes EXPECTED_ROUND_LENGTH 180 @@ -523,7 +528,7 @@ CARGO_LOAD_ITEMS_FROM json # Forces the maploader to load the specified map path. Valid options: aurora, runtime -FORCE_MAP aurora +FORCE_MAP runtime # Reminds ticket handlers/all admin staff of not-closed tickets after this many SECONDS. #TICKET_REMINDER_PERIOD 600 diff --git a/html/changelog.html b/html/changelog.html index ef734cd772c..ae0c20e9e68 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,10 +35,453 @@ -->
+
The 5th and final victim of the Odin Killer. He was slain by the Odin Killer for his brave, personal investigation on the killings. Studying to become a detective at the time of his death, he was posthumously granted the title.
November 2428 - June 2460" }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 4 + dir = 4; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled, /area/security/training) @@ -3700,8 +3706,8 @@ /obj/structure/table/steel, /obj/structure/metronome, /obj/machinery/light/small/red{ - tag = "icon-bulb1 (NORTH)"; - dir = 1 + dir = 1; + tag = "icon-bulb1 (NORTH)" }, /turf/simulated/floor/reinforced, /area/medical/psych) @@ -3755,9 +3761,9 @@ /area/security/training) "hP" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1481; - listening = 0; + listening = FALSE; name = "station intercom (Isolation Room)"; pixel_x = 27 }, @@ -4141,8 +4147,8 @@ }, /obj/machinery/porta_turret/stationary, /obj/machinery/light/colored/blue{ - tag = "icon-tube_empty (WEST)"; - dir = 8 + dir = 8; + tag = "icon-tube_empty (WEST)" }, /turf/simulated/floor/plating, /area/bridge/selfdestruct) @@ -4152,8 +4158,8 @@ }, /obj/machinery/porta_turret/stationary, /obj/machinery/light/colored/blue{ - tag = "icon-tube_empty (EAST)"; - dir = 4 + dir = 4; + tag = "icon-tube_empty (EAST)" }, /turf/simulated/floor/plating, /area/bridge/selfdestruct) @@ -4552,8 +4558,8 @@ dir = 9 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/security/range) @@ -4604,8 +4610,8 @@ /area/security/investigations) "jF" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/open, /area/security/training) @@ -4863,9 +4869,9 @@ /area/medical/psych) "kb" = ( /obj/machinery/chakraconsole{ - tag = "icon-body_scannerconsole (EAST)"; + dir = 4; icon_state = "body_scannerconsole"; - dir = 4 + tag = "icon-body_scannerconsole (EAST)" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/green/diagonal, @@ -5063,8 +5069,8 @@ /area/medical/psych) "ks" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner_wide/green{ dir = 9 @@ -5242,8 +5248,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/device/radio/intercom{ dir = 4; @@ -5388,8 +5394,8 @@ /area/medical/psych) "kZ" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/firealarm/west, /obj/machinery/ringer{ @@ -5782,8 +5788,8 @@ /area/medical/psych) "lL" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner_wide/green/full, /turf/simulated/floor/tiled/white, @@ -5948,8 +5954,8 @@ /area/mine/unexplored) "mh" = ( /obj/effect/floor_decal/industrial/warning/dust{ - tag = "icon-warning_dust (SOUTHWEST)"; - dir = 10 + dir = 10; + tag = "icon-warning_dust (SOUTHWEST)" }, /turf/simulated/floor/airless{ icon_state = "asteroidplating" @@ -7276,8 +7282,8 @@ /area/maintenance/elevator) "tm" = ( /obj/effect/floor_decal/industrial/warning/dust{ - tag = "icon-warning_dust (SOUTHWEST)"; - dir = 10 + dir = 10; + tag = "icon-warning_dust (SOUTHWEST)" }, /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 4 @@ -7622,8 +7628,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 9 + dir = 9; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -8003,8 +8009,8 @@ pixel_y = 24 }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 5 + dir = 5; + icon_state = "corner_white" }, /obj/structure/cable/green{ d2 = 2; @@ -8347,8 +8353,8 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 4 + dir = 4; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -8926,8 +8932,8 @@ /area/quartermaster/storage) "En" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 9 + dir = 9; + icon_state = "corner_white" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -9202,8 +9208,8 @@ /area/mine/unexplored) "FP" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner_wide/green{ dir = 9 @@ -9298,8 +9304,8 @@ /area/mine/unexplored) "Gv" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 10 + dir = 10; + icon_state = "corner_white" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -9312,8 +9318,8 @@ /area/maintenance/interstitial_construction_site/office) "Gz" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 10 + dir = 10; + icon_state = "corner_white" }, /obj/structure/cable{ d1 = 1; @@ -9587,8 +9593,8 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment{ - icon_state = "conpipe-c"; - dir = 4 + dir = 4; + icon_state = "conpipe-c" }, /turf/simulated/floor/plating, /area/maintenance/medbay_interstitial) @@ -9763,8 +9769,8 @@ /area/quartermaster/storage) "IP" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 9 + dir = 9; + icon_state = "corner_white" }, /obj/structure/sign/vacuum{ pixel_x = -32 @@ -9794,8 +9800,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 9 + dir = 9; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -9920,8 +9926,8 @@ icon_state = "tube1" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 6 + dir = 6; + icon_state = "corner_white" }, /obj/structure/extinguisher_cabinet{ pixel_x = 28 @@ -9962,8 +9968,8 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/yellow/full{ - icon_state = "corner_white_full"; - dir = 4 + dir = 4; + icon_state = "corner_white_full" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -10297,8 +10303,8 @@ /area/maintenance/interstitial_cargo) "Kj" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled, @@ -10498,8 +10504,8 @@ /area/medical/upperlevel) "Lr" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 5 + dir = 5; + icon_state = "corner_white" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -10603,8 +10609,8 @@ icon_state = "12-0" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating{ roof_type = null @@ -10618,8 +10624,8 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 4 + dir = 4; + icon_state = "pipe-j2" }, /turf/simulated/floor/plating, /area/maintenance/interstitial_cargo) @@ -10798,8 +10804,8 @@ /area/maintenance/engineering_ladder) "Mv" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 6 + dir = 6; + icon_state = "corner_white" }, /obj/machinery/alarm{ dir = 8; @@ -11034,8 +11040,8 @@ /area/maintenance/interstitial_cargo) "NJ" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 6 + dir = 6; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -11161,8 +11167,8 @@ icon_state = "1-4" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 1 + dir = 1; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -11245,6 +11251,7 @@ }, /obj/structure/table/standard, /obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/item/paper_scanner, /turf/simulated/floor/tiled/white, /area/security/forensics_office) "Pm" = ( @@ -11254,8 +11261,8 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 10 + dir = 10; + icon_state = "corner_white" }, /obj/machinery/alarm{ dir = 1; @@ -11613,8 +11620,8 @@ /area/medical/upperlevel) "QN" = ( /obj/effect/floor_decal/corner/yellow/full{ - icon_state = "corner_white_full"; - dir = 8 + dir = 8; + icon_state = "corner_white_full" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -12055,8 +12062,8 @@ /area/security/forensics_office) "Ts" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/pink/full{ @@ -12270,8 +12277,8 @@ /area/quartermaster/storage) "UA" = ( /obj/effect/floor_decal/industrial/warning/dust{ - tag = "icon-warning_dust (SOUTHWEST)"; - dir = 10 + dir = 10; + tag = "icon-warning_dust (SOUTHWEST)" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless{ @@ -12437,8 +12444,8 @@ /obj/machinery/ringer{ department = "Cargo"; id = "cargo_ringer"; - req_access = list(31); - pixel_x = 30 + pixel_x = 30; + req_access = list(31) }, /obj/structure/lattice/catwalk/indoor, /turf/simulated/open, @@ -12574,8 +12581,8 @@ icon_state = "2-8" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 5 + dir = 5; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -12739,8 +12746,8 @@ icon_state = "2-4" }, /obj/effect/floor_decal/corner/yellow/full{ - icon_state = "corner_white_full"; - dir = 1 + dir = 1; + icon_state = "corner_white_full" }, /obj/structure/cable/green{ d1 = 1; @@ -12847,8 +12854,8 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 10 + dir = 10; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index ffa65f24b79..33a0c2b3c40 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -25293,6 +25293,7 @@ /obj/effect/landmark{ name = "carpspawn" }, +/obj/effect/shuttle_landmark/burglar/surface, /turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "Xi" = ( diff --git a/maps/aurora/code/aurora.dm b/maps/aurora/code/aurora.dm index cf54bc3332d..8dc152796aa 100644 --- a/maps/aurora/code/aurora.dm +++ b/maps/aurora/code/aurora.dm @@ -7,14 +7,16 @@ it is under the joint administration of the Republic of Biesel and the trans-stellar corporate conglomerate NanoTrasen." path = "aurora" - lobby_screens = list("aurora_asteroid", "aurora_postcard") + lobby_icon = 'icons/misc/aurora.dmi' + lobby_screens = list("nanotrasen", "idris", "hephaestus", "zavodskoi") + lobby_transitions = 10 SECONDS station_levels = list(2, 3, 4, 5, 6, 7) admin_levels = list(1) contact_levels = list(3, 4, 5, 6, 7) player_levels = list(2, 3, 4, 5, 6, 7, 8) restricted_levels = list() - accessible_z_levels = list("7" = 15, "2" = 60) + accessible_z_levels = list("2" = 60, "6" = 20, "7" = 20) base_turf_by_z = list( "1" = /turf/space, "2" = /turf/space, @@ -79,6 +81,7 @@ /datum/shuttle/autodock/ferry/autoreturn/ccia, /datum/shuttle/autodock/ferry/specops/ert_aurora, /datum/shuttle/autodock/multi/antag/skipjack_aurora, + /datum/shuttle/autodock/multi/antag/burglar_aurora, /datum/shuttle/autodock/multi/antag/merc_aurora, /datum/shuttle/autodock/ferry/legion, /datum/shuttle/autodock/ferry/research_aurora, diff --git a/maps/aurora/code/aurora_shuttles.dm b/maps/aurora/code/aurora_shuttles.dm index 5b4c550de4b..0d1de1facca 100644 --- a/maps/aurora/code/aurora_shuttles.dm +++ b/maps/aurora/code/aurora_shuttles.dm @@ -31,7 +31,7 @@ } \ /obj/effect/shuttle_landmark/escape_pod/start/pod##NUMBER { \ landmark_tag = "escape_pod_"+ #NUMBER +"_start"; \ - docking_controller = "escape_pod_"+ #NUMBER +"_berth"; \ + docking_controller = "escape_pod_" + #NUMBER +"_berth"; \ } \ /obj/effect/shuttle_landmark/escape_pod/out/pod##NUMBER { \ landmark_tag = "escape_pod_"+ #NUMBER +"_out"; \ @@ -226,6 +226,52 @@ AURORA_ESCAPE_POD(3) special_dock_targets = list("Phoenix Shuttle" = "specops_shuttle_fore") landmark_flags = SLANDMARK_FLAG_AUTOSET +//Burglar Pod +/datum/shuttle/autodock/multi/antag/burglar_aurora + name = "Burglar Pod" + current_location = "nav_burglar_start" + landmark_transition = "nav_burglar_interim" + warmup_time = 10 + move_time = 75 + ceiling_type = /turf/simulated/shuttle_roof/dark + shuttle_area = /area/burglar_base/pod + destination_tags = list( + "nav_burglar_start", + "nav_burglar_surface", + "nav_burglar_under", + "nav_burglar_caverns" + ) + + announcer = "NDV Icarus" + arrival_message = "Attention, we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not." + departure_message = "Attention, your guests are pulling away - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip." + +/obj/effect/shuttle_landmark/burglar/start + name = "Homebase" + landmark_tag = "nav_burglar_start" + base_turf = /turf/space + +/obj/effect/shuttle_landmark/burglar/interim + name = "In Transit" + landmark_tag = "nav_burglar_interim" + base_turf = /turf/space/transit + +/obj/effect/shuttle_landmark/burglar/surface + name = "Surface Aft of Cargo" + landmark_tag = "nav_burglar_surface" + landmark_flags = SLANDMARK_FLAG_AUTOSET + +/obj/effect/shuttle_landmark/burglar/under + name = "Under the Station" + landmark_tag = "nav_burglar_under" + landmark_flags = SLANDMARK_FLAG_AUTOSET + base_turf = /turf/space + +/obj/effect/shuttle_landmark/burglar/caverns + name = "Caverns by Mining" + landmark_tag = "nav_burglar_caverns" + landmark_flags = SLANDMARK_FLAG_AUTOSET + //Skipjack. /datum/shuttle/autodock/multi/antag/skipjack_aurora name = "Skipjack" diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm index 4fddf73d9d4..b2bd49db2ed 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -3295,9 +3295,9 @@ dir = 8 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1475; - listening = 0; + listening = FALSE; name = "Station Intercom (Security)"; pixel_x = -30 }, @@ -4134,9 +4134,9 @@ /area/security/brig) "ahN" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1449; - listening = 0; + listening = FALSE; pixel_y = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4762,9 +4762,9 @@ "aja" = ( /obj/structure/table/standard, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1475; - listening = 0; + listening = FALSE; name = "Station Intercom (Security)"; pixel_x = -30 }, @@ -10183,9 +10183,9 @@ "asL" = ( /obj/structure/table/standard, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1475; - listening = 0; + listening = FALSE; name = "Station Intercom (Security)"; pixel_y = -30 }, @@ -21785,7 +21785,7 @@ dir = 1 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1480; name = "Confessional Intercom"; pixel_x = 25 @@ -23170,7 +23170,7 @@ "aSL" = ( /obj/machinery/light/small, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1480; name = "Confessional Intercom"; pixel_x = 25 @@ -24573,12 +24573,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aVH" = ( -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 2; pixel_y = 6 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -2; pixel_y = 4 }, @@ -26460,11 +26460,11 @@ /area/crew_quarters/bar) "aZb" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -2; pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -26511,10 +26511,10 @@ /turf/simulated/floor/tiled, /area/crew_quarters/kitchen) "aZf" = ( -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 3 }, /obj/structure/table/stone/marble, @@ -31937,7 +31937,7 @@ name = "tripai" }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = 20 }, @@ -31947,7 +31947,7 @@ pixel_y = -26 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; name = "Common Channel"; pixel_x = -25; pixel_y = -4 @@ -31985,7 +31985,7 @@ pixel_y = 5 }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_x = -27; pixel_y = 4 @@ -31994,7 +31994,7 @@ name = "AI" }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; name = "Common Channel"; pixel_y = 25 }, @@ -32042,7 +32042,7 @@ name = "tripai" }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = 19 }, @@ -32052,7 +32052,7 @@ pixel_y = -26 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; name = "Common Channel"; pixel_x = 27; pixel_y = -3 @@ -44792,9 +44792,9 @@ /area/medical/psych) "bHh" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1481; - listening = 0; + listening = FALSE; name = "station intercom (Isolation Room)"; pixel_x = 27 }, diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm index 9d123c76f85..3638677d80f 100644 --- a/maps/exodus/exodus-2_centcomm.dmm +++ b/maps/exodus/exodus-2_centcomm.dmm @@ -1639,7 +1639,7 @@ /area/syndicate_mothership/control) "ahq" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1213; name = "Syndicate Ops Intercom"; @@ -1704,10 +1704,10 @@ /area/syndicate_mothership/elite_squad) "ahR" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1213; - listening = 0; + listening = FALSE; name = "Syndicate Ops Intercom"; pixel_y = 28; subspace_transmission = 1; @@ -5352,10 +5352,10 @@ /area/centcom/specops) "atK" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -6090,10 +6090,10 @@ /area/centcom/specops) "awE" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -7674,11 +7674,11 @@ "aBG" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 2; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -6 }, /turf/unsimulated/floor{ @@ -7862,7 +7862,7 @@ name = "Hull Door Control" }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; name = "Spec Ops Intercom"; @@ -8084,18 +8084,6 @@ icon_state = "redfull" }, /area/centcom/specops) -"aCV" = ( -/obj/structure/table/rack, -/obj/item/clothing/shoes/magboots/vox, -/obj/item/clothing/gloves/yellow/vox, -/obj/item/clothing/suit/space/vox/carapace, -/obj/item/clothing/head/helmet/space/vox/carapace, -/turf/unsimulated/floor{ - icon_state = "asteroid" - }, -/area/syndicate_mothership{ - name = "\improper Raider Base" - }) "aCW" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/item/tank/nitrogen, @@ -10913,7 +10901,7 @@ /area/centcom/test) "aMc" = ( /obj/structure/table/wood, -/obj/item/storage/fancy/cigar, +/obj/item/storage/fancy/cigarettes/cigar, /obj/item/flame/lighter/zippo, /turf/simulated/floor/wood, /area/merchant_station) @@ -14224,10 +14212,10 @@ dir = 8 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1443; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -23372,7 +23360,7 @@ axz axz axz axz -aCV +aCq aya alC alC diff --git a/maps/templates/pra.dmm b/maps/templates/pra.dmm index 094d8a26fe7..7d724108707 100644 --- a/maps/templates/pra.dmm +++ b/maps/templates/pra.dmm @@ -324,7 +324,7 @@ "aU" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/wood, -/obj/item/storage/fancy/cigar, +/obj/item/storage/fancy/cigarettes/cigar, /obj/item/flame/lighter/zippo, /turf/simulated/floor/wood, /area/derelict/ship) diff --git a/nano/templates/appearance_changer.tmpl b/nano/templates/appearance_changer.tmpl index f71c41d996b..2f9eb3f78af 100644 --- a/nano/templates/appearance_changer.tmpl +++ b/nano/templates/appearance_changer.tmpl @@ -23,6 +23,19 @@
{{/if}}
+{{if data.change_accent}}
+ 15 July 2020
+Doxxmedearly updated:
+-
+
- Replaces the memey drinks 'Syndicate Bomb' and 'Changeling Sting' with 'Gibson Hooch' and 'Gibson Punch', respectively. Recipes are unchanged. New sprites by Carpe Venenum. +
Geeves updated:
+-
+
- Changelings have received a free ability that allows them to mimic accents. +
- A shield worn on your back will now properly defend you from penetration in the rear. +
- Added a paper scanner device that can scan paper and paper bundles and convert them into data files. +
14 July 2020
+Alberyk, Sleepy wolf updated:
+-
+
- Added a deep wastelander accent option to unathi. +
- Added new icons to the unathi accent tags. +
Geeves updated:
+-
+
- Soulstones now apply a 2 second click cooldown when used to suck up a soul, whether it was successful or not. +
- Spiderbots now appear on the radio with the name of the one controlling them. +
- Mechs can now operate windoors. +
- Remote mechs can now use mounted health analyzers. +
- Mech rechargers will now charge the mech on top of them if there is a power change and the power is back. +
- Burglars and Conflict has been added to the secret rotation. +
- The minimum players amount needed for Burglars has been removed. +
- Burglars max player cap has been increased to 20. +
- Tweaked lighter activation messages to be less spammy. They appear smaller and only have a three tile range. +
MattAtlas updated:
+-
+
- Bishops now have the martian accent. +
- Talisman runes no longer delete themselves. +
- Ghosts no longer phase out of reality when exiting bluespace. +
SynysterSparx updated:
+-
+
- GPS Move Event registered to target when surgically implanted. +
Wowzewow (Wezzy) updated:
+-
+
- Cigarettes and chewables stay in your mouth/hands when they go out. +
- Cigarettes no longer stay lit in storage containers. +
mikomyazaki updated:
+-
+
- Items within other items will always be properly destroyed when going to cryo-storage, if they are not supposed to be kept for reclaiming by other players. +
13 July 2020
+Ferner updated:
+-
+
- Falling off the station will no longer have you end up floating forever through space. +
12 July 2020
+Geeves updated:
+-
+
- Mech UIs can no longer be moved via click-drag. +
- The lower left mech UI has received a make-over. +
- You can now use a cyborg analyzer on a mech to get its diagnostics report. +
- Stacks now spawn new stacks if their amount is larger than their max amount. +
- Drills can now drill at the lowest Z-level with no station breach warning. +
- Inputs and outputs for mining machines are no longer visible to players. +
- Added descriptions to all the mining refinery machines. +
- Stacking machine consoles now properly get their console screens. +
- Stacking machines now do their stacking without having to access their console first. +
- Added a small amount of invisible pixels to the processing consoles sprites, to prevent misclicks onto walls. +
- Speaking with an ID that doesn't match your voice no longer displays (as Unknown) or (as ID name). +
- Being disfigured makes speech difficult, thus your voice will appear as Unknown. +
- Wizard healing spells now heal internal organs as well. +
- Hacking no longer requires you to hold the tool (wirecutters, multitool, signaler) in your active hand, just that the tool is in one of your hands. This applies to cyborgs as well. +
- Tweaked the name of the 'check misc. lifeforms' turret option to 'Neutralize All Wildlife' to more accurately represent what it does. +
- You no longer have to swipe on a turret or turret control panel to access it, as long as you have access. The option remains if you want to open it for others. +
- Drowning in the pool no longer causes your lungs to pop. +
- You will no longer gasp for air when submerged, instead you will flail violently. +
MattAtlas updated:
+-
+
- Fixed stairs randomly faceplanting you. +
mikomyazaki updated:
+-
+
- A traitor AI/cyborg accessing an airlock UI will see the proper button state for dropping door bolts. +
- Smoking or chewing tobacco products will no longer produce pain messages. +
10 July 2020
+Doxxmedearly updated:
+-
+
- Borg modules (and maint drones) that had bars of soap now have soap that lasts 50 uses before needing to be re-wet. +
Geeves updated:
+-
+
- Paroxetine's recipe is now 1 mindbreaker, 1 ammonia, 1 copper. +
- Cryogenics no longer swallow the items that spawn in your hands if you spawn there. +
- Mech Weaponry no longer have safeties, and can be used as normal. +
- Space Wizards and their Apprentices now spawn with chameleon clothes that only they can change the appearance of. +
09 July 2020
+Geeves updated:
+-
+
- Melee weapon techniques targeting the feet should now work. +
- Cultist should now properly spawn. +
- Added a HUD overlay to the hand slots which indicate whether the hand is disabled, stumped, or removed. +
- Suit Cyclers will now only put ejected contents in your hands if you're adjacent to it. No more bluespace cyclers. +
- Messes and spills now appear above pipes, scrubbers, and vents. +
- You can brush messes and spills away from pipes, scrubbers, and vents, by using your hands on them. +
MattAtlas updated:
+-
+
- Added a cycle background option to the main menu. +
- Reworked how character preview works. It should now be far more responsive. +
Snakebittenn updated:
+-
+
- Skrell are now by default they/them. +
- Adjusts Skrell blood color. It's #0081CD if you're curious. +
- Adjusts the 'star' pod crash backstory to be for all sexes. +
Wowzewow (Wezzy) updated:
+-
+
- You can wear matches in your mask slot now, you pyromaniac, you. +
- You no longer can keep matches lit inside storage containers. +
- You can light matches using lighters. Because why the hell not. +
armrha updated:
+-
+
- Modified the define function to bypass bug from http://www.byond.com/forum/post/2061007 where the preprocessor inappropriately interprets a parenthesis in a string so that circuitboards display their type and name properly again +
08 July 2020
+Geeves updated:
+-
+
- Removes Changeling abilities if their antagonist status is removed. +
07 July 2020
+Doxxmedearly updated:
+-
+
- Adjusted cargo warehouse spawns. Added items, made some patterns less predictable, and removed some filler junk (Such as signs and huge stacks of trays). +
Geeves updated:
+-
+
- Flash rounds have been buffed. Scoring a headshot now ignores eye-protection, but only grants half the effects of a standard flash round effect. +
- Borg typing indicators now work again. +
- Borg eye colours now change immediately upon switching intent. +
- Borgs that spawn without a client no longer have active eyes. +
- Fixed borg shielding and mobility modules not updating their icon states correctly. +
- Fixed mobility modules not correctly increasing speed. +
- Slightly resprited the 9mm pistol and its silencer attachment to not have a pitch black outline. Should look slightly nicer now. +
mikomyazaki updated:
+-
+
- Petting a pAI and toggling its flashlight now properly updates the pAIs flashlight program state. +
06 July 2020
+Decepter updated:
+-
+
- Made it so that Changelings can't absorb DNA if they're inside a sealed void suit. +
Doxxmedearly updated:
+-
+
- Added more accent choices for Skrell characters. +
- Added more missing accents for humans and IPCs. +
Geeves updated:
+-
+
- Modular computers now properly print with their paper formatting. +
MattAtlas updated:
+-
+
- Hitting walls is now instant instead of being charged up. This means you can no longer queue up an insane amount of attacks. +
Wowzewow (Wezzy) updated:
+-
+
- Bolds the amount of things in a stack when examined. +
- Lighters actually update their inhands now. +
- Lighters actually have inhands now. +
- Fixes the message for pulling cigarettes out of cigarette packets using your mouth. +
Wowzwow (Wezzy) updated:
+-
+
- Paroxetine actually follows the recipie in the wiki now. +
armrha updated:
+-
+
- Modified mob/living/simple_animal/friendly/cat and /mob/living/simple_animal to allow cats to turn colors in radiation, modified modules/events/radiation_storm so it would apply to cats. +
05 July 2020
+Geeves updated:
+-
+
- Suit Cyclers have received new sprites, and any suits contained within will be on display as part of the sprite. +
- Using your ID, PDA, or Computer on a suit cycler will now attempt to unlock it. +
- The grab strength needed to put someone into a suit cycler has been increased to a neck grab. +
- You can no longer put helmets and suits in a suit cycler that's containing someone. +
- Ejecting a helmet or suit from a suit cycler will now attempt to place it in one of your empty hands. +
- Added an audible ping to suit cycler action completion. +
- You can now click drag yourself into a suit cycler to climb into it. +
- Crematoriums can now face in any direction. +
- Crematoriums and morgues now properly do not deploy their tray if something is in the way. +
- Crematoriums now properly update their icons while they work. +
MoondancerPony updated:
+-
+
- Added a new system to spawn reagents in things. +
- Made reagents use type paths instead of IDs. +
- Fixed some duplicate tobacco reagents. +
Wowzewow (Wezzy) updated:
+-
+
- Adds a information description to to cigarette packets on how to give yourself a cigarette with one hand. +
- Tweaks the names of some cigarette packets to be (debatably) more witty and on the nose. +
- Improves the sprites of some tajaran cigarette packets. +
- Fixes cheap lighters not showing their flames properly. +
Yonnimer updated:
+-
+
- Changes Dionae health to 240. +
- Changes nymph health to 50. +
- When a dionae splits, their health is now divided among their nymphs +
mikomyazaki updated:
+-
+
- Patting out flames on a target will now take priority over CPR, examining wounds, etc. +
- Can now pat out flames on targets that are dead, have no heartbeat or no heart. +
04 July 2020
+MattAtlas updated:
+-
+
- You can now use ^ in the middle of an emote to put your name there. +
- Melee weapons are now on par with bullets for internal organ wounding. +
- When internal organs are damaged, the pain felt is now less. +
- The severe brain damage event now happens at 150 brain damage instead of 100. +
- Things that aren't sharp now have an overall less chance of cutting. +
- Brute and burn damage now apply less pain overall. +
- IPCs, Dionae and so on now once again die at -100 damage. +
03 July 2020
+Alberyk updated:
+-
+
- Fixed joining via cryo disconnecting people. +
- Fix the diona accent having no chat tag. +
Alberyk, Kyres1 updated:
+-
+
- Added an accent option in the character creation menu. It will display a small tag next to the character's text when speaking a language that allows accents. +
Doxxmedearly updated:
+-
+
- Cigarettes now count as flame sources for igniting things like candles, other cigarettes, etc. +
- Added more ways to ignite certain objects, as some were hardcoded just to respond to lighters or welders. +
- Removed more remnants of clowns from code. +
- Added the missing Jupiter accent (Jovian) for humans. +
Geeves updated:
+-
+
- Borg radios now also have default access to common and the entertainment channel. +
MattAtlas updated:
+-
+
- Ported an overhauled emote backend. +
- Added automatic pain messages for all species. +
- Added a multichirp emote for dionae. +
MoondancerPony updated:
+-
+
- Makes the lobby screen fade smoothly. +
- Makes the lobby buttons bigger when you mouse over them. +
- Removed the old lobby background which was left in by accident. +
Yonnimer updated:
+-
+
- Changes the gimlet recipe to 1 gin, 1 limejuice, 1 grenadine. +
02 July 2020
+Geeves updated:
+-
+
- Added the ability to stack bullets into piles. +
- The NTNet Relay program now shows a message in your chatlog when YOU send a message. It also has a reply button which allows you to send a message back to that channel without opening the UI. +
- Added a jetpack, metal rods, a track laying RFD, and purple mining beacons to the mining cyborg module. +
- Reconnecting as a borg will now display you with the correct module on your HUD. +
- Being reset by an admin as a borg will now show you the right 'nomod' module on your HUD. +
- Scientific grippers can now grip enough stuff to be able to build mechs. +
- Science borgs now get cable coils, an experimental welding tool, and wirecutters. +
- Science borgs now get a fancy new module sprite, sprited by myself, with love. +
Wowzewow (Wezzy) updated:
+-
+
- Finally makes tool inhands work properly. +
01 July 2020
+MattAtlas updated:
+-
+
- If you chose to spawn at cryostorage, you will now spawn inside the cryocells, asleep. +
- Added a short spawn blurb. +
30 June 2020
+Alberyk updated:
+-
+
- Fixed blood overlays not going away after washing clothing. +
- Fixed bloody hand texts not going away after washing. +
Ferner updated:
+-
+
- Added compact disposal bins. +
- Projectiles now pass over disposal bins. +
Geeves updated:
+-
+
- Power cell backpacks can now be held in the Industrial, EVA, and CE RIG suitslots. Orbital droppers can now be kept in the explorer's belt. +
- Mining drills can now be properly upgraded by part replacers. +
- Mining grippers can now remove cells from mining drills, if the panel is open. +
- Cyborg radio descriptions now update when they reset modules. +
- Mining and science cyborgs now get part replacers in their modules. +
- Grippers now position their items correctly, spritewise. +
- Control-clicking your gripper will now make it drop its held item. +
- Clicking a mining drill with a gripper will no longer activate or deactivate it, which will prevent a lot of accidents. +
- Taking a cell out of a mining drill will now place it in one of your hands, if one is open. +
- Emptying a bag's contents onto the floor with the verb will now always display the message of you doing it. +
- Control-clicking a storage item in your active hand will now attempt to empty it onto the floor, if it has that verb. +
- Using an ore detector on a drill will now give a detailed readout of the ore in the vicinity that it has access to and call pull out. +
- Battlemonsters vendors now spawn with five free basic packs containing seven common cards, which can be used to show people how the game works without spending any money. +
- Fixed tape recorders being unable to print their transcripts after a while. +
- Added power efficient inductive chargers to cyborgs, maintenance-, construction- and mining drones, allowing them to charge power cells, and things that contain power cells. +
29 June 2020
+Alberyk, Menown updated:
+-
+
- Added adhomian dice to the loadout, that can be used to play Suns and Moon. +
Geeves updated:
+-
+
- Added a lowpop gamemode called 'Burglars', featuring a new type of antagonist, a mix between a heister and a traitor. Neutered for lowpop fun. +
- Added a mixed gamemode, 'Conflict', which is heisters and burglars. +
- Added an optional acting captain uniform briefcase to the captain's locker. It includes a jacket, a cap, an armband, and a captain radio. +
- The modular computer pAI access lock program should properly only show when you have a pAI in your computer. +
- You can now properly save NTNet IRC chats' logs to your hard drive. +
- Fixes various programs not having their computer correctly set, which should fix a wide spectrum of bugs for modular computers. +
- Replaced the non-functioning suit-cycler and voidsuit combo at the burglar base, with a simple black and red all-species syndicate softsuit. +
- Burglars can properly no longer access some of the more robust uplinks, to keep up with the lowpop theme. +
- Off-station antagonists will no longer keep the player's character's flavour text. +
- Antagonists will now be assigned random names before they pick their name. +
- Spacebikes, speeders, and monowheels now have storage compartments accessible by dragging it onto your sprite. +
- Spacebikes and speeders now drive a bit faster on non-space tiles. +
MattAtlas updated:
+-
+
- Added a new, swanky main menu. +
Wowzewow (Wezzy) updated:
+-
+
- Intercom buttons are red when off (but still powered). +
- Ramen's crunchy when dry. +
28 June 2020
+Alberyk updated:
+-
+
- Reworked aut'akh augments. +
Geeves updated:
+-
+
- The Telecomms Lounge has been removed from the droppod target list, as it no longer exists. +
- A warning now pops up if you attempt to launch a droppod while not inside it. +
27 June 2020
+Ferner updated:
+-
+
- Tweaked some values related to hivebots to make them more inline of their original implementation, to remedy some unintentional problems that have crept up. +
Geeves updated:
+-
+
- You can now pump a shotgun or work a rifle's bolt without wielding it, but it takes two seconds to do so. +
- Using the double-barreled shotgun in-hand now ejects its ammunition instead of changing the firing mode. Changing the firing mode has been put on alt click. +
- EMT and Paramedic loadout items now work properly, and they now appear under medical in the records. +
MattAtlas updated:
+-
+
- Things that don't respect brainmed such as shadows and skeletons should now die when they're supposed to. +
- The handling of pain and pain messages has been overhauled. +
- Added a STRONG red pain overlay when you're in a real lot of pain. +
26 June 2020
+Wowzewow (Wezzy) updated:
+-
+
- Fixes loadout slot buttons not working properly. +
Yonnimer updated:
+-
+
- Adds a verb that allows nymphs to remove their hat. +
25 June 2020
+Alberyk updated:
+-
+
- Wizard skeleton minions don't have whacky wizard names anymore. +
Ferner, Kyres1 updated:
+-
+
- Added Elyran holographic suits to the loadout, able to transform into a selection of different Elyran cultural apparel. Spriting by Kyres1. +
Wowzewow (Wezzy) updated:
+-
+
- Fixes invisible argyle tubenecks and turtlenecks. +
24 June 2020
+Alberyk updated:
+-
+
- Crew can no longer interact with the arrival's shuttle docking controller. +
Geeves updated:
+-
+
- Added sharpened bear traps, a mechanical trap that ignores armour in the clamp action, to the Stealthy and Inconspicuous Weapons uplink. +
- Bear traps will no longer trap you if they take your limb off while triggering. +
- Added closet teleporters to the Stealth and Camouflage Items uplink, a device that start linked and can be attached to closets to set-up a teleport network. Step inside and close the door to teleport. +
- Pushing a wall to try and find a secret entrance now takes a few seconds of touching and feeling. +
- Cargo warehouse now has the proper amount of stock to account for two Z-levels. +
- Overlays have been added to webs, making it look like you're travelling through them instead of travelling over them. +
Skull132 updated:
+-
+
- Adjust some gravity behaviour, maybe fix a few bugs. +
Snakebitten updated:
- Adds a psionic receiver augment. This allows vaurca and IPCs to be picked up by psionic pings and telepathic messages, and allows humans and other races to not be hurt by telepathic messages. +
- Fixes Synthskin limb damage examines. +
Wowzewow (Wezzy) updated:
+-
+
- Improved sprites for cable cuffs, zipties and handcuffs. Tweaks cable coil inhands. +
- Cable cuffs and nooses take the color of the cable coil now. +
- You can cut cable cuffs with wirecutters to get the materials back.
23 June 2020
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 99a66f73122..6d1b209de0e 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -13808,7 +13808,396 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Kyres1: - rscadd: Added Himean and Vysokan clothing to the loadout. 2020-06-24: + Alberyk: + - tweak: Crew can no longer interact with the arrival's shuttle docking controller. + Geeves: + - rscadd: Added sharpened bear traps, a mechanical trap that ignores armour in the + clamp action, to the Stealthy and Inconspicuous Weapons uplink. + - bugfix: Bear traps will no longer trap you if they take your limb off while triggering. + - rscadd: Added closet teleporters to the Stealth and Camouflage Items uplink, a + device that start linked and can be attached to closets to set-up a teleport + network. Step inside and close the door to teleport. + - tweak: Pushing a wall to try and find a secret entrance now takes a few seconds + of touching and feeling. + - bugfix: Cargo warehouse now has the proper amount of stock to account for two + Z-levels. + - rscadd: Overlays have been added to webs, making it look like you're travelling + through them instead of travelling over them. + Skull132: + - tweak: Adjust some gravity behaviour, maybe fix a few bugs. Snakebitten: - rscadd: Adds a psionic receiver augment. This allows vaurca and IPCs to be picked up by psionic pings and telepathic messages, and allows humans and other races to not be hurt by telepathic messages. + - bugfix: Fixes Synthskin limb damage examines. + Wowzewow (Wezzy): + - imageadd: Improved sprites for cable cuffs, zipties and handcuffs. Tweaks cable + coil inhands. + - rscadd: Cable cuffs and nooses take the color of the cable coil now. + - rscadd: You can cut cable cuffs with wirecutters to get the materials back. +2020-06-25: + Alberyk: + - tweak: Wizard skeleton minions don't have whacky wizard names anymore. + Ferner, Kyres1: + - rscadd: Added Elyran holographic suits to the loadout, able to transform into + a selection of different Elyran cultural apparel. Spriting by Kyres1. + Wowzewow (Wezzy): + - bugfix: Fixes invisible argyle tubenecks and turtlenecks. +2020-06-26: + Wowzewow (Wezzy): + - bugfix: Fixes loadout slot buttons not working properly. + Yonnimer: + - rscadd: Adds a verb that allows nymphs to remove their hat. +2020-06-27: + Ferner: + - bugfix: Tweaked some values related to hivebots to make them more inline of their + original implementation, to remedy some unintentional problems that have crept + up. + Geeves: + - rscadd: You can now pump a shotgun or work a rifle's bolt without wielding it, + but it takes two seconds to do so. + - tweak: Using the double-barreled shotgun in-hand now ejects its ammunition instead + of changing the firing mode. Changing the firing mode has been put on alt click. + - rscadd: EMT and Paramedic loadout items now work properly, and they now appear + under medical in the records. + MattAtlas: + - bugfix: Things that don't respect brainmed such as shadows and skeletons should + now die when they're supposed to. + - experiment: The handling of pain and pain messages has been overhauled. + - rscadd: Added a STRONG red pain overlay when you're in a real lot of pain. +2020-06-28: + Alberyk: + - tweak: Reworked aut'akh augments. + Geeves: + - bugfix: The Telecomms Lounge has been removed from the droppod target list, as + it no longer exists. + - bugfix: A warning now pops up if you attempt to launch a droppod while not inside + it. +2020-06-29: + Alberyk, Menown: + - rscadd: Added adhomian dice to the loadout, that can be used to play Suns and + Moon. + Geeves: + - rscadd: Added a lowpop gamemode called 'Burglars', featuring a new type of antagonist, + a mix between a heister and a traitor. Neutered for lowpop fun. + - rscadd: Added a mixed gamemode, 'Conflict', which is heisters and burglars. + - rscadd: Added an optional acting captain uniform briefcase to the captain's locker. + It includes a jacket, a cap, an armband, and a captain radio. + - bugfix: The modular computer pAI access lock program should properly only show + when you have a pAI in your computer. + - bugfix: You can now properly save NTNet IRC chats' logs to your hard drive. + - bugfix: Fixes various programs not having their computer correctly set, which + should fix a wide spectrum of bugs for modular computers. + - bugfix: Replaced the non-functioning suit-cycler and voidsuit combo at the burglar + base, with a simple black and red all-species syndicate softsuit. + - bugfix: Burglars can properly no longer access some of the more robust uplinks, + to keep up with the lowpop theme. + - bugfix: Off-station antagonists will no longer keep the player's character's flavour + text. + - bugfix: Antagonists will now be assigned random names before they pick their name. + - rscadd: Spacebikes, speeders, and monowheels now have storage compartments accessible + by dragging it onto your sprite. + - tweak: Spacebikes and speeders now drive a bit faster on non-space tiles. + MattAtlas: + - rscadd: Added a new, swanky main menu. + Wowzewow (Wezzy): + - rscadd: Intercom buttons are red when off (but still powered). + - rscadd: Ramen's crunchy when dry. +2020-06-30: + Alberyk: + - bugfix: Fixed blood overlays not going away after washing clothing. + - bugfix: Fixed bloody hand texts not going away after washing. + Ferner: + - rscadd: Added compact disposal bins. + - tweak: Projectiles now pass over disposal bins. + Geeves: + - rscadd: Power cell backpacks can now be held in the Industrial, EVA, and CE RIG + suitslots. Orbital droppers can now be kept in the explorer's belt. + - bugfix: Mining drills can now be properly upgraded by part replacers. + - rscadd: Mining grippers can now remove cells from mining drills, if the panel + is open. + - bugfix: Cyborg radio descriptions now update when they reset modules. + - rscadd: Mining and science cyborgs now get part replacers in their modules. + - bugfix: Grippers now position their items correctly, spritewise. + - rscadd: Control-clicking your gripper will now make it drop its held item. + - bugfix: Clicking a mining drill with a gripper will no longer activate or deactivate + it, which will prevent a lot of accidents. + - tweak: Taking a cell out of a mining drill will now place it in one of your hands, + if one is open. + - bugfix: Emptying a bag's contents onto the floor with the verb will now always + display the message of you doing it. + - rscadd: Control-clicking a storage item in your active hand will now attempt to + empty it onto the floor, if it has that verb. + - rscadd: Using an ore detector on a drill will now give a detailed readout of the + ore in the vicinity that it has access to and call pull out. + - rscadd: Battlemonsters vendors now spawn with five free basic packs containing + seven common cards, which can be used to show people how the game works without + spending any money. + - bugfix: Fixed tape recorders being unable to print their transcripts after a while. + - rscadd: Added power efficient inductive chargers to cyborgs, maintenance-, construction- + and mining drones, allowing them to charge power cells, and things that contain + power cells. +2020-07-01: + MattAtlas: + - rscadd: If you chose to spawn at cryostorage, you will now spawn inside the cryocells, + asleep. + - rscadd: Added a short spawn blurb. +2020-07-02: + Geeves: + - rscadd: Added the ability to stack bullets into piles. + - rscadd: The NTNet Relay program now shows a message in your chatlog when YOU send + a message. It also has a reply button which allows you to send a message back + to that channel without opening the UI. + - rscadd: Added a jetpack, metal rods, a track laying RFD, and purple mining beacons + to the mining cyborg module. + - bugfix: Reconnecting as a borg will now display you with the correct module on + your HUD. + - bugfix: Being reset by an admin as a borg will now show you the right 'nomod' + module on your HUD. + - rscadd: Scientific grippers can now grip enough stuff to be able to build mechs. + - rscadd: Science borgs now get cable coils, an experimental welding tool, and wirecutters. + - rscadd: Science borgs now get a fancy new module sprite, sprited by myself, with + love. + Wowzewow (Wezzy): + - bugfix: Finally makes tool inhands work properly. +2020-07-03: + Alberyk: + - bugfix: Fixed joining via cryo disconnecting people. + - bugfix: Fix the diona accent having no chat tag. + Alberyk, Kyres1: + - rscadd: Added an accent option in the character creation menu. It will display + a small tag next to the character's text when speaking a language that allows + accents. + Doxxmedearly: + - rscadd: Cigarettes now count as flame sources for igniting things like candles, + other cigarettes, etc. + - rscadd: Added more ways to ignite certain objects, as some were hardcoded just + to respond to lighters or welders. + - rscdel: Removed more remnants of clowns from code. + - bugfix: Added the missing Jupiter accent (Jovian) for humans. + Geeves: + - bugfix: Borg radios now also have default access to common and the entertainment + channel. + MattAtlas: + - rscadd: Ported an overhauled emote backend. + - rscadd: Added automatic pain messages for all species. + - rscadd: Added a multichirp emote for dionae. + MoondancerPony: + - rscadd: Makes the lobby screen fade smoothly. + - rscadd: Makes the lobby buttons bigger when you mouse over them. + - rscdel: Removed the old lobby background which was left in by accident. + Yonnimer: + - tweak: Changes the gimlet recipe to 1 gin, 1 limejuice, 1 grenadine. +2020-07-04: + MattAtlas: + - bugfix: You can now use ^ in the middle of an emote to put your name there. + - tweak: Melee weapons are now on par with bullets for internal organ wounding. + - tweak: When internal organs are damaged, the pain felt is now less. + - tweak: The severe brain damage event now happens at 150 brain damage instead of + 100. + - tweak: Things that aren't sharp now have an overall less chance of cutting. + - tweak: Brute and burn damage now apply less pain overall. + - bugfix: IPCs, Dionae and so on now once again die at -100 damage. +2020-07-05: + Geeves: + - imageadd: Suit Cyclers have received new sprites, and any suits contained within + will be on display as part of the sprite. + - rscadd: Using your ID, PDA, or Computer on a suit cycler will now attempt to unlock + it. + - tweak: The grab strength needed to put someone into a suit cycler has been increased + to a neck grab. + - bugfix: You can no longer put helmets and suits in a suit cycler that's containing + someone. + - rscadd: Ejecting a helmet or suit from a suit cycler will now attempt to place + it in one of your empty hands. + - rscadd: Added an audible ping to suit cycler action completion. + - rscadd: You can now click drag yourself into a suit cycler to climb into it. + - bugfix: Crematoriums can now face in any direction. + - bugfix: Crematoriums and morgues now properly do not deploy their tray if something + is in the way. + - bugfix: Crematoriums now properly update their icons while they work. + MoondancerPony: + - backend: Added a new system to spawn reagents in things. + - refactor: Made reagents use type paths instead of IDs. + - tweak: Fixed some duplicate tobacco reagents. + Wowzewow (Wezzy): + - rscadd: Adds a information description to to cigarette packets on how to give + yourself a cigarette with one hand. + - tweak: Tweaks the names of some cigarette packets to be (debatably) more witty + and on the nose. + - imageadd: Improves the sprites of some tajaran cigarette packets. + - bugfix: Fixes cheap lighters not showing their flames properly. + Yonnimer: + - tweak: Changes Dionae health to 240. + - tweak: Changes nymph health to 50. + - rscadd: ' When a dionae splits, their health is now divided among their nymphs' + mikomyazaki: + - bugfix: Patting out flames on a target will now take priority over CPR, examining + wounds, etc. + - bugfix: Can now pat out flames on targets that are dead, have no heartbeat or + no heart. +2020-07-06: + Decepter: + - tweak: Made it so that Changelings can't absorb DNA if they're inside a sealed + void suit. + Doxxmedearly: + - rscadd: Added more accent choices for Skrell characters. + - bugfix: Added more missing accents for humans and IPCs. + Geeves: + - bugfix: Modular computers now properly print with their paper formatting. + MattAtlas: + - tweak: Hitting walls is now instant instead of being charged up. This means you + can no longer queue up an insane amount of attacks. + Wowzewow (Wezzy): + - rscadd: Bolds the amount of things in a stack when examined. + - bugfix: Lighters actually update their inhands now. + - imageadd: Lighters actually have inhands now. + - bugfix: Fixes the message for pulling cigarettes out of cigarette packets using + your mouth. + Wowzwow (Wezzy): + - bugfix: Paroxetine actually follows the recipie in the wiki now. + armrha: + - rscadd: Modified mob/living/simple_animal/friendly/cat and /mob/living/simple_animal + to allow cats to turn colors in radiation, modified modules/events/radiation_storm + so it would apply to cats. +2020-07-07: + Doxxmedearly: + - tweak: Adjusted cargo warehouse spawns. Added items, made some patterns less predictable, + and removed some filler junk (Such as signs and huge stacks of trays). + Geeves: + - tweak: Flash rounds have been buffed. Scoring a headshot now ignores eye-protection, + but only grants half the effects of a standard flash round effect. + - bugfix: Borg typing indicators now work again. + - tweak: Borg eye colours now change immediately upon switching intent. + - bugfix: Borgs that spawn without a client no longer have active eyes. + - bugfix: Fixed borg shielding and mobility modules not updating their icon states + correctly. + - bugfix: Fixed mobility modules not correctly increasing speed. + - imageadd: Slightly resprited the 9mm pistol and its silencer attachment to not + have a pitch black outline. Should look slightly nicer now. + mikomyazaki: + - bugfix: Petting a pAI and toggling its flashlight now properly updates the pAIs + flashlight program state. +2020-07-08: + Geeves: + - bugfix: Removes Changeling abilities if their antagonist status is removed. +2020-07-09: + Geeves: + - bugfix: Melee weapon techniques targeting the feet should now work. + - bugfix: Cultist should now properly spawn. + - rscadd: Added a HUD overlay to the hand slots which indicate whether the hand + is disabled, stumped, or removed. + - bugfix: Suit Cyclers will now only put ejected contents in your hands if you're + adjacent to it. No more bluespace cyclers. + - tweak: Messes and spills now appear above pipes, scrubbers, and vents. + - rscadd: You can brush messes and spills away from pipes, scrubbers, and vents, + by using your hands on them. + MattAtlas: + - rscadd: Added a cycle background option to the main menu. + - experiment: Reworked how character preview works. It should now be far more responsive. + Snakebittenn: + - rscadd: Skrell are now by default they/them. + - tweak: 'Adjusts Skrell blood color. It''s #0081CD if you''re curious.' + - tweak: Adjusts the 'star' pod crash backstory to be for all sexes. + Wowzewow (Wezzy): + - rscadd: You can wear matches in your mask slot now, you pyromaniac, you. + - bugfix: You no longer can keep matches lit inside storage containers. + - rscadd: You can light matches using lighters. Because why the hell not. + armrha: + - rscadd: Modified the define function to bypass bug from http://www.byond.com/forum/post/2061007 + where the preprocessor inappropriately interprets a parenthesis in a string + so that circuitboards display their type and name properly again +2020-07-10: + Doxxmedearly: + - rscadd: Borg modules (and maint drones) that had bars of soap now have soap that + lasts 50 uses before needing to be re-wet. + Geeves: + - tweak: Paroxetine's recipe is now 1 mindbreaker, 1 ammonia, 1 copper. + - bugfix: Cryogenics no longer swallow the items that spawn in your hands if you + spawn there. + - bugfix: Mech Weaponry no longer have safeties, and can be used as normal. + - rscadd: Space Wizards and their Apprentices now spawn with chameleon clothes that + only they can change the appearance of. +2020-07-12: + Geeves: + - tweak: Mech UIs can no longer be moved via click-drag. + - tweak: The lower left mech UI has received a make-over. + - rscadd: You can now use a cyborg analyzer on a mech to get its diagnostics report. + - backend: Stacks now spawn new stacks if their amount is larger than their max + amount. + - bugfix: Drills can now drill at the lowest Z-level with no station breach warning. + - bugfix: Inputs and outputs for mining machines are no longer visible to players. + - rscadd: Added descriptions to all the mining refinery machines. + - bugfix: Stacking machine consoles now properly get their console screens. + - bugfix: Stacking machines now do their stacking without having to access their + console first. + - rscadd: Added a small amount of invisible pixels to the processing consoles sprites, + to prevent misclicks onto walls. + - rscdel: Speaking with an ID that doesn't match your voice no longer displays (as + Unknown) or (as ID name). + - tweak: Being disfigured makes speech difficult, thus your voice will appear as + Unknown. + - rscadd: Wizard healing spells now heal internal organs as well. + - rscadd: Hacking no longer requires you to hold the tool (wirecutters, multitool, + signaler) in your active hand, just that the tool is in one of your hands. This + applies to cyborgs as well. + - tweak: Tweaked the name of the 'check misc. lifeforms' turret option to 'Neutralize + All Wildlife' to more accurately represent what it does. + - rscadd: You no longer have to swipe on a turret or turret control panel to access + it, as long as you have access. The option remains if you want to open it for + others. + - bugfix: Drowning in the pool no longer causes your lungs to pop. + - bugfix: You will no longer gasp for air when submerged, instead you will flail + violently. + MattAtlas: + - bugfix: Fixed stairs randomly faceplanting you. + mikomyazaki: + - bugfix: A traitor AI/cyborg accessing an airlock UI will see the proper button + state for dropping door bolts. + - tweak: Smoking or chewing tobacco products will no longer produce pain messages. +2020-07-13: + Ferner: + - bugfix: Falling off the station will no longer have you end up floating forever + through space. +2020-07-14: + Alberyk, Sleepy wolf: + - rscadd: Added a deep wastelander accent option to unathi. + - rscadd: Added new icons to the unathi accent tags. + Geeves: + - tweak: Soulstones now apply a 2 second click cooldown when used to suck up a soul, + whether it was successful or not. + - bugfix: Spiderbots now appear on the radio with the name of the one controlling + them. + - bugfix: Mechs can now operate windoors. + - bugfix: Remote mechs can now use mounted health analyzers. + - bugfix: Mech rechargers will now charge the mech on top of them if there is a + power change and the power is back. + - rscadd: Burglars and Conflict has been added to the secret rotation. + - tweak: The minimum players amount needed for Burglars has been removed. + - tweak: Burglars max player cap has been increased to 20. + - tweak: Tweaked lighter activation messages to be less spammy. They appear smaller + and only have a three tile range. + MattAtlas: + - bugfix: Bishops now have the martian accent. + - bugfix: Talisman runes no longer delete themselves. + - bugfix: Ghosts no longer phase out of reality when exiting bluespace. + SynysterSparx: + - bugfix: GPS Move Event registered to target when surgically implanted. + Wowzewow (Wezzy): + - rscadd: Cigarettes and chewables stay in your mouth/hands when they go out. + - rscadd: Cigarettes no longer stay lit in storage containers. + mikomyazaki: + - bugfix: Items within other items will always be properly destroyed when going + to cryo-storage, if they are not supposed to be kept for reclaiming by other + players. +2020-07-15: + Doxxmedearly: + - rscadd: Replaces the memey drinks 'Syndicate Bomb' and 'Changeling Sting' with + 'Gibson Hooch' and 'Gibson Punch', respectively. Recipes are unchanged. New + sprites by Carpe Venenum. + Geeves: + - rscadd: Changelings have received a free ability that allows them to mimic accents. + - rscadd: A shield worn on your back will now properly defend you from penetration + in the rear. + - rscadd: Added a paper scanner device that can scan paper and paper bundles and + convert them into data files. diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi new file mode 100644 index 00000000000..4f37a18cbb1 Binary files /dev/null and b/icons/accent_tags.dmi differ diff --git a/icons/clothing/kit/acting_captain.dmi b/icons/clothing/kit/acting_captain.dmi new file mode 100644 index 00000000000..55649a0a67f Binary files /dev/null and b/icons/clothing/kit/acting_captain.dmi differ diff --git a/icons/clothing/under/uniforms/elyra_holoclothes.dmi b/icons/clothing/under/uniforms/elyra_holoclothes.dmi new file mode 100644 index 00000000000..149db7a0415 Binary files /dev/null and b/icons/clothing/under/uniforms/elyra_holoclothes.dmi differ diff --git a/icons/effects/128x48.dmi b/icons/effects/128x48.dmi new file mode 100644 index 00000000000..71038ffdbf8 Binary files /dev/null and b/icons/effects/128x48.dmi differ diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index d59d1f73530..cc9192c5430 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/mecha/mecha_hud.dmi b/icons/mecha/mecha_hud.dmi index 33288be2bf2..adee40ac16f 100644 Binary files a/icons/mecha/mecha_hud.dmi and b/icons/mecha/mecha_hud.dmi differ diff --git a/icons/misc/aurora.dmi b/icons/misc/aurora.dmi new file mode 100644 index 00000000000..1e1b5f29e51 Binary files /dev/null and b/icons/misc/aurora.dmi differ diff --git a/icons/misc/hudmenu.dmi b/icons/misc/hudmenu.dmi new file mode 100644 index 00000000000..675f55ad643 Binary files /dev/null and b/icons/misc/hudmenu.dmi differ diff --git a/icons/misc/title.dmi b/icons/misc/title.dmi index 72e7b8dbce7..47f57dabd42 100644 Binary files a/icons/misc/title.dmi and b/icons/misc/title.dmi differ diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 98dd833b2e9..e1ea461ca3c 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ diff --git a/icons/mob/items/lefthand_cigs_lighters.dmi b/icons/mob/items/lefthand_cigs_lighters.dmi index 1c087488e5d..68e92071c51 100644 Binary files a/icons/mob/items/lefthand_cigs_lighters.dmi and b/icons/mob/items/lefthand_cigs_lighters.dmi differ diff --git a/icons/mob/items/lefthand_hydro.dmi b/icons/mob/items/lefthand_hydro.dmi index 59498ec649f..18d0a1e9b30 100644 Binary files a/icons/mob/items/lefthand_hydro.dmi and b/icons/mob/items/lefthand_hydro.dmi differ diff --git a/icons/mob/items/lefthand_tools.dmi b/icons/mob/items/lefthand_tools.dmi index 4c4121ba758..04e670c462d 100644 Binary files a/icons/mob/items/lefthand_tools.dmi and b/icons/mob/items/lefthand_tools.dmi differ diff --git a/icons/mob/items/righthand_cigs_lighters.dmi b/icons/mob/items/righthand_cigs_lighters.dmi index 3118163108c..01db9a0d8a6 100644 Binary files a/icons/mob/items/righthand_cigs_lighters.dmi and b/icons/mob/items/righthand_cigs_lighters.dmi differ diff --git a/icons/mob/items/righthand_hydro.dmi b/icons/mob/items/righthand_hydro.dmi index 142c37fbb82..3d5c528e4f0 100644 Binary files a/icons/mob/items/righthand_hydro.dmi and b/icons/mob/items/righthand_hydro.dmi differ diff --git a/icons/mob/items/righthand_tools.dmi b/icons/mob/items/righthand_tools.dmi index abed50d50f3..b083665204e 100644 Binary files a/icons/mob/items/righthand_tools.dmi and b/icons/mob/items/righthand_tools.dmi differ diff --git a/icons/mob/items/stacks/lefthand_materials.dmi b/icons/mob/items/stacks/lefthand_materials.dmi index 70437b3365e..70ac3748c95 100644 Binary files a/icons/mob/items/stacks/lefthand_materials.dmi and b/icons/mob/items/stacks/lefthand_materials.dmi differ diff --git a/icons/mob/items/stacks/righthand_materials.dmi b/icons/mob/items/stacks/righthand_materials.dmi index a0a2f415f17..f59557d87b9 100644 Binary files a/icons/mob/items/stacks/righthand_materials.dmi and b/icons/mob/items/stacks/righthand_materials.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 7d20b29a59b..4066d8f0e5d 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi index 6742b47d5d4..ba9d9729d1c 100644 Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ diff --git a/icons/mob/screen/full.dmi b/icons/mob/screen/full.dmi index 97d2a29d930..193c7c138d0 100644 Binary files a/icons/mob/screen/full.dmi and b/icons/mob/screen/full.dmi differ diff --git a/icons/mob/screen/generic.dmi b/icons/mob/screen/generic.dmi index 8f7b06badcb..1c8bb6604bb 100644 Binary files a/icons/mob/screen/generic.dmi and b/icons/mob/screen/generic.dmi differ diff --git a/icons/mob/screen/robot.dmi b/icons/mob/screen/robot.dmi index 9630b598536..a309afb2cad 100644 Binary files a/icons/mob/screen/robot.dmi and b/icons/mob/screen/robot.dmi differ diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi index 2071c634d13..11cef591c1e 100644 Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ diff --git a/icons/obj/action_buttons/organs.dmi b/icons/obj/action_buttons/organs.dmi index 0db0a83f09d..3895aee651c 100644 Binary files a/icons/obj/action_buttons/organs.dmi and b/icons/obj/action_buttons/organs.dmi differ diff --git a/icons/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi index 0980ba8e6da..073aad23113 100644 Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index ed7558490a6..baff3fa5261 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/devices/paperscanner.dmi b/icons/obj/devices/paperscanner.dmi new file mode 100644 index 00000000000..1af5e969134 Binary files /dev/null and b/icons/obj/devices/paperscanner.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 8e54ab94ca8..ba0c3c0b646 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/guns/pistol.dmi b/icons/obj/guns/pistol.dmi index 3e3f599138f..b66e31b93ba 100644 Binary files a/icons/obj/guns/pistol.dmi and b/icons/obj/guns/pistol.dmi differ diff --git a/icons/obj/handcuffs.dmi b/icons/obj/handcuffs.dmi new file mode 100644 index 00000000000..d88290d948f Binary files /dev/null and b/icons/obj/handcuffs.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 03183a200d8..a17af56fc4d 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/noose.dmi b/icons/obj/noose.dmi index 7b9494d718a..66a0c121660 100644 Binary files a/icons/obj/noose.dmi and b/icons/obj/noose.dmi differ diff --git a/icons/obj/pipes/disposal.dmi b/icons/obj/pipes/disposal.dmi index 4a3037b7de8..190d9f4cbdf 100644 Binary files a/icons/obj/pipes/disposal.dmi and b/icons/obj/pipes/disposal.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index a905de431fc..59d6d97d939 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index 94105c5e3a3..7aad9d46244 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ diff --git a/icons/obj/robot_items.dmi b/icons/obj/robot_items.dmi index a43a0cc27b8..8a495202f7f 100644 Binary files a/icons/obj/robot_items.dmi and b/icons/obj/robot_items.dmi differ diff --git a/icons/obj/suit_cycler.dmi b/icons/obj/suit_cycler.dmi new file mode 100644 index 00000000000..418ce5d1767 Binary files /dev/null and b/icons/obj/suit_cycler.dmi differ diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index 286e7d876ac..0bcc343032b 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi index f19dc3e6cd9..bfdb632a5d1 100644 Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ diff --git a/interface/interface.dm b/interface/interface.dm index 9937a270b55..78cbd5bb317 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -37,7 +37,7 @@ return send_link(src, config.githuburl + "/issues") else - to_chat(src, span("warning", "The issue tracker URL is not set in the server configuration.")) + to_chat(src, SPAN_WARNING("The issue tracker URL is not set in the server configuration.")) return #define RULES_FILE "config/rules.html" @@ -183,7 +183,7 @@ Any-Mode: (hotkey doesn't need to be on) return send_link(src, config.webint_url) else - to_chat(src, span("warning", "The web interface URL is not set in the server configuration.")) + to_chat(src, SPAN_WARNING("The web interface URL is not set in the server configuration.")) return /client/verb/open_discord() @@ -197,6 +197,6 @@ Any-Mode: (hotkey doesn't need to be on) if (url_link) send_link(src, url_link) else - to_chat(src, span("danger", "An error occured retreiving the invite.")) + to_chat(src, SPAN_DANGER("An error occured retreiving the invite.")) else - to_chat(src, span("warning", "The serverside Discord bot is not set up.")) + to_chat(src, SPAN_WARNING("The serverside Discord bot is not set up.")) diff --git a/interface/skin.dmf b/interface/skin.dmf index 7796e8d0617..5cd9c58feea 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -1394,3 +1394,27 @@ window "text_editor" saved-params = "" multi-line = true +window "preferences_window" + elem "preferences_window" + type = MAIN + pos = 281,0 + size = 1200x800 + anchor1 = none + anchor2 = none + is-visible = false + saved-params = "pos;size;is-minimized;is-maximized" + statusbar = false + elem "preferences_browser" + type = BROWSER + pos = 0,0 + size = 1000x800 + anchor1 = 0,0 + anchor2 = 80,100 + saved-params = "" + elem "character_preview_map" + type = MAP + pos = 1000,0 + size = 200x800 + anchor1 = 80,0 + anchor2 = 100,100 + right-click = false \ No newline at end of file diff --git a/maps/_common/areas/special.dm b/maps/_common/areas/special.dm index 6ef5cbe0149..9cbc0b454ca 100644 --- a/maps/_common/areas/special.dm +++ b/maps/_common/areas/special.dm @@ -254,6 +254,17 @@ name = "Kataphract Chapter - Hull" icon_state = "blue" +/area/burglar_base + name = "Burglar Base" + icon_state = "yellow" + requires_power = FALSE + no_light_control = TRUE + +/area/burglar_base/pod + name = "Burglar Pod" + base_turf = /turf/space + flags = SPAWN_ROOF + /area/skipjack_station name = "Skipjack" icon_state = "yellow" diff --git a/maps/_common/mapsystem/map.dm b/maps/_common/mapsystem/map.dm index 4dde40d85b3..dc916c67040 100644 --- a/maps/_common/mapsystem/map.dm +++ b/maps/_common/mapsystem/map.dm @@ -66,6 +66,7 @@ var/lobby_icon // The icon which contains the lobby image(s) var/list/lobby_screens = list("title") // The list of lobby screen to pick() from. If left unset the first icon state is always selected. + var/lobby_transitions = FALSE // If a number, transition between the lobby screens with this delay instead of picking just one. var/use_overmap = FALSE //If overmap should be used (including overmap space travel override) var/overmap_size = 20 //Dimensions of overmap zlevel if overmap is used. diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index b83b149bf06..855560b6544 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -2493,7 +2493,7 @@ /area/syndicate_mothership/control) "akn" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1213; name = "Syndicate Ops Intercom"; @@ -2558,10 +2558,10 @@ /area/syndicate_mothership/elite_squad) "akz" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1213; - listening = 0; + listening = FALSE; name = "Syndicate Ops Intercom"; pixel_y = 28; subspace_transmission = 1; @@ -4220,7 +4220,7 @@ "apv" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/vending/boozeomat{ - products = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 12, /obj/item/reagent_containers/food/drinks/ice = 12, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 6, /obj/item/reagent_containers/food/drinks/bottle/tequilla = 6, /obj/item/reagent_containers/food/drinks/bottle/champagne = 2, /obj/item/reagent_containers/food/drinks/bottle/vodka = 6, /obj/item/reagent_containers/food/drinks/bottle/rum = 6, /obj/item/reagent_containers/food/drinks/bottle/wine = 6, /obj/item/reagent_containers/food/drinks/bottle/cognac = 6, /obj/item/reagent_containers/food/drinks/bottle/victorygin = 6, /obj/item/reagent_containers/food/drinks/bottle/boukha = 6, /obj/item/reagent_containers/food/drinks/bottle/small/beer = 12, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 6, /obj/item/reagent_containers/food/drinks/bottle/brandy = 6, /obj/item/reagent_containers/food/drinks/bottle/sarezhiwine = 6); + products = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 12, /obj/item/reagent_containers/food/drinks/ice = 12, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 6, /obj/item/reagent_containers/food/drinks/bottle/tequila = 6, /obj/item/reagent_containers/food/drinks/bottle/champagne = 2, /obj/item/reagent_containers/food/drinks/bottle/vodka = 6, /obj/item/reagent_containers/food/drinks/bottle/rum = 6, /obj/item/reagent_containers/food/drinks/bottle/wine = 6, /obj/item/reagent_containers/food/drinks/bottle/cognac = 6, /obj/item/reagent_containers/food/drinks/bottle/victorygin = 6, /obj/item/reagent_containers/food/drinks/bottle/boukha = 6, /obj/item/reagent_containers/food/drinks/bottle/small/beer = 12, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 6, /obj/item/reagent_containers/food/drinks/bottle/brandy = 6, /obj/item/reagent_containers/food/drinks/bottle/sarezhiwine = 6); random_itemcount = 1; req_access = list(); restock_items = 1 @@ -6111,10 +6111,10 @@ /area/centcom/specops) "avV" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -6478,7 +6478,7 @@ name = "Hull Door Control" }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; name = "Spec Ops Intercom"; @@ -7643,10 +7643,10 @@ dir = 8 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1443; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -7919,10 +7919,10 @@ /area/centcom/specops) "azU" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -11634,11 +11634,11 @@ "aIJ" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 2; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -6 }, /turf/unsimulated/floor{ @@ -15685,7 +15685,7 @@ /obj/item/clothing/mask/smokable/pipe/cobpipe, /obj/item/clothing/mask/smokable/pipe, /obj/item/flame/lighter/zippo, -/obj/item/storage/fancy/cigar, +/obj/item/storage/fancy/cigarettes/cigar, /turf/unsimulated/floor{ name = "plating"; icon_state = "cult" @@ -17556,7 +17556,7 @@ pixel_x = 2; premium = list(); prices = list(); - products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/random = 4, /obj/item/storage/fancy/cigar = 5, /obj/item/storage/fancy/cigarettes/acmeco = 5) + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/random = 4, /obj/item/storage/fancy/cigarettes/cigar = 5, /obj/item/storage/fancy/cigarettes/acmeco = 5) }, /turf/simulated/floor/lino/grey, /area/merchant_station) @@ -17994,6 +17994,9 @@ icon_state = "0,2" }, /area/shuttle/distress/centcom) +"bhr" = ( +/turf/unsimulated/wall/darkshuttlewall, +/area/burglar_base/pod) "bhH" = ( /turf/unsimulated/floor/plating, /turf/simulated/wall/shuttle/unique/hapt{ @@ -18070,6 +18073,21 @@ /obj/effect/decal/cleanable/dirt, /turf/unsimulated/floor/plating, /area/centcom/legion/hangar5) +"blS" = ( +/obj/structure/window/reinforced/crescent{ + dir = 8 + }, +/obj/structure/window/reinforced/crescent{ + dir = 1 + }, +/obj/effect/floor_decal/corner_wide/red/full{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/unsimulated/floor, +/area/burglar_base) "blX" = ( /obj/structure/table/standard, /obj/item/stack/medical/advanced/bruise_pack, @@ -18719,6 +18737,16 @@ icon_state = "engine" }, /area/centcom/legion/hangar5) +"cnZ" = ( +/obj/item/folder{ + pixel_y = 2 + }, +/obj/structure/table/glass, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "coC" = ( /obj/structure/sign/greencross{ name = "Emergency Room" @@ -18931,6 +18959,15 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/grass/alt, /area/centcom/shared_dream) +"cAN" = ( +/obj/structure/closet/crate, +/obj/item/gun/custom_ka/frame01/illegal, +/obj/item/gun/custom_ka/frame01/illegal, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "cCe" = ( /obj/structure/shuttle_part/hapt{ desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; @@ -19076,6 +19113,16 @@ /obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled/dark, /area/shuttle/administration/centcom) +"cIa" = ( +/obj/structure/window/reinforced/crescent{ + dir = 1 + }, +/obj/structure/window/reinforced/crescent, +/obj/effect/floor_decal/corner_wide/red{ + dir = 5 + }, +/turf/unsimulated/floor, +/area/burglar_base) "cJl" = ( /obj/structure/shuttle_part/transfer{ desc = "A large, bloated shuttle designed for automated passenger transport."; @@ -19330,10 +19377,11 @@ /area/shuttle/escape/centcom) "cZH" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ + checks_for_access = 1; frequency = 1380; id_tag = "arrival_shuttle"; pixel_y = -25; - req_one_access = list(13); + req_one_access = list(101); tag_door = "arrival_shuttle_hatch" }, /turf/simulated/floor/shuttle/dark_blue, @@ -19538,6 +19586,13 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/ramp/bottom, /area/merchant_station/warehouse) +"dqJ" = ( +/obj/machinery/light, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "dqP" = ( /turf/simulated/wall/shuttle/unique/raider{ desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands."; @@ -19676,6 +19731,11 @@ icon_state = "6,0" }, /area/shuttle/distress/centcom) +"dDK" = ( +/obj/structure/table/reinforced/steel, +/obj/item/storage/fancy/tray, +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "dEX" = ( /obj/structure/closet/secure_closet/merchant, /turf/simulated/floor/tiled/dark, @@ -19843,7 +19903,7 @@ }, /area/shuttle/distress/centcom) "dNm" = ( -/obj/item/storage/fancy/cigar{ +/obj/item/storage/fancy/cigarettes/cigar{ layer = 3.01; pixel_x = -5; pixel_y = 6 @@ -19857,6 +19917,9 @@ icon_state = "wood_light" }, /area/centcom/legion/hangar5) +"dOH" = ( +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "dPt" = ( /obj/structure/flora/pottedplant/random, /turf/unsimulated/floor{ @@ -20089,6 +20152,16 @@ icon_state = "5,10" }, /area/supply/dock) +"ead" = ( +/obj/structure/window/reinforced/crescent{ + dir = 4 + }, +/obj/structure/window/reinforced/crescent, +/obj/machinery/vending/sovietsoda{ + name = "Syndicate-Sponsored BODA" + }, +/turf/simulated/floor/carpet, +/area/burglar_base) "eby" = ( /turf/simulated/wall/shuttle/unique/tcfl{ icon_state = "15,2" @@ -20132,6 +20205,11 @@ icon_state = "wood" }, /area/centcom/distress_prep) +"ein" = ( +/turf/simulated/wall/shuttle/dark/corner/underlay{ + dir = 6 + }, +/area/burglar_base/pod) "eiw" = ( /turf/unsimulated/wall/fakepdoor{ dir = 4 @@ -20334,6 +20412,17 @@ name = "Skipjack" }, /area/skipjack_station/start) +"ezR" = ( +/obj/structure/bed/chair/office/bridge/generic{ + desc = "Looks suspiciously comfortable."; + dir = 8; + name = "bolted chair" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "eAT" = ( /turf/simulated/wall/shuttle/unique/mercenary{ icon_state = "10,22" @@ -20423,6 +20512,10 @@ /obj/effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/distress_prep) +"eMY" = ( +/obj/machinery/computer/shuttle_control/multi/burglar, +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "eNz" = ( /turf/simulated/wall/shuttle/unique/raider{ desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands."; @@ -20465,6 +20558,18 @@ /obj/structure/bedsheetbin, /turf/simulated/floor/wood, /area/skipjack_station/start) +"ePN" = ( +/obj/structure/window/reinforced/crescent{ + dir = 1 + }, +/obj/structure/window/reinforced/crescent{ + dir = 4 + }, +/obj/effect/floor_decal/corner_wide/red/full{ + dir = 1 + }, +/turf/unsimulated/floor, +/area/burglar_base) "ePR" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -21039,6 +21144,11 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/administration/centcom) +"ftj" = ( +/turf/simulated/wall/shuttle/dark/corner/underlay{ + dir = 5 + }, +/area/burglar_base/pod) "ftu" = ( /obj/structure/shuttle_part/raider{ desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands."; @@ -21104,6 +21214,23 @@ name = "autoshuttle" }, /area/shuttle/arrival/centcom) +"fwV" = ( +/turf/simulated/wall/shuttle/dark/corner/underlay{ + dir = 9 + }, +/area/burglar_base/pod) +"fze" = ( +/obj/structure/window/reinforced/crescent{ + dir = 8 + }, +/obj/structure/window/reinforced/crescent, +/obj/machinery/vending/zora{ + name = "Syndicate-Sponsored Zo'ra Soda"; + prices = list() + }, +/obj/machinery/light, +/turf/simulated/floor/carpet/blue, +/area/burglar_base) "fzh" = ( /turf/simulated/wall/shuttle/unique/transfer{ desc = "A large, bloated shuttle designed for automated passenger transport."; @@ -21298,6 +21425,16 @@ dir = 8 }, /area/centcom/living) +"fQl" = ( +/obj/structure/table/rack, +/obj/item/device/camera{ + desc = "A polaroid camera. This one has 'Petr' scribbled into the casing." + }, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "fQE" = ( /turf/simulated/wall/shuttle/unique/raider{ desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands."; @@ -21596,6 +21733,14 @@ icon_state = "floor-shuttle" }, /area/centcom/legion) +"glm" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/grille, +/turf/unsimulated/floor/plating, +/area/burglar_base) "glx" = ( /obj/machinery/light/small{ dir = 8 @@ -21977,6 +22122,10 @@ }, /turf/space, /area/syndicate_station/start) +"gEt" = ( +/obj/machinery/optable, +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "gEu" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -22331,6 +22480,17 @@ icon_state = "0,10" }, /area/supply/dock) +"hat" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/unsimulated/floor/plating, +/area/burglar_base) "hau" = ( /turf/simulated/wall/shuttle/unique/distress{ icon_state = "8,4" @@ -22998,11 +23158,11 @@ pixel_y = 32 }, /obj/structure/table/standard, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ layer = 3.01; pixel_y = 1 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ layer = 3.01; pixel_x = 6; pixel_y = 1 @@ -23476,6 +23636,15 @@ icon_state = "dark" }, /area/centcom/legion/hangar5) +"iot" = ( +/obj/structure/sign/double/map/left{ + pixel_y = 32 + }, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "ioS" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southright, @@ -24027,7 +24196,7 @@ /obj/item/melee/energy/sword/knife, /obj/item/melee/telebaton, /obj/item/device/megaphone, -/obj/item/storage/fancy/cigar, +/obj/item/storage/fancy/cigarettes/cigar, /obj/item/flame/lighter/zippo, /obj/item/reagent_containers/food/drinks/bottle/victorygin, /obj/item/reagent_containers/food/drinks/bottle/whiskey, @@ -24228,6 +24397,14 @@ name = "military corvette" }, /area/shuttle/administration/centcom) +"jne" = ( +/obj/structure/table/rack, +/obj/item/storage/belt/utility/very_full, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "jnf" = ( /turf/simulated/wall/shuttle/unique/tcfl{ icon_state = "1,6" @@ -24241,6 +24418,10 @@ icon_state = "dark" }, /area/centcom/distress_prep) +"jnL" = ( +/obj/effect/wingrille_spawn/reinforced, +/turf/unsimulated/floor/plating, +/area/burglar_base/pod) "jon" = ( /obj/machinery/door/airlock/centcom{ icon = 'icons/obj/doors/Doorcomglass.dmi'; @@ -24272,6 +24453,15 @@ }, /turf/simulated/floor/plating, /area/shuttle/merchant/start) +"jqI" = ( +/obj/item/reagent_containers/food/drinks/cans/waterbottle{ + pixel_x = -6; + pixel_y = 4 + }, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/holding) "jrk" = ( /turf/simulated/wall/shuttle/unique/merchant{ icon_state = "6,3" @@ -24559,6 +24749,16 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/transport1/centcom) +"jKQ" = ( +/obj/machinery/vending/snack{ + name = "Syndicate-Sponsored Getmore Chocolate Corp"; + prices = list() + }, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "jKW" = ( /obj/machinery/light/spot{ icon_state = "tube1"; @@ -25464,6 +25664,16 @@ name = "military corvette" }, /area/shuttle/administration/centcom) +"kXY" = ( +/obj/structure/table/rack, +/obj/item/device/camera{ + desc = "A polaroid camera. This one has 'Kismet' scribled into the casing." + }, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "kYu" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -25521,6 +25731,28 @@ }, /turf/simulated/floor/tiled, /area/merchant_station/warehouse) +"lcy" = ( +/obj/structure/table/reinforced/steel, +/obj/item/ammo_magazine/mc9mm{ + pixel_x = 2 + }, +/obj/item/ammo_magazine/mc9mm, +/obj/item/ammo_magazine/mc9mm{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/mc9mm{ + pixel_x = -4 + }, +/obj/item/gun/projectile/pistol{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/gun/projectile/pistol{ + pixel_x = -2; + pixel_y = 2 + }, +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "ldQ" = ( /turf/unsimulated/wall/darkshuttlewall, /area/centcom/legion/hangar5) @@ -25538,6 +25770,19 @@ }, /turf/space, /area/syndicate_station/start) +"lfi" = ( +/obj/structure/table/rack, +/obj/item/tank/oxygen/red, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/clothing/suit/space/syndicate/black/red, +/obj/item/clothing/head/helmet/space/syndicate/black/red, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "lfp" = ( /obj/machinery/light{ dir = 8; @@ -25729,6 +25974,17 @@ icon_state = "3,4" }, /area/shuttle/distress/centcom) +"lsh" = ( +/obj/structure/table/rack, +/obj/item/tank/oxygen/red, +/obj/machinery/light, +/obj/item/clothing/suit/space/syndicate/black/red, +/obj/item/clothing/head/helmet/space/syndicate/black/red, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "lsU" = ( /turf/unsimulated/floor/plating, /turf/simulated/wall/shuttle/unique/cargo{ @@ -25851,6 +26107,11 @@ /obj/effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/legion/hangar5) +"lBW" = ( +/turf/simulated/wall/shuttle/dark/corner/underlay{ + dir = 10 + }, +/area/burglar_base/pod) "lBZ" = ( /obj/structure/shuttle_part/mercenary{ icon_state = "6,25" @@ -25956,6 +26217,17 @@ icon_state = "wood" }, /area/centcom/legion/hangar5) +"lKr" = ( +/obj/structure/closet/crate, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/fire, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "lKB" = ( /obj/structure/table/reinforced/steel, /obj/item/spacecash/c1000{ @@ -26025,6 +26297,18 @@ icon_state = "7,12" }, /area/syndicate_station/start) +"lPu" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/effect/landmark{ + name = "burglarspawn" + }, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "lPG" = ( /obj/structure/shuttle_part/raider{ desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands."; @@ -26134,6 +26418,10 @@ }, /turf/unsimulated/floor/plating, /area/centcom/distress_prep) +"lVU" = ( +/obj/effect/shuttle_landmark/burglar/interim, +/turf/space/transit, +/area/space) "lWY" = ( /obj/structure/shuttle_part/hapt{ desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; @@ -27218,7 +27506,7 @@ dir = 8 }, /obj/machinery/turretid{ - check_anomalies = 0; + check_wildlife = 0; check_arrest = 0; check_records = 0; name = "merchant turret control panel"; @@ -27895,6 +28183,17 @@ icon_state = "dark" }, /area/centcom/legion) +"oeU" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/grille, +/turf/unsimulated/floor/plating, +/area/burglar_base) "ofD" = ( /obj/effect/decal/fake_object{ icon = 'icons/obj/mining.dmi'; @@ -27906,6 +28205,15 @@ opacity = 0 }, /area/centcom/shared_dream) +"ogh" = ( +/obj/structure/window/reinforced/crescent{ + dir = 4 + }, +/obj/effect/floor_decal/corner_wide/red{ + dir = 1 + }, +/turf/unsimulated/floor, +/area/burglar_base) "ogn" = ( /turf/simulated/wall/shuttle/unique/raider{ desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands."; @@ -28252,6 +28560,14 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/escape/centcom) +"oCy" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/grille, +/turf/unsimulated/floor/plating, +/area/burglar_base) "oCD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -28916,6 +29232,10 @@ icon_state = "0,5" }, /area/supply/dock) +"pta" = ( +/obj/machinery/computer/operating, +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "pux" = ( /obj/item/pickaxe, /turf/unsimulated/floor/asteroid/ash/rocky{ @@ -29007,6 +29327,12 @@ icon_state = "3,2" }, /area/shuttle/merchant/start) +"pDr" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_r" + }, +/turf/unsimulated/floor/plating, +/area/burglar_base/pod) "pDA" = ( /obj/structure/flora/rock/pile{ density = 0; @@ -29644,6 +29970,17 @@ icon_state = "platebot" }, /area/centcom/distress_prep) +"qxs" = ( +/obj/structure/bed/chair/office/bridge/generic{ + desc = "Looks suspiciously comfortable."; + dir = 4; + name = "bolted chair" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "qxI" = ( /turf/simulated/wall/shuttle/unique/mercenary{ icon_state = "8,2" @@ -29655,6 +29992,18 @@ }, /turf/space, /area/syndicate_station/start) +"qxQ" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/obj/effect/landmark{ + name = "burglarspawn" + }, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "qzj" = ( /obj/structure/shuttle_part/mercenary{ icon_state = "5,22" @@ -30514,6 +30863,18 @@ icon_state = "1,6" }, /area/syndicate_station/start) +"ryV" = ( +/obj/structure/window/reinforced/crescent{ + dir = 8 + }, +/obj/structure/window/reinforced/crescent{ + dir = 4 + }, +/obj/effect/floor_decal/corner_wide/red{ + dir = 9 + }, +/turf/unsimulated/floor, +/area/burglar_base) "rzy" = ( /obj/structure/bed/chair/office/bridge{ dir = 4 @@ -30574,6 +30935,17 @@ name = "military corvette" }, /area/shuttle/administration/centcom) +"rDV" = ( +/obj/machinery/door/airlock/centcom{ + name = "Shuttle"; + opacity = 1; + req_access = list(150) + }, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "rEP" = ( /obj/machinery/button/remote/blast_door{ dir = 4; @@ -30822,6 +31194,13 @@ icon_state = "beach" }, /area/centcom/shared_dream) +"rTn" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced/crescent{ + dir = 1 + }, +/turf/unsimulated/floor/plating, +/area/burglar_base/pod) "rUc" = ( /obj/machinery/door/airlock/glass_command{ name = "Cell 1"; @@ -30899,6 +31278,9 @@ icon_state = "15,7" }, /area/syndicate_station/start) +"saE" = ( +/turf/unsimulated/wall/steel, +/area/burglar_base) "sbN" = ( /obj/structure/shuttle_part/raider{ desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands."; @@ -30912,6 +31294,16 @@ icon_state = "10,8" }, /area/shuttle/merchant/start) +"scA" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/grille, +/turf/unsimulated/floor/plating, +/area/burglar_base) "scL" = ( /obj/structure/shuttle_part/mercenary{ icon_state = "9,1" @@ -31395,6 +31787,17 @@ }, /turf/unsimulated/wall/darkshuttlewall, /area/centcom/legion/hangar5) +"sOh" = ( +/obj/machinery/vending/cigarette{ + name = "Syndicate-Sponsored cigarette machine"; + prices = list(); + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + }, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "sOJ" = ( /turf/unsimulated/floor/plating, /turf/simulated/wall/shuttle/unique/cargo{ @@ -31720,6 +32123,12 @@ /obj/structure/bed/chair/office/bridge/legion, /turf/simulated/floor/shuttle/black, /area/shuttle/legion/centcom) +"tfa" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_l" + }, +/turf/unsimulated/floor/plating, +/area/burglar_base/pod) "tfb" = ( /obj/structure/shuttle_part/merchant{ icon_state = "14,8" @@ -31964,6 +32373,16 @@ }, /turf/simulated/floor/tiled, /area/merchant_station/warehouse) +"twB" = ( +/obj/machinery/vending/cola{ + name = "Syndicate-Sponsored Robust Softdrinks"; + prices = list() + }, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "tym" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket{ @@ -31974,6 +32393,17 @@ dir = 1 }, /area/centcom/control) +"tyS" = ( +/obj/structure/table/reinforced/steel, +/obj/item/card/emag{ + pixel_y = 2 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_y = -10; + pixel_x = 2 + }, +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "tAQ" = ( /obj/machinery/door/blast/odin{ density = 0; @@ -32068,6 +32498,16 @@ icon_state = "wood_light" }, /area/centcom/legion/hangar5) +"tHp" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/grille, +/turf/unsimulated/floor/plating, +/area/burglar_base) "tHS" = ( /obj/structure/closet/crate/secure/legion, /obj/item/storage/belt/security/tactical, @@ -32754,6 +33194,13 @@ }, /turf/space, /area/skipjack_station/start) +"uDS" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "uEQ" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -33276,6 +33723,12 @@ icon_state = "floor" }, /area/centcom/checkpoint/aft) +"viy" = ( +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "viR" = ( /turf/simulated/wall/shuttle/unique/mercenary{ icon_state = "3,12" @@ -33745,6 +34198,19 @@ icon_state = "dark" }, /area/centcom/legion) +"vHw" = ( +/obj/structure/window/reinforced/crescent{ + dir = 1 + }, +/obj/structure/window/reinforced/crescent, +/obj/structure/window/reinforced/crescent{ + dir = 4 + }, +/obj/effect/floor_decal/corner_wide/red{ + dir = 5 + }, +/turf/unsimulated/floor, +/area/burglar_base) "vIS" = ( /obj/structure/shuttle_part/mercenary{ icon_state = "0,10" @@ -34067,6 +34533,18 @@ icon_state = "floor" }, /area/centcom/legion/hangar5) +"wdS" = ( +/obj/structure/sign/double/map/right{ + pixel_y = 32 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "weO" = ( /turf/simulated/wall/shuttle/unique/mercenary{ icon_state = "7,19" @@ -34201,6 +34679,15 @@ name = "Skipjack" }, /area/skipjack_station/start) +"wpe" = ( +/obj/structure/window/reinforced/crescent{ + dir = 8 + }, +/obj/effect/floor_decal/corner_wide/red{ + dir = 4 + }, +/turf/unsimulated/floor, +/area/burglar_base) "wpg" = ( /turf/unsimulated/floor{ name = "plating"; @@ -34529,7 +35016,7 @@ /area/shuttle/transport1/centcom) "wNn" = ( /obj/machinery/porta_turret/net{ - check_anomalies = 0; + check_wildlife = 0; check_arrest = 0; check_records = 0; health = 120; @@ -34704,6 +35191,10 @@ icon_state = "engine" }, /area/centcom/legion/hangar5) +"wZK" = ( +/obj/effect/shuttle_landmark/burglar/start, +/turf/simulated/floor/carpet/rubber, +/area/burglar_base/pod) "xbK" = ( /obj/structure/shuttle_part/transfer{ desc = "A large, bloated shuttle designed for automated passenger transport."; @@ -34732,6 +35223,10 @@ icon_state = "wood_light" }, /area/centcom/legion/hangar5) +"xdj" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/unsimulated/floor/plating, +/area/burglar_base/pod) "xgn" = ( /obj/structure/window/reinforced{ dir = 8 @@ -35554,6 +36049,18 @@ }, /turf/simulated/floor/plating, /area/shuttle/merchant/start) +"yjl" = ( +/obj/structure/window/reinforced/crescent{ + dir = 8 + }, +/obj/structure/window/reinforced/crescent{ + dir = 4 + }, +/obj/effect/floor_decal/corner_wide/red{ + dir = 6 + }, +/turf/unsimulated/floor, +/area/burglar_base) "yjn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/curtain/open/shower, @@ -35642,26 +36149,26 @@ aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -35899,26 +36406,26 @@ aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -36152,30 +36659,30 @@ aax aaq aaq aaq -aaq -aaq +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax aaq aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -36409,30 +36916,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -36666,30 +37173,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -36923,30 +37430,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -37180,30 +37687,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -37437,30 +37944,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -37694,30 +38201,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -37951,30 +38458,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -38208,30 +38715,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -38465,30 +38972,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -38722,30 +39229,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +lVU +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -38979,30 +39486,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -39236,30 +39743,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -39493,30 +40000,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -39750,30 +40257,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -40007,30 +40514,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -40264,30 +40771,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -40521,30 +41028,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -40778,30 +41285,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -41035,30 +41542,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -41292,30 +41799,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -41549,30 +42056,30 @@ aax aaq aaq aaq +aax aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aax +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -41806,30 +42313,30 @@ aax aaq aaq aaq -aaq -aaq +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax +aax aaq aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -42067,26 +42574,26 @@ aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -42324,26 +42831,26 @@ aaq aaq aaq aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq bJl bJl -bJl -bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -42585,22 +43092,22 @@ bJl bJl bJl bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl aaM aaM aaM @@ -42842,22 +43349,22 @@ bJl bJl bJl bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl aaM aaM aaM @@ -43099,22 +43606,22 @@ bJl bJl bJl bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl aaM aaM aaM @@ -43356,22 +43863,22 @@ bJl bJl bJl bJl -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl +bJl aaM aaM aaM @@ -59310,24 +59817,24 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ aaM aaM aaM @@ -59567,6 +60074,7 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM @@ -59583,8 +60091,7 @@ aaM aaM aaM aaM -aaM -aaM +aDQ aaM aaM aaM @@ -59824,6 +60331,7 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM @@ -59840,8 +60348,7 @@ aaM aaM aaM aaM -aaM -aaM +aDQ aaM aaM aaM @@ -60081,6 +60588,7 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM @@ -60097,8 +60605,7 @@ aaM aaM aaM aaM -aaM -aaM +aDQ aaM aaM aaM @@ -60338,24 +60845,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM aaM +scA +tHp +tHp +tHp +tHp +tHp +oCy aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -60595,24 +61102,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM aaM +glm +kXY +viy +lPu +viy +fQl +glm aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -60852,24 +61359,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM aaM +glm +lfi +viy +cnZ +viy +lsh +glm aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -61109,24 +61616,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM aaM +hat +jne +viy +qxQ +viy +jne +oeU aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -61366,24 +61873,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM aaM +saE +uDS +viy +viy +viy +uDS +saE aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -61623,24 +62130,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM aaM +saE +iot +viy +viy +viy +viy +saE aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -61880,24 +62387,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM aaM +saE +wdS +viy +viy +viy +dqJ +saE aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -62137,24 +62644,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM aaM +saE +jKQ +viy +viy +twB +sOh +saE aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -62394,24 +62901,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM aaM +saE +saE +rDV +saE +saE +saE +saE aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -62651,6 +63158,15 @@ aaM aaM aaM aaM +aDQ +aaM +aaM +aaM +aaM +aaM +aaM +aaM +cIa aaM aaM aaM @@ -62659,16 +63175,7 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -62908,6 +63415,7 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM @@ -62915,17 +63423,16 @@ aaM aaM aaM aaM +ePN +yjl +yjl +yjl +yjl +wpe +fze aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -63165,24 +63672,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM aaM aaM +blS +ryV +ryV +ryV +ryV +ryV +ogh +ead aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -63422,6 +63929,14 @@ aaM aaM aaM aaM +aDQ +aaM +aaM +aaM +aaM +aaM +aaM +vHw aaM aaM aaM @@ -63431,15 +63946,7 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -63679,24 +64186,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM +fwV +bhr +jnL +jnL +jnL +jnL +bhr +bhr +lBW aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -63936,24 +64443,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM +bhr +qxs +dOH +tyS +dDK +dOH +cAN +rTn +tfa aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -64193,24 +64700,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM +jnL +eMY +wZK +dOH +dOH +dOH +lcy +rTn +xdj aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -64450,24 +64957,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM +bhr +ezR +dOH +pta +gEt +dOH +lKr +rTn +pDr aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -64707,24 +65214,24 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM aaM +ftj +bhr +jnL +jnL +jnL +jnL +bhr +bhr +ein aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ aaM aaM aaM @@ -64964,6 +65471,7 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM @@ -64980,8 +65488,7 @@ aaM aaM aaM aaM -aaM -aaM +aDQ aaM aaM aaM @@ -65221,6 +65728,7 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM @@ -65237,8 +65745,7 @@ aaM aaM aaM aaM -aaM -aaM +aDQ aaM aaM aaM @@ -65478,6 +65985,7 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM @@ -65494,8 +66002,7 @@ aaM aaM aaM aaM -aaM -aaM +aDQ aaM aaM aaM @@ -65735,6 +66242,7 @@ aaM aaM aaM aaM +aDQ aaM aaM aaM @@ -65751,8 +66259,7 @@ aaM aaM aaM aaM -aaM -aaM +aDQ aaM aaM aaM @@ -65992,24 +66499,24 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ +aDQ aaM aaM aaM @@ -71516,7 +72023,7 @@ aOS aCq aMQ aCo -aCo +jqI aCo aQM aIv diff --git a/maps/aurora/aurora-2_under-station.dmm b/maps/aurora/aurora-2_under-station.dmm index 11faa392679..d541caecc1a 100644 --- a/maps/aurora/aurora-2_under-station.dmm +++ b/maps/aurora/aurora-2_under-station.dmm @@ -316,6 +316,10 @@ /obj/structure/lattice/catwalk, /turf/template_noop, /area/engineering/cooling) +"Q" = ( +/obj/effect/shuttle_landmark/burglar/under, +/turf/template_noop, +/area/template_noop) (1,1,1) = {" a @@ -9173,7 +9177,7 @@ a a a a -a +Q a a a diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index dec2986cfd1..b5f956d0f01 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -6701,7 +6701,7 @@ pixel_x = -27 }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = -27 }, @@ -7520,7 +7520,7 @@ /area/turret_protected/ai) "aou" = ( /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = 19 }, @@ -8313,7 +8313,7 @@ pixel_x = -27 }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = 19 }, diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 6fcf3fea95d..ce9f10143d2 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -492,8 +492,8 @@ "aba" = ( /obj/structure/flora/pottedplant/random, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled/dark, /area/security/vacantoffice2) @@ -1098,8 +1098,8 @@ /area/maintenance/substation/security) "acp" = ( /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/terminal{ dir = 1 @@ -1497,8 +1497,8 @@ }, /obj/structure/flora/pottedplant/random, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled/dark, /area/security/vacantoffice2) @@ -1806,7 +1806,7 @@ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/spacespice, +/obj/item/reagent_containers/food/condiment/shaker/spacespice, /turf/simulated/floor/plating, /area/maintenance/vault) "adz" = ( @@ -1988,8 +1988,8 @@ icon_state = "2-4" }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner/blue/full{ dir = 8 @@ -3058,10 +3058,10 @@ initialize_directions = 1; internal_pressure_bound = 4000; internal_pressure_bound_default = 4000; - use_power = 1; pressure_checks = 2; pressure_checks_default = 2; - pump_direction = 0 + pump_direction = 0; + use_power = 1 }, /turf/simulated/floor/bluegrid{ name = "Server Base"; @@ -3335,9 +3335,9 @@ /area/security/brig) "agl" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1449; - listening = 0; + listening = FALSE; pixel_x = 27 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -3426,8 +3426,8 @@ name = "Evidence Closet" }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled{ name = "cooled floor"; @@ -4466,8 +4466,8 @@ icon_state = "1-2" }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner/blue{ dir = 9 @@ -5056,8 +5056,8 @@ pixel_x = -24 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/machinery/power/sensor{ name = "Powernet Sensor - Master Grid"; @@ -6075,10 +6075,10 @@ /area/maintenance/atmos_control) "alt" = ( /obj/machinery/power/smes/buildable{ + RCon_tag = "Substation - Atmospherics"; charge = 2e+006; input_attempt = 1; - output_attempt = 1; - RCon_tag = "Substation - Atmospherics" + output_attempt = 1 }, /obj/structure/cable/green, /turf/simulated/floor/plating, @@ -6782,8 +6782,8 @@ dir = 4 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/maintenance/engineering) @@ -7715,17 +7715,17 @@ /area/engineering/engine_room) "aoC" = ( /obj/machinery/power/smes/buildable{ + RCon_tag = "Supermatter - Grid"; charge = 1e+007; cur_coils = 4; input_attempt = 1; input_level = 500000; output_attempt = 1; - output_level = 500000; - RCon_tag = "Supermatter - Grid" + output_level = 500000 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/engineering/engine_smes) @@ -8470,8 +8470,8 @@ /area/engineering/engine_smes) "apV" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Camera Corridor 4"; @@ -8874,8 +8874,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 2 + dir = 2; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled, /area/security/brig) @@ -9049,8 +9049,8 @@ /area/bridge) "aqX" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera/network/engine{ c_tag = "Engineering - Engine Fore"; @@ -9682,8 +9682,8 @@ "arZ" = ( /obj/structure/table/wood, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/alarm{ pixel_y = 28 @@ -9882,13 +9882,13 @@ /area/engineering/engine_room) "asu" = ( /obj/machinery/power/smes/buildable{ + RCon_tag = "Supermatter - Containment"; charge = 2e+006; input_attempt = 1; input_level = 100000; is_critical = 1; output_attempt = 1; - output_level = 200000; - RCon_tag = "Supermatter - Containment" + output_level = 200000 }, /obj/structure/cable/orange{ icon_state = "0-2" @@ -10285,8 +10285,8 @@ dir = 4 }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 2 + dir = 2; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled, /area/security/brig) @@ -10887,8 +10887,8 @@ /area/engineering/engine_room) "atO" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -11626,8 +11626,8 @@ pixel_x = -28 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera/network/command{ c_tag = "Bridge - Command Deck Port"; @@ -11698,8 +11698,8 @@ /area/bridge) "avo" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/unsimulated/floor/asteroid/ash/rocky, /area/bridge) @@ -12261,8 +12261,8 @@ dir = 9 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/firealarm/west, /turf/simulated/floor/tiled, @@ -12594,6 +12594,7 @@ dir = 9 }, /obj/structure/table/reinforced, +/obj/item/paper_scanner, /turf/simulated/floor/tiled, /area/bridge) "awV" = ( @@ -13535,8 +13536,8 @@ /area/security/prison) "ayl" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/reinforced, /area/security/brig) @@ -13907,8 +13908,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Corridor Camera 3"; @@ -14476,6 +14477,7 @@ req_access = list(7) }, /obj/effect/floor_decal/corner_wide/mauve/full, +/obj/item/paper_scanner, /turf/simulated/floor/tiled/white, /area/rnd/telesci) "azV" = ( @@ -14701,8 +14703,8 @@ req_access = list(10) }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -15018,8 +15020,8 @@ RCon_tag = "Substation - Engineering Main" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable/green{ d2 = 8; @@ -15847,8 +15849,8 @@ dir = 1 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering) @@ -16065,6 +16067,7 @@ info = "\[center]\[Large]\[b]NSS Exodus\[/b]\[/large]\[br] \[small]Armoury Inventory\[/small]\[/center] \[hr] \[hr] \[br] \[b]Weaponry\[/b]\[br] \[field] Energy Gun(s)\[br] \[field] Laser Gun(s)\[br] \[field] Ion Rifle(s)\[br] \[field] Combat Shotgun(s) \[hr] \[b]Armour\[/b]\[br] \[field] Bulletproof Vest(s)\[br] \[field] Abalative Vest(s)\[br] \[field] Biohazard Suit(s)\[br] \[field] Bomb Suit(s) \[hr] \[b]Auxiliary Equipment\[/b]\[br] \[field] Gasmask(s)\[br] \[field] box(es) of Flashbangs\[br] \[field] box(es) of Handcuffs\[br] \[field] box(es) of R.O.B.U.S.T. Cartridges \[hr] \[b]Riot Equipment\[/b]\[br] \[field] Stun Baton(s)\[br] \[field] Riot Suit(s)\[br] \[field] Riot Shield(s) \[hr] \[b]Tactical Equipment\[/b]\[br] \[field] Tactical Armour(s)\[br] \[field] Tactical Helmet(s)\[br] \[field] Tactical Jumpsuit(s)\[br] \[field] Green Balaclava(s)\[br] \[field] Tactical HUD(s)\[br] \[field] Combat Belt(s)\[br] \[field] Black Glove(s)\[br] \[field] Jackboot(s) \[hr] \[b]Implants\[/b]\[br] \[field] Tracking Implant Box(es)\[br] \[field] Chemical Implant Box(es) \[hr] \[b]Defense Systems\[/b]\[br] \[field] Deployable Barrier(s)\[br] \[field] Portable Flasher(s) \[hr] \[b]Other\[/b]\[br] \[field] Holobadge Box(es) \[hr] \[b]\[center]Warden's's Signature:\[/b] \[field]\[/center] \[hr]"; name = "Armory Inventory" }, +/obj/item/paper_scanner, /turf/simulated/floor/tiled, /area/security/warden) "aCA" = ( @@ -16727,8 +16730,8 @@ "aDA" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera/network/engine{ c_tag = "Engineering - Engine Aft"; @@ -17009,8 +17012,8 @@ /area/ai_monitored/storage/eva) "aEd" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera/network/security{ c_tag = "Security - Camera Corridor 5"; @@ -17321,8 +17324,8 @@ dir = 8 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, @@ -17618,8 +17621,8 @@ /area/teleporter) "aEY" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/fullgrass, @@ -18196,8 +18199,8 @@ dir = 9 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) @@ -19005,7 +19008,7 @@ /area/crew_quarters/captain) "aHf" = ( /obj/structure/table/wood, -/obj/item/storage/fancy/cigar, +/obj/item/storage/fancy/cigarettes/cigar, /obj/item/flame/lighter/zippo, /obj/item/hand_tele, /obj/item/device/radio/intercom{ @@ -19112,8 +19115,8 @@ /area/crew_quarters/captain) "aHp" = ( /obj/machinery/atmospherics/valve/digital{ - name = "Emergency Cooling Valve 2"; - dir = 1 + dir = 1; + name = "Emergency Cooling Valve 2" }, /turf/simulated/floor/plating, /area/engineering/engine_room) @@ -19924,8 +19927,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera/network/security{ c_tag = "Security - Corridor Camera 3"; @@ -20161,8 +20164,8 @@ pixel_y = 3 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/alarm{ dir = 4; @@ -20790,8 +20793,8 @@ pixel_x = -32 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) @@ -21098,6 +21101,10 @@ network = list("Capt_Office"); pixel_y = 30 }, +/obj/item/paper_scanner{ + pixel_x = 6; + pixel_y = -2 + }, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "aKH" = ( @@ -21940,8 +21947,8 @@ pixel_x = -32 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner_wide/paleblue/diagonal, /turf/simulated/floor/tiled/white, @@ -22567,8 +22574,8 @@ pixel_x = -32 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera/network/security{ c_tag = "Security - Head of Security's Office"; @@ -22759,8 +22766,8 @@ /area/security/prison) "aNx" = ( /obj/machinery/cryopod{ - icon_state = "body_scanner_0"; - dir = 4 + dir = 4; + icon_state = "body_scanner_0" }, /turf/simulated/floor/tiled/white, /area/security/prison) @@ -23656,6 +23663,7 @@ }, /obj/structure/table/standard, /obj/item/folder/sec, +/obj/item/paper_scanner, /turf/simulated/floor/tiled, /area/security/brig) "aPg" = ( @@ -23685,8 +23693,8 @@ pixel_y = 5 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera/network/security{ c_tag = "Security - Communal Bathroom"; @@ -23700,8 +23708,8 @@ /area/security/prison) "aPk" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/cryofeed{ dir = 4 @@ -24284,6 +24292,9 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen, +/obj/item/paper_scanner{ + pixel_x = 8 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/chief) "aQh" = ( @@ -24392,8 +24403,8 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/sortjunction{ - sortType = "CE Office"; - name = "CE Office" + name = "CE Office"; + sortType = "CE Office" }, /turf/simulated/floor/tiled, /area/engineering/foyer) @@ -24567,6 +24578,7 @@ pixel_x = 5; pixel_y = -30 }, +/obj/item/paper_scanner, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "aQI" = ( @@ -25795,8 +25807,8 @@ /area/journalistoffice) "aSF" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/wood, /area/journalistoffice) @@ -26777,6 +26789,9 @@ d2 = 4; icon_state = "2-4" }, +/obj/item/paper_scanner{ + pixel_x = -8 + }, /turf/simulated/floor/carpet, /area/journalistoffice) "aUq" = ( @@ -27347,8 +27362,8 @@ /obj/structure/window/reinforced, /obj/machinery/door/firedoor, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) @@ -27368,8 +27383,8 @@ icon_state = "0-8" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) @@ -27409,8 +27424,8 @@ icon_state = "0-8" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/ai_monitored/storage/eva) @@ -27593,6 +27608,10 @@ "aVG" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/laptop/preset/command/hop, +/obj/item/paper_scanner{ + pixel_x = 4; + pixel_y = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "aVH" = ( @@ -28859,8 +28878,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera/network/civilian_main{ c_tag = "Port Corridor - Camera 2"; @@ -31325,8 +31344,8 @@ /area/maintenance/substation/command) "bcv" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) @@ -31876,8 +31895,8 @@ pixel_x = -32 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, @@ -32327,8 +32346,8 @@ pixel_x = -32 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/cryo) @@ -32640,8 +32659,8 @@ /area/hallway/primary/central_one) "beQ" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/cable/green{ d1 = 1; @@ -32778,6 +32797,7 @@ pixel_x = 5; pixel_y = -4 }, +/obj/item/paper_scanner, /turf/simulated/floor/carpet/blue, /area/medical/exam_room{ name = "\improper Medical - Exam Room 2" @@ -32998,8 +33018,8 @@ /area/bridge/meeting_room) "bfA" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/alarm{ dir = 4; @@ -35639,8 +35659,8 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 4 + dir = 4; + icon_state = "pipe-j2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -36570,6 +36590,9 @@ pixel_y = 6 }, /obj/item/pen, +/obj/item/paper_scanner{ + pixel_x = 6 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "blG" = ( @@ -37936,6 +37959,7 @@ dir = 4 }, /obj/structure/table/standard, +/obj/item/paper_scanner, /turf/simulated/floor/carpet/blue, /area/medical/exam_room{ name = "\improper Medical - Exam Room 1" @@ -38301,8 +38325,8 @@ /area/bridge) "boN" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -38518,8 +38542,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/assembly/robotics) @@ -38559,8 +38583,8 @@ /area/assembly/robotics) "bpj" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/closet/firecloset, /turf/simulated/floor/tiled, @@ -38597,8 +38621,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/bed/chair/plastic{ dir = 4 @@ -38665,8 +38689,8 @@ /area/medical/reception) "bpx" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner_wide/lime{ dir = 1 @@ -40225,8 +40249,8 @@ pixel_x = -24 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/table/rack, /obj/random/loot, @@ -42598,8 +42622,8 @@ icon_state = "1-2" }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) @@ -42965,8 +42989,8 @@ dir = 1 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/bridge) @@ -43396,8 +43420,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled/white, /area/medical/medbay) @@ -43472,8 +43496,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner_wide/lime{ @@ -43660,6 +43684,10 @@ /obj/item/device/eftpos{ eftpos_name = "Research EFTPOS scanner" }, +/obj/item/paper_scanner{ + pixel_x = -6; + pixel_y = 4 + }, /turf/simulated/floor/carpet/blue, /area/rnd/rdoffice) "bzD" = ( @@ -44166,8 +44194,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/carpet/blue, /area/rnd/rdoffice) @@ -44442,8 +44470,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/bed/roller, /obj/effect/floor_decal/corner_wide/lime{ @@ -45020,12 +45048,12 @@ "bCu" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/requests_console{ - name = "Research Director RC"; - pixel_x = -2; - pixel_y = -30; + announcementConsole = 1; department = "Research Director's Desk"; departmentType = 5; - announcementConsole = 1 + name = "Research Director RC"; + pixel_x = -2; + pixel_y = -30 }, /turf/simulated/floor/tiled/white, /area/rnd/rdoffice) @@ -45287,8 +45315,8 @@ }, /obj/structure/cable/green, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled/white, /area/medical/surgerywing) @@ -46025,8 +46053,8 @@ pixel_x = -25 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/structure/closet/secure_closet/personal/patient, /obj/effect/floor_decal/corner_wide/lime{ @@ -47686,7 +47714,7 @@ }, /obj/machinery/door/firedoor, /obj/structure/table/reinforced, -/obj/item/storage/fancy/cigar, +/obj/item/storage/fancy/cigarettes/cigar, /turf/simulated/floor/lino/grey, /area/crew_quarters/bar) "bIv" = ( @@ -48531,6 +48559,7 @@ req_access = list(37) }, /obj/structure/table/wood, +/obj/item/paper_scanner, /turf/simulated/floor/wood, /area/library) "bKK" = ( @@ -48828,8 +48857,8 @@ /area/library) "bLu" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/camera/network/civilian_main{ c_tag = "Aft Corridor - Camera 4"; @@ -50058,6 +50087,14 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, +/obj/item/paper_scanner{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/paper_scanner{ + pixel_x = -2; + pixel_y = -2 + }, /obj/machinery/light{ dir = 8 }, @@ -51368,8 +51405,8 @@ /area/chapel/main) "bSj" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) @@ -51586,6 +51623,7 @@ "bSD" = ( /obj/machinery/button/crematorium{ _wifi_id = "chapel_crema"; + cremate_dir = 4; pixel_x = -32; pixel_y = 25 }, @@ -52154,8 +52192,8 @@ dir = 5 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -52578,8 +52616,8 @@ /area/crew_quarters/locker/locker_toilet) "bUO" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/requests_console{ department = "Chapel"; @@ -52684,8 +52722,8 @@ dir = 9 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/computer/arcade/orion_trail, /turf/simulated/floor/wood, @@ -53436,8 +53474,8 @@ dir = 8 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -54015,6 +54053,7 @@ dir = 6 }, /obj/structure/table/standard, +/obj/item/paper_scanner, /obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 @@ -55494,8 +55533,8 @@ /area/maintenance/disposal) "cbk" = ( /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 2 + dir = 2; + icon_state = "pipe-j2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -55879,8 +55918,8 @@ /area/maintenance/bar) "ccm" = ( /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 2 + dir = 2; + icon_state = "pipe-j2" }, /turf/simulated/floor/plating, /area/maintenance/bar) @@ -56710,8 +56749,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 4 + dir = 4; + icon_state = "pipe-j2" }, /turf/simulated/floor/plating, /area/maintenance/cargo) @@ -58200,8 +58239,8 @@ dir = 9 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) @@ -58276,12 +58315,12 @@ /area/outpost/mining_main/eva) "cgT" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - tag_airpump = "mining_east_pump"; - tag_exterior_door = "mining_east_outer"; id_tag = "mining_east_airlock"; - tag_interior_door = "mining_east_inner"; pixel_y = -25; - tag_chamber_sensor = "mining_east_sensor" + tag_airpump = "mining_east_pump"; + tag_chamber_sensor = "mining_east_sensor"; + tag_exterior_door = "mining_east_outer"; + tag_interior_door = "mining_east_inner" }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; @@ -58643,8 +58682,8 @@ }, /obj/machinery/disposal, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) @@ -58977,8 +59016,8 @@ /area/outpost/mining_main/refinery) "cin" = ( /obj/effect/floor_decal/industrial/warning/dust{ - tag = "icon-warning_dust (SOUTHWEST)"; - dir = 10 + dir = 10; + tag = "icon-warning_dust (SOUTHWEST)" }, /turf/simulated/floor/tiled/asteroid/airless, /area/outpost/mining_main/eva) @@ -59041,8 +59080,8 @@ "ciI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/conveyor{ - icon_state = "conveyor-broken"; - dir = 10 + dir = 10; + icon_state = "conveyor-broken" }, /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -59829,8 +59868,8 @@ dir = 8 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -59936,10 +59975,10 @@ "erq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = -8 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = 8; pixel_y = 14 }, @@ -59968,8 +60007,8 @@ id = "qm_warehouse"; name = "Warehouse Door Control"; pixel_x = 24; - req_access = list(31); - pixel_y = 4 + pixel_y = 4; + req_access = list(31) }, /turf/simulated/floor/tiled, /area/quartermaster/storage) @@ -60753,11 +60792,11 @@ "gpm" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/stone/marble, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 4; pixel_y = 4 }, @@ -61771,8 +61810,8 @@ /area/rnd/chemistry) "iPS" = ( /obj/machinery/conveyor{ - icon_state = "conveyor-broken"; - dir = 8 + dir = 8; + icon_state = "conveyor-broken" }, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -63050,6 +63089,7 @@ dir = 6 }, /obj/structure/table/reinforced, +/obj/item/paper_scanner, /turf/simulated/floor/tiled, /area/bridge) "mlB" = ( @@ -63228,8 +63268,8 @@ }, /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 2 + dir = 2; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled/white, /area/rnd/research) @@ -64113,6 +64153,10 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) +"oGq" = ( +/obj/effect/shuttle_landmark/burglar/caverns, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine/unexplored) "oGG" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -64552,8 +64596,8 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 2 + dir = 2; + icon_state = "pipe-j2" }, /obj/effect/floor_decal/corner_wide/lime{ dir = 5 @@ -65043,8 +65087,8 @@ /area/rnd/research) "qOq" = ( /obj/machinery/conveyor{ - icon_state = "conveyor-broken"; - dir = 8 + dir = 8; + icon_state = "conveyor-broken" }, /obj/machinery/door/firedoor, /obj/structure/barricade/steel, @@ -65137,8 +65181,8 @@ pixel_y = 24 }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating, /area/maintenance/bar) @@ -65716,6 +65760,11 @@ /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/old_white, /area/maintenance/medbay) +"skc" = ( +/obj/structure/table/steel, +/obj/item/paper_scanner, +/turf/simulated/floor/carpet/rubber, +/area/rnd/misc_lab) "slK" = ( /obj/machinery/door/firedoor, /obj/machinery/door/window/eastleft{ @@ -66326,8 +66375,8 @@ "tCT" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /obj/structure/grille, /obj/structure/window/reinforced{ @@ -66653,8 +66702,8 @@ /area/medical/cryo) "udn" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/floor/plating, @@ -66792,11 +66841,11 @@ /area/quartermaster/storage) "uuz" = ( /obj/effect/floor_decal/corner/red/diagonal, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 3; pixel_y = 10 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -4; pixel_y = 10 }, @@ -67790,6 +67839,9 @@ pixel_x = 3; pixel_y = 4 }, +/obj/item/paper_scanner{ + pixel_x = -4 + }, /turf/simulated/floor/carpet, /area/lawoffice) "wzO" = ( @@ -68396,7 +68448,7 @@ pixel_x = -8; pixel_y = 8 }, -/obj/item/reagent_containers/food/condiment/spacespice{ +/obj/item/reagent_containers/food/condiment/shaker/spacespice{ pixel_x = 5; pixel_y = 4 }, @@ -91266,7 +91318,7 @@ btK buR bDu bxc -byE +skc hwh byE bCD @@ -96228,7 +96280,7 @@ aaa aab aab aab -aab +oGq aab aab aab diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index e5e5859b914..488f871218b 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -196,8 +196,8 @@ /area/maintenance/interstitial_main) "ax" = ( /obj/effect/floor_decal/corner/yellow/full{ - icon_state = "corner_white_full"; - dir = 1 + dir = 1; + icon_state = "corner_white_full" }, /obj/machinery/light{ dir = 4; @@ -267,8 +267,8 @@ icon_state = "tube1" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 6 + dir = 6; + icon_state = "corner_white" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -281,8 +281,8 @@ "aK" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 6 + dir = 6; + icon_state = "corner_white" }, /obj/machinery/light{ dir = 4; @@ -293,8 +293,8 @@ /area/maintenance/interstitial_main) "aL" = ( /obj/effect/floor_decal/corner/yellow/full{ - icon_state = "corner_white_full"; - dir = 8 + dir = 8; + icon_state = "corner_white_full" }, /obj/structure/sign/vacuum{ pixel_x = -32 @@ -303,8 +303,8 @@ /area/maintenance/interstitial_main) "aM" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 5 + dir = 5; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -315,8 +315,8 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 5 + dir = 5; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -375,8 +375,8 @@ /area/maintenance/interstitial_main) "aW" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 10 + dir = 10; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -551,15 +551,15 @@ }, /obj/machinery/door/window/eastright, /obj/effect/floor_decal/corner/yellow/full{ - icon_state = "corner_white_full"; - dir = 8 + dir = 8; + icon_state = "corner_white_full" }, /turf/simulated/floor/tiled, /area/maintenance/bridge_elevator) "bm" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 1 + dir = 1; + icon_state = "corner_white" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -595,8 +595,8 @@ /area/maintenance/bridge_elevator) "bq" = ( /obj/effect/floor_decal/corner/yellow/full{ - icon_state = "corner_white_full"; - dir = 1 + dir = 1; + icon_state = "corner_white_full" }, /obj/machinery/alarm{ dir = 8; @@ -660,8 +660,8 @@ }, /obj/machinery/door/window/eastright, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 9 + dir = 9; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/bridge_elevator) @@ -689,8 +689,8 @@ /area/maintenance/bridge_elevator) "bA" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 6 + dir = 6; + icon_state = "corner_white" }, /obj/structure/cable/green{ d1 = 2; @@ -817,8 +817,8 @@ /area/maintenance/bridge_elevator) "bJ" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 8 + dir = 8; + icon_state = "corner_white" }, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -833,8 +833,8 @@ /area/maintenance/bridge_elevator) "bL" = ( /obj/effect/floor_decal/corner/yellow/full{ - icon_state = "corner_white_full"; - dir = 4 + dir = 4; + icon_state = "corner_white_full" }, /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -1548,8 +1548,8 @@ dir = 9 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/security/training) @@ -1717,8 +1717,8 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 2 + dir = 2; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled, /area/security/training) @@ -2065,6 +2065,9 @@ "eG" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, +/obj/item/paper_scanner{ + pixel_x = 6 + }, /turf/simulated/floor/carpet, /area/security/detectives_office) "eH" = ( @@ -2203,8 +2206,8 @@ }, /obj/machinery/firealarm/west, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/security/training) @@ -2363,8 +2366,8 @@ "fr" = ( /obj/machinery/photocopier, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/lino/grey, /area/security/detectives_office) @@ -2513,8 +2516,8 @@ /area/security/detectives_office) "fH" = ( /turf/simulated/floor/tiled/ramp/bottom{ - tag = "icon-rampbot (NORTH)"; - dir = 1 + dir = 1; + tag = "icon-rampbot (NORTH)" }, /area/security/detectives_office) "fI" = ( @@ -2525,8 +2528,8 @@ /obj/structure/table/wood, /obj/item/device/camera_film, /obj/item/device/camera{ - name = "detectives camera"; desc = "A one use - polaroid camera. 30 photos left."; + name = "detectives camera"; pictures_left = 30 }, /turf/simulated/floor/lino/grey, @@ -2600,8 +2603,8 @@ /area/security/forensics_office) "fQ" = ( /obj/structure/disposalpipe/segment{ - icon_state = "conpipe-c"; - dir = 4 + dir = 4; + icon_state = "conpipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -2651,8 +2654,8 @@ /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/wood, /area/security/training) @@ -2665,6 +2668,9 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, +/obj/item/paper_scanner{ + pixel_x = -6 + }, /turf/simulated/floor/wood, /area/security/training) "fZ" = ( @@ -2898,8 +2904,8 @@ dir = 9 }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 2 + dir = 2; + icon_state = "pipe-j2" }, /obj/structure/cable/green{ d1 = 1; @@ -3097,8 +3103,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/security/training) @@ -3145,8 +3151,8 @@ /area/maintenance/security_interstitial) "gN" = ( /obj/structure/disposalpipe/segment{ - icon_state = "conpipe-c"; - dir = 4 + dir = 4; + icon_state = "conpipe-c" }, /obj/structure/cable/green{ d1 = 2; @@ -3385,8 +3391,8 @@ dir = 6 }, /obj/structure/disposalpipe/segment{ - icon_state = "conpipe-c"; - dir = 4 + dir = 4; + icon_state = "conpipe-c" }, /obj/structure/cable/green{ d1 = 1; @@ -3542,8 +3548,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled/dark, /area/security/training) @@ -3609,8 +3615,8 @@ desc = "Avery Bennett Memorial HallThe 5th and final victim of the Odin Killer. He was slain by the Odin Killer for his brave, personal investigation on the killings. Studying to become a detective at the time of his death, he was posthumously granted the title.
November 2428 - June 2460" }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 4 + dir = 4; + icon_state = "pipe-j2" }, /turf/simulated/floor/tiled, /area/security/training) @@ -3700,8 +3706,8 @@ /obj/structure/table/steel, /obj/structure/metronome, /obj/machinery/light/small/red{ - tag = "icon-bulb1 (NORTH)"; - dir = 1 + dir = 1; + tag = "icon-bulb1 (NORTH)" }, /turf/simulated/floor/reinforced, /area/medical/psych) @@ -3755,9 +3761,9 @@ /area/security/training) "hP" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1481; - listening = 0; + listening = FALSE; name = "station intercom (Isolation Room)"; pixel_x = 27 }, @@ -4141,8 +4147,8 @@ }, /obj/machinery/porta_turret/stationary, /obj/machinery/light/colored/blue{ - tag = "icon-tube_empty (WEST)"; - dir = 8 + dir = 8; + tag = "icon-tube_empty (WEST)" }, /turf/simulated/floor/plating, /area/bridge/selfdestruct) @@ -4152,8 +4158,8 @@ }, /obj/machinery/porta_turret/stationary, /obj/machinery/light/colored/blue{ - tag = "icon-tube_empty (EAST)"; - dir = 4 + dir = 4; + tag = "icon-tube_empty (EAST)" }, /turf/simulated/floor/plating, /area/bridge/selfdestruct) @@ -4552,8 +4558,8 @@ dir = 9 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/security/range) @@ -4604,8 +4610,8 @@ /area/security/investigations) "jF" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /turf/simulated/open, /area/security/training) @@ -4863,9 +4869,9 @@ /area/medical/psych) "kb" = ( /obj/machinery/chakraconsole{ - tag = "icon-body_scannerconsole (EAST)"; + dir = 4; icon_state = "body_scannerconsole"; - dir = 4 + tag = "icon-body_scannerconsole (EAST)" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/green/diagonal, @@ -5063,8 +5069,8 @@ /area/medical/psych) "ks" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner_wide/green{ dir = 9 @@ -5242,8 +5248,8 @@ dir = 4 }, /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/item/device/radio/intercom{ dir = 4; @@ -5388,8 +5394,8 @@ /area/medical/psych) "kZ" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/firealarm/west, /obj/machinery/ringer{ @@ -5782,8 +5788,8 @@ /area/medical/psych) "lL" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner_wide/green/full, /turf/simulated/floor/tiled/white, @@ -5948,8 +5954,8 @@ /area/mine/unexplored) "mh" = ( /obj/effect/floor_decal/industrial/warning/dust{ - tag = "icon-warning_dust (SOUTHWEST)"; - dir = 10 + dir = 10; + tag = "icon-warning_dust (SOUTHWEST)" }, /turf/simulated/floor/airless{ icon_state = "asteroidplating" @@ -7276,8 +7282,8 @@ /area/maintenance/elevator) "tm" = ( /obj/effect/floor_decal/industrial/warning/dust{ - tag = "icon-warning_dust (SOUTHWEST)"; - dir = 10 + dir = 10; + tag = "icon-warning_dust (SOUTHWEST)" }, /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 4 @@ -7622,8 +7628,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 9 + dir = 9; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -8003,8 +8009,8 @@ pixel_y = 24 }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 5 + dir = 5; + icon_state = "corner_white" }, /obj/structure/cable/green{ d2 = 2; @@ -8347,8 +8353,8 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 4 + dir = 4; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -8926,8 +8932,8 @@ /area/quartermaster/storage) "En" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 9 + dir = 9; + icon_state = "corner_white" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -9202,8 +9208,8 @@ /area/mine/unexplored) "FP" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner_wide/green{ dir = 9 @@ -9298,8 +9304,8 @@ /area/mine/unexplored) "Gv" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 10 + dir = 10; + icon_state = "corner_white" }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -9312,8 +9318,8 @@ /area/maintenance/interstitial_construction_site/office) "Gz" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 10 + dir = 10; + icon_state = "corner_white" }, /obj/structure/cable{ d1 = 1; @@ -9587,8 +9593,8 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/segment{ - icon_state = "conpipe-c"; - dir = 4 + dir = 4; + icon_state = "conpipe-c" }, /turf/simulated/floor/plating, /area/maintenance/medbay_interstitial) @@ -9763,8 +9769,8 @@ /area/quartermaster/storage) "IP" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 9 + dir = 9; + icon_state = "corner_white" }, /obj/structure/sign/vacuum{ pixel_x = -32 @@ -9794,8 +9800,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 9 + dir = 9; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -9920,8 +9926,8 @@ icon_state = "tube1" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 6 + dir = 6; + icon_state = "corner_white" }, /obj/structure/extinguisher_cabinet{ pixel_x = 28 @@ -9962,8 +9968,8 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/yellow/full{ - icon_state = "corner_white_full"; - dir = 4 + dir = 4; + icon_state = "corner_white_full" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -10297,8 +10303,8 @@ /area/maintenance/interstitial_cargo) "Kj" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled, @@ -10498,8 +10504,8 @@ /area/medical/upperlevel) "Lr" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 5 + dir = 5; + icon_state = "corner_white" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -10603,8 +10609,8 @@ icon_state = "12-0" }, /obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/plating{ roof_type = null @@ -10618,8 +10624,8 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/junction{ - icon_state = "pipe-j2"; - dir = 4 + dir = 4; + icon_state = "pipe-j2" }, /turf/simulated/floor/plating, /area/maintenance/interstitial_cargo) @@ -10798,8 +10804,8 @@ /area/maintenance/engineering_ladder) "Mv" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 6 + dir = 6; + icon_state = "corner_white" }, /obj/machinery/alarm{ dir = 8; @@ -11034,8 +11040,8 @@ /area/maintenance/interstitial_cargo) "NJ" = ( /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 6 + dir = 6; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -11161,8 +11167,8 @@ icon_state = "1-4" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 1 + dir = 1; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -11245,6 +11251,7 @@ }, /obj/structure/table/standard, /obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/item/paper_scanner, /turf/simulated/floor/tiled/white, /area/security/forensics_office) "Pm" = ( @@ -11254,8 +11261,8 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 10 + dir = 10; + icon_state = "corner_white" }, /obj/machinery/alarm{ dir = 1; @@ -11613,8 +11620,8 @@ /area/medical/upperlevel) "QN" = ( /obj/effect/floor_decal/corner/yellow/full{ - icon_state = "corner_white_full"; - dir = 8 + dir = 8; + icon_state = "corner_white_full" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -12055,8 +12062,8 @@ /area/security/forensics_office) "Ts" = ( /obj/machinery/light{ - icon_state = "tube1"; - dir = 8 + dir = 8; + icon_state = "tube1" }, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/corner/pink/full{ @@ -12270,8 +12277,8 @@ /area/quartermaster/storage) "UA" = ( /obj/effect/floor_decal/industrial/warning/dust{ - tag = "icon-warning_dust (SOUTHWEST)"; - dir = 10 + dir = 10; + tag = "icon-warning_dust (SOUTHWEST)" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless{ @@ -12437,8 +12444,8 @@ /obj/machinery/ringer{ department = "Cargo"; id = "cargo_ringer"; - req_access = list(31); - pixel_x = 30 + pixel_x = 30; + req_access = list(31) }, /obj/structure/lattice/catwalk/indoor, /turf/simulated/open, @@ -12574,8 +12581,8 @@ icon_state = "2-8" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 5 + dir = 5; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -12739,8 +12746,8 @@ icon_state = "2-4" }, /obj/effect/floor_decal/corner/yellow/full{ - icon_state = "corner_white_full"; - dir = 1 + dir = 1; + icon_state = "corner_white_full" }, /obj/structure/cable/green{ d1 = 1; @@ -12847,8 +12854,8 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/yellow{ - icon_state = "corner_white"; - dir = 10 + dir = 10; + icon_state = "corner_white" }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index ffa65f24b79..33a0c2b3c40 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -25293,6 +25293,7 @@ /obj/effect/landmark{ name = "carpspawn" }, +/obj/effect/shuttle_landmark/burglar/surface, /turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "Xi" = ( diff --git a/maps/aurora/code/aurora.dm b/maps/aurora/code/aurora.dm index cf54bc3332d..8dc152796aa 100644 --- a/maps/aurora/code/aurora.dm +++ b/maps/aurora/code/aurora.dm @@ -7,14 +7,16 @@ it is under the joint administration of the Republic of Biesel and the trans-stellar corporate conglomerate NanoTrasen." path = "aurora" - lobby_screens = list("aurora_asteroid", "aurora_postcard") + lobby_icon = 'icons/misc/aurora.dmi' + lobby_screens = list("nanotrasen", "idris", "hephaestus", "zavodskoi") + lobby_transitions = 10 SECONDS station_levels = list(2, 3, 4, 5, 6, 7) admin_levels = list(1) contact_levels = list(3, 4, 5, 6, 7) player_levels = list(2, 3, 4, 5, 6, 7, 8) restricted_levels = list() - accessible_z_levels = list("7" = 15, "2" = 60) + accessible_z_levels = list("2" = 60, "6" = 20, "7" = 20) base_turf_by_z = list( "1" = /turf/space, "2" = /turf/space, @@ -79,6 +81,7 @@ /datum/shuttle/autodock/ferry/autoreturn/ccia, /datum/shuttle/autodock/ferry/specops/ert_aurora, /datum/shuttle/autodock/multi/antag/skipjack_aurora, + /datum/shuttle/autodock/multi/antag/burglar_aurora, /datum/shuttle/autodock/multi/antag/merc_aurora, /datum/shuttle/autodock/ferry/legion, /datum/shuttle/autodock/ferry/research_aurora, diff --git a/maps/aurora/code/aurora_shuttles.dm b/maps/aurora/code/aurora_shuttles.dm index 5b4c550de4b..0d1de1facca 100644 --- a/maps/aurora/code/aurora_shuttles.dm +++ b/maps/aurora/code/aurora_shuttles.dm @@ -31,7 +31,7 @@ } \ /obj/effect/shuttle_landmark/escape_pod/start/pod##NUMBER { \ landmark_tag = "escape_pod_"+ #NUMBER +"_start"; \ - docking_controller = "escape_pod_"+ #NUMBER +"_berth"; \ + docking_controller = "escape_pod_" + #NUMBER +"_berth"; \ } \ /obj/effect/shuttle_landmark/escape_pod/out/pod##NUMBER { \ landmark_tag = "escape_pod_"+ #NUMBER +"_out"; \ @@ -226,6 +226,52 @@ AURORA_ESCAPE_POD(3) special_dock_targets = list("Phoenix Shuttle" = "specops_shuttle_fore") landmark_flags = SLANDMARK_FLAG_AUTOSET +//Burglar Pod +/datum/shuttle/autodock/multi/antag/burglar_aurora + name = "Burglar Pod" + current_location = "nav_burglar_start" + landmark_transition = "nav_burglar_interim" + warmup_time = 10 + move_time = 75 + ceiling_type = /turf/simulated/shuttle_roof/dark + shuttle_area = /area/burglar_base/pod + destination_tags = list( + "nav_burglar_start", + "nav_burglar_surface", + "nav_burglar_under", + "nav_burglar_caverns" + ) + + announcer = "NDV Icarus" + arrival_message = "Attention, we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not." + departure_message = "Attention, your guests are pulling away - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip." + +/obj/effect/shuttle_landmark/burglar/start + name = "Homebase" + landmark_tag = "nav_burglar_start" + base_turf = /turf/space + +/obj/effect/shuttle_landmark/burglar/interim + name = "In Transit" + landmark_tag = "nav_burglar_interim" + base_turf = /turf/space/transit + +/obj/effect/shuttle_landmark/burglar/surface + name = "Surface Aft of Cargo" + landmark_tag = "nav_burglar_surface" + landmark_flags = SLANDMARK_FLAG_AUTOSET + +/obj/effect/shuttle_landmark/burglar/under + name = "Under the Station" + landmark_tag = "nav_burglar_under" + landmark_flags = SLANDMARK_FLAG_AUTOSET + base_turf = /turf/space + +/obj/effect/shuttle_landmark/burglar/caverns + name = "Caverns by Mining" + landmark_tag = "nav_burglar_caverns" + landmark_flags = SLANDMARK_FLAG_AUTOSET + //Skipjack. /datum/shuttle/autodock/multi/antag/skipjack_aurora name = "Skipjack" diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm index 4fddf73d9d4..b2bd49db2ed 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -3295,9 +3295,9 @@ dir = 8 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1475; - listening = 0; + listening = FALSE; name = "Station Intercom (Security)"; pixel_x = -30 }, @@ -4134,9 +4134,9 @@ /area/security/brig) "ahN" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1449; - listening = 0; + listening = FALSE; pixel_y = 25 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4762,9 +4762,9 @@ "aja" = ( /obj/structure/table/standard, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1475; - listening = 0; + listening = FALSE; name = "Station Intercom (Security)"; pixel_x = -30 }, @@ -10183,9 +10183,9 @@ "asL" = ( /obj/structure/table/standard, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1475; - listening = 0; + listening = FALSE; name = "Station Intercom (Security)"; pixel_y = -30 }, @@ -21785,7 +21785,7 @@ dir = 1 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1480; name = "Confessional Intercom"; pixel_x = 25 @@ -23170,7 +23170,7 @@ "aSL" = ( /obj/machinery/light/small, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1480; name = "Confessional Intercom"; pixel_x = 25 @@ -24573,12 +24573,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aVH" = ( -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 2; pixel_y = 6 }, /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -2; pixel_y = 4 }, @@ -26460,11 +26460,11 @@ /area/crew_quarters/bar) "aZb" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -2; pixel_y = 4 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 2; pixel_y = 6 }, @@ -26511,10 +26511,10 @@ /turf/simulated/floor/tiled, /area/crew_quarters/kitchen) "aZf" = ( -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -3 }, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 3 }, /obj/structure/table/stone/marble, @@ -31937,7 +31937,7 @@ name = "tripai" }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = 20 }, @@ -31947,7 +31947,7 @@ pixel_y = -26 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; name = "Common Channel"; pixel_x = -25; pixel_y = -4 @@ -31985,7 +31985,7 @@ pixel_y = 5 }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_x = -27; pixel_y = 4 @@ -31994,7 +31994,7 @@ name = "AI" }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; name = "Common Channel"; pixel_y = 25 }, @@ -32042,7 +32042,7 @@ name = "tripai" }, /obj/item/device/radio/intercom{ - listening = 0; + listening = FALSE; name = "Custom Channel"; pixel_y = 19 }, @@ -32052,7 +32052,7 @@ pixel_y = -26 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; name = "Common Channel"; pixel_x = 27; pixel_y = -3 @@ -44792,9 +44792,9 @@ /area/medical/psych) "bHh" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; frequency = 1481; - listening = 0; + listening = FALSE; name = "station intercom (Isolation Room)"; pixel_x = 27 }, diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm index 9d123c76f85..3638677d80f 100644 --- a/maps/exodus/exodus-2_centcomm.dmm +++ b/maps/exodus/exodus-2_centcomm.dmm @@ -1639,7 +1639,7 @@ /area/syndicate_mothership/control) "ahq" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1213; name = "Syndicate Ops Intercom"; @@ -1704,10 +1704,10 @@ /area/syndicate_mothership/elite_squad) "ahR" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1213; - listening = 0; + listening = FALSE; name = "Syndicate Ops Intercom"; pixel_y = 28; subspace_transmission = 1; @@ -5352,10 +5352,10 @@ /area/centcom/specops) "atK" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -6090,10 +6090,10 @@ /area/centcom/specops) "awE" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -7674,11 +7674,11 @@ "aBG" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ pixel_x = 2; pixel_y = 6 }, -/obj/item/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -6 }, /turf/unsimulated/floor{ @@ -7862,7 +7862,7 @@ name = "Hull Door Control" }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1441; name = "Spec Ops Intercom"; @@ -8084,18 +8084,6 @@ icon_state = "redfull" }, /area/centcom/specops) -"aCV" = ( -/obj/structure/table/rack, -/obj/item/clothing/shoes/magboots/vox, -/obj/item/clothing/gloves/yellow/vox, -/obj/item/clothing/suit/space/vox/carapace, -/obj/item/clothing/head/helmet/space/vox/carapace, -/turf/unsimulated/floor{ - icon_state = "asteroid" - }, -/area/syndicate_mothership{ - name = "\improper Raider Base" - }) "aCW" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/item/tank/nitrogen, @@ -10913,7 +10901,7 @@ /area/centcom/test) "aMc" = ( /obj/structure/table/wood, -/obj/item/storage/fancy/cigar, +/obj/item/storage/fancy/cigarettes/cigar, /obj/item/flame/lighter/zippo, /turf/simulated/floor/wood, /area/merchant_station) @@ -14224,10 +14212,10 @@ dir = 8 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = TRUE; dir = 1; frequency = 1443; - listening = 0; + listening = FALSE; name = "Spec Ops Intercom"; pixel_y = 28 }, @@ -23372,7 +23360,7 @@ axz axz axz axz -aCV +aCq aya alC alC diff --git a/maps/templates/pra.dmm b/maps/templates/pra.dmm index 094d8a26fe7..7d724108707 100644 --- a/maps/templates/pra.dmm +++ b/maps/templates/pra.dmm @@ -324,7 +324,7 @@ "aU" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/wood, -/obj/item/storage/fancy/cigar, +/obj/item/storage/fancy/cigarettes/cigar, /obj/item/flame/lighter/zippo, /turf/simulated/floor/wood, /area/derelict/ship) diff --git a/nano/templates/appearance_changer.tmpl b/nano/templates/appearance_changer.tmpl index f71c41d996b..2f9eb3f78af 100644 --- a/nano/templates/appearance_changer.tmpl +++ b/nano/templates/appearance_changer.tmpl @@ -23,6 +23,19 @@
+
+{{/if}}
+
{{if data.change_eye_color || data.change_skin_tone || data.change_skin_color || data.change_hair_color || data.change_facial_hair_color}}
+ Accents:
+
+
+ {{for data.accents}}
+ {{:helper.link(value.accent, null, { 'accent' : value.accent}, null, data.accent == value.accent ? 'selected' : null)}}
+ {{/for}}
+
+
diff --git a/nano/templates/droppod.tmpl b/nano/templates/droppod.tmpl
index 754cdee3454..d3842786083 100644
--- a/nano/templates/droppod.tmpl
+++ b/nano/templates/droppod.tmpl
@@ -7,7 +7,6 @@
Pod Status: Operational
{{:helper.link('Departures', 'gear', {'fire' : 'arrivals'})}}
{{:helper.link('Cargo Surface', 'gear', {'fire' : 'cargo'})}}
- {{:helper.link('Telecomms Lounge', 'gear', {'fire' : 'tcoms'})}}
{{:helper.link('Command Surface', 'gear', {'fire' : 'commandescape'})}}
{{/if}} diff --git a/nano/templates/sleeper.tmpl b/nano/templates/sleeper.tmpl index 1b7cd99d0b6..c5a176e99c2 100644 --- a/nano/templates/sleeper.tmpl +++ b/nano/templates/sleeper.tmpl @@ -42,7 +42,7 @@
{{:helper.link('Cargo Surface', 'gear', {'fire' : 'cargo'})}}
- {{:helper.link('Telecomms Lounge', 'gear', {'fire' : 'tcoms'})}}
{{:helper.link('Command Surface', 'gear', {'fire' : 'commandescape'})}}
{{/if}} diff --git a/nano/templates/sleeper.tmpl b/nano/templates/sleeper.tmpl index 1b7cd99d0b6..c5a176e99c2 100644 --- a/nano/templates/sleeper.tmpl +++ b/nano/templates/sleeper.tmpl @@ -42,7 +42,7 @@
{{if data.occupant}}Occupant: {{:value.amount}} units{{/if}}
- {{:helper.link('Inject 5', null, {'chemical' : value.id, 'amount' : 5}, data.occupant ? null : 'disabled')}}{{:helper.link('Inject 10', null, {'chemical' : value.id, 'amount' : 10}, data.occupant ? null : 'disabled')}}
+ {{:helper.link('Inject 5', null, {'chemical' : value.type, 'amount' : 5}, data.occupant ? null : 'disabled')}}{{:helper.link('Inject 10', null, {'chemical' : value.type, 'amount' : 10}, data.occupant ? null : 'disabled')}}
{{/for}}
"))}}),n("vui-button",{attrs:{params:{_openurl:e[4]}}},[t._v("Open")])],1)})),0)]:t._e(),t._t("default")],2),!t.hideAdvanced&&1&t.editable?n("vui-button",{staticClass:"danger",attrs:{params:{deleterecord:1},icon:"trash-alt"}},[t._v("Delete record")]):t._e()],1):t._e()},a=[],i=(n("ac1f"),n("5319"),{data:function(){return this.$root.$data.state},props:{hideAdvanced:{type:Boolean,default:!1}},filters:{replace:function(t,e,n){return t.replace(e,n)}}}),o=i,s=(n("bb33"),n("2877")),u=Object(s["a"])(o,r,a,!1,null,"085e2812",null);e["default"]=u.exports},3270:function(t,e,n){"use strict";var r=n("7b42"),a=n.n(r);a.a},"342f":function(t,e,n){var r=n("d066");t.exports=r("navigator","userAgent")||""},3468:function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[t.read?n("vui-group",[n("vui-group-item",{attrs:{label:"Pressure:"}},[t._v(" "+t._s(t.press.toFixed(1))+" ")]),n("vui-group-item",{attrs:{label:"Temperature:"}},[t._v(" "+t._s(t.temp.toFixed(1))+" K ("+t._s(t.tempC.toFixed(1))+"°C) ")]),n("vui-group-item",{attrs:{label:"Gases:"}},[t.gas.oxygen?n("span",{staticClass:"complist"},[t._v(t._s(t.gas.oxygen.toFixed(2))+" O"),n("sub",[t._v("2")])]):t._e(),t.gas.nitrogen?n("span",{staticClass:"complist"},[t._v(t._s(t.gas.nitrogen.toFixed(2))+" N")]):t._e(),t.gas.carbon_dioxide?n("span",{staticClass:"complist"},[t._v(t._s(t.gas.carbon_dioxide.toFixed(2))+" CO"),n("sub",[t._v("2"),n("sub")])]):t._e(),t.gas.phoron?n("span",{staticClass:"complist"},[t._v(t._s(t.gas.phoron.toFixed(2))+" PH")]):t._e(),t.gas.sleeping_agent?n("span",{staticClass:"complist"},[t._v(t._s(t.gas.sleeping_agent.toFixed(2))+" SA")]):t._e()])],1):n("span",{staticClass:"bad"},[t._v("Unable to obtain air reading!")])],1)},a=[],i={data:function(){return this.$root.$data.state}},o=i,s=(n("fd5c"),n("2877")),u=Object(s["a"])(o,r,a,!1,null,"664f2b03",null);e["default"]=u.exports},"34ac":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[t.editing?[t._t("default",[n("input",{directives:[{name:"model",rawName:"v-model",value:t.gdata.state.editingvalue,expression:"gdata.state.editingvalue"}],domProps:{value:t.gdata.state.editingvalue},on:{input:function(e){e.target.composing||t.$set(t.gdata.state,"editingvalue",e.target.value)}}})]),n("vui-button",{attrs:{icon:"check"},on:{click:t.save}})]:[n("span",{staticStyle:{"white-space":"pre-wrap"}},[t._v(t._s(t.rvalue))]),t._v(" "),t.reditable||t.editButton?n("vui-button",{staticStyle:{"white-space":"pre-wrap"},attrs:{icon:"pen"},on:{click:t.beginEditing}},[t._v(t._s(t.editbtnname))]):t._e()]],2)},a=[],i=(n("ac1f"),n("5319"),n("1276"),n("025e")),o={data:function(){return{editing:!1,gdata:this.$root.$data,startEditHandler:null}},props:{value:{type:String,default:""},path:{type:String,default:null},editable:{type:Boolean,default:!1},editButton:{type:String,default:null}},computed:{reditable:function(){return!!this.path&&this.editable},rvalue:function(){return this.path?i["a"].dotNotationRead(this.gdata.state,this.path):this.value},editbtnname:function(){return this.editButton?this.editButton:""}},methods:{beginEditing:function(){var t=this;(this.reditable||this.editButton)&&(this.$root.$emit("record-field-start-editing"),this.gdata.state.editingvalue=this.rvalue,this.startEditHandler=function(){t.endEditing()},this.$root.$on("record-field-start-editing",this.startEditHandler),this.editing=!0)},endEditing:function(){(this.reditable||this.editButton)&&(this.editing=!1,this.$root.$off("record-field-start-editing",this.startEditHandler))},save:function(){(this.reditable||this.editButton)&&(this.endEditing(),this.editButton?this.$emit("save",this.gdata.state.editingvalue):i["a"].sendToTopic({editrecord:{value:this.gdata.state.editingvalue,key:this.path.split(".")}}))}},filters:{replace:function(t,e,n){return t.replace(e,n)}}},s=o,u=(n("3270"),n("2877")),c=Object(u["a"])(s,r,a,!1,null,"e071fda6",null);e["default"]=c.exports},"355d":function(t,e,n){},"35a1":function(t,e,n){var r=n("f5df"),a=n("3f8c"),i=n("b622"),o=i("iterator");t.exports=function(t){if(void 0!=t)return t[o]||t["@@iterator"]||a[r(t)]}},3729:function(t,e,n){var r=n("9e69"),a=n("00fd"),i=n("29f3"),o="[object Null]",s="[object Undefined]",u=r?r.toStringTag:void 0;function c(t){return null==t?void 0===t?s:o:u&&u in Object(t)?a(t):i(t)}t.exports=c},"37e8":function(t,e,n){var r=n("83ab"),a=n("9bf2"),i=n("825a"),o=n("df75");t.exports=r?Object.defineProperties:function(t,e){i(t);var n,r=o(e),s=r.length,u=0;while(s>u)a.f(t,n=r[u++],e[n]);return t}},3831:function(t,e,n){"use strict";var r=n("9e80"),a=n.n(r);a.a},3851:function(t,e,n){var r={"./header/default.vue":"f3ce","./header/minimal.vue":"d657","./header/modular-computer.vue":"4709","./view/admin/player-panel.vue":"3930","./view/console/atmocontrol/injector.vue":"614c","./view/console/atmocontrol/main.vue":"86ad","./view/console/atmocontrol/supermatter.vue":"df0b","./view/console/atmocontrol/tank.vue":"508b","./view/cooking/microwave.vue":"c1e2","./view/devices/gps/gps.vue":"0566","./view/devices/quikpay/confirmation.vue":"47db","./view/devices/quikpay/main.vue":"4678","./view/manifest.vue":"f264","./view/mcomputer/medical/sensors.vue":"f309","./view/mcomputer/pai/atmosphere.vue":"3468","./view/mcomputer/pai/directives.vue":"d3c6","./view/mcomputer/pai/doorjack.vue":"3b8a","./view/mcomputer/pai/radio.vue":"207c","./view/mcomputer/pai/signaler.vue":"c939","./view/mcomputer/security/penalcontroller.vue":"2c9a","./view/mcomputer/system/config.vue":"07c3","./view/mcomputer/system/downloader.vue":"019f","./view/mcomputer/system/main.vue":"13c9","./view/mcomputer/system/manager.vue":"d3c8","./view/medical/bodyscanner.vue":"1062","./view/misc/doors.vue":"3a07","./view/misc/ghostspawner.vue":"1503","./view/misc/maglock-config.vue":"0ea6","./view/misc/maglock.vue":"20a6","./view/misc/pai/recruit.vue":"9324","./view/misc/voting.vue":"e31d","./view/paperwork/fax.vue":"9556","./view/paperwork/photocopier.vue":"6a01","./view/records/field.vue":"34ac","./view/records/general.vue":"2fa9","./view/records/incident.vue":"256f","./view/records/list-locked.vue":"c0f7","./view/records/list-virus.vue":"8385","./view/records/list.vue":"ac4c","./view/records/login.vue":"a8bb","./view/records/main.vue":"cf32","./view/records/medical.vue":"203b","./view/records/security.vue":"b6db","./view/records/virus.vue":"73f5","./view/turrets/control-part.vue":"10d4","./view/turrets/control.vue":"fb48","./view/wanalyzer/analyzer.vue":"407e","./vui/button.vue":"5aa2","./vui/group-item.vue":"2704","./vui/group.vue":"48f3","./vui/img.vue":"810a","./vui/input/numeric.vue":"210c","./vui/input/search.vue":"419b","./vui/item.vue":"faf6","./vui/progress.vue":"1253","./vui/tooltip.vue":"0ec3"};function a(t){var e=i(t);return n(e)}function i(t){if(!n.o(r,t)){var e=new Error("Cannot find module '"+t+"'");throw e.code="MODULE_NOT_FOUND",e}return r[t]}a.keys=function(){return Object.keys(r)},a.resolve=i,t.exports=a,a.id="3851"},3930:function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,check_antagonist:1}}},[t._v("Check antagonists")]),n("vui-input-search",{staticStyle:{float:"right"},attrs:{input:t.players_filtered,keys:["name","real_name","assigment","key","ip"],autofocus:"",threshold:t.threshold,"include-score":""},model:{value:t.search_results,callback:function(e){t.search_results=e},expression:"search_results"}}),n("div",{staticClass:"table"},[n("div",{staticClass:"header"},[n("div",{staticClass:"header-item"},[t._v("Name")]),n("div",{staticClass:"header-item"},[t._v("Assignment")]),n("div",{staticClass:"header-item"},[t._v("Key")]),t.s.ismod?n("div",{staticClass:"header-item"},[t._v("Age")]):t._e(),t.s.ismod?n("div",{staticClass:"header-item"},[t._v("Antag")]):t._e(),n("div",{staticClass:"header-item"},[t._v("Actions")])]),t._l(t.search_results,(function(e){return n("div",{key:e.item.ref,staticClass:"player",style:{opacity:1-e.score*t.score_multiplier}},[n("div",{staticClass:"item"},[e.item.name==e.item.real_name||"NA"==e.item.assigment?[t._v(t._s(e.item.name))]:n("vui-tooltip",{attrs:{label:e.item.name}},[t._v(t._s(e.item.real_name))])],2),n("div",{staticClass:"item"},["NA"==e.item.assigment?[t._v(t._s(e.item.real_name))]:[t._v(t._s(e.item.assigment))]],2),n("div",{staticClass:"item"},[t.s.ismod?n("vui-tooltip",{scopedSlots:t._u([{key:"label",fn:function(){return[t._v(t._s(e.item.key)),e.item.connected?t._e():n("span",[t._v(" (DC)")])]},proxy:!0}],null,!0)},[t._v(" "+t._s(e.item.ip)+" ")]):[t._v(" "+t._s(e.item.key)),e.item.connected?t._e():n("span",[t._v(" (DC)")])]],2),t.s.ismod?n("div",{staticClass:"item"},[t._v(t._s(e.item.age))]):t._e(),t.s.ismod?n("div",{staticClass:"item"},[-1==e.item.antag?n("span",[t._v("NA")]):0==e.item.antag?n("span",[t._v("No")]):t._e(),1==e.item.antag?n("span",{staticClass:"red"},[n("vui-tooltip",{attrs:{label:"ADD"}},[t._v("This antag was added by admin.")])],1):t._e(),2==e.item.antag?n("span",{staticClass:"red"},[n("vui-tooltip",{attrs:{label:"GM"}},[t._v("This antag was added by gamemode.")])],1):t._e()]):t._e(),n("div",{staticClass:"item",staticStyle:{"text-align":"right"}},[n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,adminplayeropts:e.item.ref}}},[t._v("PP")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,priv_msg:e.item.ref}}},[t._v("PM")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,subtlemessage:e.item.ref}}},[t._v("SM")]),n("vui-button",{attrs:{"unsafe-params":{_src_:"vars",Vars:e.item.ref}}},[t._v("VV")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,mob:e.item.ref,notes:"show"}}},[t._v("N")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,traitor:e.item.ref}}},[t._v("TP")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,adminplayerobservejump:e.item.ref}}},[t._v("JMP")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,admin_wind_player:e.item.ref}}},[t._v("WIND")])],1)])}))],2)],1)},a=[],i=(n("4de4"),n("07ac"),{data:function(){return{search_results:[],s:this.$root.$data.state,threshold:.3}},computed:{players_filtered:function(){return Object.values(this.s.players).filter((function(t){return t}))},score_multiplier:function(){return 1/this.threshold}}}),o=i,s=(n("c8b2"),n("2877")),u=Object(s["a"])(o,r,a,!1,null,"301700a1",null);e["default"]=u.exports},"3a07":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("vui-group",[n("vui-group-item",{attrs:{label:"Main power:"}},[n("vui-progress",{class:{good:0==t.s.plu_main,bad:-1==t.s.plu_main,average:t.s.plu_main>0},staticStyle:{width:"12em"},attrs:{value:t.gs.wtime,min:t.s.plua_main,max:t.s.plu_main||10}},[t._v(" "+t._s(t.mainMsg)+" ")]),n("vui-button",{attrs:{disabled:0!=t.s.plu_main,params:{command:"main_power"}}},[t._v("Interrupt")])],1),n("vui-group-item",{attrs:{label:"Backup power:"}},[n("vui-progress",{class:{good:0==t.s.plu_back||0==t.s.plu_main,bad:-1==t.s.plu_back&&0!=t.s.plu_main,average:t.s.plu_back>0},staticStyle:{width:"12em"},attrs:{value:t.gs.wtime,min:t.s.plua_back,max:t.s.plu_back||10}},[t._v(" "+t._s(t.backupMsg)+" ")]),n("vui-button",{attrs:{disabled:0!=t.s.plu_back,params:{command:"backup_power"}}},[t._v("Interrupt")])],1),n("vui-group-item",{attrs:{label:"Electrified status:"}},[n("vui-progress",{class:{good:0==t.s.ele,bad:-1==t.s.ele,average:t.s.ele>0},staticStyle:{width:"12em"},attrs:{value:t.gs.wtime,min:t.s.elea,max:t.s.ele||10}},[t._v(" "+t._s(t.eleMsg)+" ")]),n("vui-button",{attrs:{disabled:0==t.s.ele,params:{command:"electrify_permanently",activate:0}}},[t._v("R")]),t.s.isai?t._e():[n("vui-button",{attrs:{disabled:t.s.ele>0,params:{command:"electrify_temporary",activate:1}}},[t._v("T")]),n("vui-button",{attrs:{disabled:-1==t.s.ele,params:{command:"electrify_permanently",activate:1}}},[t._v("P")])]],2),n("vui-group-item"),t._l(t.commands,(function(e,r){return n("vui-group-item",{key:r,attrs:{label:e.n+":"}},[n("vui-button",{class:{on:t.s[r]},staticStyle:{"min-width":"6em"},attrs:{params:{command:r,activate:e.i?1:0}}},[t._v(t._s(e.et||"Enabled"))]),n("vui-button",{class:{on:!t.s[r]&&!e.d,danger:!t.s[r]&&e.d},staticStyle:{"min-width":"6em"},attrs:{disabled:e.a&&t.s.isai,params:{command:r,activate:e.i?0:1}}},[t._v(t._s(e.dt||"Disabled"))])],1)}))],2)],1)},a=[],i={data:function(){var t=this.$root.$data,e=t.state;return{gs:t,s:e,commands:{idscan:{n:"IdScan",i:!0},bolts:{n:"Bolts",et:"Raised",dt:"Dropped",a:!0},lights:{n:"Bolt Lights",i:!0},safeties:{n:"Safeties",et:"Nominal",dt:"Overridden",d:!0},timing:{n:"Timing",et:"Nominal",dt:"Overridden",d:!0},open:{n:"Door State",et:"Opened",dt:"Closed",i:1}}}},computed:{mainMsg:function(){return this.getPowerStatusMessage(this.s.plu_main,this.gs.wtime)},backupMsg:function(){return this.getPowerStatusMessage(this.s.plu_back,this.gs.wtime)},eleMsg:function(){if(0==this.s.ele)return"Safe";if(-1==this.s.ele)return"Permanently";var t=Math.max(Math.round((this.s.ele-this.gs.wtime)/10),0);return"".concat(t,"s left")}},methods:{getPowerStatusMessage:function(t,e){if(-1==t)return"Offline";if(0==t)return"Online";var n=Math.max(Math.round((t-e)/10),0);return"Interrupted, ".concat(n,"s left")}}},o=i,s=n("2877"),u=Object(s["a"])(o,r,a,!1,null,null,null);e["default"]=u.exports},"3b8a":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("vui-group",[n("vui-group-item",{attrs:{label:"Cable:"}},[t.connected?n("span",[t._v("Connected")]):t.extended?n("span",[t._v("Extended")]):n("vui-button",{attrs:{params:{extend:1}}},[t._v("Retracted")])],1),t.connected?n("vui-group-item",{attrs:{label:"Hack:"}},[t.ishacking?[n("vui-progress",{attrs:{max:1e3,value:t.progress}},[t._v(t._s(t.progress/10)+"%")]),n("vui-button",{attrs:{params:{cancel:1}}},[t._v("Cancel")])]:n("vui-button",{attrs:{params:{hack:1}}},[t._v("Start")])],2):t.aborted?n("vui-group-item",[n("div",{staticClass:"bad"},[t._v("Hack aborted!")])]):t._e()],1)],1)},a=[],i={data:function(){return this.$root.$data.state}},o=i,s=n("2877"),u=Object(s["a"])(o,r,a,!1,null,"2c69059a",null);e["default"]=u.exports},"3bab":function(t,e,n){"use strict";var r=n("9e79"),a=n.n(r);a.a},"3bb1":function(t,e,n){"use strict";var r=n("2b55"),a=n.n(r);a.a},"3bbe":function(t,e,n){var r=n("861d");t.exports=function(t){if(!r(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype");return t}},"3ca3":function(t,e,n){"use strict";var r=n("6547").charAt,a=n("69f3"),i=n("7dd0"),o="String Iterator",s=a.set,u=a.getterFor(o);i(String,"String",(function(t){s(this,{type:o,string:String(t),index:0})}),(function(){var t,e=u(this),n=e.string,a=e.index;return a>=n.length?{value:void 0,done:!0}:(t=r(n,a),e.index+=t.length,{value:t,done:!1})}))},"3f8c":function(t,e){t.exports={}},4069:function(t,e,n){var r=n("44d2");r("flat")},"407e":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("b",[t._v("Analyzing "+t._s(t.name)+" ")]),n("br"),t.$root.$data.assets["icon"]?n("div",[n("vui-img",{attrs:{name:"icon"}})],1):t._e(),1==t.item?n("div",[n("table",{staticClass:"other"},[n("tr",[n("td",[t._v(" Damage type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.damage_type)+" ")])]),n("tr",[n("td",[t._v(" Item's estimated force-rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.force)+" points")])]),n("tr",[n("td",[t._v(" Item's estimated throw force-rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.throw_force)+" points ")])]),1==t.energy?[n("tr",[n("td",[t._v(" Item's estimated force-rating when activated: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.active_force)+" points ")])]),n("tr",[n("td",[t._v(" Item's estimated throw force-rating when activated: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.active_throw_force)+" points")])]),n("tr",[n("td",[t._v(" Base block chance is: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.base_block_chance)+"% ")])]),n("tr",[n("td",[t._v(" Base reflect chance is: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.base_reflectchance)+"% ")])]),n("tr",[n("td",[t._v(" Item's estimated shield rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.shield_power)+" points")])]),n("tr",[n("td",[t._v(" Can block bullets: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.can_block)+" ")])])]:t._e(),n("tr",[n("td",[t._v(" Is sharp:")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.sharp)+" ")])]),n("tr",[n("td",[t._v(" Chance to dismember: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.edge)+" ")])]),n("tr",[n("td",[t._v(" Item's estimated armor penetration rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.penetration)+" points")])])],2)]):t._e(),1==t.gun?n("div",{staticClass:"active_energy"},[n("table",{staticClass:"other"},[n("tr",[n("td",[t._v(" Maximum shots: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.max_shots)+" ")])]),n("tr",[n("td",[t._v(" Burst: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.burst)+" ")])]),n("tr",[n("td",[t._v(" Self recharge: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.recharge)+" ")])]),n("tr",[n("td",[t._v(" Recharge time: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.recharge_time)+" ")])]),n("tr",[n("td",[t._v(" Reliability: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.reliability)+" ")])]),n("br"),n("b",[t._v("First projectile information: ")]),n("br"),n("tr",[n("td",[t._v(" Projectile's estimated damage rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.damage)+" points")])]),n("tr",[n("td",[t._v(" Projectile's Damage type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.damage_type)+" ")])]),n("tr",[n("td",[t._v(" Projectile's estimated armor penetration rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.armor_penetration)+" points")])]),n("tr",[n("td",[t._v(" Projectile's armor damage type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.check_armor)+" ")])]),n("tr",[n("td",[t._v(" Projectile's shrapnel type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.shrapnel_type)+" ")])]),n("tr",[n("td",[t._v(" Stun: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.stun)+" ")])]),t.secondary_damage?[n("br"),n("b",[t._v("Second projectile information: ")]),n("br"),n("tr",[n("td",[t._v(" Projectile's estimated damage rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_damage)+" points")])]),n("tr",[n("td",[t._v(" Projectile's damage type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_damage_type)+" ")])]),n("tr",[n("td",[t._v(" Projectile's estimated armor penetration rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_armor_penetration)+" points")])]),n("tr",[n("td",[t._v(" Projectile's armor damage type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_check_armor)+" ")])]),n("tr",[n("td",[t._v(" Projectile's shrapnel type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_shrapnel_type)+" ")])]),n("tr",[n("td",[t._v(" Stun: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_stun)+" ")])])]:t._e()],2)]):t._e(),t.gun_mods?n("div",[n("br"),n("b",[t._v("Modular gun information: ")]),n("br"),n("table",{staticClass:"modular"},[t._m(0),t._l(t.gun_mods,(function(e,r){return n("tr",{key:r},[n("td",[t._v(t._s(r))]),t._l(e,(function(r,a){return n("td",{key:a},[t._v(" "+t._s(e[a])+" ")])}))],2)}))],2)]):t._e()])},a=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("tr",[n("th",[t._v(" Name ")]),n("th",[t._v(" Reliability ")]),n("th",[t._v(" Damage modifier ")]),n("th",[t._v(" Fire delay modifier ")]),n("th",[t._v(" Number of shots modifier ")]),n("th",[t._v(" Burst modifier ")]),n("th",[t._v(" Accuracy modifier ")]),n("th",[t._v(" Repair tool ")])])}],i={data:function(){return this.$root.$data.state}},o=i,s=(n("a206"),n("2877")),u=Object(s["a"])(o,r,a,!1,null,"4bd3d7b3",null);e["default"]=u.exports},4128:function(t,e,n){"use strict";var r=n("1352"),a=n.n(r);a.a},4160:function(t,e,n){"use strict";var r=n("23e7"),a=n("17c2");r({target:"Array",proto:!0,forced:[].forEach!=a},{forEach:a})},"419b":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("input",{directives:[{name:"model",rawName:"v-model",value:t.searchValue,expression:"searchValue"}],attrs:{type:"text",placeholder:"Search..."},domProps:{value:t.searchValue},on:{input:function(e){e.target.composing||(t.searchValue=e.target.value)}}})},a=[],i=(n("e260"),n("d81d"),n("a9e3"),n("d3b7"),n("ac1f"),n("841c"),n("ddb0"),n("ffe7")),o=n.n(i),s={data:function(){return{fuse:null,searchValue:""}},mounted:function(){this.onFieldUpdate(this.searchValue)},props:{keys:{type:Array,default:function(){return[]}},includeScore:{type:Boolean,default:!1},threshold:{type:Number,default:.6},input:{type:Array,default:function(){return[]}},value:{type:Array,default:function(){return[]}}},watch:{keys:function(){this.fuse=null},includeScore:function(){this.fuse=null},threshold:function(){this.fuse=null},input:function(){this.onFieldUpdate(this.searchValue)},searchValue:function(t){this.onFieldUpdate(t)}},methods:{onFieldUpdate:function(t){this.initFuse();var e=this.fuse.search(t);0==e.length&&(e=this.includeScore?this.input.map((function(t){return{item:t,score:0}})):this.input),this.$emit("input",e)},initFuse:function(){if(null==this.fuse){var t={shouldSort:!0,findAllMatches:!0,keys:this.keys,includeScore:this.includeScore,threshold:this.threshold};this.fuse=new o.a(this.input,t)}else this.fuse.setCollection(this.input)}}},u=s,c=n("2877"),l=Object(c["a"])(u,r,a,!1,null,null,null);e["default"]=l.exports},"428f":function(t,e,n){var r=n("da84");t.exports=r},"44ad":function(t,e,n){var r=n("d039"),a=n("c6b6"),i="".split;t.exports=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==a(t)?i.call(t,""):Object(t)}:Object},"44d2":function(t,e,n){var r=n("b622"),a=n("7c73"),i=n("9bf2"),o=r("unscopables"),s=Array.prototype;void 0==s[o]&&i.f(s,o,{configurable:!0,value:a(null)}),t.exports=function(t){s[o][t]=!0}},"44e7":function(t,e,n){var r=n("861d"),a=n("c6b6"),i=n("b622"),o=i("match");t.exports=function(t){var e;return r(t)&&(void 0!==(e=t[o])?!!e:"RegExp"==a(t))}},4678:function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[t._l(t.items,(function(e,r){return n("div",{key:r,staticStyle:{clear:"both"}},[t._v(" "+t._s(r)+": "+t._s(e)+" Credits "),n("div",{staticStyle:{float:"right"}},[n("vui-input-numeric",{attrs:{width:"2em"},model:{value:t.selection[r],callback:function(e){t.$set(t.selection,r,e)},expression:"selection[name]"}}),1==t.editmode?n("vui-button",{attrs:{params:{remove:r},width:"3em"}},[t._v("Delete")]):t._e()],1)])})),1==t.editmode?n("div",[n("input",{directives:[{name:"model",rawName:"v-model",value:t.tmp_name,expression:"tmp_name"}],domProps:{value:t.tmp_name},on:{input:function(e){e.target.composing||(t.tmp_name=e.target.value)}}}),n("vui-input-numeric",{attrs:{width:"3em","button-count":2},model:{value:t.tmp_price,callback:function(e){t.tmp_price=e},expression:"tmp_price"}}),n("vui-button",{attrs:{params:{add:{name:t.tmp_name,price:t.tmp_price}}}},[t._v("Add")]),n("vui-button",{attrs:{params:{accountselect:1},width:"3em"}},[t._v("Select Destination Account")])],1):t._e(),n("vui-button",{attrs:{params:{locking:1},width:"3em"}},[t._v("Toggle Lock")]),n("vui-button",{attrs:{params:{confirm:t.selection}}},[t._v("Confirm Selection")])],2)},a=[],i=n("025e"),o={data:function(){return this.$root.$data.state},methods:{accountChange:function(t){i["a"].sendToTopic({changeaccount:t})}}},s=o,u=n("2877"),c=Object(u["a"])(s,r,a,!1,null,null,null);e["default"]=c.exports},4709:function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("header-default",[n("div",{staticClass:"maincont"},[t.state._PC.batteryicon&&t.state._PC.showbatteryicon?n("img",{staticClass:"valign",attrs:{src:t.state._PC.batteryicon}}):t._e(),t.state._PC.batterypercent&&t.state._PC.showbatteryicon?n("b",{staticClass:"valign"},[t._v(t._s(t.state._PC.batterypercent))]):t._e(),t.state._PC.ntneticon?n("img",{staticClass:"valign",attrs:{img:"",src:t.state._PC.ntneticon}}):t._e(),t.state._PC.apclinkicon?n("img",{staticClass:"valign",attrs:{img:"",src:t.state._PC.apclinkicon}}):t._e(),n("div",{staticStyle:{float:"right"}},[n("vui-button",{attrs:{params:{PC_shutdown:1}}},[t._v("Shutdown")]),t.state._PC.showexitprogram?[n("vui-button",{attrs:{params:{PC_exit:1}}},[t._v("Exit Program")]),n("vui-button",{attrs:{params:{PC_minimize:1}}},[t._v("Minimize Program")])]:t._e()],2)])])},a=[],i={data:function(){return this.$root.$data}},o=i,s=(n("68bc"),n("2877")),u=Object(s["a"])(o,r,a,!1,null,"407221fa",null);e["default"]=u.exports},4795:function(t,e,n){var r=n("23e7"),a=n("da84"),i=n("342f"),o=[].slice,s=/MSIE .\./.test(i),u=function(t){return function(e,n){var r=arguments.length>2,a=r?o.call(arguments,2):void 0;return t(r?function(){("function"==typeof e?e:Function(e)).apply(this,a)}:e,n)}};r({global:!0,bind:!0,forced:s},{setTimeout:u(a.setTimeout),setInterval:u(a.setInterval)})},"47db":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("h3",[t._v(" Selected Products:")]),t._l(t.items,(function(e,r){return n("div",{key:r},[t.selection[r]&&t.selection[r]>0?n("span",[t._v(" "+t._s(t.selection[r])+"x "+t._s(r)+": at "+t._s(e*t.selection[r])+" Credits ")]):t._e()])})),n("h3",[t._v(" Total: "+t._s(t.priceSum))]),n("h4",[t._v("Destination Account: "+t._s(t.destinationact))]),n("h3",[t._v("Please swipe your ID to pay.")]),n("vui-button",{attrs:{params:{return:1},width:"3em"}},[t._v("Return to order menu")])],2)},a=[],i=(n("13d5"),n("b64b"),{data:function(){return this.$root.$data.state},computed:{priceSum:function(){var t=this;return Object.keys(this.selection).reduce((function(e,n){return isNaN(e)?t.items[n]*t.selection[n]:e+t.items[n]*t.selection[n]}))}}}),o=i,s=n("2877"),u=Object(s["a"])(o,r,a,!1,null,null,null);e["default"]=u.exports},4840:function(t,e,n){var r=n("825a"),a=n("1c0b"),i=n("b622"),o=i("species");t.exports=function(t,e){var n,i=r(t).constructor;return void 0===i||void 0==(n=r(i)[o])?e:a(n)}},"48f3":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[t._t("default")],2)},a=[],i=(n("d44d"),n("2877")),o={},s=Object(i["a"])(o,r,a,!1,null,"b2030120",null);e["default"]=s.exports},4930:function(t,e,n){var r=n("d039");t.exports=!!Object.getOwnPropertySymbols&&!r((function(){return!String(Symbol())}))},"4caa":function(t,e,n){var r=n("a919"),a=n("76dd"),i=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,o="\\u0300-\\u036f",s="\\ufe20-\\ufe2f",u="\\u20d0-\\u20ff",c=o+s+u,l="["+c+"]",d=RegExp(l,"g");function f(t){return t=a(t),t&&t.replace(i,r).replace(d,"")}t.exports=f},"4d4a":function(t,e,n){"use strict";var r=n("2665"),a=n.n(r);a.a},"4d64":function(t,e,n){var r=n("fc6a"),a=n("50c4"),i=n("23cb"),o=function(t){return function(e,n,o){var s,u=r(e),c=a(u.length),l=i(o,c);if(t&&n!=n){while(c>l)if(s=u[l++],s!=s)return!0}else for(;c>l;l++)if((t||l in u)&&u[l]===n)return t||l||0;return!t&&-1}};t.exports={includes:o(!0),indexOf:o(!1)}},"4de4":function(t,e,n){"use strict";var r=n("23e7"),a=n("b727").filter,i=n("1dde"),o=n("ae40"),s=i("filter"),u=o("filter");r({target:"Array",proto:!0,forced:!s||!u},{filter:function(t){return a(this,t,arguments.length>1?arguments[1]:void 0)}})},"4df4":function(t,e,n){"use strict";var r=n("0366"),a=n("7b0b"),i=n("9bdd"),o=n("e95a"),s=n("50c4"),u=n("8418"),c=n("35a1");t.exports=function(t){var e,n,l,d,f,v,p=a(t),m="function"==typeof this?this:Array,h=arguments.length,_=h>1?arguments[1]:void 0,g=void 0!==_,b=c(p),y=0;if(g&&(_=r(_,h>2?arguments[2]:void 0,2)),void 0==b||m==Array&&o(b))for(e=s(p.length),n=new m(e);e>y;y++)v=g?_(p[y],y):p[y],u(n,y,v);else for(d=b.call(p),f=d.next,n=new m;!(l=f.call(d)).done;y++)v=g?i(d,_,[l.value,y],!0):l.value,u(n,y,v);return n.length=y,n}},"4fad":function(t,e,n){var r=n("23e7"),a=n("6f53").entries;r({target:"Object",stat:!0},{entries:function(t){return a(t)}})},"508b":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("h3",[t._v("Tank Control System")]),t.state["input"]?n("div",[n("vui-item",{attrs:{balance:.65,label:"Input:"}},[t.state["input"].power?n("span",[t._v("Injecting")]):n("span",[t._v("On Hold")]),t._v(" "),n("vui-button",{attrs:{params:{in_toggle_injector:1},icon:"power-off"}},[t._v("Toggle Power")])],1),n("vui-item",{attrs:{balance:.65,label:"Flow Rate Limit:"}},[t._v(t._s(t.state["input"].rate)+" L/s")]),n("vui-item",{attrs:{balance:.65,label:"Command:"}},[n("vui-input-numeric",{attrs:{width:"3em","button-count":3,max:t.state.maxrate},on:{keypress:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.s({in_set_flowrate:t.state["input"].setrate})}},model:{value:t.state["input"].setrate,callback:function(e){t.$set(t.state["input"],"setrate",e)},expression:"state['input'].setrate"}}),n("br"),n("vui-button",{attrs:{"push-state":"",params:{in_set_flowrate:t.state["input"].setrate}}},[t._v("Set Flow Rate")])],1)],1):n("vui-button",{attrs:{params:{in_refresh_status:1}}},[t._v("Search for input port")]),t.state["output"]?n("div",{staticStyle:{"margin-top":"2em"}},[n("vui-item",{attrs:{balance:.65,label:"Output:"}},[t.state["output"].power?n("span",[t._v("Open")]):n("span",[t._v("On Hold")]),t._v(" "),n("vui-button",{attrs:{params:{out_toggle_power:1},icon:"power-off"}},[t._v("Toggle Power")])],1),n("vui-item",{attrs:{balance:.65,label:"Max Output Pressure:"}},[t._v(t._s(t.state["output"].pressure)+" kPa")]),n("vui-item",{attrs:{balance:.65,label:"Command:"}},[n("vui-input-numeric",{attrs:{width:"5em","button-count":4,"decimal-places":2,max:t.state.maxpressure},on:{keypress:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.s({out_set_pressure:t.state["output"].setpressure})}},model:{value:t.state["output"].setpressure,callback:function(e){t.$set(t.state["output"],"setpressure",e)},expression:"state['output'].setpressure"}}),n("br"),n("vui-button",{attrs:{"push-state":"",params:{out_set_pressure:t.state["output"].setpressure}}},[t._v("Set Pressure")])],1)],1):n("vui-button",{attrs:{params:{out_refresh_status:1}}},[t._v("Search for output port")])],1)},a=[],i=n("025e"),o={data:function(){return this.$root.$data},methods:{s:function(t){i["a"].sendToTopic(t)}}},s=o,u=n("2877"),c=Object(u["a"])(s,r,a,!1,null,null,null);e["default"]=c.exports},"50c4":function(t,e,n){var r=n("a691"),a=Math.min;t.exports=function(t){return t>0?a(r(t),9007199254740991):0}},5135:function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},5319:function(t,e,n){"use strict";var r=n("d784"),a=n("825a"),i=n("7b0b"),o=n("50c4"),s=n("a691"),u=n("1d80"),c=n("8aa5"),l=n("14c3"),d=Math.max,f=Math.min,v=Math.floor,p=/\$([$&'`]|\d\d?|<[^>]*>)/g,m=/\$([$&'`]|\d\d?)/g,h=function(t){return void 0===t?t:String(t)};r("replace",2,(function(t,e,n,r){var _=r.REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE,g=r.REPLACE_KEEPS_$0,b=_?"$":"$0";return[function(n,r){var a=u(this),i=void 0==n?void 0:n[t];return void 0!==i?i.call(n,a,r):e.call(String(a),n,r)},function(t,r){if(!_&&g||"string"===typeof r&&-1===r.indexOf(b)){var i=n(e,t,this,r);if(i.done)return i.value}var u=a(t),v=String(this),p="function"===typeof r;p||(r=String(r));var m=u.global;if(m){var w=u.unicode;u.lastIndex=0}var x=[];while(1){var $=l(u,v);if(null===$)break;if(x.push($),!m)break;var C=String($[0]);""===C&&(u.lastIndex=c(v,o(u.lastIndex),w))}for(var k="",S=0,O=0;O
"+this.$root.$data.active.substr(1)+"
":null}},watch:{state:{handler:function(){s["a"].pushState()},deep:!0}}}).$mount("#app")}document.getElementById("header")&&new e["a"]({data:s["a"].state}).$mount("#header"),document.getElementById("dapp")&&new e["a"]({data:s["a"].state,template:"Debug this UI with inspector by opening URL in your browser:
{{url}}Current data of UI:
{{ JSON.stringify(this.$root.$data, null, ' ') }}"))}}),n("vui-button",{attrs:{params:{_openurl:e[4]}}},[t._v("Open")])],1)})),0)]:t._e(),t._t("default")],2),!t.hideAdvanced&&1&t.editable?n("vui-button",{staticClass:"danger",attrs:{params:{deleterecord:1},icon:"trash-alt"}},[t._v("Delete record")]):t._e()],1):t._e()},a=[],i=(n("ac1f"),n("5319"),{data:function(){return this.$root.$data.state},props:{hideAdvanced:{type:Boolean,default:!1}},filters:{replace:function(t,e,n){return t.replace(e,n)}}}),o=i,s=(n("bb33"),n("2877")),u=Object(s["a"])(o,r,a,!1,null,"085e2812",null);e["default"]=u.exports},3270:function(t,e,n){"use strict";var r=n("7b42"),a=n.n(r);a.a},"342f":function(t,e,n){var r=n("d066");t.exports=r("navigator","userAgent")||""},3468:function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[t.read?n("vui-group",[n("vui-group-item",{attrs:{label:"Pressure:"}},[t._v(" "+t._s(t.press.toFixed(1))+" ")]),n("vui-group-item",{attrs:{label:"Temperature:"}},[t._v(" "+t._s(t.temp.toFixed(1))+" K ("+t._s(t.tempC.toFixed(1))+"°C) ")]),n("vui-group-item",{attrs:{label:"Gases:"}},[t.gas.oxygen?n("span",{staticClass:"complist"},[t._v(t._s(t.gas.oxygen.toFixed(2))+" O"),n("sub",[t._v("2")])]):t._e(),t.gas.nitrogen?n("span",{staticClass:"complist"},[t._v(t._s(t.gas.nitrogen.toFixed(2))+" N")]):t._e(),t.gas.carbon_dioxide?n("span",{staticClass:"complist"},[t._v(t._s(t.gas.carbon_dioxide.toFixed(2))+" CO"),n("sub",[t._v("2"),n("sub")])]):t._e(),t.gas.phoron?n("span",{staticClass:"complist"},[t._v(t._s(t.gas.phoron.toFixed(2))+" PH")]):t._e(),t.gas.sleeping_agent?n("span",{staticClass:"complist"},[t._v(t._s(t.gas.sleeping_agent.toFixed(2))+" SA")]):t._e()])],1):n("span",{staticClass:"bad"},[t._v("Unable to obtain air reading!")])],1)},a=[],i={data:function(){return this.$root.$data.state}},o=i,s=(n("fd5c"),n("2877")),u=Object(s["a"])(o,r,a,!1,null,"664f2b03",null);e["default"]=u.exports},"34ac":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[t.editing?[t._t("default",[n("input",{directives:[{name:"model",rawName:"v-model",value:t.gdata.state.editingvalue,expression:"gdata.state.editingvalue"}],domProps:{value:t.gdata.state.editingvalue},on:{input:function(e){e.target.composing||t.$set(t.gdata.state,"editingvalue",e.target.value)}}})]),n("vui-button",{attrs:{icon:"check"},on:{click:t.save}})]:[n("span",{staticStyle:{"white-space":"pre-wrap"}},[t._v(t._s(t.rvalue))]),t._v(" "),t.reditable||t.editButton?n("vui-button",{staticStyle:{"white-space":"pre-wrap"},attrs:{icon:"pen"},on:{click:t.beginEditing}},[t._v(t._s(t.editbtnname))]):t._e()]],2)},a=[],i=(n("ac1f"),n("5319"),n("1276"),n("025e")),o={data:function(){return{editing:!1,gdata:this.$root.$data,startEditHandler:null}},props:{value:{type:String,default:""},path:{type:String,default:null},editable:{type:Boolean,default:!1},editButton:{type:String,default:null}},computed:{reditable:function(){return!!this.path&&this.editable},rvalue:function(){return this.path?i["a"].dotNotationRead(this.gdata.state,this.path):this.value},editbtnname:function(){return this.editButton?this.editButton:""}},methods:{beginEditing:function(){var t=this;(this.reditable||this.editButton)&&(this.$root.$emit("record-field-start-editing"),this.gdata.state.editingvalue=this.rvalue,this.startEditHandler=function(){t.endEditing()},this.$root.$on("record-field-start-editing",this.startEditHandler),this.editing=!0)},endEditing:function(){(this.reditable||this.editButton)&&(this.editing=!1,this.$root.$off("record-field-start-editing",this.startEditHandler))},save:function(){(this.reditable||this.editButton)&&(this.endEditing(),this.editButton?this.$emit("save",this.gdata.state.editingvalue):i["a"].sendToTopic({editrecord:{value:this.gdata.state.editingvalue,key:this.path.split(".")}}))}},filters:{replace:function(t,e,n){return t.replace(e,n)}}},s=o,u=(n("3270"),n("2877")),c=Object(u["a"])(s,r,a,!1,null,"e071fda6",null);e["default"]=c.exports},"355d":function(t,e,n){},"35a1":function(t,e,n){var r=n("f5df"),a=n("3f8c"),i=n("b622"),o=i("iterator");t.exports=function(t){if(void 0!=t)return t[o]||t["@@iterator"]||a[r(t)]}},3729:function(t,e,n){var r=n("9e69"),a=n("00fd"),i=n("29f3"),o="[object Null]",s="[object Undefined]",u=r?r.toStringTag:void 0;function c(t){return null==t?void 0===t?s:o:u&&u in Object(t)?a(t):i(t)}t.exports=c},"37e8":function(t,e,n){var r=n("83ab"),a=n("9bf2"),i=n("825a"),o=n("df75");t.exports=r?Object.defineProperties:function(t,e){i(t);var n,r=o(e),s=r.length,u=0;while(s>u)a.f(t,n=r[u++],e[n]);return t}},3831:function(t,e,n){"use strict";var r=n("9e80"),a=n.n(r);a.a},3851:function(t,e,n){var r={"./header/default.vue":"f3ce","./header/minimal.vue":"d657","./header/modular-computer.vue":"4709","./view/admin/player-panel.vue":"3930","./view/console/atmocontrol/injector.vue":"614c","./view/console/atmocontrol/main.vue":"86ad","./view/console/atmocontrol/supermatter.vue":"df0b","./view/console/atmocontrol/tank.vue":"508b","./view/cooking/microwave.vue":"c1e2","./view/devices/gps/gps.vue":"0566","./view/devices/quikpay/confirmation.vue":"47db","./view/devices/quikpay/main.vue":"4678","./view/manifest.vue":"f264","./view/mcomputer/medical/sensors.vue":"f309","./view/mcomputer/pai/atmosphere.vue":"3468","./view/mcomputer/pai/directives.vue":"d3c6","./view/mcomputer/pai/doorjack.vue":"3b8a","./view/mcomputer/pai/radio.vue":"207c","./view/mcomputer/pai/signaler.vue":"c939","./view/mcomputer/security/penalcontroller.vue":"2c9a","./view/mcomputer/system/config.vue":"07c3","./view/mcomputer/system/downloader.vue":"019f","./view/mcomputer/system/main.vue":"13c9","./view/mcomputer/system/manager.vue":"d3c8","./view/medical/bodyscanner.vue":"1062","./view/misc/doors.vue":"3a07","./view/misc/ghostspawner.vue":"1503","./view/misc/maglock-config.vue":"0ea6","./view/misc/maglock.vue":"20a6","./view/misc/pai/recruit.vue":"9324","./view/misc/voting.vue":"e31d","./view/paperwork/fax.vue":"9556","./view/paperwork/photocopier.vue":"6a01","./view/records/field.vue":"34ac","./view/records/general.vue":"2fa9","./view/records/incident.vue":"256f","./view/records/list-locked.vue":"c0f7","./view/records/list-virus.vue":"8385","./view/records/list.vue":"ac4c","./view/records/login.vue":"a8bb","./view/records/main.vue":"cf32","./view/records/medical.vue":"203b","./view/records/security.vue":"b6db","./view/records/virus.vue":"73f5","./view/turrets/control-part.vue":"10d4","./view/turrets/control.vue":"fb48","./view/wanalyzer/analyzer.vue":"407e","./vui/button.vue":"5aa2","./vui/group-item.vue":"2704","./vui/group.vue":"48f3","./vui/img.vue":"810a","./vui/input/numeric.vue":"210c","./vui/input/search.vue":"419b","./vui/item.vue":"faf6","./vui/progress.vue":"1253","./vui/tooltip.vue":"0ec3"};function a(t){var e=i(t);return n(e)}function i(t){if(!n.o(r,t)){var e=new Error("Cannot find module '"+t+"'");throw e.code="MODULE_NOT_FOUND",e}return r[t]}a.keys=function(){return Object.keys(r)},a.resolve=i,t.exports=a,a.id="3851"},3930:function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,check_antagonist:1}}},[t._v("Check antagonists")]),n("vui-input-search",{staticStyle:{float:"right"},attrs:{input:t.players_filtered,keys:["name","real_name","assigment","key","ip"],autofocus:"",threshold:t.threshold,"include-score":""},model:{value:t.search_results,callback:function(e){t.search_results=e},expression:"search_results"}}),n("div",{staticClass:"table"},[n("div",{staticClass:"header"},[n("div",{staticClass:"header-item"},[t._v("Name")]),n("div",{staticClass:"header-item"},[t._v("Assignment")]),n("div",{staticClass:"header-item"},[t._v("Key")]),t.s.ismod?n("div",{staticClass:"header-item"},[t._v("Age")]):t._e(),t.s.ismod?n("div",{staticClass:"header-item"},[t._v("Antag")]):t._e(),n("div",{staticClass:"header-item"},[t._v("Actions")])]),t._l(t.search_results,(function(e){return n("div",{key:e.item.ref,staticClass:"player",style:{opacity:1-e.score*t.score_multiplier}},[n("div",{staticClass:"item"},[e.item.name==e.item.real_name||"NA"==e.item.assigment?[t._v(t._s(e.item.name))]:n("vui-tooltip",{attrs:{label:e.item.name}},[t._v(t._s(e.item.real_name))])],2),n("div",{staticClass:"item"},["NA"==e.item.assigment?[t._v(t._s(e.item.real_name))]:[t._v(t._s(e.item.assigment))]],2),n("div",{staticClass:"item"},[t.s.ismod?n("vui-tooltip",{scopedSlots:t._u([{key:"label",fn:function(){return[t._v(t._s(e.item.key)),e.item.connected?t._e():n("span",[t._v(" (DC)")])]},proxy:!0}],null,!0)},[t._v(" "+t._s(e.item.ip)+" ")]):[t._v(" "+t._s(e.item.key)),e.item.connected?t._e():n("span",[t._v(" (DC)")])]],2),t.s.ismod?n("div",{staticClass:"item"},[t._v(t._s(e.item.age))]):t._e(),t.s.ismod?n("div",{staticClass:"item"},[-1==e.item.antag?n("span",[t._v("NA")]):0==e.item.antag?n("span",[t._v("No")]):t._e(),1==e.item.antag?n("span",{staticClass:"red"},[n("vui-tooltip",{attrs:{label:"ADD"}},[t._v("This antag was added by admin.")])],1):t._e(),2==e.item.antag?n("span",{staticClass:"red"},[n("vui-tooltip",{attrs:{label:"GM"}},[t._v("This antag was added by gamemode.")])],1):t._e()]):t._e(),n("div",{staticClass:"item",staticStyle:{"text-align":"right"}},[n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,adminplayeropts:e.item.ref}}},[t._v("PP")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,priv_msg:e.item.ref}}},[t._v("PM")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,subtlemessage:e.item.ref}}},[t._v("SM")]),n("vui-button",{attrs:{"unsafe-params":{_src_:"vars",Vars:e.item.ref}}},[t._v("VV")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,mob:e.item.ref,notes:"show"}}},[t._v("N")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,traitor:e.item.ref}}},[t._v("TP")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,adminplayerobservejump:e.item.ref}}},[t._v("JMP")]),n("vui-button",{attrs:{"unsafe-params":{src:t.s.holder_ref,admin_wind_player:e.item.ref}}},[t._v("WIND")])],1)])}))],2)],1)},a=[],i=(n("4de4"),n("07ac"),{data:function(){return{search_results:[],s:this.$root.$data.state,threshold:.3}},computed:{players_filtered:function(){return Object.values(this.s.players).filter((function(t){return t}))},score_multiplier:function(){return 1/this.threshold}}}),o=i,s=(n("c8b2"),n("2877")),u=Object(s["a"])(o,r,a,!1,null,"301700a1",null);e["default"]=u.exports},"3a07":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("vui-group",[n("vui-group-item",{attrs:{label:"Main power:"}},[n("vui-progress",{class:{good:0==t.s.plu_main,bad:-1==t.s.plu_main,average:t.s.plu_main>0},staticStyle:{width:"12em"},attrs:{value:t.gs.wtime,min:t.s.plua_main,max:t.s.plu_main||10}},[t._v(" "+t._s(t.mainMsg)+" ")]),n("vui-button",{attrs:{disabled:0!=t.s.plu_main,params:{command:"main_power"}}},[t._v("Interrupt")])],1),n("vui-group-item",{attrs:{label:"Backup power:"}},[n("vui-progress",{class:{good:0==t.s.plu_back||0==t.s.plu_main,bad:-1==t.s.plu_back&&0!=t.s.plu_main,average:t.s.plu_back>0},staticStyle:{width:"12em"},attrs:{value:t.gs.wtime,min:t.s.plua_back,max:t.s.plu_back||10}},[t._v(" "+t._s(t.backupMsg)+" ")]),n("vui-button",{attrs:{disabled:0!=t.s.plu_back,params:{command:"backup_power"}}},[t._v("Interrupt")])],1),n("vui-group-item",{attrs:{label:"Electrified status:"}},[n("vui-progress",{class:{good:0==t.s.ele,bad:-1==t.s.ele,average:t.s.ele>0},staticStyle:{width:"12em"},attrs:{value:t.gs.wtime,min:t.s.elea,max:t.s.ele||10}},[t._v(" "+t._s(t.eleMsg)+" ")]),n("vui-button",{attrs:{disabled:0==t.s.ele,params:{command:"electrify_permanently",activate:0}}},[t._v("R")]),t.s.isai?t._e():[n("vui-button",{attrs:{disabled:t.s.ele>0,params:{command:"electrify_temporary",activate:1}}},[t._v("T")]),n("vui-button",{attrs:{disabled:-1==t.s.ele,params:{command:"electrify_permanently",activate:1}}},[t._v("P")])]],2),n("vui-group-item"),t._l(t.commands,(function(e,r){return n("vui-group-item",{key:r,attrs:{label:e.n+":"}},[n("vui-button",{class:{on:t.s[r]},staticStyle:{"min-width":"6em"},attrs:{params:{command:r,activate:e.i?1:0}}},[t._v(t._s(e.et||"Enabled"))]),n("vui-button",{class:{on:!t.s[r]&&!e.d,danger:!t.s[r]&&e.d},staticStyle:{"min-width":"6em"},attrs:{disabled:!!(e.a&&t.s.isai||t.isAdmin),params:{command:r,activate:e.i?0:1}}},[t._v(t._s(e.dt||"Disabled"))])],1)}))],2)],1)},a=[],i={data:function(){var t=this.$root.$data,e=t.state;return{gs:t,s:e,commands:{idscan:{n:"IdScan",i:!0},bolts:{n:"Bolts",et:"Raised",dt:"Dropped",a:!0},lights:{n:"Bolt Lights",i:!0},safeties:{n:"Safeties",et:"Nominal",dt:"Overridden",d:!0},timing:{n:"Timing",et:"Nominal",dt:"Overridden",d:!0},open:{n:"Door State",et:"Opened",dt:"Closed",i:1}}}},computed:{mainMsg:function(){return this.getPowerStatusMessage(this.s.plu_main,this.gs.wtime)},backupMsg:function(){return this.getPowerStatusMessage(this.s.plu_back,this.gs.wtime)},eleMsg:function(){if(0==this.s.ele)return"Safe";if(-1==this.s.ele)return"Permanently";var t=Math.max(Math.round((this.s.ele-this.gs.wtime)/10),0);return"".concat(t,"s left")}},methods:{getPowerStatusMessage:function(t,e){if(-1==t)return"Offline";if(0==t)return"Online";var n=Math.max(Math.round((t-e)/10),0);return"Interrupted, ".concat(n,"s left")}}},o=i,s=n("2877"),u=Object(s["a"])(o,r,a,!1,null,null,null);e["default"]=u.exports},"3b8a":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("vui-group",[n("vui-group-item",{attrs:{label:"Cable:"}},[t.connected?n("span",[t._v("Connected")]):t.extended?n("span",[t._v("Extended")]):n("vui-button",{attrs:{params:{extend:1}}},[t._v("Retracted")])],1),t.connected?n("vui-group-item",{attrs:{label:"Hack:"}},[t.ishacking?[n("vui-progress",{attrs:{max:1e3,value:t.progress}},[t._v(t._s(t.progress/10)+"%")]),n("vui-button",{attrs:{params:{cancel:1}}},[t._v("Cancel")])]:n("vui-button",{attrs:{params:{hack:1}}},[t._v("Start")])],2):t.aborted?n("vui-group-item",[n("div",{staticClass:"bad"},[t._v("Hack aborted!")])]):t._e()],1)],1)},a=[],i={data:function(){return this.$root.$data.state}},o=i,s=n("2877"),u=Object(s["a"])(o,r,a,!1,null,"2c69059a",null);e["default"]=u.exports},"3bab":function(t,e,n){"use strict";var r=n("9e79"),a=n.n(r);a.a},"3bb1":function(t,e,n){"use strict";var r=n("2b55"),a=n.n(r);a.a},"3bbe":function(t,e,n){var r=n("861d");t.exports=function(t){if(!r(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype");return t}},"3ca3":function(t,e,n){"use strict";var r=n("6547").charAt,a=n("69f3"),i=n("7dd0"),o="String Iterator",s=a.set,u=a.getterFor(o);i(String,"String",(function(t){s(this,{type:o,string:String(t),index:0})}),(function(){var t,e=u(this),n=e.string,a=e.index;return a>=n.length?{value:void 0,done:!0}:(t=r(n,a),e.index+=t.length,{value:t,done:!1})}))},"3f8c":function(t,e){t.exports={}},4069:function(t,e,n){var r=n("44d2");r("flat")},"407e":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("b",[t._v("Analyzing "+t._s(t.name)+" ")]),n("br"),t.$root.$data.assets["icon"]?n("div",[n("vui-img",{attrs:{name:"icon"}})],1):t._e(),1==t.item?n("div",[n("table",{staticClass:"other"},[n("tr",[n("td",[t._v(" Damage type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.damage_type)+" ")])]),n("tr",[n("td",[t._v(" Item's estimated force-rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.force)+" points")])]),n("tr",[n("td",[t._v(" Item's estimated throw force-rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.throw_force)+" points ")])]),1==t.energy?[n("tr",[n("td",[t._v(" Item's estimated force-rating when activated: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.active_force)+" points ")])]),n("tr",[n("td",[t._v(" Item's estimated throw force-rating when activated: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.active_throw_force)+" points")])]),n("tr",[n("td",[t._v(" Base block chance is: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.base_block_chance)+"% ")])]),n("tr",[n("td",[t._v(" Base reflect chance is: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.base_reflectchance)+"% ")])]),n("tr",[n("td",[t._v(" Item's estimated shield rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.shield_power)+" points")])]),n("tr",[n("td",[t._v(" Can block bullets: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.can_block)+" ")])])]:t._e(),n("tr",[n("td",[t._v(" Is sharp:")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.sharp)+" ")])]),n("tr",[n("td",[t._v(" Chance to dismember: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.edge)+" ")])]),n("tr",[n("td",[t._v(" Item's estimated armor penetration rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.penetration)+" points")])])],2)]):t._e(),1==t.gun?n("div",{staticClass:"active_energy"},[n("table",{staticClass:"other"},[n("tr",[n("td",[t._v(" Maximum shots: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.max_shots)+" ")])]),n("tr",[n("td",[t._v(" Burst: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.burst)+" ")])]),n("tr",[n("td",[t._v(" Self recharge: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.recharge)+" ")])]),n("tr",[n("td",[t._v(" Recharge time: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.recharge_time)+" ")])]),n("tr",[n("td",[t._v(" Reliability: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.reliability)+" ")])]),n("br"),n("b",[t._v("First projectile information: ")]),n("br"),n("tr",[n("td",[t._v(" Projectile's estimated damage rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.damage)+" points")])]),n("tr",[n("td",[t._v(" Projectile's Damage type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.damage_type)+" ")])]),n("tr",[n("td",[t._v(" Projectile's estimated armor penetration rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.armor_penetration)+" points")])]),n("tr",[n("td",[t._v(" Projectile's armor damage type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.check_armor)+" ")])]),n("tr",[n("td",[t._v(" Projectile's shrapnel type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.shrapnel_type)+" ")])]),n("tr",[n("td",[t._v(" Stun: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.stun)+" ")])]),t.secondary_damage?[n("br"),n("b",[t._v("Second projectile information: ")]),n("br"),n("tr",[n("td",[t._v(" Projectile's estimated damage rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_damage)+" points")])]),n("tr",[n("td",[t._v(" Projectile's damage type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_damage_type)+" ")])]),n("tr",[n("td",[t._v(" Projectile's estimated armor penetration rating: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_armor_penetration)+" points")])]),n("tr",[n("td",[t._v(" Projectile's armor damage type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_check_armor)+" ")])]),n("tr",[n("td",[t._v(" Projectile's shrapnel type: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_shrapnel_type)+" ")])]),n("tr",[n("td",[t._v(" Stun: ")]),t._v(" "),n("td",{staticClass:"right"},[t._v(" "+t._s(t.secondary_stun)+" ")])])]:t._e()],2)]):t._e(),t.gun_mods?n("div",[n("br"),n("b",[t._v("Modular gun information: ")]),n("br"),n("table",{staticClass:"modular"},[t._m(0),t._l(t.gun_mods,(function(e,r){return n("tr",{key:r},[n("td",[t._v(t._s(r))]),t._l(e,(function(r,a){return n("td",{key:a},[t._v(" "+t._s(e[a])+" ")])}))],2)}))],2)]):t._e()])},a=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("tr",[n("th",[t._v(" Name ")]),n("th",[t._v(" Reliability ")]),n("th",[t._v(" Damage modifier ")]),n("th",[t._v(" Fire delay modifier ")]),n("th",[t._v(" Number of shots modifier ")]),n("th",[t._v(" Burst modifier ")]),n("th",[t._v(" Accuracy modifier ")]),n("th",[t._v(" Repair tool ")])])}],i={data:function(){return this.$root.$data.state}},o=i,s=(n("a206"),n("2877")),u=Object(s["a"])(o,r,a,!1,null,"4bd3d7b3",null);e["default"]=u.exports},4128:function(t,e,n){"use strict";var r=n("1352"),a=n.n(r);a.a},4160:function(t,e,n){"use strict";var r=n("23e7"),a=n("17c2");r({target:"Array",proto:!0,forced:[].forEach!=a},{forEach:a})},"419b":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("input",{directives:[{name:"model",rawName:"v-model",value:t.searchValue,expression:"searchValue"}],attrs:{type:"text",placeholder:"Search..."},domProps:{value:t.searchValue},on:{input:function(e){e.target.composing||(t.searchValue=e.target.value)}}})},a=[],i=(n("e260"),n("d81d"),n("a9e3"),n("d3b7"),n("ac1f"),n("841c"),n("ddb0"),n("ffe7")),o=n.n(i),s={data:function(){return{fuse:null,searchValue:""}},mounted:function(){this.onFieldUpdate(this.searchValue)},props:{keys:{type:Array,default:function(){return[]}},includeScore:{type:Boolean,default:!1},threshold:{type:Number,default:.6},input:{type:Array,default:function(){return[]}},value:{type:Array,default:function(){return[]}}},watch:{keys:function(){this.fuse=null},includeScore:function(){this.fuse=null},threshold:function(){this.fuse=null},input:function(){this.onFieldUpdate(this.searchValue)},searchValue:function(t){this.onFieldUpdate(t)}},methods:{onFieldUpdate:function(t){this.initFuse();var e=this.fuse.search(t);0==e.length&&(e=this.includeScore?this.input.map((function(t){return{item:t,score:0}})):this.input),this.$emit("input",e)},initFuse:function(){if(null==this.fuse){var t={shouldSort:!0,findAllMatches:!0,keys:this.keys,includeScore:this.includeScore,threshold:this.threshold};this.fuse=new o.a(this.input,t)}else this.fuse.setCollection(this.input)}}},u=s,c=n("2877"),l=Object(c["a"])(u,r,a,!1,null,null,null);e["default"]=l.exports},"428f":function(t,e,n){var r=n("da84");t.exports=r},"44ad":function(t,e,n){var r=n("d039"),a=n("c6b6"),i="".split;t.exports=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==a(t)?i.call(t,""):Object(t)}:Object},"44d2":function(t,e,n){var r=n("b622"),a=n("7c73"),i=n("9bf2"),o=r("unscopables"),s=Array.prototype;void 0==s[o]&&i.f(s,o,{configurable:!0,value:a(null)}),t.exports=function(t){s[o][t]=!0}},"44e7":function(t,e,n){var r=n("861d"),a=n("c6b6"),i=n("b622"),o=i("match");t.exports=function(t){var e;return r(t)&&(void 0!==(e=t[o])?!!e:"RegExp"==a(t))}},4678:function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[t._l(t.items,(function(e,r){return n("div",{key:r,staticStyle:{clear:"both"}},[t._v(" "+t._s(r)+": "+t._s(e)+" Credits "),n("div",{staticStyle:{float:"right"}},[n("vui-input-numeric",{attrs:{width:"2em"},model:{value:t.selection[r],callback:function(e){t.$set(t.selection,r,e)},expression:"selection[name]"}}),1==t.editmode?n("vui-button",{attrs:{params:{remove:r},width:"3em"}},[t._v("Delete")]):t._e()],1)])})),1==t.editmode?n("div",[n("input",{directives:[{name:"model",rawName:"v-model",value:t.tmp_name,expression:"tmp_name"}],domProps:{value:t.tmp_name},on:{input:function(e){e.target.composing||(t.tmp_name=e.target.value)}}}),n("vui-input-numeric",{attrs:{width:"3em","button-count":2},model:{value:t.tmp_price,callback:function(e){t.tmp_price=e},expression:"tmp_price"}}),n("vui-button",{attrs:{params:{add:{name:t.tmp_name,price:t.tmp_price}}}},[t._v("Add")]),n("vui-button",{attrs:{params:{accountselect:1},width:"3em"}},[t._v("Select Destination Account")])],1):t._e(),n("vui-button",{attrs:{params:{locking:1},width:"3em"}},[t._v("Toggle Lock")]),n("vui-button",{attrs:{params:{confirm:t.selection}}},[t._v("Confirm Selection")])],2)},a=[],i=n("025e"),o={data:function(){return this.$root.$data.state},methods:{accountChange:function(t){i["a"].sendToTopic({changeaccount:t})}}},s=o,u=n("2877"),c=Object(u["a"])(s,r,a,!1,null,null,null);e["default"]=c.exports},4709:function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("header-default",[n("div",{staticClass:"maincont"},[t.state._PC.batteryicon&&t.state._PC.showbatteryicon?n("img",{staticClass:"valign",attrs:{src:t.state._PC.batteryicon}}):t._e(),t.state._PC.batterypercent&&t.state._PC.showbatteryicon?n("b",{staticClass:"valign"},[t._v(t._s(t.state._PC.batterypercent))]):t._e(),t.state._PC.ntneticon?n("img",{staticClass:"valign",attrs:{img:"",src:t.state._PC.ntneticon}}):t._e(),t.state._PC.apclinkicon?n("img",{staticClass:"valign",attrs:{img:"",src:t.state._PC.apclinkicon}}):t._e(),n("div",{staticStyle:{float:"right"}},[n("vui-button",{attrs:{params:{PC_shutdown:1}}},[t._v("Shutdown")]),t.state._PC.showexitprogram?[n("vui-button",{attrs:{params:{PC_exit:1}}},[t._v("Exit Program")]),n("vui-button",{attrs:{params:{PC_minimize:1}}},[t._v("Minimize Program")])]:t._e()],2)])])},a=[],i={data:function(){return this.$root.$data}},o=i,s=(n("68bc"),n("2877")),u=Object(s["a"])(o,r,a,!1,null,"407221fa",null);e["default"]=u.exports},4795:function(t,e,n){var r=n("23e7"),a=n("da84"),i=n("342f"),o=[].slice,s=/MSIE .\./.test(i),u=function(t){return function(e,n){var r=arguments.length>2,a=r?o.call(arguments,2):void 0;return t(r?function(){("function"==typeof e?e:Function(e)).apply(this,a)}:e,n)}};r({global:!0,bind:!0,forced:s},{setTimeout:u(a.setTimeout),setInterval:u(a.setInterval)})},"47db":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("h3",[t._v(" Selected Products:")]),t._l(t.items,(function(e,r){return n("div",{key:r},[t.selection[r]&&t.selection[r]>0?n("span",[t._v(" "+t._s(t.selection[r])+"x "+t._s(r)+": at "+t._s(e*t.selection[r])+" Credits ")]):t._e()])})),n("h3",[t._v(" Total: "+t._s(t.priceSum))]),n("h4",[t._v("Destination Account: "+t._s(t.destinationact))]),n("h3",[t._v("Please swipe your ID to pay.")]),n("vui-button",{attrs:{params:{return:1},width:"3em"}},[t._v("Return to order menu")])],2)},a=[],i=(n("13d5"),n("b64b"),{data:function(){return this.$root.$data.state},computed:{priceSum:function(){var t=this;return Object.keys(this.selection).reduce((function(e,n){return isNaN(e)?t.items[n]*t.selection[n]:e+t.items[n]*t.selection[n]}))}}}),o=i,s=n("2877"),u=Object(s["a"])(o,r,a,!1,null,null,null);e["default"]=u.exports},4840:function(t,e,n){var r=n("825a"),a=n("1c0b"),i=n("b622"),o=i("species");t.exports=function(t,e){var n,i=r(t).constructor;return void 0===i||void 0==(n=r(i)[o])?e:a(n)}},"48f3":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[t._t("default")],2)},a=[],i=(n("d44d"),n("2877")),o={},s=Object(i["a"])(o,r,a,!1,null,"b2030120",null);e["default"]=s.exports},4930:function(t,e,n){var r=n("d039");t.exports=!!Object.getOwnPropertySymbols&&!r((function(){return!String(Symbol())}))},"4caa":function(t,e,n){var r=n("a919"),a=n("76dd"),i=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,o="\\u0300-\\u036f",s="\\ufe20-\\ufe2f",u="\\u20d0-\\u20ff",c=o+s+u,l="["+c+"]",d=RegExp(l,"g");function f(t){return t=a(t),t&&t.replace(i,r).replace(d,"")}t.exports=f},"4d4a":function(t,e,n){"use strict";var r=n("2665"),a=n.n(r);a.a},"4d64":function(t,e,n){var r=n("fc6a"),a=n("50c4"),i=n("23cb"),o=function(t){return function(e,n,o){var s,u=r(e),c=a(u.length),l=i(o,c);if(t&&n!=n){while(c>l)if(s=u[l++],s!=s)return!0}else for(;c>l;l++)if((t||l in u)&&u[l]===n)return t||l||0;return!t&&-1}};t.exports={includes:o(!0),indexOf:o(!1)}},"4de4":function(t,e,n){"use strict";var r=n("23e7"),a=n("b727").filter,i=n("1dde"),o=n("ae40"),s=i("filter"),u=o("filter");r({target:"Array",proto:!0,forced:!s||!u},{filter:function(t){return a(this,t,arguments.length>1?arguments[1]:void 0)}})},"4df4":function(t,e,n){"use strict";var r=n("0366"),a=n("7b0b"),i=n("9bdd"),o=n("e95a"),s=n("50c4"),u=n("8418"),c=n("35a1");t.exports=function(t){var e,n,l,d,f,v,p=a(t),m="function"==typeof this?this:Array,h=arguments.length,_=h>1?arguments[1]:void 0,g=void 0!==_,b=c(p),y=0;if(g&&(_=r(_,h>2?arguments[2]:void 0,2)),void 0==b||m==Array&&o(b))for(e=s(p.length),n=new m(e);e>y;y++)v=g?_(p[y],y):p[y],u(n,y,v);else for(d=b.call(p),f=d.next,n=new m;!(l=f.call(d)).done;y++)v=g?i(d,_,[l.value,y],!0):l.value,u(n,y,v);return n.length=y,n}},"4fad":function(t,e,n){var r=n("23e7"),a=n("6f53").entries;r({target:"Object",stat:!0},{entries:function(t){return a(t)}})},"508b":function(t,e,n){"use strict";n.r(e);var r=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("h3",[t._v("Tank Control System")]),t.state["input"]?n("div",[n("vui-item",{attrs:{balance:.65,label:"Input:"}},[t.state["input"].power?n("span",[t._v("Injecting")]):n("span",[t._v("On Hold")]),t._v(" "),n("vui-button",{attrs:{params:{in_toggle_injector:1},icon:"power-off"}},[t._v("Toggle Power")])],1),n("vui-item",{attrs:{balance:.65,label:"Flow Rate Limit:"}},[t._v(t._s(t.state["input"].rate)+" L/s")]),n("vui-item",{attrs:{balance:.65,label:"Command:"}},[n("vui-input-numeric",{attrs:{width:"3em","button-count":3,max:t.state.maxrate},on:{keypress:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.s({in_set_flowrate:t.state["input"].setrate})}},model:{value:t.state["input"].setrate,callback:function(e){t.$set(t.state["input"],"setrate",e)},expression:"state['input'].setrate"}}),n("br"),n("vui-button",{attrs:{"push-state":"",params:{in_set_flowrate:t.state["input"].setrate}}},[t._v("Set Flow Rate")])],1)],1):n("vui-button",{attrs:{params:{in_refresh_status:1}}},[t._v("Search for input port")]),t.state["output"]?n("div",{staticStyle:{"margin-top":"2em"}},[n("vui-item",{attrs:{balance:.65,label:"Output:"}},[t.state["output"].power?n("span",[t._v("Open")]):n("span",[t._v("On Hold")]),t._v(" "),n("vui-button",{attrs:{params:{out_toggle_power:1},icon:"power-off"}},[t._v("Toggle Power")])],1),n("vui-item",{attrs:{balance:.65,label:"Max Output Pressure:"}},[t._v(t._s(t.state["output"].pressure)+" kPa")]),n("vui-item",{attrs:{balance:.65,label:"Command:"}},[n("vui-input-numeric",{attrs:{width:"5em","button-count":4,"decimal-places":2,max:t.state.maxpressure},on:{keypress:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.s({out_set_pressure:t.state["output"].setpressure})}},model:{value:t.state["output"].setpressure,callback:function(e){t.$set(t.state["output"],"setpressure",e)},expression:"state['output'].setpressure"}}),n("br"),n("vui-button",{attrs:{"push-state":"",params:{out_set_pressure:t.state["output"].setpressure}}},[t._v("Set Pressure")])],1)],1):n("vui-button",{attrs:{params:{out_refresh_status:1}}},[t._v("Search for output port")])],1)},a=[],i=n("025e"),o={data:function(){return this.$root.$data},methods:{s:function(t){i["a"].sendToTopic(t)}}},s=o,u=n("2877"),c=Object(u["a"])(s,r,a,!1,null,null,null);e["default"]=c.exports},"50c4":function(t,e,n){var r=n("a691"),a=Math.min;t.exports=function(t){return t>0?a(r(t),9007199254740991):0}},5135:function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},5319:function(t,e,n){"use strict";var r=n("d784"),a=n("825a"),i=n("7b0b"),o=n("50c4"),s=n("a691"),u=n("1d80"),c=n("8aa5"),l=n("14c3"),d=Math.max,f=Math.min,v=Math.floor,p=/\$([$&'`]|\d\d?|<[^>]*>)/g,m=/\$([$&'`]|\d\d?)/g,h=function(t){return void 0===t?t:String(t)};r("replace",2,(function(t,e,n,r){var _=r.REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE,g=r.REPLACE_KEEPS_$0,b=_?"$":"$0";return[function(n,r){var a=u(this),i=void 0==n?void 0:n[t];return void 0!==i?i.call(n,a,r):e.call(String(a),n,r)},function(t,r){if(!_&&g||"string"===typeof r&&-1===r.indexOf(b)){var i=n(e,t,this,r);if(i.done)return i.value}var u=a(t),v=String(this),p="function"===typeof r;p||(r=String(r));var m=u.global;if(m){var w=u.unicode;u.lastIndex=0}var x=[];while(1){var $=l(u,v);if(null===$)break;if(x.push($),!m)break;var C=String($[0]);""===C&&(u.lastIndex=c(v,o(u.lastIndex),w))}for(var k="",S=0,O=0;O
"+this.$root.$data.active.substr(1)+"
":null}},watch:{state:{handler:function(){s["a"].pushState()},deep:!0}}}).$mount("#app")}document.getElementById("header")&&new e["a"]({data:s["a"].state}).$mount("#header"),document.getElementById("dapp")&&new e["a"]({data:s["a"].state,template:"Debug this UI with inspector by opening URL in your browser:
{{url}}Current data of UI:
{{ JSON.stringify(this.$root.$data, null, ' ') }}\n \n \n {{ s.disk_used }}GQ / {{ s.disk_size }}GQ\n \n \n \n \n
\n \n \n \n \n {{ program.name }}\n \n {{ program.filename }} ({{program.size}} GQ)\n {{ program.desc }} \n \n Download\n \n \n
\n \n \n \n
\n\n\n\n\n>","import mod from \"-!../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../node_modules/babel-loader/lib/index.js!../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./downloader.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../node_modules/babel-loader/lib/index.js!../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./downloader.vue?vue&type=script&lang=js&\"","import { render, staticRenderFns } from \"./downloader.vue?vue&type=template&id=a4703c50&scoped=true&\"\nimport script from \"./downloader.vue?vue&type=script&lang=js&\"\nexport * from \"./downloader.vue?vue&type=script&lang=js&\"\nimport style0 from \"./downloader.vue?vue&type=style&index=0&id=a4703c50&lang=scss&scoped=true&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"a4703c50\",\n null\n \n)\n\nexport default component.exports","import Store from './store.js'\nimport store from './store.js';\nexport default {\n sendToTopicRaw(data) {\n var sendparams = []\n for(var val in data) {\n if (Array.isArray(data[val])) {\n for (const value in data[val]) {\n sendparams.push(encodeURIComponent(val) + \"=\" + encodeURIComponent(value))\n }\n } else {\n sendparams.push(encodeURIComponent(val) + \"=\" + encodeURIComponent(data[val]))\n }\n }\n var r = new XMLHttpRequest()\n var sendUrl = \"?\" + sendparams.join(\"&\")\n r.open(\"GET\", sendUrl, true);\n r.send()\n },\n sendToTopic(data, pushState = false) {\n var pushData = {\n src: Store.state.uiref,\n vueuihrefjson: JSON.stringify(data)\n }\n if(pushState) {\n pushData[\"vueuistateupdate\"] = store.getStatePushDataString()\n }\n this.sendToTopicRaw(pushData)\n },\n dotNotationRead(object, key) {\n return key.split('.').reduce((a, b) => a[b], object);\n }\n}","var aFunction = require('../internals/a-function');\n\n// optional / simple context binding\nmodule.exports = function (fn, that, length) {\n aFunction(fn);\n if (that === undefined) return fn;\n switch (length) {\n case 0: return function () {\n return fn.call(that);\n };\n case 1: return function (a) {\n return fn.call(that, a);\n };\n case 2: return function (a, b) {\n return fn.call(that, a, b);\n };\n case 3: return function (a, b, c) {\n return fn.call(that, a, b, c);\n };\n }\n return function (/* ...args */) {\n return fn.apply(that, arguments);\n };\n};\n","'use strict';\nvar $ = require('../internals/export');\nvar flattenIntoArray = require('../internals/flatten-into-array');\nvar toObject = require('../internals/to-object');\nvar toLength = require('../internals/to-length');\nvar toInteger = require('../internals/to-integer');\nvar arraySpeciesCreate = require('../internals/array-species-create');\n\n// `Array.prototype.flat` method\n// https://github.com/tc39/proposal-flatMap\n$({ target: 'Array', proto: true }, {\n flat: function flat(/* depthArg = 1 */) {\n var depthArg = arguments.length ? arguments[0] : undefined;\n var O = toObject(this);\n var sourceLen = toLength(O.length);\n var A = arraySpeciesCreate(O, 0);\n A.length = flattenIntoArray(A, O, O, sourceLen, 0, depthArg === undefined ? 1 : toInteger(depthArg));\n return A;\n }\n});\n","var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('input',{directives:[{name:\"model\",rawName:\"v-model\",value:(_vm.new_own_tag),expression:\"new_own_tag\"}],attrs:{\"placeholder\":_vm.own_tag},domProps:{\"value\":(_vm.new_own_tag)},on:{\"input\":function($event){if($event.target.composing){ return; }_vm.new_own_tag=$event.target.value}}}),_c('vui-button',{attrs:{\"params\":{ tag: _vm.new_own_tag }}},[_vm._v(\"Set GPS Tag\")]),_c('br'),_c('input',{directives:[{name:\"model\",rawName:\"v-model\",value:(_vm.add_track_tag),expression:\"add_track_tag\"}],domProps:{\"value\":(_vm.add_track_tag)},on:{\"input\":function($event){if($event.target.composing){ return; }_vm.add_track_tag=$event.target.value}}}),_c('vui-button',{attrs:{\"params\":{ add_tag: _vm.add_track_tag }}},[_vm._v(\"Track New Tag\")]),_c('br'),_c('vui-button',{attrs:{\"params\":{ add_all: 1 }}},[_vm._v(\"Track All\")]),_c('vui-button',{attrs:{\"params\":{ clear_all: 1 }}},[_vm._v(\"Untrack All\")]),_c('hr'),_c('table',[_vm._m(0),_vm._l((_vm.tracking_list),function(gps){return _c('tr',{key:gps.tag},[_c('td',[_vm._v(\" \"+_vm._s(gps.tag)+\" \")]),_c('td',[_vm._v(\" \"+_vm._s(gps.pos_x)+\", \"+_vm._s(gps.pos_y)+\", \"+_vm._s(gps.pos_z)+\" \")]),_c('td',[_vm._v(\" \"+_vm._s(gps.area)+\" \")]),(gps.tag != _vm.own_tag)?_c('vui-button',{attrs:{\"params\":{ remove_tag: gps.tag }}},[_vm._v(\"Untrack\")]):_c('td')],1)})],2)],1)}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('tr',[_c('th',[_vm._v(\"GPS Tag\")]),_c('th',[_vm._v(\"Location\")]),_c('th',[_vm._v(\"Area\")]),_c('th',[_vm._v(\"Remove\")])])}]\n\nexport { render, staticRenderFns }","\n Queue
\n| Name | \nProgress | \nAction | \n
|---|---|---|
| {{ program.filename }} | \n\n | \n \n | \n
Available Programs
\n\n
\n \n Set GPS Tag
\nTrack New Tag
\nTrack All \n Untrack All \n
\n\n \n\n
\n
\n\n\n\n","import mod from \"-!../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../node_modules/babel-loader/lib/index.js!../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./gps.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../node_modules/babel-loader/lib/index.js!../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./gps.vue?vue&type=script&lang=js&\"","import { render, staticRenderFns } from \"./gps.vue?vue&type=template&id=3729e945&\"\nimport script from \"./gps.vue?vue&type=script&lang=js&\"\nexport * from \"./gps.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\nexport default component.exports","var toIndexedObject = require('../internals/to-indexed-object');\nvar nativeGetOwnPropertyNames = require('../internals/object-get-own-property-names').f;\n\nvar toString = {}.toString;\n\nvar windowNames = typeof window == 'object' && window && Object.getOwnPropertyNames\n ? Object.getOwnPropertyNames(window) : [];\n\nvar getWindowNames = function (it) {\n try {\n return nativeGetOwnPropertyNames(it);\n } catch (error) {\n return windowNames.slice();\n }\n};\n\n// fallback for IE11 buggy Object.getOwnPropertyNames with iframe and window\nmodule.exports.f = function getOwnPropertyNames(it) {\n return windowNames && toString.call(it) == '[object Window]'\n ? getWindowNames(it)\n : nativeGetOwnPropertyNames(toIndexedObject(it));\n};\n","var DESCRIPTORS = require('../internals/descriptors');\nvar propertyIsEnumerableModule = require('../internals/object-property-is-enumerable');\nvar createPropertyDescriptor = require('../internals/create-property-descriptor');\nvar toIndexedObject = require('../internals/to-indexed-object');\nvar toPrimitive = require('../internals/to-primitive');\nvar has = require('../internals/has');\nvar IE8_DOM_DEFINE = require('../internals/ie8-dom-define');\n\nvar nativeGetOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;\n\n// `Object.getOwnPropertyDescriptor` method\n// https://tc39.github.io/ecma262/#sec-object.getownpropertydescriptor\nexports.f = DESCRIPTORS ? nativeGetOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {\n O = toIndexedObject(O);\n P = toPrimitive(P, true);\n if (IE8_DOM_DEFINE) try {\n return nativeGetOwnPropertyDescriptor(O, P);\n } catch (error) { /* empty */ }\n if (has(O, P)) return createPropertyDescriptor(!propertyIsEnumerableModule.f.call(O, P), O[P]);\n};\n","var $ = require('../internals/export');\nvar $values = require('../internals/object-to-array').values;\n\n// `Object.values` method\n// https://tc39.github.io/ecma262/#sec-object.values\n$({ target: 'Object', stat: true }, {\n values: function values(O) {\n return $values(O);\n }\n});\n","var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('i',[_vm._v(\"Welcome to computer configuration utility. Please consult your system administrator if you have any questions about your device.\")]),_c('hr'),_c('h2',[_vm._v(\"Power Supply\")]),_c('vui-item',{attrs:{\"label\":\"Battery Status:\"}},[(_vm.battery)?_c('span',[_vm._v(\"Active\")]):_c('span',[_vm._v(\"Not Available\")])]),(_vm.battery)?_c('vui-item',{attrs:{\"label\":\"Battery Rating:\"}},[_vm._v(_vm._s(_vm.battery.rating))]):_vm._e(),(_vm.battery)?_c('vui-item',{attrs:{\"label\":\"Battery Charge:\"}},[_c('vui-progress',{attrs:{\"value\":_vm.battery.percent}},[_vm._v(_vm._s(_vm.battery.percent)+\"%\")])],1):_vm._e(),_c('vui-item',{attrs:{\"label\":\"Power Usage:\"}},[_vm._v(_vm._s(_vm.power_usage)+\"W\")]),_c('h2',[_vm._v(\"File System\")]),(_vm.battery)?_c('vui-item',{attrs:{\"label\":\"Used Capacity:\"}},[_c('vui-progress',{attrs:{\"value\":_vm.disk_used,\"min\":\"0\",\"max\":_vm.disk_size}},[_vm._v(_vm._s(_vm.disk_used)+\"GQ / \"+_vm._s(_vm.disk_size)+\"GQ\")])],1):_vm._e(),_c('h2',[_vm._v(\"Computer Components\")]),_vm._l((_vm.hardware),function(h,name){return _c('div',{key:name},[_c('h3',[_vm._v(_vm._s(name))]),_c('vui-item',{attrs:{\"label\":\"State:\"}},[(h.enabled)?_c('span',[_vm._v(\"Enabled\")]):_c('span',[_vm._v(\"Disabled\")])]),_c('vui-item',{attrs:{\"label\":\"Power Usage:\"}},[_vm._v(_vm._s(h.power_usage)+\"W\")]),(!h.critical)?_c('vui-item',{attrs:{\"label\":\"Toggle Component:\"}},[_c('vui-button',{attrs:{\"params\":{ PC_enable_component: name},\"disabled\":!!h.enabled}},[_vm._v(\"ON\")]),_c('vui-button',{attrs:{\"params\":{ PC_disable_component: name},\"disabled\":!h.enabled}},[_vm._v(\"OFF\")])],1):_vm._e()],1)}),_c('i',[_vm._v(\"NTOS v2.0.4b Copyright NanoTrasen 2557 - 2559\")])],2)}\nvar staticRenderFns = []\n\nexport { render, staticRenderFns }","\n \n
\n
\n\n \n
| GPS Tag | \nLocation | \nArea | \nRemove | \n
|---|---|---|---|
| {{ gps.tag }} | \n{{ gps.pos_x }}, {{ gps.pos_y }}, {{ gps.pos_z }} | \n{{ gps.area }} | \n\n |
\n Welcome to computer configuration utility. Please consult your system administrator if you have any questions about your device.
\n\n Active\n Not Available\n \n {{battery.rating}} \n \n {{battery.percent}}% \n \n {{power_usage}}W \n \n {{disk_used}}GQ / {{disk_size}}GQ \n \n
\n\n\n","import mod from \"-!../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../node_modules/babel-loader/lib/index.js!../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./config.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../node_modules/babel-loader/lib/index.js!../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./config.vue?vue&type=script&lang=js&\"","import { render, staticRenderFns } from \"./config.vue?vue&type=template&id=abe13338&\"\nimport script from \"./config.vue?vue&type=script&lang=js&\"\nexport * from \"./config.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\nexport default component.exports","import mod from \"-!../../../node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-2!../../../node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./button.vue?vue&type=style&index=0&id=acaec0ae&lang=scss&scoped=true&\"; export default mod; export * from \"-!../../../node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-2!../../../node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./button.vue?vue&type=style&index=0&id=acaec0ae&lang=scss&scoped=true&\"","import mod from \"-!../../../node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-2!../../../node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./tooltip.vue?vue&type=style&index=0&id=4ea2a2b3&lang=scss&scoped=true&\"; export default mod; export * from \"-!../../../node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-2!../../../node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./tooltip.vue?vue&type=style&index=0&id=4ea2a2b3&lang=scss&scoped=true&\"","var DESCRIPTORS = require('../internals/descriptors');\nvar fails = require('../internals/fails');\nvar createElement = require('../internals/document-create-element');\n\n// Thank's IE8 for his funny defineProperty\nmodule.exports = !DESCRIPTORS && !fails(function () {\n return Object.defineProperty(createElement('div'), 'a', {\n get: function () { return 7; }\n }).a != 7;\n});\n","var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('input',{directives:[{name:\"model\",rawName:\"v-model\",value:(_vm.passcode),expression:\"passcode\"}],attrs:{\"placeholder\":\"Enter passcode...\",\"autofocus\":\"\"},domProps:{\"value\":(_vm.passcode)},on:{\"input\":function($event){if($event.target.composing){ return; }_vm.passcode=$event.target.value}}}),_c('vui-button',{attrs:{\"params\":{ set_passcode: _vm.passcode }}},[_vm._v(\"Set\")]),_c('vui-button',{attrs:{\"params\":{ lock: 1 }}},[_vm._v(\"Lock\")])],1)}\nvar staticRenderFns = []\n\nexport { render, staticRenderFns }","\n \n
Power Supply
\nFile System
\nComputer Components
\n\n \n Enabled\n Disabled\n \n {{h.power_usage}}W \n \n ON \n OFF \n \n
\n NTOS v2.0.4b Copyright NanoTrasen 2557 - 2559\n {{name}}
\n\n \n Set \n Lock \n
\n\n\n\n\n","import mod from \"-!../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../node_modules/thread-loader/dist/cjs.js!../../../../node_modules/babel-loader/lib/index.js!../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./maglock-config.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../node_modules/thread-loader/dist/cjs.js!../../../../node_modules/babel-loader/lib/index.js!../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./maglock-config.vue?vue&type=script&lang=js&\"","import { render, staticRenderFns } from \"./maglock-config.vue?vue&type=template&id=081a5cf1&\"\nimport script from \"./maglock-config.vue?vue&type=script&lang=js&\"\nexport * from \"./maglock-config.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\nexport default component.exports","var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('span',{staticClass:\"tooltip label\"},[_vm._t(\"label\",[_vm._v(_vm._s(_vm.label))]),_c('div',{staticClass:\"tooltip content\"},[_vm._t(\"default\")],2)],2)}\nvar staticRenderFns = []\n\nexport { render, staticRenderFns }","\n \n \n\n \n \n
\n
\n\n\n\n\n\n","import mod from \"-!../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../node_modules/thread-loader/dist/cjs.js!../../../../node_modules/babel-loader/lib/index.js!../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./bodyscanner.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../node_modules/thread-loader/dist/cjs.js!../../../../node_modules/babel-loader/lib/index.js!../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./bodyscanner.vue?vue&type=script&lang=js&\"","import { render, staticRenderFns } from \"./bodyscanner.vue?vue&type=template&id=0abb6271&scoped=true&\"\nimport script from \"./bodyscanner.vue?vue&type=script&lang=js&\"\nexport * from \"./bodyscanner.vue?vue&type=script&lang=js&\"\nimport style0 from \"./bodyscanner.vue?vue&type=style&index=0&id=0abb6271&lang=scss&scoped=true&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"0abb6271\",\n null\n \n)\n\nexport default component.exports","var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('vui-item',{attrs:{\"label\":\"Turret Status:\",\"balance\":0.4}},[_c('vui-button',{class:{'red': _vm.settings.enabled},attrs:{\"params\":{'command' : 'enable', 'value' : 1, 'turret_ref': _vm.tref}}},[_vm._v(\"Enabled\")]),_c('vui-button',{class:{'selected': !_vm.settings.enabled},attrs:{\"params\":{'command' : 'enable', 'value' : 0, 'turret_ref': _vm.tref}}},[_vm._v(\"Disabled\")])],1),(_vm.settings.is_lethal)?_c('vui-item',{attrs:{\"label\":\"Lethal Mode:\",\"balance\":0.4}},[_c('vui-button',{class:{'red': _vm.settings.lethal && _vm.settings.can_switch},attrs:{\"disabled\":!_vm.settings.can_switch,\"params\":{'command' : 'lethal', 'value' : 1, 'turret_ref': _vm.tref}}},[_vm._v(\"On\")]),_c('vui-button',{class:{'selected': !_vm.settings.lethal && _vm.settings.can_switch},attrs:{\"disabled\":!_vm.settings.can_switch,\"params\":{'command' : 'lethal', 'value' : 0, 'turret_ref': _vm.tref}}},[_vm._v(\"Off\")])],1):_vm._e(),_vm._l((_vm.settings.settings),function(setting,id){return _c('vui-item',{key:setting.id,attrs:{\"label\":setting.category,\"balance\":0.4}},[_c('vui-button',{class:{'selected': setting.value},attrs:{\"params\":{'command' : id, 'value' : 1, 'turret_ref': _vm.tref}}},[_vm._v(\"On\")]),_c('vui-button',{class:{'selected': !setting.value},attrs:{\"params\":{'command' : id, 'value' : 0, 'turret_ref': _vm.tref}}},[_vm._v(\"Off\")])],1)})],2)}\nvar staticRenderFns = []\n\nexport { render, staticRenderFns }","\n \n Error: No scanner bed detected!\n No occupant detected.\n Error: Object in scanner bed interfering with sensor array.\n Error: No diagnostics profile installed for this species.\n Error: Unknown error.\n
\n\n \n | Organ | \nTrauma | \nWounds | \n
|---|---|---|
| {{ capitalizeFirstLetter(organ.name) }} | \n{{ organ.damage }} | \n {{ wound }} | \n \n
\n
External Bodypart Status
\n\n
| Organ | \nPhysical / Burn Trauma | \nWounds | \n
|---|---|---|
| {{ capitalizeFirstLetter(organ.name) }} | \n{{ organ.bruteDmg }} / {{ organ.burnDmg }} | \n {{ wound }} | \n \n
Actions
\n\n \n Enabled \n Disabled \n \n \n On \n Off \n \n \n On \n Off \n \n
\n\n\n","import mod from \"-!../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../node_modules/thread-loader/dist/cjs.js!../../../../node_modules/babel-loader/lib/index.js!../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./control-part.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../node_modules/thread-loader/dist/cjs.js!../../../../node_modules/babel-loader/lib/index.js!../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./control-part.vue?vue&type=script&lang=js&\"","import { render, staticRenderFns } from \"./control-part.vue?vue&type=template&id=47762730&\"\nimport script from \"./control-part.vue?vue&type=script&lang=js&\"\nexport * from \"./control-part.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\nexport default component.exports","var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:\"displayBar\"},[_c('div',{staticClass:\"displayBarFill\",style:({ width: _vm.percentage + '%'})},[_c('span',[_vm._t(\"default\")],2)])])}\nvar staticRenderFns = []\n\nexport { render, staticRenderFns }","\n \n
\n\n\n\n\n\n","import mod from \"-!../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../node_modules/thread-loader/dist/cjs.js!../../../node_modules/babel-loader/lib/index.js!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./progress.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../node_modules/thread-loader/dist/cjs.js!../../../node_modules/babel-loader/lib/index.js!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./progress.vue?vue&type=script&lang=js&\"","import { render, staticRenderFns } from \"./progress.vue?vue&type=template&id=0c63b5f7&scoped=true&\"\nimport script from \"./progress.vue?vue&type=script&lang=js&\"\nexport * from \"./progress.vue?vue&type=script&lang=js&\"\nimport style0 from \"./progress.vue?vue&type=style&index=0&id=0c63b5f7&lang=scss&scoped=true&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"0c63b5f7\",\n null\n \n)\n\nexport default component.exports","var asciiToArray = require('./_asciiToArray'),\n hasUnicode = require('./_hasUnicode'),\n unicodeToArray = require('./_unicodeToArray');\n\n/**\n * Converts `string` to an array.\n *\n * @private\n * @param {string} string The string to convert.\n * @returns {Array} Returns the converted array.\n */\nfunction stringToArray(string) {\n return hasUnicode(string)\n ? unicodeToArray(string)\n : asciiToArray(string);\n}\n\nmodule.exports = stringToArray;\n","'use strict';\nvar fixRegExpWellKnownSymbolLogic = require('../internals/fix-regexp-well-known-symbol-logic');\nvar isRegExp = require('../internals/is-regexp');\nvar anObject = require('../internals/an-object');\nvar requireObjectCoercible = require('../internals/require-object-coercible');\nvar speciesConstructor = require('../internals/species-constructor');\nvar advanceStringIndex = require('../internals/advance-string-index');\nvar toLength = require('../internals/to-length');\nvar callRegExpExec = require('../internals/regexp-exec-abstract');\nvar regexpExec = require('../internals/regexp-exec');\nvar fails = require('../internals/fails');\n\nvar arrayPush = [].push;\nvar min = Math.min;\nvar MAX_UINT32 = 0xFFFFFFFF;\n\n// babel-minify transpiles RegExp('x', 'y') -> /x/y and it causes SyntaxError\nvar SUPPORTS_Y = !fails(function () { return !RegExp(MAX_UINT32, 'y'); });\n\n// @@split logic\nfixRegExpWellKnownSymbolLogic('split', 2, function (SPLIT, nativeSplit, maybeCallNative) {\n var internalSplit;\n if (\n 'abbc'.split(/(b)*/)[1] == 'c' ||\n 'test'.split(/(?:)/, -1).length != 4 ||\n 'ab'.split(/(?:ab)*/).length != 2 ||\n '.'.split(/(.?)(.?)/).length != 4 ||\n '.'.split(/()()/).length > 1 ||\n ''.split(/.?/).length\n ) {\n // based on es5-shim implementation, need to rework it\n internalSplit = function (separator, limit) {\n var string = String(requireObjectCoercible(this));\n var lim = limit === undefined ? MAX_UINT32 : limit >>> 0;\n if (lim === 0) return [];\n if (separator === undefined) return [string];\n // If `separator` is not a regex, use native split\n if (!isRegExp(separator)) {\n return nativeSplit.call(string, separator, lim);\n }\n var output = [];\n var flags = (separator.ignoreCase ? 'i' : '') +\n (separator.multiline ? 'm' : '') +\n (separator.unicode ? 'u' : '') +\n (separator.sticky ? 'y' : '');\n var lastLastIndex = 0;\n // Make `global` and avoid `lastIndex` issues by working with a copy\n var separatorCopy = new RegExp(separator.source, flags + 'g');\n var match, lastIndex, lastLength;\n while (match = regexpExec.call(separatorCopy, string)) {\n lastIndex = separatorCopy.lastIndex;\n if (lastIndex > lastLastIndex) {\n output.push(string.slice(lastLastIndex, match.index));\n if (match.length > 1 && match.index < string.length) arrayPush.apply(output, match.slice(1));\n lastLength = match[0].length;\n lastLastIndex = lastIndex;\n if (output.length >= lim) break;\n }\n if (separatorCopy.lastIndex === match.index) separatorCopy.lastIndex++; // Avoid an infinite loop\n }\n if (lastLastIndex === string.length) {\n if (lastLength || !separatorCopy.test('')) output.push('');\n } else output.push(string.slice(lastLastIndex));\n return output.length > lim ? output.slice(0, lim) : output;\n };\n // Chakra, V8\n } else if ('0'.split(undefined, 0).length) {\n internalSplit = function (separator, limit) {\n return separator === undefined && limit === 0 ? [] : nativeSplit.call(this, separator, limit);\n };\n } else internalSplit = nativeSplit;\n\n return [\n // `String.prototype.split` method\n // https://tc39.github.io/ecma262/#sec-string.prototype.split\n function split(separator, limit) {\n var O = requireObjectCoercible(this);\n var splitter = separator == undefined ? undefined : separator[SPLIT];\n return splitter !== undefined\n ? splitter.call(separator, O, limit)\n : internalSplit.call(String(O), separator, limit);\n },\n // `RegExp.prototype[@@split]` method\n // https://tc39.github.io/ecma262/#sec-regexp.prototype-@@split\n //\n // NOTE: This cannot be properly polyfilled in engines that don't support\n // the 'y' flag.\n function (regexp, limit) {\n var res = maybeCallNative(internalSplit, regexp, this, limit, internalSplit !== nativeSplit);\n if (res.done) return res.value;\n\n var rx = anObject(regexp);\n var S = String(this);\n var C = speciesConstructor(rx, RegExp);\n\n var unicodeMatching = rx.unicode;\n var flags = (rx.ignoreCase ? 'i' : '') +\n (rx.multiline ? 'm' : '') +\n (rx.unicode ? 'u' : '') +\n (SUPPORTS_Y ? 'y' : 'g');\n\n // ^(? + rx + ) is needed, in combination with some S slicing, to\n // simulate the 'y' flag.\n var splitter = new C(SUPPORTS_Y ? rx : '^(?:' + rx.source + ')', flags);\n var lim = limit === undefined ? MAX_UINT32 : limit >>> 0;\n if (lim === 0) return [];\n if (S.length === 0) return callRegExpExec(splitter, S) === null ? [S] : [];\n var p = 0;\n var q = 0;\n var A = [];\n while (q < S.length) {\n splitter.lastIndex = SUPPORTS_Y ? q : 0;\n var z = callRegExpExec(splitter, SUPPORTS_Y ? S : S.slice(q));\n var e;\n if (\n z === null ||\n (e = min(toLength(splitter.lastIndex + (SUPPORTS_Y ? 0 : q)), S.length)) === p\n ) {\n q = advanceStringIndex(S, q, unicodeMatching);\n } else {\n A.push(S.slice(p, q));\n if (A.length === lim) return A;\n for (var i = 1; i <= z.length - 1; i++) {\n A.push(z[i]);\n if (A.length === lim) return A;\n }\n q = p = e;\n }\n }\n A.push(S.slice(p));\n return A;\n }\n ];\n}, !SUPPORTS_Y);\n","// `SameValue` abstract operation\n// https://tc39.github.io/ecma262/#sec-samevalue\nmodule.exports = Object.is || function is(x, y) {\n // eslint-disable-next-line no-self-compare\n return x === y ? x !== 0 || 1 / x === 1 / y : x != x && y != y;\n};\n","/**\n * Checks if `value` is object-like. A value is object-like if it's not `null`\n * and has a `typeof` result of \"object\".\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is object-like, else `false`.\n * @example\n *\n * _.isObjectLike({});\n * // => true\n *\n * _.isObjectLike([1, 2, 3]);\n * // => true\n *\n * _.isObjectLike(_.noop);\n * // => false\n *\n * _.isObjectLike(null);\n * // => false\n */\nfunction isObjectLike(value) {\n return value != null && typeof value == 'object';\n}\n\nmodule.exports = isObjectLike;\n","var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(_vm.services.length)?_c('h2',[_vm._v(\"Programs\")]):_vm._e(),_c('i',[_vm._v(\"No program loaded. Please select program from list below.\")]),_vm._l((_vm.displayed_programs),function(p){return _c('div',{key:p.filename},[_c('vui-button',{attrs:{\"params\":{ PC_runprogram: p.filename}}},[_vm._v(_vm._s(p.desc))]),(p.running)?_c('vui-button',{attrs:{\"params\":{ PC_killprogram: p.filename}}},[_vm._v(\"X\")]):_vm._e()],1)}),(_vm.services.length)?_c('h2',[_vm._v(\"Services\")]):_vm._e(),_vm._l((_vm.services),function(p){return _c('div',{key:p.filename},[_c('vui-button',{class:{ on: p.service.enabled },attrs:{\"params\":{ PC_toggleservice: p.filename}}},[_vm._v(_vm._s(p.desc))]),(p.service.online)?_c('i',[_vm._v(\"Running\")]):_vm._e()],1)})],2)}\nvar staticRenderFns = []\n\nexport { render, staticRenderFns }","\n \n
\n\n\n","import mod from \"-!../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../node_modules/babel-loader/lib/index.js!../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./main.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../node_modules/babel-loader/lib/index.js!../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./main.vue?vue&type=script&lang=js&\"","import { render, staticRenderFns } from \"./main.vue?vue&type=template&id=75578ff2&\"\nimport script from \"./main.vue?vue&type=script&lang=js&\"\nexport * from \"./main.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\nexport default component.exports","'use strict';\nvar $ = require('../internals/export');\nvar $reduce = require('../internals/array-reduce').left;\nvar arrayMethodIsStrict = require('../internals/array-method-is-strict');\nvar arrayMethodUsesToLength = require('../internals/array-method-uses-to-length');\n\nvar STRICT_METHOD = arrayMethodIsStrict('reduce');\nvar USES_TO_LENGTH = arrayMethodUsesToLength('reduce', { 1: 0 });\n\n// `Array.prototype.reduce` method\n// https://tc39.github.io/ecma262/#sec-array.prototype.reduce\n$({ target: 'Array', proto: true, forced: !STRICT_METHOD || !USES_TO_LENGTH }, {\n reduce: function reduce(callbackfn /* , initialValue */) {\n return $reduce(this, callbackfn, arguments.length, arguments.length > 1 ? arguments[1] : undefined);\n }\n});\n","var classof = require('./classof-raw');\nvar regexpExec = require('./regexp-exec');\n\n// `RegExpExec` abstract operation\n// https://tc39.github.io/ecma262/#sec-regexpexec\nmodule.exports = function (R, S) {\n var exec = R.exec;\n if (typeof exec === 'function') {\n var result = exec.call(R, S);\n if (typeof result !== 'object') {\n throw TypeError('RegExp exec method returned something other than an Object or null');\n }\n return result;\n }\n\n if (classof(R) !== 'RegExp') {\n throw TypeError('RegExp#exec called on incompatible receiver');\n }\n\n return regexpExec.call(R, S);\n};\n\n","import mod from \"-!../../../node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-2!../../../node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./default.vue?vue&type=style&index=0&lang=scss&\"; export default mod; export * from \"-!../../../node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../../node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-2!../../../node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./default.vue?vue&type=style&index=0&lang=scss&\"","var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('div',{directives:[{name:\"show\",rawName:\"v-show\",value:(!_vm.spawnpoint),expression:\"!spawnpoint\"}],staticClass:\"tagselector\"},_vm._l((_vm.tags),function(amount,tag){return _c('vui-button',{key:tag,class:{ selected: _vm.current_tag == tag},on:{\"click\":function($event){_vm.current_tag = tag}}},[_vm._v(_vm._s(tag)+\" (\"+_vm._s(amount)+\")\")])}),1),_c('hr',{directives:[{name:\"show\",rawName:\"v-show\",value:(!_vm.spawnpoint),expression:\"!spawnpoint\"}]}),_c('table',[_vm._m(0),_vm._l((_vm.spawners),function(data,index){return _c('tr',{directives:[{name:\"show\",rawName:\"v-show\",value:(_vm.showEntry(data)),expression:\"showEntry(data)\"}],key:index},[_c('td',[_vm._v(_vm._s(data.name))]),_c('td',[_vm._v(_vm._s(data.desc))]),(data.max_count > 0)?_c('td',[_vm._v(_vm._s(data.max_count - data.count)+\" / \"+_vm._s(data.max_count))]):_c('td',[_vm._v(\"∞\")]),_c('td',{staticClass:\"action\"},[_c('vui-button',{attrs:{\"disabled\":(data.cant_spawn !== 0),\"params\":{spawn: index, spawnpoint: _vm.spawnpoint},\"icon\":\"star\"}},[_vm._v(\"Spawn\")]),(data.can_edit == 1)?_c('vui-button',{attrs:{\"disabled\":(data.enabled == 1),\"params\":{enable: index}}},[_vm._v(\"Enable\")]):_vm._e(),(data.can_edit == 1)?_c('vui-button',{attrs:{\"disabled\":(data.enabled == 0),\"params\":{disable: index}}},[_vm._v(\"Disable\")]):_vm._e()],1)])})],2)])}\nvar staticRenderFns = [function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('tr',[_c('th',[_vm._v(\"Name\")]),_c('th',[_vm._v(\"Description\")]),_c('th',[_vm._v(\"Available Slots\")]),_c('th',{staticClass:\"action\"},[_vm._v(\"Actions\")])])}]\n\nexport { render, staticRenderFns }","\n Programs
\n No program loaded. Please select program from list below.\n\n {{ p.desc }} \n X \n
\n Services
\n\n {{ p.desc }} \n Running\n
\n \n \n
\n\n
\n
\n\n\n\n\n\n\n","import mod from \"-!../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../node_modules/thread-loader/dist/cjs.js!../../../../node_modules/babel-loader/lib/index.js!../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./ghostspawner.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../node_modules/thread-loader/dist/cjs.js!../../../../node_modules/babel-loader/lib/index.js!../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./ghostspawner.vue?vue&type=script&lang=js&\"","import { render, staticRenderFns } from \"./ghostspawner.vue?vue&type=template&id=779ac49e&scoped=true&\"\nimport script from \"./ghostspawner.vue?vue&type=script&lang=js&\"\nexport * from \"./ghostspawner.vue?vue&type=script&lang=js&\"\nimport style0 from \"./ghostspawner.vue?vue&type=style&index=0&id=779ac49e&lang=scss&scoped=true&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"779ac49e\",\n null\n \n)\n\nexport default component.exports","var global = require('../internals/global');\nvar DOMIterables = require('../internals/dom-iterables');\nvar forEach = require('../internals/array-for-each');\nvar createNonEnumerableProperty = require('../internals/create-non-enumerable-property');\n\nfor (var COLLECTION_NAME in DOMIterables) {\n var Collection = global[COLLECTION_NAME];\n var CollectionPrototype = Collection && Collection.prototype;\n // some Chrome versions have non-configurable methods on DOMTokenList\n if (CollectionPrototype && CollectionPrototype.forEach !== forEach) try {\n createNonEnumerableProperty(CollectionPrototype, 'forEach', forEach);\n } catch (error) {\n CollectionPrototype.forEach = forEach;\n }\n}\n","'use strict';\nvar $forEach = require('../internals/array-iteration').forEach;\nvar arrayMethodIsStrict = require('../internals/array-method-is-strict');\nvar arrayMethodUsesToLength = require('../internals/array-method-uses-to-length');\n\nvar STRICT_METHOD = arrayMethodIsStrict('forEach');\nvar USES_TO_LENGTH = arrayMethodUsesToLength('forEach');\n\n// `Array.prototype.forEach` method implementation\n// https://tc39.github.io/ecma262/#sec-array.prototype.foreach\nmodule.exports = (!STRICT_METHOD || !USES_TO_LENGTH) ? function forEach(callbackfn /* , thisArg */) {\n return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);\n} : [].forEach;\n","var getBuiltIn = require('../internals/get-built-in');\n\nmodule.exports = getBuiltIn('document', 'documentElement');\n","module.exports = function (it) {\n if (typeof it != 'function') {\n throw TypeError(String(it) + ' is not a function');\n } return it;\n};\n","var wellKnownSymbol = require('../internals/well-known-symbol');\n\nvar ITERATOR = wellKnownSymbol('iterator');\nvar SAFE_CLOSING = false;\n\ntry {\n var called = 0;\n var iteratorWithReturn = {\n next: function () {\n return { done: !!called++ };\n },\n 'return': function () {\n SAFE_CLOSING = true;\n }\n };\n iteratorWithReturn[ITERATOR] = function () {\n return this;\n };\n // eslint-disable-next-line no-throw-literal\n Array.from(iteratorWithReturn, function () { throw 2; });\n} catch (error) { /* empty */ }\n\nmodule.exports = function (exec, SKIP_CLOSING) {\n if (!SKIP_CLOSING && !SAFE_CLOSING) return false;\n var ITERATION_SUPPORT = false;\n try {\n var object = {};\n object[ITERATOR] = function () {\n return {\n next: function () {\n return { done: ITERATION_SUPPORT = true };\n }\n };\n };\n exec(object);\n } catch (error) { /* empty */ }\n return ITERATION_SUPPORT;\n};\n","// `RequireObjectCoercible` abstract operation\n// https://tc39.github.io/ecma262/#sec-requireobjectcoercible\nmodule.exports = function (it) {\n if (it == undefined) throw TypeError(\"Can't call method on \" + it);\n return it;\n};\n","var fails = require('../internals/fails');\nvar wellKnownSymbol = require('../internals/well-known-symbol');\nvar V8_VERSION = require('../internals/engine-v8-version');\n\nvar SPECIES = wellKnownSymbol('species');\n\nmodule.exports = function (METHOD_NAME) {\n // We can't use this feature detection in V8 since it causes\n // deoptimization and serious performance degradation\n // https://github.com/zloirock/core-js/issues/677\n return V8_VERSION >= 51 || !fails(function () {\n var array = [];\n var constructor = array.constructor = {};\n constructor[SPECIES] = function () {\n return { foo: 1 };\n };\n return array[METHOD_NAME](Boolean).foo !== 1;\n });\n};\n","var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.active)?_c('div',[_c('view-records-general',{attrs:{\"hide-advanced\":\"\"}},[_c('vui-group-item',{attrs:{\"label\":\"Blood type:\"}},[_c('view-records-field',{attrs:{\"editable\":(_vm.editable & 2) > 0,\"path\":\"active.medical.blood_type\"}},[_c('select',{directives:[{name:\"model\",rawName:\"v-model\",value:(_vm.$root.$data.state.editingvalue),expression:\"$root.$data.state.editingvalue\"}],on:{\"change\":function($event){var $$selectedVal = Array.prototype.filter.call($event.target.options,function(o){return o.selected}).map(function(o){var val = \"_value\" in o ? o._value : o.value;return val}); _vm.$set(_vm.$root.$data.state, \"editingvalue\", $event.target.multiple ? $$selectedVal : $$selectedVal[0])}}},_vm._l((_vm.choices.medical.blood_type),function(i){return _c('option',{key:i,domProps:{\"value\":i}},[_vm._v(_vm._s(i))])}),0)])],1),_c('vui-group-item',{attrs:{\"label\":\"DNA:\"}},[_c('view-records-field',{attrs:{\"editable\":(_vm.editable & 2) > 0,\"path\":\"active.medical.blood_dna\"}})],1),_c('vui-group-item',{attrs:{\"label\":\"Disabilities:\"}},[_c('view-records-field',{attrs:{\"editable\":(_vm.editable & 2) > 0,\"path\":\"active.medical.disabilities\"}},[_c('textarea',{directives:[{name:\"model\",rawName:\"v-model\",value:(_vm.$root.$data.state.editingvalue),expression:\"$root.$data.state.editingvalue\"}],domProps:{\"value\":(_vm.$root.$data.state.editingvalue)},on:{\"input\":function($event){if($event.target.composing){ return; }_vm.$set(_vm.$root.$data.state, \"editingvalue\", $event.target.value)}}})])],1),_c('vui-group-item',{attrs:{\"label\":\"Allergies:\"}},[_c('view-records-field',{attrs:{\"editable\":(_vm.editable & 2) > 0,\"path\":\"active.medical.allergies\"}},[_c('textarea',{directives:[{name:\"model\",rawName:\"v-model\",value:(_vm.$root.$data.state.editingvalue),expression:\"$root.$data.state.editingvalue\"}],domProps:{\"value\":(_vm.$root.$data.state.editingvalue)},on:{\"input\":function($event){if($event.target.composing){ return; }_vm.$set(_vm.$root.$data.state, \"editingvalue\", $event.target.value)}}})])],1),_c('vui-group-item',{attrs:{\"label\":\"Diseases:\"}},[_c('view-records-field',{attrs:{\"editable\":(_vm.editable & 2) > 0,\"path\":\"active.medical.diseases\"}},[_c('textarea',{directives:[{name:\"model\",rawName:\"v-model\",value:(_vm.$root.$data.state.editingvalue),expression:\"$root.$data.state.editingvalue\"}],domProps:{\"value\":(_vm.$root.$data.state.editingvalue)},on:{\"input\":function($event){if($event.target.composing){ return; }_vm.$set(_vm.$root.$data.state, \"editingvalue\", $event.target.value)}}})])],1),_c('vui-group-item',{attrs:{\"label\":\"Comments:\"}},[_vm._l((_vm.active.medical.comments),function(comment){return _c('div',{key:comment},[_vm._v(_vm._s(comment)+\" \"),((_vm.editable & 2) > 0)?_c('vui-button',{staticClass:\"danger\",attrs:{\"params\":{ removefromrecord: { value: comment, key: ['active', 'medical', 'comments'] }},\"icon\":\"trash-alt\"}}):_vm._e()],1)}),(_vm.active.medical.comments.length == 0)?_c('div',[_vm._v(\"There are no comments.\")]):_vm._e(),((_vm.editable & 2) > 0)?_c('view-records-field',{attrs:{\"edit-button\":\"Add\"},on:{\"save\":function($event){return _vm.add('active.medical.comments', $event)}}}):_vm._e()],2),_c('vui-group-item',{attrs:{\"label\":\"Notes:\"}},[_c('view-records-field',{attrs:{\"editable\":(_vm.editable & 2) > 0,\"path\":\"active.medical.notes\"}},[_c('textarea',{directives:[{name:\"model\",rawName:\"v-model\",value:(_vm.$root.$data.state.editingvalue),expression:\"$root.$data.state.editingvalue\"}],domProps:{\"value\":(_vm.$root.$data.state.editingvalue)},on:{\"input\":function($event){if($event.target.composing){ return; }_vm.$set(_vm.$root.$data.state, \"editingvalue\", $event.target.value)}}})])],1)],1)],1):_vm._e()}\nvar staticRenderFns = []\n\nexport { render, staticRenderFns }","\n \n
| Name | \nDescription | \nAvailable Slots | \nActions | \n|
|---|---|---|---|---|
| {{data.name}} | \n{{data.desc}} | \n0\">{{data.max_count - data.count}} / {{data.max_count}} | \n∞ | \n\n | \n
\n \n \n 0\" path=\"active.medical.blood_type\">\n \n \n \n 0\" path=\"active.medical.blood_dna\"/> 0\" path=\"active.medical.disabilities\">