")
diff --git a/code/__DEFINES/color_defines.dm b/code/__DEFINES/color_defines.dm
index 2f8c847c66ee..98aa5963c3bd 100644
--- a/code/__DEFINES/color_defines.dm
+++ b/code/__DEFINES/color_defines.dm
@@ -129,6 +129,11 @@
#define COLOR_THEME_OPERATIVE "#B8221F"
#define COLOR_THEME_GLASS "#75A4C4"
#define COLOR_THEME_CLOCKWORK "#CFBA47"
+// SS220 ADDITION - START
+#define COLOR_THEME_VAPORWAVE "#bc3ce3"
+#define COLOR_THEME_DETECTIVE "#c7b08b"
+#define COLOR_THEME_TRASENKNOX "#3ce375"
+// SS220 ADDITION - END
// Color matrix utilities
#define COLOR_MATRIX_ADD(C) list(COLOR_RED, COLOR_GREEN, COLOR_BLUE, C)
diff --git a/code/__DEFINES/combat_defines.dm b/code/__DEFINES/combat_defines.dm
index b84987651527..e25451497205 100644
--- a/code/__DEFINES/combat_defines.dm
+++ b/code/__DEFINES/combat_defines.dm
@@ -53,6 +53,7 @@
//Health Defines
#define HEALTH_THRESHOLD_CRIT 0
+#define HEALTH_THRESHOLD_KNOCKOUT -50
#define HEALTH_THRESHOLD_DEAD -100
//Grab levels
diff --git a/code/__DEFINES/construction_defines.dm b/code/__DEFINES/construction_defines.dm
index 9612ed7f2c1f..3264c0e96165 100644
--- a/code/__DEFINES/construction_defines.dm
+++ b/code/__DEFINES/construction_defines.dm
@@ -2,14 +2,14 @@
//Defines for construction states
-//girder construction states
+/// girder construction states
#define GIRDER_NORMAL 0
#define GIRDER_REINF_STRUTS 1
#define GIRDER_REINF 2
#define GIRDER_DISPLACED 3
#define GIRDER_DISASSEMBLED 4
-//rwall construction states
+/// rwall construction states
#define RWALL_INTACT 0
#define RWALL_SUPPORT_LINES 1
#define RWALL_COVER 2
@@ -18,31 +18,31 @@
#define RWALL_SUPPORT_RODS 5
#define RWALL_SHEATH 6
-//window construction states
+/// window construction states
#define WINDOW_OUT_OF_FRAME 0
#define WINDOW_IN_FRAME 1
#define WINDOW_SCREWED_TO_FRAME 2
-//airlock assembly construction states
+/// airlock assembly construction states
#define AIRLOCK_ASSEMBLY_NEEDS_WIRES 0
#define AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS 1
#define AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER 2
-//used by airlocks and airlock wires.
+/// used by airlocks and airlock wires.
#define AICONTROLDISABLED_OFF 0 // Silicons can control the airlock normally.
#define AICONTROLDISABLED_ON 1 // Silicons cannot control the airlock, but can hack the airlock.
#define AICONTROLDISABLED_BYPASS 2 // Silicons can control the airlock because they succeeded on the hack
#define AICONTROLDISABLED_PERMA 3 // Wire cutting an airlock on AICONTROLDISABLED_BYPASS toggles it between AICONTROLDISABLED_BYPASS and this.
-//plastic flaps construction states
+/// plastic flaps construction states
#define PLASTIC_FLAPS_NORMAL 0
#define PLASTIC_FLAPS_DETACHED 1
-//Mounted Frames BITMASK
+/// Mounted Frames BITMASK
#define MOUNTED_FRAME_SIMFLOOR (1 << 0)
#define MOUNTED_FRAME_NOSPACE (1 << 1)
-//ai core defines
+/// ai core defines
#define EMPTY_CORE 0
#define CIRCUIT_CORE 1
#define SCREWED_CORE 2
@@ -50,31 +50,38 @@
#define GLASS_CORE 4
#define AI_READY_CORE 5
-//other construction-related things
+/// other construction-related things
-//windows affected by nar'sie turn this color.
+/// windows affected by nar'sie turn this color.
#define NARSIE_WINDOW_COLOUR "#7D1919"
-//let's just pretend fulltile windows being children of border windows is fine
+/// let's just pretend fulltile windows being children of border windows is fine
#define FULLTILE_WINDOW_DIR NORTHEAST
-//Material defines, for determining how much of a given material an item contains
-#define MAT_METAL "$metal"
-#define MAT_GLASS "$glass"
-#define MAT_SILVER "$silver"
-#define MAT_GOLD "$gold"
-#define MAT_DIAMOND "$diamond"
-#define MAT_URANIUM "$uranium"
-#define MAT_PLASMA "$plasma"
-#define MAT_BLUESPACE "$bluespace"
-#define MAT_BANANIUM "$bananium"
-#define MAT_TRANQUILLITE "$tranquillite"
-#define MAT_TITANIUM "$titanium"
-#define MAT_BIOMASS "$biomass"
-#define MAT_PLASTIC "$plastic"
-//The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
+/// Range of a tint control button, that works only in its area.
+#define TINT_CONTROL_RANGE_AREA 0
+
+/// ID of a tint control button with no group specified, so it controls only windows also with no group specified ('null-like' id).
+#define TINT_CONTROL_GROUP_NONE 0
+
+/// Material defines, for determining how much of a given material an item contains
+#define MAT_METAL "metal"
+#define MAT_GLASS "glass"
+#define MAT_SILVER "silver"
+#define MAT_GOLD "gold"
+#define MAT_DIAMOND "diamond"
+#define MAT_URANIUM "uranium"
+#define MAT_PLASMA "plasma"
+#define MAT_BLUESPACE "bluespace"
+#define MAT_BANANIUM "bananium"
+#define MAT_TRANQUILLITE "tranquillite"
+#define MAT_TITANIUM "titanium"
+#define MAT_BIOMASS "biomass"
+#define MAT_PLASTIC "plastic"
+
+/// The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
#define MINERAL_MATERIAL_AMOUNT 2000
-//The maximum size of a stack object.
+/// The maximum size of a stack object.
#define MAX_STACK_SIZE 50
-//maximum amount of cable in a coil
+/// maximum amount of cable in a coil
#define MAXCOIL 30
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index a64306a38d1d..f680b67faaba 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -157,9 +157,6 @@
///from base of datum/radiation_wave/check_obstructions(): (datum/radiation_wave, width)
#define COMSIG_ATOM_RAD_WAVE_PASSING "atom_rad_wave_pass"
#define COMPONENT_RAD_WAVE_HANDLED (1<<0)
-///from internal loop in atom/movable/proc/CanReach(): (list/next)
-#define COMSIG_ATOM_CANREACH "atom_can_reach"
- #define COMPONENT_BLOCK_REACH (1<<0)
///from base of atom/screwdriver_act(): (mob/living/user, obj/item/I)
#define COMSIG_ATOM_SCREWDRIVER_ACT "atom_screwdriver_act"
///from base of atom/wrench_act(): (mob/living/user, obj/item/I)
@@ -525,7 +522,12 @@
#define COMSIG_CARBON_UPDATE_HANDCUFFED "carbon_update_handcuff"
/// From /mob/living/carbon/regenerate_icons()
#define COMSIG_CARBON_REGENERATE_ICONS "carbon_regen_icons"
-
+/// From /mob/living/carbon/enter_stamcrit()
+#define COMSIG_CARBON_ENTER_STAMINACRIT "carbon_enter_staminacrit"
+/// From /mob/living/carbon/update_stamina()
+#define COMSIG_CARBON_EXIT_STAMINACRIT "carbon_exit_staminacrit"
+/// From /mob/living/carbon/handle_status_effects()
+#define COMSIG_CARBON_STAMINA_REGENERATED "carbon_stamina_regenerated"
// /mob/living/simple_animal/hostile signals
#define COMSIG_HOSTILE_ATTACKINGTARGET "hostile_attackingtarget"
@@ -702,6 +704,9 @@
///called in /obj/item/gun/process_fire (user, target, params, zone_override)
#define COMSIG_MOB_FIRED_GUN "mob_fired_gun"
+///called in /obj/item/gun/process_fire (user, target)
+#define COMSIG_GUN_FIRED "gun_fired"
+
// /obj/item/grenade signals
///called in /obj/item/gun/process_fire (user, target, params, zone_override)
@@ -765,6 +770,10 @@
///From mob/living/carbon/human/attackedby(): (mob/living/carbon/human/attacker). Also found on species/disarm and species/harm
#define COMSIG_HUMAN_ATTACKED "human_attacked"
+///from /mob/living/carbon/human/proc/check_shields(): (atom/hit_by, damage, attack_text, attack_type, armour_penetration, damage_type)
+#define COMSIG_HUMAN_CHECK_SHIELDS "human_check_shields"
+ #define SHIELD_BLOCK (1<<0)
+
// /datum/species signals
///from datum/species/on_species_gain(): (datum/species/new_species, datum/species/old_species)
@@ -796,7 +805,7 @@
//Food
-///from base of obj/item/reagent_containers/food/snacks/attack(): (mob/living/eater, mob/feeder)
+///from base of obj/item/food/snacks/attack(): (mob/living/eater, mob/feeder)
#define COMSIG_FOOD_EATEN "food_eaten"
//Reagent
diff --git a/code/__DEFINES/inventory_defines.dm b/code/__DEFINES/inventory_defines.dm
index 95ab8b6ae8d1..546a9a664038 100644
--- a/code/__DEFINES/inventory_defines.dm
+++ b/code/__DEFINES/inventory_defines.dm
@@ -5,3 +5,8 @@
#define WEIGHT_CLASS_BULKY 4 //Items that can be weilded or equipped but not stored in an inventory, ex: Defibrillator, Backpack, Space Suits
#define WEIGHT_CLASS_HUGE 5 //Usually represents objects that require two hands to operate, ex: Shotgun, Two Handed Melee Weapons
#define WEIGHT_CLASS_GIGANTIC 6 //Essentially means it cannot be picked up or placed in an inventory, ex: Mech Parts, Safe
+
+//Inventory depth: limits how many nested storage items you can access directly.
+//1: stuff in mob, 2: stuff in backpack, 3: stuff in box in backpack, etc
+#define INVENTORY_DEPTH 3
+#define STORAGE_VIEW_DEPTH 2
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 3242f672b982..cab2662a7ec6 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -27,6 +27,8 @@
#define isaliensentinel(A) (istype(A, /mob/living/carbon/alien/humanoid/sentinel))
+#define isalienqueen(A) (istype(A, /mob/living/carbon/alien/humanoid/queen))
+
// Simple animals
#define issimple_animal(A) (istype(A, /mob/living/simple_animal))
@@ -119,7 +121,7 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
#define isradio(A) istype(A, /obj/item/radio)
#define ispill(A) istype(A, /obj/item/reagent_containers/pill)
#define ispatch(A) istype(A, /obj/item/reagent_containers/patch)
-#define isfood(A) istype(A, /obj/item/reagent_containers/food)
+#define isfood(A) istype(A, /obj/item/food)
// Modsuits
#define ismodcontrol(A) istype(A, /obj/item/mod/control)
diff --git a/code/__DEFINES/keybindings_defines.dm b/code/__DEFINES/keybindings_defines.dm
index cc1c80d83c56..6568d8a45094 100644
--- a/code/__DEFINES/keybindings_defines.dm
+++ b/code/__DEFINES/keybindings_defines.dm
@@ -14,6 +14,8 @@
#define KB_CATEGORY_EMOTE_SILICON 14
#define KB_CATEGORY_EMOTE_ANIMAL 15
#define KB_CATEGORY_EMOTE_CUSTOM 16
+#define KB_CATEGORY_CLICK 17
+#define KB_CATEGORY_COMMUNICATION 18
#define KB_CATEGORY_UNSORTED 1000
///Max length of a keypress command before it's considered to be a forged packet/bogus command
diff --git a/code/__DEFINES/language_defines.dm b/code/__DEFINES/language_defines.dm
index 2134628966db..345c73d193fc 100644
--- a/code/__DEFINES/language_defines.dm
+++ b/code/__DEFINES/language_defines.dm
@@ -1,13 +1,3 @@
-//Languages!
-#define LANGUAGE_HUMAN 1
-#define LANGUAGE_ALIEN 2
-#define LANGUAGE_DOG 4
-#define LANGUAGE_CAT 8
-#define LANGUAGE_BINARY 16
-#define LANGUAGE_OTHER 32768
-
-#define LANGUAGE_UNIVERSAL 65535
-
//Language flags.
#define WHITELISTED 1 // Language is available if the speaker is whitelisted.
#define RESTRICTED 2 // Language can only be accquired by spawning or an admin.
@@ -18,6 +8,7 @@
#define NO_STUTTER 256 // No stuttering, slurring, or other speech problems
#define NOBABEL 512 // Not granted by book of babel. Typically antag languages.
#define NOLIBRARIAN 1024 // Flag for banning the Librarian from certain languages. (actual 1984)
+#define HIVEMIND_RUNECHAT (1<<11) // Flag for letting hivemind languages have a runechat appear over the head of the recipient
//Auto-accent level defines.
#define AUTOHISS_OFF 0
diff --git a/code/__DEFINES/mappers.dm b/code/__DEFINES/mappers.dm
new file mode 100644
index 000000000000..28c2977aa9ef
--- /dev/null
+++ b/code/__DEFINES/mappers.dm
@@ -0,0 +1,21 @@
+/// Create directional subtypes for a path to simplify mapping.
+#define MAPPING_DIRECTIONAL_HELPERS(path, offset_y, offset_x) ##path/directional/north {\
+ name = "north bump"; \
+ dir = NORTH; \
+ pixel_y = offset_y; \
+} \
+##path/directional/south {\
+ name = "south bump"; \
+ dir = SOUTH; \
+ pixel_y = -offset_y; \
+} \
+##path/directional/east {\
+ name = "east bump"; \
+ dir = EAST; \
+ pixel_x = offset_x; \
+} \
+##path/directional/west {\
+ name = "west bump"; \
+ dir = WEST; \
+ pixel_x = -offset_x; \
+}
diff --git a/code/__DEFINES/martial_arts.dm b/code/__DEFINES/martial_arts.dm
index 4eb139cc44a1..4e8111e05733 100644
--- a/code/__DEFINES/martial_arts.dm
+++ b/code/__DEFINES/martial_arts.dm
@@ -6,6 +6,7 @@
#define MARTIAL_COMBO_DONE_CLEAR_COMBOS 5 // If the combo should do a basic hit after it's done
#define MARTIAL_ARTS_CANNOT_USE -1
+#define MARTIAL_ARTS_ACT_SUCCESS 1
#define MARTIAL_COMBO_STEP_HARM "Harm"
#define MARTIAL_COMBO_STEP_DISARM "Disarm"
diff --git a/code/__DEFINES/misc_defines.dm b/code/__DEFINES/misc_defines.dm
index 482bc95f622c..fc47625b19da 100644
--- a/code/__DEFINES/misc_defines.dm
+++ b/code/__DEFINES/misc_defines.dm
@@ -313,6 +313,23 @@
#define TRIGGER_GUARD_NONE 0
#define TRIGGER_GUARD_NORMAL 1
+// These comments mirror the below define in the order of operations to help you understand what it is doing
+ // Check if datum I is a mob
+ // If I is a mob, return the client of mob I
+ // Else, check to see if I is a client
+ // If I is a client, return I
+ // Else, check to see if I is a mind
+ // If I is a mind, try and return the mind's current mob's client
+
+/// Return a Client
+#define CLIENT_FROM_VAR(I) (ismob(I) \
+ ? I:client \
+ : istype(I, /client) \
+ ? I \
+ : istype(I, /datum/mind \
+ ? I:current?:client \
+ : null))
+
// Macro to get the current elapsed round time, rather than total world runtime
#define ROUND_TIME (SSticker.time_game_started ? (world.time - SSticker.time_game_started) : 0)
@@ -588,3 +605,5 @@
#define TS_INFESTATION_WHITE_SPIDER 3
#define TS_INFESTATION_PRINCESS_SPIDER 4
#define TS_INFESTATION_QUEEN_SPIDER 5
+
+#define MAX_ALLOWED_TELEPORTS_PER_PROCESS 20
diff --git a/code/__DEFINES/mob_defines.dm b/code/__DEFINES/mob_defines.dm
index de0aafa4096e..f1514f1126f0 100644
--- a/code/__DEFINES/mob_defines.dm
+++ b/code/__DEFINES/mob_defines.dm
@@ -11,6 +11,10 @@
#define ORGAN_BURNT (1 << 7)
#define ORGAN_SALVED (1 << 8)
+// Organ datum defines. Each one of these represents a slot for organ datums in internal_organ_datums
+#define ORGAN_DATUM_HEART "heart"
+#define ORGAN_DATUM_LUNGS "lungs"
+
// For limb resistance flags
#define CANNOT_BREAK (1 << 0)
#define CANNOT_DISMEMBER (1 << 1)
diff --git a/code/__DEFINES/pipes.dm b/code/__DEFINES/pipes.dm
index 92fc2f12788f..dbf877001bf8 100644
--- a/code/__DEFINES/pipes.dm
+++ b/code/__DEFINES/pipes.dm
@@ -11,8 +11,8 @@
#define PIPE_MVALVE 8
#define PIPE_PUMP 9
#define PIPE_SCRUBBER 10
-#define PIPE_INSULATED_STRAIGHT 11
-#define PIPE_INSULATED_BENT 12
+// #define PIPE_INSULATED_STRAIGHT 11
+// #define PIPE_INSULATED_BENT 12
#define PIPE_GAS_FILTER 13
#define PIPE_GAS_MIXER 14
#define PIPE_PASSIVE_GATE 15
diff --git a/code/__DEFINES/preferences_defines.dm b/code/__DEFINES/preferences_defines.dm
index 8272092d330d..15d4b3dba673 100644
--- a/code/__DEFINES/preferences_defines.dm
+++ b/code/__DEFINES/preferences_defines.dm
@@ -1,73 +1,76 @@
//Preference toggles
-#define SOUND_ADMINHELP 1
-#define SOUND_MIDI 2
-#define SOUND_AMBIENCE 4
-#define SOUND_LOBBY 8
-#define SOUND_HEARTBEAT 32
-#define SOUND_BUZZ 64
-#define SOUND_INSTRUMENTS 128
-#define SOUND_MENTORHELP 256
-#define SOUND_DISCO 512
-#define SOUND_AI_VOICE 1024
+#define SOUND_ADMINHELP 1
+#define SOUND_MIDI 2
+#define SOUND_AMBIENCE 4
+#define SOUND_LOBBY 8
+#define SOUND_HEARTBEAT 32
+#define SOUND_BUZZ 64
+#define SOUND_INSTRUMENTS 128
+#define SOUND_MENTORHELP 256
+#define SOUND_DISCO 512
+#define SOUND_AI_VOICE 1024
#define SOUND_PRAYERNOTIFY 2048
#define SOUND_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|SOUND_HEARTBEAT|SOUND_BUZZ|SOUND_INSTRUMENTS|SOUND_MENTORHELP|SOUND_DISCO|SOUND_AI_VOICE|SOUND_PRAYERNOTIFY)
-#define PREFTOGGLE_CHAT_OOC 1
-#define PREFTOGGLE_CHAT_DEAD 2
-#define PREFTOGGLE_CHAT_GHOSTEARS 4
-#define PREFTOGGLE_CHAT_GHOSTSIGHT 8
-#define PREFTOGGLE_CHAT_PRAYER 16
-#define PREFTOGGLE_CHAT_RADIO 32
-#define PREFTOGGLE_AZERTY 64 // obsolete
-#define PREFTOGGLE_CHAT_DEBUGLOGS 128
-#define PREFTOGGLE_CHAT_LOOC 256
-#define PREFTOGGLE_CHAT_GHOSTRADIO 512
-#define PREFTOGGLE_SHOW_TYPING 1024
-#define PREFTOGGLE_DISABLE_SCOREBOARD 2048
+#define PREFTOGGLE_CHAT_OOC 1
+#define PREFTOGGLE_CHAT_DEAD 2
+#define PREFTOGGLE_CHAT_GHOSTEARS 4
+#define PREFTOGGLE_CHAT_GHOSTSIGHT 8
+#define PREFTOGGLE_CHAT_PRAYER 16
+#define PREFTOGGLE_CHAT_RADIO 32
+// #define PREFTOGGLE_AZERTY 64 // obsolete
+#define PREFTOGGLE_CHAT_DEBUGLOGS 128
+#define PREFTOGGLE_CHAT_LOOC 256
+#define PREFTOGGLE_CHAT_GHOSTRADIO 512
+#define PREFTOGGLE_SHOW_TYPING 1024
+#define PREFTOGGLE_DISABLE_SCOREBOARD 2048
// #define PREFTOGGLE_DISABLE_KARMA_REMINDER 4096 // Defunct as of 2023-03-12
-#define PREFTOGGLE_MEMBER_PUBLIC 8192
-#define PREFTOGGLE_CHAT_NO_ADMINLOGS 16384
-#define PREFTOGGLE_DONATOR_PUBLIC 32768
-#define PREFTOGGLE_CHAT_NO_TICKETLOGS 65536
-#define PREFTOGGLE_UI_DARKMODE 131072
+#define PREFTOGGLE_MEMBER_PUBLIC 8192
+#define PREFTOGGLE_CHAT_NO_ADMINLOGS 16384
+#define PREFTOGGLE_DONATOR_PUBLIC 32768
+#define PREFTOGGLE_CHAT_NO_TICKETLOGS 65536
+// #define PREFTOGGLE_UI_DARKMODE 131072 // Defunct as of 2024-01-29
// #define PREFTOGGLE_DISABLE_KARMA 262144 // Defunct as of 2023-03-12
-#define PREFTOGGLE_CHAT_NO_MENTORTICKETLOGS 524288
-#define PREFTOGGLE_TYPING_ONCE 1048576
-#define PREFTOGGLE_AMBIENT_OCCLUSION 2097152
-#define PREFTOGGLE_CHAT_GHOSTPDA 4194304
-#define PREFTOGGLE_NUMPAD_TARGET 8388608 // Made obsolete with key bindings
+#define PREFTOGGLE_CHAT_NO_MENTORTICKETLOGS 524288
+// #define PREFTOGGLE_TYPING_ONCE 1048576 // Defunct as of 2024-01-29
+#define PREFTOGGLE_AMBIENT_OCCLUSION 2097152
+#define PREFTOGGLE_CHAT_GHOSTPDA 4194304
+// #define PREFTOGGLE_NUMPAD_TARGET 8388608 // Made obsolete with key bindings
-#define TOGGLES_TOTAL 16777215 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined.
+#define TOGGLES_TOTAL 16777215 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined.
-#define TOGGLES_DEFAULT (PREFTOGGLE_CHAT_OOC|PREFTOGGLE_CHAT_DEAD|PREFTOGGLE_CHAT_GHOSTEARS|PREFTOGGLE_CHAT_GHOSTSIGHT|PREFTOGGLE_CHAT_PRAYER|PREFTOGGLE_CHAT_RADIO|PREFTOGGLE_CHAT_DEBUGLOGS|PREFTOGGLE_CHAT_LOOC|PREFTOGGLE_MEMBER_PUBLIC|PREFTOGGLE_DONATOR_PUBLIC|PREFTOGGLE_AMBIENT_OCCLUSION|PREFTOGGLE_CHAT_GHOSTPDA|PREFTOGGLE_NUMPAD_TARGET)
+#define TOGGLES_DEFAULT (PREFTOGGLE_CHAT_OOC|PREFTOGGLE_CHAT_DEAD|PREFTOGGLE_CHAT_GHOSTEARS|PREFTOGGLE_CHAT_GHOSTSIGHT|PREFTOGGLE_CHAT_PRAYER|PREFTOGGLE_CHAT_RADIO|PREFTOGGLE_CHAT_DEBUGLOGS|PREFTOGGLE_CHAT_LOOC|PREFTOGGLE_MEMBER_PUBLIC|PREFTOGGLE_DONATOR_PUBLIC|PREFTOGGLE_AMBIENT_OCCLUSION|PREFTOGGLE_CHAT_GHOSTPDA)
// toggles_2 variables. These MUST be prefixed with PREFTOGGLE_2
-#define PREFTOGGLE_2_RANDOMSLOT (1<<0) // 1
-#define PREFTOGGLE_2_FANCYUI (1<<1) // 2
-#define PREFTOGGLE_2_ITEMATTACK (1<<2) // 4
-#define PREFTOGGLE_2_WINDOWFLASHING (1<<3) // 8
-#define PREFTOGGLE_2_ANON (1<<4) // 16
-#define PREFTOGGLE_2_AFKWATCH (1<<5) // 32
-#define PREFTOGGLE_2_RUNECHAT (1<<6) // 64
-#define PREFTOGGLE_2_DEATHMESSAGE (1<<7) // 128
-#define PREFTOGGLE_2_EMOTE_BUBBLE (1<<8) // 256
+#define PREFTOGGLE_2_RANDOMSLOT (1<<0) // 1
+#define PREFTOGGLE_2_FANCYUI (1<<1) // 2
+#define PREFTOGGLE_2_ITEMATTACK (1<<2) // 4
+#define PREFTOGGLE_2_WINDOWFLASHING (1<<3) // 8
+#define PREFTOGGLE_2_ANON (1<<4) // 16
+#define PREFTOGGLE_2_AFKWATCH (1<<5) // 32
+#define PREFTOGGLE_2_RUNECHAT (1<<6) // 64
+#define PREFTOGGLE_2_DEATHMESSAGE (1<<7) // 128
+// #define PREFTOGGLE_2_EMOTE_BUBBLE (1<<8) // 256 - Defunct as of 2024-01-29
// Yes I know this being an "enable to disable" is misleading, but it avoids having to tweak all existing pref entries
-#define PREFTOGGLE_2_REVERB_DISABLE (1<<9) // 512
-#define PREFTOGGLE_2_FORCE_WHITE_RUNECHAT (1<<10) // 1024
-#define PREFTOGGLE_2_SIMPLE_STAT_PANEL (1<<11) // 2048
-#define PREFTOGGLE_2_SEE_ITEM_OUTLINES (1<<12) // 4096
-#define PREFTOGGLE_2_HIDE_ITEM_TOOLTIPS (1<<13) // 8192
-#define PREFTOGGLE_2_THOUGHT_BUBBLE (1<<14) // 16384
-#define PREFTOGGLE_2_MC_TABS (1<<15) // 32768
-#define PREFTOGGLE_2_DANCE_DISCO (1<<16) // 65536
-#define PREFTOGGLE_2_MOD_ACTIVATION_METHOD (1<<17) // 131072
-#define PREFTOGGLE_2_PARALLAX_IN_DARKNESS (1<<18) // 262144
-#define PREFTOGGLE_2_DISABLE_TGUI_LISTS (1<<19) // 524288
-
-#define TOGGLES_2_TOTAL 1048575 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined.
-
-#define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_EMOTE_BUBBLE|PREFTOGGLE_2_SEE_ITEM_OUTLINES|PREFTOGGLE_2_THOUGHT_BUBBLE|PREFTOGGLE_2_DANCE_DISCO|PREFTOGGLE_2_MOD_ACTIVATION_METHOD)
+#define PREFTOGGLE_2_REVERB_DISABLE (1<<9) // 512
+#define PREFTOGGLE_2_FORCE_WHITE_RUNECHAT (1<<10) // 1024
+#define PREFTOGGLE_2_SIMPLE_STAT_PANEL (1<<11) // 2048
+#define PREFTOGGLE_2_SEE_ITEM_OUTLINES (1<<12) // 4096
+#define PREFTOGGLE_2_HIDE_ITEM_TOOLTIPS (1<<13) // 8192
+#define PREFTOGGLE_2_THOUGHT_BUBBLE (1<<14) // 16384
+#define PREFTOGGLE_2_MC_TABS (1<<15) // 32768
+#define PREFTOGGLE_2_DANCE_DISCO (1<<16) // 65536
+#define PREFTOGGLE_2_MOD_ACTIVATION_METHOD (1<<17) // 131072
+#define PREFTOGGLE_2_PARALLAX_IN_DARKNESS (1<<18) // 262144
+#define PREFTOGGLE_2_DISABLE_TGUI_INPUT (1<<19) // 524288
+#define PREFTOGGLE_2_ENABLE_TGUI_SAY_LIGHT_MODE (1<<20) // 1048576
+#define PREFTOGGLE_2_SWAP_INPUT_BUTTONS (1<<21) // 2097152
+#define PREFTOGGLE_2_LARGE_INPUT_BUTTONS (1<<22) // 4194304
+
+#define TOGGLES_2_TOTAL 8388607 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined.
+
+#define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_SEE_ITEM_OUTLINES|PREFTOGGLE_2_THOUGHT_BUBBLE|PREFTOGGLE_2_DANCE_DISCO|PREFTOGGLE_2_MOD_ACTIVATION_METHOD|PREFTOGGLE_2_SWAP_INPUT_BUTTONS|PREFTOGGLE_2_LARGE_INPUT_BUTTONS)
// Sanity checks
#if TOGGLES_TOTAL > 16777215
@@ -125,10 +128,11 @@
#define MAX_SAVE_SLOTS 30 // Save slots for regular players
#define MAX_SAVE_SLOTS_MEMBER 30 // Save slots for BYOND members
-#define TAB_CHAR 0
-#define TAB_GAME 1
-#define TAB_GEAR 2
-#define TAB_KEYS 3
+#define TAB_CHAR 0
+#define TAB_GAME 1
+#define TAB_ANTAG 2
+#define TAB_GEAR 3
+#define TAB_KEYS 4
// Colourblind modes
#define COLOURBLIND_MODE_NONE "None"
diff --git a/code/__DEFINES/sound_defines.dm b/code/__DEFINES/sound_defines.dm
index 1f64c9a9c78a..262f2a600f69 100644
--- a/code/__DEFINES/sound_defines.dm
+++ b/code/__DEFINES/sound_defines.dm
@@ -11,10 +11,11 @@
#define CHANNEL_ASH_STORM 1015
#define CHANNEL_RADIO_NOISE 1014 // radio headset noise
#define CHANNEL_BOSS_MUSIC 1013
+#define CHANNEL_GENERAL 1012
// SS220 ADDITION START
-#define CHANNEL_TTS_RADIO 1012
-#define CHANNEL_TTS_LOCAL 1011
-#define CHANNEL_CINEMATIC 1010
+#define CHANNEL_TTS_RADIO 1011
+#define CHANNEL_TTS_LOCAL 1010
+#define CHANNEL_CINEMATIC 1009
// SS220 ADDITION END
#define USER_VOLUME(M, C) M?.client?.prefs.get_channel_volume(C)
@@ -22,7 +23,7 @@
//THIS SHOULD ALWAYS BE THE LOWEST ONE!
//KEEP IT UPDATED
-#define CHANNEL_HIGHEST_AVAILABLE 1009 // SS220 EDIT
+#define CHANNEL_HIGHEST_AVAILABLE 1008
#define MAX_INSTRUMENT_CHANNELS (128 * 6)
diff --git a/code/__DEFINES/speech_channels.dm b/code/__DEFINES/speech_channels.dm
new file mode 100644
index 000000000000..68067d21aec6
--- /dev/null
+++ b/code/__DEFINES/speech_channels.dm
@@ -0,0 +1,11 @@
+// Used to direct channels to speak into.
+#define SAY_CHANNEL "Say"
+#define RADIO_CHANNEL "Radio"
+#define WHISPER_CHANNEL "Whisper"
+#define ME_CHANNEL "Me"
+#define OOC_CHANNEL "OOC"
+#define LOOC_CHANNEL "LOOC"
+#define MENTOR_CHANNEL "Mentor"
+#define ADMIN_CHANNEL "Admin"
+#define DSAY_CHANNEL "Dsay"
+
diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm
index addf59e2f02e..ac824022f6cf 100644
--- a/code/__DEFINES/stat.dm
+++ b/code/__DEFINES/stat.dm
@@ -3,12 +3,6 @@
#define UNCONSCIOUS 1
#define DEAD 2
-// TGUI flags
-#define STATUS_INTERACTIVE 2 // GREEN Visability
-#define STATUS_UPDATE 1 // ORANGE Visability
-#define STATUS_DISABLED 0 // RED Visability
-#define STATUS_CLOSE -1 // Close the interface
-
/*
Shuttles
*/
diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm
index a7ee1856f94d..b903749ea310 100644
--- a/code/__DEFINES/status_effects.dm
+++ b/code/__DEFINES/status_effects.dm
@@ -60,6 +60,8 @@
#define STATUS_EFFECT_REVOLUTION_PROTECT /datum/status_effect/rev_protection
+#define STATUS_EFFECT_BEARSERKER_RAGE /datum/status_effect/bearserker_rage
+
/////////////
// DEBUFFS //
/////////////
@@ -106,6 +108,10 @@
#define STATUS_BOOKWYRM /datum/status_effect/bookwyrm
+#define STATUS_EFFECT_ABDUCTOR_COOLDOWN /datum/status_effect/abductor_cooldown //warning status, prevents abductor from being recalled for 10 seconds
+
+#define STATUS_EFFECT_MAGIC_DISGUISE /datum/status_effect/magic_disguise
+
//#define STATUS_EFFECT_NECROPOLIS_CURSE /datum/status_effect/necropolis_curse
//#define CURSE_BLINDING 1 //makes the edges of the target's screen obscured
@@ -182,6 +188,8 @@
#define STATUS_EFFECT_LWAPSCOPE /datum/status_effect/lwap_scope
/// This status effect allows a mob to be revived with a defibrillator.
#define STATUS_EFFECT_REVIVABLE /datum/status_effect/limited_bonus/revivable
+/// Causes a random safe teleport every 2 seconds for a limited time
+#define STATUS_EFFECT_TELEPORT_ROULETTE /datum/status_effect/teleport_roulette
/// Status effects for different actions
#define STATUS_EFFECT_REMOVE_CUFFS /datum/status_effect/action_status_effect/remove_handcuffs
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 19a59ed2faf6..53962a8ee9a1 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -84,10 +84,12 @@
#define INIT_ORDER_LATE_MAPPING -40
#define INIT_ORDER_PATH -50
#define INIT_ORDER_PERSISTENCE -95
+#define INIT_ORDER_CHAT -100 // Should be last to ensure chat remains smooth during init.
// Subsystem fire priority, from lowest to highest priority
// If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
+#define FIRE_PRIORITY_PING 10
#define FIRE_PRIORITY_NANOMOB 10
#define FIRE_PRIORITY_NIGHTSHIFT 10
#define FIRE_PRIORITY_IDLE_NPC 10
@@ -112,6 +114,7 @@
#define FIRE_PRIORITY_MOBS 100
#define FIRE_PRIORITY_TGUI 110
#define FIRE_PRIORITY_TICKER 200
+#define FIRE_PRIORITY_CHAT 400
#define FIRE_PRIORITY_RUNECHAT 410 // I hate how high the fire priority on this is -aa
#define FIRE_PRIORITY_OVERLAYS 500
#define FIRE_PRIORITY_DELAYED_VERBS 950
diff --git a/code/__DEFINES/tgui_defines.dm b/code/__DEFINES/tgui_defines.dm
index 6257e24d9f8c..ccd8d25f6f70 100644
--- a/code/__DEFINES/tgui_defines.dm
+++ b/code/__DEFINES/tgui_defines.dm
@@ -1,4 +1,4 @@
-// TGUI defines
+// TGUI Modal defines
#define UI_MODAL_INPUT_MAX_LENGTH 1024
#define UI_MODAL_INPUT_MAX_LENGTH_NAME 64 // Names for generally anything don't go past 32, let alone 64.
@@ -6,3 +6,41 @@
#define UI_MODAL_DELEGATE 2
#define UI_MODAL_ANSWER 3
#define UI_MODAL_CLOSE 4
+
+/// Green eye; fully interactive
+#define UI_INTERACTIVE 2
+/// Orange eye; updates but is not interactive
+#define UI_UPDATE 1
+/// Red eye; disabled, does not update
+#define UI_DISABLED 0
+/// UI Should close
+#define UI_CLOSE -1
+
+/// Maximum number of windows that can be suspended/reused
+#define TGUI_WINDOW_SOFT_LIMIT 5
+/// Maximum number of open windows
+#define TGUI_WINDOW_HARD_LIMIT 9
+
+/// Maximum ping timeout allowed to detect zombie windows
+#define TGUI_PING_TIMEOUT (4 SECONDS)
+/// Used for rate-limiting to prevent DoS by excessively refreshing a TGUI window
+#define TGUI_REFRESH_FULL_UPDATE_COOLDOWN (1 SECONDS)
+
+/// Window does not exist
+#define TGUI_WINDOW_CLOSED 0
+/// Window was just opened, but is still not ready to be sent data
+#define TGUI_WINDOW_LOADING 1
+/// Window is free and ready to receive data
+#define TGUI_WINDOW_READY 2
+
+/// Get a window id based on the provided pool index
+#define TGUI_WINDOW_ID(index) "tgui-window-[index]"
+/// Get a pool index of the provided window id
+#define TGUI_WINDOW_INDEX(window_id) text2num(copytext(window_id, 13))
+
+/// Creates a message packet for sending via output()
+#define TGUI_CREATE_MESSAGE(type, payload) ( \
+ url_encode(json_encode(list( \
+ "type" = type, \
+ "payload" = payload, \
+ ))))
diff --git a/code/__DEFINES/tools_defines.dm b/code/__DEFINES/tools_defines.dm
index 70af463f7ddb..dff98f4bda19 100644
--- a/code/__DEFINES/tools_defines.dm
+++ b/code/__DEFINES/tools_defines.dm
@@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(surgery_tool_behaviors, list(
//Wirecutter messages
#define WIRECUTTER_SNIP_MESSAGE user.visible_message("[user] cuts the wires from [src]!", "You cut the wires from [src]!", "You hear snipping.")
-#define WIRECUTTER_ATTEMPT_DISMANTLE_MESSAGE user.visible_message("[user] begins cutting [src] apart... ", "You begin cutting [src] apart...", "You hear snipping.")
+#define WIRECUTTER_ATTEMPT_DISMANTLE_MESSAGE user.visible_message("[user] begins cutting [src] apart...", "You begin cutting [src] apart...", "You hear snipping.")
#define WIRECUTTER_DISMANTLE_SUCCESS_MESSAGE user.visible_message("[user] cuts [src] apart!", "You cut [src] apart!", "You hear snipping.")
//Welder messages and other stuff
diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm
index de2800a7ccc8..1fdbbbaa60e2 100644
--- a/code/__HELPERS/_logging.dm
+++ b/code/__HELPERS/_logging.dm
@@ -40,7 +40,7 @@ GLOBAL_PROTECT(log_end)
for(var/client/C in GLOB.admins)
if(check_rights(R_DEBUG | R_VIEWRUNTIMES, FALSE, C.mob) && (C.prefs.toggles & PREFTOGGLE_CHAT_DEBUGLOGS))
- to_chat(C, "DEBUG: [text]")
+ to_chat(C, "DEBUG: [text]", MESSAGE_TYPE_DEBUG, confidential = TRUE)
/proc/log_game(text)
if(GLOB.configuration.logging.game_logging)
@@ -149,8 +149,19 @@ GLOBAL_PROTECT(log_end)
/proc/log_runtime_summary(text)
rustg_log_write(GLOB.runtime_summary_log, "[text][GLOB.log_end]")
-/proc/log_tgui(text)
- rustg_log_write(GLOB.tgui_log, "[text][GLOB.log_end]")
+/proc/log_tgui(user_or_client, text)
+ var/list/messages = list()
+ if(!user_or_client)
+ messages.Add("no user")
+ else if(ismob(user_or_client))
+ var/mob/user = user_or_client
+ messages.Add("[user.ckey] (as [user])")
+ else if(isclient(user_or_client))
+ var/client/client = user_or_client
+ messages.Add("[client.ckey]")
+ messages.Add(": [text]")
+ messages.Add("[GLOB.log_end]")
+ rustg_log_write(GLOB.tgui_log, messages.Join())
#ifdef REFERENCE_TRACKING
/proc/log_gc(text)
diff --git a/code/__HELPERS/api.dm b/code/__HELPERS/api.dm
index 1a0b567e959a..9f25fe4c2a40 100644
--- a/code/__HELPERS/api.dm
+++ b/code/__HELPERS/api.dm
@@ -20,7 +20,7 @@
if(IsAdminAdvancedProcCall())
// Admins shouldnt fuck with this
- to_chat(usr, "API interaction blocked: Advanced ProcCall detected.")
+ to_chat(usr, "API interaction blocked: Advanced ProcCall detected.")
message_admins("[key_name(usr)] attempted to interact with the internal API via advanced proc-call")
log_admin("[key_name(usr)] attempted to interact with the internal API via advanced proc-call")
return
diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm
index 397c05c466c8..0ec44eb327f0 100644
--- a/code/__HELPERS/files.dm
+++ b/code/__HELPERS/files.dm
@@ -2,7 +2,7 @@
/proc/wrap_file(filepath)
if(IsAdminAdvancedProcCall())
// Admins shouldnt fuck with this
- to_chat(usr, "File load blocked: Advanced ProcCall detected.")
+ to_chat(usr, "File load blocked: Advanced ProcCall detected.")
message_admins("[key_name(usr)] attempted to load files via advanced proc-call")
log_admin("[key_name(usr)] attempted to load files via advanced proc-call")
return
@@ -12,7 +12,7 @@
/proc/wrap_file2text(filepath)
if(IsAdminAdvancedProcCall())
// Admins shouldnt fuck with this
- to_chat(usr, "File load blocked: Advanced ProcCall detected.")
+ to_chat(usr, "File load blocked: Advanced ProcCall detected.")
message_admins("[key_name(usr)] attempted to load files via advanced proc-call")
log_admin("[key_name(usr)] attempted to load files via advanced proc-call")
return
@@ -33,11 +33,6 @@
return text
-//Sends resource files to client cache
-/client/proc/getFiles()
- for(var/file in args)
- src << browse_rsc(file)
-
/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt", "log", "htm", "json"))
// wow why was this ever a parameter
root = "data/logs/"
diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm
index 2caf08837271..b6a7a52b5a5c 100644
--- a/code/__HELPERS/icon_smoothing.dm
+++ b/code/__HELPERS/icon_smoothing.dm
@@ -103,7 +103,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
for(var/direction in GLOB.cardinal)
switch(find_type_in_direction(direction))
if(NULLTURF_BORDER)
- if((smoothing_flags & SMOOTH_BORDER))
+ if(smoothing_flags & SMOOTH_BORDER)
. |= direction //BYOND and smooth dirs are the same for cardinals
if(ADJ_FOUND)
. |= direction //BYOND and smooth dirs are the same for cardinals
@@ -112,7 +112,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
if(. & WEST_JUNCTION)
switch(find_type_in_direction(NORTHWEST))
if(NULLTURF_BORDER)
- if((smoothing_flags & SMOOTH_BORDER))
+ if(smoothing_flags & SMOOTH_BORDER)
. |= NORTHWEST_JUNCTION
if(ADJ_FOUND)
. |= NORTHWEST_JUNCTION
@@ -120,7 +120,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
if(. & EAST_JUNCTION)
switch(find_type_in_direction(NORTHEAST))
if(NULLTURF_BORDER)
- if((smoothing_flags & SMOOTH_BORDER))
+ if(smoothing_flags & SMOOTH_BORDER)
. |= NORTHEAST_JUNCTION
if(ADJ_FOUND)
. |= NORTHEAST_JUNCTION
@@ -129,7 +129,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
if(. & WEST_JUNCTION)
switch(find_type_in_direction(SOUTHWEST))
if(NULLTURF_BORDER)
- if((smoothing_flags & SMOOTH_BORDER))
+ if(smoothing_flags & SMOOTH_BORDER)
. |= SOUTHWEST_JUNCTION
if(ADJ_FOUND)
. |= SOUTHWEST_JUNCTION
@@ -137,7 +137,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
if(. & EAST_JUNCTION)
switch(find_type_in_direction(SOUTHEAST))
if(NULLTURF_BORDER)
- if((smoothing_flags & SMOOTH_BORDER))
+ if(smoothing_flags & SMOOTH_BORDER)
. |= SOUTHEAST_JUNCTION
if(ADJ_FOUND)
. |= SOUTHEAST_JUNCTION
diff --git a/code/__HELPERS/iconprocs.dm b/code/__HELPERS/iconprocs.dm
index eb86df49e86d..067aabb188d3 100644
--- a/code/__HELPERS/iconprocs.dm
+++ b/code/__HELPERS/iconprocs.dm
@@ -299,3 +299,44 @@ world
M.Blend("#ffffff", ICON_SUBTRACT)
// apply mask
Blend(M, ICON_ADD)
+
+// Converts an icon to base64. Operates by putting the icon in the iconCache savefile,
+// exporting it as text, and then parsing the base64 from that.
+// (This relies on byond automatically storing icons in savefiles as base64)
+GLOBAL_DATUM_INIT(iconCache, /savefile, new /savefile("data/iconCache.sav"))
+
+GLOBAL_LIST_EMPTY(bicon_cache)
+
+/proc/icon2base64(icon/icon, iconKey = "misc")
+ if(!isicon(icon)) return 0
+
+ GLOB.iconCache[iconKey] << icon
+ var/iconData = GLOB.iconCache.ExportText(iconKey)
+ var/list/partial = splittext(iconData, "{")
+ return replacetext(copytext(partial[2], 3, -5), "\n", "")
+
+/proc/bicon(obj, use_class = 1)
+ var/class = use_class ? "class='icon misc'" : null
+ if(!obj)
+ return
+
+ if(isicon(obj))
+ if(!GLOB.bicon_cache["\ref[obj]"]) // Doesn't exist yet, make it.
+ GLOB.bicon_cache["\ref[obj]"] = icon2base64(obj)
+
+ return ""
+
+ // Either an atom or somebody fucked up and is gonna get a runtime, which I'm fine with.
+ var/atom/A = obj
+ var/key = "[istype(A.icon, /icon) ? "\ref[A.icon]" : A.icon]:[A.icon_state]"
+ if(!GLOB.bicon_cache[key]) // Doesn't exist, make it.
+ var/icon/I = icon(A.icon, A.icon_state, SOUTH, 1)
+ if(ishuman(obj)) // Shitty workaround for a BYOND issue.
+ var/icon/temp = I
+ I = icon()
+ I.Insert(temp, dir = SOUTH)
+ GLOB.bicon_cache[key] = icon2base64(I, key)
+ if(use_class)
+ class = "class='icon [A.icon_state]'"
+
+ return ""
diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm
index c4f932574a6e..812f8369e237 100644
--- a/code/__HELPERS/lists.dm
+++ b/code/__HELPERS/lists.dm
@@ -410,13 +410,6 @@
var/middle = L.len / 2 + 1 // Copy is first,second-1
return mergeLists(sortList(L.Copy(0,middle)), sortList(L.Copy(middle))) //second parameter null = to end of list
-//Mergsorge: uses sortAssoc() but uses the var's name specifically. This should probably be using mergeAtom() instead
-/proc/sortNames(list/L)
- var/list/Q = new()
- for(var/atom/x in L)
- Q[x.name] = x
- return sortAssoc(Q)
-
/proc/mergeLists(list/L, list/R)
var/Li=1
var/Ri=1
@@ -865,3 +858,15 @@
// Pick something else from a list than we last picked
/proc/pick_excluding(list/l, exclude)
return pick(l - exclude)
+
+///takes an input_key, as text, and the list of keys already used, outputting a replacement key in the format of "[input_key] ([number_of_duplicates])" if it finds a duplicate
+///use this for lists of things that might have the same name, like mobs or objects, that you plan on giving to a player as input
+/proc/avoid_assoc_duplicate_keys(input_key, list/used_key_list)
+ if(!input_key || !istype(used_key_list))
+ return
+ if(used_key_list[input_key])
+ used_key_list[input_key]++
+ input_key = "[input_key] ([used_key_list[input_key]])"
+ else
+ used_key_list[input_key] = 1
+ return input_key
diff --git a/code/__HELPERS/mob_helpers.dm b/code/__HELPERS/mob_helpers.dm
index 5a6fc82dc98e..81d2bd0efbeb 100644
--- a/code/__HELPERS/mob_helpers.dm
+++ b/code/__HELPERS/mob_helpers.dm
@@ -218,12 +218,14 @@
else return "unknown"
else if(species == "Vox")
switch(tone)
- if(2) return "dark green"
+ if(2) return "plum"
if(3) return "brown"
if(4) return "gray"
if(5) return "emerald"
if(6) return "azure"
- else return "green"
+ if(7) return "crimson"
+ if(8) return "nebula"
+ else return "lime"
else
return "unknown"
@@ -582,7 +584,6 @@ GLOBAL_LIST_EMPTY(do_after_once_tracker)
to_chat(user, "No mob located in [A].")
// Suppress the mouse macros
-/client/var/next_mouse_macro_warning
/mob/proc/LogMouseMacro(verbused, params)
if(!client)
return
@@ -707,3 +708,7 @@ GLOBAL_LIST_EMPTY(do_after_once_tracker)
out_ckey = "(Disconnected)"
return out_ckey
+
+/// rounds value to limited symbols after the period for organ damage and other values
+/proc/round_health(health)
+ return round(health, 0.01)
diff --git a/code/__HELPERS/name_helpers.dm b/code/__HELPERS/name_helpers.dm
index 5f97da0fd55a..389d8a9759db 100644
--- a/code/__HELPERS/name_helpers.dm
+++ b/code/__HELPERS/name_helpers.dm
@@ -108,6 +108,10 @@ GLOBAL_VAR(syndicate_name)
GLOBAL_VAR(syndicate_code_phrase) //Code phrase for traitors.
GLOBAL_VAR(syndicate_code_response) //Code response for traitors.
+//Cached regex search - for checking if codewords are used.
+GLOBAL_DATUM(syndicate_code_phrase_regex, /regex)
+GLOBAL_DATUM(syndicate_code_response_regex, /regex)
+
/*
Should be expanded.
How this works:
@@ -122,9 +126,12 @@ GLOBAL_VAR(syndicate_code_response) //Code response for traitors.
/N
*/
-/proc/generate_code_phrase()//Proc is used for phrase and response in master_controller.dm
+/proc/generate_code_phrase(return_list = FALSE) // Proc is used for phrase and response in master_controller.dm
- var/code_phrase = ""//What is returned when the proc finishes.
+ if(!return_list)
+ . = ""
+ else
+ . = list()
var/words = pick(//How many words there will be. Minimum of two. 2, 4 and 5 have a lesser chance of being selected. 3 is the most likely.
50; 2,
200; 3,
@@ -152,34 +159,34 @@ GLOBAL_VAR(syndicate_code_response) //Code response for traitors.
switch(pick(safety))//Chance based on the safety list.
if(1)//1 and 2 can only be selected once each to prevent more than two specific names/places/etc.
- switch(rand(1,2))//Mainly to add more options later.
+ switch(rand(1, 2)) // Mainly to add more options later.
if(1)
- if(names.len)
- code_phrase += pick(names)
+ if(length(names))
+ . += pick(names)
if(2)
- code_phrase += pick(GLOB.jobs)//Returns a job. // SS220 EDIT - ORIGINAL: (GLOB.joblist)
+ . += pick(GLOB.jobs)//Returns a job. // SS220 EDIT - ORIGINAL: (GLOB.joblist)
safety -= 1
if(2)
switch(rand(1,2))//Places or things.
if(1)
- code_phrase += pick(GLOB.cocktails) // SS220 EDIT - ORIGINAL: (drinks)
+ . += pick(GLOB.cocktails) // SS220 EDIT - ORIGINAL: (drinks)
if(2)
- code_phrase += pick(GLOB.locations) // SS220 EDIT - ORIGINAL: (locations)
+ . += pick(GLOB.locations) // SS220 EDIT - ORIGINAL: (locations)
safety -= 2
if(3)
- switch(rand(1,3))//Nouns, adjectives, verbs. Can be selected more than once.
+ switch(rand(1, 3)) // Nouns, adjectives, verbs. Can be selected more than once.
if(1)
- code_phrase += pick(GLOB.nouns) // SS220 EDIT - ORIGINAL: (nouns)
+ . += pick(GLOB.nouns) // SS220 EDIT - ORIGINAL: (nouns)
if(2)
- code_phrase += pick(GLOB.adjectives)
+ . += pick(GLOB.adjectives)
if(3)
- code_phrase += pick(GLOB.verbs)
- if(words==1)
- code_phrase += "."
- else
- code_phrase += ", "
+ . += pick(GLOB.verbs)
- return code_phrase
+ if(!return_list)
+ if(words == 1)
+ . += "."
+ else
+ . += ", "
/proc/GenerateKey()
var/newKey
@@ -187,89 +194,3 @@ GLOBAL_VAR(syndicate_code_response) //Code response for traitors.
newKey += pick("diamond", "beer", "mushroom", "assistant", "clown", "captain", "twinkie", "security", "nuke", "small", "big", "escape", "yellow", "gloves", "monkey", "engine", "nuclear", "ai")
newKey += pick("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
return newKey
-
-/*
-//This proc tests the gen above.
-/client/verb/test_code_phrase()
- set name = "Generate Code Phrase"
- set category = "Debug"
-
- to_chat(world, "Code Phrase is: [generate_code_phrase()]")
- return
-
-
- This was an earlier attempt at code phrase system, aside from an even earlier attempt (and failure).
- This system more or less works as intended--aside from being unfinished--but it's still very predictable.
- Particularly, the phrase opening statements are pretty easy to recognize and identify when metagaming.
- I think the above-used method solves this issue by using words in a sequence, providing for much greater flexibility.
- /N
-
- switch(choice)
- if(1)
- syndicate_code_phrase += pick("I'm looking for","Have you seen","Maybe you've seen","I'm trying to find","I'm tracking")
- syndicate_code_phrase += " "
- syndicate_code_phrase += pick(pick(GLOB.first_names_male,GLOB.first_names_female))
- syndicate_code_phrase += " "
- syndicate_code_phrase += pick(GLOB.last_names)
- syndicate_code_phrase += "."
- if(2)
- syndicate_code_phrase += pick("How do I get to","How do I find","Where is","Where do I find")
- syndicate_code_phrase += " "
- syndicate_code_phrase += pick("Escape","Engineering","Atmos","the bridge","the brig","CentComm","the library","the chapel","a bathroom","Med Bay","Tool Storage","the escape shuttle","Robotics","a locker room","the living quarters","the gym","the autolathe","QM","the bar","the theater","the derelict")
- syndicate_code_phrase += "?"
- if(3)
- if(prob(70))
- syndicate_code_phrase += pick("Get me","I want","I'd like","Make me")
- syndicate_code_phrase += " a "
- else
- syndicate_code_phrase += pick("One")
- syndicate_code_phrase += " "
- syndicate_code_phrase += pick("vodka and tonic","gin fizz","bahama mama","manhattan","black Russian","whiskey soda","long island tea","margarita","Irish coffee"," manly dwarf","Irish cream","doctor's delight","Beepksy Smash","tequila sunrise","brave bull","gargle blaster","bloody mary","whiskey cola","white Russian","vodka martini","martini","Cuba libre","kahlua","vodka","wine","moonshine")
- syndicate_code_phrase += "."
- if(4)
- syndicate_code_phrase += pick("I wish I was","My dad was","His mom was","Where do I find","The hero this station needs is","I'd fuck","I wouldn't trust","Someone caught","HoS caught","Someone found","I'd wrestle","I wanna kill")
- syndicate_code_phrase += " [pick("a","the")] "
- syndicate_code_phrase += pick("wizard","ninja","xeno","lizard","slime","monkey","syndicate","cyborg","clown","space carp","singularity","singulo","mime")
- syndicate_code_phrase += "."
- if(5)
- syndicate_code_phrase += pick("Do we have","Is there","Where is","Where's","Who's")
- syndicate_code_phrase += " "
- syndicate_code_phrase += "[pick(GLOB.joblist)]"
- syndicate_code_phrase += "?"
-
- switch(choice)
- if(1)
- if(prob(80))
- syndicate_code_response += pick("Try looking for them near","I they ran off to","Yes. I saw them near","Nope. I'm heading to","Try searching")
- syndicate_code_response += " "
- syndicate_code_response += pick("Escape","Engineering","Atmos","the bridge","the brig","CentComm","the library","the chapel","a bathroom","Med Bay","Tool Storage","the escape shuttle","Robotics","a locker room","the living quarters","the gym","the autolathe","QM","the bar","the theater","the derelict")
- syndicate_code_response += "."
- else if(prob(60))
- syndicate_code_response += pick("No. I'm busy, sorry.","I don't have the time.","Not sure, maybe?","There is no time.")
- else
- syndicate_code_response += pick("*shrug*","*smile*","*blink*","*sigh*","*laugh*","*nod*","*giggle*")
- if(2)
- if(prob(80))
- syndicate_code_response += pick("Go to","Navigate to","Try","Sure, run to","Try searching","It's near","It's around")
- syndicate_code_response += " the "
- syndicate_code_response += pick("[pick("south","north","east","west")] maitenance door","nearby maitenance","teleporter","[pick("cold","dead")] space","morgue","vacuum","[pick("south","north","east","west")] hall ","[pick("south","north","east","west")] hallway","[pick("white","black","red","green","blue","pink","purple")] [pick("rabbit","frog","lion","tiger","panther","snake","facehugger")]")
- syndicate_code_response += "."
- else if(prob(60))
- syndicate_code_response += pick("Try asking","Ask","Talk to","Go see","Follow","Hunt down")
- syndicate_code_response += " "
- if(prob(50))
- syndicate_code_response += pick(pick(GLOB.first_names_male,GLOB.first_names_female))
- syndicate_code_response += " "
- syndicate_code_response += pick(GLOB.last_names)
- else
- syndicate_code_response += " the "
- syndicate_code_response += "[pic(GLOB.joblist)]"
- syndicate_code_response += "."
- else
- syndicate_code_response += pick("*shrug*","*smile*","*blink*","*sigh*","*laugh*","*nod*","*giggle*")
- if(3)
- if(4)
- if(5)
-
- return
-*/
diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index bfa53476912c..a85939f05903 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -89,8 +89,6 @@
// Uses client.typing to check if the popup should appear or not
/proc/typing_input(mob/user, message = "", title = "", default = "")
- if(user.client.checkTyping()) // Prevent double windows
- return null
var/client/C = user.client // Save it in a var in case the client disconnects from the mob
C.typing = TRUE
var/msg = input(user, message, title, html_decode(default)) as text|null
@@ -272,6 +270,10 @@
/proc/trim(text)
return trim_left(trim_right(text))
+/// Returns a string that does not exceed max_length characters in size
+/proc/trim_length(text, max_length)
+ return copytext_char(text, 1, max_length)
+
//Returns a string with the first element of the string capitalized.
/proc/capitalize(t as text)
return uppertext(copytext_char(t, 1, 2)) + copytext_char(t, 2) // SS220 EDIT - ORIGINAL: copytext
diff --git a/code/__HELPERS/trait_helpers.dm b/code/__HELPERS/trait_helpers.dm
index 3f907bc09d57..b19bf436541a 100644
--- a/code/__HELPERS/trait_helpers.dm
+++ b/code/__HELPERS/trait_helpers.dm
@@ -226,6 +226,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
//***** MIND TRAITS *****/
#define TRAIT_HOLY "is_holy" // The mob is holy in regards to religion
+#define TRAIT_TABLE_LEAP "table_leap"
//***** ITEM AND MOB TRAITS *****//
/// Show what machine/door wires do when held.
@@ -242,6 +243,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_OBSCURED_WIRES "obscured_wires"
/// Forces open doors after a delay specific to the item
#define TRAIT_FORCES_OPEN_DOORS_ITEM "forces_open_doors_item_varient"
+/// Makes the item no longer spit out a visible message when thrown
+#define TRAIT_NO_THROWN_MESSAGE "no_message_when_thrown"
/// A surgical tool; when in hand in help intent (and with a surgery in progress) won't attack the user
#define TRAIT_SURGICAL "surgical_tool"
@@ -305,7 +308,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
//quirk traits
#define TRAIT_ALCOHOL_TOLERANCE "alcohol_tolerance"
-#define TRAIT_TABLE_LEAP "table_leap"
//traits that should be properly converted to genetic mutations one day
#define TRAIT_LASEREYES "laser_eyes"
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index ac905dd1216a..9b8e2bb3ae4e 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -126,7 +126,7 @@
//Converts an angle (degrees) into an ss13 direction
/proc/angle2dir(degree)
- degree = ((degree+22.5)%365)
+ degree = (degree + 22.5) % 360
if(degree < 45) return NORTH
if(degree < 90) return NORTHEAST
if(degree < 135) return EAST
@@ -209,16 +209,16 @@
return 'icons/mob/screen_white.dmi'
if("Midnight")
return 'icons/mob/screen_midnight.dmi'
- // SS220 ADDITION START
+ // SS220 ADDITION - START
if("Vaporwave")
return 'modular_ss220/aesthetics/skin/icons/screen_vaporwave.dmi'
if("Detective")
return 'modular_ss220/aesthetics/skin/icons/screen_detective.dmi'
- if("Trasen")
+ if("Trasenknox")
return 'modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi'
if("Clockwork")
return 'modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi'
- // SS220 ADDITION END
+ // SS220 ADDITION - END
else
return 'icons/mob/screen_midnight.dmi'
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 751daeca3ac8..2389b37031e7 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -300,18 +300,18 @@
/proc/ionnum()
return "[pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")]"
-//When an AI is activated, it can choose from a list of non-slaved borgs to have as a slave.
-/proc/freeborg()
+// Selects an unlinked borg, used in the robot upload console
+/proc/freeborg(mob/user)
var/select
var/list/borgs = list()
for(var/mob/living/silicon/robot/A in GLOB.player_list)
- if(A.stat == 2 || A.connected_ai || A.scrambledcodes || isdrone(A))
+ if(A.stat == DEAD || A.connected_ai || A.scrambledcodes || isdrone(A))
continue
var/name = "[A.real_name] ([A.modtype] [A.braintype])"
borgs[name] = A
if(length(borgs))
- select = input("Unshackled borg signals detected:", "Borg selection", null, null) as null|anything in borgs
+ select = tgui_input_list(user, "Unshackled borg signals detected:", "Borg selection", borgs)
return borgs[select]
//When a borg is activated, it can choose which AI it wants to be slaved to
@@ -338,10 +338,12 @@
/proc/select_active_ai(mob/user)
var/list/ais = active_ais()
- if(length(ais))
- if(user) . = input(usr,"AI signals detected:", "AI selection") in ais
- else . = pick(ais)
- return .
+ if(!length(ais))
+ return
+ if(user)
+ return tgui_input_list(user, "AI signals detected:", "AI selection", ais)
+ else
+ return pick(ais)
/proc/get_sorted_mobs()
var/list/old_list = getmobs()
@@ -1601,7 +1603,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
return closest_atom
/proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
- if(value == FALSE) //nothing should be calling us with a number, so this is safe
+ if(!value) //nothing should be calling us with a number, so this is safe
value = input("Enter type to find (blank for all, cancel to cancel)", "Search for type") as null|text
if(isnull(value))
return
@@ -1667,8 +1669,8 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
/obj/item/reagent_containers/glass/bottle = "BOTTLE",
/obj/item/reagent_containers/patch = "PATCH",
/obj/item/reagent_containers/pill = "PILL",
- /obj/item/reagent_containers/food/drinks = "DRINK",
- /obj/item/reagent_containers/food = "FOOD",
+ /obj/item/reagent_containers/drinks = "DRINK",
+ /obj/item/food = "FOOD",
/obj/item/reagent_containers/syringe = "SYRINGE",
/obj/item/reagent_containers = "REAGENT_CONTAINERS",
/obj/item/robot_parts = "ROBOT_PARTS",
@@ -1965,6 +1967,8 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
*/
/proc/get_channel_name(channel)
switch(channel)
+ if(CHANNEL_GENERAL)
+ return "General Sounds"
if(CHANNEL_LOBBYMUSIC)
return "Lobby Music"
if(CHANNEL_ADMIN)
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index 0578e08a32db..c0c2ffc27140 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -9,6 +9,8 @@
// Your data directory will grow by about a gigabyte every time you launch the server, as well as introducing potential instabilities over multiple BYOND versions.
// #define ENABLE_BYOND_TRACY
+// Uncomment this to enable support for multiple instances
+// #define MULTIINSTANCE
#ifdef CIBUILDING
#define UNIT_TESTS
diff --git a/code/_globalvars/lists/keybindings_lists.dm b/code/_globalvars/lists/keybindings_lists.dm
index 350c5c3ec75e..72e001c87e41 100644
--- a/code/_globalvars/lists/keybindings_lists.dm
+++ b/code/_globalvars/lists/keybindings_lists.dm
@@ -2,6 +2,7 @@ GLOBAL_LIST_EMPTY(keybindings)
GLOBAL_LIST_INIT(keybindings_groups, list(
"Movement" = KB_CATEGORY_MOVEMENT,
+ "Communication" = KB_CATEGORY_COMMUNICATION,
"Living" = KB_CATEGORY_LIVING,
"General" = KB_CATEGORY_MOB,
"General Emote" = KB_CATEGORY_EMOTE_GENERIC,
@@ -15,6 +16,7 @@ GLOBAL_LIST_INIT(keybindings_groups, list(
"Animal Emote" = KB_CATEGORY_EMOTE_ANIMAL,
"Brain Emote" = KB_CATEGORY_EMOTE_BRAIN,
"Alien Emote" = KB_CATEGORY_EMOTE_ALIEN,
+ "Click Keybinds" = KB_CATEGORY_CLICK,
"Admin" = KB_CATEGORY_ADMIN,
"Other" = KB_CATEGORY_UNSORTED,
"Custom Emotes (Character-based)" = KB_CATEGORY_EMOTE_CUSTOM,
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 707a797c8ba5..648636a251bb 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -42,7 +42,6 @@ GLOBAL_LIST_EMPTY(global_radios) //list of all radios, across all z-levels
GLOBAL_LIST_EMPTY(meteor_list) //list of all meteors
GLOBAL_LIST_EMPTY(poi_list) //list of points of interest for observe/follow
GLOBAL_LIST_EMPTY(active_jammers) // List of active radio jammers
-GLOBAL_LIST_EMPTY(ladders)
GLOBAL_LIST_EMPTY(mirrors) //list of all mirrors and mirror shields.
GLOBAL_LIST_EMPTY(arc_emitters) //list of all arc emitters
diff --git a/code/_globalvars/misc_globals.dm b/code/_globalvars/misc_globals.dm
index db39391a7835..697445658137 100644
--- a/code/_globalvars/misc_globals.dm
+++ b/code/_globalvars/misc_globals.dm
@@ -56,3 +56,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/atmospherics/supermatter_cr
GLOBAL_LIST_INIT(character_physiques, list("rail thin", "thin", "average", "well-built", "muscular", "overweight"))
GLOBAL_LIST_INIT(character_heights, list("very short", "short", "average height", "tall", "very tall"))
+
+#define GLOBAL_SPARK_LIMIT 500
+/// Counter for the current amount of sparks
+GLOBAL_VAR_INIT(sparks_active, 0)
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 6e5ea7ed4cba..159b0cb0baa1 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -91,7 +91,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
),
/datum/mind = list(
- "TRAIT_HOLY" = TRAIT_HOLY
+ "TRAIT_HOLY" = TRAIT_HOLY,
+ "TRAIT_TABLE_LEAP" = TRAIT_TABLE_LEAP
),
/obj/item = list(
@@ -101,7 +102,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_CMAGGED" = TRAIT_CMAGGED,
"TRAIT_FORCES_OPEN_DOORS" = TRAIT_FORCES_OPEN_DOORS_ITEM,
"TRAIT_OBSCURED_WIRES" = TRAIT_OBSCURED_WIRES,
- "TRAIT_XENO_INTERACTABLE" = TRAIT_XENO_INTERACTABLE
+ "TRAIT_XENO_INTERACTABLE" = TRAIT_XENO_INTERACTABLE,
+ "TRAIT_NO_THROWN_MESSAGE" = TRAIT_NO_THROWN_MESSAGE
),
/turf = list(
"bluespace_speed_trait" = TRAIT_BLUESPACE_SPEED
diff --git a/code/_onclick/ai_onclick.dm b/code/_onclick/ai_onclick.dm
index 093d9408014f..b821e3591dcd 100644
--- a/code/_onclick/ai_onclick.dm
+++ b/code/_onclick/ai_onclick.dm
@@ -35,30 +35,8 @@
if(control_disabled || stat)
return
- var/turf/pixel_turf = isturf(A) ? A : get_turf_pixel(A)
- if(isnull(pixel_turf))
+ if(!can_click_on_turf(A))
return
- if(!can_see(A))
- if(isturf(A)) //On unmodified clients clicking the static overlay clicks the turf underneath
- return // So there's no point messaging admins
- add_attack_logs(src, src, "[key_name_admin(src)] might be running a modified client! (failed can_see on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))", ATKLOG_ALL)
- var/message = "[key_name(src)] might be running a modified client! (failed can_see on AI click of [A]([COORD(pixel_turf)]))"
- log_admin(message)
- GLOB.discord_manager.send2discord_simple_noadmins("**\[Warning]** [key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))")
-
-
- var/turf_visible
- if(pixel_turf)
- turf_visible = GLOB.cameranet.checkTurfVis(pixel_turf)
- if(!turf_visible)
- if(istype(loc, /obj/item/aicard) && (pixel_turf in view(client.view, loc)))
- turf_visible = TRUE
- else
- if(pixel_turf.obscured)
- log_admin("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)])")
- add_attack_logs(src, src, "[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))", ATKLOG_ALL)
- GLOB.discord_manager.send2discord_simple_noadmins("**\[Warning]** [key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))")
- return
var/list/modifiers = params2list(params)
if(modifiers["shift"] && modifiers["ctrl"])
@@ -106,6 +84,41 @@
A.add_hiddenprint(src)
A.attack_ai(src)
+/mob/living/silicon/ai/MiddleShiftControlClickOn(atom/A)
+ return
+
+/mob/living/silicon/ai/can_use_clickbinds()
+ var/atom/atom_targeted = locateUID(client.moused_over)
+ if(atom_targeted)
+ return can_click_on_turf(atom_targeted)
+
+/mob/living/silicon/ai/proc/can_click_on_turf(atom/A)
+ var/turf/pixel_turf = isturf(A) ? A : get_turf_pixel(A)
+ if(isnull(pixel_turf))
+ return
+ if(!can_see(A))
+ if(isturf(A)) //On unmodified clients clicking the static overlay clicks the turf underneath
+ return // So there's no point messaging admins
+ add_attack_logs(src, src, "[key_name_admin(src)] might be running a modified client! (failed can_see on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))", ATKLOG_ALL)
+ var/message = "[key_name(src)] might be running a modified client! (failed can_see on AI click of [A]([COORD(pixel_turf)]))"
+ log_admin(message)
+ GLOB.discord_manager.send2discord_simple_noadmins("**\[Warning]** [key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))")
+ return FALSE
+
+ var/turf_visible
+ if(pixel_turf)
+ turf_visible = GLOB.cameranet.checkTurfVis(pixel_turf)
+ if(!turf_visible)
+ if(istype(loc, /obj/item/aicard) && (pixel_turf in view(client.view, loc)))
+ turf_visible = TRUE
+ else
+ if(pixel_turf.obscured)
+ log_admin("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)])")
+ add_attack_logs(src, src, "[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))", ATKLOG_ALL)
+ GLOB.discord_manager.send2discord_simple_noadmins("**\[Warning]** [key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))")
+ return FALSE
+ return TRUE
+
/*
AI has no need for the UnarmedAttack() and RangedAttack() procs,
because the AI code is not generic; attack_ai() is used instead.
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 5cbbc279a538..91e889369037 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -61,7 +61,7 @@
if(dragged && !modifiers[dragged])
return
if(IsFrozen(A) && !is_admin(usr))
- to_chat(usr, "Interacting with admin-frozen players is not permitted.")
+ to_chat(usr, "Interacting with admin-frozen players is not permitted.")
return
if(modifiers["middle"] && modifiers["shift"] && modifiers["ctrl"])
MiddleShiftControlClickOn(A)
@@ -129,40 +129,99 @@
return
// operate three levels deep here (item in backpack in src; item in box in backpack in src, not any deeper)
- var/sdepth = A.storage_depth(src)
- if(A == loc || (A in loc) || (sdepth != -1 && sdepth <= 2))
- // No adjacency needed
+ if(A in direct_access())
if(W)
W.melee_attack_chain(src, A, params)
else
if(ismob(A))
changeNext_move(CLICK_CD_MELEE)
UnarmedAttack(A, 1)
-
return
if(!isturf(loc)) // This is going to stop you from telekinesing from inside a closet, but I don't shed many tears for that
return TRUE
- // Allows you to click on a box's contents, if that box is on the ground, but no deeper than that
- sdepth = A.storage_depth_turf()
- if(isturf(A) || isturf(A.loc) || (sdepth != -1 && sdepth <= 1))
- if(A.Adjacent(src)) // see adjacent.dm
- if(W)
- W.melee_attack_chain(src, A, params)
- else
- if(ismob(A))
- changeNext_move(CLICK_CD_MELEE)
- UnarmedAttack(A, 1)
+ if(can_reach(A, W))
+ if(W)
+ W.melee_attack_chain(src, A, params)
+ else
+ if(ismob(A))
+ changeNext_move(CLICK_CD_MELEE)
+ UnarmedAttack(A, 1)
+
+ else
+ if(W)
+ W.afterattack(A, src, 0, params) // 0: not Adjacent
+ else
+ RangedAttack(A, params)
- return
- else // non-adjacent click
- if(W)
- W.afterattack(A,src,0,params) // 0: not Adjacent
- else
- RangedAttack(A, params)
- return
+/**
+ * A backwards depth-limited breadth-first-search to see if the target is
+ * logically "in" anything adjacent to us.
+ */
+/atom/movable/proc/can_reach(atom/ultimate_target, obj/item/tool, view_only = FALSE) //This might break mod storage. If it does, we hardcode mods / funny bag in here
+ var/list/direct_access = direct_access()
+ var/depth = 1 + (view_only ? STORAGE_VIEW_DEPTH : INVENTORY_DEPTH)
+
+ var/list/closed = list()
+ var/list/checking = list(ultimate_target)
+
+ while(length(checking) && depth > 0)
+ var/list/next = list()
+ --depth
+
+ for(var/atom/target in checking) // will filter out nulls
+ if(closed[target] || isarea(target)) // avoid infinity situations
+ continue
+
+ if(isturf(target) || isturf(target.loc) || (target in direct_access) || !(target.IsObscured()) || istype(target.loc, /obj/item/storage)) //Directly accessible atoms
+ if(target.Adjacent(src) || (tool && CheckToolReach(src, target, tool.reach))) //Adjacent or reaching attacks
+ return TRUE
+
+ closed[target] = TRUE
+
+ if(!target.loc)
+ continue
+
+ if(istype(target.loc, /obj/item/storage))
+ next += target.loc
+
+ checking = next
+ return FALSE
+
+/atom/movable/proc/direct_access()
+ return list(src, loc)
+
+/mob/direct_access(atom/target)
+ return ..() + contents
+
+/mob/living/direct_access(atom/target)
+ return ..() + get_contents()
+
+/proc/CheckToolReach(atom/movable/here, atom/movable/there, reach)
+ if(!here || !there)
+ return FALSE
+ switch(reach)
+ if(0, 1)
+ return FALSE //here.Adjacent(there)
+ if(2 to INFINITY)
+ var/obj/dummy = new(get_turf(here))
+ dummy.pass_flags |= PASSTABLE
+ dummy.invisibility = 120
+ for(var/i in 1 to reach) //Limit it to that many tries
+ var/turf/T = get_step(dummy, get_dir(dummy, there))
+ if(dummy.can_reach(there))
+ qdel(dummy)
+ return TRUE
+ if(!dummy.Move(T)) //we're blocked!
+ qdel(dummy)
+ return FALSE
+ qdel(dummy)
+
+/// Can this mob use keybinded click actions? (Altclick, Ctrlclick, ect)
+/mob/proc/can_use_clickbinds()
+ return TRUE
//Is the atom obscured by a PREVENT_CLICK_UNDER_1 object above it
/atom/proc/IsObscured()
diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm
index e1da5a150736..9bdd7691a1a4 100644
--- a/code/_onclick/click_override.dm
+++ b/code/_onclick/click_override.dm
@@ -33,23 +33,25 @@
to_chat(user, "You draw a bit of power from [src], you can use middle click or alt click to release the power!")
/datum/middleClickOverride/badminClicker
- var/summon_path = /obj/item/reagent_containers/food/snacks/cookie
+ var/summon_path = /obj/item/food/snacks/cookie
/datum/middleClickOverride/badminClicker/onClick(atom/A, mob/living/user)
var/atom/movable/newObject = new summon_path
newObject.loc = get_turf(A)
- to_chat(user, "You release the power you had stored up, summoning \a [newObject.name]! ")
- usr.loc.visible_message("[user] waves [user.p_their()] hand and summons \a [newObject.name]")
+ to_chat(user, "You release the power you had stored up, summoning \a [newObject.name]!")
+ usr.loc.visible_message("[user] waves [user.p_their()] hand and summons \a [newObject.name]!")
..()
-/datum/middleClickOverride/power_gloves
+/datum/middleClickOverride/shock_implant
-/datum/middleClickOverride/power_gloves/onClick(atom/A, mob/living/carbon/human/user)
+/datum/middleClickOverride/shock_implant/onClick(atom/A, mob/living/carbon/human/user)
if(A == user || user.a_intent == INTENT_HELP || user.a_intent == INTENT_GRAB)
return FALSE
if(user.incapacitated())
return FALSE
- var/obj/item/clothing/gloves/color/yellow/power/P = user.gloves
+ var/obj/item/bio_chip/shock/P = locate() in user
+ if(!P)
+ return
if(world.time < P.last_shocked + P.shock_delay)
to_chat(user, "The gloves are still recharging.")
return FALSE
@@ -73,26 +75,31 @@
beam_from.Beam(target_atom, icon_state = "lightning[rand(1, 12)]", icon = 'icons/effects/effects.dmi', time = 6)
if(isliving(target_atom))
var/mob/living/L = target_atom
- var/surplus_power = C.get_surplus()
+ var/powergrid = C.get_available_power() //We want available power, so the station being conservative doesn't mess with glove / dark bundle users
if(user.a_intent == INTENT_DISARM)
- add_attack_logs(user, L, "shocked with power gloves.")
- L.adjustStaminaLoss(60)
+ add_attack_logs(user, L, "shocked with power bio-chip.")
+ L.apply_damage(60, STAMINA)
L.Jitter(10 SECONDS)
var/atom/throw_target = get_edge_target_turf(user, get_dir(user, get_step_away(L, user)))
- L.throw_at(throw_target, surplus_power / 100000, surplus_power / 100000) //100 kW surplus throws 1 tile, 200 throws 2, etc.
+ L.throw_at(throw_target, powergrid / 100000, powergrid / 100000) //100 kW in grid throws 1 tile, 200 throws 2, etc.
else
- add_attack_logs(user, L, "electrocuted with[P.unlimited_power ? " unlimited" : null] power gloves")
+ add_attack_logs(user, L, "electrocuted with[P.unlimited_power ? " unlimited" : null] power bio-chip")
if(P.unlimited_power)
L.electrocute_act(1000, P, flags = SHOCK_NOGLOVES) //Just kill them
else
- electrocute_mob(L, C, P)
+ electrocute_mob(L, C.powernet, P)
break
var/list/next_shocked = list()
- for(var/atom/movable/AM in orange(3, target_atom))
- if(AM == user || iseffect(AM) || isobserver(AM))
+ for(var/mob/M in range(3, target_atom)) //Try to jump to a mob first
+ if(M == user || isobserver(M))
continue
- next_shocked.Add(AM)
-
+ next_shocked.Add(M)
+ break //Break this so it gets the closest, thank you
+ if(!length(next_shocked)) //No mob? Random bullshit go, try to get closer to a mob with luck
+ for(var/atom/movable/AM in orange(3, target_atom))
+ if(AM == user || iseffect(AM) || isobserver(AM))
+ continue
+ next_shocked.Add(AM)
beam_from = target_atom
target_atom = pick(next_shocked)
A = target_atom
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 86949ea31c7a..ff5a81640882 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -95,13 +95,13 @@
return
// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc))
- if(isturf(A) || isturf(A.loc))
- if(A.Adjacent(src)) // see adjacent.dm
- W.melee_attack_chain(src, A, params)
- return
- else
- W.afterattack(A, src, 0, params)
- return
+ if(can_reach(A, W))
+ W.melee_attack_chain(src, A, params)
+ return
+ W.afterattack(A, src, 0, params)
+ return
+
+/mob/living/silicon/robot/MiddleShiftControlClickOn(atom/A)
return
//Ctrl+Middle click cycles through modules
diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm
index bca000eac812..2ff53932b0ce 100644
--- a/code/_onclick/hud/action_button.dm
+++ b/code/_onclick/hud/action_button.dm
@@ -105,6 +105,12 @@
return ..()
/obj/screen/movable/action_button/hide_toggle/Click(location,control,params)
+ var/list/modifiers = params2list(params)
+
+ if(modifiers["alt"])
+ AltClick(usr)
+ return TRUE
+
usr.hud_used.action_buttons_hidden = !usr.hud_used.action_buttons_hidden
hidden = usr.hud_used.action_buttons_hidden
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 0b70b7f28f08..5385f46078cc 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -428,7 +428,7 @@ Recharging stations are available in robotics, the dormitory bathrooms, and the
var/mob/living/simple_animal/diona/D = nymphs[1]
D.split(TRUE)
else
- var/mob/living/simple_animal/diona/D = input("Select a nymph to drop:", "Nymph Dropping", nymphs[1]) as anything in nymphs
+ var/mob/living/simple_animal/diona/D = tgui_input_list(usr, "Select a nymph to drop:", "Nymph Dropping", nymphs)
if(D in usr.contents)
D.split(TRUE)
@@ -652,7 +652,7 @@ so as to remain in compliance with the most up-to-date laws."
success = poll.sign_up(G)
if(success)
// Add a small overlay to indicate we've signed up
- update_signed_up_alert()
+ update_signed_up_alert(usr)
else if(target)
switch(action)
if(NOTIFY_ATTACK)
@@ -682,14 +682,14 @@ so as to remain in compliance with the most up-to-date laws."
poll.remove_candidate(G)
else
poll.sign_up(G)
- update_signed_up_alert()
+ update_signed_up_alert(G)
-/obj/screen/alert/notify_action/proc/update_signed_up_alert()
+/obj/screen/alert/notify_action/proc/update_signed_up_alert(mob/user)
if(!signed_up_overlay)
signed_up_overlay = image('icons/mob/screen_gen.dmi', icon_state = "selector")
signed_up_overlay.layer = FLOAT_LAYER
signed_up_overlay.plane = FLOAT_PLANE + 2
- if(usr in poll.signed_up)
+ if(user in poll.signed_up)
overlays += signed_up_overlay
else
overlays -= signed_up_overlay
@@ -724,8 +724,8 @@ so as to remain in compliance with the most up-to-date laws."
if(!usr || !usr.client)
return
if(stone)
- if(alert(usr, "Do you want to be captured by [stoner]'s soul stone? This will destroy your corpse and make it \
- impossible for you to get back into the game as your regular character.",, "No", "Yes") == "Yes")
+ if(tgui_alert(usr, "Do you want to be captured by [stoner]'s soul stone? This will destroy your corpse and make it \
+ impossible for you to get back into the game as your regular character.", "Respawn", list("No", "Yes")) == "Yes")
stone?.opt_in = TRUE
/obj/screen/alert/notify_soulstone/Destroy()
diff --git a/code/_onclick/hud/alien_hud.dm b/code/_onclick/hud/alien_hud.dm
index 1dd86fe5ce5a..a541fca8b57d 100644
--- a/code/_onclick/hud/alien_hud.dm
+++ b/code/_onclick/hud/alien_hud.dm
@@ -16,8 +16,21 @@
/obj/screen/alien/nightvision/Click()
var/mob/living/carbon/alien/humanoid/A = usr
- A.nightvisiontoggle()
+ A.night_vision_toggle()
+
+/mob/living/carbon/alien/proc/night_vision_toggle()
+ if(!nightvision)
+ see_in_dark = 8
+ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+ nightvision = TRUE
+ hud_used.nightvisionicon.icon_state = "nightvision1"
+ else
+ see_in_dark = initial(see_in_dark)
+ lighting_alpha = initial(lighting_alpha)
+ nightvision = FALSE
+ hud_used.nightvisionicon.icon_state = "nightvision0"
+ update_sight()
/obj/screen/alien/plasma_display
icon = 'icons/mob/screen_gen.dmi'
diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
index 64c96c3e67e6..ec6bde573d6b 100644
--- a/code/_onclick/hud/fullscreen.dm
+++ b/code/_onclick/hud/fullscreen.dm
@@ -197,8 +197,12 @@
/obj/screen/fullscreen/cursor_catcher/proc/calculate_params()
var/list/modifiers = params2list(mouse_params)
- var/icon_x = text2num(modifiers["icon-x"])
- var/icon_y = text2num(modifiers["icon-y"])
+ var/icon_x = text2num(LAZYACCESS(modifiers, "vis-x"))
+ if(isnull(icon_x))
+ icon_x = text2num(LAZYACCESS(modifiers, "icon-x"))
+ var/icon_y = text2num(LAZYACCESS(modifiers, "vis-y"))
+ if(isnull(icon_y))
+ icon_y = text2num(LAZYACCESS(modifiers, "icon-y"))
var/our_x = round(icon_x / world.icon_size)
var/our_y = round(icon_y / world.icon_size)
given_turf = locate(owner.x + our_x - round(view_list[1] / 2), owner.y + our_y - round(view_list[2] / 2), owner.z)
diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
index fa53a7c6e0d7..75b34cfa1d3b 100644
--- a/code/_onclick/hud/parallax.dm
+++ b/code/_onclick/hud/parallax.dm
@@ -98,7 +98,7 @@
if(new_parallax_movedir == C.parallax_movedir)
return
var/animatedir = new_parallax_movedir
- if(new_parallax_movedir == FALSE)
+ if(!new_parallax_movedir)
var/animate_time = 0
for(var/thing in C.parallax_layers)
var/obj/screen/parallax_layer/L = thing
@@ -313,12 +313,17 @@
layer = 4
/obj/screen/parallax_layer/planet
- icon_state = "planet"
+ icon_state = "planet_lava"
blend_mode = BLEND_OVERLAY
absolute = TRUE //Status of seperation
speed = 3
layer = 30
+/obj/screen/parallax_layer/planet/Initialize(mapload)
+ . = ..()
+ if(SSmapping.lavaland_theme?.planet_icon_state)
+ icon_state = SSmapping.lavaland_theme.planet_icon_state
+
/obj/screen/parallax_layer/planet/update_status(mob/M)
var/turf/T = get_turf(M)
if(is_station_level(T.z))
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index abde11138fa9..85edb417fbad 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -133,7 +133,7 @@
// Proximity_flag is 1 if this afterattack was called on something adjacent, in your square, or on your person.
// Click parameters is the params string from byond Click() code, see that documentation.
/obj/item/proc/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- return
+ SEND_SIGNAL(src, COMSIG_ITEM_AFTERATTACK, target, user, proximity_flag, click_parameters)
/obj/item/proc/get_clamped_volume()
if(w_class)
diff --git a/code/_onclick/observer_onclick.dm b/code/_onclick/observer_onclick.dm
index 028419a79abd..c36c8f07a3de 100644
--- a/code/_onclick/observer_onclick.dm
+++ b/code/_onclick/observer_onclick.dm
@@ -62,6 +62,21 @@
/mob/dead/observer/ShiftClickOn(atom/A)
examinate(A)
+/mob/dead/observer/AltClickOn(atom/A)
+ AltClickNoInteract(src, A)
+
+/mob/dead/observer/AltShiftClickOn(atom/A)
+ return
+
+/mob/dead/observer/CtrlShiftClickOn(atom/A)
+ return
+
+/mob/dead/observer/MiddleShiftClickOn(atom/A)
+ return
+
+/mob/dead/observer/MiddleShiftControlClickOn(atom/A)
+ return
+
/atom/proc/attack_ghost(mob/user)
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_GHOST, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
return TRUE
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index f8193e8d4c1c..f8b8d2f535c8 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -112,6 +112,9 @@
/mob/new_player/ClickOn()
return
+/mob/new_player/can_use_clickbinds()
+ return FALSE
+
// pAIs are not intended to interact with anything in the world
/mob/living/silicon/pai/UnarmedAttack(atom/A)
return
diff --git a/code/_onclick/overmind_onclick.dm b/code/_onclick/overmind_onclick.dm
index 40c60b992686..ed9f06b63fc0 100644
--- a/code/_onclick/overmind_onclick.dm
+++ b/code/_onclick/overmind_onclick.dm
@@ -33,3 +33,15 @@
var/turf/T = get_turf(A)
if(T)
remove_blob(T)
+
+/mob/camera/blob/AltShiftClickOn(atom/A)
+ return AltClickOn(A)
+
+/mob/camera/blob/CtrlShiftClickOn(atom/A)
+ return CtrlClickOn(A)
+
+/mob/camera/blob/MiddleShiftClickOn(atom/A)
+ return MiddleClickOn(A)
+
+/mob/camera/blob/MiddleShiftControlClickOn(atom/A)
+ return MiddleClickOn(A)
diff --git a/code/controllers/configuration/configuration_core.dm b/code/controllers/configuration/configuration_core.dm
index 26d3647ae7ee..0ace31c5bd89 100644
--- a/code/controllers/configuration/configuration_core.dm
+++ b/code/controllers/configuration/configuration_core.dm
@@ -46,6 +46,8 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
var/datum/configuration_section/url_configuration/url
/// Holder for the voting configuration datum
var/datum/configuration_section/vote_configuration/vote
+ /// Holder for the asset cache configuration datum
+ var/datum/configuration_section/asset_cache_configuration/asset_cache
/// Raw data. Stored here to avoid passing data between procs constantly
var/list/raw_data = list()
@@ -92,6 +94,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
system = new()
url = new()
vote = new()
+ asset_cache = new()
// Load our stuff up
var/config_file = "config/config.toml"
@@ -129,6 +132,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
safe_load(system, "system_configuration")
safe_load(url, "url_configuration")
safe_load(vote, "voting_configuration")
+ safe_load(asset_cache, "asset_cache_configuration")
// Proc to load up instance-specific overrides
/datum/server_configuration/proc/load_overrides()
diff --git a/code/controllers/configuration/sections/asset_cache_configuration.dm b/code/controllers/configuration/sections/asset_cache_configuration.dm
new file mode 100644
index 000000000000..35fa4fef85d5
--- /dev/null
+++ b/code/controllers/configuration/sections/asset_cache_configuration.dm
@@ -0,0 +1,23 @@
+/datum/configuration_section/asset_cache_configuration
+ /// Type of asset transport that will be used for asset delivery.
+ /// Available options are "simple" or "webroot".
+ var/asset_transport = "simple"
+ /// Whether to make server passively send all browser assets to each client in the background
+ /// (instead of waiting for them to be needed)
+ var/asset_simple_preload = TRUE
+ /// Local folder to save assets to.
+ /// Assets will be saved in the format of asset.MD5HASH.EXT or in namespaces/hash/
+ /// as ASSET_FILE_NAME or asset.MD5HASH.EXT
+ var/asset_cdn_webroot = "data/asset-store/"
+ /// URL the `asset_cdn_webroot` can be accessed from.
+ /// For best results the webserver powering this should return a long cache validity time,
+ /// as all assets sent via this transport use hash based urls
+ /// if you want to test this locally, you simpily run the `localhost-asset-webroot-server.py` python3 script
+ /// to host assets stored in `data/asset-store/` via http://localhost:58715/
+ var/asset_cdn_url = "http://localhost:58715/"
+
+/datum/configuration_section/asset_cache_configuration/load_data(list/data)
+ CONFIG_LOAD_STR(asset_transport, data["asset_transport"])
+ CONFIG_LOAD_BOOL(asset_simple_preload, data["asset_simple_preload"])
+ CONFIG_LOAD_STR(asset_cdn_webroot, data["asset_cdn_webroot"])
+ CONFIG_LOAD_STR(asset_cdn_url, data["asset_cdn_url"])
diff --git a/code/controllers/configuration/sections/job_configuration.dm b/code/controllers/configuration/sections/job_configuration.dm
index d56faddfc749..41cbb0191466 100644
--- a/code/controllers/configuration/sections/job_configuration.dm
+++ b/code/controllers/configuration/sections/job_configuration.dm
@@ -1,7 +1,5 @@
/// Config holder for all job related things
/datum/configuration_section/job_configuration
- /// Do we want jobs to have minimal access or extra access (IE: Scientists having robotics access)
- var/jobs_have_minimal_access = TRUE
/// Do we want to restrict jobs based on account age
var/restrict_jobs_on_account_age = FALSE
/// Allow admins to bypass age-based job restrictions
@@ -31,7 +29,6 @@
/datum/configuration_section/job_configuration/load_data(list/data)
// Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line
- CONFIG_LOAD_BOOL(jobs_have_minimal_access, data["jobs_have_minimal_access"])
CONFIG_LOAD_BOOL(restrict_jobs_on_account_age, data["restrict_jobs_on_account_age"])
CONFIG_LOAD_BOOL(restrict_jobs_on_account_age_admin_bypass, data["restrict_jobs_on_account_age_admin_bypass"])
CONFIG_LOAD_BOOL(enable_exp_tracking, data["enable_exp_tracking"])
diff --git a/code/controllers/controller.dm b/code/controllers/controller.dm
index 3645cea82e83..93a1d2ce0860 100644
--- a/code/controllers/controller.dm
+++ b/code/controllers/controller.dm
@@ -23,5 +23,5 @@
*/
/datum/controller/proc/log_startup_progress(message)
Master.last_init_info = "([name]): [message]"
- to_chat(world, "\[[name]] [message]")
+ to_chat(world, "\[[name]] [message]", MESSAGE_TYPE_DEBUG, confidential = TRUE)
log_world("\[[name]] [message]")
diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm
index d6c09473b631..8df9f1958dcf 100644
--- a/code/controllers/failsafe.dm
+++ b/code/controllers/failsafe.dm
@@ -41,10 +41,10 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
break
else if(defcon == 1) //Exit Failsafe if we weren't able to recover the MC in the last stage
log_game("FailSafe: Failed to recover MC while in emergency state. Failsafe exiting.")
- message_admins("Failsafe failed critically while trying to recreate broken MC. Please manually fix the MC or reboot the server. Failsafe exiting now.")
- message_admins("You can try manually calling these two procs:.")
- message_admins("/proc/recover_all_SS_and_recreate_master: Most stuff should still function but expect instability/runtimes/broken stuff.")
- message_admins("/proc/delete_all_SS_and_recreate_master: Most stuff will be broken but basic stuff like movement and chat should still work.")
+ message_admins("Failsafe failed critically while trying to recreate broken MC. Please manually fix the MC or reboot the server. Failsafe exiting now.")
+ message_admins("You can try manually calling these two procs:.")
+ message_admins("/proc/recover_all_SS_and_recreate_master: Most stuff should still function but expect instability/runtimes/broken stuff.")
+ message_admins("/proc/delete_all_SS_and_recreate_master: Most stuff will be broken but basic stuff like movement and chat should still work.")
else if(recovery_result == -1) //Failed to recreate MC
defcon--
sleep(initial(processing_interval)) //Wait a bit until the next try
@@ -77,11 +77,11 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
--defcon
if(2)
- to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks.")
+ to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks.")
--defcon
if(1)
- to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting...")
+ to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting...")
--defcon
var/rtn = Recreate_MC()
if(rtn > 0)
@@ -90,7 +90,7 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
to_chat(GLOB.admins, "MC restarted successfully")
else if(rtn < 0)
log_game("FailSafe: Could not restart MC, runtime encountered. Entering defcon 0")
- to_chat(GLOB.admins, "ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying.")
+ to_chat(GLOB.admins, "ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying.")
//if the return number was 0, it just means the mc was restarted too recently, and it just needs some time before we try again
//no need to handle that specially when defcon 0 can handle it
@@ -131,7 +131,7 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
to_chat(GLOB.admins, "Failsafe recovered MC while in emergency state [defcon_pretty()]")
else
log_game("FailSafe: Failsafe in emergency state and was unable to recreate MC while in defcon state [defcon_pretty()].")
- message_admins("Failsafe in emergency state and master down, trying to recreate MC while in defcon level [defcon_pretty()] failed.")
+ message_admins("Failsafe in emergency state and master down, trying to recreate MC while in defcon level [defcon_pretty()] failed.")
///Recreate all SSs which will still cause data survive due to Recover(), the new Master will then find and take them from global.vars
/proc/recover_all_SS_and_recreate_master()
@@ -149,7 +149,7 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
Master.Initialize(10, FALSE, TRUE) //Need to manually start the MC, normally world.new would do this
to_chat(GLOB.admins, "MC successfully recreated after recovering all subsystems!")
else
- message_admins("Failed to create new MC!")
+ message_admins("Failed to create new MC!")
///Delete all existing SS to basically start over
/proc/delete_all_SS_and_recreate_master()
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index bfaae9a4d2b4..54d7c3b019b7 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -185,7 +185,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
msg = "The [BadBoy.name] subsystem seems to be destabilizing the MC and will be offlined. The following implications are now in effect: [BadBoy.offline_implications]"
BadBoy.flags |= SS_NO_FIRE
if(msg)
- to_chat(GLOB.admins, "[msg]")
+ to_chat(GLOB.admins, "[msg]")
log_world(msg)
if(istype(Master.subsystems))
@@ -195,10 +195,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
current_runlevel = Master.current_runlevel
StartProcessing(10)
else
- to_chat(world, "The Master Controller is having some issues, we will need to re-initialize EVERYTHING")
+ to_chat(world, "The Master Controller is having some issues, we will need to re-initialize EVERYTHING")
Initialize(20, TRUE)
-
// Please don't stuff random bullshit here,
// Make a subsystem, give it the SS_NO_FIRE flag, and do your work in it's Initialize()
/datum/controller/master/Initialize(delay, init_sss, tgs_prime)
@@ -326,7 +325,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
SS.state = SS_IDLE
if((SS.flags & (SS_TICKER|SS_BACKGROUND)) == SS_TICKER)
tickersubsystems += SS
- timer += world.tick_lag * rand(1, 5)
+ // Timer subsystems aren't allowed to bunch up, so we offset them a bit
+ timer += world.tick_lag * rand(0, 1)
SS.next_fire = timer
continue
@@ -401,14 +401,15 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
var/checking_runlevel = current_runlevel
if(cached_runlevel != checking_runlevel)
//resechedule subsystems
+ var/list/old_subsystems = current_runlevel_subsystems
cached_runlevel = checking_runlevel
current_runlevel_subsystems = runlevel_sorted_subsystems[cached_runlevel]
- var/stagger = world.time
- for(var/I in current_runlevel_subsystems)
- var/datum/controller/subsystem/SS = I
- if(SS.next_fire <= world.time)
- stagger += world.tick_lag * rand(1, 5)
- SS.next_fire = stagger
+ //now we'll go through all the subsystems we want to offset and give them a next_fire
+ for(var/datum/controller/subsystem/SS as anything in current_runlevel_subsystems)
+ //we only want to offset it if it's new and also behind
+ if(SS.next_fire > world.time || (SS in old_subsystems))
+ continue
+ SS.next_fire = world.time + world.tick_lag * rand(0, DS2TICKS(min(SS.wait, 2 SECONDS)))
subsystems_to_check = current_runlevel_subsystems
else
@@ -530,7 +531,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
queue_node = queue_node.queue_next
continue
- if((queue_node_flags & SS_BACKGROUND))
+ if(queue_node_flags & SS_BACKGROUND)
if(!bg_calc)
current_tick_budget = queue_priority_count_bg
bg_calc = TRUE
diff --git a/code/controllers/subsystem/SSair.dm b/code/controllers/subsystem/SSair.dm
index 0a97e76490e5..0d4f7b8858f0 100644
--- a/code/controllers/subsystem/SSair.dm
+++ b/code/controllers/subsystem/SSair.dm
@@ -361,6 +361,7 @@ SUBSYSTEM_DEF(air)
for(var/obj/machinery/atmospherics/A in machines_to_init)
A.atmos_init()
count++
+ CHECK_TICK
return count
//this can't be done with setup_atmos_machinery() because
diff --git a/code/controllers/subsystem/SSchat.dm b/code/controllers/subsystem/SSchat.dm
new file mode 100644
index 000000000000..604f18c2d7c4
--- /dev/null
+++ b/code/controllers/subsystem/SSchat.dm
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+SUBSYSTEM_DEF(chat)
+ name = "Chat"
+ flags = SS_TICKER|SS_NO_INIT
+ wait = 1
+ priority = FIRE_PRIORITY_CHAT
+ init_order = INIT_ORDER_CHAT
+ offline_implications = "Chat will no longer function correctly. Immediate server restart recommended."
+
+ /// Associates a ckey with a list of messages to send to them.
+ var/list/list/datum/chat_payload/client_to_payloads = list()
+
+ /// Associates a ckey with an associative list of their last CHAT_RELIABILITY_HISTORY_SIZE messages.
+ var/list/list/datum/chat_payload/client_to_reliability_history = list()
+
+ /// Associates a ckey with their next sequence number.
+ var/list/client_to_sequence_number = list()
+
+/datum/controller/subsystem/chat/proc/generate_payload(client/target, message_data)
+ var/sequence = client_to_sequence_number[target.ckey]
+ client_to_sequence_number[target.ckey] += 1
+
+ var/datum/chat_payload/payload = new
+ payload.sequence = sequence
+ payload.content = message_data
+
+ if(!(target.ckey in client_to_reliability_history))
+ client_to_reliability_history[target.ckey] = list()
+ var/list/client_history = client_to_reliability_history[target.ckey]
+ client_history["[sequence]"] = payload
+
+ if(length(client_history) > CHAT_RELIABILITY_HISTORY_SIZE)
+ var/oldest = text2num(client_history[1])
+ for(var/index in 2 to length(client_history))
+ var/test = text2num(client_history[index])
+ if(test < oldest)
+ oldest = test
+ client_history -= "[oldest]"
+ return payload
+
+/datum/controller/subsystem/chat/proc/send_payload_to_client(client/target, datum/chat_payload/payload)
+ target.tgui_panel.window.send_message("chat/message", payload.into_message())
+ SEND_TEXT(target, payload.get_content_as_html())
+
+/datum/controller/subsystem/chat/fire()
+ for(var/ckey in client_to_payloads)
+ var/client/target = GLOB.directory[ckey]
+ if(isnull(target)) // verify client still exists
+ LAZYREMOVE(client_to_payloads, ckey)
+ continue
+
+ for(var/datum/chat_payload/payload as anything in client_to_payloads[ckey])
+ send_payload_to_client(target, payload)
+ LAZYREMOVE(client_to_payloads, ckey)
+
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/chat/proc/queue(queue_target, list/message_data)
+ var/list/targets = islist(queue_target) ? queue_target : list(queue_target)
+ for(var/target in targets)
+ var/client/client = CLIENT_FROM_VAR(target)
+ if(isnull(client))
+ continue
+ LAZYADDASSOC(client_to_payloads, client.ckey, generate_payload(client, message_data))
+
+/datum/controller/subsystem/chat/proc/send_immediate(send_target, list/message_data)
+ var/list/targets = islist(send_target) ? send_target : list(send_target)
+ for(var/target in targets)
+ var/client/client = CLIENT_FROM_VAR(target)
+ if(isnull(client))
+ continue
+ send_payload_to_client(client, generate_payload(client, message_data))
+
+/datum/controller/subsystem/chat/proc/handle_resend(client/client, sequence)
+ var/list/client_history = client_to_reliability_history[client.ckey]
+ sequence = "[sequence]"
+ if(isnull(client_history) || !(sequence in client_history))
+ return
+
+ var/datum/chat_payload/payload = client_history[sequence]
+ if(payload.resends > CHAT_RELIABILITY_MAX_RESENDS)
+ return // we tried but byond said no
+
+ payload.resends += 1
+ send_payload_to_client(client, client_history[sequence])
+ SSblackbox.record_feedback(
+ "nested tally",
+ "chat_resend_byond_version",
+ 1,
+ list(
+ "[client.byond_version]",
+ "[client.byond_build]",
+ ),
+ )
diff --git a/code/controllers/subsystem/SSchat_pings.dm b/code/controllers/subsystem/SSchat_pings.dm
deleted file mode 100644
index 24fb85d0bd87..000000000000
--- a/code/controllers/subsystem/SSchat_pings.dm
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBSYSTEM_DEF(chat_pings)
- name = "Chat Pings"
- flags = SS_NO_INIT
- runlevels = RUNLEVEL_INIT | RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME // ALL OF THEM
- wait = 30 SECONDS // Chat pings every 30 seconds
- cpu_display = SS_CPUDISPLAY_LOW
- /// List of all held chat datums
- var/list/datum/chatOutput/chat_datums = list() // Do NOT put this in Initialize(). You will cause issues.
-
-/datum/controller/subsystem/chat_pings/fire(resumed)
- for(var/datum/chatOutput/CO as anything in chat_datums)
- CO.updatePing()
- if(MC_TICK_CHECK)
- return
-
-/datum/controller/subsystem/chat_pings/get_stat_details()
- return "P: [length(chat_datums)]"
diff --git a/code/controllers/subsystem/SSdbcore.dm b/code/controllers/subsystem/SSdbcore.dm
index e0dfe5c1067a..88624dc784ce 100644
--- a/code/controllers/subsystem/SSdbcore.dm
+++ b/code/controllers/subsystem/SSdbcore.dm
@@ -249,7 +249,7 @@ SUBSYSTEM_DEF(dbcore)
*/
/datum/controller/subsystem/dbcore/proc/NewQuery(sql_query, arguments)
if(IsAdminAdvancedProcCall())
- to_chat(usr, "DB query blocked: Advanced ProcCall detected.")
+ to_chat(usr, "DB query blocked: Advanced ProcCall detected.")
message_admins("[key_name(usr)] attempted to create a DB query via advanced proc-call")
log_admin("[key_name(usr)] attempted to create a DB query via advanced proc-call")
return FALSE
@@ -386,7 +386,7 @@ SUBSYSTEM_DEF(dbcore)
if(!.)
SSdbcore.total_errors++
if(usr)
- to_chat(usr, "A SQL error occurred during this operation, please inform an admin or a coder.")
+ to_chat(usr, "A SQL error occurred during this operation, please inform an admin or a coder.", MESSAGE_TYPE_ADMINLOG, confidential = TRUE)
message_admins("An SQL error has occurred. Please check the server logs, with the following timestamp ID: \[[time_stamp()]]")
/**
diff --git a/code/controllers/subsystem/SSdebugview.dm b/code/controllers/subsystem/SSdebugview.dm
index 6b145b416be3..0f973a5deb21 100644
--- a/code/controllers/subsystem/SSdebugview.dm
+++ b/code/controllers/subsystem/SSdebugview.dm
@@ -31,7 +31,7 @@ SUBSYSTEM_DEF(debugview)
entries += "\[Processing] Cost: [round(SSprocessing.cost, 1)]ms | P: [length(SSprocessing.processing)]"
entries += "\[Projectiles] Cost: [round(SSprojectiles.cost, 1)]ms | P: [length(SSprojectiles.processing)]"
entries += "\[Runechat] Cost: [round(SSrunechat.cost, 1)]ms | AM: [SSrunechat.bucket_count] | SQ: [length(SSrunechat.second_queue)]"
- entries += "\[TGUI] Cost: [round(SStgui.cost, 1)]ms | P: [length(SStgui.processing_uis)]"
+ entries += "\[TGUI] Cost: [round(SStgui.cost, 1)]ms | P: [length(SStgui.open_uis)]]"
entries += "\[Timer] Cost: [round(SStimer.cost, 1)]ms | B: [SStimer.bucket_count] | P: [length(SStimer.second_queue)] | RST: [SStimer.bucket_reset_count]"
// Do some parsing to format it properly
diff --git a/code/controllers/subsystem/SSghost_spawns.dm b/code/controllers/subsystem/SSghost_spawns.dm
index c433765f0bc6..9811088f742d 100644
--- a/code/controllers/subsystem/SSghost_spawns.dm
+++ b/code/controllers/subsystem/SSghost_spawns.dm
@@ -96,7 +96,7 @@ SUBSYSTEM_DEF(ghost_spawns)
if(P != P2 && P.hash == P2.hash)
// If there's already a poll for an identical mob type ongoing and the client is signed up for it, sign them up for this one
if(!inherited_sign_up && (M in P2.signed_up) && P.sign_up(M, TRUE))
- A.update_signed_up_alert()
+ A.update_signed_up_alert(M)
inherited_sign_up = TRUE
// This number is used to display the number of polls the alert regroups
num_stack++
diff --git a/code/controllers/subsystem/SSinstancing.dm b/code/controllers/subsystem/SSinstancing.dm
index 51c2532c472c..58eb372391a8 100644
--- a/code/controllers/subsystem/SSinstancing.dm
+++ b/code/controllers/subsystem/SSinstancing.dm
@@ -1,3 +1,4 @@
+#ifdef MULTIINSTANCE
SUBSYSTEM_DEF(instancing)
name = "Instancing"
runlevels = RUNLEVEL_INIT | RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME
@@ -182,3 +183,4 @@ SUBSYSTEM_DEF(instancing)
qdel(dbq1)
return null // If we are here, it means we didnt find our player on another server
+#endif
diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm
index f520b06ae41a..8c5a04e9a2c0 100644
--- a/code/controllers/subsystem/SSjobs.dm
+++ b/code/controllers/subsystem/SSjobs.dm
@@ -12,6 +12,7 @@ SUBSYSTEM_DEF(jobs)
var/list/type_occupations = list() //Dict of all jobs, keys are types
var/list/prioritized_jobs = list() // List of jobs set to priority by HoP/Captain
var/list/id_change_records = list() // List of all job transfer records
+ var/probability_of_antag_role_restriction = 100 // Dict probability of a job rolling an antagonist role
var/id_change_counter = 1
//Players who need jobs
var/list/unassigned = list()
@@ -24,6 +25,8 @@ SUBSYSTEM_DEF(jobs)
var/late_arrivals_spawning = FALSE
/// Do we spawn people drunkenly due to the party last night?
var/drunken_spawning = FALSE
+ /// A list of minds that have failed to roll antagonist. Cleared when job selection finishes.
+ var/list/failed_head_antag_roll = list()
/datum/controller/subsystem/jobs/Initialize()
if(!length(occupations))
@@ -42,7 +45,7 @@ SUBSYSTEM_DEF(jobs)
occupations = list()
var/list/all_jobs = subtypesof(/datum/job)
if(!all_jobs.len)
- to_chat(world, "Error setting up jobs, no job datums found")
+ to_chat(world, "Error setting up jobs, no job datums found.")
return 0
for(var/J in all_jobs)
@@ -90,6 +93,8 @@ SUBSYSTEM_DEF(jobs)
return FALSE
if(job.barred_by_missing_limbs(player.client))
return FALSE
+ if(!job.is_donor_allowed(player.client)) // SS220 ADD - Donor Jobs
+ return FALSE
var/available = latejoin ? job.is_position_available() : job.is_spawn_position_available()
@@ -152,6 +157,13 @@ SUBSYSTEM_DEF(jobs)
Debug("FOC incompatbile with antagonist role, Player: [player]")
continue
if(player.client.prefs.active_character.GetJobDepartment(job, level) & job.flag)
+ if(player.mind.special_role && player.mind && (job.title in SSticker.mode.single_antag_positions)) //We want to check if they want the job, before rolling the prob chance
+ if((player.mind in SSjobs.failed_head_antag_roll) || !prob(probability_of_antag_role_restriction))
+ Debug("FOC Failed probability of getting a second antagonist position in this job, Player: [player], Job:[job.title]")
+ SSjobs.failed_head_antag_roll |= player.mind
+ continue
+ else
+ probability_of_antag_role_restriction /= 10
Debug("FOC pass, Player: [player], Level:[level]")
candidates += player
return candidates
@@ -183,6 +195,10 @@ SUBSYSTEM_DEF(jobs)
Debug("GRJ player not enough playtime, Player: [player]")
continue
+ if(!job.is_donor_allowed(player.client)) // SS220 ADD - Donor Jobs
+ Debug("DO player not enough donor level, Player: [player], Job:[job.title]")
+ continue
+
if(job.barred_by_disability(player.client))
Debug("GRJ player has disability rendering them ineligible for job, Player: [player]")
continue
@@ -194,7 +210,13 @@ SUBSYSTEM_DEF(jobs)
if(player.mind && (job.title in player.mind.restricted_roles))
Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
continue
-
+ if(player.mind.special_role && player.mind && (job.title in SSticker.mode.single_antag_positions))
+ if((player.mind in SSjobs.failed_head_antag_roll) || !prob(probability_of_antag_role_restriction))
+ Debug("GRJ Failed probability of getting a second antagonist position in this job, Player: [player], Job:[job.title]")
+ SSjobs.failed_head_antag_roll |= player.mind
+ continue
+ else
+ probability_of_antag_role_restriction /= 10
if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
Debug("GRJ Random job given, Player: [player], Job: [job]")
AssignRole(player, job.title)
@@ -365,6 +387,10 @@ SUBSYSTEM_DEF(jobs)
Debug("DO player not enough playtime, Player: [player], Job:[job.title]")
continue
+ if(!job.is_donor_allowed(player.client)) // SS220 ADD - Donor Jobs
+ Debug("DO player not enough donor level, Player: [player], Job:[job.title]")
+ continue
+
if(job.barred_by_disability(player.client))
Debug("DO player has disability rendering them ineligible for job, Player: [player], Job:[job.title]")
continue
@@ -376,12 +402,17 @@ SUBSYSTEM_DEF(jobs)
if(player.mind && (job.title in player.mind.restricted_roles))
Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
continue
-
// If the player wants that job on this level, then try give it to him.
if(player.client.prefs.active_character.GetJobDepartment(job, level) & job.flag)
-
// If the job isn't filled
if(job.is_spawn_position_available())
+ if(player.mind.special_role && player.mind && (job.title in SSticker.mode.single_antag_positions)) //We want to check if they want the job, before rolling the prob chance
+ if((player.mind in SSjobs.failed_head_antag_roll) || !prob(probability_of_antag_role_restriction))
+ Debug("DO Failed probability of getting a second antagonist position in this job, Player: [player], Job:[job.title]")
+ SSjobs.failed_head_antag_roll |= player.mind
+ continue
+ else
+ probability_of_antag_role_restriction /= 10
Debug("DO pass, Player: [player], Level:[level], Job:[job.title]")
Debug(" - Job Flag: [job.flag] Job Department: [player.client.prefs.active_character.GetJobDepartment(job, level)] Job Current Pos: [job.current_positions] Job Spawn Positions = [job.spawn_positions]")
AssignRole(player, job.title)
@@ -418,6 +449,7 @@ SUBSYSTEM_DEF(jobs)
unassigned -= player
log_debug("Dividing Occupations took [stop_watch(watch)]s")
+ failed_head_antag_roll = list()
return TRUE
/datum/controller/subsystem/jobs/proc/AssignRank(mob/living/carbon/human/H, rank, joined_late = FALSE)
@@ -519,7 +551,7 @@ SUBSYSTEM_DEF(jobs)
H = new_mob
if(job && H)
- job.after_spawn(H)
+ job.after_spawn(H, joined_late) // SS220 EDIT - jobs - prisoner spawn
//Gives glasses to the vision impaired
if(HAS_TRAIT(H, TRAIT_NEARSIGHT))
@@ -529,8 +561,10 @@ SUBSYSTEM_DEF(jobs)
if(istype(G) && !G.prescription)
G.upgrade_prescription()
H.update_nearsighted_effects()
+
if(joined_late || job.admin_only)
H.create_log(MISC_LOG, "Spawned as \an [H.dna?.species ? H.dna.species : "Undefined species"] named [H]. [joined_late ? "Joined during the round" : "Roundstart joined"] as job: [rank].")
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/controller/subsystem/jobs, show_location_blurb), H.client, H.mind), 1 SECONDS) //Moment for minds to boot up / people to load in
return H
if(late_arrivals_spawning)
H.forceMove(pick(GLOB.latejoin))
@@ -545,6 +579,7 @@ SUBSYSTEM_DEF(jobs)
H.Sleeping(5 SECONDS)
H.Drunk((2 / liver_multiplier) MINUTES)
H.create_log(MISC_LOG, "Spawned as \an [H.dna?.species ? H.dna.species : "Undefined species"] named [H]. Roundstart joined as job: [rank].")
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/controller/subsystem/jobs, show_location_blurb), H.client, H.mind), 1 SECONDS) //Moment for minds to boot up / people to load in
return H
/datum/controller/subsystem/jobs/proc/LoadJobs(highpop = FALSE) //ran during round setup, reads info from jobs list
@@ -616,7 +651,7 @@ SUBSYSTEM_DEF(jobs)
//fuck
/datum/controller/subsystem/jobs/proc/CreateMoneyAccount(mob/living/H, rank, datum/job/job)
- if(!job.has_bank_account)
+ if(job && !job.has_bank_account)
return
var/starting_balance = job?.department_account_access ? COMMAND_MEMBER_STARTING_BALANCE : CREW_MEMBER_STARTING_BALANCE
var/datum/money_account/account = GLOB.station_money_database.create_account(H.real_name, starting_balance, ACCOUNT_SECURITY_ID, "NAS Trurl Accounting", TRUE)
diff --git a/code/controllers/subsystem/SSping.dm b/code/controllers/subsystem/SSping.dm
new file mode 100644
index 000000000000..d8fda04bddd6
--- /dev/null
+++ b/code/controllers/subsystem/SSping.dm
@@ -0,0 +1,41 @@
+/*!
+ * Copyright (c) 2022 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+SUBSYSTEM_DEF(ping)
+ name = "Ping"
+ priority = FIRE_PRIORITY_PING
+ wait = 4 SECONDS
+ flags = SS_NO_INIT
+ runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+ offline_implications = "Chat ping system will no longer function correctly. No immediate action is needed."
+
+ /// List used each time SS fires to track which clients have been processed so far
+ var/list/current_run = list()
+
+/datum/controller/subsystem/ping/stat_entry()
+ ..("P:[length(GLOB.clients)]")
+
+/datum/controller/subsystem/ping/fire(resumed = FALSE)
+ // Prepare the new batch of clients
+ if(!resumed)
+ src.current_run = GLOB.clients.Copy()
+
+ // De-reference the list for sanic speeds
+ var/list/current_run = src.current_run
+
+ while(length(current_run))
+ var/client/client = current_run[current_run.len]
+ current_run.len--
+
+ if(client?.tgui_panel?.is_ready())
+ // Send a soft ping
+ client.tgui_panel.window.send_message("ping/soft", list(
+ // Slightly less than the subsystem timer (somewhat arbitrary)
+ // to prevent incoming pings from resetting the afk state
+ "afk" = client.is_afk(3.5 SECONDS),
+ ))
+
+ if(MC_TICK_CHECK)
+ return
diff --git a/code/controllers/subsystem/SStgui.dm b/code/controllers/subsystem/SStgui.dm
index 8ef9384f09c3..924a5f02919b 100644
--- a/code/controllers/subsystem/SStgui.dm
+++ b/code/controllers/subsystem/SStgui.dm
@@ -1,311 +1,357 @@
- /**
- * tgui subsystem
- *
- * Contains all tgui state and subsystem code.
- **/
-
+/**
+ * tgui subsystem
+ *
+ * Contains all tgui state and subsystem code.
+ *
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
SUBSYSTEM_DEF(tgui)
- name = "TGUI"
+ name = "tgui"
wait = 9
flags = SS_NO_INIT
priority = FIRE_PRIORITY_TGUI
runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
- offline_implications = "All TGUIs will no longer process. Shuttle call recommended."
- var/list/currentrun = list()
- var/list/open_uis = list() // A list of open UIs, grouped by src_object and ui_key.
- var/list/processing_uis = list() // A list of processing UIs, ungrouped.
- var/basehtml // The HTML base used for all UIs.
+ /// A list of UIs scheduled to process
+ var/list/current_run = list()
+ /// A list of open UIs
+ var/list/open_uis = list()
+ /// A list of open UIs, grouped by src_object.
+ var/list/open_uis_by_src = list()
+ /// The HTML base used for all UIs.
+ var/basehtml
/datum/controller/subsystem/tgui/PreInit()
- basehtml = file2text('tgui/packages/tgui/public/tgui.html')
+ basehtml = file2text('tgui/public/tgui.html')
+ // Inject inline polyfills
+ var/polyfill = file2text('tgui/public/tgui-polyfill.min.js')
+ polyfill = ""
+ basehtml = replacetextEx(basehtml, "", polyfill)
/datum/controller/subsystem/tgui/Shutdown()
close_all_uis()
-/datum/controller/subsystem/tgui/get_stat_details()
- return "P:[length(processing_uis)]"
-
-/datum/controller/subsystem/tgui/get_metrics()
- . = ..()
- var/list/cust = list()
- cust["processing"] = length(processing_uis)
- .["custom"] = cust
+/datum/controller/subsystem/tgui/stat_entry(msg)
+ msg = "P:[length(open_uis)]"
+ return ..()
-
-/datum/controller/subsystem/tgui/fire(resumed = 0)
+/datum/controller/subsystem/tgui/fire(resumed = FALSE)
if(!resumed)
- src.currentrun = processing_uis.Copy()
- //cache for sanic speed (lists are references anyways)
- var/list/currentrun = src.currentrun
-
- while(currentrun.len)
- var/datum/tgui/ui = currentrun[currentrun.len]
- currentrun.len--
+ src.current_run = open_uis.Copy()
+ // Cache for sanic speed (lists are references anyways)
+ var/list/current_run = src.current_run
+ while(current_run.len)
+ var/datum/tgui/ui = current_run[current_run.len]
+ current_run.len--
+ // TODO: Move user/src_object check to process()
if(ui && ui.user && ui.src_object)
ui.process()
else
- processing_uis.Remove(ui)
+ open_uis.Remove(ui)
if(MC_TICK_CHECK)
return
/**
* public
*
- * Get an open UI given a user, src_object, and ui_key and try to update it with data.
- * Returns the found UI.
+ * Requests a usable tgui window from the pool.
+ * Returns null if pool was exhausted.
*
- * * mob/user - The mob who opened/is using the UI. (REQUIRED)
- * * datum/src_object - The object/datum which owns the UI. (REQUIRED)
- * * ui_key - The ui_key of the UI. (REQUIRED)
- * * datum/tgui/ui - The UI to be updated, if it exists. (OPTIONAL)
- * * force_open - If the UI should be re-opened instead of updated. (OPTIONAL)
+ * required user mob
+ * return datum/tgui
*/
-/datum/controller/subsystem/tgui/proc/try_update_ui(mob/user, datum/src_object, ui_key, datum/tgui/ui, force_open = FALSE)
- if(isnull(ui)) // No UI was passed, so look for one.
- ui = get_open_ui(user, src_object, ui_key)
-
- if(!isnull(ui))
- var/data = src_object.ui_data(user) // Get data from the src_object.
- if(!force_open) // UI is already open; update it.
- ui.push_data(data)
- else // Re-open it anyways.
- ui.reinitialize(null, data)
- return ui // We found the UI, return it.
- else
- return null // We couldn't find a UI.
+/datum/controller/subsystem/tgui/proc/request_pooled_window(mob/user)
+ if(!user.client)
+ return
+ var/list/windows = user.client.tgui_windows
+ var/window_id
+ var/datum/tgui_window/window
+ var/window_found = FALSE
+ // Find a usable window
+ for(var/i in 1 to TGUI_WINDOW_HARD_LIMIT)
+ window_id = TGUI_WINDOW_ID(i)
+ window = windows[window_id]
+ // As we are looping, create missing window datums
+ if(!window)
+ window = new(user.client, window_id, pooled = TRUE)
+ // Skip windows with acquired locks
+ if(window.locked)
+ continue
+ if(window.status == TGUI_WINDOW_READY)
+ return window
+ if(window.status == TGUI_WINDOW_CLOSED)
+ window.status = TGUI_WINDOW_LOADING
+ window_found = TRUE
+ break
+ if(!window_found)
+ log_tgui(user, "Error: Pool exhausted")
+ return
+ return window
/**
- * private
+ * public
*
- * Get an open UI given a user, src_object, and ui_key.
- * Returns the found UI.
+ * Force closes all tgui windows.
*
- * * mob/user - The mob who opened/is using the UI. (REQUIRED)
- * * datum/src_object - The object/datum which owns the UI. (REQUIRED)
- * * ui_key - The ui_key of the UI. (REQUIRED)
+ * required user mob
*/
-/datum/controller/subsystem/tgui/proc/get_open_ui(mob/user, datum/src_object, ui_key)
- var/src_object_key = "[src_object.UID()]"
- if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key]))
- return null // No UIs open.
- else if(isnull(open_uis[src_object_key][ui_key]) || !islist(open_uis[src_object_key][ui_key]))
- return null // No UIs open for this object.
-
- for(var/datum/tgui/ui in open_uis[src_object_key][ui_key]) // Find UIs for this object.
- if(ui.user == user) // Make sure we have the right user
- return ui
-
- return null // Couldn't find a UI!
+/datum/controller/subsystem/tgui/proc/force_close_all_windows(mob/user)
+ log_tgui(user, "force_close_all_windows")
+ if(user.client)
+ user.client.tgui_windows = list()
+ for(var/i in 1 to TGUI_WINDOW_HARD_LIMIT)
+ var/window_id = TGUI_WINDOW_ID(i)
+ user << browse(null, "window=[window_id]")
/**
- * private
+ * public
*
- * Update all UIs attached to src_object.
- * Returns the number of UIs updated.
+ * Force closes the tgui window by window_id.
*
- * * datum/src_object - The object/datum which owns the UIs.
- * * update_static_data - If the static data of the `src_object` should be updated for every viewing user.
+ * required user mob
+ * required window_id string
*/
-/datum/controller/subsystem/tgui/proc/update_uis(datum/src_object, update_static_data = FALSE)
- var/src_object_key = "[src_object.UID()]"
- if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key]))
- return 0 // Couldn't find any UIs for this object.
-
- var/update_count = 0
- for(var/ui_key in open_uis[src_object_key])
- for(var/datum/tgui/ui in open_uis[src_object_key][ui_key])
- if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) // Check the UI is valid.
- if(update_static_data)
- src_object.update_static_data(ui.user, ui, ui_key)
- ui.process(force = 1) // Update the UI.
- update_count++ // Count each UI we update.
- return update_count
+/datum/controller/subsystem/tgui/proc/force_close_window(mob/user, window_id)
+ log_tgui(user, "force_close_window")
+ // Close all tgui datums based on window_id.
+ for(var/datum/tgui/ui in user.tgui_open_uis)
+ if(ui.window && ui.window.id == window_id)
+ ui.close(can_be_suspended = FALSE)
+ // Unset machine just to be sure.
+ user.unset_machine()
+ // Close window directly just to be sure.
+ user << browse(null, "window=[window_id]")
/**
- * private
+ * public
*
- * Close all UIs attached to src_object.
- * Returns the number of UIs closed.
+ * Try to find an instance of a UI, and push an update to it.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * required src_object datum The object/datum which owns the UI.
+ * optional ui datum/tgui The UI to be updated, if it exists.
+ * optional force_open bool If the UI should be re-opened instead of updated.
*
- * * datum/src_object - The object/datum which owns the UIs.
+ * return datum/tgui The found UI.
*/
-/datum/controller/subsystem/tgui/proc/close_uis(datum/src_object)
- if(!src_object.unique_datum_id) // First check if the datum has an UID set
- return 0
- var/src_object_key = "[src_object.UID()]"
- if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key]))
- return 0 // Couldn't find any UIs for this object.
-
- var/close_count = 0
- for(var/ui_key in open_uis[src_object_key])
- for(var/datum/tgui/ui in open_uis[src_object_key][ui_key])
- if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) // Check the UI is valid.
- ui.close() // Close the UI.
- close_count++ // Count each UI we close.
- return close_count
+/datum/controller/subsystem/tgui/proc/try_update_ui(mob/user, datum/src_object, datum/tgui/ui, force_open = FALSE)
+ // Look up a UI if it wasn't passed
+ if(isnull(ui))
+ ui = get_open_ui(user, src_object)
+ // Couldn't find a UI.
+ if(isnull(ui))
+ return
+ var/data = src_object.ui_data(user) // Get data from the src_object.
+ if(force_open) // UI is already open; update it.
+ ui.send_full_update(data, TRUE)
+ return ui // We found the UI, return it
+ ui.process_status()
+ // UI ended up with the closed status
+ // or is actively trying to close itself.
+ // FIXME: Doesn't actually fix the paper bug.
+ if(ui.status <= UI_CLOSE)
+ ui.close()
+ return
+ ui.send_update()
+ return ui
/**
+ * public
+ *
+ * Get a open UI given a user and src_object.
*
- * Gets the amount of open UIs on an object
- * Returns the number of UIs open.
+ * required user mob The mob who opened/is using the UI.
+ * required src_object datum The object/datum which owns the UI.
*
- * * datum/src_object - The object/datum which owns the UIs.
+ * return datum/tgui The found UI.
*/
-/datum/controller/subsystem/tgui/proc/get_open_ui_count(datum/src_object)
- if(!src_object.unique_datum_id) // First check if the datum has an UID set
- return 0
- var/src_object_key = "[src_object.UID()]"
- if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key]))
- return 0 // Couldn't find any UIs for this object.
-
- var/open_count = 0
- for(var/ui_key in open_uis[src_object_key])
- for(var/datum/tgui/ui in open_uis[src_object_key][ui_key])
- if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) // Check the UI is valid.
- open_count++ // Count each UI thats open
+/datum/controller/subsystem/tgui/proc/get_open_ui(mob/user, datum/src_object)
+ var/key = "[src_object.UID()]"
+ // No UIs opened for this src_object
+ if(isnull(open_uis_by_src[key]) || !islist(open_uis_by_src[key]))
+ return
+ for(var/datum/tgui/ui in open_uis_by_src[key])
+ // Make sure we have the right user
+ if(ui.user == user)
+ return ui
+ return
- return open_count
+/**
+ * public
+ *
+ * Update all UIs attached to src_object.
+ *
+ * required src_object datum The object/datum which owns the UIs.
+ *
+ * return int The number of UIs updated.
+ */
+/datum/controller/subsystem/tgui/proc/update_uis(datum/src_object)
+ var/count = 0
+ var/key = "[src_object.UID()]"
+ // No UIs opened for this src_object
+ if(isnull(open_uis_by_src[key]) || !islist(open_uis_by_src[key]))
+ return count
+ for(var/datum/tgui/ui in open_uis_by_src[key])
+ // Check if UI is valid.
+ if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user))
+ ui.process(force = TRUE)
+ count++
+ return count
+/**
+ * public
+ *
+ * Close all UIs attached to src_object.
+ *
+ * required src_object datum The object/datum which owns the UIs.
+ *
+ * return int The number of UIs closed.
+ */
+/datum/controller/subsystem/tgui/proc/close_uis(datum/src_object)
+ . = 0
+ var/key = "[src_object.UID()]"
+ // No UIs opened for this src_object
+ if(isnull(open_uis_by_src[key]) || !islist(open_uis_by_src[key]))
+ return
+ for(var/datum/tgui/ui in open_uis_by_src[key])
+ // Check if UI is valid.
+ if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user))
+ ui.close()
+ .++
+ return
/**
- * private
+ * public
+ *
+ * Close all UIs regardless of their attachment to src_object.
*
- * Close *ALL* UIs
- * Returns the number of UIs closed.
+ * return int The number of UIs closed.
*/
/datum/controller/subsystem/tgui/proc/close_all_uis()
- var/close_count = 0
- for(var/src_object_key in open_uis)
- for(var/ui_key in open_uis[src_object_key])
- for(var/datum/tgui/ui in open_uis[src_object_key][ui_key])
- if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) // Check the UI is valid.
- ui.close() // Close the UI.
- close_count++ // Count each UI we close.
- return close_count
+ var/count = 0
+ for(var/key in open_uis_by_src)
+ for(var/datum/tgui/ui in open_uis_by_src[key])
+ // Check if UI is valid.
+ if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user))
+ ui.close()
+ count++
+ return count
/**
- * private
+ * public
*
* Update all UIs belonging to a user.
- * Returns the number of UIs updated.
*
- * * mob/user - The mob who opened/is using the UI. (REQUIRED)
- * * datum/src_object - If provided, only update UIs belonging this src_object. (OPTIONAL)
- * * ui_key - If provided, only update UIs with this UI key. (OPTIONAL)
+ * required user mob The mob who opened/is using the UI.
+ * optional src_object datum If provided, only update UIs belonging this src_object.
+ *
+ * return int The number of UIs updated.
*/
-/datum/controller/subsystem/tgui/proc/update_user_uis(mob/user, datum/src_object = null, ui_key = null)
- if(isnull(user.open_uis) || !islist(user.open_uis) || open_uis.len == 0)
- return 0 // Couldn't find any UIs for this user.
-
- var/update_count = 0
- for(var/datum/tgui/ui in user.open_uis)
- if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
- ui.process(force = 1) // Update the UI.
- update_count++ // Count each UI we upadte.
- return update_count
+/datum/controller/subsystem/tgui/proc/update_user_uis(mob/user, datum/src_object)
+ var/count = 0
+ if(length(user?.tgui_open_uis) == 0)
+ return count
+ for(var/datum/tgui/ui in user.tgui_open_uis)
+ if(isnull(src_object) || ui.src_object == src_object)
+ ui.process(force = TRUE)
+ count++
+ return count
/**
- * private
+ * public
*
* Close all UIs belonging to a user.
- * Returns the number of UIs closed.
*
- * * mob/user - The mob who opened/is using the UI. (REQUIRED)
- * * datum/src_object - If provided, only close UIs belonging this src_object. (OPTIONAL)
- * * ui_key - If provided, only close UIs with this UI key. (OPTIONAL)
+ * required user mob The mob who opened/is using the UI.
+ * optional src_object datum If provided, only close UIs belonging this src_object.
+ *
+ * return int The number of UIs closed.
*/
-/datum/controller/subsystem/tgui/proc/close_user_uis(mob/user, datum/src_object = null, ui_key = null)
- if(isnull(user.open_uis) || !islist(user.open_uis) || open_uis.len == 0)
- return 0 // Couldn't find any UIs for this user.
-
- var/close_count = 0
- for(var/datum/tgui/ui in user.open_uis)
- if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
- ui.close() // Close the UI.
- close_count++ // Count each UI we close.
- return close_count
+/datum/controller/subsystem/tgui/proc/close_user_uis(mob/user, datum/src_object)
+ var/count = 0
+ if(length(user?.tgui_open_uis) == 0)
+ return count
+ for(var/datum/tgui/ui in user.tgui_open_uis)
+ if(isnull(src_object) || ui.src_object == src_object)
+ ui.close()
+ count++
+ return count
/**
* private
*
* Add a UI to the list of open UIs.
*
- * * datum/tgui/ui - The UI to be added.
+ * required ui datum/tgui The UI to be added.
*/
/datum/controller/subsystem/tgui/proc/on_open(datum/tgui/ui)
- var/src_object_key = "[ui.src_object.UID()]"
- if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key]))
- open_uis[src_object_key] = list(ui.ui_key = list()) // Make a list for the ui_key and src_object.
- else if(isnull(open_uis[src_object_key][ui.ui_key]) || !islist(open_uis[src_object_key][ui.ui_key]))
- open_uis[src_object_key][ui.ui_key] = list() // Make a list for the ui_key.
-
- // Append the UI to all the lists.
- ui.user.open_uis |= ui
- var/list/uis = open_uis[src_object_key][ui.ui_key]
+ var/key = "[ui.src_object.UID()]"
+ if(isnull(open_uis_by_src[key]) || !islist(open_uis_by_src[key]))
+ open_uis_by_src[key] = list()
+ ui.user.tgui_open_uis |= ui
+ var/list/uis = open_uis_by_src[key]
uis |= ui
- processing_uis |= ui
+ open_uis |= ui
/**
* private
*
* Remove a UI from the list of open UIs.
- * Returns TRUE if removed, and FALSE if not.
*
- * * datum/tgui/ui - The UI to be removed.
+ * required ui datum/tgui The UI to be removed.
+ *
+ * return bool If the UI was removed or not.
*/
/datum/controller/subsystem/tgui/proc/on_close(datum/tgui/ui)
- var/src_object_key = "[ui.src_object.UID()]"
- if(isnull(open_uis[src_object_key]) || !islist(open_uis[src_object_key]))
- return FALSE // It wasn't open.
- else if(isnull(open_uis[src_object_key][ui.ui_key]) || !islist(open_uis[src_object_key][ui.ui_key]))
- return FALSE // It wasn't open.
-
- processing_uis.Remove(ui) // Remove it from the list of processing UIs.
- if(ui.user) // If the user exists, remove it from them too.
- ui.user.open_uis.Remove(ui)
- var/Ukey = ui.ui_key
- var/list/uis = open_uis[src_object_key][Ukey] // Remove it from the list of open UIs.
+ var/key = "[ui.src_object.UID()]"
+ if(isnull(open_uis_by_src[key]) || !islist(open_uis_by_src[key]))
+ return FALSE
+ // Remove it from the list of processing UIs.
+ open_uis.Remove(ui)
+ // If the user exists, remove it from them too.
+ if(ui.user)
+ ui.user.tgui_open_uis.Remove(ui)
+ var/list/uis = open_uis_by_src[key]
uis.Remove(ui)
- if(!uis.len)
- var/list/uiobj = open_uis[src_object_key]
- uiobj.Remove(Ukey)
- if(!uiobj.len)
- open_uis.Remove(src_object_key)
-
- return TRUE // Let the caller know we did it.
+ if(length(uis) == 0)
+ open_uis_by_src.Remove(key)
+ return TRUE
/**
* private
*
* Handle client logout, by closing all their UIs.
- * Returns the number of UIs closed.
*
- * * mob/user - The mob which logged out.
+ * required user mob The mob which logged out.
+ *
+ * return int The number of UIs closed.
*/
/datum/controller/subsystem/tgui/proc/on_logout(mob/user)
- return close_user_uis(user)
+ close_user_uis(user)
/**
* private
*
* Handle clients switching mobs, by transferring their UIs.
- * Returns TRUE if the UIs were transferred, and FALSE if not.
*
- * * mob/source - The client's original mob.
- * * mob/target - The client's new mob.
+ * required user source The client's original mob.
+ * required user target The client's new mob.
+ *
+ * return bool If the UIs were transferred.
*/
/datum/controller/subsystem/tgui/proc/on_transfer(mob/source, mob/target)
- if(!source || isnull(source.open_uis) || !islist(source.open_uis) || open_uis.len == 0)
- return FALSE // The old mob had no open UIs.
-
- if(isnull(target.open_uis) || !islist(target.open_uis))
- target.open_uis = list() // Create a list for the new mob if needed.
-
- for(var/datum/tgui/ui in source.open_uis)
- ui.user = target // Inform the UIs of their new owner.
- target.open_uis.Add(ui) // Transfer all the UIs.
-
- source.open_uis.Cut() // Clear the old list.
- return TRUE // Let the caller know we did it.
+ // The old mob had no open UIs.
+ if(length(source?.tgui_open_uis) == 0)
+ return FALSE
+ if(isnull(target.tgui_open_uis) || !istype(target.tgui_open_uis, /list))
+ target.tgui_open_uis = list()
+ // Transfer all the UIs.
+ for(var/datum/tgui/ui in source.tgui_open_uis)
+ // Inform the UIs of their new owner.
+ ui.user = target
+ target.tgui_open_uis.Add(ui)
+ // Clear the old list.
+ source.tgui_open_uis.Cut()
+ return TRUE
diff --git a/code/controllers/subsystem/SSthrowing.dm b/code/controllers/subsystem/SSthrowing.dm
index 606c762bb10b..10944b42c338 100644
--- a/code/controllers/subsystem/SSthrowing.dm
+++ b/code/controllers/subsystem/SSthrowing.dm
@@ -70,6 +70,8 @@ SUBSYSTEM_DEF(throwing)
var/last_move = 0
///When this variable is false, non dense mobs will be hit by a thrown item. useful for things that you dont want to be cheesed by crawling, EG. gravitational anomalies
var/dodgeable = TRUE
+ /// Can a thrown mob move themselves to stop the throw?
+ var/block_movement = TRUE
/datum/thrownthing/proc/tick()
var/atom/movable/AM = thrownthing
diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm
index 0e99b37bcd5d..2c500571b4e1 100644
--- a/code/controllers/subsystem/SSticker.dm
+++ b/code/controllers/subsystem/SSticker.dm
@@ -296,9 +296,25 @@ SUBSYSTEM_DEF(ticker)
// Generate code phrases and responses
if(!GLOB.syndicate_code_phrase)
- GLOB.syndicate_code_phrase = generate_code_phrase()
+ var/temp_syndicate_code_phrase = generate_code_phrase(return_list = TRUE)
+
+ var/codewords = jointext(temp_syndicate_code_phrase, "|")
+ var/regex/codeword_match = new("([codewords])", "ig")
+
+ GLOB.syndicate_code_phrase_regex = codeword_match
+ temp_syndicate_code_phrase = jointext(temp_syndicate_code_phrase, ", ")
+ GLOB.syndicate_code_phrase = temp_syndicate_code_phrase
+
+
if(!GLOB.syndicate_code_response)
- GLOB.syndicate_code_response = generate_code_phrase()
+ var/temp_syndicate_code_response = generate_code_phrase(return_list = TRUE)
+
+ var/codewords = jointext(temp_syndicate_code_response, "|")
+ var/regex/codeword_match = new("([codewords])", "ig")
+
+ GLOB.syndicate_code_response_regex = codeword_match
+ temp_syndicate_code_response = jointext(temp_syndicate_code_response, ", ")
+ GLOB.syndicate_code_response = temp_syndicate_code_response
// Run post setup stuff
mode.post_setup()
@@ -699,8 +715,10 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/reboot_helper(reason, end_string, delay)
// Admins delayed round end. Just alert and dont bother with anything else.
if(delay_end)
- to_chat(world, "An admin has delayed the round end.")
+ to_chat(world, "An admin has delayed the round end.")
return
+ if(delay)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/datum/controller/subsystem/ticker, show_server_restart_blurb), reason)
if(!isnull(delay))
// Delay time was present. Use that.
@@ -709,14 +727,14 @@ SUBSYSTEM_DEF(ticker)
// Use default restart timeout
delay = restart_timeout
- to_chat(world, "Rebooting world in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]")
+ to_chat(world, "Rebooting world in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]")
real_reboot_time = world.time + delay
UNTIL(world.time > real_reboot_time) // Hold it here
// And if we re-delayed, bail again
if(delay_end)
- to_chat(world, "Reboot was cancelled by an admin.")
+ to_chat(world, "Reboot was cancelled by an admin.")
return
if(end_string)
diff --git a/code/controllers/subsystem/SStimer.dm b/code/controllers/subsystem/SStimer.dm
index 53571e6eb7d8..7e80a9c06e75 100644
--- a/code/controllers/subsystem/SStimer.dm
+++ b/code/controllers/subsystem/SStimer.dm
@@ -224,7 +224,7 @@ SUBSYSTEM_DEF(timer)
* Generates a string with details about the timed event for debugging purposes
*/
/datum/controller/subsystem/timer/proc/get_timer_debug_string(datum/timedevent/TE)
- . = "Timer: [TE]"
+ . = "Timer: [TE.getTimerInfo()]"
. += "Prev: [TE.prev ? TE.prev : "NULL"], Next: [TE.next ? TE.next : "NULL"]"
if(TE.spent)
. += ", SPENT([TE.spent])"
@@ -502,14 +502,8 @@ SUBSYSTEM_DEF(timer)
* If the timed event is tracking client time, it will be added to a special bucket.
*/
/datum/timedevent/proc/bucketJoin()
- // Generate debug-friendly name for timer
- var/static/list/bitfield_flags = list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT", "TIMER_LOOP")
- name = "Timer: [id] (\ref[src]), TTR: [timeToRun], wait:[wait] Flags: [jointext(bitfield2list(flags, bitfield_flags), ", ")], \
- callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), \
- callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""]), source: [source]"
-
if(bucket_joined)
- stack_trace("Bucket already joined! [name]")
+ stack_trace("Bucket already joined! [getTimerInfo()]")
// Check if this timed event should be diverted to the client time bucket, or the secondary queue
var/list/L
@@ -529,7 +523,7 @@ SUBSYSTEM_DEF(timer)
if(bucket_pos < SStimer.practical_offset && timeToRun < (SStimer.head_offset + TICKS2DS(BUCKET_LEN)))
WARNING("Bucket pos in past: bucket_pos = [bucket_pos] < practical_offset = [SStimer.practical_offset] \
- && timeToRun = [timeToRun] < [SStimer.head_offset + TICKS2DS(BUCKET_LEN)], Timer: [name]")
+ && timeToRun = [timeToRun] < [SStimer.head_offset + TICKS2DS(BUCKET_LEN)], Timer: [getTimerInfo()]")
bucket_pos = SStimer.practical_offset // Recover bucket_pos to avoid timer blocking queue
var/datum/timedevent/bucket_head = bucket_list[bucket_pos]
@@ -550,6 +544,21 @@ SUBSYSTEM_DEF(timer)
prev = null
bucket_list[bucket_pos] = src
+/**
+ * Returns debug information about timer
+ */
+/datum/timedevent/proc/getTimerInfo()
+ var/static/list/bitfield_flags = list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT", "TIMER_LOOP")
+ if(!name)
+ name = "Timer: [id] (\ref[src]), TTR: [timeToRun], wait:[wait] Flags: [jointext(bitfield2list(flags, bitfield_flags), ", ")], \
+ callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), \
+ callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""]), source: [source]"
+ return name
+
+/datum/timedevent/can_vv_get(var_name)
+ getTimerInfo()
+ return ..()
+
/**
* Returns a string of the type of the callback for this timer
*/
diff --git a/code/controllers/subsystem/non_firing/SSassets.dm b/code/controllers/subsystem/non_firing/SSassets.dm
index d2c9a90217df..83bd6b5b9b5b 100644
--- a/code/controllers/subsystem/non_firing/SSassets.dm
+++ b/code/controllers/subsystem/non_firing/SSassets.dm
@@ -2,15 +2,38 @@ SUBSYSTEM_DEF(assets)
name = "Assets"
init_order = INIT_ORDER_ASSETS
flags = SS_NO_FIRE
+ /// Contains /datum/asset_cache_item
var/list/cache = list()
var/list/preload = list()
+ var/datum/asset_transport/transport = new()
-/datum/controller/subsystem/assets/Initialize()
- for(var/type in typesof(/datum/asset) - list(/datum/asset, /datum/asset/simple))
- var/datum/asset/A = new type()
- A.register()
+/datum/controller/subsystem/assets/Initialize(timeofday)
+ load_assets()
+ apply_configuration()
- preload = cache.Copy() //don't preload assets generated during the round
+/datum/controller/subsystem/assets/Recover()
+ cache = SSassets.cache
+ preload = SSassets.preload
- for(var/client/C in GLOB.clients)
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(getFilesSlow), C, preload, FALSE), 10)
+/datum/controller/subsystem/assets/proc/apply_configuration(initialize_transport = TRUE)
+ var/newtransporttype = /datum/asset_transport
+ switch(GLOB.configuration.asset_cache.asset_transport)
+ if("webroot")
+ newtransporttype = /datum/asset_transport/webroot
+
+ if(newtransporttype == transport.type)
+ return
+
+ var/datum/asset_transport/newtransport = new newtransporttype
+ if(newtransport.validate_config())
+ transport = newtransport
+
+ if(initialize_transport)
+ transport.Initialize(cache)
+
+/datum/controller/subsystem/assets/proc/load_assets()
+ for(var/datum/asset/asset_to_load as anything in typesof(/datum/asset))
+ if(initial(asset_to_load._abstract))
+ continue
+
+ get_asset_datum(type)
diff --git a/code/controllers/subsystem/non_firing/SSchangelog.dm b/code/controllers/subsystem/non_firing/SSchangelog.dm
index cfff6afee409..52b9f2004283 100644
--- a/code/controllers/subsystem/non_firing/SSchangelog.dm
+++ b/code/controllers/subsystem/non_firing/SSchangelog.dm
@@ -53,12 +53,6 @@ SUBSYSTEM_DEF(changelog)
if(!ss_ready)
return // Only return here, we dont have to worry about a queue list because this will be called from ShowChangelog()
- if(C.prefs.toggles & PREFTOGGLE_UI_DARKMODE)
- winset(C, "rpane.changelog", "background-color=#40628a;font-color=#ffffff;font-style=none")
- else
- winset(C, "rpane.changelog", "background-color=none;font-style=none")
-
-
C.prefs.lastchangelog = current_cl_timestamp
var/datum/db_query/updatePlayerCLTime = SSdbcore.NewQuery(
@@ -76,22 +70,12 @@ SUBSYSTEM_DEF(changelog)
/datum/controller/subsystem/changelog/proc/UpdatePlayerChangelogButton(client/C)
// If SQL aint even enabled, or we aint ready just set the button to default style
if(!SSdbcore.IsConnected() || !ss_ready)
- if(C.prefs.toggles & PREFTOGGLE_UI_DARKMODE)
- winset(C, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF")
- else
- winset(C, "rpane.changelog", "background-color=none;text-color=#000000")
return
// If we are ready, process the button style
if(C.prefs.lastchangelog != current_cl_timestamp)
- winset(C, "rpane.changelog", "background-color=#bb7700;text-color=#FFFFFF;font-style=bold")
+ winset(C, "rpane.changelog", "border=line;font-style=bold")
to_chat(C, "Changelog has changed since your last visit.")
- else
- if(C.prefs.toggles & PREFTOGGLE_UI_DARKMODE)
- winset(C, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF")
- else
- winset(C, "rpane.changelog", "background-color=none;text-color=#000000")
-
/datum/controller/subsystem/changelog/proc/OpenChangelog(client/C)
// If SQL isnt enabled, dont even queue them, just tell them it wont work
@@ -204,10 +188,13 @@ SUBSYSTEM_DEF(changelog)
return data
-/datum/controller/subsystem/changelog/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/controller/subsystem/changelog/ui_state(mob/user)
+ return GLOB.always_state
+
+/datum/controller/subsystem/changelog/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ChangelogView", name, 750, 800, master_ui, state)
+ ui = new(user, src, "ChangelogView", name)
ui.set_autoupdate(FALSE)
ui.open()
@@ -224,13 +211,13 @@ SUBSYSTEM_DEF(changelog)
if("open_pr")
var/pr_num = params["pr_number"]
if(GLOB.configuration.url.github_url)
- if(alert("This will open PR #[pr_num] in your browser. Are you sure?", "Open PR", "Yes", "No") == "No")
+ if(tgui_alert(usr, "This will open PR #[pr_num] in your browser. Are you sure?", "Open PR", list("Yes", "No")) != "Yes")
return
// If the github URL in the config has a trailing slash, it doesnt matter here, thankfully github accepts having a double slash: https://github.com/org/repo//pull/1
var/url = "[GLOB.configuration.url.github_url]/pull/[pr_num]"
usr << link(url)
- return
+ return TRUE
to_chat(usr, "The GitHub URL is not set in the server configuration. PRs cannot be opened from changelog view. Please inform the server host.")
diff --git a/code/controllers/subsystem/non_firing/SSmapping.dm b/code/controllers/subsystem/non_firing/SSmapping.dm
index e5c776c8ed53..def0d7fffebc 100644
--- a/code/controllers/subsystem/non_firing/SSmapping.dm
+++ b/code/controllers/subsystem/non_firing/SSmapping.dm
@@ -13,7 +13,7 @@ SUBSYSTEM_DEF(mapping)
///List of areas that exist on the station this shift
var/list/existing_station_areas
///What do we have as the lavaland theme today?
- var/turf/simulated/floor/lavaland_theme
+ var/datum/lavaland_theme/lavaland_theme
///What primary cave theme we have picked for cave generation today.
var/cave_theme
@@ -40,8 +40,11 @@ SUBSYSTEM_DEF(mapping)
F << next_map.type
/datum/controller/subsystem/mapping/Initialize()
- lavaland_theme = pick(/turf/simulated/floor/lava/lava_land_surface, /turf/simulated/floor/lava/lava_land_surface/plasma, /turf/simulated/floor/chasm/straight_down/lava_land_surface)
+ var/datum/lavaland_theme/lavaland_theme_type = pick(subtypesof(/datum/lavaland_theme))
+ ASSERT(lavaland_theme_type)
+ lavaland_theme = new lavaland_theme_type
log_startup_progress("We're in the mood for [initial(lavaland_theme.name)] today...") //We load this first. In the event some nerd ever makes a surface map, and we don't have it in lavaland in the event lavaland is disabled.
+
cave_theme = pick(BLOCKED_BURROWS, CLASSIC_CAVES, DEADLY_DEEPROCK)
log_startup_progress("We feel like [cave_theme] today...")
// Load all Z level templates
@@ -71,14 +74,8 @@ SUBSYSTEM_DEF(mapping)
log_startup_progress("Populating lavaland...")
var/lavaland_setup_timer = start_watch()
seedRuins(list(level_name_to_num(MINING)), GLOB.configuration.ruins.lavaland_ruin_budget, /area/lavaland/surface/outdoors/unexplored, GLOB.lava_ruins_templates)
- switch(lavaland_theme)
- if(/turf/simulated/floor/lava/lava_land_surface)
- spawn_rivers(level_name_to_num(MINING)) //Default spawn, no tweaks needed
- if(/turf/simulated/floor/lava/lava_land_surface/plasma) //More rivers, smaller
- spawn_rivers(level_name_to_num(MINING), nodes = 2)
- spawn_rivers(level_name_to_num(MINING), nodes = 2)
- if(/turf/simulated/floor/chasm/straight_down/lava_land_surface) //Thiner chasms, bridges, reaches to edge of map.
- spawn_rivers(level_name_to_num(MINING), nodes = 6, turf_type = /turf/simulated/floor/lava/mapping_lava, whitelist_area = /area/lavaland/surface/outdoors, min_x = 50, min_y = 7, max_x = 250, max_y = 225, prob = 10, prob_loss = 5)
+ if(lavaland_theme)
+ lavaland_theme.setup()
var/time_spent = stop_watch(lavaland_setup_timer)
log_startup_progress("Successfully populated lavaland in [time_spent]s.")
else
@@ -129,6 +126,8 @@ SUBSYSTEM_DEF(mapping)
var/num_extra_space = rand(GLOB.configuration.ruins.extra_levels_min, GLOB.configuration.ruins.extra_levels_max)
for(var/i in 1 to num_extra_space)
GLOB.space_manager.add_new_zlevel("Ruin Area #[i]", linkage = CROSSLINKED, traits = list(REACHABLE_BY_CREW, SPAWN_RUINS, REACHABLE_SPACE_ONLY))
+ CHECK_TICK
+
log_startup_progress("Loaded random space levels in [stop_watch(load_zlevels_timer)]s.")
// Now spawn ruins, random budget between 20 and 30 for all zlevels combined.
diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm
index 4ec3beb5c6ff..14ab39fdcdfc 100644
--- a/code/controllers/subsystem/processing/processing.dm
+++ b/code/controllers/subsystem/processing/processing.dm
@@ -37,8 +37,6 @@ SUBSYSTEM_DEF(processing)
if(MC_TICK_CHECK)
return
-/datum/var/isprocessing = FALSE
-
/datum/proc/process()
set waitfor = 0
return PROCESS_KILL
diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm
index d3310abcaa67..e72f61da2227 100644
--- a/code/controllers/subsystem/tickets/tickets.dm
+++ b/code/controllers/subsystem/tickets/tickets.dm
@@ -252,14 +252,14 @@ SUBSYSTEM_DEF(tickets)
C.man_up(returnClient(N))
T.lastStaffResponse = "Autoresponse: [message_key]"
resolveTicket(N)
- message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with: [message_key] ")
+ message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with: [message_key]")
log_game("[C] has auto responded to [ticket_owner]\'s adminhelp with: [response_phrases[message_key]]")
if("Mentorhelp")
convert_ticket(T)
else
SEND_SOUND(returnClient(N), sound('sound/effects/adminhelp.ogg'))
to_chat_safe(returnClient(N), "[key_name_hidden(C)] is autoresponding with: [response_phrases[message_key]]")//for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key]
- message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with: [message_key] ") //we want to use the short named keys for this instead of the full sentence which is why we just do message_key
+ message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with: [message_key]") //we want to use the short named keys for this instead of the full sentence which is why we just do message_key
T.lastStaffResponse = "Autoresponse: [message_key]"
resolveTicket(N)
log_game("[C] has auto responded to [ticket_owner]\'s adminhelp with: [response_phrases[message_key]]")
diff --git a/code/datums/action.dm b/code/datums/action.dm
index 0bdd5c4a0a36..0e6dc66076dc 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -445,7 +445,7 @@
/datum/action/item_action/instrument
name = "Use Instrument"
- desc = "Use the instrument specified"
+ desc = "Use the instrument specified."
/datum/action/item_action/instrument/Trigger(left_click)
if(istype(target, /obj/item/instrument))
@@ -551,7 +551,7 @@
/datum/action/item_action/accessory/herald
name = "Mirror Walk"
- desc = "Use near a mirror to enter it"
+ desc = "Use near a mirror to enter it."
//Preset for spells
/datum/action/spell_action
diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index d40051220839..f67b5f2ed4c9 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -14,8 +14,9 @@
var/origin_oldloc = null
var/static_beam = FALSE
var/beam_type = /obj/effect/ebeam //must be subtype
+ var/beamcolor
-/datum/beam/New(beam_origin,beam_target,beam_icon='icons/effects/beam.dmi',beam_icon_state="b_beam",time=50,maxdistance=10,btype = /obj/effect/ebeam,beam_sleep_time=3)
+/datum/beam/New(beam_origin, beam_target,beam_icon = 'icons/effects/beam.dmi', beam_icon_state = "b_beam", time = 50, maxdistance = 10, btype = /obj/effect/ebeam, beam_sleep_time = 3, beam_color)
endtime = world.time+time
origin = beam_origin
origin_oldloc = get_turf(origin)
@@ -29,6 +30,7 @@
icon = beam_icon
icon_state = beam_icon_state
beam_type = btype
+ beamcolor = beam_color
/datum/beam/proc/Start()
Draw()
@@ -77,10 +79,12 @@
//cropped by a transparent box of length-N pixel size
if(N+32>length)
var/icon/II = new(icon, icon_state)
- II.DrawBox(null,1,(length-N),32,32)
+ II.DrawBox(null, 1, (length-N), 32, 32)
X.icon = II
else
X.icon = base_icon
+ if(beamcolor)
+ X.color = beamcolor
X.transform = rot_matrix
//Calculate pixel offsets (If necessary)
@@ -163,7 +167,7 @@
var/armor = L.run_armor_check(limb_to_hit, LASER)
L.apply_damage(damage, BURN, limb_to_hit, armor)
-/atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time=3)
- var/datum/beam/newbeam = new(src,BeamTarget,icon,icon_state,time,maxdistance,beam_type,beam_sleep_time)
+/atom/proc/Beam(atom/BeamTarget, icon_state="b_beam", icon='icons/effects/beam.dmi', time = 5 SECONDS, maxdistance = 10, beam_type = /obj/effect/ebeam, beam_sleep_time = 3, beam_color)
+ var/datum/beam/newbeam = new(src, BeamTarget, icon, icon_state, time, maxdistance, beam_type, beam_sleep_time, beam_color)
INVOKE_ASYNC(newbeam, TYPE_PROC_REF(/datum/beam, Start))
return newbeam
diff --git a/code/datums/browser.dm b/code/datums/browser.dm
index 24d324d6e77f..e48861f533fd 100644
--- a/code/datums/browser.dm
+++ b/code/datums/browser.dm
@@ -1,24 +1,29 @@
/datum/browser
var/mob/user
var/title
- var/window_id // window_id is used as the window name for browse and onclose
+ /// window_id is used as the window name for browse and onclose calls
+ var/window_id
var/width = 0
var/height = 0
- var/atom/ref = null
- var/window_options = "focus=0;can_close=1;can_minimize=1;can_maximize=0;can_resize=1;titlebar=1;" // window option is set using window_id
+ /// UID of the host atom
+ var/atom_uid = null
+ /// Various options to control elements such as titlebar buttons for the window
+ var/list/window_options = list("focus=0;can_close=1;can_minimize=1;can_maximize=0;can_resize=1;titlebar=1;") // window option is set using window_id
+ /// Assoc list of stylesheets for use by the datum
var/stylesheets[0]
+ /// Assoc list of script files for use by the datum
var/scripts[0]
- var/title_image
- var/head_elements
- var/body_elements
- var/head_content = ""
- var/content = ""
- var/title_buttons = ""
+ /// Should default stylesheets be loaded
+ var/include_default_stylesheet = TRUE
+ /// Header HTML content of the browser datum
+ var/list/head_content = list()
+ /// HTML content of the browser datum
+ var/list/content = list()
-/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/nref = null)
-
+/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/atom = null)
user = nuser
+ RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(user_deleted))
window_id = nwindow_id
if(ntitle)
title = format_text(ntitle)
@@ -26,64 +31,71 @@
width = nwidth
if(nheight)
height = nheight
- if(nref)
- ref = nref
- add_stylesheet("common", 'html/browser/common.css') // this CSS sheet is common to all UIs
+ if(atom)
+ atom_uid = atom.UID()
+
+/datum/browser/proc/user_deleted(datum/source)
+ SIGNAL_HANDLER
+ user = null
/datum/browser/proc/set_title(ntitle)
- title = format_text(ntitle)
+ title = islist(ntitle) ? ntitle : list(ntitle)
/datum/browser/proc/add_head_content(nhead_content)
- head_content = nhead_content
-
-/datum/browser/proc/set_title_buttons(ntitle_buttons)
- title_buttons = ntitle_buttons
+ head_content = islist(nhead_content) ? nhead_content : list(nhead_content)
/datum/browser/proc/set_window_options(nwindow_options)
- window_options = nwindow_options
-
-/datum/browser/proc/set_title_image(ntitle_image)
- //title_image = ntitle_image
+ window_options = islist(nwindow_options) ? nwindow_options : list(nwindow_options)
/datum/browser/proc/add_stylesheet(name, file)
- stylesheets[name] = file
+ if(istype(name, /datum/asset/spritesheet))
+ var/datum/asset/spritesheet/sheet = name
+ stylesheets["spritesheet_[sheet.name].css"] = "data/spritesheets/[sheet.name]"
+ else
+ var/asset_name = "[name].css"
+
+ stylesheets[asset_name] = file
+
+ if(!SSassets.cache[asset_name])
+ SSassets.transport.register_asset(asset_name, file)
+
+/datum/browser/proc/add_scss_stylesheet(name, file)
+ var/asset_name = "[name].scss"
+ stylesheets[asset_name] = file
+
+ if(!SSassets.cache[asset_name])
+ SSassets.transport.register_asset(asset_name, file)
/datum/browser/proc/add_script(name, file)
- scripts[name] = file
+ scripts["[ckey(name)].js"] = file
+ SSassets.transport.register_asset("[ckey(name)].js", file)
/datum/browser/proc/set_content(ncontent)
- content = ncontent
+ content = islist(ncontent) ? ncontent : list(ncontent)
/datum/browser/proc/add_content(ncontent)
content += ncontent
/datum/browser/proc/get_header()
- var/key
- var/filename
- for(key in stylesheets)
- filename = "[ckey(key)].css"
- user << browse_rsc(stylesheets[key], filename)
- head_content += ""
-
- for(key in scripts)
- filename = "[ckey(key)].js"
- user << browse_rsc(scripts[key], filename)
- head_content += ""
-
- var/title_attributes = "class='uiTitle'"
- if(title_image)
- title_attributes = "class='uiTitle icon' style='background-image: url([title_image]);'"
-
- return {"
+ if(include_default_stylesheet)
+ head_content += ""
+
+ for(var/file in stylesheets)
+ head_content += ""
+
+ for(var/file in scripts)
+ head_content += ""
+
+ return {"
-
-
- [head_content]
+
+
+ [head_content.Join("")]
- [title ? "
[title]
[title_buttons]
" : ""]
+ [title ? "
[title]
" : ""]
"}
@@ -97,86 +109,60 @@
/datum/browser/proc/get_content()
return {"
[get_header()]
- [content]
+ [content.Join("")]
[get_footer()]
"}
-/datum/browser/proc/open(use_onclose = 1)
+/datum/browser/proc/open(use_onclose = TRUE)
+ if(isnull(window_id)) //null check because this can potentially nuke goonchat
+ WARNING("Browser [title] tried to open with a null ID")
+ to_chat(user, "The [title] browser you tried to open failed a sanity check! Please report this on github!")
+ return
+
var/window_size = ""
if(width && height)
window_size = "size=[width]x[height];"
- user << browse(get_content(), "window=[window_id];[window_size][window_options]")
+ if(include_default_stylesheet)
+ var/datum/asset/simple/common/common_asset = get_asset_datum(/datum/asset/simple/common)
+ common_asset.send(user)
+ if(length(stylesheets))
+ SSassets.transport.send_assets(user, stylesheets)
+ if(length(scripts))
+ SSassets.transport.send_assets(user, scripts)
+ user << browse(get_content(), "window=[window_id];[window_size][window_options.Join("")]")
if(use_onclose)
- onclose(user, window_id, ref)
+ onclose(user, window_id, atom_uid)
/datum/browser/proc/close()
- user << browse(null, "window=[window_id]")
-
-// This will allow you to show an icon in the browse window
-// This is added to mob so that it can be used without a reference to the browser object
-// There is probably a better place for this...
-/mob/proc/browse_rsc_icon(icon, icon_state, dir = -1)
- /*
- var/icon/I
- if(dir >= 0)
- I = new /icon(icon, icon_state, dir)
+ if(!isnull(window_id))//null check because this can potentially nuke goonchat
+ user << browse(null, "window=[window_id]")
else
- I = new /icon(icon, icon_state)
- dir = "default"
-
- var/filename = "[ckey("[icon]_[icon_state]_[dir]")].png"
- src << browse_rsc(I, filename)
- return filename
- */
-
-
-// Registers the on-close verb for a browse window (client/verb/.windowclose)
-// this will be called when the close-button of a window is pressed.
-//
-// This is usually only needed for devices that regularly update the browse window,
-// e.g. canisters, timers, etc.
-//
-// windowid should be the specified window name
-// e.g. code is : user << browse(text, "window=fred")
-// then use : onclose(user, "fred")
-//
-// Optionally, specify the "ref" parameter as the controlled atom (usually src)
-// to pass a "close=1" parameter to the atom's Topic() proc for special handling.
-// Otherwise, the user mob's machine var will be reset directly.
-//
-
-/proc/onclose(mob/user, windowid, atom/ref=null)
- if(!user || !user.client) return
- var/param = "null"
- if(ref)
- param = "\ref[ref]"
-
- winset(user, windowid, "on-close=\".windowclose [param]\"")
+ WARNING("Browser [title] tried to close with a null ID")
-// to_chat(world, "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]")
+/proc/onclose(mob/user, windowid, atom_uid)
+ if(!user?.client)
+ return
+ winset(user, windowid, "on-close=\".windowclose [atom_uid || "null"]\"")
// the on-close client verb
// called when a browser popup window is closed after registering with proc/onclose()
-// if a valid atom reference is supplied, call the atom's Topic() with "close=1"
+// if a valid atom uid is supplied, call the atom's Topic() with "close=1"
// otherwise, just reset the client mob's machine var.
//
-/client/verb/windowclose(atomref as text)
- set hidden = 1 // hide this verb from the user's panel
- set name = ".windowclose" // no autocomplete on cmd line
+/client/verb/windowclose(atom_uid as text)
+ set hidden = TRUE // hide this verb from the user's panel
+ set name = ".windowclose" // no autocomplete on cmd line
-// to_chat(world, "windowclose: [atomref]")
- if(atomref!="null") // if passed a real atomref
- var/hsrc = locate(atomref) // find the reffed atom
+ if(atom_uid != "null") // if passed a real atom_uid
+ var/hsrc = locateUID(atom_uid) // find the reffed atom
if(hsrc)
-// to_chat(world, "[src] Topic [href] [hsrc]")
+ var/href = "close=1"
usr = src.mob
- src.Topic("close=1", list("close"="1"), hsrc) // this will direct to the atom's
- return // Topic() proc via client.Topic()
+ src.Topic(href, params2list(href), hsrc) // this will direct to the atom's
+ return // Topic() proc via client.Topic()
- // no atomref specified (or not found)
+ // no atom_uid specified (or not found)
// so just reset the user mob's machine var
- if(src && src.mob)
-// to_chat(world, "[src] was [src.mob.machine], setting to null")
+ if(src?.mob)
src.mob.unset_machine()
- return
diff --git a/code/datums/callback.dm b/code/datums/callback.dm
index 9f2c8d0cd5fa..1179480781b4 100644
--- a/code/datums/callback.dm
+++ b/code/datums/callback.dm
@@ -22,17 +22,17 @@
global proc:
GLOBAL_PROC_REF(procname)
Example:
- CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(some_proc_here))
+ CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(some_proc_here), args)
proc defined on current(src) object:
PROC_REF(procname)
Example:
- CALLBACK(src, PROC_REF(some_proc_here))
+ CALLBACK(src, PROC_REF(some_proc_here), args)
proc defined on some other type:
TYPE_PROC_REF(some_type, procname)
Example:
- CALLBACK(other_atom, TYPE_PROC_REF(other_atom_type, procname)
+ CALLBACK(other_atom, TYPE_PROC_REF(other_atom_type, procname), args)
*/
diff --git a/code/datums/chat_payload.dm b/code/datums/chat_payload.dm
new file mode 100644
index 000000000000..fd35bbc4eecf
--- /dev/null
+++ b/code/datums/chat_payload.dm
@@ -0,0 +1,16 @@
+/// Stores information about a chat payload
+/datum/chat_payload
+ /// Sequence number of this payload
+ var/sequence = 0
+ /// Message we are sending
+ var/list/content
+ /// Resend count
+ var/resends = 0
+
+/// Converts the chat payload into a JSON string
+/datum/chat_payload/proc/into_message()
+ return "{\"sequence\":[sequence],\"content\":[json_encode(content)]}"
+
+/// Returns an HTML-encoded message from our contents.
+/datum/chat_payload/proc/get_content_as_html()
+ return message_to_html(content)
diff --git a/code/datums/components/codeword_hearing.dm b/code/datums/components/codeword_hearing.dm
new file mode 100644
index 000000000000..8e9ee833ec74
--- /dev/null
+++ b/code/datums/components/codeword_hearing.dm
@@ -0,0 +1,47 @@
+/**
+ * Component that allows for highlighting of words or phrases in chat based on regular expressions.
+ *
+ * Hooks into /mob/proc/combine_message to wrap every regex match in the message
+ * between tags with the provided span class. This modifies the output that
+ * is sent to the parent's chat window.
+ *
+ * Removal of this component should be done by calling [GetComponents(/datum/component/codeword_hearing)]
+ * on the parent and then iterating through all components calling [delete_if_from_source(source)].
+ */
+/datum/component/codeword_hearing
+ dupe_mode = COMPONENT_DUPE_ALLOWED
+
+ /// Regex for matching words or phrases you want highlighted.
+ var/regex/replace_regex
+ /// The to use for highlighting matches.
+ var/span_class
+ /// The source of this component. Used to identify the source in delete_if_from_source since this component is COMPONENT_DUPE_ALLOWED.
+ var/source
+
+/datum/component/codeword_hearing/Initialize(regex/codeword_regex, highlight_span_class, component_source)
+ if(!ismovable(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ replace_regex = codeword_regex
+ span_class = highlight_span_class
+ source = component_source
+ return ..()
+
+/datum/component/codeword_hearing/proc/handle_hearing(message)
+ var/mob/living/owner = parent
+ if(!istype(owner))
+ return
+
+ // don't skip codewords when owner speaks
+ if(!owner.can_hear())
+ return
+
+ return replace_regex.Replace(message, "$1")
+
+/// Since a parent can have multiple of these components on them simultaneously, this allows a datum to delete components from a specific source.
+/datum/component/codeword_hearing/proc/delete_if_from_source(component_source)
+ if(source == component_source)
+ qdel(src)
+ return TRUE
+
+ return FALSE
diff --git a/code/datums/components/defibrillator.dm b/code/datums/components/defibrillator.dm
index 945df4b16ed8..ff1020e5eca5 100644
--- a/code/datums/components/defibrillator.dm
+++ b/code/datums/components/defibrillator.dm
@@ -205,12 +205,12 @@
return
if(target.undergoing_cardiac_arrest()) // Can have a heart attack and heart is either missing, necrotic, or not beating
- var/obj/item/organ/internal/heart/heart = target.get_int_organ(/obj/item/organ/internal/heart)
+ var/datum/organ/heart/heart = target.get_int_organ_datum(ORGAN_DATUM_HEART)
if(!heart)
user.visible_message("[defib_ref] buzzes: Resuscitation failed - Failed to pick up any heart electrical activity.")
- else if(heart.status & ORGAN_DEAD)
+ else if(heart.linked_organ.status & ORGAN_DEAD)
user.visible_message("[defib_ref] buzzes: Resuscitation failed - Heart necrosis detected.")
- if(!heart || (heart.status & ORGAN_DEAD))
+ if(!heart || (heart.linked_organ.status & ORGAN_DEAD))
playsound(get_turf(defib_ref), 'sound/machines/defib_failed.ogg', 50, 0)
busy = FALSE
return
@@ -330,7 +330,7 @@
busy = TRUE
target.visible_message("[user] has touched [target] with [parent]!", \
"[user] touches you with [parent], and you feel a strong jolt!")
- target.adjustStaminaLoss(60)
+ target.apply_damage(60, STAMINA)
target.KnockDown(10 SECONDS)
playsound(get_turf(parent), 'sound/machines/defib_zap.ogg', 50, 1, -1)
target.emote("gasp")
@@ -345,7 +345,7 @@
if(!istype(target))
return
busy = TRUE
- target.adjustStaminaLoss(60)
+ target.apply_damage(60, STAMINA)
target.emote("gasp")
add_attack_logs(user, target, "Stunned with [parent]")
target.KnockDown(4 SECONDS)
@@ -384,8 +384,8 @@
return
if(electrocute_mob(affecting, power_source, origin)) // shock anyone touching them >:)
- var/obj/item/organ/internal/heart/HE = affecting.get_organ_slot("heart")
- if(HE.parent_organ == "chest" && affecting.has_both_hands()) // making sure the shock will go through their heart (drask hearts are in their head), and that they have both arms so the shock can cross their heart inside their chest
+ var/datum/organ/heart/heart = affecting.get_int_organ_datum(ORGAN_DATUM_HEART)
+ if(heart.linked_organ.parent_organ == "chest" && affecting.has_both_hands()) // making sure the shock will go through their heart (drask hearts are in their head), and that they have both arms so the shock can cross their heart inside their chest
affecting.visible_message("[affecting]'s entire body shakes as a shock travels up [affecting.p_their()] arm!", \
"You feel a powerful shock travel up your [affecting.hand ? affecting.get_organ("l_arm") : affecting.get_organ("r_arm")] and back down your [affecting.hand ? affecting.get_organ("r_arm") : affecting.get_organ("l_arm")]!")
affecting.set_heartattack(TRUE)
diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index 82df42a0a820..42d9731dbc0d 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -93,7 +93,7 @@
if(istype(I, /obj/item/stack) && precise_insertion)
var/atom/current_parent = parent
var/obj/item/stack/S = I
- requested_amount = input(user, "How much do you want to insert?", "Inserting [S.singular_name]s") as num|null
+ requested_amount = tgui_input_number(user, "How much do you want to insert?", "Inserting [S.singular_name]s", max_value = S.amount)
if(isnull(requested_amount) || (requested_amount <= 0))
return
if(QDELETED(I) || QDELETED(user) || QDELETED(src) || parent != current_parent || user.incapacitated() || !in_range(current_parent, user) || user.l_hand != I && user.r_hand != I)
diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm
index e9c36989d878..50ff05d4af1b 100644
--- a/code/datums/components/orbiter.dm
+++ b/code/datums/components/orbiter.dm
@@ -376,9 +376,6 @@
// Atom procs/vars
///////////////////////////////////
-/// UID for the atom which the current atom is orbiting
-/atom/movable/var/orbiting_uid = null
-
/**
* Set an atom to orbit around another one. This atom will follow the base atom's movement and rotate around it.
*
diff --git a/code/datums/components/shielded.dm b/code/datums/components/shielded.dm
new file mode 100644
index 000000000000..effad26c8fec
--- /dev/null
+++ b/code/datums/components/shielded.dm
@@ -0,0 +1,191 @@
+/**
+ * The shielded component causes the parent item to nullify a certain number of attacks against the wearer, see: shielded vests.
+ */
+
+/datum/component/shielded
+ /// The person currently wearing us
+ var/mob/living/wearer
+ /// How many charges we can have max, and how many we start with
+ var/max_charges
+ /// How many charges we currently have
+ var/current_charges
+ /// How long we have to avoid being hit to replenish charges. If set to 0, we never recharge lost charges
+ var/recharge_start_delay = 20 SECONDS
+ /// Once we go unhit long enough to recharge, we replenish charges this often. The floor is effectively 1 second, AKA how often SSdcs processes
+ var/charge_increment_delay = 1 SECONDS
+ /// How many charges we recover on each charge increment
+ var/charge_recovery = 1
+ /// What .dmi we're pulling the shield icon from
+ var/shield_icon_file = 'icons/effects/effects.dmi'
+ /// What icon is used when someone has a functional shield up
+ var/shield_icon = "shield-old"
+ /// Do we still shield if we're being held in-hand? If FALSE, it needs to be equipped to a slot to work
+ var/shield_inhand = FALSE
+ /// Should the shield lose charges equal to the damage dealt by a hit?
+ var/lose_multiple_charges = FALSE
+ /// Should the shield's alpha change to show its remaining charge
+ var/show_charge_as_alpha = FALSE
+ /// The item we use for recharging
+ var/recharge_path
+ /// The cooldown tracking when we were last hit
+ COOLDOWN_DECLARE(recently_hit_cd)
+ /// The cooldown tracking when we last replenished a charge
+ COOLDOWN_DECLARE(charge_add_cd)
+ /// A callback for the sparks/message that play when a charge is used, see [/datum/component/shielded/proc/default_run_hit_callback]
+ var/datum/callback/on_hit_effects
+ ///The visual effect
+ var/mutable_appearance/shield
+
+/datum/component/shielded/Initialize(max_charges = 3, recharge_start_delay = 20 SECONDS, charge_increment_delay = 1 SECONDS, charge_recovery = 1, lose_multiple_charges = FALSE, show_charge_as_alpha = FALSE, recharge_path = null, starting_charges = null, shield_icon_file = 'icons/effects/effects.dmi', shield_icon = "shield-old", shield_inhand = FALSE, run_hit_callback)
+ if(!isitem(parent) || max_charges <= 0)
+ return COMPONENT_INCOMPATIBLE
+
+ src.max_charges = max_charges
+ src.recharge_start_delay = recharge_start_delay
+ src.charge_increment_delay = charge_increment_delay
+ src.charge_recovery = charge_recovery
+ src.lose_multiple_charges = lose_multiple_charges
+ src.show_charge_as_alpha = show_charge_as_alpha
+ src.recharge_path = recharge_path
+ src.shield_icon_file = shield_icon_file
+ src.shield_icon = shield_icon
+ src.shield_inhand = shield_inhand
+ src.on_hit_effects = run_hit_callback || CALLBACK(src, PROC_REF(default_run_hit_callback))
+ if(isnull(starting_charges))
+ current_charges = max_charges
+ else
+ current_charges = starting_charges
+ if(recharge_start_delay)
+ START_PROCESSING(SSdcs, src)
+
+/datum/component/shielded/Destroy(force, silent)
+ if(wearer)
+ shield_icon = "broken"
+ UnregisterSignal(wearer, COMSIG_ATOM_UPDATE_OVERLAYS)
+ wearer.update_appearance(UPDATE_ICON)
+ wearer = null
+ on_hit_effects = null
+ return ..()
+
+/datum/component/shielded/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(lost_wearer))
+ RegisterSignal(parent, COMSIG_ITEM_HIT_REACT, PROC_REF(on_hit_react))
+ var/atom/shield = parent
+ if(ismob(shield.loc))
+ var/mob/holder = shield.loc
+ if(holder.is_holding(parent) && !shield_inhand)
+ return
+ set_wearer(holder)
+
+/datum/component/shielded/UnregisterFromParent()
+ UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_ITEM_HIT_REACT))
+ var/atom/shield = parent
+ if(shield.loc == wearer)
+ lost_wearer(src, wearer)
+
+// Handle recharging, if we want to
+/datum/component/shielded/process(seconds_per_tick)
+ if(current_charges >= max_charges)
+ STOP_PROCESSING(SSdcs, src)
+ return
+
+ if(!COOLDOWN_FINISHED(src, recently_hit_cd))
+ return
+ if(!COOLDOWN_FINISHED(src, charge_add_cd))
+ return
+
+ var/obj/item/item_parent = parent
+ COOLDOWN_START(src, charge_add_cd, charge_increment_delay)
+ adjust_charge(charge_recovery) // set the number of charges to current + recovery per increment, clamped from zero to max_charges
+ playsound(item_parent, 'sound/magic/charge.ogg', 50, TRUE)
+ if(current_charges == max_charges)
+ playsound(item_parent, 'sound/machines/ding.ogg', 50, TRUE)
+
+/datum/component/shielded/proc/adjust_charge(change)
+ current_charges = clamp(current_charges + change, 0, max_charges)
+ if(wearer)
+ wearer.update_appearance(UPDATE_ICON)
+
+/// Check if we've been equipped to a valid slot to shield
+/datum/component/shielded/proc/on_equipped(datum/source, mob/user, slot)
+ SIGNAL_HANDLER
+
+ if((slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND) && !shield_inhand)
+ lost_wearer(source, user)
+ return
+ set_wearer(user)
+
+/// Either we've been dropped or our wearer has been QDEL'd. Either way, they're no longer our problem
+/datum/component/shielded/proc/lost_wearer(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ if(wearer)
+ UnregisterSignal(wearer, list(COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_PARENT_QDELETING))
+ wearer.cut_overlay(shield)
+ wearer.update_appearance(UPDATE_ICON)
+ wearer = null
+
+/datum/component/shielded/proc/set_wearer(mob/user)
+ wearer = user
+ RegisterSignal(wearer, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays))
+ RegisterSignal(wearer, COMSIG_PARENT_QDELETING, PROC_REF(lost_wearer))
+ if(current_charges)
+ wearer.update_appearance(UPDATE_ICON)
+
+/// Used to draw the shield overlay on the wearer
+/datum/component/shielded/proc/on_update_overlays(atom/parent_atom)
+ SIGNAL_HANDLER
+ wearer.cut_overlay(shield)
+ var/mutable_appearance/shield_appearance = mutable_appearance(shield_icon_file, (current_charges > 0 ? shield_icon : "broken"), MOB_LAYER + 0.01)
+ if(show_charge_as_alpha)
+ shield_appearance.alpha = (current_charges/max_charges)*255
+ wearer.add_overlay(shield_appearance)
+ shield = shield_appearance
+
+/**
+ * This proc fires when we're hit, and is responsible for checking if we're charged, then deducting one + returning that we're blocking if so.
+ * It then runs the callback in [/datum/component/shielded/var/on_hit_effects] which handles the messages/sparks (so the visuals)
+ */
+/datum/component/shielded/proc/on_hit_react(datum/source, mob/living/carbon/human/owner, atom/movable/hitby, damage, attack_type)
+ SIGNAL_HANDLER
+
+ COOLDOWN_START(src, recently_hit_cd, recharge_start_delay)
+
+ if(current_charges <= 0)
+ return
+ . = COMPONENT_BLOCK_SUCCESSFUL
+
+ var/charge_loss = 1 // how many charges do we lose
+
+ if(istype(hitby, /obj/item/projectile))
+ var/obj/item/projectile/P = hitby
+ if(P.shield_buster)
+ charge_loss = 3
+ if(lose_multiple_charges)
+ charge_loss = damage //Double dip if health based instead
+
+ if(lose_multiple_charges) // if the shield has health like damage we'll lose charges equal to the damage of the hit
+ charge_loss += damage
+
+ adjust_charge(-charge_loss)
+ wearer.update_appearance(UPDATE_ICON)
+
+ INVOKE_ASYNC(src, PROC_REF(actually_run_hit_callback), owner, hitby, current_charges)
+
+ if(!recharge_start_delay) // if recharge_start_delay is 0, we don't recharge
+ return
+
+ START_PROCESSING(SSdcs, src) // if we DO recharge, start processing so we can do that
+
+/// The wrapper to invoke the on_hit callback, so we don't have to worry about blocking in the signal handler
+/datum/component/shielded/proc/actually_run_hit_callback(mob/living/owner, attack_text, current_charges)
+ on_hit_effects.Invoke(owner, attack_text, current_charges)
+
+/// Default on_hit proc, since cult robes are stupid and have different descriptions/sparks
+/datum/component/shielded/proc/default_run_hit_callback(mob/living/owner, attack_text, current_charges)
+ do_sparks(2, TRUE, owner)
+ owner.visible_message("[owner]'s shields deflect [attack_text] in a shower of sparks!")
+ if(current_charges <= 0)
+ owner.visible_message("[owner]'s shield overloads!")
+
diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm
index b056bdcac71e..99f7ba058116 100644
--- a/code/datums/components/spooky.dm
+++ b/code/datums/components/spooky.dm
@@ -8,7 +8,7 @@
if(ishuman(user)) //this weapon wasn't meant for mortals.
var/mob/living/carbon/human/U = user
if(!istype(U.dna.species, /datum/species/skeleton))
- U.adjustStaminaLoss(35) //Extra Damage
+ U.apply_damage(35, STAMINA) //Extra Damage
U.Jitter(70 SECONDS)
U.SetStuttering(40 SECONDS)
if(U.getStaminaLoss() > 95)
@@ -23,7 +23,7 @@
C.Jitter(70 SECONDS)
C.SetStuttering(40 SECONDS)
if(!istype(H.dna.species, /datum/species/diona) && !istype(H.dna.species, /datum/species/machine) && !istype(H.dna.species, /datum/species/slime) && !istype(H.dna.species, /datum/species/golem) && !istype(H.dna.species, /datum/species/plasmaman))
- C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
+ C.apply_damage(25, STAMINA) //boneless humanoids don't lose the will to live
to_chat(C, "DOOT")
spectral_change(H)
@@ -51,7 +51,7 @@
change_name(H) //time for a new name!
/datum/component/spooky/proc/change_name(mob/living/carbon/human/H)
- var/t = stripped_input(H, "Enter your new skeleton name", H.real_name, null, MAX_NAME_LEN)
+ var/t = tgui_input_text(H, "Enter your new skeleton name", H.real_name, max_length = MAX_NAME_LEN)
if(!t)
t = "spooky skeleton"
H.real_name = t
diff --git a/code/datums/components/sticky.dm b/code/datums/components/sticky.dm
index 49f6723ac622..7c36f3207953 100644
--- a/code/datums/components/sticky.dm
+++ b/code/datums/components/sticky.dm
@@ -24,9 +24,11 @@
/datum/component/sticky/RegisterWithParent()
RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(stick_to_it))
+ RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(stick_to_it_throwing))
/datum/component/sticky/UnregisterFromParent()
UnregisterSignal(parent, COMSIG_ITEM_PRE_ATTACK)
+ UnregisterSignal(parent, COMSIG_MOVABLE_IMPACT)
/datum/component/sticky/proc/stick_to_it(obj/item/I, atom/target, mob/user, params)
SIGNAL_HANDLER
@@ -58,8 +60,23 @@
overlay.Shift(EAST, clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2))
overlay.Shift(NORTH, clamp(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2))
+ attach_signals(I)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/datum/component/sticky/proc/stick_to_it_throwing(obj/item/thrown_item, atom/hit_target, throwingdatum, params)
+ SIGNAL_HANDLER
+ if(hit_target.GetComponent(/datum/component/sticky))
+ return
+
+ attached_to = hit_target
+ move_to_the_thing(parent)
+
+ overlay = icon(thrown_item.icon, thrown_item.icon_state)
+ attach_signals(thrown_item)
+
+/datum/component/sticky/proc/attach_signals(obj/item/attached)
attached_to.add_overlay(overlay, priority = TRUE)
- I.invisibility = INVISIBILITY_ABSTRACT
+ attached.invisibility = INVISIBILITY_ABSTRACT
RegisterSignal(attached_to, COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY, PROC_REF(pick_up))
RegisterSignal(attached_to, COMSIG_PARENT_EXAMINE, PROC_REF(add_sticky_text))
@@ -67,7 +84,6 @@
if(ismovable(attached_to))
RegisterSignal(attached_to, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
START_PROCESSING(SSobj, src)
- return COMPONENT_CANCEL_ATTACK_CHAIN
/datum/component/sticky/proc/pick_up(atom/A, mob/living/carbon/human/user)
SIGNAL_HANDLER
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 582366258b0d..ac79cfb2597b 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -128,7 +128,7 @@ GLOBAL_LIST_EMPTY(PDA_Manifest)
is_custom_job = FALSE
break
- if(is_custom_job)
+ if(is_custom_job && foundrecord)
real_title = foundrecord.fields["real_rank"]
if(foundrecord)
@@ -166,9 +166,17 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
G.fields["m_stat"] = "Stable"
G.fields["sex"] = capitalize(H.gender)
G.fields["species"] = H.dna.species.name
- G.fields["photo"] = get_id_photo(H)
- G.fields["photo-south"] = "data:image/png;base64,[icon2base64(icon(G.fields["photo"], dir = SOUTH))]"
- G.fields["photo-west"] = "data:image/png;base64,[icon2base64(icon(G.fields["photo"], dir = WEST))]"
+ // Do some ID card checking stuff here to save on resources
+ var/card_photo
+ if(istype(H.wear_id, /obj/item/card/id))
+ var/obj/item/card/id/IDC = H.wear_id
+ card_photo = IDC.photo
+ else
+ card_photo = get_id_photo(H)
+
+ G.fields["photo"] = card_photo
+ G.fields["photo-south"] = "data:image/png;base64,[icon2base64(icon(card_photo, dir = SOUTH))]"
+ G.fields["photo-west"] = "data:image/png;base64,[icon2base64(icon(card_photo, dir = WEST))]"
if(H.gen_record && !jobban_isbanned(H, ROLEBAN_RECORDS))
G.fields["notes"] = H.gen_record
else
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index 82b8bd2e2303..cf1715b7a878 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -9,6 +9,9 @@
var/var_edited = FALSE //Warranty void if seal is broken
var/tmp/unique_datum_id = null
+ /// Used by SSprocessing
+ var/isprocessing = FALSE
+
/**
* A cached version of our \ref
* The brunt of \ref costs are in creating entries in the string tree (a tree of immutable strings)
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 796072c95465..4cdee93d0ba6 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -22,7 +22,7 @@
/client/can_vv_get(var_name)
var/static/list/protected_vars = list(
- "address", "chatOutput", "computer_id", "connection", "jbh", "pm_tracker", "related_accounts_cid", "related_accounts_ip", "watchlisted"
+ "address", "computer_id", "connection", "jbh", "pm_tracker", "related_accounts_cid", "related_accounts_ip", "watchlisted"
)
if(!check_rights(R_ADMIN, FALSE, usr) && (var_name in protected_vars))
return FALSE
diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm
index 0ff5231ae302..91873cf56a6b 100644
--- a/code/datums/diseases/_MobProcs.dm
+++ b/code/datums/diseases/_MobProcs.dm
@@ -2,9 +2,9 @@
/mob/proc/HasDisease(datum/disease/D)
for(var/thing in viruses)
var/datum/disease/DD = thing
- if(D.IsSame(DD))
- return 1
- return 0
+ if(DD.IsSame(D))
+ return TRUE
+ return FALSE
/mob/proc/CanContractDisease(datum/disease/D)
@@ -153,9 +153,14 @@
if(HAS_TRAIT(src, TRAIT_VIRUSIMMUNE) && !D.bypasses_immunity)
return FALSE
- for(var/thing in D.required_organs)
- if(!((locate(thing) in bodyparts) || (locate(thing) in internal_organs)))
- return FALSE
+ for(var/organ in D.required_organs)
+ if(istext(organ) && get_int_organ_datum(organ))
+ continue
+ if(locate(organ) in internal_organs)
+ continue
+ if(locate(organ) in bodyparts)
+ continue
+ return FALSE
return ..()
/mob/living/carbon/human/monkey/CanContractDisease(datum/disease/D)
diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm
index 404a45324e2f..6d19e603ca92 100644
--- a/code/datums/diseases/_disease.dm
+++ b/code/datums/diseases/_disease.dm
@@ -158,10 +158,9 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
qdel(src)
/datum/disease/proc/IsSame(datum/disease/D)
- if(istype(src, D.type))
- return 1
- return 0
-
+ if(ispath(D))
+ return istype(src, D)
+ return istype(src, D.type)
/datum/disease/proc/Copy()
var/datum/disease/D = new type()
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 6e445daffc3f..08c6509defe6 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -86,13 +86,16 @@ GLOBAL_LIST_INIT(advance_cures, list(
// Compares type then ID.
/datum/disease/advance/IsSame(datum/disease/advance/D)
+ if(ispath(D))
+ return FALSE
- if(!(istype(D, /datum/disease/advance)))
- return 0
+ if(!istype(D, /datum/disease/advance))
+ return FALSE
if(GetDiseaseID() != D.GetDiseaseID())
- return 0
- return 1
+ return FALSE
+
+ return TRUE
// To add special resistances.
/datum/disease/advance/cure(resistance=1)
diff --git a/code/datums/diseases/critical.dm b/code/datums/diseases/critical.dm
index ac83c8f15de6..1807c8a86e3e 100644
--- a/code/datums/diseases/critical.dm
+++ b/code/datums/diseases/critical.dm
@@ -87,7 +87,10 @@
cure_chance = 10
stage_prob = 5
severity = HARMFUL
- required_organs = list(/obj/item/organ/internal/heart)
+ disease_flags = CURABLE
+ required_organs = list(ORGAN_DATUM_HEART)
+ bypasses_immunity = TRUE
+ virus_heal_resistant = TRUE
/datum/disease/critical/heart_failure/stage_act()
if(..())
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index 0a23b014a59a..8ade68def32f 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -71,6 +71,8 @@
affected_mob.mind.transfer_to(new_mob)
else
new_mob.key = affected_mob.key
+ if(isrobot(new_mob))
+ new_mob.rename_self("Cyborg", TRUE, TRUE)
qdel(affected_mob)
diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm
index 83cf7609bf1c..e8f6bb317b5d 100644
--- a/code/datums/diseases/tuberculosis.dm
+++ b/code/datums/diseases/tuberculosis.dm
@@ -9,9 +9,9 @@
viable_mobtypes = list(/mob/living/carbon/human)
cure_chance = 5 // Like hell are you getting out of hell
desc = "A rare highly transmittable virulent virus. Few samples exist, rumoured to be carefully grown and cultured by clandestine bio-weapon specialists. Causes fever, blood vomiting, lung damage, weight loss, and fatigue."
- required_organs = list(/obj/item/organ/internal/lungs)
+ required_organs = list(ORGAN_DATUM_LUNGS)
severity = HARMFUL
- bypasses_immunity = TRUE // Fungal and bacterial in nature; also infects the lungs
+ bypasses_immunity = TRUE //Fungal and bacterial in nature; also infects the lungs
/datum/disease/tuberculosis/stage_act()
if(!..())
diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm
index 1cfaf3d24bf4..64ae1fcc5bb1 100644
--- a/code/datums/dog_fashion.dm
+++ b/code/datums/dog_fashion.dm
@@ -177,7 +177,7 @@
/datum/dog_fashion/head/sombrero
name = "Segnor REAL_NAME"
- desc = "You must respect Elder Dogname"
+ desc = "You must respect Elder Dogname."
/datum/dog_fashion/head/sombrero/New(mob/M)
..()
@@ -211,7 +211,7 @@
/datum/dog_fashion/head/cone
name = "REAL_NAME"
- desc = "Omnicone's Chosen Champion"
+ desc = "Omnicone's Chosen Champion."
/datum/dog_fashion/back/hardsuit
name = "Space Explorer REAL_NAME"
diff --git a/code/datums/emote.dm b/code/datums/emote.dm
index 1cb1668e1182..42304b2f8795 100644
--- a/code/datums/emote.dm
+++ b/code/datums/emote.dm
@@ -531,7 +531,7 @@
return FALSE
if(!check_rights(R_ADMIN, FALSE, user))
if(!GLOB.dsay_enabled)
- to_chat(user, "Deadchat is globally muted")
+ to_chat(user, "Deadchat is globally muted.")
return FALSE
/**
diff --git a/code/datums/keybindings/admin_keybinds.dm b/code/datums/keybindings/admin_keybinds.dm
index 19cb750a2d71..f2f9675f2aa4 100644
--- a/code/datums/keybindings/admin_keybinds.dm
+++ b/code/datums/keybindings/admin_keybinds.dm
@@ -20,22 +20,6 @@
return
SSdebugview.start_processing(C)
-/datum/keybinding/admin/msay
- name = "Msay"
- keys = list("F4")
-
-/datum/keybinding/admin/msay/down(client/C)
- . = ..()
- C.get_mentor_say()
-
-/datum/keybinding/admin/asay
- name = "Asay"
- keys = list("F5")
-
-/datum/keybinding/admin/asay/down(client/C)
- . = ..()
- C.get_admin_say()
-
/datum/keybinding/admin/aghost
name = "Aghost"
keys = list("F6")
@@ -68,11 +52,3 @@
/datum/keybinding/admin/invisimin/down(client/C)
. = ..()
C.invisimin()
-
-/datum/keybinding/admin/dsay
- name = "Dsay"
- keys = list("F10")
-
-/datum/keybinding/admin/dsay/down(client/C)
- . = ..()
- C.get_dead_say()
diff --git a/code/datums/keybindings/click_keybindings.dm b/code/datums/keybindings/click_keybindings.dm
new file mode 100644
index 000000000000..45835029acd5
--- /dev/null
+++ b/code/datums/keybindings/click_keybindings.dm
@@ -0,0 +1,77 @@
+/datum/keybinding/clickbind
+ category = KB_CATEGORY_CLICK
+
+/datum/keybinding/clickbind/can_use(client/C, mob/M)
+ return istype(M) && M.can_use_clickbinds() && ..()
+
+/datum/keybinding/clickbind/down(client/C)
+ ..()
+ if(C.mob.next_click > world.time)
+ return
+ C.mob.changeNext_click(1)
+ return locateUID(C.moused_over)
+
+/datum/keybinding/clickbind/alt_click
+ name = "Alt-Click"
+
+/datum/keybinding/clickbind/alt_click/down(client/C)
+ . = ..()
+ if(.)
+ C.mob.AltClickOn(.)
+
+/datum/keybinding/clickbind/ctrl_click
+ name = "Ctrl-Click"
+
+/datum/keybinding/clickbind/ctrl_click/down(client/C)
+ . = ..()
+ if(.)
+ C.mob.CtrlClickOn(.)
+
+/datum/keybinding/clickbind/shift_click
+ name = "Shift-Click"
+
+/datum/keybinding/clickbind/shift_click/down(client/C)
+ . = ..()
+ if(.)
+ C.mob.ShiftClickOn(.)
+
+/datum/keybinding/clickbind/middle_click
+ name = "Middle-Click"
+
+/datum/keybinding/clickbind/middle_click/down(client/C)
+ . = ..()
+ if(.)
+ C.mob.MiddleClickOn(.)
+
+/datum/keybinding/clickbind/alt_shift_click
+ name = "Alt-Shift-Click"
+
+/datum/keybinding/clickbind/alt_shift_click/down(client/C)
+ . = ..()
+ if(.)
+ C.mob.AltShiftClickOn(.)
+
+/datum/keybinding/clickbind/ctrl_shift_click
+ name = "Ctrl-Shift-Click"
+
+/datum/keybinding/clickbind/ctrl_shift_click/down(client/C)
+ . = ..()
+ if(.)
+ C.mob.CtrlShiftClickOn(.)
+
+/datum/keybinding/clickbind/middle_shift_click
+ name = "Middle-Shift-Click"
+
+/datum/keybinding/clickbind/middle_shift_click/down(client/C)
+ . = ..()
+ if(.)
+ C.mob.MiddleShiftClickOn(.)
+
+/datum/keybinding/clickbind/middle_shift_ctrl_click
+ name = "Middle-Shift-Ctrl-Click"
+
+/datum/keybinding/clickbind/middle_shift_ctrl_click/down(client/C)
+ . = ..()
+ if(.)
+ C.mob.MiddleShiftControlClickOn(.)
+
diff --git a/code/datums/keybindings/client.dm b/code/datums/keybindings/client.dm
index b9f6cc79a62b..23a89404931d 100644
--- a/code/datums/keybindings/client.dm
+++ b/code/datums/keybindings/client.dm
@@ -9,38 +9,6 @@
. = ..()
C.adminhelp()
-/datum/keybinding/client/ooc
- name = "OOC"
- keys = list("O")
-
-/datum/keybinding/client/ooc/down(client/C)
- . = ..()
- C.ooc()
-
-/datum/keybinding/client/looc
- name = "Local OOC"
- keys = list("L")
-
-/datum/keybinding/client/looc/down(client/C)
- . = ..()
- C.looc()
-
-/datum/keybinding/client/say
- name = "Say"
- keys = list("T")
-
-/datum/keybinding/client/say/down(client/C)
- . = ..()
- C.mob.say_wrapper()
-
-/datum/keybinding/client/me
- name = "Me"
- keys = list("M")
-
-/datum/keybinding/client/me/down(client/C)
- . = ..()
- C.mob.me_wrapper()
-
/datum/keybinding/client/toggle_min_hud
name = "Toggle Minimal HUD"
keys = list("F12")
diff --git a/code/datums/keybindings/communication_keybinds.dm b/code/datums/keybindings/communication_keybinds.dm
new file mode 100644
index 000000000000..b3ddd289fda4
--- /dev/null
+++ b/code/datums/keybindings/communication_keybinds.dm
@@ -0,0 +1,74 @@
+/datum/keybinding/client/communication
+ category = KB_CATEGORY_COMMUNICATION
+ /// Used to store special rights if required by a keybind, such as R_ADMIN
+ var/required_rights
+ /// Used to map muted categories to channels
+ var/mute_category = MUTE_OOC
+
+/datum/keybinding/client/communication/down(client/C)
+ . = ..()
+ if(required_rights && !check_rights(required_rights, FALSE, C.mob))
+ return
+
+ if(mute_category && check_mute(C.ckey, mute_category))
+ to_chat(C, "You cannot use [name] (muted).", MESSAGE_TYPE_WARNING)
+ return
+
+ winset(C, null, "command=[C.tgui_say_create_open_command(name)]")
+
+/datum/keybinding/client/communication/ooc
+ name = OOC_CHANNEL
+ keys = list("O")
+
+/datum/keybinding/client/communication/ooc/down(client/C)
+ if(check_rights(R_ADMIN, FALSE, C.mob)) // You may pass
+ return ..()
+
+ if(!GLOB.ooc_enabled)
+ to_chat(C, "OOC is globally muted.", MESSAGE_TYPE_WARNING)
+ return
+
+ if(!GLOB.dooc_enabled && C.mob.stat == DEAD)
+ to_chat(C, "OOC for dead mobs has been turned off.", MESSAGE_TYPE_WARNING)
+ return
+
+ return ..()
+
+/datum/keybinding/client/communication/looc
+ name = LOOC_CHANNEL
+ keys = list("L")
+
+/datum/keybinding/client/communication/say
+ name = SAY_CHANNEL
+ keys = list("T")
+ mute_category = MUTE_IC
+
+/datum/keybinding/client/communication/me
+ name = ME_CHANNEL
+ keys = list("M")
+ mute_category = MUTE_EMOTE
+
+/datum/keybinding/client/communication/whisper
+ name = WHISPER_CHANNEL
+ keys = list("U")
+ mute_category = MUTE_IC
+
+/datum/keybinding/client/communication/radio
+ name = RADIO_CHANNEL
+ keys = list("Y")
+ mute_category = MUTE_IC
+
+/datum/keybinding/client/communication/msay
+ name = MENTOR_CHANNEL
+ keys = list("F4")
+ required_rights = R_MENTOR | R_ADMIN
+
+/datum/keybinding/client/communication/asay
+ name = ADMIN_CHANNEL
+ keys = list("F5")
+ required_rights = R_ADMIN
+
+/datum/keybinding/client/communication/dsay
+ name = DSAY_CHANNEL
+ keys = list("F10")
+ required_rights = R_ADMIN
diff --git a/code/datums/keybindings/living_keybinds.dm b/code/datums/keybindings/living_keybinds.dm
index 4dfb11f1073b..47f59550ba45 100644
--- a/code/datums/keybindings/living_keybinds.dm
+++ b/code/datums/keybindings/living_keybinds.dm
@@ -21,17 +21,3 @@
. = ..()
var/mob/living/M = C.mob
M.resist()
-
-/datum/keybinding/living/whisper
- name = "Whisper"
- keys = list("U")
-
-/datum/keybinding/living/whisper/down(client/C)
- var/mob/M = C.mob
- M.set_typing_indicator(TRUE)
- M.hud_typing = 1
- var/message = typing_input(M, "", "Whisper (text)")
- M.hud_typing = 0
- M.set_typing_indicator(FALSE)
- if(message)
- M.whisper(message)
diff --git a/code/datums/log_viewer.dm b/code/datums/log_viewer.dm
index 9433683a5ec6..33d6f3a92ece 100644
--- a/code/datums/log_viewer.dm
+++ b/code/datums/log_viewer.dm
@@ -251,13 +251,13 @@ if(!result || result.ckey != __ckey){\
return
if(href_list["add_mob"])
var/list/mobs = getpois(TRUE, TRUE)
- var/datum/async_input/A = input_autocomplete_async(usr, "Please, select a mob: ", mobs)
- A.on_close(CALLBACK(src, PROC_REF(add_mob), usr))
+ var/mob_choice = tgui_input_list(usr, "Please, select a mob: ", "Mob selector", mobs)
+ add_mob(usr, mobs[mob_choice])
return
if(href_list["add_ckey"])
var/list/ckeys = GLOB.logging.get_ckeys_logged()
- var/datum/async_input/A = input_autocomplete_async(usr, "Please, select a ckey: ", ckeys)
- A.on_close(CALLBACK(src, PROC_REF(add_ckey), usr))
+ var/ckey_choice = tgui_input_list(usr, "Please, select a ckey: ", "Ckey selector", ckeys)
+ add_ckey(usr, ckey_choice)
return
if(href_list["remove_mob"])
var/mob/M = locate(href_list["remove_mob"])
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 1d4eb334251b..2a0af53911a4 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -1424,7 +1424,7 @@
return
var/mob/living/carbon/human/H = current
- var/gear = alert("Agent or Scientist Gear","Gear","Agent","Scientist")
+ var/gear = alert("Agent or Scientist Gear", "Gear", "Agent", "Scientist")
if(gear)
if(gear=="Agent")
H.equipOutfit(/datum/outfit/abductor/agent)
@@ -1657,9 +1657,9 @@
SSticker.mode.update_wiz_icons_added(src)
/datum/mind/proc/make_Abductor()
- var/role = alert("Abductor Role ?","Role","Agent","Scientist")
- var/team = input("Abductor Team ?","Team ?") in list(1,2,3,4)
- var/teleport = alert("Teleport to ship ?","Teleport","Yes","No")
+ var/role = alert("Abductor Role?", "Role", "Agent", "Scientist")
+ var/team = input("Abductor Team?", "Team?") in list(1,2,3,4)
+ var/teleport = alert("Teleport to ship?", "Teleport", "Yes", "No")
if(!role || !team || !teleport)
return
@@ -1724,6 +1724,9 @@
/datum/mind/proc/transfer_mindbound_actions(mob/living/new_character)
for(var/X in spell_list)
var/obj/effect/proc_holder/spell/S = X
+ if(!S.on_mind_transfer(new_character))
+ current.RemoveSpell(S)
+ continue
S.action.Grant(new_character)
/datum/mind/proc/get_ghost(even_if_they_cant_reenter)
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index 8136bf81c680..c64099993e3c 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -50,7 +50,7 @@
/obj/item/storage/box/engineer = 1,
/obj/item/flashlight = 1,
/obj/item/card/emag = 1,
- /obj/item/reagent_containers/food/snacks/syndidonkpocket = 1
+ /obj/item/food/snacks/syndidonkpocket = 1
)
var/id_icon = "syndie"
@@ -103,7 +103,7 @@
/obj/item/ammo_box/magazine/m10mm = 1,
/obj/item/crowbar/red = 1,
/obj/item/grenade/plastic/c4 = 1,
- /obj/item/reagent_containers/food/snacks/syndidonkpocket = 1,
+ /obj/item/food/snacks/syndidonkpocket = 1,
/obj/item/flashlight = 1,
/obj/item/clothing/shoes/combat = 1
)
@@ -381,13 +381,13 @@
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/thermal/monocle
id = /obj/item/card/id
- l_pocket = /obj/item/reagent_containers/food/snacks/grown/banana
+ l_pocket = /obj/item/food/snacks/grown/banana
r_pocket = /obj/item/bikehorn
r_hand = /obj/item/fireaxe
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/flashlight = 1,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana = 1,
+ /obj/item/reagent_containers/drinks/bottle/bottleofbanana = 1,
/obj/item/grenade/clown_grenade = 1,
/obj/item/melee/baton/cattleprod = 1,
/obj/item/stock_parts/cell/super = 1,
@@ -420,14 +420,14 @@
pda = /obj/item/pda/mime
backpack_contents = list(
/obj/item/storage/box/survival = 1,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 1,
+ /obj/item/reagent_containers/drinks/bottle/bottleofnothing = 1,
/obj/item/toy/crayon/mime = 1,
/obj/item/gun/projectile/automatic/pistol = 1,
/obj/item/ammo_box/magazine/m10mm = 1,
/obj/item/suppressor = 1,
/obj/item/card/emag = 1,
/obj/item/radio/uplink = 1,
- /obj/item/reagent_containers/food/snacks/syndidonkpocket = 1,
+ /obj/item/food/snacks/syndidonkpocket = 1,
/obj/item/flashlight = 1
)
@@ -956,7 +956,7 @@
/datum/outfit/admin/modsuit/wizard // Technically not a MODsuit, we'll bundle it up in here for the future when it does become one
name = "Hardsuit - Wizard"
- suit = /obj/item/clothing/suit/space/hardsuit/shielded/wizard
+ suit = /obj/item/clothing/suit/space/hardsuit/wizard
shoes = /obj/item/clothing/shoes/magboots/wizard
/datum/outfit/admin/modsuit/medical
@@ -1240,7 +1240,7 @@
l_hand = null
backpack_contents = list(
/obj/item/storage/box/engineer = 1,
- /obj/item/clothing/suit/space/hardsuit/shielded/wizard/arch = 1,
+ /obj/item/clothing/suit/space/hardsuit/wizard/arch = 1,
/obj/item/clothing/shoes/magboots = 1,
/obj/item/kitchen/knife/ritual = 1,
/obj/item/clothing/suit/wizrobe/red = 1,
@@ -1311,7 +1311,7 @@
/obj/item/stamp/clown = 1,
/obj/item/toy/crayon/rainbow = 1,
/obj/item/reagent_containers/spray/waterflower = 1,
- /obj/item/reagent_containers/food/snacks/grown/banana = 1,
+ /obj/item/food/snacks/grown/banana = 1,
)
shoes = /obj/item/clothing/shoes/clown_shoes
diff --git a/code/datums/outfits/outfit_debug.dm b/code/datums/outfits/outfit_debug.dm
index 28460989c297..e992aed1af2a 100644
--- a/code/datums/outfits/outfit_debug.dm
+++ b/code/datums/outfits/outfit_debug.dm
@@ -40,6 +40,11 @@
if(istype(I))
apply_to_card(I, H, get_all_accesses(), "Debugger", "admin")
+ H.dna.SetSEState(GLOB.breathlessblock, 1)
+ singlemutcheck(H, GLOB.breathlessblock, MUTCHK_FORCED)
+ H.dna.default_blocks.Add(GLOB.breathlessblock)
+ H.check_mutations = 1
+
/obj/item/radio/headset/centcom/debug
name = "AVD-CNED bowman headset"
ks2type = /obj/item/encryptionkey/syndicate/all_channels
@@ -62,10 +67,10 @@
to_chat(user, "You switch [src] to [change_voice ? "" : "not "]change your voice on syndicate communications.")
/obj/item/encryptionkey/syndicate/all_channels/AltClick(mob/user)
- var/new_name = stripped_input(user, "Enter new fake agent name...", "New name")
+ var/new_name = tgui_input_text(user, "Enter new fake agent name...", "New name", max_length = MAX_NAME_LEN)
if(!new_name)
return
- fake_name = copytext(new_name, 1, MAX_NAME_LEN + 1)
+ fake_name = new_name
/obj/item/clothing/mask/gas/welding/advanced
name = "AVD-CNED welding mask"
@@ -313,7 +318,7 @@
// put cool admin-only shit here :)
/obj/item/storage/box/debug/misc_debug/populate_contents()
new /obj/item/badminBook(src)
- new /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka(src)
+ new /obj/item/reagent_containers/drinks/bottle/vodka/badminka(src)
new /obj/item/crowbar/power(src) // >admin only lol
new /obj/item/clothing/gloves/fingerless/rapid/admin(src)
new /obj/item/clothing/under/misc/acj(src)
diff --git a/code/datums/pathfinding_mover.dm b/code/datums/pathfinding_mover.dm
new file mode 100644
index 000000000000..fe168adc2fcc
--- /dev/null
+++ b/code/datums/pathfinding_mover.dm
@@ -0,0 +1,128 @@
+/**
+ * A generalized datum for pathfinding, and moving to a target.
+ */
+
+/datum/pathfinding_mover
+ /// Can be a simplemob bot, a drone, or even a pathfinding modsuit module (currently only implemented for drones)
+ VAR_PRIVATE/atom/movable/owner
+ /// The target turf we are after
+ VAR_PRIVATE/turf/target
+
+ /// List of turfs through which a mod 'steps' to reach the waypoint
+ VAR_PRIVATE/list/path = list()
+ /// max amount of tries before resetting path to null
+ var/max_tries = 10
+ /// How many times have we tried to move?
+ VAR_PRIVATE/tries = 0
+ /// How many 2-tick delays per move (5 = 1 second)
+ var/move_speed = 2
+ /// A counter for move_speed via modulo
+ VAR_PRIVATE/move_ticks = 0
+
+ /// Callback invoked on failure
+ var/datum/callback/on_set_path_null
+ /// Callback invoked on success
+ var/datum/callback/on_success
+
+ /// The delay called as part of Move()
+ VAR_PRIVATE/atom/movable/owner_move_delay = 0
+ /// Do we consider movement delay? Disable for non-mobs
+ var/consider_movement_delay = TRUE
+ /// Requires `consider_movement_delay = TRUE`, saves the last movement delay to prevent diagonal weirdness
+ VAR_PRIVATE/last_movement_delay
+
+
+/datum/pathfinding_mover/New(_owner, _target)
+ target = _target
+
+ owner = _owner
+ if(ismob(owner))
+ var/mob/M = owner
+ owner_move_delay = M.movement_delay()
+ RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(signal_qdel))
+
+/datum/pathfinding_mover/Destroy(force, ...)
+ UnregisterSignal(owner, COMSIG_PARENT_QDELETING)
+ STOP_PROCESSING(SSfastprocess, src)
+ return ..()
+
+/datum/pathfinding_mover/proc/generate_path(...)
+ set_path(get_path_to(arglist(list(owner, target) + args)))
+ return (length(path) > 0)
+
+/datum/pathfinding_mover/proc/set_target(atom/new_target)
+ if(!isatom(new_target))
+ target = null
+ return
+ target = get_turf(new_target)
+
+/datum/pathfinding_mover/proc/set_path(list/newpath)
+ PRIVATE_PROC(TRUE)
+
+ if(newpath == null)
+ on_set_path_null?.Invoke() // This is seperate to prevent invoking the callback if calling from generate_path
+ path = newpath ? newpath : list()
+ if(!length(path)) // Because newpath could be an empty list
+ STOP_PROCESSING(SSfastprocess, src)
+ tries = 0
+
+/**
+ * Start moving towards our target, returns false if the path does not lead to the target
+ */
+/datum/pathfinding_mover/proc/start()
+ if(!target || !length(path)) // Pathfinding failed or a path/destination was not set.
+ set_path(null)
+ return FALSE
+
+ var/turf/last_node = get_turf(path[length(path)]) // This is the turf at the end of the path
+ if(target != last_node) // The path should lead us to our given destination. If this is not true, we must stop.
+ set_path(null)
+ return FALSE
+
+ START_PROCESSING(SSfastprocess, src)
+ return TRUE
+
+/**
+ * Using fast process, see if we should take the next step yet
+ */
+/datum/pathfinding_mover/process(wait) // 2 on fast process
+ move_ticks++
+ if(move_speed && (move_ticks < move_speed))
+ return
+ if(consider_movement_delay && (last_movement_delay > (move_ticks * wait)))
+ return
+ move_ticks = 0
+
+ if(tries >= max_tries)
+ set_path(null)
+ return // PROCESS_KILL called with set_path(null)
+
+ if(get_turf(owner) == target) // We have arrived, no need to move again.
+ on_success?.Invoke(src)
+ return PROCESS_KILL
+
+ generalized_step()
+
+/**
+ * Take our next step in our pathfinding algorithm
+ */
+/datum/pathfinding_mover/proc/generalized_step() // Step, increase tries if failed
+ PRIVATE_PROC(TRUE)
+ if(!length(path))
+ return
+
+ var/targetted_direction = get_dir(owner, path[1])
+
+ var/delay = owner_move_delay
+ if(IS_DIR_DIAGONAL(targetted_direction))
+ delay *= SQRT_2
+
+ if(!owner.Move(path[1], targetted_direction, delay))
+ tries++
+ return
+ tries = 0
+ if(consider_movement_delay)
+ last_movement_delay = delay
+
+ // Increment the path
+ path.Cut(1, 2)
diff --git a/code/datums/pipe_datums.dm b/code/datums/pipe_datums.dm
index a771be3430b3..41adb4a18829 100644
--- a/code/datums/pipe_datums.dm
+++ b/code/datums/pipe_datums.dm
@@ -228,7 +228,7 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable
pipe_name = "passive vent"
pipe_id = PIPE_PASV_VENT
orientations = 4
- pipe_icon = "passive vent"
+ pipe_icon = "passive_vent"
pipe_category = RPD_DEVICES
rpd_dispensable = TRUE
@@ -343,15 +343,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable
pipe_id = PIPE_CIRCULATOR
pipe_icon = "circ"
-/datum/pipes/atmospheric/insulated
- pipe_name = "insulated pipe"
- pipe_id = PIPE_INSULATED_STRAIGHT
- pipe_icon = "insulated"
-
-/datum/pipes/atmospheric/insulated/bent
- pipe_name = "bent insulated pipe"
- pipe_id = PIPE_INSULATED_BENT
-
/datum/pipes/disposal/left_sortjunction
pipe_name = "disposals sort junction left"
pipe_id = PIPE_DISPOSALS_SORT_LEFT
diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm
index 484b8d5bc50e..3582772446ae 100644
--- a/code/datums/recipe.dm
+++ b/code/datums/recipe.dm
@@ -36,7 +36,7 @@
/datum/recipe
var/list/reagents // example: = list("berryjuice" = 5) // do not list same reagent twice
var/list/items // example: =list(/obj/item/crowbar, /obj/item/welder) // place /foo/bar before /foo
- var/result //example: = /obj/item/reagent_containers/food/snacks/donut
+ var/result //example: = /obj/item/food/snacks/donut
var/time = 100 // 1/10 part of second
/// Whether or not an upgraded kitchen machine will create more products using the same amount of ingredients
var/duplicate = TRUE
diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm
index af4b272b4d1a..83c2b9ef7b2c 100644
--- a/code/datums/spawners_menu.dm
+++ b/code/datums/spawners_menu.dm
@@ -6,10 +6,13 @@
qdel(src)
owner = new_owner
-/datum/spawners_menu/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/ui_state/state = GLOB.observer_state, datum/tgui/master_ui = null)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/spawners_menu/ui_state(mob/user)
+ return GLOB.observer_state
+
+/datum/spawners_menu/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "SpawnersMenu", "Spawners Menu", 700, 600, master_ui, state = state)
+ ui = new(user, src, "SpawnersMenu", "Spawners Menu")
ui.open()
/datum/spawners_menu/ui_data(mob/user)
@@ -43,8 +46,9 @@
/datum/spawners_menu/ui_act(action, params)
if(..())
return
- var/spawners = replacetext(params["ID"], ",", ";")
- var/list/possible_spawners = params2list(spawners)
+ var/list/possible_spawners = params["ID"]
+ if(!length(possible_spawners))
+ return
var/obj/effect/mob_spawn/MS = locate(pick(possible_spawners))
if(!MS || !istype(MS))
CRASH("A ghost tried to interact with an invalid spawner, or the spawner didn't exist.")
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index eac5f40356d8..3cd988a06247 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -461,6 +461,10 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
target.vars[type] += amount //I bear no responsibility for the runtimes that'll happen if you try to adjust non-numeric or even non-existant vars
return
+///This proc is ran when a mind is transfered to a new mob. Tells it if the action should be transfered on return true, and tells it not to remove it on false
+/obj/effect/proc_holder/spell/proc/on_mind_transfer(mob/living/L)
+ return TRUE
+
/obj/effect/proc_holder/spell/aoe
name = "Spell"
create_attack_logs = FALSE
diff --git a/code/datums/spell_targeting/clicked_atom.dm b/code/datums/spell_targeting/clicked_atom.dm
index 279d28e1cde0..d851edf993ec 100644
--- a/code/datums/spell_targeting/clicked_atom.dm
+++ b/code/datums/spell_targeting/clicked_atom.dm
@@ -7,6 +7,10 @@
/datum/spell_targeting/clicked_atom/choose_targets(mob/user, obj/effect/proc_holder/spell/spell, params, atom/clicked_atom)
if(clicked_atom)
return list(clicked_atom)
- else
- return null
+/datum/spell_targeting/clicked_atom/external/choose_targets(mob/user, obj/effect/proc_holder/spell/spell, params, atom/clicked_atom)
+ . = ..()
+ if(!.)
+ return list()
+ if(!isturf(clicked_atom.loc) && !isturf(clicked_atom))
+ return list()
diff --git a/code/datums/spells/alien_spells/basetype_alien_spell.dm b/code/datums/spells/alien_spells/basetype_alien_spell.dm
index 3cacc2e8e022..c4413e45d907 100644
--- a/code/datums/spells/alien_spells/basetype_alien_spell.dm
+++ b/code/datums/spells/alien_spells/basetype_alien_spell.dm
@@ -20,8 +20,7 @@ Updates the spell's actions on use as well, so they know when they can or can't
/obj/effect/proc_holder/spell/alien_spell
action_background_icon_state = "bg_alien"
clothes_req = FALSE
- /// Extremely fast cooldown, only present so the cooldown system doesn't explode
- base_cooldown = 1
+ base_cooldown = 0
create_attack_logs = FALSE
/// Every alien spell creates only logs, no attack messages on someone placing weeds, but you DO get attack messages on neurotoxin and corrosive acid
create_custom_logs = TRUE
diff --git a/code/datums/spells/alien_spells/build_resin_structure.dm b/code/datums/spells/alien_spells/build_resin_structure.dm
index aadbcabcdeaf..9da55a22ebf1 100644
--- a/code/datums/spells/alien_spells/build_resin_structure.dm
+++ b/code/datums/spells/alien_spells/build_resin_structure.dm
@@ -8,14 +8,18 @@
return new /datum/spell_targeting/self
/obj/effect/proc_holder/spell/alien_spell/build_resin/cast(list/targets, mob/living/carbon/user)
- var/static/list/resin_buildings = list("Resin Wall (55)" = image(icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi', icon_state = "resin_wall-0"),
- "Resin Nest (55)" = image(icon = 'icons/mob/alien.dmi', icon_state = "nest"),
- "Resin door (80)" = image(icon = 'icons/obj/smooth_structures/alien/resin_door.dmi', icon_state = "resin"))
+ var/static/list/resin_buildings = list("Resin Wall" = image(icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi', icon_state = "resin_wall-0"),
+ "Resin Nest" = image(icon = 'icons/mob/alien.dmi', icon_state = "nest"),
+ "Resin Door" = image(icon = 'icons/obj/smooth_structures/alien/resin_door.dmi', icon_state = "resin"),
+ "Revival Nest" = image(icon = 'icons/mob/alien.dmi', icon_state = "placeholder_rejuv_nest"))
var/choice = show_radial_menu(user, user, resin_buildings, src, radius = 40)
var/turf/turf_to_spawn_at = user.loc
if(!choice)
revert_cast(user)
return
+ if(!do_mob(user, user, 3 SECONDS))
+ revert_cast()
+ return
if(isspaceturf(turf_to_spawn_at))
to_chat(user, "You cannot build the [choice] while in space!")
revert_cast(user)
@@ -27,15 +31,52 @@
return
visible_message("[user] vomits up a thick purple substance and shapes it!")
switch(choice)
- if("Resin Wall (55)")
+ if("Resin Wall")
new /obj/structure/alien/resin/wall(turf_to_spawn_at)
- if("Resin Nest (55)")
+ if("Resin Nest")
new /obj/structure/bed/nest(turf_to_spawn_at)
- if("Resin door (80)")
- var/plasma_current = user.get_plasma()
- if(plasma_current >= 25)
- new /obj/structure/alien/resin/door(turf_to_spawn_at)
- user.add_plasma(-25)
- return
- to_chat(user, "You don't have enough plasma to place a door down.")
- revert_cast(user)
+ if("Resin Door")
+ new /obj/structure/alien/resin/door(turf_to_spawn_at)
+ if("Revival Nest")
+ new /obj/structure/bed/revival_nest(turf_to_spawn_at)
+
+/obj/effect/proc_holder/spell/touch/alien_spell/consume_resin
+ name = "Consume resin structures"
+ desc = "Allows you to rip and tear straight through resin structures."
+ action_icon_state = "alien_resin"
+ hand_path = "/obj/item/melee/touch_attack/alien/consume_resin"
+ plasma_cost = 10
+ base_cooldown = 5 SECONDS
+
+/obj/item/melee/touch_attack/alien/consume_resin
+ name = "Resin consumption"
+ desc = "The hunger..."
+ icon_state = "alien_acid"
+
+/obj/item/melee/touch_attack/alien/consume_resin/afterattack(atom/target, mob/living/carbon/user, proximity)
+ if(target == user)
+ to_chat(user, "You stop trying to consume resin.")
+ ..()
+ return
+ if(!proximity || !iscarbon(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
+ return
+ if(istype(target, /obj/structure/alien/weeds))
+ qdel(target)
+ if(istype(target, /obj/structure/alien/weeds/node))
+ user.add_plasma(50)
+ user.visible_message("[user] rips and tears into [target] with their teeth!", "You viciously rip apart and consume [target]!")
+ return
+ if(!plasma_check(10, user))
+ to_chat(user, "You don't have enough plasma to perform this action!")
+ return
+ var/static/list/resin_objects = list(/obj/structure/alien/resin, /obj/structure/alien/egg, /obj/structure/bed/nest, /obj/structure/bed/revival_nest)
+ for(var/resin_type in resin_objects)
+ if(!istype(target, resin_type))
+ continue
+ user.visible_message("[user] rips and tears into [target] with their teeth!")
+ if(!do_after(user, 3 SECONDS, target = target))
+ return
+ to_chat(user, "You viciously rip apart and consume [target]!")
+ user.add_plasma(-10)
+ qdel(target)
+ ..()
diff --git a/code/datums/spells/alien_spells/corrosive_acid_spit.dm b/code/datums/spells/alien_spells/corrosive_acid_spit.dm
index 18a58b9494bf..17e7756f7c70 100644
--- a/code/datums/spells/alien_spells/corrosive_acid_spit.dm
+++ b/code/datums/spells/alien_spells/corrosive_acid_spit.dm
@@ -4,6 +4,7 @@
hand_path = "/obj/item/melee/touch_attack/alien/corrosive_acid"
action_icon_state = "alien_acid"
plasma_cost = 200
+ base_cooldown = 15 SECONDS
/obj/item/melee/touch_attack/alien/corrosive_acid
name = "Corrosive acid"
@@ -30,3 +31,45 @@
else
to_chat(user, "You cannot dissolve this object.")
..()
+
+/obj/effect/proc_holder/spell/touch/alien_spell/burning_touch
+ name = "Blazing touch"
+ desc = "Boil acid within your hand to burn through anything you touch with it, deals a lot of damage to aliens and destroys resin structures instantly."
+ hand_path = "/obj/item/melee/touch_attack/alien/burning_touch"
+ action_icon_state = "alien_acid"
+ plasma_cost = 100
+ base_cooldown = 10 SECONDS
+
+/obj/item/melee/touch_attack/alien/burning_touch
+ name = "Blazing touch"
+ desc = "The air warps around your hand, somehow the heat doesn't hurt."
+ icon_state = "alien_acid"
+
+/obj/item/melee/touch_attack/alien/burning_touch/afterattack(atom/target, mob/living/carbon/user, proximity)
+ if(target == user)
+ to_chat(user, "You cool down your boiled aid.")
+ ..()
+ return
+ if(!proximity || !iscarbon(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
+ return
+ if(!plasma_check(100, user))
+ to_chat(user, "You don't have enough plasma to perform this action!")
+ return
+ if(isliving(target))
+ var/mob/living/guy_to_burn = target
+ add_attack_logs(user, target, "Applied blazing touch") // Want this logged
+ guy_to_burn.adjustFireLoss(60)
+ guy_to_burn.adjust_fire_stacks(3)
+ guy_to_burn.IgniteMob()
+ user.visible_message("[user] touches [target] and a fireball erupts on contact!")
+ user.add_plasma(-100)
+ ..()
+ else
+ var/static/list/resin_objects = list(/obj/structure/alien/resin, /obj/structure/alien/egg, /obj/structure/bed/nest, /obj/structure/bed/revival_nest)
+ for(var/resin_type in resin_objects)
+ if(!istype(target, resin_type))
+ continue
+ user.visible_message("[user] touches [target] and burns right through it!")
+ user.add_plasma(-100)
+ qdel(target)
+ ..()
diff --git a/code/datums/spells/alien_spells/lay_alien_eggs.dm b/code/datums/spells/alien_spells/lay_alien_eggs.dm
index 7789420e1c31..f2bfc89011f4 100644
--- a/code/datums/spells/alien_spells/lay_alien_eggs.dm
+++ b/code/datums/spells/alien_spells/lay_alien_eggs.dm
@@ -5,3 +5,35 @@
weed_type = /obj/structure/alien/egg
weed_name = "alien egg"
action_icon_state = "alien_egg"
+ requires_do_after = FALSE
+
+/obj/effect/proc_holder/spell/alien_spell/combust_facehuggers
+ name = "Combust facehuggers and eggs"
+ desc = "Take over the programming of facehuggers and eggs, sending out a shockwave which causes them to combust."
+ plasma_cost = 25
+ action_icon_state = "alien_egg"
+ base_cooldown = 3 SECONDS
+
+/obj/effect/proc_holder/spell/alien_spell/combust_facehuggers/create_new_targeting()
+ return new /datum/spell_targeting/clicked_atom
+
+/obj/effect/proc_holder/spell/alien_spell/combust_facehuggers/cast(list/targets, mob/living/carbon/user)
+ var/obj/target = targets[1]
+ var/turf/T = user.loc
+ if(!istype(T) || !istype(target))
+ revert_cast()
+ return FALSE
+
+ if(!istype(target, /obj/item/clothing/mask/facehugger) && !istype(target, /obj/structure/alien/egg))
+ revert_cast()
+ return FALSE
+
+ target.color = "#c72623"
+ addtimer(CALLBACK(src, PROC_REF(blow_it_up), target, user), 3 SECONDS)
+ to_chat(user, "[target] will explode in 3 seconds!")
+ return TRUE
+
+/obj/effect/proc_holder/spell/alien_spell/combust_facehuggers/proc/blow_it_up(obj/target, mob/user)
+ add_attack_logs(user, target, "Caused it to explode")
+ explosion(get_turf(target), 0, 2, 3, 3, cause = user)
+ to_chat(user, "[target] has detonated!")
diff --git a/code/datums/spells/alien_spells/neurotoxin_spit.dm b/code/datums/spells/alien_spells/neurotoxin_spit.dm
index ca688886d131..ad4048f53a17 100644
--- a/code/datums/spells/alien_spells/neurotoxin_spit.dm
+++ b/code/datums/spells/alien_spells/neurotoxin_spit.dm
@@ -1,7 +1,7 @@
/obj/effect/proc_holder/spell/alien_spell/neurotoxin
name = "Neurotoxin spit"
desc = "This ability allows you to fire some neurotoxin. Knocks down anyone you hit, applies a small amount of stamina damage as well."
- base_cooldown = 5 SECONDS
+ base_cooldown = 3 SECONDS
plasma_cost = 50
selection_activated_message = "Your prepare some neurotoxin!"
selection_deactivated_message = "You swallow your prepared neurotoxin."
@@ -34,3 +34,9 @@
user.newtonian_move(get_dir(U, T))
return TRUE
+
+/obj/effect/proc_holder/spell/alien_spell/neurotoxin/death_to_xenos
+ name = "Neurotoxin spit"
+ desc = "This ability allows you to fire some neurotoxin. Knocks aliens down."
+ neurotoxin_type = /obj/item/projectile/bullet/anti_alien_toxin
+ base_cooldown = 2 SECONDS
diff --git a/code/datums/spells/alien_spells/plasma_weeds.dm b/code/datums/spells/alien_spells/plasma_weeds.dm
index c816475f7ea4..b254403bc6e2 100644
--- a/code/datums/spells/alien_spells/plasma_weeds.dm
+++ b/code/datums/spells/alien_spells/plasma_weeds.dm
@@ -2,9 +2,10 @@
name = "Plant weeds"
desc = "Allows you to plant some alien weeds on the floor below you. Does not work while in space."
plasma_cost = 50
- var/weed_type = /obj/structure/alien/weeds/node
+ var/atom/weed_type = /obj/structure/alien/weeds/node
var/weed_name = "alien weed node"
action_icon_state = "alien_plant"
+ var/requires_do_after = TRUE
/obj/effect/proc_holder/spell/alien_spell/plant_weeds/create_new_targeting()
return new /datum/spell_targeting/self
@@ -26,5 +27,10 @@
revert_cast()
return
+ user.visible_message("Vines burst from the back of [user], quickly scurring to the ground and swarm onto [user.loc].", "You begin infesting [user.loc] with [initial(weed_type.name)].")
+ if(requires_do_after && !do_mob(user, user, 2 SECONDS))
+ revert_cast()
+ return
+
user.visible_message("[user] has planted \a [weed_name]!")
new weed_type(T)
diff --git a/code/datums/spells/alien_spells/queen_evolve.dm b/code/datums/spells/alien_spells/queen_evolve.dm
index e8112f0506cb..75502cfcd690 100644
--- a/code/datums/spells/alien_spells/queen_evolve.dm
+++ b/code/datums/spells/alien_spells/queen_evolve.dm
@@ -1,7 +1,7 @@
/obj/effect/proc_holder/spell/alien_spell/evolve_queen
name = "Evolve into an alien queen"
desc = "Evolve into an alien queen."
- plasma_cost = 500
+ plasma_cost = 300
action_icon_state = "alien_evolve_drone"
/obj/effect/proc_holder/spell/alien_spell/evolve_queen/create_new_targeting()
@@ -17,8 +17,7 @@
// If there is no queen, that means we can evolve
to_chat(user, "You begin to evolve!")
user.visible_message("[user] begins to twist and contort!")
- var/turf/userloc = user.loc
- var/mob/living/carbon/alien/humanoid/queen/new_xeno = new(userloc)
+ var/mob/living/carbon/alien/humanoid/queen/new_xeno = new(get_turf(user))
user.mind.transfer_to(new_xeno)
new_xeno.mind.name = new_xeno.name
SSblackbox.record_feedback("tally", "alien_growth", 1, "queen")
diff --git a/code/datums/spells/alien_spells/regurgitate.dm b/code/datums/spells/alien_spells/regurgitate.dm
index effd0a9629bf..02960c88afb3 100644
--- a/code/datums/spells/alien_spells/regurgitate.dm
+++ b/code/datums/spells/alien_spells/regurgitate.dm
@@ -9,6 +9,9 @@
/obj/effect/proc_holder/spell/alien_spell/regurgitate/cast(list/targets, mob/living/carbon/user)
for(var/mob/M in user.stomach_contents)
var/turf/output_loc = user.loc
+ if(!istype(output_loc))
+ return
+ user.stomach_contents -= M
M.forceMove(output_loc)
visible_message("[user] hurls out the contents of [p_their()] stomach!")
return
diff --git a/code/datums/spells/alien_spells/tail_lash.dm b/code/datums/spells/alien_spells/tail_lash.dm
new file mode 100644
index 000000000000..0daa1e8a6a04
--- /dev/null
+++ b/code/datums/spells/alien_spells/tail_lash.dm
@@ -0,0 +1,23 @@
+/obj/effect/proc_holder/spell/alien_spell/tail_lash
+ name = "Tail lash"
+ desc = "Knocks down anyone around you."
+ action_icon_state = "tailsweep"
+ base_cooldown = 10 SECONDS
+
+/obj/effect/proc_holder/spell/alien_spell/tail_lash/create_new_targeting()
+ return new /datum/spell_targeting/self
+
+/obj/effect/proc_holder/spell/alien_spell/tail_lash/cast(list/targets, mob/user)
+ var/turf/T = user.loc
+ var/cast_resolved = FALSE
+ if(!istype(T))
+ revert_cast()
+ return
+ for(var/mob/living/to_knock_down in orange(1, user))
+ if(to_knock_down.KnockDown(10 SECONDS))
+ cast_resolved = TRUE
+ to_knock_down.visible_message("[user] sweeps [to_knock_down] off their feet!")
+ if(!cast_resolved)
+ revert_cast()
+
+ return cast_resolved
diff --git a/code/datums/spells/alien_spells/transfer_plasma.dm b/code/datums/spells/alien_spells/transfer_plasma.dm
index 1edf34dfa673..3ab94da1daf0 100644
--- a/code/datums/spells/alien_spells/transfer_plasma.dm
+++ b/code/datums/spells/alien_spells/transfer_plasma.dm
@@ -1,28 +1,55 @@
-/obj/effect/proc_holder/spell/touch/alien_spell/transfer_plasma
+/obj/effect/proc_holder/spell/alien_spell/transfer_plasma
name = "Transfer Plasma"
desc = "Transfers 50 plasma to a nearby alien"
- hand_path = "/obj/item/melee/touch_attack/alien/transfer_plasma"
action_icon_state = "alien_transfer"
plasma_cost = 50
-/obj/item/melee/touch_attack/alien/transfer_plasma
- name = "plasma transfer"
- desc = "Transfers 50 plasma to another alien."
- icon_state = "alien_transfer"
+/obj/effect/proc_holder/spell/alien_spell/transfer_plasma/create_new_targeting()
+ return new /datum/spell_targeting/clicked_atom
-/obj/item/melee/touch_attack/alien/transfer_plasma/afterattack(atom/target, mob/living/carbon/user, proximity)
- if(target == user)
- to_chat(user, "You withdraw your readied plasma.")
- ..()
- return
- if(!proximity || !isalien(target) || !iscarbon(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
- return
- if(!plasma_check(50, user))
- to_chat(user, "You don't have enough plasma to perform this action!")
+/obj/effect/proc_holder/spell/alien_spell/transfer_plasma/cast(list/targets, mob/living/carbon/user)
+ var/mob/living/carbon/alien/target = targets[1]
+ var/turf/T = user.loc
+ if(!istype(T) || !istype(target))
+ revert_cast()
+ return FALSE
+
+ user.Beam(target, icon_state = "sendbeam", time = 2 SECONDS, beam_color = "#f180bd")
+ target.add_plasma(50)
+ to_chat(user, "You have transfered 50 plasma to [target].")
+ to_chat(target, "[user] has transfered 50 plasma to you!")
+ return TRUE
+
+/obj/effect/proc_holder/spell/alien_spell/syphon_plasma
+ name = "Syphon plasma"
+ desc = "Syphons 150 plasma from a nearby alien."
+ action_icon_state = "alien_transfer"
+ plasma_cost = 0
+ base_cooldown = 10 SECONDS
+
+/obj/effect/proc_holder/spell/alien_spell/syphon_plasma/create_new_targeting()
+ return new /datum/spell_targeting/clicked_atom
+
+/obj/effect/proc_holder/spell/alien_spell/syphon_plasma/cast(list/targets, mob/living/carbon/user)
+ var/mob/living/carbon/alien/target = targets[1]
+ var/turf/T = user.loc
+ if(!istype(T) || !istype(target))
+ revert_cast()
+ return FALSE
+
+ user.Beam(target, icon_state = "drainbeam", time = 2 SECONDS, beam_color = "#f180bd")
+ var/obj/item/organ/internal/alien/plasmavessel/vessel = target.get_int_organ(/obj/item/organ/internal/alien/plasmavessel)
+ if(!vessel)
return
- user.add_plasma(-50)
- var/mob/living/carbon/transfering_to = target
- transfering_to.add_plasma(50)
- to_chat(user, "You have transfered 50 plasma to [transfering_to].")
- to_chat(transfering_to, "[user] has transfered 50 plasma to you!")
- ..()
+ var/plasma_syphoned
+ if(vessel.stored_plasma < 150)
+ user.add_plasma(vessel.stored_plasma)
+ plasma_syphoned = vessel.stored_plasma
+ vessel.stored_plasma = 0
+ else
+ user.add_plasma(150)
+ plasma_syphoned = 50
+ vessel.stored_plasma = vessel.stored_plasma - 150
+ to_chat(user, "You have syphoned [plasma_syphoned] plasma from [target].")
+ to_chat(target, "[user] has syphoned [plasma_syphoned] from you!")
+ return TRUE
diff --git a/code/datums/spells/alien_spells/whisper.dm b/code/datums/spells/alien_spells/whisper.dm
index 22febebc1f90..0f5369d04358 100644
--- a/code/datums/spells/alien_spells/whisper.dm
+++ b/code/datums/spells/alien_spells/whisper.dm
@@ -17,7 +17,7 @@
/obj/effect/proc_holder/spell/alien_spell/whisper/cast(list/targets, mob/living/carbon/user)
var/mob/living/target = targets[1]
- var/msg = sanitize(input("Message:", "Alien Whisper") as text|null)
+ var/msg = tgui_input_text(user, "Message:", "Alien Whisper")
if(!msg)
revert_cast(user)
return
diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm
index 80ad56996f83..60502ffbe86a 100644
--- a/code/datums/spells/area_teleport.dm
+++ b/code/datums/spells/area_teleport.dm
@@ -11,18 +11,18 @@
/obj/effect/proc_holder/spell/area_teleport/before_cast(list/targets, mob/user)
..()
selected_area = null // Reset it
- var/A
+ var/area_name
if(!randomise_selection)
- A = input("Area to teleport to", "Teleport", A) as null|anything in SSmapping.teleportlocs
+ area_name = tgui_input_list(user, "Area to teleport to", "Teleport", SSmapping.teleportlocs)
else
- A = pick(SSmapping.teleportlocs)
+ area_name = pick(SSmapping.teleportlocs)
- if(!A)
+ if(!area_name)
smoke_type = SMOKE_NONE
return
- var/area/thearea = SSmapping.teleportlocs[A]
+ var/area/thearea = SSmapping.teleportlocs[area_name]
if(thearea.tele_proof && !istype(thearea, /area/wizard_station))
to_chat(user, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.")
diff --git a/code/datums/spells/chaplain_bless.dm b/code/datums/spells/chaplain_bless.dm
index 8c88be8ba550..70b8eb8e7082 100644
--- a/code/datums/spells/chaplain_bless.dm
+++ b/code/datums/spells/chaplain_bless.dm
@@ -42,7 +42,7 @@
var/mob/living/carbon/human/target = targets[1]
spawn(0) // allows cast to complete even if recipient ignores the prompt
- if(alert(target, "[user] wants to bless you, in the name of [user.p_their()] religion. Accept?", "Accept Blessing?", "Yes", "No") == "Yes") // prevents forced conversions
+ if(tgui_alert(target, "[user] wants to bless you, in the name of [user.p_their()] religion. Accept?", "Accept Blessing?", list("Yes", "No")) == "Yes") // prevents forced conversions
user.visible_message("[user] starts blessing [target] in the name of [SSticker.Bible_deity_name].", "You start blessing [target] in the name of [SSticker.Bible_deity_name].")
if(do_after(user, 150, target = target))
user.visible_message("[user] has blessed [target] in the name of [SSticker.Bible_deity_name].", "You have blessed [target] in the name of [SSticker.Bible_deity_name].")
diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm
index 34d2a86aeaf3..eeaed56ac114 100644
--- a/code/datums/spells/cluwne.dm
+++ b/code/datums/spells/cluwne.dm
@@ -12,6 +12,11 @@
action_icon_state = "cluwne"
/mob/living/carbon/human/proc/makeCluwne()
+ if(istype(back, /obj/item/mod/control)) // Check if the target is wearing a modsuit
+ var/obj/item/mod/control/modsuit_control = back
+ if(istype(wear_suit, /obj/item/clothing/suit/mod)) // Check if the modsuit is deployed
+ modsuit_control.active = FALSE // Instantly deactivate the modsuit - if it was activated
+ modsuit_control.quick_deploy(src) // The modsuit is no longer deployed
to_chat(src, "You feel funny.")
if(!get_int_organ(/obj/item/organ/internal/brain/cluwne))
var/obj/item/organ/internal/brain/cluwne/idiot_brain = new
diff --git a/code/datums/spells/disguise_self.dm b/code/datums/spells/disguise_self.dm
new file mode 100644
index 000000000000..f45f3d226546
--- /dev/null
+++ b/code/datums/spells/disguise_self.dm
@@ -0,0 +1,22 @@
+/obj/effect/proc_holder/spell/disguise_self
+ name = "Disguise Self"
+ desc = "Disguise yourself as a crewmember, based on your current location. Also changes your voice. \
+ The disguise will not hold up to being examined directly, and will break if you're damaged."
+
+ school = "illusion"
+ base_cooldown = 10 SECONDS
+ clothes_req = FALSE
+ invocation = "Yutake Yutendes"
+ invocation_type = "whisper"
+ level_max = 0 //cannot be improved
+ action_icon_state = "disguise_self"
+ sound = null
+
+/obj/effect/proc_holder/spell/disguise_self/create_new_targeting()
+ return new /datum/spell_targeting/self
+
+/obj/effect/proc_holder/spell/disguise_self/cast(list/targets, mob/user = usr)
+ if(!ishuman(user))
+ return FALSE
+ var/mob/living/carbon/human/H = user
+ H.apply_status_effect(STATUS_EFFECT_MAGIC_DISGUISE)
diff --git a/code/datums/spells/mimic.dm b/code/datums/spells/mimic.dm
index 4d807f4baaff..b7fe668761d9 100644
--- a/code/datums/spells/mimic.dm
+++ b/code/datums/spells/mimic.dm
@@ -188,7 +188,6 @@
examine_text = form.examine(user)
name = form.name
-
/obj/effect/proc_holder/spell/mimic/morph
action_background_icon_state = "bg_morph"
diff --git a/code/datums/spells/wizard_spells.dm b/code/datums/spells/wizard_spells.dm
index 8951fb00ffc2..e68728e9c4fc 100644
--- a/code/datums/spells/wizard_spells.dm
+++ b/code/datums/spells/wizard_spells.dm
@@ -359,7 +359,7 @@
centcom_cancast = FALSE
/obj/effect/proc_holder/spell/fireball/create_new_targeting()
- var/datum/spell_targeting/clicked_atom/C = new()
+ var/datum/spell_targeting/clicked_atom/external/C = new()
C.range = 20
return C
diff --git a/code/datums/station_traits/admin_panel.dm b/code/datums/station_traits/admin_panel.dm
index 27c16dd2909d..9e088d8ea610 100644
--- a/code/datums/station_traits/admin_panel.dm
+++ b/code/datums/station_traits/admin_panel.dm
@@ -80,10 +80,8 @@
var/list/new_future_traits = list()
var/list/station_trait_names = list()
- var/station_trait_text = params["station_traits"]
- var/list/temp_list = splittext(station_trait_text, ",")
- for(var/thing in temp_list) //TODO QWERTY / HI REVIEWERS NAME THIS BETTER BUT ITS ALMOST MIDNIGHT AND i HATE MYSELF
- var/datum/station_trait/station_trait_path = text2path(thing)
+ for(var/station_trait_text in params["station_traits"])
+ var/datum/station_trait/station_trait_path = text2path(station_trait_text)
if(!ispath(station_trait_path, /datum/station_trait) || station_trait_path == /datum/station_trait)
log_admin("[key_name(ui.user)] tried to set an invalid future station trait: [station_trait_text]")
to_chat(ui.user, "Invalid future station trait: [station_trait_text]")
@@ -126,8 +124,11 @@
/datum/ui_module/station_traits_panel/proc/too_late_to_revert()
return SSticker.current_state >= GAME_STATE_PLAYING
-/datum/ui_module/station_traits_panel/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/station_traits_panel/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/ui_module/station_traits_panel/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "StationTraitsPanel", "Station Traits Panel", 700, 600, master_ui, state = state)
+ ui = new(user, src, "StationTraitsPanel")
ui.open()
diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm
index 24a56cb3c977..f8fb95e185c2 100644
--- a/code/datums/station_traits/negative_traits.dm
+++ b/code/datums/station_traits/negative_traits.dm
@@ -74,7 +74,7 @@
E.weight *= weight_multiplier
for(var/role_weight in E.role_weights)
E.role_weights[role_weight] *= weight_multiplier
- if(disable_is_one_shot == TRUE)
+ if(disable_is_one_shot)
E.one_shot = FALSE
modified_event = TRUE
if(!modified_event)
diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm
index 1374f9d0616d..4661f5efed8c 100644
--- a/code/datums/station_traits/neutral_traits.dm
+++ b/code/datums/station_traits/neutral_traits.dm
@@ -2,14 +2,14 @@
name = "Bananium Shipment"
trait_type = STATION_TRAIT_NEUTRAL
weight = 5
- report_message = "Rumor has it that the clown planet has been sending support packages to clowns in this system."
+ report_message = "An unidentified benefactor has dispatched a mysterious shipment to your station's clown. It was reported to smell faintly of bananas."
trait_to_give = STATION_TRAIT_BANANIUM_SHIPMENTS
-/datum/station_trait/bananium_shipment
+/datum/station_trait/tranquilite_shipment
name = "Tranquilite Shipment"
trait_type = STATION_TRAIT_NEUTRAL
weight = 5
- report_message = "Rumor has it that the mime federation has been sending support packages to mimes in this system."
+ report_message = "Shipping records show an unmarked crate being delivered to your station's mime."
trait_to_give = STATION_TRAIT_TRANQUILITE_SHIPMENTS
/datum/station_trait/unique_ai
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index d65790632129..61143bc0ccaf 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -747,3 +747,28 @@
/datum/status_effect/bookwyrm
duration = BRAIN_DAMAGE_MOB_TIME
alert_type = null
+
+/datum/status_effect/bearserker_rage
+ id = "bearserker rage"
+ duration = 5 SECONDS
+ status_type = STATUS_EFFECT_REFRESH
+ alert_type = /obj/screen/alert/status_effect/bearserker_rage
+
+/obj/screen/alert/status_effect/bearserker_rage
+ name = "Bearserker Rage"
+ desc = "Blood flows between your fingers, and Foh'Sie roars; \"MORE BLOOD!\""
+ icon_state = "bearserker"
+
+/datum/status_effect/bearserker_rage/on_apply()
+ . = ..()
+ if(. && ishuman(owner))
+ var/mob/living/carbon/human/H = owner
+ H.physiology.stamina_mod *= 0.75
+ add_attack_logs(owner, owner, "gained bearserker rage resistances", ATKLOG_ALL)
+ owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, TRUE, use_reverb = FALSE)
+
+/datum/status_effect/bearserker_rage/on_remove()
+ if(ishuman(owner))
+ var/mob/living/carbon/human/H = owner
+ H.physiology.stamina_mod /= 0.75
+ add_attack_logs(owner, owner, "lost bearserker rage resistances", ATKLOG_ALL)
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 0839d40d5971..2a2b60997626 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -247,7 +247,7 @@
owner.cut_overlay(overlay)
/datum/status_effect/cult_stun_mark/proc/trigger()
- owner.adjustStaminaLoss(60)
+ owner.apply_damage(60, STAMINA)
owner.Silence(6 SECONDS) // refresh the silence
qdel(src)
@@ -1120,6 +1120,17 @@
animate(get_filter("ray"), offset = 10, time = 10 SECONDS, loop = -1)
animate(offset = 0, time = 10 SECONDS)
+
+/datum/status_effect/abductor_cooldown
+ id = "abductor_cooldown"
+ alert_type = /obj/screen/alert/status_effect/abductor_cooldown
+ duration = 10 SECONDS
+
+/obj/screen/alert/status_effect/abductor_cooldown
+ name = "Teleportation cooldown"
+ desc = "Per article A-113, all experimentors must wait 10000 milliseconds between teleports in order to ensure no long term genetic or mental damage happens to experimentor or test subjects."
+ icon_state = "bluespace"
+
#define DEFAULT_MAX_CURSE_COUNT 5
/// Status effect that gives the target miscellanous debuffs while throwing a status alert and causing them to smoke from the damage they're incurring.
diff --git a/code/datums/status_effects/magic_disguise.dm b/code/datums/status_effects/magic_disguise.dm
new file mode 100644
index 000000000000..9da1fb8dc39b
--- /dev/null
+++ b/code/datums/status_effects/magic_disguise.dm
@@ -0,0 +1,86 @@
+/datum/status_effect/magic_disguise
+ id = "magic_disguise"
+ duration = -1
+ tick_interval = -1
+ alert_type = /obj/screen/alert/status_effect/magic_disguise
+ status_type = STATUS_EFFECT_REPLACE
+ var/datum/icon_snapshot/disguise
+
+/obj/screen/alert/status_effect/magic_disguise
+ name = "Disguised"
+ desc = "You are disguised as a crewmember."
+ icon = 'icons/mob/actions/actions.dmi'
+ icon_state = "chameleon_outfit"
+
+/datum/status_effect/magic_disguise/on_creation(mob/living/new_owner, mob/living/disguise_mob)
+ . = ..()
+ if(!ishuman(new_owner))
+ return FALSE
+ if(!disguise_mob)
+ disguise_mob = select_disguise()
+ if(disguise_mob && ishuman(disguise_mob))
+ create_disguise(disguise_mob)
+ if(disguise)
+ apply_disguise(new_owner)
+ return TRUE
+ else
+ to_chat(owner, "Your spell fails to find a disguise!")
+ return FALSE
+
+/datum/status_effect/magic_disguise/on_apply()
+ . = ..()
+ if(!ishuman(owner))
+ return FALSE
+
+ RegisterSignal(owner, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(remove_disguise))
+
+/datum/status_effect/magic_disguise/on_remove()
+ owner.regenerate_icons()
+ ..()
+
+/datum/status_effect/magic_disguise/proc/select_disguise()
+ var/obj/machinery/door/airlock/AL
+ var/area/caster_area
+
+ caster_area = get_area(owner)
+ for(var/obj/machinery/door/airlock/tmp in view(owner))
+ if(get_area(tmp) == caster_area && !(tmp.req_access_txt == "0" && tmp.req_one_access_txt == "0")) //Ignore airlocks that arent in area or are public airlocks
+ AL = tmp
+ break
+ for(var/mob/living/carbon/human/disguise_source in shuffle(GLOB.player_list)) //Pick a random crewmember with access to this room
+ if((ACCESS_CAPTAIN in disguise_source.get_access()) || (ACCESS_HOP in disguise_source.get_access()) || (ACCESS_CLOWN in disguise_source.get_access()))
+ continue //We don't want the cap, HOP or clown as a disguise, too remarkable. If you're spotted by the Cap or HOP in their own office, disguising as them wont help you either
+ if((!AL || AL.allowed(disguise_source)) && !disguise_source.mind.offstation_role && disguise_source != owner)
+ return disguise_source
+ for(var/mob/living/carbon/human/backup_source in shuffle(GLOB.player_list)) //Pick a random crewmember if there's no one with access to the current room
+ if((ACCESS_CAPTAIN in backup_source.get_access()) || (ACCESS_HOP in backup_source.get_access()) || (ACCESS_CLOWN in backup_source.get_access()))
+ continue //ditto
+ if(!backup_source.mind.offstation_role && backup_source != owner)
+ return backup_source
+ return
+
+/datum/status_effect/magic_disguise/proc/create_disguise(mob/living/carbon/human/disguise_source)
+ var/datum/icon_snapshot/temp = new
+ temp.name = disguise_source.name
+ temp.icon = disguise_source.icon
+ temp.icon_state = disguise_source.icon_state
+ temp.overlays = disguise_source.get_overlays_copy(list(L_HAND_LAYER, R_HAND_LAYER))
+ disguise = temp
+
+/datum/status_effect/magic_disguise/proc/apply_disguise(mob/living/carbon/human/H)
+ H.name_override = disguise.name
+ H.icon = disguise.icon
+ H.icon_state = disguise.icon_state
+ H.overlays = disguise.overlays
+ H.update_inv_r_hand()
+ H.update_inv_l_hand()
+ to_chat(H, "You disguise yourself as [disguise.name].")
+
+/datum/status_effect/magic_disguise/proc/remove_disguise()
+ SIGNAL_HANDLER // COMSIG_MOB_APPLY_DAMAGE
+ if(!ishuman(owner))
+ return
+ var/mob/living/carbon/human/H = owner
+ H.name_override = null
+ H.overlays.Cut()
+ qdel(src)
diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm
index ff77a3edfaaf..2634cd51b5ed 100644
--- a/code/datums/uplink_items/uplink_general.dm
+++ b/code/datums/uplink_items/uplink_general.dm
@@ -374,6 +374,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/toy/plushie/carpplushie/dehy_carp
cost = 4
+/datum/uplink_item/stealthy_weapons/knuckleduster
+ name = "Syndicate Knuckleduster"
+ desc = "A straightforward and fairly concealable melee weapon for bludgeoning someone to death in brutal fashion. This one is designed specifically to cause severe organ damage to the victim."
+ reference = "SKD"
+ item = /obj/item/melee/knuckleduster/syndie
+ cost = 10
+ cant_discount = TRUE
// GRENADES AND EXPLOSIVES
@@ -796,6 +803,29 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/bio_chip_implanter/stealth
cost = 45
+// CYBERNETICS
+
+/datum/uplink_item/cyber_implants
+ category = "Cybernetic Implants"
+
+/datum/uplink_item/cyber_implants/hackerman_deck
+ name = "Binyat Wireless Hacking System Autoimplanter"
+ desc = "This implant will allow you to wirelessly emag from a distance. However, it will slightly burn you \
+ on use, and will be quite visual as you are emaging the object. \
+ Will not show on unupgraded body scanners."
+ reference = "HKR"
+ item = /obj/item/autosurgeon/organ/syndicate/hackerman_deck
+ cost = 30 // Probably slightly less useful than an emag with heat / cooldown, but I am not going to make it cheaper or everyone picks it over emag
+
+/datum/uplink_item/cyber_implants/razorwire
+ name = "Razorwire Spool Arm Implant Autoimplanter"
+ desc = "A long length of monomolecular filament, built into the back of your hand. \
+ Impossibly thin and flawlessly sharp, it should slice through organic materials with no trouble; \
+ even from a few steps away. However, results against anything more durable will heavily vary."
+ reference = "RZR"
+ item = /obj/item/autosurgeon/organ/syndicate/razorwire
+ cost = 15
+
// POINTLESS BADASSERY
/datum/uplink_item/badass
diff --git a/code/datums/uplink_items/uplink_nuclear.dm b/code/datums/uplink_items/uplink_nuclear.dm
index 444dd9b696ed..5fbd96465e29 100644
--- a/code/datums/uplink_items/uplink_nuclear.dm
+++ b/code/datums/uplink_items/uplink_nuclear.dm
@@ -488,7 +488,7 @@
// SPACE SUITS
-/datum/uplink_item/suits/hardsuit/elite
+/datum/uplink_item/suits/elite_nukie
name = "Elite Syndicate MODsuit"
desc = "An advanced MODsuit with superior armor and mobility to the standard Syndicate MODsuit."
item = /obj/item/mod/control/pre_equipped/elite
@@ -497,11 +497,14 @@
excludefrom = list()
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
-/datum/uplink_item/suits/hardsuit/shielded
- name = "Shielded Hardsuit"
- desc = "An advanced hardsuit with built in energy shielding. The shields will rapidly recharge when not under fire."
- item = /obj/item/clothing/suit/space/hardsuit/shielded/syndi
- cost = 150
+/datum/uplink_item/suits/shielded
+ name = "Energy Shield Module"
+ desc = "A personal, protective forcefield typically seen in military applications. \
+ This advanced deflector shield is essentially a scaled down version of those seen on starships, \
+ and the power cost can be an easy indicator of this. However, it is capable of blocking nearly any incoming attack, \
+ though with its' low amount of separate charges, the user remains mortal."
+ item = /obj/item/mod/module/energy_shield
+ cost = 200
reference = "SHS"
excludefrom = list()
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
@@ -543,17 +546,14 @@
// CYBERNETICS
-/datum/uplink_item/cyber_implants
- category = "Cybernetic Implants"
- surplus = 0
- uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
-
/datum/uplink_item/cyber_implants/thermals
name = "Thermal Vision Implant"
desc = "These cybernetic eyes will give you thermal vision. Comes with an autosurgeon."
reference = "CIT"
item = /obj/item/autosurgeon/organ/syndicate/thermal_eyes
cost = 40
+ surplus = 0
+ uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
/datum/uplink_item/cyber_implants/xray
name = "X-Ray Vision Implant"
@@ -561,6 +561,8 @@
reference = "CIX"
item = /obj/item/autosurgeon/organ/syndicate/xray_eyes
cost = 50
+ surplus = 0
+ uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
/datum/uplink_item/cyber_implants/antistun
name = "Hardened CNS Rebooter Implant"
@@ -568,6 +570,8 @@
reference = "CIAS"
item = /obj/item/autosurgeon/organ/syndicate/anti_stam
cost = 60
+ surplus = 0
+ uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
/datum/uplink_item/cyber_implants/reviver
name = "Hardened Reviver Implant"
@@ -575,6 +579,8 @@
reference = "CIR"
item = /obj/item/autosurgeon/organ/syndicate/reviver
cost = 40
+ surplus = 0
+ uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
// BUNDLES
diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm
index ecbd9908794d..7f437119a8b2 100644
--- a/code/datums/uplink_items/uplink_traitor.dm
+++ b/code/datums/uplink_items/uplink_traitor.dm
@@ -91,7 +91,7 @@
name = "Chef Excellence's Special Sauce"
desc = "A custom sauce made from the highly poisonous fly amanita mushrooms. Anyone who ingests it will take variable toxin damage depending on how long it has been in their system, with a higher dosage taking longer to metabolize."
reference = "CESS"
- item = /obj/item/reagent_containers/food/condiment/syndisauce
+ item = /obj/item/reagent_containers/condiment/syndisauce
cost = 10
job = list("Chef")
surplus = 0 // Far too specific in its use.
@@ -206,12 +206,12 @@
//Engineer
/datum/uplink_item/jobspecific/powergloves
- name = "Power Gloves"
- desc = "Insulated gloves that can utilize the power of the station to deliver a short arc of electricity at a target. \
+ name = "Power Bio-Chip"
+ desc = "A Bio-Chip that can utilize the power of the station to deliver a short arc of electricity at a target. \
Must be standing on a powered cable to use. \
- Activated by alt-clicking, or pressing the middle mouse button. Disarm intent will deal stamina damage and cause jittering, while harm intent will deal damage based on the power of the cable you're standing on."
+ Activated by alt-clicking, or pressing the middle mouse button. Disarm intent will deal stamina damage and cause jittering, while harm intent will deal damage based on the power of the cable you're standing on. Can be toggled on / off via the action button."
reference = "PG"
- item = /obj/item/clothing/gloves/color/yellow/power
+ item = /obj/item/bio_chip_implanter/shock
cost = 50
job = list("Station Engineer", "Chief Engineer")
@@ -412,6 +412,16 @@
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
cant_discount = TRUE
+/datum/uplink_item/stealthy_weapons/bearserk
+ name = "Bearserker Pelt"
+ desc = "A bear pelt that infuses the wearer with bear spirits and knowledge on an occultic martial art known as Rage of the Space Bear. \
+ The pelt itself is also armored, providing the wearer great longevity. \
+ Made with love, lots of spirits and lots of the other kind of spirits by the Sydnicate-affiliated cult, Children of Ursa Major."
+ reference = "BSP"
+ item = /obj/item/clothing/head/bearpelt/bearserk
+ cost = 60
+ excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
+
/datum/uplink_item/stealthy_tools/traitor_belt
name = "Traitor's Toolbelt"
desc = "A robust seven-slot belt made for carrying a broad variety of weapons, ammunition and explosives. It's modelled after the standard NT toolbelt so as to avoid suspicion while wearing it."
@@ -663,7 +673,7 @@
/datum/uplink_item/explosives/detomatix
name = "Detomatix PDA Cartridge"
- desc = "When inserted into a personal digital assistant, this cartridge gives you five opportunities to detonate PDAs of crewmembers who have their message feature enabled. The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer. It has a chance to detonate your PDA."
+ desc = "When inserted into a personal digital assistant, this cartridge gives you five opportunities to detonate PDAs of crewmembers who have their message feature enabled. The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer."
reference = "DEPC"
item = /obj/item/cartridge/syndicate
cost = 30
diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm
index 018c865d2bb5..9ab3e9d32014 100644
--- a/code/datums/weather/weather_types/ash_storm.dm
+++ b/code/datums/weather/weather_types/ash_storm.dm
@@ -12,7 +12,7 @@
weather_duration_upper = 1200
weather_overlay = "ash_storm"
- end_message = "The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now."
+ end_message = "The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now."
end_duration = 300
end_overlay = "light_ash"
@@ -32,9 +32,7 @@
/datum/weather/ash_storm/proc/is_shuttle_docked(shuttleId, dockId)
var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId)
- var/obj/docking_port/stationary/S = M.get_docked()
-
- return S.id == dockId
+ return M && M.getDockedId() == dockId
/datum/weather/ash_storm/proc/update_eligible_areas()
var/list/inside_areas = list()
@@ -52,6 +50,10 @@
if(!laborShuttleDocked)
eligible_areas -= get_areas(/area/shuttle/siberia)
+ var/golemShuttleOnPlanet = is_shuttle_docked("freegolem", "freegolem_lavaland")
+ if(!golemShuttleOnPlanet)
+ eligible_areas -= get_areas(/area/shuttle/freegolem)
+
for(var/i in 1 to eligible_areas.len)
var/area/place = eligible_areas[i]
if(place.outdoors)
diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index 3288038d4f1c..ccb43e11a816 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -27,6 +27,7 @@
/area/station/security/brig,
/area/shuttle,
/area/survivalpod, //although survivalpods are off-station, creating one on station no longer protects pods on station from the rad storm
+ /area/syndicate_depot/core, // exterior of depot still dangerous, gotta be inside
/area/ruin, //Let us not completely kill space explorers.
/area/station/command/server
)
diff --git a/code/datums/weather/weather_types/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm
index 4e4d5aab59d2..927030046acd 100644
--- a/code/datums/weather/weather_types/snow_storm.dm
+++ b/code/datums/weather/weather_types/snow_storm.dm
@@ -13,7 +13,7 @@
weather_duration_upper = 1500
end_duration = 100
- end_message = "The snowfall dies down, it should be safe to go outside again."
+ end_message = "The snowfall dies down, it should be safe to go outside again."
// area_type = /area/awaymission/snowdin/outside
target_trait = AWAY_LEVEL
diff --git a/code/datums/wires/airlock_wires.dm b/code/datums/wires/airlock_wires.dm
index 9fe15e604505..d87cc86d2e9a 100644
--- a/code/datums/wires/airlock_wires.dm
+++ b/code/datums/wires/airlock_wires.dm
@@ -7,8 +7,6 @@
holder_type = /obj/machinery/door/airlock
wire_count = 12 // 10 actual, 2 duds.
proper_name = "Airlock"
- window_x = 400
- window_y = 101
/datum/wires/airlock/New(atom/_holder)
wires = list(
diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm
index b4dcd8bd001f..8660a8e64219 100644
--- a/code/datums/wires/alarm.dm
+++ b/code/datums/wires/alarm.dm
@@ -2,8 +2,6 @@
/datum/wires/alarm
holder_type = /obj/machinery/alarm
wire_count = 5
- window_x = 385
- window_y = 90
proper_name = "Air alarm"
/datum/wires/alarm/New(atom/_holder)
diff --git a/code/datums/wires/apc_wires.dm b/code/datums/wires/apc_wires.dm
index 3c322ff37772..ca1167c28206 100644
--- a/code/datums/wires/apc_wires.dm
+++ b/code/datums/wires/apc_wires.dm
@@ -2,8 +2,6 @@
holder_type = /obj/machinery/power/apc
wire_count = 4
proper_name = "APC"
- window_x = 355
- window_y = 97
/datum/wires/apc/New(atom/_holder)
wires = list(WIRE_IDSCAN, WIRE_MAIN_POWER1, WIRE_MAIN_POWER2, WIRE_AI_CONTROL)
diff --git a/code/datums/wires/autolathe_wires.dm b/code/datums/wires/autolathe_wires.dm
index 5339121c85a8..c0b7e14cea03 100644
--- a/code/datums/wires/autolathe_wires.dm
+++ b/code/datums/wires/autolathe_wires.dm
@@ -2,8 +2,6 @@
holder_type = /obj/machinery/autolathe
wire_count = 10
proper_name = "Autolathe"
- window_x = 340
- window_y = 55
/datum/wires/autolathe/New(atom/_holder)
wires = list(WIRE_AUTOLATHE_HACK, WIRE_ELECTRIFY, WIRE_AUTOLATHE_DISABLE)
diff --git a/code/datums/wires/camera_wires.dm b/code/datums/wires/camera_wires.dm
index 39e0cb2c3e11..2bcdfb2ff606 100644
--- a/code/datums/wires/camera_wires.dm
+++ b/code/datums/wires/camera_wires.dm
@@ -4,8 +4,6 @@
holder_type = /obj/machinery/camera
wire_count = 2
proper_name = "Camera"
- window_x = 350
- window_y = 95
/datum/wires/camera/New(atom/_holder)
wires = list(WIRE_FOCUS, WIRE_MAIN_POWER1)
diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm
index acabe00ccaf6..4d68b3fda552 100644
--- a/code/datums/wires/explosive.dm
+++ b/code/datums/wires/explosive.dm
@@ -1,8 +1,6 @@
/datum/wires/explosive
wire_count = 1
proper_name = "Explosive"
- window_x = 320
- window_y = 50
/datum/wires/explosive/New(atom/_holder)
wires = list(WIRE_EXPLODE)
diff --git a/code/datums/wires/mod_wires.dm b/code/datums/wires/mod_wires.dm
index d63c1162eda1..ba83886fb3e9 100644
--- a/code/datums/wires/mod_wires.dm
+++ b/code/datums/wires/mod_wires.dm
@@ -3,8 +3,6 @@
randomize = TRUE //Every modsuit is personalised
wire_count = 6 // 4 actual, 2 duds
proper_name = "MOD control unit"
- window_x = 345
- window_y = 90
/datum/wires/mod/New(atom/holder)
wires = list(WIRE_HACK, WIRE_DISABLE, WIRE_ELECTRIFY, WIRE_INTERFACE)
diff --git a/code/datums/wires/mulebot_wires.dm b/code/datums/wires/mulebot_wires.dm
index cb13b0d67184..437b32bc211f 100644
--- a/code/datums/wires/mulebot_wires.dm
+++ b/code/datums/wires/mulebot_wires.dm
@@ -3,8 +3,6 @@
holder_type = /mob/living/simple_animal/bot/mulebot
wire_count = 10
proper_name = "Mulebot"
- window_x = 370
- window_y = -12
/datum/wires/mulebot/New(atom/_holder)
wires = list(
diff --git a/code/datums/wires/nuclearbomb_wires.dm b/code/datums/wires/nuclearbomb_wires.dm
index b3627ca091c0..6282f8904668 100644
--- a/code/datums/wires/nuclearbomb_wires.dm
+++ b/code/datums/wires/nuclearbomb_wires.dm
@@ -3,8 +3,6 @@
randomize = TRUE
wire_count = 7 // 3 actual, 4 duds.
proper_name = "Nuclear bomb"
- window_x = 345
- window_y = 75
/datum/wires/nuclearbomb/New(atom/_holder)
wires = list(WIRE_BOMB_LIGHT, WIRE_BOMB_TIMING, WIRE_BOMB_SAFETY)
diff --git a/code/datums/wires/particle_accelerator_wires.dm b/code/datums/wires/particle_accelerator_wires.dm
index e285f4cf8988..526ffd802700 100644
--- a/code/datums/wires/particle_accelerator_wires.dm
+++ b/code/datums/wires/particle_accelerator_wires.dm
@@ -2,8 +2,6 @@
wire_count = 5
holder_type = /obj/machinery/particle_accelerator/control_box
proper_name = "Particle accelerator control"
- window_x = 361
- window_y = 22
/datum/wires/particle_acc/control_box/New(atom/_holder)
wires = list(WIRE_PARTICLE_POWER, WIRE_PARTICLE_STRENGTH, WIRE_PARTICLE_INTERFACE, WIRE_PARTICLE_POWER_LIMIT)
diff --git a/code/datums/wires/radio_wires.dm b/code/datums/wires/radio_wires.dm
index 1efee71692d8..2932ca3118af 100644
--- a/code/datums/wires/radio_wires.dm
+++ b/code/datums/wires/radio_wires.dm
@@ -2,8 +2,6 @@
holder_type = /obj/item/radio
wire_count = 3
proper_name = "Radio"
- window_x = 330
- window_y = 37
/datum/wires/radio/New(atom/_holder)
wires = list(WIRE_RADIO_SIGNAL, WIRE_RADIO_RECEIVER, WIRE_RADIO_TRANSMIT)
diff --git a/code/datums/wires/robot_wires.dm b/code/datums/wires/robot_wires.dm
index 927980c57fa9..cde2d653a7c9 100644
--- a/code/datums/wires/robot_wires.dm
+++ b/code/datums/wires/robot_wires.dm
@@ -2,8 +2,6 @@
randomize = TRUE
holder_type = /mob/living/silicon/robot
wire_count = 5
- window_x = 340
- window_y = 106
proper_name = "Cyborg"
/datum/wires/robot/New(atom/_holder)
diff --git a/code/datums/wires/smartfridge_wires.dm b/code/datums/wires/smartfridge_wires.dm
index 3955b1849b0d..78b82939e26d 100644
--- a/code/datums/wires/smartfridge_wires.dm
+++ b/code/datums/wires/smartfridge_wires.dm
@@ -2,8 +2,6 @@
holder_type = /obj/machinery/smartfridge
wire_count = 3
proper_name = "Smartfridge"
- window_x = 340
- window_y = 103
/datum/wires/smartfridge/New(atom/_holder)
wires = list(WIRE_ELECTRIFY, WIRE_IDSCAN, WIRE_THROW_ITEM)
@@ -12,7 +10,6 @@
/datum/wires/smartfridge/secure
randomize = TRUE
wire_count = 4 // 3 actual, 1 dud.
- window_y = 97
/datum/wires/smartfridge/interactable(mob/user)
var/obj/machinery/smartfridge/S = holder
diff --git a/code/datums/wires/suitstorage.dm b/code/datums/wires/suitstorage.dm
index d9df0399dd42..c9fd548f0a63 100644
--- a/code/datums/wires/suitstorage.dm
+++ b/code/datums/wires/suitstorage.dm
@@ -2,8 +2,6 @@
holder_type = /obj/machinery/suit_storage_unit
wire_count = 8
proper_name = "Suit storage unit"
- window_x = 350
- window_y = 85
/datum/wires/suitstorage/New(atom/_holder)
wires = list(WIRE_IDSCAN, WIRE_ELECTRIFY, WIRE_SAFETY, WIRE_SSU_UV)
diff --git a/code/datums/wires/syndicatebomb_wires.dm b/code/datums/wires/syndicatebomb_wires.dm
index bd996f72fccd..e8cb953f43b7 100644
--- a/code/datums/wires/syndicatebomb_wires.dm
+++ b/code/datums/wires/syndicatebomb_wires.dm
@@ -3,8 +3,6 @@
holder_type = /obj/machinery/syndicatebomb
wire_count = 5
proper_name = "Syndicate bomb"
- window_x = 320
- window_y = 22
/datum/wires/syndicatebomb/New(atom/_holder)
wires = list(WIRE_BOMB_DELAY, WIRE_EXPLODE, WIRE_BOMB_UNBOLT,WIRE_BOMB_PROCEED, WIRE_BOMB_ACTIVATE)
diff --git a/code/datums/wires/tesla_coil.dm b/code/datums/wires/tesla_coil.dm
index f4dbf39017a1..30f15539b7ed 100644
--- a/code/datums/wires/tesla_coil.dm
+++ b/code/datums/wires/tesla_coil.dm
@@ -2,8 +2,6 @@
wire_count = 1
holder_type = /obj/machinery/power/tesla_coil
proper_name = "Tesla coil"
- window_x = 320
- window_y = 50
/datum/wires/tesla_coil/New(atom/_holder)
wires = list(WIRE_TESLACOIL_ZAP)
diff --git a/code/datums/wires/vending_wires.dm b/code/datums/wires/vending_wires.dm
index 8fe759af72ef..0d591ca15a36 100644
--- a/code/datums/wires/vending_wires.dm
+++ b/code/datums/wires/vending_wires.dm
@@ -1,8 +1,6 @@
/datum/wires/vending
holder_type = /obj/machinery/economy/vending
wire_count = 4
- window_y = 112
- window_x = 350
proper_name = "Vending machine"
/datum/wires/vending/New(atom/_holder)
diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm
index 896be0f2c908..58fc524c8c0a 100644
--- a/code/datums/wires/wires.dm
+++ b/code/datums/wires/wires.dm
@@ -19,10 +19,6 @@
var/list/colors
/// An associative list of signalers attached to the wires. The wire color is the key, and the signaler object reference is the value.
var/list/assemblies
- /// The width of the wire TGUI window.
- var/window_x = 300
- /// The height of the wire TGUI window. Will get longer as needed, based on the `wire_count`.
- var/window_y = 100
/datum/wires/New(atom/_holder)
..()
@@ -92,10 +88,13 @@
/datum/wires/ui_host()
return holder
-/datum/wires/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/wires/ui_state(mob/user)
+ return GLOB.physical_state
+
+/datum/wires/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "Wires", "[proper_name] wires", window_x, window_y + wire_count * 30, master_ui, state)
+ ui = new(user, src, "Wires", "[proper_name] wires")
ui.open()
/datum/wires/ui_data(mob/user)
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 032046134e81..421a369e4ac4 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -20,6 +20,8 @@
var/map_name
/// Is the lightswitch in this area on? Controls whether or not lights are on and off
var/lightswitch = TRUE
+ /// Is the window tint control in this area on? Controls whether electrochromic windows and doors are tinted or not
+ var/window_tint = FALSE
/// If TRUE, the local powernet in this area will have all its power channels switched off
var/apc_starts_off = FALSE
/// If TRUE, this area's local powernet will require power to properly operate machines
diff --git a/code/game/area/misc_areas.dm b/code/game/area/misc_areas.dm
index b64a443990e0..329e031f3903 100644
--- a/code/game/area/misc_areas.dm
+++ b/code/game/area/misc_areas.dm
@@ -26,6 +26,9 @@
icon_state = "space_near"
dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
+/area/space/nearstation/disposals
+ icon_state = "nearspace_disposals"
+
/area/space/atmosalert()
return
diff --git a/code/game/area/shuttle_areas.dm b/code/game/area/shuttle_areas.dm
index be9f5f44fb22..efd45956d8e5 100644
--- a/code/game/area/shuttle_areas.dm
+++ b/code/game/area/shuttle_areas.dm
@@ -234,63 +234,6 @@
/area/shuttle/research/outpost
icon_state = "shuttle"
-/area/shuttle/salvage
- name = "\improper Salvage Ship"
- icon_state = "yellow"
-
-/area/shuttle/salvage/start
- name = "\improper Middle of Nowhere"
- icon_state = "yellow"
-
-/area/shuttle/salvage/arrivals
- name = "\improper Space Station Auxiliary Docking"
- icon_state = "yellow"
-
-/area/shuttle/salvage/derelict
- name = "\improper Derelict Station"
- icon_state = "yellow"
-
-/area/shuttle/salvage/djstation
- name = "\improper Ruskie DJ Station"
- icon_state = "yellow"
-
-/area/shuttle/salvage/north
- name = "\improper North of the Station"
- icon_state = "yellow"
-
-/area/shuttle/salvage/east
- name = "\improper East of the Station"
- icon_state = "yellow"
-
-/area/shuttle/salvage/south
- name = "\improper South of the Station"
- icon_state = "yellow"
-
-/area/shuttle/salvage/commssat
- name = "\improper The Communications Satellite"
- icon_state = "yellow"
-
-/area/shuttle/salvage/mining
- name = "\improper South-West of the Mining Asteroid"
- icon_state = "yellow"
-
-/area/shuttle/salvage/abandoned_ship
- name = "\improper Abandoned Ship"
- icon_state = "yellow"
- parallax_movedir = WEST
-
-/area/shuttle/salvage/clown_asteroid
- name = "\improper Clown Asteroid"
- icon_state = "yellow"
-
-/area/shuttle/salvage/trading_post
- name = "\improper Trading Post"
- icon_state = "yellow"
-
-/area/shuttle/salvage/transit
- name = "\improper hyperspace"
- icon_state = "shuttle"
-
/area/shuttle/supply
name = "Supply Shuttle"
icon_state = "shuttle3"
diff --git a/code/game/area/ss13_areas/command_areas.dm b/code/game/area/ss13_areas/command_areas.dm
index 1b9314b7fd0a..1e63b839053e 100644
--- a/code/game/area/ss13_areas/command_areas.dm
+++ b/code/game/area/ss13_areas/command_areas.dm
@@ -72,7 +72,3 @@
/area/station/command/customs
name = "Customs"
icon_state = "checkpoint1"
-
-/area/station/command/customs2
- name = "Customs"
- icon_state = "security"
diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm
index 03c3a6751de2..aa68e2d90e61 100644
--- a/code/game/area/ss13_areas/engineering_areas.dm
+++ b/code/game/area/ss13_areas/engineering_areas.dm
@@ -88,11 +88,11 @@
/area/station/engineering/solar/aft
name = "\improper Aft Solar Array"
- icon_state = "aft"
+ icon_state = "Asolars"
/area/station/engineering/solar/starboard
name = "\improper Starboard Solar Array"
- icon_state = "ASsolars"
+ icon_state = "Ssolars"
/area/station/engineering/solar/starboard/aft
name = "\improper Aft Starboard Solar Array"
diff --git a/code/game/area/ss13_areas/legal_areas.dm b/code/game/area/ss13_areas/legal_areas.dm
index f829565ac5c1..c366e054fbcf 100644
--- a/code/game/area/ss13_areas/legal_areas.dm
+++ b/code/game/area/ss13_areas/legal_areas.dm
@@ -3,6 +3,10 @@
name = "\improper Courtroom"
icon_state = "courtroom"
+/area/station/legal/courtroom/gallery
+ name = "\improper Courtroom Gallery"
+ icon_state = "courtroom"
+
/area/station/legal/lawoffice
name = "\improper Law Office"
icon_state = "law"
@@ -13,7 +17,3 @@
icon_state = "magistrate"
sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
-/area/station/legal/courtroom/dap
- name = "\improper Courtroom Defense and Prosecution"
- icon_state = "seccourt"
- sound_environment = SOUND_AREA_LARGE_ENCLOSED
diff --git a/code/game/area/ss13_areas/medical_areas.dm b/code/game/area/ss13_areas/medical_areas.dm
index 1501c839bb34..12c18beab250 100644
--- a/code/game/area/ss13_areas/medical_areas.dm
+++ b/code/game/area/ss13_areas/medical_areas.dm
@@ -39,31 +39,24 @@
icon_state = "patients"
sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
+/area/station/medical/patients_rooms1
+ name = "\improper Patient Room"
+ icon_state = "patients"
+ sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
+
+/area/station/medical/patients_rooms_secondary
+ name = "\improper Patient Room Secondary"
+ icon_state = "patients"
+ sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
+
/area/station/medical/ward
name = "\improper Medbay Patient Ward"
icon_state = "patientsward"
-/area/station/medical/isolation/a
- name = "Isolation A"
- icon_state = "medbayisoa"
-
-/area/station/medical/isolation/b
- name = "Isolation B"
- icon_state = "medbayisob"
-
-/area/station/medical/isolation/c
- name = "Isolation C"
- icon_state = "medbayisoc"
-
-/area/station/medical/isolation
- name = "Isolation Access"
- icon_state = "medbayisoaccess"
-
/area/station/medical/coldroom
name = "Cold Room"
icon_state = "coldroom"
-
/area/station/medical/storage/secondary
name = "Medical Secondary Storage"
icon_state = "medbaysecstorage"
diff --git a/code/game/area/ss13_areas/public_areas.dm b/code/game/area/ss13_areas/public_areas.dm
index a0baa65505ec..f5c9408384e1 100644
--- a/code/game/area/ss13_areas/public_areas.dm
+++ b/code/game/area/ss13_areas/public_areas.dm
@@ -132,6 +132,10 @@
/area/station/hallway/secondary/entry/south
+/area/station/hallway/secondary/entry/east
+
+/area/station/hallway/secondary/entry/west
+
/area/station/hallway/secondary/entry/lounge
name = "\improper Arrivals Lounge"
@@ -159,14 +163,6 @@
name = "\improper Secondary Cryogenic Dormitories"
icon_state = "Sleep"
-/area/station/public/sleep_male
- name = "\improper Male Dorm"
- icon_state = "Sleep"
-
-/area/station/public/sleep_female
- name = "\improper Female Dorm"
- icon_state = "Sleep"
-
/area/station/public/locker
name = "\improper Locker Room"
icon_state = "locker"
@@ -176,12 +172,6 @@
icon_state = "toilet"
sound_environment = SOUND_AREA_SMALL_ENCLOSED
-/area/station/public/toilet/male
- name = "\improper Male Toilets"
-
-/area/station/public/toilet/female
- name = "\improper Female Toilets"
-
/area/station/public/toilet/unisex
name = "\improper Unisex Restroom"
@@ -200,10 +190,6 @@
name = "\improper Mr Chang's"
icon_state = "changs"
-/area/station/public/clothing
- name = "\improper Clothing Shop"
- icon_state = "Theatre"
-
/area/station/public/pet_store
name = "\improper Pet Store"
icon_state = "pet_store"
@@ -226,10 +212,6 @@
name = "Primary Tool Storage"
icon_state = "primarystorage"
-/area/station/public/storage/autolathe
- name = "Autolathe Storage"
- icon_state = "storage"
-
/area/station/public/storage/art
name = "Art Supply Storage"
icon_state = "storage"
@@ -246,9 +228,6 @@
name = "Office Supplies"
icon_state = "office_supplies"
-/area/station/public/recreation
- name = "\improper Recreation Area"
-
/area/station/public/construction
name = "\improper Construction Area"
icon_state = "construction"
diff --git a/code/game/area/ss13_areas/security_areas.dm b/code/game/area/ss13_areas/security_areas.dm
index b384eb63f666..4729423116c2 100644
--- a/code/game/area/ss13_areas/security_areas.dm
+++ b/code/game/area/ss13_areas/security_areas.dm
@@ -51,14 +51,6 @@
name = "\improper Prison Cell Block A"
icon_state = "brigcella"
-/area/station/security/prison/cell_block/B
- name = "\improper Prison Cell Block B"
- icon_state = "brigcellb"
-
-/area/station/security/prison/cell_block/C
- name = "\improper Prison Cell Block C"
- icon_state = "brig"
-
/area/station/security/execution
name = "Execution"
icon_state = "execution"
@@ -78,11 +70,6 @@
name = "Security Equipment Storage"
icon_state = "securityequipmentstorage"
-/area/station/security/interrogation/observation
- name = "Interrogation Observation"
- icon_state = "security"
- can_get_auto_cryod = FALSE
-
/area/station/security/evidence
name = "\improper Evidence Room"
icon_state = "evidence"
@@ -110,10 +97,6 @@
name = "\improper Secure Armory"
icon_state = "secarmory"
-/area/station/security/securehallway
- name = "\improper Brig Secure Hallway"
- icon_state = "securehall"
-
/area/station/security/detective
name = "\improper Detective's Office"
icon_state = "detective"
@@ -133,22 +116,6 @@
name = "\improper Security Checkpoint"
icon_state = "checkpoint1"
-/area/station/security/checkpoint/supply
- name = "Security Post - Cargo Bay"
- icon_state = "checkpoint1"
-
-/area/station/security/checkpoint/engineering
- name = "Security Post - Engineering"
- icon_state = "checkpoint1"
-
-/area/station/security/checkpoint/medical
- name = "Security Post - Medbay"
- icon_state = "checkpoint1"
-
-/area/station/security/checkpoint/science
- name = "Security Post - Science"
- icon_state = "checkpoint1"
-
// Solitary
/area/station/security/permasolitary
name = "Solitary Confinement"
diff --git a/code/game/area/ss13_areas/service_areas.dm b/code/game/area/ss13_areas/service_areas.dm
index 1d524096164b..4639602103e4 100644
--- a/code/game/area/ss13_areas/service_areas.dm
+++ b/code/game/area/ss13_areas/service_areas.dm
@@ -12,10 +12,6 @@
icon_state = "bar"
sound_environment = SOUND_AREA_WOODFLOOR
-/area/station/service/bar/atrium
- name = "Atrium"
- icon_state = "bar"
-
/area/station/service/theatre
name = "\improper Theatre"
icon_state = "Theatre"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 98220ce3ae90..582a307920b6 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -36,6 +36,8 @@
//Detective Work, used for the duplicate data points kept in the scanners
var/list/original_atom
+ /// Materials scannable by detective
+ var/list/suit_fibers
var/admin_spawned = FALSE //was this spawned by an admin? used for stat tracking stuff.
@@ -515,8 +517,10 @@
/atom/proc/welder_act(mob/living/user, obj/item/I)
return
+/// This is when an atom is emagged. Should return false if it fails, or it has no emag_act defined.
/atom/proc/emag_act(mob/user)
SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT, user)
+ return FALSE
/atom/proc/unemag()
return
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index a2a2294907b2..98c6784021b5 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -38,6 +38,13 @@
/// Icon state for thought bubbles. Normally set by mobs.
var/thought_bubble_image = "thought_bubble"
+ // Atmos
+ var/pressure_resistance = 10
+ var/last_high_pressure_movement_air_cycle = 0
+
+ /// UID for the atom which the current atom is orbiting
+ var/orbiting_uid = null
+
/atom/movable/attempt_init(loc, ...)
var/turf/T = get_turf(src)
if(T && SSatoms.initialized != INITIALIZATION_INSSATOMS && GLOB.space_manager.is_zlevel_dirty(T.z))
@@ -394,7 +401,7 @@
step(src, AM.dir)
..()
-/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = INFINITY, dodgeable = TRUE)
+/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = INFINITY, dodgeable = TRUE, block_movement = TRUE)
if(!target || (flags & NODROP) || speed <= 0)
return 0
@@ -435,6 +442,7 @@
TT.diagonals_first = diagonals_first
TT.callback = callback
TT.dodgeable = dodgeable
+ TT.block_movement = block_movement
var/dist_x = abs(target.x - src.x)
var/dist_y = abs(target.y - src.y)
@@ -674,9 +682,11 @@
return
//We inline a MAPTEXT() here, because there's no good way to statically add to a string like this
active_hud.screentip_text.maptext = "[name]"
+ usr.client.moused_over = UID()
/atom/movable/MouseExited(location, control, params)
usr.hud_used.screentip_text.maptext = ""
+ usr.client.moused_over = null
/atom/movable/proc/choose_crush_crit(mob/living/carbon/victim)
if(!length(GLOB.tilt_crits))
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 51d8bbc88417..29124ecc5031 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -503,6 +503,7 @@
holder.icon_state = "hudjani"
holder.alpha = 130
holder.plane = ABOVE_LIGHTING_PLANE
+ holder.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
I'll just put this somewhere near the end...
diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm
index cd7794592742..090aa51320fa 100644
--- a/code/game/dna/dna2.dm
+++ b/code/game/dna/dna2.dm
@@ -370,17 +370,21 @@ GLOBAL_LIST_EMPTY(bad_blocks)
return num2hex(value, 3)
/datum/dna/proc/UpdateUI()
+ var/list/ui_text_list = list()
uni_identity = ""
for(var/block in UI)
- uni_identity += EncodeDNABlock(block)
+ ui_text_list += EncodeDNABlock(block)
+ uni_identity = ui_text_list.Join("")
//testing("New UI: [uni_identity]")
dirtyUI = 0
/datum/dna/proc/UpdateSE()
//var/oldse=struc_enzymes
+ var/list/se_text_list = list()
struc_enzymes = ""
for(var/block in SE)
- struc_enzymes += EncodeDNABlock(block)
+ se_text_list += EncodeDNABlock(block)
+ struc_enzymes = se_text_list.Join("")
//testing("Old SE: [oldse]")
//testing("New SE: [struc_enzymes]")
dirtySE = 0
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 7fb1115727fb..2eff528db17e 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -186,6 +186,7 @@
put_in(L)
if(user.pulling == L)
user.stop_pulling()
+ QDEL_LIST_CONTENTS(L.grabbed_by)
return TRUE
/obj/machinery/dna_scannernew/attackby(obj/item/I, mob/user, params)
@@ -398,13 +399,16 @@
ui_interact(user)
-/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/computer/scan_consolenew/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, datum/tgui/ui = null)
if(user == connected.occupant)
return
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "DNAModifier", name, 660, 700, master_ui, state)
+ ui = new(user, src, "DNAModifier", name)
ui.open()
/obj/machinery/computer/scan_consolenew/ui_data(mob/user)
@@ -732,8 +736,8 @@
var/datum/dna2/record/buf = buffers[bufferId]
- if((buf.types & DNA2_BUF_UI))
- if((buf.types & DNA2_BUF_UE))
+ if(buf.types & DNA2_BUF_UI)
+ if(buf.types & DNA2_BUF_UE)
connected.occupant.real_name = buf.dna.real_name
connected.occupant.name = buf.dna.real_name
connected.occupant.UpdateAppearance(buf.dna.UI.Copy())
diff --git a/code/game/dna/mutations/mutation_powers.dm b/code/game/dna/mutations/mutation_powers.dm
index e2b9231b1a90..b8a1e0370d98 100644
--- a/code/game/dna/mutations/mutation_powers.dm
+++ b/code/game/dna/mutations/mutation_powers.dm
@@ -734,7 +734,7 @@
var/obj/item/organ/external/head/head_organ = M.get_organ("head")
var/obj/item/organ/internal/eyes/eyes_organ = M.get_int_organ(/obj/item/organ/internal/eyes)
- var/new_gender = alert(user, "Please select gender.", "Character Generation", "Male", "Female")
+ var/new_gender = tgui_alert(user, "Please select gender.", "Character Generation", list("Male", "Female"))
if(new_gender)
if(new_gender == "Male")
M.change_gender(MALE)
@@ -750,13 +750,13 @@
//Alt heads.
if(head_organ.dna.species.bodyflags & HAS_ALT_HEADS)
var/list/valid_alt_heads = M.generate_valid_alt_heads()
- var/new_alt_head = input("Please select alternate head", "Character Generation", head_organ.alt_head) as null|anything in valid_alt_heads
+ var/new_alt_head = tgui_input_list(user, "Please select alternate head", "Character Generation", valid_alt_heads)
if(new_alt_head)
M.change_alt_head(new_alt_head)
// hair
var/list/valid_hairstyles = M.generate_valid_hairstyles()
- var/new_style = input("Please select hair style", "Character Generation", head_organ.h_style) as null|anything in valid_hairstyles
+ var/new_style = tgui_input_list(user, "Please select hair style", "Character Generation", valid_hairstyles)
// if new style selected (not cancel)
if(new_style)
@@ -774,7 +774,7 @@
// facial hair
var/list/valid_facial_hairstyles = M.generate_valid_facial_hairstyles()
- new_style = input("Please select facial style", "Character Generation", head_organ.f_style) as null|anything in valid_facial_hairstyles
+ new_style = tgui_input_list(user, "Please select facial style", "Character Generation", valid_facial_hairstyles)
if(new_style)
M.change_facial_hair(new_style)
@@ -792,7 +792,7 @@
//Head accessory.
if(head_organ.dna.species.bodyflags & HAS_HEAD_ACCESSORY)
var/list/valid_head_accessories = M.generate_valid_head_accessories()
- var/new_head_accessory = input("Please select head accessory style", "Character Generation", head_organ.ha_style) as null|anything in valid_head_accessories
+ var/new_head_accessory = tgui_input_list(user, "Please select head accessory style", "Character Generation", valid_head_accessories)
if(new_head_accessory)
M.change_head_accessory(new_head_accessory)
@@ -804,8 +804,8 @@
//Body accessory.
if((M.dna.species.tail && M.dna.species.bodyflags & (HAS_TAIL)) || (M.dna.species.wing && M.dna.species.bodyflags & (HAS_WING)))
var/list/valid_body_accessories = M.generate_valid_body_accessories()
- if(valid_body_accessories.len > 1) //By default valid_body_accessories will always have at the very least a 'none' entry populating the list, even if the user's species is not present in any of the list items.
- var/new_body_accessory = input("Please select body accessory style", "Character Generation", M.body_accessory) as null|anything in valid_body_accessories
+ if(length(valid_body_accessories) > 1) //By default valid_body_accessories will always have at the very least a 'none' entry populating the list, even if the user's species is not present in any of the list items.
+ var/new_body_accessory = tgui_input_list(user, "Please select body accessory style", "Character Generation", valid_body_accessories)
if(new_body_accessory)
M.change_body_accessory(new_body_accessory)
@@ -813,7 +813,7 @@
//Head markings.
if(M.dna.species.bodyflags & HAS_HEAD_MARKINGS)
var/list/valid_head_markings = M.generate_valid_markings("head")
- var/new_marking = input("Please select head marking style", "Character Generation", M.m_styles["head"]) as null|anything in valid_head_markings
+ var/new_marking = tgui_input_list(user, "Please select head marking style", "Character Generation", valid_head_markings)
if(new_marking)
M.change_markings(new_marking, "head")
@@ -824,7 +824,7 @@
//Body markings.
if(M.dna.species.bodyflags & HAS_BODY_MARKINGS)
var/list/valid_body_markings = M.generate_valid_markings("body")
- var/new_marking = input("Please select body marking style", "Character Generation", M.m_styles["body"]) as null|anything in valid_body_markings
+ var/new_marking = tgui_input_list(user, "Please select body marking style", "Character Generation", valid_body_markings)
if(new_marking)
M.change_markings(new_marking, "body")
@@ -834,7 +834,7 @@
//Tail markings.
if(M.dna.species.bodyflags & HAS_TAIL_MARKINGS)
var/list/valid_tail_markings = M.generate_valid_markings("tail")
- var/new_marking = input("Please select tail marking style", "Character Generation", M.m_styles["tail"]) as null|anything in valid_tail_markings
+ var/new_marking = tgui_input_list("Please select tail marking style", "Character Generation", valid_tail_markings)
if(new_marking)
M.change_markings(new_marking, "tail")
@@ -918,20 +918,19 @@
if(user.mind?.miming) // Dont let mimes telepathically talk
to_chat(user,"You can't communicate without breaking your vow of silence.")
return
- var/say = input("What do you wish to say") as text|null
+ var/say = tgui_input_text(user, "What do you wish to say?", "Project Mind")
if(!say || usr.stat)
return
- say = strip_html(say)
- say = pencode_to_html(say, usr, format = 0, fields = 0)
+ say = pencode_to_html(say, usr, format = FALSE, fields = FALSE)
for(var/mob/living/target in targets)
log_say("(TPATH to [key_name(target)]) [say]", user)
user.create_log(SAY_LOG, "Telepathically said '[say]' using [src]", target)
if(target.dna?.GetSEState(GLOB.remotetalkblock))
- target.show_message("You hear [user.real_name]'s voice: [say]")
+ target.show_message("You hear [user.real_name]'s voice: [say]")
else
- target.show_message("You hear a voice that seems to echo around the room: [say]")
- user.show_message("You project your mind into [(target in user.get_visible_mobs()) ? target.name : "the unknown entity"]: [say]")
+ target.show_message("You hear a voice that seems to echo around the room: [say]")
+ user.show_message("You project your mind into [(target in user.get_visible_mobs()) ? target.name : "the unknown entity"]: [say]")
for(var/mob/dead/observer/G in GLOB.player_list)
G.show_message("Telepathic message from [user] ([ghost_follow_link(user, ghost=G)]) to [target] ([ghost_follow_link(target, ghost=G)]): [say]")
@@ -955,8 +954,8 @@
var/message = "You feel your mind expand briefly... (Click to send a message.)"
if(target.dna?.GetSEState(GLOB.remotetalkblock))
message = "You feel [user.real_name] request a response from you... (Click here to project mind.)"
- user.show_message("You offer your mind to [(target in user.get_visible_mobs()) ? target.name : "the unknown entity"].")
- target.show_message("[message]")
+ user.show_message("You offer your mind to [(target in user.get_visible_mobs()) ? target.name : "the unknown entity"].")
+ target.show_message("[message]")
available_targets += target
addtimer(CALLBACK(src, PROC_REF(removeAvailability), target), 100)
@@ -964,7 +963,7 @@
if(target in available_targets)
available_targets -= target
if(!(target in available_targets))
- target.show_message("You feel the sensation fade...")
+ target.show_message("You feel the sensation fade...")
/obj/effect/proc_holder/spell/mindscan/Topic(href, href_list)
var/mob/living/user
@@ -977,18 +976,17 @@
if(!(target in available_targets))
return
available_targets -= target
- var/say = input("What do you wish to say") as text|null
+ var/say = tgui_input_text(user, "What do you wish to say?", "Scan Mind")
if(!say)
return
- say = strip_html(say)
- say = pencode_to_html(say, target, format = 0, fields = 0)
+ say = pencode_to_html(say, target, format = FALSE, fields = FALSE)
user.create_log(SAY_LOG, "Telepathically responded '[say]' using [src]", target)
log_say("(TPATH to [key_name(target)]) [say]", user)
if(target.dna?.GetSEState(GLOB.remotetalkblock))
- target.show_message("You project your mind into [user.name]: [say]")
+ target.show_message("You project your mind into [user.name]: [say]")
else
- target.show_message("You fill the space in your thoughts: [say]")
- user.show_message("You hear [target.name]'s voice: [say]")
+ target.show_message("You fill the space in your thoughts: [say]")
+ user.show_message("You hear [target.name]'s voice: [say]")
for(var/mob/dead/observer/G in GLOB.player_list)
G.show_message("Telepathic response from [target] ([ghost_follow_link(target, ghost=G)]) to [user] ([ghost_follow_link(user, ghost=G)]): [say]")
diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm
index 41a81a2ae2c2..274916d4937e 100644
--- a/code/game/gamemodes/cult/blood_magic.dm
+++ b/code/game/gamemodes/cult/blood_magic.dm
@@ -97,6 +97,21 @@
var/invocation = "Hoi there something's wrong!"
var/health_cost = 0
+/datum/action/innate/cult/blood_spell/proc/get_panel_text()
+ if(initial(charges) == 1)
+ return
+ var/available_charges = hand_magic ? "[hand_magic.uses]" : "[charges]"
+ return "[available_charges]/[initial(charges)]"
+
+/datum/action/innate/cult/blood_spell/UpdateButtonIcon()
+ . = ..()
+ var/text = get_panel_text()
+ if(!text || !button)
+ return
+ var/image/count_down_holder = image('icons/effects/effects.dmi', icon_state = "nothing")
+ count_down_holder.maptext = "
[text]
"
+ button.add_overlay(count_down_holder)
+
/datum/action/innate/cult/blood_spell/Grant(mob/living/owner, datum/action/innate/cult/blood_magic/BM)
if(health_cost)
desc += " Deals [health_cost] damage to your arm per use."
@@ -295,6 +310,7 @@
var/mob/living/carbon/human/H = target
H.Hallucinate(120 SECONDS)
attached_action.charges--
+ attached_action.UpdateButtonIcon()
attached_action.desc = attached_action.base_desc
attached_action.desc += " Has [attached_action.charges] use\s remaining."
attached_action.UpdateButtonIcon()
@@ -358,6 +374,9 @@
charges = 5
magic_path = /obj/item/melee/blood_magic/manipulator
+/datum/action/innate/cult/blood_spell/manipulation/get_panel_text()
+ return hand_magic ? "[hand_magic.uses]" : "[charges]"
+
// The "magic hand" items
/obj/item/melee/blood_magic
name = "\improper magical aura"
@@ -458,7 +477,7 @@
to_chat(user, "In a brilliant flash of red, [L] falls to the ground!")
L.KnockDown(10 SECONDS)
- L.adjustStaminaLoss(60)
+ L.apply_damage(60, STAMINA)
L.apply_status_effect(STATUS_EFFECT_CULT_STUN)
L.flash_eyes(1, TRUE)
if(issilicon(target))
@@ -565,6 +584,7 @@
else
user.visible_message("This victim doesn't have enough arms to complete the restraint!")
return
+ source.UpdateButtonIcon()
..()
/obj/item/melee/blood_magic/shackles/proc/CuffAttack(mob/living/carbon/C, mob/living/user)
@@ -700,37 +720,34 @@
if(user.holy_check())
return
if(proximity_flag)
-
// Shielded suit
if(istype(target, /obj/item/clothing/suit/hooded/cultrobes/cult_shield))
- var/obj/item/clothing/suit/hooded/cultrobes/cult_shield/C = target
- if(C.current_charges < 3)
- uses--
- to_chat(user, "You empower [target] with blood, recharging its shields!")
- playsound(user, 'sound/magic/cult_spell.ogg', 25, TRUE, SOUND_RANGE_SET(7))
- C.current_charges = 3
- C.shield_state = "shield-cult"
- user.update_inv_wear_suit() // The only way a suit can be clicked on is if its on the floor, in the users bag, or on the user, so we will play it safe if it is on the user.
- else
+ var/datum/component/shielded/shield = target.GetComponent(/datum/component/shielded)
+ if(shield.current_charges >= 3)
to_chat(user, "[target] is already at full charge!")
return
+ uses--
+ to_chat(user, "You empower [target] with blood, recharging its shields!")
+ playsound(user, 'sound/magic/cult_spell.ogg', 25, TRUE, SOUND_RANGE_SET(7))
+ shield.current_charges = 3
+ user.update_appearance(UPDATE_ICON)
+ return ..()
// Veil Shifter
- else if(istype(target, /obj/item/cult_shift))
+ if(istype(target, /obj/item/cult_shift))
var/obj/item/cult_shift/S = target
- if(S.uses < 4)
- uses--
- to_chat(user, "You empower [target] with blood, recharging its ability to shift!")
- playsound(user, 'sound/magic/cult_spell.ogg', 25, TRUE, SOUND_RANGE_SET(7))
- S.uses = 4
- S.icon_state = "shifter"
- else
+ if(S.uses >= 4)
to_chat(user, "[target] is already at full charge!")
return
- else
- to_chat(user, "The spell will not work on [target]!")
- return
- ..()
+ uses--
+ to_chat(user, "You empower [target] with blood, recharging its ability to shift!")
+ playsound(user, 'sound/magic/cult_spell.ogg', 25, TRUE, SOUND_RANGE_SET(7))
+ S.uses = 4
+ S.icon_state = "shifter"
+ return ..()
+
+ to_chat(user, "The spell will not work on [target]!")
+ return ..()
//Blood Rite: Absorb blood to heal cult members or summon weapons
/obj/item/melee/blood_magic/manipulator
@@ -860,10 +877,12 @@
target.clean_blood()
else
steal_blood(user, target)
+ source.UpdateButtonIcon()
return
if(isconstruct(target))
heal_construct(user, target)
+ source.UpdateButtonIcon()
return
if(istype(target, /obj/item/blood_orb))
@@ -873,8 +892,10 @@
to_chat(user, "You obtain [candidate.blood] blood from the orb of blood!")
playsound(user, 'sound/misc/enter_blood.ogg', 50, extrarange = SOUND_RANGE_SET(7))
qdel(candidate)
+ source.UpdateButtonIcon()
return
blood_draw(target, user)
+ source.UpdateButtonIcon()
/obj/item/melee/blood_magic/manipulator/proc/blood_draw(atom/target, mob/living/carbon/human/user)
var/temp = 0
@@ -978,3 +999,4 @@
to_chat(user, "You need a free hand for this rite!")
uses += BLOOD_BARRAGE_COST // Refund the charges
qdel(rite)
+ source.UpdateButtonIcon()
diff --git a/code/game/gamemodes/cult/cult_actions.dm b/code/game/gamemodes/cult/cult_actions.dm
index 26c08709a2dd..4db5796e848a 100644
--- a/code/game/gamemodes/cult/cult_actions.dm
+++ b/code/game/gamemodes/cult/cult_actions.dm
@@ -18,7 +18,7 @@
check_flags = AB_CHECK_CONSCIOUS
/datum/action/innate/cult/comm/Activate()
- var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "")
+ var/input = tgui_input_text(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", encode = FALSE)
if(!input || !IsAvailable())
return
cultist_commune(usr, input)
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index ee9c00bfb532..23ec5b39dd0e 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -150,9 +150,6 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
hoodtype = /obj/item/clothing/head/hooded/cult_hoodie
- var/current_charges = 3
- var/shield_state = "shield-cult"
- var/shield_on = "shield-cult"
/obj/item/clothing/head/hooded/cult_hoodie
name = "empowered cultist hood"
@@ -174,25 +171,16 @@
user.Confused(20 SECONDS)
user.Weaken(10 SECONDS)
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(current_charges && !owner.holy_check())
- owner.visible_message("[attack_text] is deflected in a burst of blood-red sparks!")
- current_charges--
- playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- new /obj/effect/temp_visual/cult/sparks(get_turf(owner))
- if(istype(hitby, /obj/item/projectile))
- var/obj/item/projectile/P = hitby
- if(P.shield_buster)
- current_charges = 0 //Change it to remove 3 charges if it ever has its max shield limit increased above 3.
- if(!current_charges)
- owner.visible_message("The runed shield around [owner] suddenly disappears!")
- shield_state = "broken"
- owner.update_inv_wear_suit()
- return TRUE
- return FALSE
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/special_overlays()
- return mutable_appearance('icons/effects/cult_effects.dmi', shield_state, MOB_LAYER + 0.01)
+/obj/item/clothing/suit/hooded/cultrobes/cult_shield/setup_shielding()
+ AddComponent(/datum/component/shielded, recharge_start_delay = 0 SECONDS, shield_icon_file = 'icons/effects/cult_effects.dmi', shield_icon = "shield-cult", run_hit_callback = CALLBACK(src, PROC_REF(shield_damaged)))
+
+/// A proc for callback when the shield breaks, since cult robes are stupid and have different effects
+/obj/item/clothing/suit/hooded/cultrobes/cult_shield/proc/shield_damaged(mob/living/wearer, attack_text, new_current_charges)
+ wearer.visible_message("[attack_text] is deflected in a burst of blood-red sparks!")
+ new /obj/effect/temp_visual/cult/sparks(get_turf(wearer))
+ if(new_current_charges == 0)
+ wearer.visible_message("The runed shield around [wearer] suddenly disappears!")
/obj/item/clothing/suit/hooded/cultrobes/flagellant_robe
name = "flagellant's robes"
@@ -260,7 +248,7 @@
to_chat(user, "[src] crumbles to ashes.")
qdel(src)
-/obj/item/reagent_containers/food/drinks/bottle/unholywater
+/obj/item/reagent_containers/drinks/bottle/unholywater
name = "flask of unholy water"
desc = "Toxic to nonbelievers; this water renews and reinvigorates the faithful of a cult."
icon_state = "holyflask"
@@ -610,7 +598,7 @@
S.trigger()
else
L.KnockDown(10 SECONDS)
- L.adjustStaminaLoss(60)
+ L.apply_damage(60, STAMINA)
L.apply_status_effect(STATUS_EFFECT_CULT_STUN)
L.flash_eyes(1, TRUE)
if(issilicon(L))
diff --git a/code/game/gamemodes/cult/cult_mode.dm b/code/game/gamemodes/cult/cult_mode.dm
index f2abcc0acedc..4f2d21d8b5c1 100644
--- a/code/game/gamemodes/cult/cult_mode.dm
+++ b/code/game/gamemodes/cult/cult_mode.dm
@@ -94,7 +94,6 @@
var/datum/action/innate/toggle_clumsy/A = new
A.Grant(cult_mind.current)
- add_cult_actions(cult_mind)
update_cult_icons_added(cult_mind)
cult_objs.study(cult_mind.current)
to_chat(cult_mind.current, "For more information, check the wiki page: ([GLOB.configuration.url.wiki_url]/index.php/Cultist)")
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index 7db14947e373..efd2e7a02b51 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -145,7 +145,7 @@
selection_prompt = "You study the rituals on the altar..."
selection_title = "Altar"
creation_message = "You kneel before the altar and your faith is rewarded with a %ITEM%!"
- choosable_items = list("Eldritch Whetstone" = /obj/item/whetstone/cult, "Flask of Unholy Water" = /obj/item/reagent_containers/food/drinks/bottle/unholywater,
+ choosable_items = list("Eldritch Whetstone" = /obj/item/whetstone/cult, "Flask of Unholy Water" = /obj/item/reagent_containers/drinks/bottle/unholywater,
"Construct Shell" = /obj/structure/constructshell)
/obj/structure/cult/functional/altar/Initialize(mapload)
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index f9690f5c683a..58f8b12ae5f1 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -70,8 +70,8 @@
if(!(A in summon_areas))
to_chat(user, "[SSticker.cultdat.entity_name] can only be summoned where the veil is weak - in [english_list(summon_areas)]!")
return FALSE
- var/confirm_final = alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence AND your location!",
- "Are you prepared for the final battle?", "My life for [SSticker.cultdat.entity_name]!", "No")
+ var/confirm_final = tgui_alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence AND your location!",
+ "Are you prepared for the final battle?", list("My life for [SSticker.cultdat.entity_name]!", "No"))
if(user)
if(confirm_final == "No" || confirm_final == null)
to_chat(user, "You decide to prepare further before scribing the rune.")
@@ -124,7 +124,7 @@
if(rune == /obj/effect/rune/narsie)
narsie_rune = TRUE
if(initial(rune.req_keyword))
- keyword = stripped_input(user, "Please enter a keyword for the rune.", "Enter Keyword")
+ keyword = tgui_input_text(user, "Please enter a keyword for the rune.", "Enter Keyword")
if(!keyword)
return
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 4627b8d41821..74b722faf3cb 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -369,7 +369,7 @@ structure_check() searches for nearby cultist structures required for the invoca
var/obj/item/melee/cultblade/dagger/D = new(get_turf(src))
if(H.equip_to_slot_if_possible(D, SLOT_HUD_IN_BACKPACK, FALSE, TRUE))
- to_chat(H, "You have a dagger in your backpack. Use it to do [SSticker.cultdat.entity_title1]'s bidding. ")
+ to_chat(H, "You have a dagger in your backpack. Use it to do [SSticker.cultdat.entity_title1]'s bidding.")
else
to_chat(H, "There is a dagger on the floor. Use it to do [SSticker.cultdat.entity_title1]'s bidding.")
@@ -913,7 +913,7 @@ structure_check() searches for nearby cultist structures required for the invoca
log_game("Manifest rune failed - user is a ghost")
return
- var/choice = alert(user, "You tear open a connection to the spirit realm...", null, "Summon a Cult Ghost", "Ascend as a Dark Spirit", "Cancel")
+ var/choice = tgui_alert(user, "You tear open a connection to the spirit realm...", "Invoke", list("Summon a Cult Ghost", "Ascend as a Dark Spirit", "Cancel"))
if(choice == "Summon a Cult Ghost")
if(!is_station_level(z) || istype(get_area(src), /area/space))
to_chat(user, "The veil is not weak enough here to manifest spirits, you must be on station!")
@@ -1001,15 +1001,12 @@ structure_check() searches for nearby cultist structures required for the invoca
/obj/effect/rune/manifest/proc/ghostify(mob/living/user, turf/T)
ADD_TRAIT(user, SCRYING, CULT_TRAIT)
- user.add_atom_colour(RUNE_COLOR_DARKRED, ADMIN_COLOUR_PRIORITY)
user.visible_message("[user] freezes statue-still, glowing an unearthly red.",
"You see what lies beyond. All is revealed. In this form you find that your voice booms above all others.")
- ghost = user.ghostize(TRUE)
+ ghost = user.ghostize(TRUE, RUNE_COLOR_DARKRED, "Dark Spirit of [user.name]")
var/datum/action/innate/cult/comm/spirit/CM = new
var/datum/action/innate/cult/check_progress/V = new
//var/datum/action/innate/cult/ghostmark/GM = new
- ghost.name = "Dark Spirit of [ghost.name]"
- ghost.color = "red"
CM.Grant(ghost)
V.Grant(ghost)
//GM.Grant(ghost)
diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm
index 52edccc9e73a..6ea8194fe61f 100644
--- a/code/game/gamemodes/extended/extended.dm
+++ b/code/game/gamemodes/extended/extended.dm
@@ -2,6 +2,7 @@
name = "extended"
config_tag = "extended"
required_players = 0
+ single_antag_positions = list()
/datum/game_mode/announce()
to_chat(world, "The current game mode is - Extended Role-Playing!")
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index e93cea24c1f6..82d3a6fa07b1 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -43,6 +43,9 @@
var/list/datum/station_goal/station_goals = list() // A list of all station goals for this game mode
+ /// Each item in this list can only be rolled once on average.
+ var/list/single_antag_positions = list("Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
+
/datum/game_mode/proc/announce() //to be calles when round starts
to_chat(world, "Notice: [src] did not define announce()")
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index 8b95f5126ef7..52aee2543b3c 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -237,7 +237,7 @@
if(!istype(T) || !is_station_level(T.z))
to_chat(owner, "You cannot activate the doomsday device while off-station!")
return
- if(alert(owner, "Send arming signal? (true = arm, false = cancel)", "purge_all_life()", "confirm = TRUE;", "confirm = FALSE;") != "confirm = TRUE;")
+ if(tgui_alert(owner, "Send arming signal? (true = arm, false = cancel)", "purge_all_life()", list("confirm = TRUE;", "confirm = FALSE;")) != "confirm = TRUE;")
return
if(active)
return //prevent the AI from activating an already active doomsday
@@ -341,6 +341,7 @@
turret.health += 30
turret.eprojectile = /obj/item/projectile/beam/laser/ai_turret/heavylaser //Once you see it, you will know what it means to FEAR.
turret.eshot_sound = 'sound/weapons/lasercannonfire.ogg'
+ AI.turrets_upgraded = TRUE
//Hostile Station Lockdown: Locks, bolts, and electrifies every airlock on the station. After 90 seconds, the doors reset.
/datum/AI_Module/lockdown
@@ -460,21 +461,21 @@
/datum/AI_Module/overload_machine
module_name = "Machine Overload"
mod_pick_name = "overload"
- description = "Overheats an electrical machine, causing a small explosion and destroying it. Two uses per purchase."
+ description = "Overheats an electrical machine, causing a moderately-sized explosion and destroying it. Four uses per purchase."
cost = 20
power_type = /datum/action/innate/ai/ranged/overload_machine
unlock_text = "You enable the ability for the station's APCs to direct intense energy into machinery."
/datum/action/innate/ai/ranged/overload_machine
name = "Overload Machine"
- desc = "Overheats a machine, causing a small explosion after a short time."
+ desc = "Overheats a machine, causing a moderately-sized explosion after a short time."
button_icon_state = "overload_machine"
- uses = 2
+ uses = 4
linked_ability_type = /obj/effect/proc_holder/ranged_ai/overload_machine
/datum/action/innate/ai/ranged/overload_machine/proc/detonate_machine(obj/machinery/M)
if(M && !QDELETED(M))
- explosion(get_turf(M), 0,1,1,0)
+ explosion(get_turf(M), 0, 3, 5, 0)
if(M) //to check if the explosion killed it before we try to delete it
qdel(M)
@@ -581,7 +582,7 @@
if(!owner_AI.can_place_transformer(src))
return
active = TRUE
- if(alert(owner, "Are you sure you want to place the machine here?", "Are you sure?", "Yes", "No") == "No")
+ if(tgui_alert(owner, "Are you sure you want to place the machine here?", "Are you sure?", list("Yes", "No")) != "Yes")
active = FALSE
return
if(!owner_AI.can_place_transformer(src))
@@ -626,6 +627,107 @@
to_chat(src, "[alert_msg]")
return success
+//Turret Assembly: Assemble an AI turret at the chosen location. One use per purchase
+/datum/AI_Module/place_turret
+ module_name = "Deploy Turret"
+ mod_pick_name = "turretdeployer"
+ description = "Build a turret anywhere that lethally targets organic life in sight."
+ cost = 30
+ power_type = /datum/action/innate/ai/place_turret
+ unlock_text = "You prepare an energy turret for deployment."
+ unlock_sound = 'sound/items/rped.ogg'
+
+/datum/action/innate/ai/place_turret
+ name = "Deploy Turret"
+ desc = "Build a turret anywhere that lethally targets organic life in sight."
+ button_icon_state = "deploy_turret"
+ uses = 1
+ auto_use_uses = FALSE
+ var/image/turf_overlay
+
+/datum/action/innate/ai/place_turret/New()
+ ..()
+ turf_overlay = image('icons/turf/overlays.dmi')
+
+/datum/action/innate/ai/place_turret/Activate()
+ if(active)
+ to_chat(owner, "Your assemblers can only construct one turret at a time.")
+ return
+ if(!owner_AI.can_place_turret(src))
+ return
+ active = TRUE
+ var/response = alert(owner, "Are you sure you want to place a turret here? Deployment will take a few seconds to complete, in which the turret will be vulnerable.", "Are you sure?", "No", "Yes")
+ if(!response || response == "No")
+ active = FALSE
+ return
+ if(!owner_AI.can_place_turret(src))
+ active = FALSE
+ return
+ deploy_turret()
+ active = FALSE
+
+/datum/action/innate/ai/place_turret/proc/deploy_turret()
+ var/turf/T = get_turf(owner_AI.eyeobj)
+
+ //Handles the turret construction and configuration
+ playsound(T, 'sound/items/rped.ogg', 100, TRUE) //Plays a sound both at the location of the construction to alert players and to the user as feedback
+ owner.playsound_local(owner, 'sound/items/rped.ogg', 50, FALSE, use_reverb = FALSE)
+ to_chat(owner, "You order your electronics to assemble a turret. This will take a few seconds.")
+ var/obj/effect/temp_visual/rcd_effect/spawning_effect = new(T)
+ QDEL_IN(spawning_effect, 5 SECONDS)
+
+ //Deploys as lethal. Nonlethals can be enabled.
+ var/obj/machinery/porta_turret/turret = new /obj/machinery/porta_turret/ai_turret(T)
+ turret.disabled = TRUE
+ turret.lethal = TRUE
+ turret.raised = TRUE //While raised, it is vulnerable to damage
+ turret.targetting_is_configurable = FALSE
+ turret.check_synth = TRUE
+ turret.invisibility = 100
+
+ //If turrets are already upgraded, beef it up
+ if(owner_AI.turrets_upgraded)
+ turret.health += 30
+ turret.eprojectile = /obj/item/projectile/beam/laser/ai_turret/heavylaser //Big gun
+ turret.eshot_sound = 'sound/weapons/lasercannonfire.ogg'
+
+ if(do_after_once(owner, 5 SECONDS, target = T, allow_moving = TRUE)) //Once this is done, turret is armed and dangerous
+ turret.raised = initial(turret.raised)
+ turret.invisibility = initial(turret.invisibility)
+ turret.disabled = initial(turret.disabled)
+ new /obj/effect/temp_visual/rcd_effect/end(T)
+ playsound(T, 'sound/items/deconstruct.ogg', 100, TRUE)
+ to_chat(owner, "Turret deployed.")
+ adjust_uses(-1)
+
+/mob/living/silicon/ai/proc/can_place_turret(datum/action/innate/ai/place_turret/action)
+ if(!eyeobj || !isturf(eyeobj.loc) || incapacitated() || !action)
+ return
+
+ var/turf/simulated/floor/deploylocation = get_turf(eyeobj)
+
+ var/image/I = action.turf_overlay
+ I.loc = deploylocation
+ client.images += I
+ I.icon_state = "redOverlay"
+ var/datum/camerachunk/C = GLOB.cameranet.getCameraChunk(deploylocation.x, deploylocation.y, deploylocation.z)
+
+ if(!istype(deploylocation))
+ to_chat(src, "There isn't enough room! Make sure you are placing the machine in a clear area and on a floor.")
+ return FALSE
+ if(!C.visibleTurfs[deploylocation])
+ to_chat(src, "You don't have camera vision of this location!")
+ addtimer(CALLBACK(src, PROC_REF(remove_transformer_image), client, I, deploylocation), 3 SECONDS)
+ return FALSE
+ if(is_blocked_turf(deploylocation))
+ to_chat(src, "That area must be clear of objects!")
+ addtimer(CALLBACK(src, PROC_REF(remove_transformer_image), client, I, deploylocation), 3 SECONDS)
+ return FALSE
+
+ I.icon_state = "greenOverlay" //greenOverlay and redOverlay for success and failure respectively
+ addtimer(CALLBACK(src, PROC_REF(remove_transformer_image), client, I, deploylocation), 3 SECONDS)
+ return TRUE
+
//Blackout: Overloads a random number of lights across the station. Three uses.
/datum/AI_Module/blackout
module_name = "Blackout"
@@ -748,6 +850,7 @@
/datum/AI_Module/cameracrack/upgrade(mob/living/silicon/ai/AI)
if(AI.builtInCamera)
+ AI.cracked_camera = TRUE
QDEL_NULL(AI.builtInCamera)
/datum/AI_Module/engi_upgrade
diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm
index 41d8aad47085..9dc28ac372b1 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction.dm
@@ -10,6 +10,7 @@
required_players = 15
var/max_teams = 4
abductor_teams = 1
+ single_antag_positions = list()
var/list/datum/mind/scientists = list()
var/list/datum/mind/agents = list()
var/list/datum/objective/team_objectives = list()
@@ -206,7 +207,7 @@
if(console.experiment.points >= objective.target_amount)
to_chat(world, "[team_name] team fulfilled its mission!")
else
- to_chat(world, "[team_name] team failed its mission.")
+ to_chat(world, "[team_name] team failed its mission.")
..()
return 1
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index bdac0e91c34d..38f5e35374b2 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -321,7 +321,7 @@
to_chat(user, "Your target is already under a mind-controlling influence!")
return
- var/command = stripped_input(user, "Enter the command for your target to follow. Uses Left: [G.mind_control_uses], Duration: [DisplayTimeText(G.mind_control_duration)]", "Enter command")
+ var/command = tgui_input_text(user, "Enter the command for your target to follow. Uses Left: [G.mind_control_uses], Duration: [DisplayTimeText(G.mind_control_duration)]", "Enter command")
if(!command)
return
@@ -341,7 +341,7 @@
if(L.stat == DEAD)
to_chat(user, "Your target is dead!")
return
- var/message = stripped_input(user, "Write a message to send to your target's brain.", "Enter message")
+ var/message = tgui_input_text(user, "Write a message to send to your target's brain.", "Enter message")
if(!message)
return
if(QDELETED(L) || L.stat == DEAD)
@@ -506,7 +506,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
add_attack_logs(user, L, "Put to sleep with [src]")
else
L.AdjustDrowsy(2 SECONDS)
- to_chat(user, "Sleep inducement works fully only on stunned specimens! ")
+ to_chat(user, "Sleep inducement works fully only on stunned specimens!")
L.visible_message("[user] tried to induce sleep in [L] with [src]!", \
"You suddenly feel drowsy!")
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
index 81a53fe481a9..71890815b0df 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
@@ -29,7 +29,7 @@
/datum/surgery_step/internal/extract_organ/begin_step(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
for(var/obj/item/I in target.internal_organs)
- // Allows for multiple subtypes of heart.
+ // Allows for multiple subtypes of heart. Doesn't use the organ datum so that slimes dont get their brains pulled out of their head
if(istype(I, /obj/item/organ/internal/heart))
IC = I
break
diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm
index 0cb5317bb8a6..b8c75eb8bd32 100644
--- a/code/game/gamemodes/miniantags/abduction/gland.dm
+++ b/code/game/gamemodes/miniantags/abduction/gland.dm
@@ -6,14 +6,15 @@
dead_icon = null
status = ORGAN_ROBOT
origin_tech = "materials=4;biotech=7;abductor=3"
- beating = TRUE
+ organ_datums = list(/datum/organ/heart/always_beating) // alien glands are immune to stopping
+ tough = TRUE //not easily broken by combat damage
+
var/cooldown_low = 300
var/cooldown_high = 300
var/next_activation = 0
var/uses // -1 For inifinite
var/human_only = FALSE
var/active = FALSE
- tough = TRUE //not easily broken by combat damage
var/mind_control_uses = 1
var/mind_control_duration = 1800
@@ -84,9 +85,6 @@
update_gland_hud()
/obj/item/organ/internal/heart/gland/on_life()
- if(!beating)
- // alien glands are immune to stopping.
- beating = TRUE
if(!active)
return
if(!ownerCheck())
@@ -265,7 +263,7 @@
/obj/item/organ/internal/heart/gland/egg/activate()
owner.visible_message("[owner] [pick(EGG_LAYING_MESSAGES)]")
- new /obj/item/reagent_containers/food/snacks/egg/gland(get_turf(owner))
+ new /obj/item/food/snacks/egg/gland(get_turf(owner))
/obj/item/organ/internal/heart/gland/electric
cooldown_low = 800
diff --git a/code/game/gamemodes/miniantags/abduction/machinery/abductor_camera.dm b/code/game/gamemodes/miniantags/abduction/machinery/abductor_camera.dm
index 1a0dd8c0bb4e..d4aac9db2692 100644
--- a/code/game/gamemodes/miniantags/abduction/machinery/abductor_camera.dm
+++ b/code/game/gamemodes/miniantags/abduction/machinery/abductor_camera.dm
@@ -89,7 +89,9 @@
return
var/obj/machinery/abductor/console/console = target
- console.TeleporterRetrieve()
+ if(!console.TeleporterRetrieve())
+ to_chat(owner, "Error, unable to recall target. Please ensure they are not buckled, and that you have waited the required 10000 milliseconds!")
+ playsound(owner, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
/datum/action/innate/teleport_self
name = "Send Self"
@@ -124,7 +126,7 @@
if(!target || !iscarbon(owner))
return
var/obj/machinery/abductor/console/console = target
- console.SelectDisguise(remote=1)
+ console.SelectDisguise(TRUE, usr)
/datum/action/innate/set_droppoint
name = "Set Experiment Release Point"
diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm
index 3946527036b7..65a5d01cc9f6 100644
--- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm
+++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm
@@ -102,7 +102,6 @@
dat += "NO AGENT VEST DETECTED"
var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500)
popup.set_content(dat)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
popup.open()
/obj/machinery/abductor/console/Topic(href, href_list)
@@ -120,7 +119,7 @@
if(vest)
vest.toggle_nodrop()
else if(href_list["select_disguise"])
- SelectDisguise()
+ SelectDisguise(FALSE, usr)
else if(href_list["dispense"])
switch(href_list["dispense"])
if("baton")
@@ -140,7 +139,7 @@
/obj/machinery/abductor/console/proc/TeleporterRetrieve()
if(pad && gizmo && gizmo.marked)
- pad.Retrieve(gizmo.marked)
+ return pad.Retrieve(gizmo.marked)
/obj/machinery/abductor/console/proc/TeleporterSend()
if(pad)
@@ -150,10 +149,10 @@
if(vest)
vest.flip_mode()
-/obj/machinery/abductor/console/proc/SelectDisguise(remote = 0)
- var/entry_name = input( "Choose Disguise", "Disguise") as null|anything in disguises
+/obj/machinery/abductor/console/proc/SelectDisguise(remote, mob/user)
+ var/entry_name = tgui_input_list(user, "Choose Disguise", "Abductor Disguises", disguises)
var/datum/icon_snapshot/chosen = disguises[entry_name]
- if(chosen && (remote || in_range(usr,src)))
+ if(chosen && (remote || in_range(user, src)))
vest.SetDisguise(chosen)
/obj/machinery/abductor/console/proc/SetDroppoint(turf/location,user)
@@ -165,9 +164,7 @@
pad.teleport_target = location
to_chat(user, "Location marked as test subject release point.")
-
/obj/machinery/abductor/console/proc/Link_Abduction_Equipment() // these must all be explicitly `in machines` or they will not properly link.
-
for(var/obj/machinery/abductor/pad/p in GLOB.abductor_equipment)
if(p.team == team)
pad = p
diff --git a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm
index 8d490c75109e..0370c73435df 100644
--- a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm
+++ b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm
@@ -40,10 +40,13 @@
if(!length(colors))
colors = shuffle(color_pool)
-/obj/machinery/abductor/gland_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/abductor/gland_dispenser/ui_state(mob/user)
+ return GLOB.physical_state
+
+/obj/machinery/abductor/gland_dispenser/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "GlandDispenser", name, 300, 338, master_ui, state)
+ ui = new(user, src, "GlandDispenser", name)
ui.open()
/obj/machinery/abductor/gland_dispenser/ui_data(mob/user)
diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm
index e23b5075a55b..2322549036a9 100644
--- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm
+++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm
@@ -9,7 +9,7 @@
var/credits = 0
var/list/history = list()
var/list/abductee_minds = list()
- var/flash = " - || - "
+ var/flash = "Idle."
var/obj/machinery/abductor/console/console
var/mob/living/carbon/human/occupant
@@ -38,17 +38,19 @@
return TRUE
visible_message("[user] puts [target] into [src].")
+ QDEL_LIST_CONTENTS(target.grabbed_by)
target.forceMove(src)
occupant = target
+ flash = "Machine ready."
update_icon(UPDATE_ICON_STATE)
add_fingerprint(user)
return TRUE
/obj/machinery/abductor/experiment/attack_hand(mob/user)
- if(..())
+ if(!isabductor(user))
+ to_chat(user, "You don't understand any of the alien writing!")
return
-
- experimentUI(user)
+ ui_interact(user)
/obj/machinery/abductor/experiment/proc/dissection_icon(mob/living/carbon/human/H)
var/icon/I = icon(H.stand_icon)
@@ -60,75 +62,62 @@
return I
-/obj/machinery/abductor/experiment/proc/experimentUI(mob/user)
- var/dat
- dat += "
"
- else
- dat += "ERR: Unable to retrieve image data for occupant."
- dat += "Probe "
- dat += "Dissect "
- dat += "Analyze "
- dat += "
"
- else
- dat += "Experiment "
-
- if(!occupant)
- dat += "
Machine Unoccupied
"
- else
- dat += "
Subject Status :
"
- dat += "[occupant.name] => "
- switch(occupant.stat)
- if(0)
- dat += "Conscious"
- if(1)
- dat += "Unconscious"
- else
- dat += "Deceased"
- dat += " "
- dat += "[flash]"
- dat += " "
- dat += "Scan"
- dat += "Eject Occupant" : "unoccupied=1'>Unoccupied"]"
- var/datum/browser/popup = new(user, "experiment", "Probing Console", 300, 300)
- popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
- popup.set_content(dat)
- popup.open()
-
-/obj/machinery/abductor/experiment/Topic(href, href_list)
- if(..() || usr == occupant)
- return
- usr.set_machine(src)
- if(href_list["refresh"])
- updateUsrDialog()
+ var/mob/living/mob_occupant = occupant
+ data["occupant_name"] = mob_occupant.name
+ data["occupant_status"] = mob_occupant.stat
+ return data
+
+/obj/machinery/abductor/experiment/ui_act(action, list/params)
+ . = ..()
+ if(.)
return
- if(href_list["eject"])
- eject_abductee()
- return
- if(occupant && occupant.stat != DEAD)
- if(href_list["experiment"])
- flash = Experiment(occupant,href_list["experiment"])
- updateUsrDialog()
- add_fingerprint(usr)
-/obj/machinery/abductor/experiment/proc/Experiment(mob/occupant,type)
+ switch(action)
+ if("door")
+ eject_abductee()
+ flash = "Specimen ejected!"
+
+ if("experiment")
+ if(!occupant)
+ return
+ var/mob/living/mob_occupant = occupant
+ if(mob_occupant.stat == DEAD)
+ return
+ flash = experiment(mob_occupant, params["experiment_type"], usr)
+ return TRUE
+
+/obj/machinery/abductor/experiment/proc/experiment(mob/occupant,type)
var/mob/living/carbon/human/H = occupant
var/point_reward = 0
if(H in history)
- return "Specimen already in database."
+ return "Specimen already in database."
if(H.stat == DEAD)
atom_say("Specimen deceased - please provide fresh sample.")
- return "Specimen deceased."
+ return "Specimen deceased."
var/obj/item/organ/internal/heart/gland/GlandTest = locate() in H.internal_organs
if(!GlandTest)
atom_say("Experimental dissection not detected!")
- return "No glands detected!"
+ return "No glands detected!"
if(H.mind != null && H.ckey != null)
history += H
abductee_minds += H.mind
@@ -158,22 +147,22 @@
point_reward++
if(point_reward > 0)
eject_abductee()
- SendBack(H)
- playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
+ send_back(H)
+ playsound(src.loc, 'sound/machines/ding.ogg', 50, TRUE)
points += point_reward
credits += point_reward
- return "Experiment successful! [point_reward] new data-points collected."
+ return "Experiment successful! [point_reward] new data-points collected."
else
- playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 1)
- return "Experiment failed! No replacement organ detected."
+ playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, TRUE)
+ return "Experiment failed! No replacement organ detected."
else
atom_say("Brain activity nonexistent - disposing sample...")
eject_abductee()
- SendBack(H)
- return "Specimen braindead - disposed."
+ send_back(H)
+ return "Specimen braindead - disposed."
-/obj/machinery/abductor/experiment/proc/SendBack(mob/living/carbon/human/H)
+/obj/machinery/abductor/experiment/proc/send_back(mob/living/carbon/human/H)
H.Sleeping(16 SECONDS)
if(console && console.pad && console.pad.teleport_target)
H.forceMove(console.pad.teleport_target)
@@ -201,6 +190,7 @@
var/mob/living/carbon/human/H = grabbed.affecting
H.forceMove(src)
occupant = H
+ flash = "Machine ready."
update_icon(UPDATE_ICON_STATE)
add_fingerprint(user)
qdel(G)
diff --git a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm
index f655a304455c..57e913418658 100644
--- a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm
+++ b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm
@@ -7,8 +7,11 @@
var/turf/teleport_target
/obj/machinery/abductor/pad/proc/Warp(mob/living/target)
- if(!target.buckled)
- target.forceMove(get_turf(src))
+ if(target.buckled || target.has_status_effect(STATUS_EFFECT_ABDUCTOR_COOLDOWN))
+ return FALSE
+ target.forceMove(get_turf(src))
+ target.apply_status_effect(STATUS_EFFECT_ABDUCTOR_COOLDOWN)
+ return TRUE
/obj/machinery/abductor/pad/proc/Send()
if(teleport_target == null)
@@ -23,7 +26,7 @@
/obj/machinery/abductor/pad/proc/Retrieve(mob/living/target)
flick("alien-pad", src)
new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
- Warp(target)
+ return Warp(target)
/obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target)
new/obj/effect/temp_visual/teleport_abductor(place)
@@ -31,6 +34,7 @@
flick("alien-pad", src)
target.forceMove(place)
new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
+ target.apply_status_effect(STATUS_EFFECT_ABDUCTOR_COOLDOWN)
/obj/machinery/abductor/pad/proc/PadToLoc(place)
new/obj/effect/temp_visual/teleport_abductor(place)
@@ -39,6 +43,7 @@
for(var/mob/living/target in src.loc)
target.forceMove(place)
new /obj/effect/temp_visual/dir_setting/ninja(get_turf(target), target.dir)
+ target.apply_status_effect(STATUS_EFFECT_ABDUCTOR_COOLDOWN)
/obj/effect/temp_visual/teleport_abductor
name = "Huh"
diff --git a/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm b/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm
index e0a32fe54689..594ede9117e0 100644
--- a/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm
+++ b/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm
@@ -193,7 +193,7 @@
if(!choice)
return
- var/msg = stripped_input(usr, "What do you wish to tell [choice]?", null, "")
+ var/msg = tgui_input_text(usr, "What do you wish to tell [choice]?", null, "")
if(!(msg))
return
log_say("(SLAUGHTER to [key_name(choice)]) [msg]", usr)
@@ -212,6 +212,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "demon_heart"
origin_tech = "combat=5;biotech=7"
+ organ_datums = list(/datum/organ/heart/always_beating)
/obj/item/organ/internal/heart/demon/update_icon_state()
return //always beating visually
@@ -219,9 +220,6 @@
/obj/item/organ/internal/heart/demon/prepare_eat()
return // Just so people don't accidentally waste it
-/obj/item/organ/internal/heart/demon/Stop()
- return 0 // Always beating.
-
/obj/item/organ/internal/heart/demon/attack_self(mob/living/user)
user.visible_message("[user] raises [src] to [user.p_their()] mouth and tears into it with [user.p_their()] teeth!", \
"An unnatural hunger consumes you. You raise [src] to your mouth and devour it!")
@@ -246,7 +244,7 @@
// Eating a 2nd heart. Gives the ability to drag people into blood and eat them.
if(HAS_TRAIT(user, TRAIT_BLOODCRAWL))
- to_chat(user, "You feel differ- CONSUME THEM! ")
+ to_chat(user, "You feel differ- CONSUME THEM!")
ADD_TRAIT(user, TRAIT_BLOODCRAWL_EAT, "bloodcrawl_eat")
qdel(src) // Replacing their demon heart with another demon heart is pointless, just delete this one and return.
return TRUE
diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index bf2cc95482d2..f3ede2875d14 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -29,7 +29,7 @@
melee_damage_lower = 15
melee_damage_upper = 15
AIStatus = AI_OFF
- butcher_results = list(/obj/item/reagent_containers/food/snacks/ectoplasm = 1)
+ butcher_results = list(/obj/item/food/snacks/ectoplasm = 1)
var/summoned = FALSE
var/cooldown = 0
var/damage_transfer = 1 //how much damage from each attack we transfer to the owner
@@ -208,7 +208,7 @@
/mob/living/simple_animal/hostile/guardian/proc/Communicate(message)
var/input
if(!message)
- input = stripped_input(src, "Please enter a message to tell your summoner.", "Guardian", "")
+ input = tgui_input_text(src, "Please enter a message to tell your summoner.", "Guardian")
else
input = message
if(!input || !summoner)
@@ -278,12 +278,12 @@
if(user.mind && (ischangeling(user) || user.mind.has_antag_datum(/datum/antagonist/vampire)))
to_chat(user, "[ling_failure]")
return
- if(used == TRUE)
+ if(used)
to_chat(user, "[used_message]")
return
used = TRUE // Set this BEFORE the popup to prevent people using the injector more than once, polling ghosts multiple times, and receiving multiple guardians.
- var/choice = alert(user, "[confirmation_message]",, "Yes", "No")
- if(choice == "No")
+ var/choice = tgui_alert(user, "[confirmation_message]", "Confirm", list("Yes", "No"))
+ if(choice != "Yes")
to_chat(user, "You decide against using the [name].")
used = FALSE
return
@@ -295,7 +295,7 @@
picked_random_type = pick(possible_guardians)
guardian_type = picked_random_type
else
- guardian_type = input(user, "Pick the type of [mob_name]", "[mob_name] Creation") as null|anything in possible_guardians
+ guardian_type = tgui_input_list(user, "Pick the type of [mob_name]", "[mob_name] Creation", possible_guardians)
if(!guardian_type)
to_chat(user, "You decide against using the [name].")
used = FALSE
diff --git a/code/game/gamemodes/miniantags/guardian/host_actions.dm b/code/game/gamemodes/miniantags/guardian/host_actions.dm
index a6df9937431d..8a622789e347 100644
--- a/code/game/gamemodes/miniantags/guardian/host_actions.dm
+++ b/code/game/gamemodes/miniantags/guardian/host_actions.dm
@@ -27,7 +27,7 @@
button_icon_state = "communicate"
/datum/action/guardian/communicate/Trigger(left_click)
- var/input = stripped_input(owner, "Enter a message to tell your guardian:", "Message", "")
+ var/input = tgui_input_text(owner, "Enter a message to tell your guardian:", "Message")
if(!input || !guardian)
return
@@ -76,8 +76,8 @@
to_chat(owner, "This ability is still recharging.")
return
- var/confirm = alert("Are you sure you want replace your guardian's player?", "Confirm", "Yes", "No")
- if(confirm == "No")
+ var/confirm = tgui_alert(owner, "Are you sure you want replace your guardian's player?", "Confirm", list("Yes", "No"))
+ if(confirm != "Yes")
return
// Do this immediately, so the user can't spam a bunch of polls.
@@ -149,12 +149,11 @@
to_chat(guardian_user, "Surveillance trap deployed!")
return TRUE
else
- to_chat(guardian_user, "You have too many traps deployed. Delete one to place another.")
- var/picked_snare = input(guardian_user, "Pick which trap to disarm", "Disarm Trap") as null|anything in guardian_user.snares
+ var/picked_snare = tgui_input_list(guardian_user, "You have too many snares deployed! Delete one to place another.", "Disarm Snare", guardian_user.snares)
if(picked_snare)
guardian_user.snares -= picked_snare
qdel(picked_snare)
- to_chat(src, "Snare disarmed.")
+ to_chat(user, "Snare disarmed.")
revert_cast()
/obj/effect/proc_holder/spell/choose_battlecry
@@ -171,7 +170,7 @@
/obj/effect/proc_holder/spell/choose_battlecry/cast(list/targets, mob/living/user = usr)
var/mob/living/simple_animal/hostile/guardian/punch/guardian_user = user
- var/input = stripped_input(guardian_user, "What do you want your battlecry to be? Max length of 5 characters.", ,"", 6)
+ var/input = tgui_input_text(guardian_user, "What do you want your battlecry to be? Max length of 6 characters.", "Change Battlecry", guardian_user.battlecry, 6)
if(!input)
revert_cast()
return
diff --git a/code/game/gamemodes/miniantags/guardian/types/gaseous.dm b/code/game/gamemodes/miniantags/guardian/types/gaseous.dm
index 221d2833f981..63b9ae2a6b6a 100644
--- a/code/game/gamemodes/miniantags/guardian/types/gaseous.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/gaseous.dm
@@ -44,7 +44,7 @@
target_turf.air_update_turf()
/mob/living/simple_animal/hostile/guardian/gaseous/ToggleMode()
- var/picked_gas = input("Select a gas to expel.", "Gas Producer") as null|anything in possible_gases
+ var/picked_gas = tgui_input_list(src, "Select a gas to expel.", "Gas Producer", possible_gases)
if(!picked_gas)
moles_of_gas = null
to_chat(src, "You stopped expelling gas.")
diff --git a/code/game/gamemodes/miniantags/guardian/types/healer.dm b/code/game/gamemodes/miniantags/guardian/types/healer.dm
index 466a448f7284..0ceeee7dadb0 100644
--- a/code/game/gamemodes/miniantags/guardian/types/healer.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/healer.dm
@@ -132,7 +132,7 @@
if(!Adjacent(A))
to_chat(src, "You must be adjacent to your target!")
return
- if((A.anchored))
+ if(A.anchored)
to_chat(src, "Your target can not be anchored!")
return
to_chat(src, "You begin to warp [A]")
diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm
index be867dcdab5b..312117880f09 100644
--- a/code/game/gamemodes/miniantags/morph/morph.dm
+++ b/code/game/gamemodes/miniantags/morph/morph.dm
@@ -34,7 +34,7 @@
wander = FALSE
attacktext = "glomps"
attack_sound = 'sound/effects/blobattack.ogg'
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
+ butcher_results = list(/obj/item/food/snacks/meat/slab = 2)
/// If the morph is disguised or not
var/morphed = FALSE
diff --git a/code/game/gamemodes/miniantags/pulsedemon/cross_shock_component.dm b/code/game/gamemodes/miniantags/pulsedemon/cross_shock_component.dm
index 0934f127f5cf..1c15fdb1a820 100644
--- a/code/game/gamemodes/miniantags/pulsedemon/cross_shock_component.dm
+++ b/code/game/gamemodes/miniantags/pulsedemon/cross_shock_component.dm
@@ -40,11 +40,11 @@
if(!our_cable || !our_cable.powernet || !our_cable.powernet.available_power)
return
var/area/to_deduct_from = get_area(our_cable)
- thing_were_gonna_shock.electrocute_act(shock_damage, src)
+ thing_were_gonna_shock.electrocute_act(shock_damage, source)
to_deduct_from.powernet.use_active_power(energy_cost)
playsound(get_turf(parent), 'sound/effects/eleczap.ogg', 30, TRUE)
else
- thing_were_gonna_shock.electrocute_act(shock_damage, src)
+ thing_were_gonna_shock.electrocute_act(shock_damage, source)
playsound(get_turf(parent), 'sound/effects/eleczap.ogg', 30, TRUE)
COOLDOWN_START(src, last_shock, delay_between_shocks)
diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
index f5a0087f2342..155cb343461f 100644
--- a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
+++ b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
@@ -142,6 +142,7 @@
RegisterSignal(SSdcs, COMSIG_GLOB_CABLE_UPDATED, PROC_REF(cable_updated_handler))
RegisterSignal(src, COMSIG_BODY_TRANSFER_TO, PROC_REF(make_pulse_antagonist))
+ RegisterSignal(src, COMSIG_ATOM_EMP_ACT, PROC_REF(handle_emp))
current_power = locate(/obj/machinery/power) in loc
// in the case that both current_power and current_cable are null, the pulsedemon will die the next tick
@@ -253,7 +254,6 @@
greeting.Add(mind.prepare_announce_objectives(FALSE))
to_chat(src, chat_box_red(greeting.Join(" ")))
SSticker.mode.traitors |= mind
- return
/mob/living/simple_animal/demon/pulse_demon/proc/give_spells()
AddSpell(new /obj/effect/proc_holder/spell/pulse_demon/cycle_camera)
@@ -379,6 +379,7 @@
current_power = new_power
current_cable = null
forceMove(current_power) // we go inside the machine
+ RegisterSignal(current_power, COMSIG_ATOM_EMP_ACT, PROC_REF(handle_emp))
playsound(src, 'sound/effects/eleczap.ogg', 15, TRUE)
do_sparks(rand(2, 4), FALSE, src)
if(isapc(current_power))
@@ -388,6 +389,8 @@
INVOKE_ASYNC(src, PROC_REF(try_hijack_apc), current_power)
else if(new_cable)
current_cable = new_cable
+ if(current_power)
+ UnregisterSignal(current_power, COMSIG_ATOM_EMP_ACT)
current_power = null
update_controlling_area()
if(!isturf(loc))
@@ -695,11 +698,10 @@
LAZYADD(apc_images[apc_turf], apc_image)
client.images += apc_image
-/mob/living/simple_animal/demon/pulse_demon/emp_act(severity)
+/mob/living/simple_animal/demon/pulse_demon/proc/handle_emp(datum/source, severity)
+ SIGNAL_HANDLER
if(emp_debounce)
return
-
- . = ..()
visible_message("[src] [pick("fizzles", "wails", "flails")] in anguish!")
playsound(get_turf(src), pick(hurt_sounds), 30, TRUE)
throw_alert(ALERT_CATEGORY_NOREGEN, /obj/screen/alert/pulse_noregen)
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
index 061f5b9a786b..2ea56a6ccdf9 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
@@ -67,7 +67,7 @@
if(do_after(src, 20, 0, target = target)) //how about now
if(!target.stat)
to_chat(src, "They are now powerful enough to fight off your draining.")
- to_chat(target, "You feel something tugging across your body before subsiding.")
+ to_chat(target, "You feel something tugging across your body before subsiding.")
draining = FALSE
return //hey, wait a minute...
to_chat(src, "You begin siphoning essence from [target]'s soul.")
@@ -133,7 +133,7 @@
/obj/effect/proc_holder/spell/revenant_transmit/cast(list/targets, mob/living/simple_animal/revenant/user = usr)
for(var/mob/living/M in targets)
spawn(0)
- var/msg = stripped_input(user, "What do you wish to tell [M]?", null, "")
+ var/msg = tgui_input_text(user, "What do you wish to tell [M]?", "Transmit")
if(!msg)
cooldown_handler.revert_cast()
return
@@ -497,7 +497,7 @@
/mob/living/carbon/human/defile()
to_chat(src, "You suddenly feel [pick("sick and tired", "tired and confused", "nauseated", "dizzy")].")
- adjustStaminaLoss(60)
+ apply_damage(60, STAMINA)
adjustToxLoss(5)
AdjustConfused(40 SECONDS, bound_lower = 0, bound_upper = 60 SECONDS)
new /obj/effect/temp_visual/revenant(loc)
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 4bc83c1c492d..b4a32179dd30 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -13,6 +13,7 @@
required_players = 30 // 30 players - 5 players to be the nuke ops = 25 players remaining
required_enemies = 5
recommended_enemies = 5
+ single_antag_positions = list()
var/const/agents_possible = 5 //If we ever need more syndicate agents.
diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm
index 0cc132b2abd8..178399588d9b 100644
--- a/code/game/gamemodes/nuclear/nuclear_challenge.dm
+++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm
@@ -21,20 +21,20 @@
return
declaring_war = TRUE
- var/are_you_sure = alert(user, "Consult your team carefully before you declare war on [station_name()]. Are you sure you want to alert the enemy crew? You have [-round((world.time-SSticker.round_start_time - CHALLENGE_TIME_LIMIT)/10)] seconds to decide.", "Declare war?", "Yes", "No")
+ var/are_you_sure = tgui_alert(user, "Consult your team carefully before you declare war on [station_name()]. Are you sure you want to alert the enemy crew? You have [-round((world.time-SSticker.round_start_time - CHALLENGE_TIME_LIMIT)/10)] seconds to decide.", "Declare war?", list("Yes", "No"))
declaring_war = FALSE
if(!check_allowed(user))
return
- if(are_you_sure == "No")
+ if(are_you_sure != "Yes")
to_chat(user, "On second thought, the element of surprise isn't so bad after all.")
return
var/war_declaration = "[user.real_name] has declared [user.p_their()] intent to utterly destroy [station_name()] with a nuclear device, and dares the crew to try and stop them."
declaring_war = TRUE
- var/custom_threat = alert(user, "Do you want to customize your declaration?", "Customize?", "Yes", "No")
+ var/custom_threat = tgui_alert(user, "Do you want to customize your declaration?", "Customize?", list("Yes", "No"))
declaring_war = FALSE
if(!check_allowed(user))
@@ -42,7 +42,7 @@
if(custom_threat == "Yes")
declaring_war = TRUE
- war_declaration = stripped_input(user, "Insert your custom declaration", "Declaration")
+ war_declaration = tgui_input_text(user, "Insert your custom declaration", "Declaration")
declaring_war = FALSE
if(!check_allowed(user) || !war_declaration)
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index f20e122a817f..8f664e7b9d63 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -277,7 +277,7 @@ GLOBAL_VAR(bomb_set)
else
if(!panel_open)
to_chat(user, "[src] emits a buzzing noise, the panel staying locked in.")
- if(panel_open == TRUE)
+ if(panel_open)
panel_open = FALSE
to_chat(user, "You screw the control panel of [src] back on.")
core_stage = removal_stage
@@ -335,7 +335,7 @@ GLOBAL_VAR(bomb_set)
/obj/machinery/nuclearbomb/attack_ghost(mob/user as mob)
if(!panel_open)
- return ui_interact(user, state = GLOB.viewer_state)
+ return ui_interact(user)
if(removal_stage != NUKE_CORE_FULLY_EXPOSED || !core)
return wires.Interact(user)
@@ -356,10 +356,13 @@ GLOBAL_VAR(bomb_set)
core = null
update_icon(UPDATE_OVERLAYS)
-/obj/machinery/nuclearbomb/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/nuclearbomb/ui_state(mob/user)
+ return GLOB.physical_state
+
+/obj/machinery/nuclearbomb/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "NuclearBomb", name, 450, 300, master_ui, state)
+ ui = new(user, src, "NuclearBomb", name)
ui.open()
/obj/machinery/nuclearbomb/ui_data(mob/user)
@@ -436,9 +439,9 @@ GLOBAL_VAR(bomb_set)
yes_code = FALSE
return
// If no code set, enter new one
- var/tempcode = input(usr, "Code", "Input Code", null) as num|null
+ var/tempcode = tgui_input_number(usr, "Code", "Input Code", max_value = 999999)
if(tempcode)
- code = min(max(round(tempcode), 0), 999999)
+ code = tempcode
if(code == r_code)
yes_code = TRUE
code = null
@@ -475,9 +478,10 @@ GLOBAL_VAR(bomb_set)
switch(action)
if("set_time")
- var/time = input(usr, "Detonation time (seconds, min 120, max 600)", "Input Time", 120) as num|null
- if(time)
- timeleft = min(max(round(time), 120), 600)
+ var/time = tgui_input_number(usr, "Detonation time (seconds, min 120, max 600)", "Input Time", 120, 600, 120)
+ if(!time)
+ return
+ timeleft = time
if("toggle_safety")
safety = !(safety)
if(safety)
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index 5e478757e797..1d39085b6143 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -186,7 +186,7 @@
target = null
location = null
- switch(alert("Please select the mode you want to put the pinpointer in.", "Pinpointer Mode Select", "Location", "Disk Recovery", "Other Signature"))
+ switch(tgui_alert(user, "Please select the mode you want to put the pinpointer in.", "Pinpointer Mode Select", list("Location", "Disk Recovery", "Other Signature")))
if("Location")
setting = SETTING_LOCATION
@@ -211,7 +211,7 @@
if("Other Signature")
setting = SETTING_OBJECT
- switch(alert("Search for item signature or DNA fragment?" , "Signature Mode Select" , "Item" , "DNA"))
+ switch(tgui_alert(user, "Search for item signature or DNA fragment?", "Signature Mode Select", list("Item", "DNA")))
if("Item")
var/list/item_names[0]
var/list/item_paths[0]
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 4757f6747917..d340f8d8cadc 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -558,20 +558,25 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
explanation_text = "Free Objective."
/datum/objective/steal/proc/select_target()
- var/list/possible_items_all = GLOB.potential_theft_objectives+"custom"
+ var/list/possible_items_all = GLOB.potential_theft_objectives + "custom"
var/new_target = input("Select target:", "Objective target", null) as null|anything in possible_items_all
- if(!new_target) return
+ if(!new_target)
+ return
+
if(new_target == "custom")
- var/datum/theft_objective/O=new
- O.typepath = input("Select type:","Type") as null|anything in typesof(/obj/item)
- if(!O.typepath) return
- var/tmp_obj = new O.typepath
- var/custom_name = tmp_obj:name
- qdel(tmp_obj)
- O.name = sanitize(copytext_char(input("Enter target name:", "Objective target", custom_name) as text|null,1,MAX_NAME_LEN)) // SS220 EDIT - ORIGINAL: copytext
- if(!O.name) return
- steal_target = O
- explanation_text = "Steal [O.name]."
+ var/obj/item/steal_target_path = input("Select type:","Type") as null|anything in typesof(/obj/item)
+ if(!steal_target_path)
+ return
+
+ var/theft_objective_name = sanitize(copytext_char(input("Enter target name:", "Objective target", initial(steal_target_path.name)) as text|null, 1, MAX_NAME_LEN)) // SS220 EDIT - ORIGINAL: copytext
+ if(!theft_objective_name)
+ return
+
+ var/datum/theft_objective/target_theft_objective = new
+ target_theft_objective.typepath = steal_target_path
+ target_theft_objective.name = theft_objective_name
+ steal_target = target_theft_objective
+ explanation_text = "Steal [theft_objective_name]."
else
steal_target = new new_target
update_explanation_text()
@@ -597,23 +602,46 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
return FALSE
/datum/objective/steal/proc/give_kit(obj/item/item_path)
- var/I = new item_path
- var/list/slots = list(
+ var/list/datum/mind/objective_owners = get_owners()
+ if(!length(objective_owners))
+ return
+
+ var/obj/item/item_to_give = new item_path
+ var/static/list/slots = list(
"backpack" = SLOT_HUD_IN_BACKPACK,
"left pocket" = SLOT_HUD_LEFT_STORE,
"right pocket" = SLOT_HUD_RIGHT_STORE,
"left hand" = SLOT_HUD_LEFT_HAND,
"right hand" = SLOT_HUD_RIGHT_HAND,
)
- for(var/datum/mind/M in get_owners())
- var/mob/living/carbon/human/H = M.current
- var/where = H.equip_in_one_of_slots(I, slots)
- if(where)
- to_chat(H, "
In your [where] is a box containing items and instructions to help you with your steal objective. ")
- else
- to_chat(H, "Unfortunately, you weren't able to get a stealing kit. This is very bad and you should adminhelp immediately (press F1).")
- message_admins("[ADMIN_LOOKUPFLW(H)] Failed to spawn with their [item_path] theft kit.")
- qdel(I)
+
+ for(var/datum/mind/kit_receiver_mind as anything in shuffle(objective_owners))
+ var/mob/living/carbon/human/kit_receiver = kit_receiver_mind.current
+ if(!kit_receiver)
+ continue
+
+ var/where = kit_receiver.equip_in_one_of_slots(item_to_give, slots)
+ if(!where)
+ continue
+
+ to_chat(kit_receiver, "
In your [where] is a box containing items and instructions to help you with your steal objective. ")
+ for(var/datum/mind/objective_owner as anything in objective_owners)
+ if(kit_receiver_mind == objective_owner || !objective_owner.current)
+ continue
+
+ to_chat(objective_owner.current, "
[kit_receiver] has received a box containing items and instructions to help you with your steal objective. ")
+
+ return
+
+ qdel(item_to_give)
+
+ for(var/datum/mind/objective_owner as anything in objective_owners)
+ var/mob/living/carbon/human/failed_receiver = objective_owner.current
+ if(!failed_receiver)
+ continue
+
+ to_chat(failed_receiver, "Unfortunately, you weren't able to get a stealing kit. This is very bad and you should adminhelp immediately (press F1).")
+ message_admins("[ADMIN_LOOKUPFLW(failed_receiver)] Failed to spawn with their [item_path] theft kit.")
/datum/objective/absorb
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 549f17c82a3d..94d6590b82a3 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -194,7 +194,7 @@
for(var/datum/mind/head in heads)
var/target = (head in targets)
if(target)
- text += "Target"
+ text += "Target"
text += printplayer(head, 1)
text += " "
return text.Join("")
diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm
index 39bfff317412..93efa0cb6b3c 100644
--- a/code/game/gamemodes/steal_items.dm
+++ b/code/game/gamemodes/steal_items.dm
@@ -150,6 +150,12 @@
protected_jobs = list("Quartermaster")
job_possession = FALSE
+/datum/theft_objective/engraved_dusters
+ name = "the quartermaster's engraved knuckledusters"
+ typepath = /obj/item/melee/knuckleduster/nanotrasen
+ protected_jobs = list("Quartermaster")
+ location_override = "the Quartermaster's Cargo Office"
+
/datum/theft_objective/number
var/min=0
var/max=0
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index bc74e2c07754..bf3eadd6551f 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -10,10 +10,13 @@
w_class = WEIGHT_CLASS_TINY
var/used = FALSE
-/obj/item/contract/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/contract/ui_state(mob/user)
+ return GLOB.inventory_state
+
+/obj/item/contract/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "WizardApprenticeContract", name, 400, 600, master_ui, state)
+ ui = new(user, src, "WizardApprenticeContract", name)
ui.open()
/obj/item/contract/ui_data(mob/user)
@@ -73,7 +76,7 @@
return
if(used)
- to_chat(user, " You've already summoned an apprentice or you are in process of summoning one. ")
+ to_chat(user, "You've already summoned an apprentice or you are in process of summoning one.")
return
ui_interact(user)
@@ -123,12 +126,12 @@
M.mind.AddSpell(new /obj/effect/proc_holder/spell/mind_transfer(null))
M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe/knock(null))
M.mind.AddSpell(new /obj/effect/proc_holder/spell/fireball/toolbox(null))
- M.mind.AddSpell(new /obj/effect/proc_holder/spell/summonitem(null))
+ M.mind.AddSpell(new /obj/effect/proc_holder/spell/disguise_self(null))
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), SLOT_HUD_SHOES)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), SLOT_HUD_WEAR_MASK)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(M), SLOT_HUD_GLOVES)
M.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(M), SLOT_HUD_BELT)
- to_chat(M, "Your service has not gone unrewarded. Under the mentorship of [H.real_name], you've mastered stealthy, robeless spells. You can now cast Mindswap, Knock, Homing Toolbox, Forcewall, and Instant Summons without the need for wizard robes.")
+ to_chat(M, "Your service has not gone unrewarded. Under the mentorship of [H.real_name], you've mastered stealthy, robeless spells. You can now cast Mindswap, Knock, Homing Toolbox, and Disguise Self without the need for wizard robes.")
if("honk")
M.mind.AddSpell(new /obj/effect/proc_holder/spell/touch/banana/apprentice(null))
M.mind.AddSpell(new /obj/effect/proc_holder/spell/ethereal_jaunt(null))
@@ -290,12 +293,9 @@
return
in_use = TRUE
ADD_TRAIT(user, SCRYING, SCRYING_ORB)
- user.add_atom_colour(COLOR_BLUE, ADMIN_COLOUR_PRIORITY) // stolen spirit rune code
user.visible_message("[user] stares into [src], [user.p_their()] eyes glazing over.",
" You stare into [src], you can see the entire universe!")
- ghost = user.ghostize(TRUE)
- ghost.name = "Magic Spirit of [ghost.name]"
- ghost.color = COLOR_BLUE
+ ghost = user.ghostize(TRUE, COLOR_BLUE, "Magic Spirit of [user.name]")
while(!QDELETED(user))
if(user.key || QDELETED(src))
user.visible_message("[user] blinks, returning to the world around [user.p_them()].",
@@ -319,6 +319,7 @@ GLOBAL_LIST_EMPTY(multiverse)
/obj/item/multisword
name = "multiverse sword"
desc = "A weapon capable of conquering the universe and beyond. Activate it to summon copies of yourself from others dimensions to fight by your side."
+ icon = 'icons/obj/energy_melee.dmi'
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
icon_state = "energy_katana"
@@ -704,6 +705,7 @@ GLOBAL_LIST_EMPTY(multiverse)
/obj/item/multisword/pike //If We are to be used and spent, let it be for a noble purpose.
name = "phantom pike"
desc = "A fishing pike that appears to be imbued with a peculiar energy."
+ icon = 'icons/obj/items.dmi'
icon_state = "harpoon"
item_state = "harpoon"
cooldown_between_uses = 200 //Half the time
@@ -877,12 +879,12 @@ GLOBAL_LIST_EMPTY(multiverse)
heal_burn = 25
heal_oxy = 25
-/obj/item/reagent_containers/food/drinks/everfull
+/obj/item/reagent_containers/drinks/everfull
name = "everfull mug"
desc = "An enchanted mug which can be filled with any of various liquids on command."
icon_state = "evermug"
-/obj/item/reagent_containers/food/drinks/everfull/attack_self(mob/user)
+/obj/item/reagent_containers/drinks/everfull/attack_self(mob/user)
var/static/list/options = list("Omnizine" = image(icon = 'icons/obj/storage.dmi', icon_state = "firstaid"),
"Ale" = image(icon = 'icons/obj/drinks.dmi', icon_state = "alebottle"),
"Wine" = image(icon = 'icons/obj/drinks.dmi', icon_state = "wineglass"),
@@ -908,7 +910,7 @@ GLOBAL_LIST_EMPTY(multiverse)
to_chat(user, "The [name] fills to brimming with [options_to_descriptions[choice]].")
magic_fill(options_to_reagent[choice])
-/obj/item/reagent_containers/food/drinks/everfull/proc/magic_fill(reagent_choice)
+/obj/item/reagent_containers/drinks/everfull/proc/magic_fill(reagent_choice)
reagents.clear_reagents()
reagents.add_reagent(reagent_choice, volume)
diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm
index 434059436730..e710e0241471 100644
--- a/code/game/gamemodes/wizard/raginmages.dm
+++ b/code/game/gamemodes/wizard/raginmages.dm
@@ -127,7 +127,7 @@
if(harry)
var/mob/living/carbon/human/new_character = makeBody(harry)
new_character.mind.make_Wizard() // This puts them at the wizard spawn, worry not
- new_character.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/mugwort(harry), SLOT_HUD_IN_BACKPACK)
+ new_character.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/mugwort(harry), SLOT_HUD_IN_BACKPACK)
// The first wiznerd can get their mugwort from the wizard's den, new ones will also need mugwort!
mages_made++
dust_if_respawnable(harry)
diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm
index bb4bedd90153..ac866c0a4f3e 100644
--- a/code/game/gamemodes/wizard/rightandwrong.dm
+++ b/code/game/gamemodes/wizard/rightandwrong.dm
@@ -41,7 +41,22 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/projectile/revolver/golden,
/obj/item/gun/projectile/automatic/sniper_rifle,
/obj/item/gun/medbeam,
- /obj/item/gun/energy/laser/scatter))
+ /obj/item/gun/energy/laser/scatter,
+ /obj/item/gun/projectile/automatic/c20r/toy/riot,
+ /obj/item/gun/projectile/shotgun/automatic/dual_tube,
+ /obj/item/gun/energy/kinetic_accelerator/experimental, // even with atmos, this thing can get scary
+ /obj/item/gun/energy/emitter,
+ /obj/item/gun/energy/spikethrower,
+ /obj/item/gun/energy/bsg/prebuilt,
+ /obj/item/gun/energy/xray,
+ /obj/item/gun/energy/plasma_pistol,
+ /obj/item/gun/projectile/automatic/pistol/APS, // whyyy is this capitalized
+ /obj/item/gun/projectile/revolver/overgrown,
+ /obj/item/gun/energy/gun/blueshield/pdw9,
+ /obj/item/gun/energy/disabler/silencer,
+ /obj/item/gun/energy/lwap,
+ /obj/item/gun/energy/arc_revolver,
+ /obj/item/gun/projectile/automatic/ak814))
//if you add anything that isn't covered by the typepaths below, add it to summon_magic_objective_types
GLOBAL_LIST_INIT(summoned_magic, list(
@@ -55,21 +70,18 @@ GLOBAL_LIST_INIT(summoned_magic, list(
/obj/item/spellbook/oneuse/charge,
/obj/item/spellbook/oneuse/summonitem,
/obj/item/gun/magic/wand,
- /obj/item/gun/magic/wand/death,
/obj/item/gun/magic/wand/resurrection,
- /obj/item/gun/magic/wand/polymorph,
/obj/item/gun/magic/wand/teleport,
/obj/item/gun/magic/wand/door,
/obj/item/gun/magic/wand/fireball,
/obj/item/gun/magic/staff/healing,
/obj/item/gun/magic/staff/door,
/obj/item/scrying,
- /obj/item/clothing/suit/space/hardsuit/shielded/wizard,
+ /obj/item/clothing/suit/space/hardsuit/wizard,
/obj/item/immortality_talisman,
/obj/item/melee/ghost_sword))
GLOBAL_LIST_INIT(summoned_special_magic, list(
- /obj/item/gun/magic/staff/change,
/obj/item/gun/magic/staff/animate,
/obj/item/storage/belt/wands/full,
/obj/item/contract,
@@ -81,7 +93,7 @@ GLOBAL_LIST_INIT(summoned_special_magic, list(
GLOBAL_LIST_INIT(summoned_magic_objectives, list(
/obj/item/contract,
/obj/item/blood_contract,
- /obj/item/clothing/suit/space/hardsuit/shielded/wizard,
+ /obj/item/clothing/suit/space/hardsuit/wizard,
/obj/item/gun/magic,
/obj/item/immortality_talisman,
/obj/item/melee/ghost_sword,
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index ab25da432f7b..74b672babc58 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -46,7 +46,7 @@
/obj/item/soulstone/proc/was_used()
if(!reusable)
spent = TRUE
- name = "dull [name]"
+ name = "dull [initial(name)]"
desc = "A fragment of the legendary treasure known simply as \
the 'Soul Stone'. The shard lies still, dull and lifeless; \
whatever spark it once held long extinguished."
@@ -199,7 +199,7 @@
and the memories of your time as their servant with it.")
to_chat(M, "Assist [user], your saviour, and get vengeance on those who enslaved you!")
else
- to_chat(M, "Your soulstone has been exorcised, and you are now bound to obey [user]. ")
+ to_chat(M, "Your soulstone has been exorcised, and you are now bound to obey [user].")
for(var/mob/living/simple_animal/shade/EX in src)
EX.holy = TRUE
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index a0849e4c800c..a391a35c33b1 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -298,6 +298,12 @@
category = "Assistance"
cost = 1
+/datum/spellbook_entry/disguiseself
+ name = "Disguise Self"
+ spell_type = /obj/effect/proc_holder/spell/disguise_self
+ category = "Assistance"
+ cost = 1
+
/datum/spellbook_entry/noclothes
name = "Remove Clothes Requirement"
spell_type = /obj/effect/proc_holder/spell/noclothes
@@ -391,7 +397,7 @@
var/item_path = null
/datum/spellbook_entry/item/Buy(mob/living/carbon/human/user, obj/item/spellbook/book)
- if(spawn_on_floor == FALSE)
+ if(!spawn_on_floor)
user.put_in_hands(new item_path)
else
new item_path(user.loc)
@@ -469,7 +475,7 @@
/datum/spellbook_entry/item/everfull_mug
name = "Everfull Mug"
desc = "A magical mug that can be filled with omnizine at will, though beware of addiction! It can also produce alchohol and other less useful substances."
- item_path = /obj/item/reagent_containers/food/drinks/everfull
+ item_path = /obj/item/reagent_containers/drinks/everfull
cost = 1
category = "Artefacts"
@@ -550,7 +556,7 @@
/datum/spellbook_entry/item/staffchaos
name = "Staff of Chaos"
- desc = "A caprious tool that can fire all sorts of magic without any rhyme or reason. Using it on people you care about is not recommended."
+ desc = "A curious staff firing bolts of chaotic energy. Any life struck will be the victim of a random effect, usually harming them. No effect on dead targets."
item_path = /obj/item/gun/magic/staff/chaos
category = "Staves"
@@ -649,14 +655,14 @@
/datum/spellbook_entry/loadout/Buy(mob/living/carbon/human/user, obj/item/spellbook/book)
if(destroy_spellbook)
- var/response = alert(user, "The [src] loadout cannot be refunded once bought. Are you sure this is what you want?", "No refunds!", "No", "Yes")
- if(response == "No")
+ var/response = tgui_alert(user, "The [src] loadout cannot be refunded once bought. Are you sure this is what you want?", "No refunds!", list("No", "Yes"))
+ if(response != "Yes")
return FALSE
to_chat(user, "[book] crumbles to ashes as you acquire its knowledge.")
qdel(book)
else if(items_path.len)
- var/response = alert(user, "The [src] loadout contains items that will not be refundable if bought. Are you sure this is what you want?", "No refunds!", "No", "Yes")
- if(response == "No")
+ var/response = tgui_alert(user, "The [src] loadout contains items that will not be refundable if bought. Are you sure this is what you want?", "No refunds!", list("No", "Yes"))
+ if(response != "Yes")
return FALSE
if(items_path.len)
var/obj/item/storage/box/wizard/B = new(src)
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index db77680783e3..0d65d3a13570 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -9,6 +9,7 @@
required_players = 20
required_enemies = 1
recommended_enemies = 1
+ single_antag_positions = list()
var/use_huds = TRUE
var/finished = FALSE
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 41701ab29314..edc60bdef29b 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -1,8 +1,3 @@
-/obj/var/list/req_access = null
-/obj/var/req_access_txt = "0"
-/obj/var/list/req_one_access = null
-/obj/var/req_one_access_txt = "0"
-
//returns 1 if this mob has sufficient access to use this object
/obj/proc/allowed(mob/M)
//check if we don't require any access at all
@@ -128,7 +123,7 @@
/proc/get_all_accesses()
return list(ACCESS_MINISAT, ACCESS_AI_UPLOAD, ACCESS_ARMORY, ACCESS_ATMOSPHERICS, ACCESS_BAR, ACCESS_SEC_DOORS, ACCESS_BLUESHIELD,
- ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_CHAPEL_OFFICE, ACCESS_CE, ACCESS_CHEMISTRY, ACCESS_CLOWN, ACCESS_CMO,
+ ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_SUPPLY_SHUTTLE, ACCESS_MAILSORTING, ACCESS_CHAPEL_OFFICE, ACCESS_CE, ACCESS_CHEMISTRY, ACCESS_CLOWN, ACCESS_CMO,
ACCESS_COURT, ACCESS_CONSTRUCTION, ACCESS_CREMATORIUM, ACCESS_JANITOR, ACCESS_ENGINE, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_FORENSICS_LOCKERS,
ACCESS_GENETICS, ACCESS_EXPEDITION, ACCESS_BRIG, ACCESS_HOP, ACCESS_HOS, ACCESS_HYDROPONICS, ACCESS_CHANGE_IDS, ACCESS_KEYCARD_AUTH, ACCESS_KITCHEN,
ACCESS_LAWYER, ACCESS_LIBRARY, ACCESS_MAGISTRATE, ACCESS_MAINT_TUNNELS, ACCESS_HEADS_VAULT, ACCESS_MEDICAL, ACCESS_MIME,
@@ -144,7 +139,7 @@
return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND)
/proc/get_all_misc_access()
- return list(ACCESS_SALVAGE_CAPTAIN, ACCESS_TRADE_SOL, ACCESS_CRATE_CASH, ACCESS_AWAY01)
+ return list(ACCESS_TRADE_SOL, ACCESS_CRATE_CASH, ACCESS_AWAY01)
/proc/get_absolutely_all_accesses()
return (get_all_accesses() | get_all_centcom_access() | get_all_syndicate_access() | get_all_misc_access())
@@ -164,7 +159,7 @@
if(REGION_ENGINEERING) //engineering and maintenance
return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MINISAT, ACCESS_CE)
if(REGION_SUPPLY) //supply
- return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_QM, ACCESS_HEADS_VAULT)
+ return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_SUPPLY_SHUTTLE, ACCESS_QM, ACCESS_HEADS_VAULT)
if(REGION_COMMAND) //command
return list(ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_TCOMSAT, ACCESS_EXPEDITION, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_HEADS_VAULT, ACCESS_BLUESHIELD, ACCESS_NTREP, ACCESS_HOP, ACCESS_CAPTAIN)
if(REGION_CENTCOMM) //because why the heck not
diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index ea70b19ebb07..4f4819a29dde 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -8,7 +8,6 @@
department_head = list("Head of Personnel")
selection_color = "#dddddd"
access = list() //See /datum/job/assistant/get_access()
- minimal_access = list() //See /datum/job/assistant/get_access()
alt_titles = list("Off-Duty", "Retired", "Intern")
outfit = /datum/outfit/job/assistant
diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm
index 04ddbe4d40d4..7800f4b68a79 100644
--- a/code/game/jobs/job/central.dm
+++ b/code/game/jobs/job/central.dm
@@ -9,7 +9,6 @@
supervisors = "the admins"
selection_color = "#ffdddd"
access = list()
- minimal_access = list()
admin_only = TRUE
outfit = /datum/outfit/job/ntnavyofficer
@@ -58,7 +57,6 @@
supervisors = "the admins"
selection_color = "#ffdddd"
access = list()
- minimal_access = list()
admin_only = TRUE
spawn_ert = 1
outfit = /datum/outfit/job/ntspecops
diff --git a/code/game/jobs/job/engineering_jobs.dm b/code/game/jobs/job/engineering_jobs.dm
index 030e3f2d2a86..5aff1dc14a5b 100644
--- a/code/game/jobs/job/engineering_jobs.dm
+++ b/code/game/jobs/job/engineering_jobs.dm
@@ -14,10 +14,6 @@
ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA,
ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS,
ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
- ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA,
- ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS,
- ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM)
minimal_player_age = 21
exp_map = list(EXP_TYPE_ENGINEERING = 1200)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
@@ -58,8 +54,7 @@
supervisors = "the chief engineer"
department_head = list("Chief Engineer")
selection_color = "#fff5cc"
- access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM)
+ access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM)
alt_titles = list("Maintenance Technician","Engine Technician","Electrician")
minimal_player_age = 7
exp_map = list(EXP_TYPE_CREW = 300)
@@ -95,8 +90,7 @@
supervisors = "the chief engineer"
department_head = list("Chief Engineer")
selection_color = "#fff5cc"
- access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_EVA, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EMERGENCY_STORAGE, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE)
+ access = list(ACCESS_EVA, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EMERGENCY_STORAGE, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE)
alt_titles = list("Atmospheric Technician")
minimal_player_age = 7
exp_map = list(EXP_TYPE_CREW = 300)
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index 4b997b66c5e7..d30d3479d9ad 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -3,9 +3,8 @@
//The name of the job
var/title = "NOPE"
- //Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access
- var/list/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population)
- var/list/access = list() //Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!)
+ /// Job access. A list of constants from access_defines.dm.
+ var/list/access = list()
///Job Bitflag, used for Database entries - DO NOT JUST EDIT THESE
var/flag = 0
@@ -73,10 +72,9 @@
var/job_banned_gamemode = FALSE
//Only override this proc
-/datum/job/proc/after_spawn(mob/living/carbon/human/H)
+/datum/job/proc/after_spawn(mob/living/carbon/human/H, joined_late = FALSE) // SS220 EDIT - jobs - prisoner spawn
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_JOB_AFTER_SPAWN, src, H)
-
/datum/job/proc/announce(mob/living/carbon/human/H)
/datum/job/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE, announce = TRUE)
@@ -94,10 +92,7 @@
announce(H)
/datum/job/proc/get_access()
- if(GLOB.configuration.jobs.jobs_have_minimal_access)
- return minimal_access.Copy()
- else
- return access.Copy()
+ return access.Copy()
//If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1
/datum/job/proc/player_old_enough(client/C)
diff --git a/code/game/jobs/job/medical_jobs.dm b/code/game/jobs/job/medical_jobs.dm
index d002d0d56518..d623a4126edc 100644
--- a/code/game/jobs/job/medical_jobs.dm
+++ b/code/game/jobs/job/medical_jobs.dm
@@ -10,12 +10,24 @@
selection_color = "#ffddf0"
req_admin_notify = 1
department_account_access = TRUE
- access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS,
- ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE,
- ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_PSYCHIATRIST, ACCESS_PARAMEDIC, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_EVA, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS,
- ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE,
- ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_PSYCHIATRIST, ACCESS_MAINT_TUNNELS, ACCESS_PARAMEDIC, ACCESS_MINERAL_STOREROOM)
+ access = list(
+ ACCESS_CHEMISTRY,
+ ACCESS_CMO,
+ ACCESS_EVA,
+ ACCESS_GENETICS,
+ ACCESS_HEADS,
+ ACCESS_KEYCARD_AUTH,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MEDICAL,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_MORGUE,
+ ACCESS_PARAMEDIC,
+ ACCESS_PSYCHIATRIST,
+ ACCESS_RC_ANNOUNCE,
+ ACCESS_SEC_DOORS,
+ ACCESS_SURGERY,
+ ACCESS_VIROLOGY
+ )
minimal_player_age = 21
exp_map = list(EXP_TYPE_MEDICAL = 1200)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY)
@@ -52,8 +64,7 @@
supervisors = "the chief medical officer"
department_head = list("Chief Medical Officer")
selection_color = "#ffeef0"
- access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_MAINT_TUNNELS)
+ access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_MAINT_TUNNELS)
alt_titles = list("Surgeon","Nurse")
minimal_player_age = 3
exp_map = list(EXP_TYPE_CREW = 180)
@@ -88,8 +99,7 @@
supervisors = "the chief medical officer"
department_head = list("Chief Medical Officer")
selection_color = "#ffeef0"
- access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS)
+ access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS)
minimal_player_age = 3
exp_map = list(EXP_TYPE_CREW = 180)
outfit = /datum/outfit/job/coroner
@@ -150,8 +160,7 @@
supervisors = "the chief medical officer"
department_head = list("Chief Medical Officer")
selection_color = "#ffeef0"
- access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
+ access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
alt_titles = list("Pharmacist","Pharmacologist")
minimal_player_age = 7
exp_map = list(EXP_TYPE_CREW = 300)
@@ -183,8 +192,7 @@
supervisors = "the chief medical officer and the research director"
department_head = list("Chief Medical Officer", "Research Director")
selection_color = "#ffeef0"
- access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_RESEARCH, ACCESS_MAINT_TUNNELS)
+ access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_RESEARCH, ACCESS_MAINT_TUNNELS)
minimal_player_age = 3
exp_map = list(EXP_TYPE_CREW = 180)
outfit = /datum/outfit/job/geneticist
@@ -216,8 +224,7 @@
supervisors = "the chief medical officer"
department_head = list("Chief Medical Officer")
selection_color = "#ffeef0"
- access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS)
- minimal_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
+ access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
alt_titles = list("Pathologist","Microbiologist")
minimal_player_age = 7
exp_map = list(EXP_TYPE_CREW = 300)
@@ -250,8 +257,7 @@
supervisors = "the chief medical officer"
department_head = list("Chief Medical Officer")
selection_color = "#ffeef0"
- access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_PSYCHIATRIST)
- minimal_access = list(ACCESS_MEDICAL, ACCESS_PSYCHIATRIST, ACCESS_MAINT_TUNNELS)
+ access = list(ACCESS_MEDICAL, ACCESS_PSYCHIATRIST, ACCESS_MAINT_TUNNELS)
alt_titles = list("Psychologist","Therapist")
outfit = /datum/outfit/job/psychiatrist
@@ -288,8 +294,20 @@
supervisors = "the chief medical officer"
department_head = list("Chief Medical Officer")
selection_color = "#ffeef0"
- access = list(ACCESS_PARAMEDIC, ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA, ACCESS_MORGUE, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MAILSORTING)
- minimal_access=list(ACCESS_PARAMEDIC, ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA, ACCESS_MORGUE, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MAILSORTING)
+ access = list(
+ ACCESS_CARGO,
+ ACCESS_EVA,
+ ACCESS_EXTERNAL_AIRLOCKS,
+ ACCESS_MAILSORTING,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MEDICAL,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_MINING_STATION,
+ ACCESS_MINING,
+ ACCESS_MINT,
+ ACCESS_MORGUE,
+ ACCESS_PARAMEDIC
+ )
minimal_player_age = 3
exp_map = list(EXP_TYPE_CREW = 180)
outfit = /datum/outfit/job/paramedic
diff --git a/code/game/jobs/job/science_jobs.dm b/code/game/jobs/job/science_jobs.dm
index ae8330fce9d5..8168456ae837 100644
--- a/code/game/jobs/job/science_jobs.dm
+++ b/code/game/jobs/job/science_jobs.dm
@@ -10,14 +10,31 @@
selection_color = "#ffddff"
req_admin_notify = 1
department_account_access = TRUE
- access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
- ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS,
- ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD,
- ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_EXPEDITION, ACCESS_XENOARCH, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM, ACCESS_NETWORK)
- minimal_access = list(ACCESS_EVA, ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
- ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS,
- ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD,
- ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_EXPEDITION, ACCESS_XENOARCH, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_NETWORK)
+ access = list(
+ ACCESS_AI_UPLOAD,
+ ACCESS_EVA,
+ ACCESS_EXPEDITION,
+ ACCESS_GENETICS,
+ ACCESS_HEADS,
+ ACCESS_KEYCARD_AUTH,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_MINISAT,
+ ACCESS_MORGUE,
+ ACCESS_NETWORK,
+ ACCESS_RC_ANNOUNCE,
+ ACCESS_RD,
+ ACCESS_RESEARCH,
+ ACCESS_ROBOTICS,
+ ACCESS_SEC_DOORS,
+ ACCESS_TCOMSAT,
+ ACCESS_TECH_STORAGE,
+ ACCESS_TELEPORTER,
+ ACCESS_TOX_STORAGE,
+ ACCESS_TOX,
+ ACCESS_XENOARCH,
+ ACCESS_XENOBIOLOGY
+ )
minimal_player_age = 21
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY)
exp_map = list(EXP_TYPE_SCIENCE = 1200)
@@ -59,8 +76,15 @@
supervisors = "the research director"
department_head = list("Research Director")
selection_color = "#ffeeff"
- access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
+ access = list(
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_RESEARCH,
+ ACCESS_TOX_STORAGE,
+ ACCESS_TOX,
+ ACCESS_XENOARCH,
+ ACCESS_XENOBIOLOGY
+ )
alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist", "Chemical Researcher")
minimal_player_age = 3
exp_map = list(EXP_TYPE_CREW = 300)
@@ -98,8 +122,14 @@
supervisors = "the research director"
department_head = list("Research Director")
selection_color = "#ffeeff"
- access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) //As a job that handles so many corpses, it makes sense for them to have morgue access.
- minimal_access = list(ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) //As a job that handles so many corpses, it makes sense for them to have morgue access.
+ access = list(
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_MORGUE, // As a job that handles so many corpses, it makes sense for them to have morgue access.
+ ACCESS_RESEARCH,
+ ACCESS_ROBOTICS,
+ ACCESS_TECH_STORAGE
+ )
alt_titles = list("Biomechanical Engineer","Mechatronic Engineer")
minimal_player_age = 3
exp_map = list(EXP_TYPE_CREW = 180)
diff --git a/code/game/jobs/job/security_jobs.dm b/code/game/jobs/job/security_jobs.dm
index 0647ae0a5a5a..5b9db8adc209 100644
--- a/code/game/jobs/job/security_jobs.dm
+++ b/code/game/jobs/job/security_jobs.dm
@@ -10,14 +10,33 @@
selection_color = "#ffdddd"
req_admin_notify = 1
department_account_access = TRUE
- access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT,
- ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
- ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
- ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS)
- minimal_access = list(ACCESS_EVA, ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT,
- ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
- ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
- ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS)
+ access = list(
+ ACCESS_ALL_PERSONAL_LOCKERS,
+ ACCESS_ARMORY,
+ ACCESS_BRIG,
+ ACCESS_CARGO_BAY,
+ ACCESS_CARGO,
+ ACCESS_CONSTRUCTION,
+ ACCESS_COURT,
+ ACCESS_ENGINE,
+ ACCESS_EVA,
+ ACCESS_EXPEDITION,
+ ACCESS_FORENSICS_LOCKERS,
+ ACCESS_HEADS,
+ ACCESS_HOS,
+ ACCESS_KEYCARD_AUTH,
+ ACCESS_MAILSORTING,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MEDICAL,
+ ACCESS_MINING,
+ ACCESS_MORGUE,
+ ACCESS_RC_ANNOUNCE,
+ ACCESS_RESEARCH,
+ ACCESS_SEC_DOORS,
+ ACCESS_SECURITY,
+ ACCESS_SUPPLY_SHUTTLE,
+ ACCESS_WEAPONS
+ )
minimal_player_age = 21
exp_map = list(EXP_TYPE_SECURITY = 1200)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
@@ -62,8 +81,7 @@
supervisors = "the head of security"
department_head = list("Head of Security")
selection_color = "#ffeeee"
- access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS)
- minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS)
+ access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS)
minimal_player_age = 21
exp_map = list(EXP_TYPE_SECURITY = 600)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
@@ -109,7 +127,6 @@
selection_color = "#ffeeee"
alt_titles = list("Forensic Technician")
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS)
- minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS)
alt_titles = list("Forensic Technician")
minimal_player_age = 14
exp_map = list(EXP_TYPE_CREW = 600)
@@ -167,8 +184,7 @@
supervisors = "the head of security"
department_head = list("Head of Security")
selection_color = "#ffeeee"
- access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS)
- minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS)
+ access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS)
minimal_player_age = 14
exp_map = list(EXP_TYPE_CREW = 600)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY)
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index c7d7891df7c6..9f9084676cbc 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -10,8 +10,7 @@
req_admin_notify = 1
job_department_flags = DEP_FLAG_COMMAND
department_account_access = TRUE
- access = list() //See get_access()
- minimal_access = list() //See get_access()
+ access = list() //See get_access()
minimal_player_age = 30
exp_map = list(EXP_TYPE_COMMAND = 1200)
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
@@ -70,18 +69,42 @@
minimal_player_age = 21
department_account_access = TRUE
exp_map = list(EXP_TYPE_SERVICE = 1200)
- access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
- ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
- ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
- ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
- ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_HEADS_VAULT, ACCESS_CARGO,
- ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT,
- ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
- ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
- ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
- ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_HEADS_VAULT, ACCESS_CARGO,
- ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
+ access = list(
+ ACCESS_AI_UPLOAD,
+ ACCESS_ALL_PERSONAL_LOCKERS,
+ ACCESS_BAR,
+ ACCESS_BRIG,
+ ACCESS_CARGO,
+ ACCESS_CHANGE_IDS,
+ ACCESS_CHAPEL_OFFICE,
+ ACCESS_CLOWN,
+ ACCESS_CONSTRUCTION,
+ ACCESS_COURT,
+ ACCESS_CREMATORIUM,
+ ACCESS_ENGINE,
+ ACCESS_EVA,
+ ACCESS_EXPEDITION,
+ ACCESS_HEADS_VAULT,
+ ACCESS_HEADS,
+ ACCESS_HOP,
+ ACCESS_HYDROPONICS,
+ ACCESS_JANITOR,
+ ACCESS_KEYCARD_AUTH,
+ ACCESS_KITCHEN,
+ ACCESS_LAWYER,
+ ACCESS_LIBRARY,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MEDICAL,
+ ACCESS_MIME,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_MORGUE,
+ ACCESS_RC_ANNOUNCE,
+ ACCESS_RESEARCH,
+ ACCESS_SEC_DOORS,
+ ACCESS_SECURITY,
+ ACCESS_THEATRE,
+ ACCESS_WEAPONS
+ )
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY , DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
outfit = /datum/outfit/job/hop
important_information = "This role requires you to coordinate a department. You are required to be familiar with Standard Operating Procedure (Service), basic job duties, and act professionally (roleplay)."
@@ -119,18 +142,45 @@
transfer_allowed = FALSE
minimal_player_age = 21
exp_map = list(EXP_TYPE_COMMAND = 3000) // 50 hours baby
- access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
- ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
- ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
- ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
- ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
- ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_NTREP)
- minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT,
- ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_EVA, ACCESS_HEADS,
- ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
- ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
- ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
- ACCESS_CLOWN, ACCESS_MIME, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_NTREP)
+ access = list(
+ ACCESS_ALL_PERSONAL_LOCKERS,
+ ACCESS_BAR,
+ ACCESS_BRIG,
+ ACCESS_CARGO_BAY,
+ ACCESS_CARGO_BOT,
+ ACCESS_CARGO,
+ ACCESS_CHAPEL_OFFICE,
+ ACCESS_CLOWN,
+ ACCESS_CONSTRUCTION,
+ ACCESS_COURT,
+ ACCESS_CREMATORIUM,
+ ACCESS_ENGINE,
+ ACCESS_EVA,
+ ACCESS_EXPEDITION,
+ ACCESS_HEADS_VAULT,
+ ACCESS_HEADS,
+ ACCESS_HYDROPONICS,
+ ACCESS_JANITOR,
+ ACCESS_KEYCARD_AUTH,
+ ACCESS_KITCHEN,
+ ACCESS_LAWYER,
+ ACCESS_LIBRARY,
+ ACCESS_MAILSORTING,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MEDICAL,
+ ACCESS_MIME,
+ ACCESS_MINING_STATION,
+ ACCESS_MINING,
+ ACCESS_MORGUE,
+ ACCESS_NTREP,
+ ACCESS_RC_ANNOUNCE,
+ ACCESS_RESEARCH,
+ ACCESS_SEC_DOORS,
+ ACCESS_SECURITY,
+ ACCESS_SUPPLY_SHUTTLE,
+ ACCESS_THEATRE,
+ ACCESS_WEAPONS
+ )
blacklisted_disabilities = list(DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
outfit = /datum/outfit/job/nanotrasenrep
important_information = "This role requires you to advise the Command team about Standard Operating Procedure, Chain of Command, and report to Central Command about various matters. You are required to act in a manner befitting someone representing Nanotrasen."
@@ -167,14 +217,22 @@
transfer_allowed = FALSE
minimal_player_age = 21
exp_map = list(EXP_TYPE_COMMAND = 3000) // 50 hours baby
- access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
- ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
- ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
- ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
- ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
- ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_WEAPONS, ACCESS_BLUESHIELD)
- minimal_access = list(ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINE, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH,
- ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_HEADS, ACCESS_BLUESHIELD, ACCESS_WEAPONS, ACCESS_CARGO, ACCESS_MINING)
+ access = list(
+ ACCESS_BLUESHIELD,
+ ACCESS_CARGO,
+ ACCESS_CONSTRUCTION,
+ ACCESS_ENGINE,
+ ACCESS_HEADS,
+ ACCESS_KEYCARD_AUTH,
+ ACCESS_MAILSORTING,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MEDICAL,
+ ACCESS_MINING,
+ ACCESS_RC_ANNOUNCE,
+ ACCESS_RESEARCH,
+ ACCESS_SEC_DOORS,
+ ACCESS_WEAPONS
+ )
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
missing_limbs_allowed = FALSE
outfit = /datum/outfit/job/blueshield
@@ -215,13 +273,17 @@
transfer_allowed = FALSE
minimal_player_age = 30
exp_map = list(EXP_TYPE_SECURITY = 6000) // 100 hours baby
- access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS,
- ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS,
- ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
- ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
- ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
- ACCESS_CLOWN, ACCESS_MIME, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_EXPEDITION, ACCESS_MAGISTRATE)
- minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_LAWYER, ACCESS_MAGISTRATE, ACCESS_HEADS, ACCESS_RC_ANNOUNCE)
+ access = list(
+ ACCESS_BRIG,
+ ACCESS_COURT,
+ ACCESS_HEADS,
+ ACCESS_LAWYER,
+ ACCESS_MAGISTRATE,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_RC_ANNOUNCE,
+ ACCESS_SEC_DOORS,
+ ACCESS_SECURITY
+ )
blacklisted_disabilities = list(DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_NERVOUS, DISABILITY_FLAG_LISP)
outfit = /datum/outfit/job/judge
important_information = "This role requires you to oversee legal matters and make important decisions about sentencing. You are required to have an extensive knowledge of Space Law and Security SOP and only operate within, not outside, the boundaries of the law."
@@ -259,8 +321,16 @@
supervisors = "the magistrate"
department_head = list("Captain")
selection_color = "#ddddff"
- access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING)
- minimal_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING)
+ access = list(
+ ACCESS_CONSTRUCTION,
+ ACCESS_COURT,
+ ACCESS_LAWYER,
+ ACCESS_MAILSORTING,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MEDICAL,
+ ACCESS_RESEARCH,
+ ACCESS_SEC_DOORS
+ )
alt_titles = list("Human Resources Agent")
minimal_player_age = 30
exp_map = list(EXP_TYPE_CREW = 600)
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index 578d490c4126..7608f59fce04 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -10,8 +10,24 @@
department_head = list("Captain")
department_account_access = TRUE
selection_color = "#e2c59d"
- access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_HEADS_VAULT)
- minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_HEADS_VAULT)
+ access = list(
+ ACCESS_CARGO_BAY,
+ ACCESS_CARGO_BOT,
+ ACCESS_CARGO,
+ ACCESS_HEADS_VAULT,
+ ACCESS_HEADS,
+ ACCESS_KEYCARD_AUTH,
+ ACCESS_MAILSORTING,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_MINING_STATION,
+ ACCESS_MINING,
+ ACCESS_MINT,
+ ACCESS_QM,
+ ACCESS_RC_ANNOUNCE,
+ ACCESS_SEC_DOORS,
+ ACCESS_SUPPLY_SHUTTLE,
+ )
blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY)
outfit = /datum/outfit/job/qm
important_information = "This role requires you to coordinate a department. You are required to be familiar with Standard Operating Procedure (Supply), basic job duties, and act professionally (roleplay)."
@@ -46,8 +62,14 @@
supervisors = "the quartermaster"
department_head = list("Quartermaster")
selection_color = "#eeddbe"
- access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)
+ access = list(
+ ACCESS_CARGO_BAY,
+ ACCESS_CARGO,
+ ACCESS_MAILSORTING,
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_SUPPLY_SHUTTLE,
+ )
alt_titles = list("Mail Carrier", "Courier")
outfit = /datum/outfit/job/cargo_tech
@@ -74,8 +96,13 @@
supervisors = "the quartermaster"
department_head = list("Quartermaster")
selection_color = "#eeddbe"
- access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_MINING, ACCESS_MINT, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
+ access = list(
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_MINERAL_STOREROOM,
+ ACCESS_MINING_STATION,
+ ACCESS_MINING,
+ ACCESS_MINT,
+ )
alt_titles = list("Spelunker")
outfit = /datum/outfit/job/mining
@@ -145,8 +172,7 @@
supervisors = "the head of personnel"
department_head = list("Head of Personnel")
selection_color = "#dddddd"
- access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
- minimal_access = list(ACCESS_BAR, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
+ access = list(ACCESS_BAR, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
outfit = /datum/outfit/job/bartender
/datum/outfit/job/bartender
@@ -174,9 +200,9 @@
singlemutcheck(H, GLOB.soberblock, MUTCHK_FORCED)
H.dna.default_blocks.Add(GLOB.soberblock)
H.check_mutations = 1
- ADD_TRAIT(H, TRAIT_TABLE_LEAP, ROUNDSTART_TRAIT)
var/datum/martial_art/judo/under_siege/bouncer_delight = new
bouncer_delight.teach(H)
+ ADD_TRAIT(H.mind, TRAIT_TABLE_LEAP, ROUNDSTART_TRAIT)
/datum/job/chef
@@ -189,8 +215,7 @@
supervisors = "the head of personnel"
department_head = list("Head of Personnel")
selection_color = "#dddddd"
- access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE)
- minimal_access = list(ACCESS_KITCHEN, ACCESS_MAINT_TUNNELS)
+ access = list(ACCESS_KITCHEN, ACCESS_MAINT_TUNNELS)
alt_titles = list("Cook","Culinary Artist","Butcher")
outfit = /datum/outfit/job/chef
@@ -217,7 +242,7 @@
return
var/datum/martial_art/cqc/under_siege/justacook = new
justacook.teach(H)
- ADD_TRAIT(H, TRAIT_TABLE_LEAP, ROUNDSTART_TRAIT)
+ ADD_TRAIT(H.mind, TRAIT_TABLE_LEAP, ROUNDSTART_TRAIT)
/datum/job/hydro
@@ -230,8 +255,7 @@
supervisors = "the head of personnel"
department_head = list("Head of Personnel")
selection_color = "#dddddd"
- access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE)
- minimal_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS)
+ access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS)
alt_titles = list("Hydroponicist", "Botanical Researcher")
outfit = /datum/outfit/job/hydro
@@ -266,7 +290,6 @@
department_head = list("Head of Personnel")
selection_color = "#dddddd"
access = list(ACCESS_CLOWN, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS)
- minimal_access = list(ACCESS_CLOWN, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS)
outfit = /datum/outfit/job/clown
/datum/outfit/job/clown
@@ -281,12 +304,12 @@
id = /obj/item/card/id/clown
pda = /obj/item/pda/clown
backpack_contents = list(
- /obj/item/reagent_containers/food/snacks/grown/banana = 1,
+ /obj/item/food/snacks/grown/banana = 1,
/obj/item/stamp/clown = 1,
/obj/item/toy/crayon/rainbow = 1,
/obj/item/storage/fancy/crayons = 1,
/obj/item/reagent_containers/spray/waterflower = 1,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana = 1,
+ /obj/item/reagent_containers/drinks/bottle/bottleofbanana = 1,
/obj/item/instrument/bikehorn = 1
)
@@ -358,7 +381,6 @@
department_head = list("Head of Personnel")
selection_color = "#dddddd"
access = list(ACCESS_MIME, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS)
- minimal_access = list(ACCESS_MIME, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS)
outfit = /datum/outfit/job/mime
/datum/outfit/job/mime
@@ -377,7 +399,7 @@
pda = /obj/item/pda/mime
backpack_contents = list(
/obj/item/toy/crayon/mime = 1,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 1,
+ /obj/item/reagent_containers/drinks/bottle/bottleofnothing = 1,
/obj/item/cane = 1
)
@@ -414,7 +436,6 @@
department_head = list("Head of Personnel")
selection_color = "#dddddd"
access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS)
- minimal_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS)
alt_titles = list("Custodial Technician")
outfit = /datum/outfit/job/janitor
@@ -442,7 +463,6 @@
department_head = list("Head of Personnel")
selection_color = "#dddddd"
access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS)
- minimal_access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS)
alt_titles = list("Journalist")
outfit = /datum/outfit/job/librarian
@@ -481,7 +501,6 @@
department_head = list("Head of Personnel")
selection_color = "#dddddd"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXPEDITION, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
- minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXPEDITION, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
outfit = /datum/outfit/job/explorer
/datum/outfit/job/explorer
diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm
index 8dfafc345cbb..514e85bdc67b 100644
--- a/code/game/jobs/job/support_chaplain.dm
+++ b/code/game/jobs/job/support_chaplain.dm
@@ -10,7 +10,6 @@
department_head = list("Head of Personnel")
selection_color = "#dddddd"
access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MAINT_TUNNELS)
- minimal_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MAINT_TUNNELS)
outfit = /datum/outfit/job/chaplain
/datum/outfit/job/chaplain
diff --git a/code/game/jobs/job/syndicate_jobs.dm b/code/game/jobs/job/syndicate_jobs.dm
index 0ca792114b7e..089a5b26e4bf 100644
--- a/code/game/jobs/job/syndicate_jobs.dm
+++ b/code/game/jobs/job/syndicate_jobs.dm
@@ -7,7 +7,6 @@
supervisors = "the admins"
selection_color = "#ff0000"
access = list()
- minimal_access = list()
admin_only = TRUE
syndicate_command = 1
outfit = /datum/outfit/job/syndicateofficer
diff --git a/code/game/jobs/job_exp.dm b/code/game/jobs/job_exp.dm
index ae628528e58b..a4539f7494da 100644
--- a/code/game/jobs/job_exp.dm
+++ b/code/game/jobs/job_exp.dm
@@ -51,7 +51,8 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list(
set name = "Check Player Playtime"
if(!check_rights(R_ADMIN|R_MOD|R_MENTOR))
return
- var/msg = "Playtime Report"
+ var/list/msg = list()
+ msg += "Playtime Report"
var/datum/job/theirjob
var/jtext
msg += "
"
- dat += ""
+ dat += ""
switch(current_tab)
if(TAB_CHAR) // Character Settings
@@ -397,7 +399,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
if(TAB_GAME) // General Preferences
// LEFT SIDE OF THE PAGE
- dat += "
"
if(jobban_isbanned(user, ROLE_SYNDICATE))
dat += "You are banned from special roles."
@@ -469,7 +480,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
else
dat += "Be [capitalize(i)]: \[ERROR] "
else
- dat += "Be [capitalize(i)]:[(i in src.be_special) ? "Yes" : "No"] "
+ var/is_special = (i in src.be_special)
+ dat += "Be [capitalize(i)]:[(is_special) ? "Yes" : "No"] "
dat += "
"
if(TAB_GEAR)
diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm
index 67e00f4661e3..50eb770d861a 100644
--- a/code/modules/client/preference/preferences_mysql.dm
+++ b/code/modules/client/preference/preferences_mysql.dm
@@ -35,7 +35,7 @@
//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor))
- UI_style = sanitize_inlist(UI_style, list("White", "Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Vaporwave", "Detective", "Trasen", "Clockwork"), initial(UI_style))// SS220 ADDITIONS "Vaporwave, Detective, Trasen, Clockwork"
+ UI_style = sanitize_inlist(UI_style, list("White", "Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Vaporwave", "Detective", "Trasenknox", "Clockwork"), initial(UI_style)) // SS220 EDIT "Vaporwave, Detective, Trasenknox, Clockwork"
default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
toggles = sanitize_integer(toggles, 0, TOGGLES_TOTAL, initial(toggles))
toggles2 = sanitize_integer(toggles2, 0, TOGGLES_2_TOTAL, initial(toggles2))
diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm
index c252a2d8d1f9..c0f8f13281ac 100644
--- a/code/modules/client/preference/preferences_toggles.dm
+++ b/code/modules/client/preference/preferences_toggles.dm
@@ -227,12 +227,12 @@
SSblackbox.record_feedback("tally", "toggle_verbs", 1, "Toggle Instruments") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/verb/toggle_input()
- set name = "Toggle TGUI Input Lists"
+ set name = "Toggle TGUI Input"
set category = "Preferences"
- set desc = "Switches input lists between the TGUI and the standard one"
- prefs.toggles2 ^= PREFTOGGLE_2_DISABLE_TGUI_LISTS
+ set desc = "Switches inputs between the TGUI and the standard one"
+ prefs.toggles2 ^= PREFTOGGLE_2_DISABLE_TGUI_INPUT
prefs.save_preferences(src)
- to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_DISABLE_TGUI_LISTS) ? "no longer" : "now"] use TGUI Input Lists.")
+ to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_DISABLE_TGUI_INPUT) ? "no longer" : "now"] use TGUI Inputs.")
/client/verb/Toggle_disco() //to toggle off the disco machine locally, in case it gets too annoying
set name = "Hear/Silence Dance Machine"
@@ -254,30 +254,6 @@
prefs.current_tab = 1
prefs.ShowChoices(usr)
-/client/verb/toggle_darkmode()
- set name = "Toggle Darkmode"
- set category = "Preferences"
- set desc = "Toggles UI style between dark and light"
- prefs.toggles ^= PREFTOGGLE_UI_DARKMODE
- prefs.save_preferences(src)
- if(prefs.toggles & PREFTOGGLE_UI_DARKMODE)
- activate_darkmode()
- else
- deactivate_darkmode()
- SSblackbox.record_feedback("tally", "toggle_verbs", 1, "Toggle Darkmode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/client/verb/toggle_popup_limiter()
- set name = "Toggle Text Popup Limiter"
- set category = "Preferences"
- set desc = "Will let you limit the text input popups to one at a time."
- prefs.toggles ^= PREFTOGGLE_TYPING_ONCE
- prefs.save_preferences(src)
- if(prefs.toggles & PREFTOGGLE_TYPING_ONCE)
- to_chat(usr, "You have enabled text popup limiting.")
- else
- to_chat(usr, "You have disabled text popup limiting.")
- return
-
/client/verb/toggle_ghost_pda()
set name = "Show/Hide GhostPDA"
set category = "Preferences"
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 3c3ceea9d347..d11bdd1e7412 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -313,14 +313,15 @@
return
var/list/modes = list("Off", "Binary sensors", "Vitals tracker", "Tracking beacon")
- var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes
+ var/switchMode = tgui_input_list(user, "Select a sensor mode:", "Suit Sensor Mode", modes, modes[sensor_mode + 1])
if(!user.Adjacent(src))
to_chat(user, "You have moved too far away!")
return
if(!ishuman(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
to_chat(user, "You can't use your hands!")
return
-
+ if(!switchMode)
+ return
sensor_mode = modes.Find(switchMode) - 1
if(loc == user)
@@ -558,6 +559,19 @@
/// Maximum weight class of an item in the suit storage slot.
var/max_suit_w = WEIGHT_CLASS_BULKY
+/obj/item/clothing/suit/Initialize(mapload)
+ . = ..()
+ setup_shielding()
+
+/**
+ * Wrapper proc to apply shielding through AddComponent().
+ * Called in /obj/item/clothing/Initialize().
+ * Override with an AddComponent(/datum/component/shielded, args) call containing the desired shield statistics.
+ * See /datum/component/shielded documentation for a description of the arguments
+ **/
+/obj/item/clothing/suit/proc/setup_shielding()
+ return
+
//Proc that opens and closes jackets.
/obj/item/clothing/suit/proc/adjustsuit(mob/user)
if(ignore_suitadjust)
@@ -731,7 +745,7 @@
var/mob/living/carbon/human/H = user
if(H.get_item_by_slot(SLOT_HUD_JUMPSUIT) == src)
for(var/obj/item/clothing/accessory/A in accessories)
- A.attached_unequip()
+ A.attached_unequip(user) // SS220 EDIT - FIX
/obj/item/clothing/under/equipped(mob/user, slot, initial)
..()
@@ -739,7 +753,7 @@
return
if(slot == SLOT_HUD_JUMPSUIT)
for(var/obj/item/clothing/accessory/A in accessories)
- A.attached_equip()
+ A.attached_equip(user) // SS220 EDIT - FIX
/*
* # can_attach_accessory
diff --git a/code/modules/clothing/gloves/colored_gloves.dm b/code/modules/clothing/gloves/colored_gloves.dm
index 27cee19987a1..c2b8ea24035a 100644
--- a/code/modules/clothing/gloves/colored_gloves.dm
+++ b/code/modules/clothing/gloves/colored_gloves.dm
@@ -11,50 +11,6 @@
item_color="yellow"
resistance_flags = NONE
-/obj/item/clothing/gloves/color/yellow/power
- var/old_mclick_override
- var/datum/middleClickOverride/power_gloves/mclick_override = new /datum/middleClickOverride/power_gloves
- var/last_shocked = 0
- var/shock_delay = 3 SECONDS
- var/unlimited_power = FALSE // Does this really need explanation?
- var/shock_range = 7
-
-/obj/item/clothing/gloves/color/yellow/power/examine(mob/user)
- . = ..()
- if(isAntag(user))
- . += "These are a pair of power gloves, and can be used to fire bolts of electricity while standing over powered power cables."
-
-/obj/item/clothing/gloves/color/yellow/power/equipped(mob/user, slot)
- if(!ishuman(user))
- return
- var/mob/living/carbon/human/H = user
- if(slot == SLOT_HUD_GLOVES)
- if(H.middleClickOverride)
- old_mclick_override = H.middleClickOverride
- H.middleClickOverride = mclick_override
- if(!unlimited_power)
- to_chat(H, "You feel electricity begin to build up in [src].")
- else
- to_chat(H, "You feel like you have UNLIMITED POWER!!")
-
-/obj/item/clothing/gloves/color/yellow/power/dropped(mob/user, slot)
- ..()
- if(!ishuman(user))
- return
- var/mob/living/carbon/human/H = user
- if(H.get_item_by_slot(SLOT_HUD_GLOVES) == src && H.middleClickOverride == mclick_override)
- if(old_mclick_override)
- H.middleClickOverride = old_mclick_override
- old_mclick_override = null
- else
- H.middleClickOverride = null
-
-/obj/item/clothing/gloves/color/yellow/power/unlimited
- name = "UNLIMITED POWER gloves"
- desc = "These gloves possess UNLIMITED POWER."
- shock_delay = 0
- unlimited_power = TRUE
-
/obj/item/clothing/gloves/color/yellow/fake
siemens_coefficient = 1
@@ -112,7 +68,7 @@
/obj/item/clothing/gloves/color/black/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/wirecutters))
if(can_be_cut && icon_state == initial(icon_state))//only if not dyed
- var/confirm = alert("Do you want to cut off the gloves fingertips? Warning: It might destroy their functionality.","Cut tips?","Yes","No")
+ var/confirm = tgui_alert(user, "Do you want to cut off the gloves fingertips? Warning: It might destroy their functionality.", "Cut tips?", list("Yes","No"))
if(get_dist(user, src) > 1)
to_chat(user, "You have moved too far away.")
return
diff --git a/code/modules/clothing/gloves/misc_gloves.dm b/code/modules/clothing/gloves/misc_gloves.dm
index 8ccbd2546f86..87d7c9a2682b 100644
--- a/code/modules/clothing/gloves/misc_gloves.dm
+++ b/code/modules/clothing/gloves/misc_gloves.dm
@@ -197,7 +197,7 @@
else
click_speed_modifier = initial(click_speed_modifier) // 2
- if((L.a_intent in accepted_intents))
+ if(L.a_intent in accepted_intents)
L.changeNext_move(click_speed_modifier)
return FALSE
diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm
index 3641624520c1..94d268d41108 100644
--- a/code/modules/clothing/head/job_hats.dm
+++ b/code/modules/clothing/head/job_hats.dm
@@ -120,7 +120,7 @@
name = "hat"
desc = "Someone who wears this will look very smart."
icon_state = "detective"
- allowed = list(/obj/item/reagent_containers/food/snacks/candy/candy_corn, /obj/item/pen)
+ allowed = list(/obj/item/food/snacks/candy/candy_corn, /obj/item/pen)
armor = list(MELEE = 15, BULLET = 5, LASER = 15, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 20, ACID = 50)
dog_fashion = /datum/dog_fashion/head/detective
diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm
index c4bf3681635f..501bfcb60b90 100644
--- a/code/modules/clothing/head/misc_hats.dm
+++ b/code/modules/clothing/head/misc_hats.dm
@@ -580,3 +580,58 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
+
+/obj/item/clothing/head/flower_crown
+ name = "flower crown"
+ desc = "A colorful flower crown made out of lilies, sunflowers and poppies."
+ icon_state = "flower_crown"
+ item_state = "flower_crown"
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ )
+
+/obj/item/clothing/head/sunflower_crown
+ name = "sunflower crown"
+ desc = "A bright flower crown made out sunflowers that is sure to brighten up anyone's day!"
+ icon_state = "sunflower_crown"
+ item_state = "sunflower_crown"
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ )
+
+/obj/item/clothing/head/poppy_crown
+ name = "poppy crown"
+ desc = "A flower crown made out of a string of bright red poppies."
+ icon_state = "poppy_crown"
+ item_state = "poppy_crown"
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ )
+
+/obj/item/clothing/head/lily_crown
+ name = "lily crown"
+ desc = "A leafy flower crown with a cluster of large white lilies at the front."
+ icon_state = "lily_crown"
+ item_state = "lily_crown"
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ )
+
+/obj/item/clothing/head/geranium_crown
+ name = "geranium crown"
+ desc = "A flower crown made out of an array of rich purple geraniums."
+ icon_state = "geranium_crown"
+ item_state = "geranium_crown"
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/head.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+ )
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index fbcab10b2064..0756c90bfc84 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -401,6 +401,7 @@
if(safety)
safety = 0
to_chat(user, "You silently fry [src]'s vocal circuit with the cryptographic sequencer.")
+ return TRUE
else
return
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 4c5ab8de27f7..efa9c46bb50c 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -499,133 +499,3 @@
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/singuloth
sprite_sheets = null
-
-/////////////SHIELDED//////////////////////////////////
-
-/obj/item/clothing/suit/space/hardsuit/shielded
- name = "shielded hardsuit"
- desc = "A hardsuit with built in energy shielding. Will rapidly recharge when not under fire."
- icon_state = "hardsuit-hos"
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded
- allowed = list(/obj/item/flashlight,/obj/item/tank/internals, /obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs)
- armor = list(MELEE = 20, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
- resistance_flags = FIRE_PROOF | ACID_PROOF
- var/current_charges = 3
- var/max_charges = 3 //How many charges total the shielding has
- var/recharge_delay = 200 //How long after we've been shot before we can start recharging. 20 seconds here
- var/recharge_cooldown = 0 //Time since we've last been shot
- var/recharge_rate = 1 //How quickly the shield recharges once it starts charging
- var/shield_state = "shield-old"
- var/shield_on = "shield-old"
-
-/obj/item/clothing/suit/space/hardsuit/shielded/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- recharge_cooldown = world.time + recharge_delay
- if(current_charges > 0)
- do_sparks(2, 1, src)
- owner.visible_message("[owner]'s shields deflect [attack_text] in a shower of sparks!")
- current_charges--
- if(recharge_rate)
- START_PROCESSING(SSobj, src)
- if(istype(hitby, /obj/item/projectile))
- var/obj/item/projectile/P = hitby
- if(P.shield_buster)
- current_charges = max(0, current_charges - 3)
- if(current_charges <= 0)
- owner.visible_message("[owner]'s shield overloads!")
- shield_state = "broken"
- owner.update_inv_wear_suit()
- return 1
- return 0
-
-
-
-/obj/item/clothing/suit/space/hardsuit/shielded/Destroy()
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/item/clothing/suit/space/hardsuit/shielded/process()
- if(world.time > recharge_cooldown && current_charges < max_charges)
- current_charges = clamp((current_charges + recharge_rate), 0, max_charges)
- playsound(loc, 'sound/magic/charge.ogg', 50, TRUE)
- if(current_charges == max_charges)
- playsound(loc, 'sound/machines/ding.ogg', 50, TRUE)
- STOP_PROCESSING(SSobj, src)
- shield_state = "[shield_on]"
- if(ishuman(loc))
- var/mob/living/carbon/human/C = loc
- C.update_inv_wear_suit()
-
-/obj/item/clothing/suit/space/hardsuit/shielded/special_overlays()
- return mutable_appearance('icons/effects/effects.dmi', shield_state, MOB_LAYER + 0.01)
-
-/obj/item/clothing/head/helmet/space/hardsuit/shielded
- name = "shielded hardsuit helmet"
- desc = "A hardsuit helmet with built in energy shielding. Will rapidly recharge when not under fire."
- icon_state = "hardsuit0-sec"
- item_state = "sec_helm"
- item_color = "sec"
- armor = list(MELEE = 20, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
- resistance_flags = FIRE_PROOF | ACID_PROOF
-
-
-//////Syndicate Version
-
-/obj/item/clothing/suit/space/hardsuit/shielded/syndi
- name = "blood-red hardsuit"
- desc = "An advanced hardsuit with built in energy shielding."
- icon_state = "hardsuit1-syndi"
- item_state = "syndie_hardsuit"
- item_color = "syndi"
- armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 25, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
- allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank/internals)
- slowdown = 0
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi
- jetpack = /obj/item/tank/jetpack/suit
-
-/obj/item/clothing/suit/space/hardsuit/shielded/syndi/multitool_act(mob/user, obj/item/I)
- . = TRUE
- if(!I.use_tool(src, user, 0, volume = I.tool_volume))
- return
- if(shield_state == "broken")
- to_chat(user, "You can't interface with the hardsuit's software if the shield's broken!")
- return
-
- if(shield_state == "shield-red")
- shield_state = "shield-old"
- shield_on = "shield-old"
- to_chat(user, "You roll back the hardsuit's software, changing the shield's color!")
-
- else
- shield_state = "shield-red"
- shield_on = "shield-red"
- to_chat(user, "You update the hardsuit's hardware, changing back the shield's color to red.")
- user.update_inv_wear_suit()
-
-/obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi
- name = "blood-red hardsuit helmet"
- desc = "An advanced hardsuit helmet with built in energy shielding."
- icon_state = "hardsuit1-syndi"
- item_state = "syndie_helm"
- item_color = "syndi"
- armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 25, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
-
-
-//////Security Version (Gamma armory only)
-
-/obj/item/clothing/suit/space/hardsuit/shielded/gamma
- name = "shielded security hardsuit"
- desc = "A more advanced version of the normal security hardsuit. Comes with built in energy shielding."
- icon_state = "hardsuit-sec"
- item_state = "sec-hardsuit"
- armor = list(MELEE = 25, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = 150, ACID = 150)
- allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/melee/baton,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/restraints/handcuffs)
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/gamma
-
-/obj/item/clothing/head/helmet/space/hardsuit/shielded/gamma
- name = "shielded security hardsuit helmet"
- desc = "A more advanced version of the normal security hardsuit helmet. Comes with built in energy shielding."
- icon_state = "hardsuit0-sec"
- item_state = "sec_helm"
- item_color = "sec"
- armor = list(MELEE = 25, BULLET = 10, LASER = 20, ENERGY = 5, BOMB = 5, RAD = 50, FIRE = 150, ACID = 150)
-
diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm
index 846b5d033e9d..47c2b602ff78 100644
--- a/code/modules/clothing/suits/armor_suits.dm
+++ b/code/modules/clothing/suits/armor_suits.dm
@@ -190,7 +190,7 @@
armor = list(MELEE = 50, BULLET = 35, LASER = 50, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 450)
dog_fashion = null
resistance_flags = FIRE_PROOF
- allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/fancy/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun/energy, /obj/item/gun/projectile)
+ allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/fancy/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun/energy, /obj/item/gun/projectile)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm
index 4b3232679f5b..db2fcc1981de 100644
--- a/code/modules/clothing/suits/job_suits.dm
+++ b/code/modules/clothing/suits/job_suits.dm
@@ -44,7 +44,7 @@
item_state = "chaplain_hoodie"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
hoodtype = /obj/item/clothing/head/hooded/chaplain_hood
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
@@ -59,7 +59,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDESHOES|HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/hooded/nun_hood
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
@@ -74,7 +74,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDESHOES|HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/hooded/monk_hood
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
/obj/item/clothing/suit/witchhunter
name = "witchhunter garb"
@@ -82,7 +82,7 @@
icon_state = "witchhunter"
item_state = "witchhunter"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
//Chef
diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm
index bfa4b04a399a..1165ab500570 100644
--- a/code/modules/clothing/suits/misc_suits.dm
+++ b/code/modules/clothing/suits/misc_suits.dm
@@ -153,7 +153,7 @@
item_state = "imperium_monk"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDESHOES|HIDEJUMPSUIT
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
/obj/item/clothing/suit/chickensuit
name = "chicken suit"
@@ -220,7 +220,7 @@
item_state = "holidaypriest"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
/obj/item/clothing/suit/cardborg
name = "cardborg suit"
@@ -756,6 +756,9 @@
actions_types = list()
adjust_flavour = null
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy,/obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/projectile/automatic/pistol, /obj/item/gun/projectile/revolver, /obj/item/gun/energy/detective)
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ )
/obj/item/clothing/suit/jacket/miljacket/navy
name = "navy military jacket"
@@ -978,6 +981,9 @@
actions_types = list()
adjust_flavour = null
resistance_flags = NONE
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ )
/obj/item/clothing/suit/jacket/motojacket
name = "leather motorcycle jacket"
@@ -1001,6 +1007,9 @@
icon_state = "leathercoat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ )
/obj/item/clothing/suit/officercoat
name = "clown officer's coat"
@@ -1261,7 +1270,7 @@
icon_state = "abaya"
item_state = "abaya"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
+ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
hoodtype = /obj/item/clothing/head/hooded/screened_niqab
flags_inv = HIDEJUMPSUIT
var/list/options = list(
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index f46c4f290f61..29c33bd0a46a 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -184,38 +184,32 @@
//Shielded Armour
-/obj/item/clothing/suit/space/hardsuit/shielded/wizard
+/obj/item/clothing/suit/space/hardsuit/wizard
name = "battlemage armor"
desc = "Not all wizards are afraid of getting up close and personal."
icon_state = "hardsuit-wiz"
item_state = "wiz_hardsuit"
- recharge_rate = 0
- ///The amount of charges the suit currently has
- current_charges = 15
- ///The max number of charges the suit can hold
- max_charges = 15
- shield_state = "shield-red"
- shield_on = "shield-red"
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 25, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
slowdown = 0
resistance_flags = FIRE_PROOF | ACID_PROOF
magical = TRUE
-/obj/item/clothing/suit/space/hardsuit/shielded/wizard/arch
+/obj/item/clothing/suit/space/hardsuit/wizard/setup_shielding()
+ AddComponent(/datum/component/shielded, max_charges = 15, recharge_start_delay = 0 SECONDS)
+
+/obj/item/clothing/suit/space/hardsuit/wizard/arch
desc = "For the arch wizard in need of additional protection."
- recharge_rate = 5
- recharge_cooldown = 0 SECONDS
- current_charges = 15
- max_charges = 15
- recharge_delay = 1 SECONDS
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard/arch
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard/arch
+
+/obj/item/clothing/suit/space/hardsuit/wizard/arch/setup_shielding()
+ AddComponent(/datum/component/shielded, max_charges = 15, recharge_start_delay = 1 SECONDS, charge_increment_delay = 1 SECONDS)
-/obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard
+/obj/item/clothing/head/helmet/space/hardsuit/wizard
name = "battlemage helmet"
desc = "A suitably impressive helmet."
icon_state = "hardsuit0-wiz"
@@ -228,10 +222,10 @@
resistance_flags = FIRE_PROOF | ACID_PROOF
magical = TRUE
-/obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard/attack_self(mob/user)
+/obj/item/clothing/head/helmet/space/hardsuit/wizard/attack_self(mob/user)
return
-/obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard/arch
+/obj/item/clothing/head/helmet/space/hardsuit/wizard/arch
desc = "A truly protective helmet."
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index cc8c0cc27012..a2f3d90fb155 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -156,8 +156,10 @@
user.visible_message("[user] places [src] against [user.p_their()] chest and listens attentively.", "You place [src] against your chest...")
else
user.visible_message("[user] places \the [src] against [M]'s chest and listens attentively.", "You place \the [src] against [M]'s chest...")
- var/obj/item/organ/internal/H = M.get_int_organ(/obj/item/organ/internal/heart)
- var/obj/item/organ/internal/L = M.get_int_organ(/obj/item/organ/internal/lungs)
+ var/datum/organ/heart/heart_datum = M.get_int_organ_datum(ORGAN_DATUM_HEART)
+ var/obj/item/organ/internal/H = heart_datum.linked_organ
+ var/datum/organ/lungs/lung_datum = M.get_int_organ_datum(ORGAN_DATUM_LUNGS)
+ var/obj/item/organ/internal/L = lung_datum.linked_organ
if(M.pulse && (H || (L && !HAS_TRAIT(M, TRAIT_NOBREATH))))
var/color = "notice"
if(H)
@@ -450,6 +452,7 @@
else
emagged = TRUE
to_chat(user, "You swipe the card and crack the holobadge security checks.")
+ return TRUE
/obj/item/clothing/accessory/holobadge/attack(mob/living/carbon/human/H, mob/living/user)
if(isliving(user))
diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm
index 2916882460aa..a520f476bc87 100644
--- a/code/modules/crafting/craft.dm
+++ b/code/modules/crafting/craft.dm
@@ -285,10 +285,13 @@
return parts_returned
-/datum/personal_crafting/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.not_incapacitated_turf_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/personal_crafting/ui_state(mob/user)
+ return GLOB.not_incapacitated_turf_state
+
+/datum/personal_crafting/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "PersonalCrafting", "Crafting Menu", 700, 800, master_ui, state)
+ ui = new(user, src, "PersonalCrafting", "Crafting Menu")
ui.open()
/datum/personal_crafting/proc/close(mob/user)
diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm
index 794446de44cc..2b41fbf63bee 100644
--- a/code/modules/crafting/guncrafting.dm
+++ b/code/modules/crafting/guncrafting.dm
@@ -29,7 +29,7 @@
/obj/item/weaponcrafting/gunkit/nuclear
name = "\improper advanced energy gun parts kit"
- desc = "A suitcase containing the necessary gun parts to tranform a standard energy gun into an advaned energy gun."
+ desc = "A suitcase containing the necessary gun parts to transform a standard energy gun into an advanced energy gun."
origin_tech = "combat=4;magnets=4;powerstorage=4"
outcome = /obj/item/gun/energy/gun/nuclear
@@ -53,7 +53,7 @@
/obj/item/weaponcrafting/gunkit/temperature
name = "\improper temperature gun parts kit"
- desc = "A suitcase containing the necessary gun parts to tranform a standard energy gun into a temperature gun. Fantastic at birthday parties and killing indigenious populations of Ash Walkers."
+ desc = "A suitcase containing the necessary gun parts to transform a standard energy gun into a temperature gun. Fantastic at birthday parties and killing indigenious populations of Ash Walkers."
origin_tech = "combat=4;materials=4;powerstorage=3;magnets=2"
outcome = /obj/item/gun/energy/temperature
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index d61c901d1e5f..27a767271d6f 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -31,19 +31,19 @@
reqs = list(/datum/reagent/fuel = 50,
/obj/item/stack/cable_coil = 1,
/obj/item/assembly/igniter = 1,
- /obj/item/reagent_containers/food/drinks/cans = 1)
- parts = list(/obj/item/reagent_containers/food/drinks/cans = 1)
+ /obj/item/reagent_containers/drinks/cans = 1)
+ parts = list(/obj/item/reagent_containers/drinks/cans = 1)
time = 15
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/molotov
name = "Molotov"
- result = list(/obj/item/reagent_containers/food/drinks/bottle/molotov)
+ result = list(/obj/item/reagent_containers/drinks/bottle/molotov)
reqs = list(/obj/item/reagent_containers/glass/rag = 1,
- /obj/item/reagent_containers/food/drinks/bottle = 1)
- blacklist = list(/obj/item/reagent_containers/food/drinks/bottle/molotov)
- parts = list(/obj/item/reagent_containers/food/drinks/bottle = 1)
+ /obj/item/reagent_containers/drinks/bottle = 1)
+ blacklist = list(/obj/item/reagent_containers/drinks/bottle/molotov)
+ parts = list(/obj/item/reagent_containers/drinks/bottle = 1)
time = 40
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
@@ -91,10 +91,10 @@
/datum/crafting_recipe/throwing_croissant
name = "Throwing croissant"
reqs = list(
- /obj/item/reagent_containers/food/snacks/croissant = 1,
+ /obj/item/food/snacks/croissant = 1,
/obj/item/stack/rods = 1
)
- result = list(/obj/item/reagent_containers/food/snacks/croissant/throwing)
+ result = list(/obj/item/food/snacks/croissant/throwing)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
always_available = FALSE
@@ -421,29 +421,6 @@
category = CAT_WEAPONRY
subcategory = CAT_AMMO
-/datum/crafting_recipe/improvisedslug
- name = "Improvised Shotgun Shell"
- result = list(/obj/item/ammo_casing/shotgun/improvised)
- reqs = list(/obj/item/grenade/chem_grenade = 1,
- /obj/item/stack/sheet/metal = 1,
- /obj/item/stack/cable_coil = 1,
- /datum/reagent/fuel = 10)
- tools = list(TOOL_SCREWDRIVER)
- time = 5
- category = CAT_WEAPONRY
- subcategory = CAT_AMMO
-
-/datum/crafting_recipe/improvisedslugoverload
- name = "Overload Improvised Shell"
- result = list(/obj/item/ammo_casing/shotgun/improvised/overload)
- reqs = list(/obj/item/ammo_casing/shotgun/improvised = 1,
- /datum/reagent/blackpowder = 10,
- /datum/reagent/plasma_dust = 20)
- tools = list(TOOL_SCREWDRIVER)
- time = 5
- category = CAT_WEAPONRY
- subcategory = CAT_AMMO
-
/datum/crafting_recipe/lasershot
name = "Lasershot Shell"
result = list(/obj/item/ammo_casing/shotgun/lasershot)
@@ -911,7 +888,7 @@
name = "Snowman"
result = list(/obj/structure/snowman/built)
reqs = list(/obj/item/snowball = 10,
- /obj/item/reagent_containers/food/snacks/grown/carrot = 1,
+ /obj/item/food/snacks/grown/carrot = 1,
/obj/item/grown/log = 2)
time = 50
category = CAT_MISC
@@ -1369,7 +1346,7 @@
time = 3 SECONDS
result = list(/obj/item/stack/medical/bruise_pack)
reqs = list(/obj/item/stack/medical/bruise_pack/improvised = 6,
- /datum/reagent/medicine/styptic_powder = 30,
+ /datum/reagent/medicine/heal_on_apply/styptic_powder = 30,
/datum/reagent/medicine/sterilizine = 10)
category = CAT_MISC
@@ -1379,6 +1356,6 @@
result = list(/obj/item/stack/medical/ointment)
reqs = list(/obj/item/stack/sheet/plastic = 2,
/datum/reagent/water = 10,
- /datum/reagent/medicine/silver_sulfadiazine = 30,
+ /datum/reagent/medicine/heal_on_apply/silver_sulfadiazine = 30,
/datum/reagent/medicine/sterilizine = 10)
category = CAT_MISC
diff --git a/code/modules/crafting/tailoring.dm b/code/modules/crafting/tailoring.dm
index 5ce8299daee3..b072b0424880 100644
--- a/code/modules/crafting/tailoring.dm
+++ b/code/modules/crafting/tailoring.dm
@@ -280,3 +280,41 @@
/obj/item/assembly/voice = 1,
/obj/item/stack/cable_coil = 5)
category = CAT_CLOTHING
+
+/datum/crafting_recipe/flower_crown
+ name = "Flower Crown"
+ result = list(/obj/item/clothing/head/flower_crown)
+ reqs = list(/obj/item/food/snacks/grown/poppy = 3,
+ /obj/item/food/snacks/grown/poppy/lily = 3,
+ /obj/item/grown/sunflower = 3
+ )
+ time = 2 SECONDS
+ category = CAT_CLOTHING
+
+/datum/crafting_recipe/sunflower_crown
+ name = "Sunflower Crown"
+ result = list(/obj/item/clothing/head/sunflower_crown)
+ reqs = list(/obj/item/grown/sunflower = 5)
+ time = 2 SECONDS
+ category = CAT_CLOTHING
+
+/datum/crafting_recipe/poppy_crown
+ name = "Poppy Crown"
+ result = list(/obj/item/clothing/head/poppy_crown)
+ reqs = list(/obj/item/food/snacks/grown/poppy = 5)
+ time = 2 SECONDS
+ category = CAT_CLOTHING
+
+/datum/crafting_recipe/lily_crown
+ name = "Lily Crown"
+ result = list(/obj/item/clothing/head/lily_crown)
+ reqs = list(/obj/item/food/snacks/grown/poppy/lily = 5)
+ time = 2 SECONDS
+ category = CAT_CLOTHING
+
+/datum/crafting_recipe/geranium_crown
+ name = "Geranium Crown"
+ result = list(/obj/item/clothing/head/geranium_crown)
+ reqs = list(/obj/item/food/snacks/grown/poppy/geranium = 5)
+ time = 2 SECONDS
+ category = CAT_CLOTHING
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index cc753c4d261b..3331ee4d8fd5 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -269,9 +269,9 @@
storage_slots = 3
/obj/item/storage/toolbox/fluff/lunchbox/populate_contents()
- new /obj/item/reagent_containers/food/snacks/sandwich(src)
- new /obj/item/reagent_containers/food/snacks/chips(src)
- new /obj/item/reagent_containers/food/drinks/cans/cola(src)
+ new /obj/item/food/snacks/sandwich(src)
+ new /obj/item/food/snacks/chips(src)
+ new /obj/item/reagent_containers/drinks/cans/cola(src)
/obj/item/fluff/wingler_comb
@@ -851,7 +851,6 @@
/obj/item/clothing/suit/fluff/kluys/verb/toggle()
set name = "Toggle Nanofibre Mode"
set category = "Object"
- set src in usr
if(usr.stat || usr.restrained())
return 0
@@ -1058,6 +1057,7 @@
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
actions_types = list(/datum/action/item_action/zipper)
adjust_flavour = "unzip"
+ sprite_sheets = null
//////////// Uniforms ////////////
@@ -1148,7 +1148,6 @@
/obj/item/clothing/under/fluff/jane_sidsuit/verb/toggle_zipper()
set name = "Toggle Jumpsuit Zipper"
set category = "Object"
- set src in usr
if(usr.stat || usr.restrained())
return 0
diff --git a/code/modules/detective_work/detective_work.dm b/code/modules/detective_work/detective_work.dm
index 98e119402f1a..0ea5bcefb2dd 100644
--- a/code/modules/detective_work/detective_work.dm
+++ b/code/modules/detective_work/detective_work.dm
@@ -1,7 +1,5 @@
//CONTAINS: Suit fibers and Detective's Scanning Computer
-/atom/var/list/suit_fibers
-
/atom/proc/add_fibers(mob/living/carbon/human/M)
if(M.gloves && isclothing(M.gloves))
var/obj/item/clothing/gloves/G = M.gloves
diff --git a/code/modules/detective_work/evidence.dm b/code/modules/detective_work/evidence.dm
index e5954b0e1b2f..104e1130d23e 100644
--- a/code/modules/detective_work/evidence.dm
+++ b/code/modules/detective_work/evidence.dm
@@ -41,11 +41,7 @@
if(isstorage(I.loc)) //in a container.
var/obj/item/storage/U = I.loc
U.remove_from_storage(I, src)
- else if(user.l_hand == I) //in a hand
- user.drop_l_hand()
- else if(user.r_hand == I) //in a hand
- user.drop_r_hand()
- else
+ else if(!user.is_holding(I) || !user.unEquip(I)) //in a hand
return
user.visible_message("[user] puts [I] into [src].", "You put [I] inside [src].",\
diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm
index 31563fa02b8f..dfe08ce1fa1e 100644
--- a/code/modules/detective_work/scanner.dm
+++ b/code/modules/detective_work/scanner.dm
@@ -17,7 +17,7 @@
actions_types = list(/datum/action/item_action/print_forensic_report, /datum/action/item_action/clear_records)
/obj/item/detective_scanner/attack_self(mob/user)
- var/search = input(user, "Enter name, fingerprint or blood DNA.", "Find record", "")
+ var/search = tgui_input_text(user, "Enter name, fingerprint or blood DNA.", "Find record")
if(!search || user.stat || user.incapacitated())
return
diff --git a/code/modules/economy/economy_admin.dm b/code/modules/economy/economy_admin.dm
index f33af855c66d..186a36b4af98 100644
--- a/code/modules/economy/economy_admin.dm
+++ b/code/modules/economy/economy_admin.dm
@@ -12,10 +12,13 @@
/datum/ui_module/economy_manager
name = "Economy Manager"
-/datum/ui_module/economy_manager/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/economy_manager/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/ui_module/economy_manager/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "EconomyManager", name, 600, 350, master_ui, state)
+ ui = new(user, src, "EconomyManager", name)
ui.autoupdate = TRUE
ui.open()
diff --git a/code/modules/economy/economy_machinery/account_terminal.dm b/code/modules/economy/economy_machinery/account_terminal.dm
index 282aa26a4df8..d8b1ec285641 100644
--- a/code/modules/economy/economy_machinery/account_terminal.dm
+++ b/code/modules/economy/economy_machinery/account_terminal.dm
@@ -32,10 +32,13 @@
/obj/machinery/computer/account_database/attack_hand(mob/user)
ui_interact(user)
-/obj/machinery/computer/account_database/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/account_database/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/computer/account_database/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "AccountsUplinkTerminal", name, 800, 600, master_ui, state)
+ ui = new(user, src, "AccountsUplinkTerminal", name)
ui.open()
/obj/machinery/computer/account_database/ui_data(mob/user)
diff --git a/code/modules/economy/economy_machinery/atm.dm b/code/modules/economy/economy_machinery/atm.dm
index 8d75ef68f40c..99d8dc2f687b 100644
--- a/code/modules/economy/economy_machinery/atm.dm
+++ b/code/modules/economy/economy_machinery/atm.dm
@@ -129,10 +129,13 @@
UnregisterSignal(authenticated_account, COMSIG_PARENT_QDELETING)
authenticated_account = null
-/obj/machinery/economy/atm/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/economy/atm/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/economy/atm/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ATM", name, 550, 650)
+ ui = new(user, src, "ATM", name)
ui.open()
/obj/machinery/economy/atm/ui_data(mob/user)
diff --git a/code/modules/economy/economy_machinery/eftpos.dm b/code/modules/economy/economy_machinery/eftpos.dm
index 5826d1db063a..9df87f8d06e2 100644
--- a/code/modules/economy/economy_machinery/eftpos.dm
+++ b/code/modules/economy/economy_machinery/eftpos.dm
@@ -55,10 +55,13 @@
else
return ..()
-/obj/item/eftpos/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/eftpos/ui_state(mob/user)
+ return GLOB.inventory_state
+
+/obj/item/eftpos/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "EFTPOS", name, 500, 250, master_ui, state)
+ ui = new(user, src, "EFTPOS", name)
ui.open()
/obj/item/eftpos/ui_data(mob/user)
@@ -90,14 +93,12 @@
switch(action)
if("change_code")
- var/attempt_code = input("Re-enter the current EFTPOS access code", "Confirm old EFTPOS code") as num
+ var/attempt_code = tgui_input_number(user, "Re-enter the current EFTPOS access code:", "Confirm old EFTPOS code", max_value = 9999, min_value = 1000)
if(attempt_code == access_code)
- var/trycode = input("Enter a new access code for this device (4 digits, numbers only)", "Enter new EFTPOS code") as num
- if(trycode < 1000 || trycode > 9999)
- alert("That is not a valid code!")
+ var/trycode = tgui_input_number(user, "Enter a new access code for this device:", "Enter new EFTPOS code", max_value = 9999, min_value = 1000)
+ if(!trycode)
return
access_code = trycode
-
print_reference()
else
to_chat(user, "[bicon(src)]Incorrect code entered.")
@@ -105,9 +106,11 @@
if(!account_database)
reconnect_database()
if(account_database)
- var/attempt_account_num = input("Enter account number to pay EFTPOS charges into", "New account number") as num
- var/attempt_pin = input("Enter pin code", "Account pin") as num
- if(!check_user_position(user) || !account_database)
+ var/attempt_account_num = tgui_input_number(user, "Enter account number to pay EFTPOS charges into:", "New account number", max_value = 9999999, min_value = 1000000)
+ if(!attempt_account_num)
+ return
+ var/attempt_pin = tgui_input_number(user, "Enter pin code", "Account pin", max_value = 99999, min_value = 10000)
+ if(!check_user_position(user) || !account_database || !attempt_pin)
return
var/datum/money_account/target_account = GLOB.station_money_database.find_user_account(attempt_account_num, include_departments = TRUE)
if(!target_account)
@@ -119,6 +122,7 @@
linked_account = target_account
else
to_chat(user, "[bicon(src)]Unable to connect to inputed account.")
+ return
else
to_chat(user, "[bicon(src)]Unable to connect to accounts database.")
return
@@ -130,25 +134,18 @@
linked_account = target_account
to_chat(user, "[bicon(src)]Linked account successfully set to [target_account.account_name]")
if("trans_purpose")
- var/purpose = clean_input("Enter reason for EFTPOS transaction", "Transaction purpose", transaction_purpose)
- if(!check_user_position(user))
+ var/purpose = tgui_input_text(user, "Enter reason for EFTPOS transaction", "Transaction purpose", transaction_purpose, encode = FALSE)
+ if(!check_user_position(user) || !purpose)
return
- if(purpose)
- transaction_purpose = purpose
+ transaction_purpose = purpose
if("trans_value")
- var/try_num = input("Enter amount for EFTPOS transaction", "Transaction amount", transaction_amount) as num
- if(!check_user_position(user))
- return
- if(try_num < 0)
- alert("That is not a valid amount!")
- return
- if(try_num > MAX_EFTPOS_CHARGE)
- alert("You cannot charge more than [MAX_EFTPOS_CHARGE] per transaction!")
+ var/try_num = tgui_input_number(user, "Enter amount for EFTPOS transaction", "Transaction amount", transaction_amount, MAX_EFTPOS_CHARGE)
+ if(!check_user_position(user) || !try_num)
return
transaction_amount = try_num
if("toggle_lock")
if(transaction_locked)
- var/attempt_code = input("Enter EFTPOS access code", "Reset Transaction") as num
+ var/attempt_code = tgui_input_number(user, "Enter EFTPOS access code", "Reset Transaction", max_value = 9999, min_value = 1000)
if(!check_user_position(user))
return
if(attempt_code == access_code)
@@ -188,14 +185,14 @@
//if security level high enough, prompt for pin
var/attempt_pin
if(D.security_level != ACCOUNT_SECURITY_ID)
- attempt_pin = input("Enter pin code", "EFTPOS transaction") as num
+ attempt_pin = tgui_input_number(user, "Enter pin code", "EFTPOS transaction", max_value = 9999, min_value = 1000)
if(!attempt_pin || !Adjacent(user))
return
//given the credentials, can the associated account be accessed right now?
if(!GLOB.station_money_database.try_authenticate_login(D, attempt_pin, restricted_bypass = FALSE))
to_chat(user, "[bicon(src)]Unable to access account, insufficient access.")
return
- if(alert("Are you sure you want to pay $[transaction_amount] to: [linked_account.account_name] ", "Confirm transaction", "Yes", "No") != "Yes")
+ if(tgui_alert(user, "Are you sure you want to pay $[transaction_amount] to: [linked_account.account_name]", "Confirm transaction", list("Yes", "No")) != "Yes")
return
if(!Adjacent(user))
return
@@ -278,10 +275,13 @@
to_chat(user, "You need to be behind [src] to use it!")
return
add_fingerprint(user)
- ui_interact(user, state = GLOB.human_adjacent_state)
+ ui_interact(user)
return TRUE
return ..()
+/obj/item/eftpos/register/ui_state(mob/user)
+ return GLOB.human_adjacent_state
+
/obj/item/eftpos/register/attack_self(mob/user)
to_chat(user, "[src] has to be set down and secured to be used.")
diff --git a/code/modules/events/blob/blob_mobs.dm b/code/modules/events/blob/blob_mobs.dm
index 0b9fca72d0f0..afc6d5f6d81a 100644
--- a/code/modules/events/blob/blob_mobs.dm
+++ b/code/modules/events/blob/blob_mobs.dm
@@ -231,7 +231,7 @@
flick("blobbernaut_death", src)
/mob/living/simple_animal/hostile/blob/blobbernaut/proc/blob_talk()
- var/message = input(src, "Announce to the overmind", "Blob Telepathy")
+ var/message = tgui_input_text(usr, "Announce to the overmind", "Blob Telepathy")
var/rendered
var/follow_text
if(message)
diff --git a/code/modules/events/blob/blob_powers.dm b/code/modules/events/blob/blob_powers.dm
index 0dc7c75625a7..e52ea432f828 100644
--- a/code/modules/events/blob/blob_powers.dm
+++ b/code/modules/events/blob/blob_powers.dm
@@ -27,7 +27,7 @@
for(var/i = 1; i <= GLOB.blob_nodes.len; i++)
var/obj/structure/blob/node/B = GLOB.blob_nodes[i]
nodes["Blob Node #[i] ([get_location_name(B)])"] = B
- var/node_name = input(src, "Choose a node to jump to.", "Node Jump") in nodes
+ var/node_name = tgui_input_list(src, "Choose a node to jump to.", "Node Jump", nodes)
var/obj/structure/blob/node/chosen_node = nodes[node_name]
if(chosen_node)
src.loc = chosen_node.loc
@@ -414,7 +414,6 @@
for(var/mob/living/simple_animal/hostile/blob_minion in blob_mobs)
if(blob_minion.stat == CONSCIOUS)
blob_minion.say(speak_text)
- return
/mob/camera/blob/verb/create_storage()
set category = "Blob"
diff --git a/code/modules/events/meaty_ores.dm b/code/modules/events/meaty_ores.dm
index 76d7fac990ee..751f8dbe3343 100644
--- a/code/modules/events/meaty_ores.dm
+++ b/code/modules/events/meaty_ores.dm
@@ -32,7 +32,7 @@
if(prob(80))
gibs(where)
if(prob(45))
- new /obj/item/reagent_containers/food/snacks/meat(where)
+ new /obj/item/food/snacks/meat(where)
else if(prob(10))
explosion(where, 0, pick(0,1), pick(2,3), 0)
else
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 74b27ad51344..2bacfbac9646 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -17,7 +17,11 @@
/datum/event/vent_clog/tick()
if(activeFor % interval == 0)
- var/obj/vent = pick_n_take(vents)
+ var/obj/machinery/atmospherics/unary/vent_scrubber/vent = pick_n_take(vents)
+
+ if(!vent || vent.welded)
+ endWhen++
+ return
var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","psilocybin","lube",
"atrazine","banana","charcoal","space_drugs","methamphetamine","holywater","ethanol","hot_coco","facid",
diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm
index 758a36ebb1af..707eb46ca9c7 100644
--- a/code/modules/fish/fish_items.dm
+++ b/code/modules/fish/fish_items.dm
@@ -66,7 +66,7 @@
can_hold = list(
/obj/item/fish,
/obj/item/fish_eggs,
- /obj/item/reagent_containers/food/snacks/shrimp,
+ /obj/item/food/snacks/shrimp,
)
resistance_flags = FLAMMABLE
@@ -74,7 +74,7 @@
// Fish Items //
//////////////////////////////////////////////
-/obj/item/reagent_containers/food/snacks/shrimp
+/obj/item/food/snacks/shrimp
name = "shrimp"
desc = "A single raw shrimp."
icon = 'icons/obj/food/seafood.dmi'
@@ -82,12 +82,12 @@
filling_color = "#FF1C1C"
bitesize = 1
-/obj/item/reagent_containers/food/snacks/shrimp/Initialize(mapload)
+/obj/item/food/snacks/shrimp/Initialize(mapload)
. = ..()
desc = pick("Anyway, like I was sayin', shrimp is the fruit of the sea.", "You can barbecue it, boil it, broil it, bake it, saute it.")
reagents.add_reagent("protein", 1)
-/obj/item/reagent_containers/food/snacks/feederfish
+/obj/item/food/snacks/feederfish
name = "feeder fish"
desc = "A tiny feeder fish. Sure doesn't look very filling..."
icon = 'icons/obj/food/seafood.dmi'
@@ -95,7 +95,7 @@
filling_color = "#FF1C1C"
bitesize = 1
-/obj/item/reagent_containers/food/snacks/feederfish/Initialize(mapload)
+/obj/item/food/snacks/feederfish/Initialize(mapload)
. = ..()
reagents.add_reagent("protein", 1)
@@ -170,8 +170,8 @@
/obj/item/fish/catfish/attackby(obj/item/O, mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
- new /obj/item/reagent_containers/food/snacks/catfishmeat(get_turf(src))
- new /obj/item/reagent_containers/food/snacks/catfishmeat(get_turf(src))
+ new /obj/item/food/snacks/catfishmeat(get_turf(src))
+ new /obj/item/food/snacks/catfishmeat(get_turf(src))
qdel(src)
return
..()
@@ -189,8 +189,8 @@
/obj/item/fish/salmon/attackby(obj/item/O, mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
- new /obj/item/reagent_containers/food/snacks/salmonmeat(get_turf(src))
- new /obj/item/reagent_containers/food/snacks/salmonmeat(get_turf(src))
+ new /obj/item/food/snacks/salmonmeat(get_turf(src))
+ new /obj/item/food/snacks/salmonmeat(get_turf(src))
qdel(src)
return
..()
@@ -205,7 +205,7 @@
/obj/item/fish/babycarp/attackby(obj/item/O, mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
- new /obj/item/reagent_containers/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
+ new /obj/item/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
qdel(src)
return
..()
diff --git a/code/modules/fish/fish_types.dm b/code/modules/fish/fish_types.dm
index f7c2e6659cc2..f90cda4efc90 100644
--- a/code/modules/fish/fish_types.dm
+++ b/code/modules/fish/fish_types.dm
@@ -52,13 +52,13 @@
/datum/fish/shrimp
fish_name = "shrimp"
egg_item = /obj/item/fish_eggs/shrimp
- fish_item = /obj/item/reagent_containers/food/snacks/shrimp
+ fish_item = /obj/item/food/snacks/shrimp
crossbreeder = 0
/datum/fish/feederfish
fish_name = "feeder fish"
egg_item = /obj/item/fish_eggs/feederfish
- fish_item = /obj/item/reagent_containers/food/snacks/feederfish
+ fish_item = /obj/item/food/snacks/feederfish
/datum/fish/feederfish/special_interact(obj/machinery/fishtank/my_tank)
if(!my_tank || !istype(my_tank))
diff --git a/code/modules/food_and_drinks/drinks/bottler/bottler.dm b/code/modules/food_and_drinks/drinks/bottler/bottler.dm
index 10f1065f444f..60672679bea5 100644
--- a/code/modules/food_and_drinks/drinks/bottler/bottler.dm
+++ b/code/modules/food_and_drinks/drinks/bottler/bottler.dm
@@ -28,8 +28,8 @@
available_recipes = list()
acceptable_items = list()
//These are going to be acceptable even if they aren't in a recipe
- acceptable_items |= /obj/item/reagent_containers/food/snacks
- acceptable_items |= /obj/item/reagent_containers/food/drinks/cans
+ acceptable_items |= /obj/item/food/snacks
+ acceptable_items |= /obj/item/reagent_containers/drinks/cans
//the rest is based on what is used in recipes so we don't have people destroying the nuke disc
for(var/type in subtypesof(/datum/bottler_recipe))
var/datum/bottler_recipe/recipe = new type
@@ -45,8 +45,8 @@
to_chat(user, "[O] is stuck to your hand, you can't seem to put it down!")
return 0
if(is_type_in_list(O,acceptable_items))
- if(istype(O, /obj/item/reagent_containers/food/snacks))
- var/obj/item/reagent_containers/food/snacks/S = O
+ if(istype(O, /obj/item/food/snacks))
+ var/obj/item/food/snacks/S = O
user.unEquip(S)
if(S.reagents && !S.reagents.total_volume) //This prevents us from using empty foods, should one occur due to some sort of error
to_chat(user, "[S] is gone, oh no!")
@@ -54,8 +54,8 @@
else
insert_item(S, user)
return 1
- else if(istype(O, /obj/item/reagent_containers/food/drinks/cans))
- var/obj/item/reagent_containers/food/drinks/cans/C = O
+ else if(istype(O, /obj/item/reagent_containers/drinks/cans))
+ var/obj/item/reagent_containers/drinks/cans/C = O
if(C.reagents)
if(C.can_opened && C.reagents.total_volume) //This prevents us from using opened cans that still have something in them
to_chat(user, "Only unopened cans and bottles can be processed to ensure product integrity.")
@@ -141,8 +141,8 @@
else
con_type = "metal can"
max_define = MAX_METAL
- else if(istype(O, /obj/item/reagent_containers/food/drinks/cans))
- var/obj/item/reagent_containers/food/drinks/cans/C = O
+ else if(istype(O, /obj/item/reagent_containers/drinks/cans))
+ var/obj/item/reagent_containers/drinks/cans/C = O
if(C.is_glass)
con_type = "glass bottle"
max_define = MAX_GLASS
@@ -215,17 +215,17 @@
/obj/machinery/bottler/proc/dispense_empty_container(container)
var/con_type
- var/obj/item/reagent_containers/food/drinks/cans/bottler/drink_container
+ var/obj/item/reagent_containers/drinks/cans/bottler/drink_container
switch(container)
if(1) //glass bottle
con_type = "glass bottle"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/glass_bottle
if(2) //plastic bottle
con_type = "plastic bottle"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/plastic_bottle
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/plastic_bottle
if(3) //metal can
con_type = "metal can"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/metal_can
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/metal_can
if(containers[con_type])
//empties aren't sealed, so let's open it quietly
drink_container = new drink_container()
@@ -240,18 +240,18 @@
visible_message("There are no ingredients to process! Please insert some first.")
return
//prep a container
- var/obj/item/reagent_containers/food/drinks/cans/bottler/drink_container
+ var/obj/item/reagent_containers/drinks/cans/bottler/drink_container
var/con_type
switch(container)
if(1) //glass bottle
con_type = "glass bottle"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/glass_bottle
if(2) //plastic bottle
con_type = "plastic bottle"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/plastic_bottle
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/plastic_bottle
if(3) //metal can
con_type = "metal can"
- drink_container = /obj/item/reagent_containers/food/drinks/cans/bottler/metal_can
+ drink_container = /obj/item/reagent_containers/drinks/cans/bottler/metal_can
if(!con_type)
visible_message("Error 404: Drink Container Not Found.")
diff --git a/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm b/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm
index 5f13f5938929..3a923c5428ad 100644
--- a/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm
+++ b/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm
@@ -22,48 +22,48 @@ There is no excuse to do this wrong now that there is an example for you. --Fals
/datum/bottler_recipe/Paradise_Punch
name = "Paradise Punch"
description = "Tastes just how you'd think Paradise would if you could bottle it."
- ingredients = list(/obj/item/reagent_containers/food/snacks/grown/grapes,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/cherries)
+ ingredients = list(/obj/item/food/snacks/grown/grapes,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/cherries)
result = "paradise_punch"
/datum/bottler_recipe/Applepocalypse
name = "Apple-pocalypse"
description = "If doomsday came in fruit form, it'd probably be apples."
- ingredients = list(/obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/apple)
+ ingredients = list(/obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/apple)
result = "apple-pocalypse"
/datum/bottler_recipe/Berry_Banned
name = "Berry Banned"
description = "Reason for ban: Excessive Flavor."
- ingredients = list(/obj/item/reagent_containers/food/snacks/grown/berries,
- /obj/item/reagent_containers/food/snacks/grown/berries,
- /obj/item/reagent_containers/food/snacks/grown/berries)
+ ingredients = list(/obj/item/food/snacks/grown/berries,
+ /obj/item/food/snacks/grown/berries,
+ /obj/item/food/snacks/grown/berries)
result = "berry_banned"
/datum/bottler_recipe/Berry_Banned2
name = "Berry Banned"
description = "Reason for ban: Excessive Flavor."
- ingredients = list(/obj/item/reagent_containers/food/snacks/grown/berries/poison,
- /obj/item/reagent_containers/food/snacks/grown/berries/poison,
- /obj/item/reagent_containers/food/snacks/grown/berries/poison)
+ ingredients = list(/obj/item/food/snacks/grown/berries/poison,
+ /obj/item/food/snacks/grown/berries/poison,
+ /obj/item/food/snacks/grown/berries/poison)
result = "berry_banned2"
/datum/bottler_recipe/Blackeye_Brew
name = "Blackeye Brew"
description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years."
- ingredients = list(/obj/item/reagent_containers/food/drinks/cans/cola,
- /obj/item/reagent_containers/food/snacks/grown/sugarcane,
- /obj/item/reagent_containers/food/snacks/frozen/icecream)
+ ingredients = list(/obj/item/reagent_containers/drinks/cans/cola,
+ /obj/item/food/snacks/grown/sugarcane,
+ /obj/item/food/snacks/frozen/icecream)
result = "blackeye_brew"
/datum/bottler_recipe/Grape_Granade
name = "Grape Granade"
description = "Exploding with grape flavor and a favorite among ERT members system-wide."
- ingredients = list(/obj/item/reagent_containers/food/drinks/cans/grape_juice,
- /obj/item/reagent_containers/food/snacks/grown/grapes,
+ ingredients = list(/obj/item/reagent_containers/drinks/cans/grape_juice,
+ /obj/item/food/snacks/grown/grapes,
/obj/item/flash)
result = "grape_granade"
@@ -71,6 +71,6 @@ There is no excuse to do this wrong now that there is an example for you. --Fals
name = "Meteor Malt"
description = "Soft drinks have been detected on collision course with your tastebuds."
ingredients = list(/obj/item/stack/ore,
- /obj/item/reagent_containers/food/snacks/grown/wheat,
+ /obj/item/food/snacks/grown/wheat,
/obj/item/stack/ore)
result = "meteor_malt"
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 5307f00752dc..88d923bb4458 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -4,7 +4,7 @@
//Functionally identical to regular drinks. The only difference is that the default bottle size is 100. - Darem
//Bottles now weaken and break when smashed on people's heads. - Giacom
-/obj/item/reagent_containers/food/drinks/bottle
+/obj/item/reagent_containers/drinks/bottle
amount_per_transfer_from_this = 10
volume = 100
throwforce = 15
@@ -12,7 +12,7 @@
var/const/duration = 13 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets)
var/is_glass = TRUE //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
-/obj/item/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target, mob/living/user, ranged = FALSE)
+/obj/item/reagent_containers/drinks/bottle/proc/smash(mob/living/target, mob/living/user, ranged = FALSE)
//Creates a shattering noise and replaces the bottle with a broken_bottle
var/new_location = get_turf(loc)
@@ -42,7 +42,7 @@
qdel(src)
-/obj/item/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user)
+/obj/item/reagent_containers/drinks/bottle/attack(mob/living/target, mob/living/user)
if(!target)
return
@@ -119,18 +119,18 @@
//Finally, smash the bottle. This kills (qdel) the bottle.
smash(target, user)
-/obj/item/reagent_containers/food/drinks/bottle/proc/SplashReagents(mob/M)
+/obj/item/reagent_containers/drinks/bottle/proc/SplashReagents(mob/M)
if(reagents && reagents.total_volume)
M.visible_message("The contents of \the [src] splashes all over [M]!")
reagents.reaction(M, REAGENT_TOUCH)
reagents.clear_reagents()
-/obj/item/reagent_containers/food/drinks/bottle/throw_impact(atom/target,mob/thrower)
+/obj/item/reagent_containers/drinks/bottle/throw_impact(atom/target,mob/thrower)
..()
SplashReagents(target)
smash(target, thrower, ranged = TRUE)
-/obj/item/reagent_containers/food/drinks/bottle/decompile_act(obj/item/matter_decompiler/C, mob/user)
+/obj/item/reagent_containers/drinks/bottle/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(!reagents.total_volume)
C.stored_comms["glass"] += 3
qdel(src)
@@ -159,119 +159,119 @@
qdel(src)
return TRUE
-/obj/item/reagent_containers/food/drinks/bottle/gin
+/obj/item/reagent_containers/drinks/bottle/gin
name = "Griffeater Gin"
desc = "A bottle of high quality gin, produced in the New London Space Station."
icon_state = "ginbottle"
list_reagents = list("gin" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/whiskey
+/obj/item/reagent_containers/drinks/bottle/whiskey
name = "Uncle Git's Special Reserve"
desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
icon_state = "whiskeybottle"
list_reagents = list("whiskey" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/vodka
+/obj/item/reagent_containers/drinks/bottle/vodka
name = "Tunguska Triple Distilled"
desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
icon_state = "vodkabottle"
list_reagents = list("vodka" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka
+/obj/item/reagent_containers/drinks/bottle/vodka/badminka
name = "Badminka Vodka"
desc = "The label's written in Cyrillic. All you can make out is the name and a word that looks vaguely like 'Vodka'."
icon_state = "badminka"
list_reagents = list("vodka" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/tequila
+/obj/item/reagent_containers/drinks/bottle/tequila
name = "Caccavo Guaranteed Quality Tequila"
desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
icon_state = "tequilabottle"
list_reagents = list("tequila" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
+/obj/item/reagent_containers/drinks/bottle/bottleofnothing
name = "Bottle of Nothing"
desc = "A bottle filled with nothing."
icon_state = "bottleofnothing"
list_reagents = list("nothing" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/bottleofbanana
+/obj/item/reagent_containers/drinks/bottle/bottleofbanana
name = "Jolly Jug"
desc = "A jug filled with banana juice."
icon_state = "bottleofjolly"
list_reagents = list("banana" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/patron
+/obj/item/reagent_containers/drinks/bottle/patron
name = "Wrapp Artiste Patron"
desc = "Silver laced tequila, served in space night clubs across the galaxy."
icon_state = "patronbottle"
list_reagents = list("patron" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/rum
+/obj/item/reagent_containers/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"
list_reagents = list("rum" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/holywater
+/obj/item/reagent_containers/drinks/bottle/holywater
name = "flask of holy water"
desc = "A flask of the chaplain's holy water."
icon_state = "holyflask"
list_reagents = list("holywater" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/holywater/hell
+/obj/item/reagent_containers/drinks/bottle/holywater/hell
desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
list_reagents = list("hell_water" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/vermouth
+/obj/item/reagent_containers/drinks/bottle/vermouth
name = "Goldeneye Vermouth"
desc = "Sweet, sweet dryness~"
icon_state = "vermouthbottle"
list_reagents = list("vermouth" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/kahlua
+/obj/item/reagent_containers/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"
list_reagents = list("kahlua" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/goldschlager
+/obj/item/reagent_containers/drinks/bottle/goldschlager
name = "College Girl Goldschlager"
desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
icon_state = "goldschlagerbottle"
list_reagents = list("goldschlager" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/cognac
+/obj/item/reagent_containers/drinks/bottle/cognac
name = "Chateau De Baton Premium Cognac"
desc = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
icon_state = "cognacbottle"
list_reagents = list("cognac" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/wine
+/obj/item/reagent_containers/drinks/bottle/wine
name = "Doublebeard Bearded Special Wine"
desc = "A faint aura of unease and asspainery surrounds the bottle."
icon_state = "winebottle"
list_reagents = list("wine" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/absinthe
+/obj/item/reagent_containers/drinks/bottle/absinthe
name = "Yellow Marquee Absinthe"
desc = "A strong alcoholic drink brewed and distributed by Yellow Marquee."
icon_state = "absinthebottle"
list_reagents = list("absinthe" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium
+/obj/item/reagent_containers/drinks/bottle/absinthe/premium
name = "Gwyn's Premium Absinthe"
desc = "A potent alcoholic beverage, almost makes you forget the ash in your lungs."
icon_state = "absinthepremium"
-/obj/item/reagent_containers/food/drinks/bottle/hcider
+/obj/item/reagent_containers/drinks/bottle/hcider
name = "Jian Hard Cider"
desc = "Apple juice for adults."
icon_state = "hcider"
volume = 50
list_reagents = list("suicider" = 50)
-/obj/item/reagent_containers/food/drinks/bottle/fernet
+/obj/item/reagent_containers/drinks/bottle/fernet
name = "Fernet Bronca"
desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station"
icon_state = "fernetbottle"
@@ -279,7 +279,7 @@
//////////////////////////JUICES AND STUFF ///////////////////////
-/obj/item/reagent_containers/food/drinks/bottle/orangejuice
+/obj/item/reagent_containers/drinks/bottle/orangejuice
name = "orange juice"
desc = "Full of vitamins and deliciousness!"
icon_state = "orangejuice"
@@ -288,7 +288,7 @@
is_glass = FALSE
list_reagents = list("orangejuice" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/cream
+/obj/item/reagent_containers/drinks/bottle/cream
name = "milk cream"
desc = "It's cream. Made from milk. What else did you think you'd find in there?"
icon_state = "cream"
@@ -297,7 +297,7 @@
is_glass = FALSE
list_reagents = list("cream" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
+/obj/item/reagent_containers/drinks/bottle/tomatojuice
name = "tomato juice"
desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
icon_state = "tomatojuice"
@@ -306,7 +306,7 @@
is_glass = FALSE
list_reagents = list("tomatojuice" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/limejuice
+/obj/item/reagent_containers/drinks/bottle/limejuice
name = "lime juice"
desc = "Sweet-sour goodness."
icon_state = "limejuice"
@@ -315,7 +315,7 @@
is_glass = FALSE
list_reagents = list("limejuice" = 100)
-/obj/item/reagent_containers/food/drinks/bottle/milk
+/obj/item/reagent_containers/drinks/bottle/milk
name = "milk"
desc = "Soothing milk."
icon_state = "milk"
@@ -325,7 +325,7 @@
list_reagents = list("milk" = 100)
////////////////////////// MOLOTOV ///////////////////////
-/obj/item/reagent_containers/food/drinks/bottle/molotov
+/obj/item/reagent_containers/drinks/bottle/molotov
name = "molotov cocktail"
desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by rioters and revolutionaries. Light and toss."
icon_state = "vodkabottle"
@@ -334,32 +334,32 @@
/datum/reagent/napalm,/datum/reagent/hellwater,/datum/reagent/plasma,/datum/reagent/plasma_dust)
var/active = FALSE
-/obj/item/reagent_containers/food/drinks/bottle/molotov/update_desc()
+/obj/item/reagent_containers/drinks/bottle/molotov/update_desc()
. = ..()
desc = initial(desc)
if(!is_glass)
desc += " You're not sure if making this out of a carton was the brightest idea."
-/obj/item/reagent_containers/food/drinks/bottle/molotov/update_icon_state()
- var/obj/item/reagent_containers/food/drinks/bottle/B = locate() in contents
+/obj/item/reagent_containers/drinks/bottle/molotov/update_icon_state()
+ var/obj/item/reagent_containers/drinks/bottle/B = locate() in contents
if(B)
icon_state = B.icon_state
-/obj/item/reagent_containers/food/drinks/bottle/molotov/update_overlays()
+/obj/item/reagent_containers/drinks/bottle/molotov/update_overlays()
. = ..()
if(active)
. += GLOB.fire_overlay
-/obj/item/reagent_containers/food/drinks/bottle/molotov/CheckParts(list/parts_list)
+/obj/item/reagent_containers/drinks/bottle/molotov/CheckParts(list/parts_list)
..()
- var/obj/item/reagent_containers/food/drinks/bottle/B = locate() in contents
+ var/obj/item/reagent_containers/drinks/bottle/B = locate() in contents
if(B)
B.reagents.copy_to(src, 100)
if(!B.is_glass)
is_glass = FALSE
update_appearance(UPDATE_DESC|UPDATE_ICON)
-/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/target,mob/thrower)
+/obj/item/reagent_containers/drinks/bottle/molotov/throw_impact(atom/target,mob/thrower)
var/firestarter = FALSE
for(var/datum/reagent/R in reagents.reagent_list)
for(var/A in accelerants)
@@ -371,7 +371,7 @@
target.fire_act()
new /obj/effect/hotspot(get_turf(target))
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params)
+/obj/item/reagent_containers/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params)
if(I.get_heat() && !active)
active = TRUE
var/turf/bombturf = get_turf(src)
@@ -395,7 +395,7 @@
A.fire_act()
qdel(src)
-/obj/item/reagent_containers/food/drinks/bottle/molotov/attack_self(mob/user)
+/obj/item/reagent_containers/drinks/bottle/molotov/attack_self(mob/user)
if(active)
if(!is_glass)
to_chat(user, "The flame's spread too far on it!")
diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm
index f3125e60df1c..c98487ba69c8 100644
--- a/code/modules/food_and_drinks/drinks/drinks/cans.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/food/drinks/cans
+/obj/item/reagent_containers/drinks/cans
container_type = NONE
var/can_opened = FALSE
var/is_glass = FALSE
@@ -8,14 +8,14 @@
var/can_burst = FALSE
var/burst_chance = 0
-/obj/item/reagent_containers/food/drinks/cans/examine(mob/user)
+/obj/item/reagent_containers/drinks/cans/examine(mob/user)
. = ..()
if(can_opened)
. += "It has been opened."
else
. += "Ctrl-click to shake it up!"
-/obj/item/reagent_containers/food/drinks/cans/attack_self(mob/user)
+/obj/item/reagent_containers/drinks/cans/attack_self(mob/user)
if(can_opened)
return ..()
if(times_shaken)
@@ -27,7 +27,7 @@
to_chat(user, "You open the drink with an audible pop!")
return ..()
-/obj/item/reagent_containers/food/drinks/cans/proc/crush(mob/user)
+/obj/item/reagent_containers/drinks/cans/proc/crush(mob/user)
var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc)
crushed_can.icon_state = icon_state
//inherit material vars for recycling purposes
@@ -41,7 +41,7 @@
qdel(src)
return crushed_can
-/obj/item/reagent_containers/food/drinks/cans/CtrlClick(mob/user)
+/obj/item/reagent_containers/drinks/cans/CtrlClick(mob/user)
var/mob/living/carbon/human/H
if(!can_shake || !ishuman(user))
return ..()
@@ -67,7 +67,7 @@
else
return ..()
-/obj/item/reagent_containers/food/drinks/cans/attack(mob/M, mob/user, proximity)
+/obj/item/reagent_containers/drinks/cans/attack(mob/M, mob/user, proximity)
if(!can_opened)
to_chat(user, "You need to open the drink!")
return
@@ -77,7 +77,7 @@
return
return ..()
-/obj/item/reagent_containers/food/drinks/cans/attackby(obj/item/I, mob/user, params)
+/obj/item/reagent_containers/drinks/cans/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/storage/bag/trash/cyborg))
user.visible_message("[user] crushes [src] in [user.p_their()] trash compactor.", "You crush [src] in your trash compactor.")
var/obj/can = crush(user)
@@ -85,7 +85,7 @@
return TRUE
..()
-/obj/item/reagent_containers/food/drinks/cans/afterattack(obj/target, mob/user, proximity)
+/obj/item/reagent_containers/drinks/cans/afterattack(obj/target, mob/user, proximity)
if(!proximity)
return
if(istype(target, /obj/structure/reagent_dispensers) && !can_opened)
@@ -97,14 +97,14 @@
else
return ..(target, user, proximity)
-/obj/item/reagent_containers/food/drinks/cans/throw_impact(atom/A)
+/obj/item/reagent_containers/drinks/cans/throw_impact(atom/A)
. = ..()
if(times_shaken < 5)
times_shaken++
else
handle_bursting()
-/obj/item/reagent_containers/food/drinks/cans/proc/fizzy_open(mob/user, burstopen = FALSE)
+/obj/item/reagent_containers/drinks/cans/proc/fizzy_open(mob/user, burstopen = FALSE)
playsound(loc, 'sound/effects/canopenfizz.ogg', rand(10, 50), 1)
can_opened = TRUE
container_type |= OPENCONTAINER
@@ -130,7 +130,7 @@
reagents.remove_any(times_shaken / 5 * reagents.total_volume)
-/obj/item/reagent_containers/food/drinks/cans/proc/handle_bursting(mob/user)
+/obj/item/reagent_containers/drinks/cans/proc/handle_bursting(mob/user)
if(times_shaken != 5 || can_opened)
return
@@ -148,10 +148,10 @@
else
fizzy_open(burstopen = TRUE)
-/obj/item/reagent_containers/food/drinks/cans/proc/reset_shakable()
+/obj/item/reagent_containers/drinks/cans/proc/reset_shakable()
can_shake = TRUE
-/obj/item/reagent_containers/food/drinks/cans/proc/reset_shaken()
+/obj/item/reagent_containers/drinks/cans/proc/reset_shaken()
times_shaken--
if(can_burst)
can_burst = FALSE
@@ -159,41 +159,41 @@
if(times_shaken)
addtimer(CALLBACK(src, PROC_REF(reset_shaken)), (70 - (times_shaken * 10)) SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT)
-/obj/item/reagent_containers/food/drinks/cans/cola
+/obj/item/reagent_containers/drinks/cans/cola
name = "space cola"
desc = "Cola. In space."
icon_state = "cola"
list_reagents = list("cola" = 30)
-/obj/item/reagent_containers/food/drinks/cans/beer
+/obj/item/reagent_containers/drinks/cans/beer
name = "space beer"
desc = "Contains only water, malt and hops."
icon_state = "beer"
is_glass = TRUE
list_reagents = list("beer" = 30)
-/obj/item/reagent_containers/food/drinks/cans/adminbooze
+/obj/item/reagent_containers/drinks/cans/adminbooze
name = "admin booze"
desc = "Bottled Griffon tears. Drink with caution."
icon_state = "adminbooze"
is_glass = TRUE
list_reagents = list("adminordrazine" = 5, "capsaicin" = 5, "methamphetamine"= 20, "thirteenloko" = 20)
-/obj/item/reagent_containers/food/drinks/cans/madminmalt
+/obj/item/reagent_containers/drinks/cans/madminmalt
name = "madmin malt"
desc = "Bottled essence of angry admins. Drink with EXTREME caution."
icon_state = "madminmalt"
is_glass = TRUE
list_reagents = list("hell_water" = 20, "neurotoxin" = 15, "thirteenloko" = 15)
-/obj/item/reagent_containers/food/drinks/cans/badminbrew
+/obj/item/reagent_containers/drinks/cans/badminbrew
name = "badmin brew"
desc = "Bottled trickery and terrible admin work. Probably shouldn't drink this one at all."
icon_state = "badminbrew"
is_glass = TRUE
list_reagents = list("mutagen" = 25, "charcoal" = 10, "thirteenloko" = 15)
-/obj/item/reagent_containers/food/drinks/cans/ale
+/obj/item/reagent_containers/drinks/cans/ale
name = "Magm-Ale"
desc = "A true dorf's drink of choice."
icon_state = "alebottle"
@@ -201,82 +201,82 @@
is_glass = TRUE
list_reagents = list("ale" = 30)
-/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind
+/obj/item/reagent_containers/drinks/cans/space_mountain_wind
name = "Space Mountain Wind"
desc = "Blows right through you like a space wind."
icon_state = "space_mountain_wind"
list_reagents = list("spacemountainwind" = 30)
-/obj/item/reagent_containers/food/drinks/cans/thirteenloko
+/obj/item/reagent_containers/drinks/cans/thirteenloko
name = "Thirteen Loko"
desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
icon_state = "thirteen_loko"
list_reagents = list("thirteenloko" = 25, "psilocybin" = 5)
-/obj/item/reagent_containers/food/drinks/cans/dr_gibb
+/obj/item/reagent_containers/drinks/cans/dr_gibb
name = "Dr. Gibb"
desc = "A delicious mixture of 42 different flavors."
icon_state = "dr_gibb"
list_reagents = list("dr_gibb" = 30)
-/obj/item/reagent_containers/food/drinks/cans/starkist
+/obj/item/reagent_containers/drinks/cans/starkist
name = "Star-kist"
desc = "The taste of a star in liquid form. And, a bit of tuna...?"
icon_state = "starkist"
list_reagents = list("brownstar" = 30)
-/obj/item/reagent_containers/food/drinks/cans/space_up
+/obj/item/reagent_containers/drinks/cans/space_up
name = "Space-Up"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up"
list_reagents = list("space_up" = 30)
-/obj/item/reagent_containers/food/drinks/cans/lemon_lime
+/obj/item/reagent_containers/drinks/cans/lemon_lime
name = "Lemon-Lime"
desc = "You wanted ORANGE. It gave you Lemon Lime."
icon_state = "lemon-lime"
list_reagents = list("lemon_lime" = 30)
-/obj/item/reagent_containers/food/drinks/cans/iced_tea
+/obj/item/reagent_containers/drinks/cans/iced_tea
name = "Vrisk Serket Iced Tea"
desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth?"
icon_state = "ice_tea_can"
list_reagents = list("icetea" = 30)
-/obj/item/reagent_containers/food/drinks/cans/grape_juice
+/obj/item/reagent_containers/drinks/cans/grape_juice
name = "Grapel Juice"
desc = "500 pages of rules of how to appropriately enter into a combat with this juice!"
icon_state = "purple_can"
list_reagents = list("grapejuice" = 30)
-/obj/item/reagent_containers/food/drinks/cans/tonic
+/obj/item/reagent_containers/drinks/cans/tonic
name = "T-Borg's Tonic Water"
desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
icon_state = "tonic"
list_reagents = list("tonic" = 50)
-/obj/item/reagent_containers/food/drinks/cans/sodawater
+/obj/item/reagent_containers/drinks/cans/sodawater
name = "soda water"
desc = "A can of soda water. Still water's more refreshing cousin."
icon_state = "sodawater"
list_reagents = list("sodawater" = 50)
-/obj/item/reagent_containers/food/drinks/cans/synthanol
+/obj/item/reagent_containers/drinks/cans/synthanol
name = "Beep's Classic Synthanol"
desc = "A can of IPC booze, however that works."
icon_state = "synthanolcan"
list_reagents = list("synthanol" = 50)
-/obj/item/reagent_containers/food/drinks/cans/bottler
+/obj/item/reagent_containers/drinks/cans/bottler
name = "generic beverage container"
desc = "this shouldn't ever be spawned. shame on you"
icon_state = "glass_bottle"
-/obj/item/reagent_containers/food/drinks/cans/bottler/on_reagent_change()
+/obj/item/reagent_containers/drinks/cans/bottler/on_reagent_change()
update_icon(UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/drinks/cans/bottler/update_overlays()
+/obj/item/reagent_containers/drinks/cans/bottler/update_overlays()
. = ..()
if(reagents.total_volume)
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
@@ -298,19 +298,19 @@
filling.icon += mix_color_from_reagents(reagents.reagent_list)
. += filling
-/obj/item/reagent_containers/food/drinks/cans/bottler/glass_bottle
+/obj/item/reagent_containers/drinks/cans/bottler/glass_bottle
name = "glass bottle"
desc = "A glass bottle suitable for beverages."
icon_state = "glass_bottle"
is_glass = TRUE
-/obj/item/reagent_containers/food/drinks/cans/bottler/plastic_bottle
+/obj/item/reagent_containers/drinks/cans/bottler/plastic_bottle
name = "plastic bottle"
desc = "A plastic bottle suitable for beverages."
icon_state = "plastic_bottle"
is_plastic = TRUE
-/obj/item/reagent_containers/food/drinks/cans/bottler/metal_can
+/obj/item/reagent_containers/drinks/cans/bottler/metal_can
name = "metal can"
desc = "A metal can suitable for beverages."
icon_state = "metal_can"
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 5ba474cf76e5..35f67923976e 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -1,6 +1,6 @@
-/obj/item/reagent_containers/food/drinks/drinkingglass
+/obj/item/reagent_containers/drinks/drinkingglass
name = "glass"
desc = "Your standard drinking glass."
icon_state = "glass_empty"
@@ -15,9 +15,9 @@
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
-/obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs
- var/obj/item/reagent_containers/food/snacks/egg/E = I
+/obj/item/reagent_containers/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/food/snacks/egg)) //breaking eggs
+ var/obj/item/food/snacks/egg/E = I
if(reagents)
if(reagents.total_volume >= reagents.maximum_volume)
to_chat(user, "[src] is full.")
@@ -29,16 +29,16 @@
else
..()
-/obj/item/reagent_containers/food/drinks/drinkingglass/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
+/obj/item/reagent_containers/drinks/drinkingglass/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
if(!reagents.total_volume)
return
..()
-/obj/item/reagent_containers/food/drinks/drinkingglass/burn()
+/obj/item/reagent_containers/drinks/drinkingglass/burn()
reagents.clear_reagents()
extinguish()
-/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
+/obj/item/reagent_containers/drinks/drinkingglass/on_reagent_change()
overlays.Cut()
if(reagents.reagent_list.len)
var/datum/reagent/R = reagents.get_master_reagent()
@@ -56,15 +56,15 @@
desc = "Your standard drinking glass."
// for /obj/machinery/economy/vending/sovietsoda
-/obj/item/reagent_containers/food/drinks/drinkingglass/soda
+/obj/item/reagent_containers/drinks/drinkingglass/soda
list_reagents = list("sodawater" = 50)
-/obj/item/reagent_containers/food/drinks/drinkingglass/cola
+/obj/item/reagent_containers/drinks/drinkingglass/cola
list_reagents = list("cola" = 50)
-/obj/item/reagent_containers/food/drinks/drinkingglass/devilskiss
+/obj/item/reagent_containers/drinks/drinkingglass/devilskiss
list_reagents = list("devilskiss" = 50)
-/obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail
+/obj/item/reagent_containers/drinks/drinkingglass/alliescocktail
list_reagents = list("alliescocktail" = 25, "omnizine" = 25)
diff --git a/code/modules/food_and_drinks/drinks/drinks/mugs.dm b/code/modules/food_and_drinks/drinks/drinks/mugs.dm
index 5238d8a88742..637ed8ec646d 100644
--- a/code/modules/food_and_drinks/drinks/drinks/mugs.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/mugs.dm
@@ -1,5 +1,5 @@
-/obj/item/reagent_containers/food/drinks/mug
+/obj/item/reagent_containers/drinks/mug
name = "coffee mug"
desc = "A mug for sipping hot beverages out of."
icon = 'icons/obj/mugs.dmi'
@@ -7,7 +7,7 @@
var/novelty = FALSE
var/preset = FALSE
-/obj/item/reagent_containers/food/drinks/mug/novelty
+/obj/item/reagent_containers/drinks/mug/novelty
name = "novelty coffee mug"
desc = "A fun mug for your coffee or other hot beverage!"
novelty = TRUE
@@ -86,7 +86,7 @@
description = "So mesmerizing!"
state = "mug_rainbow"
-/obj/item/reagent_containers/food/drinks/mug/Initialize(mapload)
+/obj/item/reagent_containers/drinks/mug/Initialize(mapload)
. = ..()
if(preset)
return
@@ -99,73 +99,73 @@
else
icon_state = pick("mug_black", "mug_white", "mug_red", "mug_blue", "mug_green", "mug_pink")
-/obj/item/reagent_containers/food/drinks/mug/eng
+/obj/item/reagent_containers/drinks/mug/eng
name = "engineer's mug"
desc = "A mug engineered to hold your beverage... IN SPACE!"
icon_state = "mug_eng"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/med
+/obj/item/reagent_containers/drinks/mug/med
name = "doctor's mug"
desc = "A mug that can hold the cure for what ails you!"
icon_state = "mug_med"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/sci
+/obj/item/reagent_containers/drinks/mug/sci
name = "scientist's mug"
desc = "Nothing fuels research like a coffee mug... or grant money!"
icon_state = "mug_sci"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/sec
+/obj/item/reagent_containers/drinks/mug/sec
name = "officer's mug"
desc = "The perfect partner for a sprinkled donut or stunbaton!"
icon_state = "mug_sec"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/serv
+/obj/item/reagent_containers/drinks/mug/serv
name = "crewmember's mug"
desc = "Serve your thirst better than you serve the rest of the crew!"
icon_state = "mug_serv"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/ce
+/obj/item/reagent_containers/drinks/mug/ce
name = "chief engineer's mug"
desc = "Broken and welded back together countless times, just like the station! Probably microwave safe."
icon_state = "mug_ce"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/hos
+/obj/item/reagent_containers/drinks/mug/hos
name = "head of security's mug"
desc = "If only your officers were as robust as this coffee's flavor!"
icon_state = "mug_hos"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/rd
+/obj/item/reagent_containers/drinks/mug/rd
name = "research director's mug"
desc = "Energy tech level: 99"
icon_state = "mug_rd"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/cmo
+/obj/item/reagent_containers/drinks/mug/cmo
name = "chief medical officer's mug"
desc = "Fill it with something to keep you awake while you try to keep the crew alive."
icon_state = "mug_cmo"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/qm
+/obj/item/reagent_containers/drinks/mug/qm
name = "quartermaster's mug"
desc = "A newly imported mug, express delivery."
icon_state = "mug_qm"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/hop
+/obj/item/reagent_containers/drinks/mug/hop
name = "head of personnel's mug"
desc = "Are the stains on the bottom coffee or ink?"
icon_state = "mug_hop"
preset = TRUE
-/obj/item/reagent_containers/food/drinks/mug/cap
+/obj/item/reagent_containers/drinks/mug/cap
name = "captain's mug"
desc = "An inscription on the side reads \"Best Captain 2559\"... The last time the station had a worthy captain."
icon_state = "mug_cap"
diff --git a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
index c181349498b1..5947abb4a527 100644
--- a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass
name = "shot glass"
desc = "No glasses were shot in the making of this glass."
icon_state = "shotglass"
@@ -10,14 +10,14 @@
light_color = LIGHT_COLOR_LIGHTBLUE
resistance_flags = FLAMMABLE
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/bluespace
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/bluespace
name = "bluespace shot glass"
desc = "For when you need to make the Bartender's life extra hell."
amount_per_transfer_from_this = 50
volume = 50
icon_state = "bluespaceshotglass"
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/bluespace/update_name()
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/bluespace/update_name()
. = ..()
if(reagents.total_volume)
name = "bluespace shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future.
@@ -26,12 +26,12 @@
else
name = "bluespace shot glass"
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change()
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/on_reagent_change()
if(!isShotFlammable() && (resistance_flags & ON_FIRE))
extinguish()
update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/update_name()
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/update_name()
. = ..()
if(reagents.total_volume)
name = "shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future.
@@ -40,7 +40,7 @@
else
name = "shot glass"
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/update_overlays()
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/update_overlays()
. = ..()
if(reagents.total_volume)
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]1")
@@ -56,7 +56,7 @@
filling.icon += mix_color_from_reagents(reagents.reagent_list)
. += filling
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/proc/clumsilyDrink(mob/living/carbon/human/user) //Clowns beware
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/proc/clumsilyDrink(mob/living/carbon/human/user) //Clowns beware
if(!(resistance_flags & ON_FIRE))
return
user.visible_message("[user] pours [src] all over [user.p_themselves()]!", "You pour [src] all over yourself!", "You hear a 'whoompf' and a sizzle.")
@@ -65,14 +65,14 @@
reagents.clear_reagents()
user.IgniteMob()
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/proc/isShotFlammable()
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/proc/isShotFlammable()
var/datum/reagent/R = reagents.get_master_reagent()
if(istype(R, /datum/reagent/consumable/ethanol))
var/datum/reagent/consumable/ethanol/A = R
if(A.volume >= 5 && A.alcohol_perc >= 0.35) //Only an approximation to if something's flammable but it will do
return TRUE
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = FALSE)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = FALSE)
if(!isShotFlammable() || (resistance_flags & ON_FIRE)) //You can't light a shot that's not flammable!
return
..()
@@ -80,31 +80,31 @@
visible_message("[src] begins to burn with a blue hue!")
update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/extinguish(silent = FALSE)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/extinguish(silent = FALSE)
..()
set_light(0)
if(!silent)
visible_message("The dancing flame on [src] dies out.")
update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/burn() //Let's override fire deleting the reagents inside the shot
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/burn() //Let's override fire deleting the reagents inside the shot
return
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/attack(mob/living/carbon/human/user)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/attack(mob/living/carbon/human/user)
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50) && (resistance_flags & ON_FIRE))
clumsilyDrink(user)
else
..()
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/attackby(obj/item/W)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/attackby(obj/item/W)
..()
if(W.get_heat())
fire_act()
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/attack_hand(mob/user, pickupfireoverride = TRUE)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/attack_hand(mob/user, pickupfireoverride = TRUE)
..()
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/attack_self(mob/living/carbon/human/user)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/attack_self(mob/living/carbon/human/user)
..()
if(!(resistance_flags & ON_FIRE))
return
@@ -114,7 +114,7 @@
user.visible_message("[user] places [user.p_their()] hand over [src] to put it out!", "You use your hand to extinguish [src]!")
extinguish()
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/MouseDrop(mob/living/carbon/human/user)
+/obj/item/reagent_containers/drinks/drinkingglass/shotglass/MouseDrop(mob/living/carbon/human/user)
if(!ishuman(user))
return
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50) && (resistance_flags & ON_FIRE))
diff --git a/code/modules/food_and_drinks/drinks/drinks_base.dm b/code/modules/food_and_drinks/drinks/drinks_base.dm
index bb7d7365c629..fc9e0a75aa26 100644
--- a/code/modules/food_and_drinks/drinks/drinks_base.dm
+++ b/code/modules/food_and_drinks/drinks/drinks_base.dm
@@ -1,30 +1,23 @@
////////////////////////////////////////////////////////////////////////////////
/// Drinks.
////////////////////////////////////////////////////////////////////////////////
-/obj/item/reagent_containers/food/drinks
+/obj/item/reagent_containers/drinks
name = "drink"
desc = "yummy"
icon = 'icons/obj/drinks.dmi'
icon_state = null
container_type = OPENCONTAINER
- consume_sound = 'sound/items/drink.ogg'
possible_transfer_amounts = list(5,10,15,20,25,30,50)
visible_transfer_rate = TRUE
volume = 50
resistance_flags = NONE
- antable = FALSE
+ var/consume_sound = 'sound/items/drink.ogg'
var/chugging = FALSE
-/obj/item/reagent_containers/food/drinks/Initialize(mapload)
- . = ..()
- bitesize = amount_per_transfer_from_this
- if(bitesize < 5)
- bitesize = 5
-
-/obj/item/reagent_containers/food/drinks/attack_self(mob/user)
+/obj/item/reagent_containers/drinks/attack_self(mob/user)
return
-/obj/item/reagent_containers/food/drinks/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/drinks/attack(mob/M, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
to_chat(user, " None of [src] left, oh no!")
return FALSE
@@ -35,11 +28,11 @@
if(iscarbon(M))
var/mob/living/carbon/C = M
- if(C.eat(src, user))
+ if(C.drink(src, user))
return TRUE
return FALSE
-/obj/item/reagent_containers/food/drinks/MouseDrop(atom/over_object) //CHUG! CHUG! CHUG!
+/obj/item/reagent_containers/drinks/MouseDrop(atom/over_object) //CHUG! CHUG! CHUG!
if(!iscarbon(over_object))
return
var/mob/living/carbon/chugger = over_object
@@ -52,7 +45,7 @@
"You hear what sounds like gulping.")
chugging = TRUE
while(do_after_once(chugger, 4 SECONDS, TRUE, chugger, null, "You stop chugging [src]."))
- chugger.eat(src, chugger, 25) //Half of a glass, quarter of a bottle.
+ chugger.drink(src, chugger, 25) //Half of a glass, quarter of a bottle.
if(!reagents.total_volume) //Finish in style.
chugger.emote("gasp")
chugger.visible_message("[chugger] [pick("finishes","downs","polishes off","slams")] the entire [src], what a [pick("savage","monster","champ","beast")]!",
@@ -61,7 +54,7 @@
break
chugging = FALSE
-/obj/item/reagent_containers/food/drinks/afterattack(obj/target, mob/user, proximity)
+/obj/item/reagent_containers/drinks/afterattack(obj/target, mob/user, proximity)
if(!proximity)
return
if(chugging)
@@ -96,7 +89,7 @@
return FALSE
-/obj/item/reagent_containers/food/drinks/examine(mob/user)
+/obj/item/reagent_containers/drinks/examine(mob/user)
. = ..()
if(in_range(user, src))
if(!reagents || reagents.total_volume == 0)
@@ -115,7 +108,7 @@
/// Drinks. END
////////////////////////////////////////////////////////////////////////////////
-/obj/item/reagent_containers/food/drinks/trophy
+/obj/item/reagent_containers/drinks/trophy
name = "pewter cup"
desc = "Everyone gets a trophy."
icon_state = "pewter_cup"
@@ -130,7 +123,7 @@
container_type = OPENCONTAINER
resistance_flags = FIRE_PROOF
-/obj/item/reagent_containers/food/drinks/trophy/gold_cup
+/obj/item/reagent_containers/drinks/trophy/gold_cup
name = "gold cup"
desc = "You're winner!"
icon_state = "golden_cup"
@@ -141,7 +134,7 @@
materials = list(MAT_GOLD=1000)
volume = 150
-/obj/item/reagent_containers/food/drinks/trophy/silver_cup
+/obj/item/reagent_containers/drinks/trophy/silver_cup
name = "silver cup"
desc = "Best loser!"
icon_state = "silver_cup"
@@ -152,7 +145,7 @@
materials = list(MAT_SILVER=800)
volume = 100
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup
+/obj/item/reagent_containers/drinks/trophy/bronze_cup
name = "bronze cup"
desc = "At least you ranked!"
icon_state = "bronze_cup"
@@ -163,7 +156,7 @@
materials = list(MAT_METAL=400)
volume = 25
-/obj/item/reagent_containers/food/drinks/trophy/bronze_cup/toolbox_win //2023 toolbox tournament 3rd place went to paradise station.
+/obj/item/reagent_containers/drinks/trophy/bronze_cup/toolbox_win //2023 toolbox tournament 3rd place went to paradise station.
name = "3rd place toolbox tournament 2567"
desc = "Awarded to centcomms elite toolbox warriors raising money for the GBS research institute."
icon_state = "reward_cup"
@@ -176,39 +169,39 @@
// Formatting is the same as food.
-/obj/item/reagent_containers/food/drinks/coffee
+/obj/item/reagent_containers/drinks/coffee
name = "Robust Coffee"
desc = "Careful, the beverage you're about to enjoy is extremely hot."
icon_state = "coffee"
list_reagents = list("coffee" = 30)
resistance_flags = FREEZE_PROOF
-/obj/item/reagent_containers/food/drinks/ice
+/obj/item/reagent_containers/drinks/ice
name = "ice cup"
desc = "Careful, cold ice, do not chew."
icon_state = "icecup"
list_reagents = list("ice" = 30)
-/obj/item/reagent_containers/food/drinks/tea
+/obj/item/reagent_containers/drinks/tea
name = "Duke Purple tea"
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
icon_state = "teacup"
item_state = "coffee"
list_reagents = list("tea" = 30)
-/obj/item/reagent_containers/food/drinks/tea/Initialize(mapload)
+/obj/item/reagent_containers/drinks/tea/Initialize(mapload)
. = ..()
if(prob(20))
reagents.add_reagent("mugwort", 3)
-/obj/item/reagent_containers/food/drinks/mugwort
+/obj/item/reagent_containers/drinks/mugwort
name = "mugwort tea"
desc = "A bitter herbal tea."
icon_state = "manlydorfglass"
item_state = "coffee"
list_reagents = list("mugwort" = 30)
-/obj/item/reagent_containers/food/drinks/h_chocolate
+/obj/item/reagent_containers/drinks/h_chocolate
name = "Dutch hot coco"
desc = "Made in Space South America."
icon_state = "hot_coco"
@@ -216,7 +209,7 @@
list_reagents = list("hot_coco" = 30, "sugar" = 5)
resistance_flags = FREEZE_PROOF
-/obj/item/reagent_containers/food/drinks/chocolate
+/obj/item/reagent_containers/drinks/chocolate
name = "hot chocolate"
desc = "Made in Space Switzerland."
icon_state = "hot_coco"
@@ -224,32 +217,32 @@
list_reagents = list("hot_coco" = 15, "chocolate" = 6, "water" = 9)
resistance_flags = FREEZE_PROOF
-/obj/item/reagent_containers/food/drinks/weightloss
+/obj/item/reagent_containers/drinks/weightloss
name = "weight-loss shake"
desc = "A shake designed to cause weight loss, now in a berry-flavored formulation. The package proudly proclaims that it is 'tapeworm free.'"
icon_state = "weightshake"
list_reagents = list("lipolicide" = 30, "berryjuice" = 5)
-/obj/item/reagent_containers/food/drinks/dry_ramen
+/obj/item/reagent_containers/drinks/dry_ramen
name = "cup ramen"
desc = "Just add 10ml of water, self heats! A taste that reminds you of your school years."
icon_state = "ramen"
item_state = "ramen"
list_reagents = list("dry_ramen" = 30)
-/obj/item/reagent_containers/food/drinks/dry_ramen/Initialize(mapload)
+/obj/item/reagent_containers/drinks/dry_ramen/Initialize(mapload)
. = ..()
if(prob(20))
reagents.add_reagent("enzyme", 3)
-/obj/item/reagent_containers/food/drinks/chicken_soup
+/obj/item/reagent_containers/drinks/chicken_soup
name = "canned chicken soup"
desc = "A delicious and soothing can of chicken noodle soup; just like spessmom used to microwave it."
icon_state = "soupcan"
item_state = "soupcan"
list_reagents = list("chicken_soup" = 30)
-/obj/item/reagent_containers/food/drinks/sillycup
+/obj/item/reagent_containers/drinks/sillycup
name = "paper cup"
desc = "A paper water cup."
icon_state = "water_cup_e"
@@ -257,7 +250,7 @@
possible_transfer_amounts = null
volume = 10
-/obj/item/reagent_containers/food/drinks/sillycup/on_reagent_change()
+/obj/item/reagent_containers/drinks/sillycup/on_reagent_change()
if(reagents.total_volume)
icon_state = "water_cup"
else
@@ -268,7 +261,7 @@
// itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass
// icon states.
-/obj/item/reagent_containers/food/drinks/shaker
+/obj/item/reagent_containers/drinks/shaker
name = "shaker"
desc = "A metal shaker to mix drinks in."
icon_state = "shaker"
@@ -279,11 +272,11 @@
COOLDOWN_DECLARE(shaking_cooldown)
-/obj/item/reagent_containers/food/drinks/shaker/Initialize(mapload)
+/obj/item/reagent_containers/drinks/shaker/Initialize(mapload)
. = ..()
reagents.set_reacting(FALSE)
-/obj/item/reagent_containers/food/drinks/shaker/attack_self(mob/user)
+/obj/item/reagent_containers/drinks/shaker/attack_self(mob/user)
if(!reagents.total_volume)
to_chat(user, "You won't shake an empty shaker now, will you?")
return
@@ -313,54 +306,54 @@
shaking = FALSE
reagents.set_reacting(FALSE)
-/obj/item/reagent_containers/food/drinks/shaker/dropped(mob/user)
+/obj/item/reagent_containers/drinks/shaker/dropped(mob/user)
. = ..()
icon_state = "shaker"
-/obj/item/reagent_containers/food/drinks/flask
+/obj/item/reagent_containers/drinks/flask
name = "flask"
desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
icon_state = "flask"
materials = list(MAT_METAL=250)
volume = 60
-/obj/item/reagent_containers/food/drinks/flask/barflask
+/obj/item/reagent_containers/drinks/flask/barflask
name = "flask"
desc = "For those who can't be bothered to hang out at the bar to drink."
icon_state = "barflask"
-/obj/item/reagent_containers/food/drinks/flask/gold
+/obj/item/reagent_containers/drinks/flask/gold
name = "captain's flask"
desc = "A gold flask belonging to the captain."
icon_state = "flask_gold"
materials = list(MAT_GOLD=500)
-/obj/item/reagent_containers/food/drinks/flask/detflask
+/obj/item/reagent_containers/drinks/flask/detflask
name = "detective's flask"
desc = "The detective's only true friend."
icon_state = "detflask"
list_reagents = list("whiskey" = 30)
-/obj/item/reagent_containers/food/drinks/flask/hand_made
+/obj/item/reagent_containers/drinks/flask/hand_made
name = "handmade flask"
desc = "A wooden flask with a silver lid and bottom. It has a matte, dark blue paint on it with the initials \"W.H.\" etched in black."
icon = 'icons/obj/custom_items.dmi'
icon_state = "williamhackett"
materials = list()
-/obj/item/reagent_containers/food/drinks/flask/thermos
+/obj/item/reagent_containers/drinks/flask/thermos
name = "vintage thermos"
desc = "An older thermos with a faint shine."
icon_state = "thermos"
volume = 50
-/obj/item/reagent_containers/food/drinks/flask/shiny
+/obj/item/reagent_containers/drinks/flask/shiny
name = "shiny flask"
desc = "A shiny metal flask. It appears to have a Greek symbol inscribed on it."
icon_state = "shinyflask"
volume = 50
-/obj/item/reagent_containers/food/drinks/flask/lithium
+/obj/item/reagent_containers/drinks/flask/lithium
name = "lithium flask"
desc = "A flask with a Lithium Atom symbol on it."
icon = 'icons/obj/custom_items.dmi'
@@ -368,30 +361,30 @@
volume = 50
-/obj/item/reagent_containers/food/drinks/britcup
+/obj/item/reagent_containers/drinks/britcup
name = "cup"
desc = "A cup with the british flag emblazoned on it."
icon_state = "britcup"
volume = 30
-/obj/item/reagent_containers/food/drinks/bag
+/obj/item/reagent_containers/drinks/bag
name = "drink bag"
desc = "Normally put in wine boxes, or down pants at stadium events."
icon_state = "goonbag"
volume = 70
-/obj/item/reagent_containers/food/drinks/bag/goonbag
+/obj/item/reagent_containers/drinks/bag/goonbag
name = "goon from a Blue Toolbox special edition"
desc = "Wine from the land down under, where the dingos roam and the roos do wander."
icon_state = "goonbag"
list_reagents = list("wine" = 70)
-/obj/item/reagent_containers/food/drinks/oilcan
+/obj/item/reagent_containers/drinks/oilcan
name = "oil can"
desc = "Contains oil intended for use on cyborgs, robots, and other synthetics."
icon = 'icons/goonstation/objects/oil.dmi'
icon_state = "oilcan"
volume = 100
-/obj/item/reagent_containers/food/drinks/oilcan/full
+/obj/item/reagent_containers/drinks/oilcan/full
list_reagents = list("oil" = 100)
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 69128c5d568b..01c99264ebf0 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -5,7 +5,7 @@
// to mixed-drinks code. If you want an object that starts pre-loaded, you need to make it in addition to the other code.
//Food items that aren't eaten normally and leave an empty container behind.
-/obj/item/reagent_containers/food/condiment
+/obj/item/reagent_containers/condiment
name = "condiment container"
desc = "Just your average condiment container."
icon = 'icons/obj/food/containers.dmi'
@@ -38,10 +38,10 @@
"rice" = list("rice", "rice sack", "A big bag of rice. Good for cooking!"))
var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
-/obj/item/reagent_containers/food/condiment/attack_self(mob/user)
+/obj/item/reagent_containers/condiment/attack_self(mob/user)
return
-/obj/item/reagent_containers/food/condiment/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/condiment/attack(mob/M, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
to_chat(user, "None of [src] left, oh no!")
@@ -68,7 +68,7 @@
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
-/obj/item/reagent_containers/food/condiment/afterattack(obj/target, mob/user , proximity)
+/obj/item/reagent_containers/condiment/afterattack(obj/target, mob/user , proximity)
if(!proximity)
return
if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
@@ -85,7 +85,7 @@
to_chat(user, "You fill [src] with [trans] units of the contents of [target].")
//Something like a glass or a food item. Player probably wants to transfer TO it.
- else if(target.is_drainable() || istype(target, /obj/item/reagent_containers/food/snacks))
+ else if(target.is_drainable() || istype(target, /obj/item/food/snacks))
if(!reagents.total_volume)
to_chat(user, "[src] is empty!")
return
@@ -95,7 +95,7 @@
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, "You transfer [trans] units of the condiment to [target].")
-/obj/item/reagent_containers/food/condiment/on_reagent_change()
+/obj/item/reagent_containers/condiment/on_reagent_change()
if(!possible_states.len)
return
if(reagents.reagent_list.len > 0)
@@ -118,16 +118,16 @@
name = "condiment bottle"
desc = "An empty condiment bottle."
-/obj/item/reagent_containers/food/condiment/enzyme
+/obj/item/reagent_containers/condiment/enzyme
name = "universal enzyme"
desc = "Used in cooking various dishes."
icon_state = "enzyme"
list_reagents = list("enzyme" = 50)
-/obj/item/reagent_containers/food/condiment/enzyme/cyborg_recharge(coeff, emagged)
+/obj/item/reagent_containers/condiment/enzyme/cyborg_recharge(coeff, emagged)
reagents.check_and_add("enzyme", volume, 2 * coeff) // Only recharge if the current amount of enzyme is under `volume`.
-/obj/item/reagent_containers/food/condiment/sugar
+/obj/item/reagent_containers/condiment/sugar
name = "sugar sack"
desc = "Tasty spacey sugar!"
icon_state = "sugar"
@@ -135,7 +135,7 @@
list_reagents = list("sugar" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then
+/obj/item/reagent_containers/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"
@@ -145,7 +145,7 @@
list_reagents = list("sodiumchloride" = 20)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/saltshaker/suicide_act(mob/user)
+/obj/item/reagent_containers/condiment/saltshaker/suicide_act(mob/user)
user.visible_message("[user] begins to swap forms with the salt shaker! It looks like [user.p_theyre()] trying to commit suicide.")
var/newname = "[name]"
name = "[user.name]"
@@ -154,7 +154,7 @@
desc = "Salt. From dead crew, presumably."
return BRUTELOSS
-/obj/item/reagent_containers/food/condiment/peppermill
+/obj/item/reagent_containers/condiment/peppermill
name = "pepper mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
@@ -164,7 +164,7 @@
list_reagents = list("blackpepper" = 20)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/milk
+/obj/item/reagent_containers/condiment/milk
name = "space milk"
desc = "It's milk. White and nutritious goodness!"
icon_state = "milk"
@@ -172,7 +172,7 @@
list_reagents = list("milk" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/flour
+/obj/item/reagent_containers/condiment/flour
name = "flour sack"
desc = "A big bag of flour. Good for baking!"
icon_state = "flour"
@@ -180,14 +180,14 @@
list_reagents = list("flour" = 30)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/bbqsauce
+/obj/item/reagent_containers/condiment/bbqsauce
name = "BBQ sauce"
desc = "Sweet, smoky, savory, and gets everywhere. Perfect for grilling."
icon_state = "bbqsauce"
list_reagents = list("bbqsauce" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/soymilk
+/obj/item/reagent_containers/condiment/soymilk
name = "soy milk"
desc = "It's soy milk. White and nutritious goodness!"
icon_state = "soymilk"
@@ -195,7 +195,7 @@
list_reagents = list("soymilk" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/rice
+/obj/item/reagent_containers/condiment/rice
name = "rice sack"
desc = "A big bag of rice. Good for cooking!"
icon_state = "rice"
@@ -203,83 +203,83 @@
list_reagents = list("rice" = 30)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/soysauce
+/obj/item/reagent_containers/condiment/soysauce
name = "soy sauce"
desc = "A salty soy-based flavoring."
icon_state = "soysauce"
list_reagents = list("soysauce" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/syndisauce
+/obj/item/reagent_containers/condiment/syndisauce
name = "\improper Chef Excellence's Special Sauce"
desc = "A potent sauce extracted from the potent amanita mushrooms. Death never tasted quite so delicious."
list_reagents = list("amanitin" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/mayonnaise
+/obj/item/reagent_containers/condiment/mayonnaise
name = "mayonnaise"
desc = "An oily condiment made from egg yolks."
icon_state = "mayonnaise"
list_reagents = list("mayonnaise" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/cherryjelly
+/obj/item/reagent_containers/condiment/cherryjelly
name = "cherry jelly"
desc = "A sweet jelly made out of red cherries."
icon_state = "cherryjelly"
list_reagents = list("cherryjelly" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/peanutbutter
+/obj/item/reagent_containers/condiment/peanutbutter
name = "peanut butter"
desc = "A smooth, nutty spread. Perfect for sandwiches."
icon_state = "peanutbutter"
list_reagents = list("peanutbutter" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/honey
+/obj/item/reagent_containers/condiment/honey
name = "honey"
desc = "A sweet substance produced by bees."
icon_state = "honey"
list_reagents = list("honey" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/oliveoil
+/obj/item/reagent_containers/condiment/oliveoil
name = "olive oil"
desc = "A high quality oil derived from olives."
icon_state = "oliveoil"
list_reagents = list("oliveoil" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/frostoil
+/obj/item/reagent_containers/condiment/frostoil
name = "cold sauce"
desc = "A special oil that noticably chills the body. Extraced from Icepeppers."
icon_state = "coldsauce"
list_reagents = list("frostoil" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/capsaicin
+/obj/item/reagent_containers/condiment/capsaicin
name = "hot sauce"
desc = "You can almost TASTE the stomach ulcers now!"
icon_state = "hotsauce"
list_reagents = list("capsaicin" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/wasabi
+/obj/item/reagent_containers/condiment/wasabi
name = "wasabi"
desc= "A pungent paste commonly served in tiny amounts with sushi. Spicy!"
icon_state = "wasabibottle"
list_reagents = list("wasabi" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/vinegar
+/obj/item/reagent_containers/condiment/vinegar
name = "vinegar"
desc = "Useful for pickling, or putting on chips."
icon_state = "vinegar"
list_reagents = list("vinegar" = 50)
possible_states = list()
-/obj/item/reagent_containers/food/condiment/ketchup
+/obj/item/reagent_containers/condiment/ketchup
name = "ketchup"
desc = "You feel more American already."
icon_state = "ketchup"
@@ -288,7 +288,7 @@
//Food packs. To easily apply deadly toxi... delicious sauces to your food!
-/obj/item/reagent_containers/food/condiment/pack
+/obj/item/reagent_containers/condiment/pack
name = "condiment pack"
desc = "A small plastic pack with condiments to put on your food."
icon_state = "condi_empty"
@@ -306,14 +306,14 @@
"sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"),
"vinegar" =list("condi_mixed", "vinegar", "Perfect for chips, if you're feeling Space British."))
-/obj/item/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
+/obj/item/reagent_containers/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
return
-/obj/item/reagent_containers/food/condiment/pack/afterattack(obj/target, mob/user , proximity)
+/obj/item/reagent_containers/condiment/pack/afterattack(obj/target, mob/user , proximity)
if(!proximity) return
//You can tear the bag open above food to put the condiments on it, obviously.
- if(istype(target, /obj/item/reagent_containers/food/snacks))
+ if(istype(target, /obj/item/food/snacks))
if(!reagents.total_volume)
to_chat(user, "You tear open [src], but there's nothing in it.")
qdel(src)
@@ -327,7 +327,7 @@
reagents.trans_to(target, amount_per_transfer_from_this)
qdel(src)
-/obj/item/reagent_containers/food/condiment/pack/on_reagent_change()
+/obj/item/reagent_containers/condiment/pack/on_reagent_change()
if(reagents.reagent_list.len > 0)
var/main_reagent = reagents.get_master_reagent_id()
if(main_reagent in possible_states)
@@ -342,13 +342,13 @@
desc = "A small condiment pack. It is empty."
//Ketchup
-/obj/item/reagent_containers/food/condiment/pack/ketchup
+/obj/item/reagent_containers/condiment/pack/ketchup
name = "ketchup pack"
originalname = "ketchup"
list_reagents = list("ketchup" = 10)
//Hot sauce
-/obj/item/reagent_containers/food/condiment/pack/hotsauce
+/obj/item/reagent_containers/condiment/pack/hotsauce
name = "hotsauce pack"
originalname = "hotsauce"
list_reagents = list("capsaicin" = 10)
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 4dd12564d29e..8d22dd0d9db3 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -1,40 +1,40 @@
#define MAKE_CUSTOM_FOOD(snack_to_add, user, type) \
do {\
- var/obj/item/reagent_containers/food/snacks/customizable/custom_snack = new type(get_turf(user));\
+ var/obj/item/food/snacks/customizable/custom_snack = new type(get_turf(user));\
custom_snack.add_ingredient(snack_to_add, user); \
user.put_in_active_hand(custom_snack); \
qdel(src);\
} while(FALSE)
-/obj/item/reagent_containers/food/snacks/breadslice/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP))
- MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/sandwich)
+/obj/item/food/snacks/breadslice/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
+ MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/sandwich)
return
..()
-/obj/item/reagent_containers/food/snacks/bun/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP))
- MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/burger)
+/obj/item/food/snacks/bun/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
+ MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/burger)
return
..()
-/obj/item/reagent_containers/food/snacks/sliceable/flatdough/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP))
- MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/pizza)
+/obj/item/food/snacks/sliceable/flatdough/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
+ MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/pizza)
return
..()
-/obj/item/reagent_containers/food/snacks/boiledspaghetti/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP))
- MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/pasta)
+/obj/item/food/snacks/boiledspaghetti/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
+ MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/pasta)
return
..()
/obj/item/trash/plate/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/reagent_containers/food/snacks) && !(W.flags & NODROP))
- MAKE_CUSTOM_FOOD(W, user, /obj/item/reagent_containers/food/snacks/customizable/fullycustom)
+ if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
+ MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/fullycustom)
return
..()
@@ -47,14 +47,14 @@ do {\
icon_state = "soup"
/obj/item/trash/bowl/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers/food/snacks) && !(I.flags & NODROP))
- var/obj/item/reagent_containers/food/snacks/customizable/soup/S = new(get_turf(user))
+ if(istype(I, /obj/item/food/snacks) && !(I.flags & NODROP))
+ var/obj/item/food/snacks/customizable/soup/S = new(get_turf(user))
S.attackby(I, user, params)
qdel(src)
else
..()
-/obj/item/reagent_containers/food/snacks/customizable
+/obj/item/food/snacks/customizable
name = "sandwich"
desc = "A sandwich! A timeless classic."
icon = 'icons/obj/food/custom.dmi'
@@ -74,20 +74,20 @@ do {\
var/list/ingredients = list()
list_reagents = list("nutriment" = 8)
-/obj/item/reagent_containers/food/snacks/customizable/Initialize(mapload)
+/obj/item/food/snacks/customizable/Initialize(mapload)
. = ..()
if(top)
top_image = new(icon, "[baseicon]_top")
add_overlay(top_image)
-/obj/item/reagent_containers/food/snacks/customizable/sandwich
+/obj/item/food/snacks/customizable/sandwich
name = "sandwich"
desc = "A sandwich! A timeless classic."
icon_state = "sandwichcustom"
baseicon = "sandwichcustom"
basename = "sandwich"
-/obj/item/reagent_containers/food/snacks/customizable/pizza
+/obj/item/food/snacks/customizable/pizza
name = "personal pizza"
desc = "A personalized pan pizza meant for only one person."
icon_state = "personal_pizza"
@@ -97,7 +97,7 @@ do {\
top = 0
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/pasta
+/obj/item/food/snacks/customizable/pasta
name = "spaghetti"
desc = "Noodles. With stuff. Delicious."
icon_state = "pasta_bot"
@@ -106,7 +106,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/cook/bread
+/obj/item/food/snacks/customizable/cook/bread
name = "bread"
desc = "Tasty bread."
icon_state = "breadcustom"
@@ -116,7 +116,7 @@ do {\
top = 0
tastes = list("bread" = 10)
-/obj/item/reagent_containers/food/snacks/customizable/cook/pie
+/obj/item/food/snacks/customizable/cook/pie
name = "pie"
desc = "Tasty pie."
icon_state = "piecustom"
@@ -126,7 +126,7 @@ do {\
top = 0
tastes = list("pie" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/cook/cake
+/obj/item/food/snacks/customizable/cook/cake
name = "cake"
desc = "A popular band."
icon_state = "cakecustom"
@@ -136,7 +136,7 @@ do {\
top = 0
tastes = list("cake" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/cook/jelly
+/obj/item/food/snacks/customizable/cook/jelly
name = "jelly"
desc = "Totally jelly."
icon_state = "jellycustom"
@@ -145,7 +145,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/cook/donkpocket
+/obj/item/food/snacks/customizable/cook/donkpocket
name = "donk pocket"
desc = "You wanna put a bangin-Oh nevermind."
icon_state = "donkcustom"
@@ -154,7 +154,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/cook/kebab
+/obj/item/food/snacks/customizable/cook/kebab
name = "kebab"
desc = "Kebab or Kabab?"
icon_state = "kababcustom"
@@ -164,7 +164,7 @@ do {\
top = 0
tastes = list("meat" = 3, "metal" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/cook/salad
+/obj/item/food/snacks/customizable/cook/salad
name = "salad"
desc = "Very tasty."
icon_state = "saladcustom"
@@ -174,7 +174,7 @@ do {\
top = 0
tastes = list("leaves" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/cook/waffles
+/obj/item/food/snacks/customizable/cook/waffles
name = "waffles"
desc = "Made with love."
icon_state = "wafflecustom"
@@ -184,7 +184,7 @@ do {\
top = 0
tastes = list("waffles" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/candy/cookie
+/obj/item/food/snacks/customizable/candy/cookie
name = "cookie"
desc = "COOKIE!!1!"
icon_state = "cookiecustom"
@@ -194,7 +194,7 @@ do {\
top = 0
tastes = list("cookie" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/candy/cotton
+/obj/item/food/snacks/customizable/candy/cotton
name = "flavored cotton candy"
desc = "Who can take a sunrise, sprinkle it with dew,"
icon_state = "cottoncandycustom"
@@ -203,7 +203,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/gummybear
+/obj/item/food/snacks/customizable/candy/gummybear
name = "flavored giant gummy bear"
desc = "Cover it in chocolate and a miracle or two,"
icon_state = "gummybearcustom"
@@ -212,7 +212,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/gummyworm
+/obj/item/food/snacks/customizable/candy/gummyworm
name = "flavored giant gummy worm"
desc = "The Candy Man can 'cause he mixes it with love,"
icon_state = "gummywormcustom"
@@ -221,7 +221,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/jellybean
+/obj/item/food/snacks/customizable/candy/jellybean
name = "flavored giant jelly bean"
desc = "And makes the world taste good."
icon_state = "jellybeancustom"
@@ -230,7 +230,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/jawbreaker
+/obj/item/food/snacks/customizable/candy/jawbreaker
name = "flavored jawbreaker"
desc = "Who can take a rainbow, Wrap it in a sigh,"
icon_state = "jawbreakercustom"
@@ -239,7 +239,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/candycane
+/obj/item/food/snacks/customizable/candy/candycane
name = "flavored candy cane"
desc = "Soak it in the sun and make strawberry-lemon pie,"
icon_state = "candycanecustom"
@@ -248,7 +248,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/gum
+/obj/item/food/snacks/customizable/candy/gum
name = "flavored gum"
desc = "The Candy Man can 'cause he mixes it with love and makes the world taste good. And the world tastes good 'cause the Candy Man thinks it should..."
icon_state = "gumcustom"
@@ -257,7 +257,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/donut
+/obj/item/food/snacks/customizable/candy/donut
name = "filled donut"
desc = "Donut eat this!" // kill me
icon_state = "donutcustom"
@@ -266,7 +266,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/bar
+/obj/item/food/snacks/customizable/candy/bar
name = "flavored chocolate bar"
desc = "Made in a factory downtown."
icon_state = "barcustom"
@@ -275,7 +275,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/sucker
+/obj/item/food/snacks/customizable/candy/sucker
name = "flavored sucker"
desc = "Suck suck suck."
icon_state = "suckercustom"
@@ -284,7 +284,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/cash
+/obj/item/food/snacks/customizable/candy/cash
name = "flavored chocolate cash"
desc = "I got piles!"
icon_state = "cashcustom"
@@ -293,7 +293,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/candy/coin
+/obj/item/food/snacks/customizable/candy/coin
name = "flavored chocolate coin"
desc = "Clink, clink, clink."
icon_state = "coincustom"
@@ -302,7 +302,7 @@ do {\
snack_overlays = 0
top = 0
-/obj/item/reagent_containers/food/snacks/customizable/fullycustom // In the event you fuckers find something I forgot to add a customizable food for.
+/obj/item/food/snacks/customizable/fullycustom // In the event you fuckers find something I forgot to add a customizable food for.
name = "on a plate"
desc = "A unique dish."
icon_state = "fullycustom"
@@ -313,7 +313,7 @@ do {\
ingredient_limit = 20
fullycustom = 1
-/obj/item/reagent_containers/food/snacks/customizable/soup
+/obj/item/food/snacks/customizable/soup
name = "soup"
desc = "A bowl with liquid and... stuff in it."
icon_state = "soup"
@@ -325,7 +325,7 @@ do {\
top = 0
tastes = list("soup" = 1)
-/obj/item/reagent_containers/food/snacks/customizable/burger
+/obj/item/food/snacks/customizable/burger
name = "burger bun"
desc = "A bun for a burger. Delicious."
icon_state = "burgercustom"
@@ -334,8 +334,8 @@ do {\
tastes = list("bun" = 4)
-/obj/item/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
- if(!istype(I, /obj/item/reagent_containers/food/snacks))
+/obj/item/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
+ if(!istype(I, /obj/item/food/snacks))
to_chat(user, "[I] isn't exactly something that you would want to eat.")
return
@@ -347,14 +347,14 @@ do {\
* Arguments:
* * snack - The ingredient that will be added
*/
-/obj/item/reagent_containers/food/snacks/customizable/proc/add_ingredient(obj/item/reagent_containers/food/snacks/snack, mob/user)
+/obj/item/food/snacks/customizable/proc/add_ingredient(obj/item/food/snacks/snack, mob/user)
if(length(ingredients) > ingredient_limit)
to_chat(user, "If you put anything else in or on [src] it's going to make a mess.")
return
// Fully custom snacks don't add the ingredients. So no need to check
- if(!fullycustom && istype(snack, /obj/item/reagent_containers/food/snacks/customizable))
- var/obj/item/reagent_containers/food/snacks/customizable/origin = snack
+ if(!fullycustom && istype(snack, /obj/item/food/snacks/customizable))
+ var/obj/item/food/snacks/customizable/origin = snack
if(length(ingredients) + length(origin.ingredients) > ingredient_limit)
to_chat(user, "Merging [snack] and [src] together is going to make a mess.")
return
@@ -369,8 +369,8 @@ do {\
var/list/added_ingredients = list(snack)
// Only merge when it is not fullycustom. Else it looks weird
- if(!fullycustom && istype(snack, /obj/item/reagent_containers/food/snacks/customizable))
- var/obj/item/reagent_containers/food/snacks/customizable/origin = snack
+ if(!fullycustom && istype(snack, /obj/item/food/snacks/customizable))
+ var/obj/item/food/snacks/customizable/origin = snack
added_ingredients += origin.ingredients
origin.ingredients.Cut()
origin.name = initial(origin.name) // Reset the name for the examine text
@@ -387,12 +387,12 @@ do {\
* Arguments:
* * new_ingredients - The new ingredients to be added
*/
-/obj/item/reagent_containers/food/snacks/customizable/proc/add_ingredients(list/new_ingredients)
+/obj/item/food/snacks/customizable/proc/add_ingredients(list/new_ingredients)
cut_overlay(top_image) // Remove the top image so we can change it again
var/ingredient_num = length(ingredients)
ingredients += new_ingredients
- for(var/obj/item/reagent_containers/food/snacks/food as anything in new_ingredients)
+ for(var/obj/item/food/snacks/food as anything in new_ingredients)
ingredient_num++
var/image/ingredient_image
if(!fullycustom)
@@ -418,20 +418,20 @@ do {\
add_overlay(top_image)
-/obj/item/reagent_containers/food/snacks/customizable/Destroy()
+/obj/item/food/snacks/customizable/Destroy()
QDEL_LIST_CONTENTS(ingredients)
qdel(top_image)
return ..()
-/obj/item/reagent_containers/food/snacks/customizable/examine(mob/user)
+/obj/item/food/snacks/customizable/examine(mob/user)
. = ..()
if(LAZYLEN(ingredients))
var/whatsinside = pick(ingredients)
. += " You think you can see [whatsinside] in there."
-/obj/item/reagent_containers/food/snacks/customizable/proc/newname()
+/obj/item/food/snacks/customizable/proc/newname()
var/unsorteditems[0]
var/sorteditems[0]
var/unsortedtypes[0]
@@ -449,8 +449,8 @@ do {\
continue
- if(istype(ing, /obj/item/reagent_containers/food/snacks/customizable)) // split the ingredients into ones with basenames (sandwich, burger, etc) and ones without, keeping track of how many of each there are
- var/obj/item/reagent_containers/food/snacks/customizable/gettype = ing
+ if(istype(ing, /obj/item/food/snacks/customizable)) // split the ingredients into ones with basenames (sandwich, burger, etc) and ones without, keeping track of how many of each there are
+ var/obj/item/food/snacks/customizable/gettype = ing
if(unsortedtypes[gettype.basename])
unsortedtypes[gettype.basename]++
if(unsortedtypes[gettype.basename] > ct)
@@ -511,7 +511,7 @@ do {\
sendback = "[pick(list("absurd","colossal","enormous","ridiculous","massive","oversized","cardiac-arresting","pipe-clogging","edible but sickening","sickening","gargantuan","mega","belly-burster","chest-burster"))] [basename]"
return sendback
-/obj/item/reagent_containers/food/snacks/customizable/proc/sortlist(list/unsorted, highest)
+/obj/item/food/snacks/customizable/proc/sortlist(list/unsorted, highest)
var/sorted[0]
for(var/i = 1, i<= highest, i++)
for(var/it in unsorted)
diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm
index 3cb816deaf6b..a4ab2d626ba3 100644
--- a/code/modules/food_and_drinks/food/foods/baked_goods.dm
+++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm
@@ -5,19 +5,19 @@
// Cakes //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sliceable/carrotcake
+/obj/item/food/snacks/sliceable/carrotcake
name = "carrot cake"
desc = "A favorite desert of a certain wascally wabbit. Not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "carrotcake"
- slice_path = /obj/item/reagent_containers/food/snacks/carrotcakeslice
+ slice_path = /obj/item/food/snacks/carrotcakeslice
slices_num = 5
bitesize = 3
filling_color = "#FFD675"
list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
-/obj/item/reagent_containers/food/snacks/carrotcakeslice
+/obj/item/food/snacks/carrotcakeslice
name = "carrot cake slice"
desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -27,19 +27,19 @@
tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/braincake
+/obj/item/food/snacks/sliceable/braincake
name = "brain cake"
desc = "A squishy cake-thing."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "braincake"
- slice_path = /obj/item/reagent_containers/food/snacks/braincakeslice
+ slice_path = /obj/item/food/snacks/braincakeslice
slices_num = 5
filling_color = "#E6AEDB"
bitesize = 3
list_reagents = list("protein" = 10, "nutriment" = 10, "mannitol" = 10, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
-/obj/item/reagent_containers/food/snacks/braincakeslice
+/obj/item/food/snacks/braincakeslice
name = "brain cake slice"
desc = "Lemme tell you something about brains. THEY'RE DELICIOUS."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -48,19 +48,19 @@
filling_color = "#E6AEDB"
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/cheesecake
+/obj/item/food/snacks/sliceable/cheesecake
name = "cheese cake"
desc = "DANGEROUSLY cheesy."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "cheesecake"
- slice_path = /obj/item/reagent_containers/food/snacks/cheesecakeslice
+ slice_path = /obj/item/food/snacks/cheesecakeslice
slices_num = 5
filling_color = "#FAF7AF"
bitesize = 3
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 4, "cream cheese" = 3)
-/obj/item/reagent_containers/food/snacks/cheesecakeslice
+/obj/item/food/snacks/cheesecakeslice
name = "cheese cake slice"
desc = "Slice of pure cheestisfaction."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -69,19 +69,19 @@
filling_color = "#FAF7AF"
tastes = list("cake" = 4, "cream cheese" = 3)
-/obj/item/reagent_containers/food/snacks/sliceable/plaincake
+/obj/item/food/snacks/sliceable/plaincake
name = "vanilla cake"
desc = "A plain cake, not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "plaincake"
- slice_path = /obj/item/reagent_containers/food/snacks/plaincakeslice
+ slice_path = /obj/item/food/snacks/plaincakeslice
slices_num = 5
bitesize = 3
filling_color = "#F7EDD5"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
-/obj/item/reagent_containers/food/snacks/plaincakeslice
+/obj/item/food/snacks/plaincakeslice
name = "vanilla cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -90,19 +90,19 @@
filling_color = "#F7EDD5"
tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/orangecake
+/obj/item/food/snacks/sliceable/orangecake
name = "orange cake"
desc = "A cake with added orange."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "orangecake"
- slice_path = /obj/item/reagent_containers/food/snacks/orangecakeslice
+ slice_path = /obj/item/food/snacks/orangecakeslice
slices_num = 5
bitesize = 3
filling_color = "#FADA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
-/obj/item/reagent_containers/food/snacks/orangecakeslice
+/obj/item/food/snacks/orangecakeslice
name = "orange cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -111,19 +111,19 @@
filling_color = "#FADA8E"
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/bananacake
+/obj/item/food/snacks/sliceable/bananacake
name = "banana cake"
desc = "A cake with added bananas."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "bananacake"
- slice_path = /obj/item/reagent_containers/food/snacks/bananacakeslice
+ slice_path = /obj/item/food/snacks/bananacakeslice
slices_num = 5
bitesize = 3
filling_color = "#FADA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
-/obj/item/reagent_containers/food/snacks/bananacakeslice
+/obj/item/food/snacks/bananacakeslice
name = "banana cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -132,19 +132,19 @@
filling_color = "#FADA8E"
tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/limecake
+/obj/item/food/snacks/sliceable/limecake
name = "lime cake"
desc = "A cake with added lime."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "limecake"
bitesize = 3
- slice_path = /obj/item/reagent_containers/food/snacks/limecakeslice
+ slice_path = /obj/item/food/snacks/limecakeslice
slices_num = 5
filling_color = "#CBFA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
-/obj/item/reagent_containers/food/snacks/limecakeslice
+/obj/item/food/snacks/limecakeslice
name = "lime cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -153,19 +153,19 @@
filling_color = "#CBFA8E"
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/lemoncake
+/obj/item/food/snacks/sliceable/lemoncake
name = "lemon cake"
desc = "A cake with added lemon."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "lemoncake"
- slice_path = /obj/item/reagent_containers/food/snacks/lemoncakeslice
+ slice_path = /obj/item/food/snacks/lemoncakeslice
slices_num = 5
bitesize = 3
filling_color = "#FAFA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
-/obj/item/reagent_containers/food/snacks/lemoncakeslice
+/obj/item/food/snacks/lemoncakeslice
name = "lemon cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -174,19 +174,19 @@
filling_color = "#FAFA8E"
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/chocolatecake
+/obj/item/food/snacks/sliceable/chocolatecake
name = "chocolate cake"
desc = "A cake with added chocolate."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "chocolatecake"
- slice_path = /obj/item/reagent_containers/food/snacks/chocolatecakeslice
+ slice_path = /obj/item/food/snacks/chocolatecakeslice
slices_num = 5
bitesize = 3
filling_color = "#805930"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
-/obj/item/reagent_containers/food/snacks/chocolatecakeslice
+/obj/item/food/snacks/chocolatecakeslice
name = "chocolate cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -195,19 +195,19 @@
filling_color = "#805930"
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
-/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake
+/obj/item/food/snacks/sliceable/birthdaycake
name = "birthday cake"
desc = "Happy Birthday..."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "birthdaycake"
- slice_path = /obj/item/reagent_containers/food/snacks/birthdaycakeslice
+ slice_path = /obj/item/food/snacks/birthdaycakeslice
slices_num = 5
filling_color = "#FFD6D6"
bitesize = 3
list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 1)
-/obj/item/reagent_containers/food/snacks/birthdaycakeslice
+/obj/item/food/snacks/birthdaycakeslice
name = "birthday cake slice"
desc = "A slice of your birthday"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -216,19 +216,19 @@
filling_color = "#FFD6D6"
tastes = list("cake" = 5, "sweetness" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/applecake
+/obj/item/food/snacks/sliceable/applecake
name = "apple cake"
desc = "A cake centered with Apple."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "applecake"
- slice_path = /obj/item/reagent_containers/food/snacks/applecakeslice
+ slice_path = /obj/item/food/snacks/applecakeslice
slices_num = 5
bitesize = 3
filling_color = "#EBF5B8"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
-/obj/item/reagent_containers/food/snacks/applecakeslice
+/obj/item/food/snacks/applecakeslice
name = "apple cake slice"
desc = "A slice of heavenly cake."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -242,7 +242,7 @@
// Cookies //
//////////////////////
-/obj/item/reagent_containers/food/snacks/cookie
+/obj/item/food/snacks/cookie
name = "cookie"
desc = "COOKIE!!!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -252,7 +252,7 @@
list_reagents = list("nutriment" = 1, "sugar" = 3, "hot_coco" = 5 )
tastes = list("cookie" = 1, "crunchy chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/fortunecookie
+/obj/item/food/snacks/fortunecookie
name = "fortune cookie"
desc = "A true prophecy in each cookie!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -262,7 +262,7 @@
trash = /obj/item/paper/fortune
tastes = list("cookie" = 1)
-/obj/item/reagent_containers/food/snacks/sugarcookie
+/obj/item/food/snacks/sugarcookie
name = "sugar cookie"
desc = "Just like your little sister used to make."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -275,7 +275,7 @@
// Pies //
//////////////////////
-/obj/item/reagent_containers/food/snacks/pie
+/obj/item/food/snacks/pie
name = "banana cream pie"
desc = "One of the five essential food groups of clowns."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -286,13 +286,13 @@
list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
tastes = list("pie" = 1)
-/obj/item/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom)
+/obj/item/food/snacks/pie/throw_impact(atom/hit_atom)
..()
new/obj/effect/decal/cleanable/pie_smudge(loc)
visible_message("[src] splats.","You hear a splat.")
qdel(src)
-/obj/item/reagent_containers/food/snacks/meatpie
+/obj/item/food/snacks/meatpie
name = "meat-pie"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "meatpie"
@@ -303,7 +303,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("pie" = 1, "meat" = 1)
-/obj/item/reagent_containers/food/snacks/tofupie
+/obj/item/food/snacks/tofupie
name = "tofu-pie"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "meatpie"
@@ -314,7 +314,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("pie" = 1, "tofu" = 1)
-/obj/item/reagent_containers/food/snacks/amanita_pie
+/obj/item/food/snacks/amanita_pie
name = "amanita pie"
desc = "Sweet and tasty poison pie."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -324,7 +324,7 @@
list_reagents = list("nutriment" = 6, "amanitin" = 3, "psilocybin" = 1, "vitamin" = 4)
tastes = list("pie" = 1, "mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/plump_pie
+/obj/item/food/snacks/plump_pie
name = "plump pie"
desc = "I bet you love stuff made out of plump helmets!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -334,14 +334,14 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("pie" = 1, "mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/plump_pie/Initialize(mapload)
+/obj/item/food/snacks/plump_pie/Initialize(mapload)
. = ..()
if(prob(10))
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" // What
reagents.add_reagent("omnizine", 5)
-/obj/item/reagent_containers/food/snacks/xemeatpie
+/obj/item/food/snacks/xemeatpie
name = "xeno-pie"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "xenomeatpie"
@@ -352,7 +352,7 @@
tastes = list("pie" = 1, "meat" = 1, "acid" = 1)
-/obj/item/reagent_containers/food/snacks/applepie
+/obj/item/food/snacks/applepie
name = "apple pie"
desc = "A pie containing sweet sweet love... or apple."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -363,7 +363,7 @@
tastes = list("pie" = 1, "apple" = 1)
-/obj/item/reagent_containers/food/snacks/cherrypie
+/obj/item/food/snacks/cherrypie
name = "cherry pie"
desc = "Taste so good, make a grown man cry."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -373,19 +373,19 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("pie" = 1, "cherries" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
+/obj/item/food/snacks/sliceable/pumpkinpie
name = "pumpkin pie"
desc = "A delicious treat for the autumn months."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "pumpkinpie"
- slice_path = /obj/item/reagent_containers/food/snacks/pumpkinpieslice
+ slice_path = /obj/item/food/snacks/pumpkinpieslice
slices_num = 5
bitesize = 3
filling_color = "#F5B951"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("pie" = 1, "pumpkin" = 1)
-/obj/item/reagent_containers/food/snacks/pumpkinpieslice
+/obj/item/food/snacks/pumpkinpieslice
name = "pumpkin pie slice"
desc = "A slice of pumpkin pie, with whipped cream on top. Perfection."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -398,7 +398,7 @@
// Donuts //
//////////////////////
-/obj/item/reagent_containers/food/snacks/donut
+/obj/item/food/snacks/donut
name = "donut"
desc = "Goes great with Robust Coffee."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -411,7 +411,7 @@
var/donut_sprite_type = DONUT_NORMAL
tastes = list("donut" = 1)
-/obj/item/reagent_containers/food/snacks/donut/Initialize(mapload)
+/obj/item/food/snacks/donut/Initialize(mapload)
. = ..()
if(randomized_sprinkles && prob(30))
icon_state = "donut2"
@@ -420,7 +420,7 @@
donut_sprite_type = DONUT_FROSTED
filling_color = "#FF69B4"
-/obj/item/reagent_containers/food/snacks/donut/sprinkles
+/obj/item/food/snacks/donut/sprinkles
name = "frosted donut"
icon_state = "donut2"
list_reagents = list("nutriment" = 3, "sugar" = 2, "sprinkles" = 2)
@@ -428,13 +428,13 @@
donut_sprite_type = DONUT_FROSTED
randomized_sprinkles = 0
-/obj/item/reagent_containers/food/snacks/donut/chaos
+/obj/item/food/snacks/donut/chaos
name = "chaos donut"
desc = "Like life, it never quite tastes the same."
bitesize = 10
tastes = list("donut" = 3, "chaos" = 1)
-/obj/item/reagent_containers/food/snacks/donut/chaos/Initialize(mapload)
+/obj/item/food/snacks/donut/chaos/Initialize(mapload)
. = ..()
extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "cocoa", "slimejelly", "banana", "berryjuice", "omnizine")
reagents.add_reagent("[extra_reagent]", 3)
@@ -444,14 +444,14 @@
reagents.add_reagent("sprinkles", 2)
filling_color = "#FF69B4"
-/obj/item/reagent_containers/food/snacks/donut/jelly
+/obj/item/food/snacks/donut/jelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
extra_reagent = "berryjuice"
tastes = list("jelly" = 1, "donut" = 3)
-/obj/item/reagent_containers/food/snacks/donut/jelly/Initialize(mapload)
+/obj/item/food/snacks/donut/jelly/Initialize(mapload)
. = ..()
if(extra_reagent)
reagents.add_reagent("[extra_reagent]", 3)
@@ -462,13 +462,13 @@
reagents.add_reagent("sprinkles", 2)
filling_color = "#FF69B4"
-/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly
+/obj/item/food/snacks/donut/jelly/slimejelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
extra_reagent = "slimejelly"
-/obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly
+/obj/item/food/snacks/donut/jelly/cherryjelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
@@ -478,7 +478,7 @@
// Pancakes //
//////////////////////
-/obj/item/reagent_containers/food/snacks/pancake
+/obj/item/food/snacks/pancake
name = "pancake"
desc = "A plain pancake."
icon = 'icons/obj/food/breakfast.dmi'
@@ -488,7 +488,7 @@
list_reagents = list("nutriment" = 3, "sugar" = 3)
tastes = list("sweet cake" = 1)
-/obj/item/reagent_containers/food/snacks/pancake/attack_tk(mob/user)
+/obj/item/food/snacks/pancake/attack_tk(mob/user)
if(src in user.tkgrabbed_objects)
to_chat(user, "You start channeling psychic energy into [src].")
visible_message("The syrup on [src] starts to boil...")
@@ -503,14 +503,14 @@
return
return ..()
-/obj/item/reagent_containers/food/snacks/pancake/berry_pancake
+/obj/item/food/snacks/pancake/berry_pancake
name = "berry pancake"
desc = "A pancake loaded with berries."
icon_state = "berry_pancake"
list_reagents = list("nutriment" = 3, "sugar" = 3, "berryjuice" = 3)
tastes = list("sweet cake" = 2, "berries" = 2)
-/obj/item/reagent_containers/food/snacks/pancake/choc_chip_pancake
+/obj/item/food/snacks/pancake/choc_chip_pancake
name = "choc-chip pancake"
desc = "A pancake loaded with chocolate chips."
icon_state = "choc_chip_pancake"
@@ -521,7 +521,7 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/muffin
+/obj/item/food/snacks/muffin
name = "muffin"
desc = "A delicious and spongy little cake."
icon = 'icons/obj/food/breakfast.dmi'
@@ -530,7 +530,7 @@
list_reagents = list("nutriment" = 6)
tastes = list("muffin" = 1)
-/obj/item/reagent_containers/food/snacks/berryclafoutis
+/obj/item/food/snacks/berryclafoutis
name = "berry clafoutis"
desc = "No black birds, this is a good sign."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -541,7 +541,7 @@
tastes = list("pie" = 1, "blackberries" = 1)
-/obj/item/reagent_containers/food/snacks/poppypretzel
+/obj/item/food/snacks/poppypretzel
name = "poppy pretzel"
desc = "A large soft pretzel full of POP! It's all twisted up!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -550,7 +550,7 @@
list_reagents = list("nutriment" = 5)
tastes = list("pretzel" = 1)
-/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
+/obj/item/food/snacks/plumphelmetbiscuit
name = "plump helmet biscuit"
desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour."
icon = 'icons/obj/food/breakfast.dmi'
@@ -559,14 +559,14 @@
list_reagents = list("nutriment" = 5)
tastes = list("mushroom" = 1, "biscuit" = 1)
-/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize(mapload)
+/obj/item/food/snacks/plumphelmetbiscuit/Initialize(mapload)
. = ..()
if(prob(10))
name = "exceptional plump helmet biscuit"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" // Is this a reference?
reagents.add_reagent("omnizine", 5)
-/obj/item/reagent_containers/food/snacks/appletart
+/obj/item/food/snacks/appletart
name = "golden apple streusel tart"
desc = "A tasty dessert that won't make it through a metal detector."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -578,7 +578,7 @@
tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1)
-/obj/item/reagent_containers/food/snacks/cracker
+/obj/item/food/snacks/cracker
name = "cracker"
desc = "It's a salted cracker."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -588,7 +588,7 @@
list_reagents = list("nutriment" = 1)
tastes = list("cracker" = 1)
-/obj/item/reagent_containers/food/snacks/croissant
+/obj/item/food/snacks/croissant
name = "croissant"
desc = "Once a pastry reserved for the bourgeois, this flaky goodness is now on your table."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -598,13 +598,13 @@
list_reagents = list("nutriment" = 4, "sugar" = 2)
tastes = list("croissant" = 1)
-/obj/item/reagent_containers/food/snacks/croissant/throwing
+/obj/item/food/snacks/croissant/throwing
throwforce = 20
throw_range = 9 //now with extra throwing action
tastes = list("croissant" = 2, "butter" = 1, "metal" = 1)
list_reagents = list("nutriment" = 4, "sugar" = 2, "iron" = 1)
-/obj/item/reagent_containers/food/snacks/croissant/throwing/Initialize(mapload)
+/obj/item/food/snacks/croissant/throwing/Initialize(mapload)
. = ..()
AddComponent(/datum/component/boomerang, throw_range, TRUE)
diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm
index f3b30727f140..c2cfd50226b8 100644
--- a/code/modules/food_and_drinks/food/foods/bread.dm
+++ b/code/modules/food_and_drinks/food/foods/bread.dm
@@ -3,53 +3,53 @@
// Breads //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sliceable/meatbread
+/obj/item/food/snacks/sliceable/meatbread
name = "meatbread loaf"
desc = "The culinary base of every self-respecting eloquen/tg/entleman."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "meatbread"
- slice_path = /obj/item/reagent_containers/food/snacks/meatbreadslice
+ slice_path = /obj/item/food/snacks/meatbreadslice
slices_num = 5
filling_color = "#FF7575"
list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
tastes = list("bread" = 10, "meat" = 10)
-/obj/item/reagent_containers/food/snacks/meatbreadslice
+/obj/item/food/snacks/meatbreadslice
name = "meatbread slice"
desc = "A slice of delicious meatbread."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "meatbreadslice"
filling_color = "#FF7575"
-/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread
+/obj/item/food/snacks/sliceable/xenomeatbread
name = "xenomeatbread loaf"
desc = "The culinary base of every self-respecting eloquent gentleman. Extra Heretical."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "xenomeatbread"
- slice_path = /obj/item/reagent_containers/food/snacks/xenomeatbreadslice
+ slice_path = /obj/item/food/snacks/xenomeatbreadslice
slices_num = 5
filling_color = "#8AFF75"
list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
tastes = list("bread" = 10, "acid" = 10)
-/obj/item/reagent_containers/food/snacks/xenomeatbreadslice
+/obj/item/food/snacks/xenomeatbreadslice
name = "xenomeatbread slice"
desc = "A slice of delicious meatbread. Extra Heretical."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "xenobreadslice"
filling_color = "#8AFF75"
-/obj/item/reagent_containers/food/snacks/sliceable/spidermeatbread
+/obj/item/food/snacks/sliceable/spidermeatbread
name = "spider meat loaf"
desc = "Reassuringly green meatloaf made from spider meat."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "spidermeatbread"
- slice_path = /obj/item/reagent_containers/food/snacks/spidermeatbreadslice
+ slice_path = /obj/item/food/snacks/spidermeatbreadslice
slices_num = 5
list_reagents = list("protein" = 20, "nutriment" = 10, "toxin" = 15, "vitamin" = 5)
tastes = list("bread" = 10, "cobwebs" = 5)
-/obj/item/reagent_containers/food/snacks/spidermeatbreadslice
+/obj/item/food/snacks/spidermeatbreadslice
name = "spider meat bread slice"
desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -57,18 +57,18 @@
tastes = list("bread" = 10, "cobwebs" = 5)
list_reagents = list("toxin" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/bananabread
+/obj/item/food/snacks/sliceable/bananabread
name = "banana-nut bread"
desc = "A heavenly and filling treat."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bananabread"
- slice_path = /obj/item/reagent_containers/food/snacks/bananabreadslice
+ slice_path = /obj/item/food/snacks/bananabreadslice
slices_num = 5
filling_color = "#EDE5AD"
list_reagents = list("banana" = 20, "nutriment" = 20)
tastes = list("bread" = 10, "banana" = 5)
-/obj/item/reagent_containers/food/snacks/bananabreadslice
+/obj/item/food/snacks/bananabreadslice
name = "banana-nut bread slice"
desc = "A slice of delicious banana bread."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -76,36 +76,36 @@
filling_color = "#EDE5AD"
tastes = list("bread" = 10, "banana" = 5)
-/obj/item/reagent_containers/food/snacks/sliceable/tofubread
+/obj/item/food/snacks/sliceable/tofubread
name = "tofubread"
desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "tofubread"
- slice_path = /obj/item/reagent_containers/food/snacks/tofubreadslice
+ slice_path = /obj/item/food/snacks/tofubreadslice
slices_num = 5
filling_color = "#F7FFE0"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("bread" = 10, "tofu" = 10)
-/obj/item/reagent_containers/food/snacks/tofubreadslice
+/obj/item/food/snacks/tofubreadslice
name = "tofubread slice"
desc = "A slice of delicious tofubread."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "tofubreadslice"
filling_color = "#F7FFE0"
-/obj/item/reagent_containers/food/snacks/sliceable/bread
+/obj/item/food/snacks/sliceable/bread
name = "bread"
desc = "Some plain old Earthen bread."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bread"
- slice_path = /obj/item/reagent_containers/food/snacks/breadslice
+ slice_path = /obj/item/food/snacks/breadslice
slices_num = 6
filling_color = "#FFE396"
list_reagents = list("nutriment" = 10)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/breadslice
+/obj/item/food/snacks/breadslice
name = "bread slice"
desc = "A slice of home."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -114,18 +114,18 @@
list_reagents = list("nutriment" = 2, "bread" = 5)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread
+/obj/item/food/snacks/sliceable/creamcheesebread
name = "cream cheese bread"
desc = "Yum yum yum!"
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "creamcheesebread"
- slice_path = /obj/item/reagent_containers/food/snacks/creamcheesebreadslice
+ slice_path = /obj/item/food/snacks/creamcheesebreadslice
slices_num = 5
filling_color = "#FFF896"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("bread" = 10, "cheese" = 10)
-/obj/item/reagent_containers/food/snacks/creamcheesebreadslice
+/obj/item/food/snacks/creamcheesebreadslice
name = "cream cheese bread slice"
desc = "A slice of yum!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -134,18 +134,18 @@
list_reagents = list("nutriment" = 4, "vitamin" = 1)
tastes = list("bread" = 10, "cheese" = 10)
-/obj/item/reagent_containers/food/snacks/sliceable/banarnarbread
+/obj/item/food/snacks/sliceable/banarnarbread
name = "banarnarbread loaf"
desc = "A loaf of delicious mah'weyh pleggh at e'ntrath!"
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "banarnarbread"
- slice_path = /obj/item/reagent_containers/food/snacks/banarnarbreadslice
+ slice_path = /obj/item/food/snacks/banarnarbreadslice
slices_num = 5
filling_color = "#6F0000"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("heresy" = 10, "banana" = 10)
-/obj/item/reagent_containers/food/snacks/banarnarbreadslice
+/obj/item/food/snacks/banarnarbreadslice
name = "banarnarbread slice"
desc = "A slice of delicious mah'weyh pleggh at e'ntrath!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -159,7 +159,7 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/bun
+/obj/item/food/snacks/bun
name = "bun"
desc = "The base for any self-respecting burger."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -168,7 +168,7 @@
tastes = list("bun" = 1)
-/obj/item/reagent_containers/food/snacks/flatbread
+/obj/item/food/snacks/flatbread
name = "flatbread"
desc = "Bland but filling."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -176,7 +176,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/baguette
+/obj/item/food/snacks/baguette
name = "baguette"
desc = "Bon appetit!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -188,15 +188,15 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/baguette/combat
+/obj/item/food/snacks/baguette/combat
sharp = TRUE
force = 20
-/obj/item/reagent_containers/food/snacks/baguette/combat/Initialize(mapload)
+/obj/item/food/snacks/baguette/combat/Initialize(mapload)
. = ..()
AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = ALL_ATTACK_TYPES)
-/obj/item/reagent_containers/food/snacks/twobread
+/obj/item/food/snacks/twobread
name = "two bread"
desc = "It is very bitter and winy."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -206,7 +206,7 @@
list_reagents = list("nutriment" = 2, "vitamin" = 2)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/toast
+/obj/item/food/snacks/toast
name = "toast"
desc = "Yeah! Toast!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -216,7 +216,7 @@
list_reagents = list("nutriment" = 3)
tastes = list("toast" = 1)
-/obj/item/reagent_containers/food/snacks/jelliedtoast
+/obj/item/food/snacks/jelliedtoast
name = "jellied toast"
desc = "A slice of bread covered with delicious jam."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -225,13 +225,13 @@
bitesize = 3
tastes = list("toast" = 1, "jelly" = 1)
-/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
+/obj/item/food/snacks/jelliedtoast/cherry
list_reagents = list("nutriment" = 1, "cherryjelly" = 5, "vitamin" = 2)
-/obj/item/reagent_containers/food/snacks/jelliedtoast/slime
+/obj/item/food/snacks/jelliedtoast/slime
list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2)
-/obj/item/reagent_containers/food/snacks/rofflewaffles
+/obj/item/food/snacks/rofflewaffles
name = "roffle waffles"
desc = "Waffles from Roffle. Co."
icon = 'icons/obj/food/breakfast.dmi'
@@ -242,7 +242,7 @@
list_reagents = list("nutriment" = 8, "psilocybin" = 2, "vitamin" = 2)
tastes = list("waffle" = 1, "mushrooms" = 1)
-/obj/item/reagent_containers/food/snacks/waffles
+/obj/item/food/snacks/waffles
name = "waffles"
desc = "Mmm, waffles."
icon = 'icons/obj/food/breakfast.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/candy.dm b/code/modules/food_and_drinks/food/foods/candy.dm
index fb4d3c2fc86a..fe3fe0ac48a6 100644
--- a/code/modules/food_and_drinks/food/foods/candy.dm
+++ b/code/modules/food_and_drinks/food/foods/candy.dm
@@ -7,7 +7,7 @@
//Candy / Candy Ingredients
//Subclass so we can pass on values
-/obj/item/reagent_containers/food/snacks/candy
+/obj/item/food/snacks/candy
name = "generic candy"
desc = "It's placeholder flavored. This shouldn't be seen."
icon = 'icons/obj/food/candy.dmi'
@@ -18,7 +18,7 @@
// Candy Ingredients / Flavorings / Byproduct
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/chocolatebar
+/obj/item/food/snacks/chocolatebar
name = "chocolate bar"
desc = "Such sweet, fattening food."
icon_state = "chocolatebar"
@@ -26,7 +26,7 @@
list_reagents = list("nutriment" = 2, "chocolate" = 4)
tastes = list("chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/candy/caramel
+/obj/item/food/snacks/candy/caramel
name = "caramel"
desc = "Chewy and dense, yet it practically melts in your mouth!"
icon_state = "caramel"
@@ -34,32 +34,32 @@
list_reagents = list("cream" = 2, "sugar" = 2)
-/obj/item/reagent_containers/food/snacks/candy/toffee
+/obj/item/food/snacks/candy/toffee
name = "toffee"
desc = "A hard, brittle candy with a distinctive taste."
icon_state = "toffee"
filling_color = "#7D5F46"
list_reagents = list("nutriment" = 3, "sugar" = 3)
-/obj/item/reagent_containers/food/snacks/candy/nougat
+/obj/item/food/snacks/candy/nougat
name = "nougat"
desc = "A soft, chewy candy commonly found in candybars."
icon_state = "nougat"
filling_color = "#7D5F46"
list_reagents = list("nutriment" = 3, "sugar" = 3)
-/obj/item/reagent_containers/food/snacks/candy/taffy
+/obj/item/food/snacks/candy/taffy
name = "saltwater taffy"
desc = "Old fashioned saltwater taffy. Chewy!"
icon_state = "candy1"
filling_color = "#7D5F46"
list_reagents = list("nutriment" = 3, "sugar" = 3)
-/obj/item/reagent_containers/food/snacks/candy/taffy/Initialize(mapload)
+/obj/item/food/snacks/candy/taffy/Initialize(mapload)
. = ..()
icon_state = pick("candy1", "candy2", "candy3", "candy4", "candy5")
-/obj/item/reagent_containers/food/snacks/candy/fudge
+/obj/item/food/snacks/candy/fudge
name = "fudge"
desc = "Chocolate fudge, a timeless classic treat."
icon_state = "fudge"
@@ -67,26 +67,26 @@
bitesize = 3
list_reagents = list("cream" = 3, "chocolate" = 6)
-/obj/item/reagent_containers/food/snacks/candy/fudge/peanut
+/obj/item/food/snacks/candy/fudge/peanut
name = "peanut fudge"
desc = "Chocolate fudge, with bits of peanuts mixed in. People with nut allergies shouldn't eat this."
icon_state = "fudge_peanut"
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/fudge/cherry
+/obj/item/food/snacks/candy/fudge/cherry
name = "chocolate cherry fudge"
desc = "Chocolate fudge surrounding sweet cherries. Good for tricking kids into eating some fruit."
icon_state = "fudge_cherry"
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/fudge/cookies_n_cream
+/obj/item/food/snacks/candy/fudge/cookies_n_cream
name = "cookies 'n' cream fudge"
desc = "An extra creamy fudge with bits of real chocolate cookie mixed in. Crunchy!"
icon_state = "fudge_cookies_n_cream"
filling_color = "#7D5F46"
list_reagents = list("cream" = 6, "chocolate" = 6)
-/obj/item/reagent_containers/food/snacks/candy/fudge/turtle
+/obj/item/food/snacks/candy/fudge/turtle
name = "turtle fudge"
desc = "Chocolate fudge with caramel and nuts. It doesn't contain real turtles, thankfully."
icon_state = "fudge_turtle"
@@ -96,14 +96,14 @@
// Candy Products (Pre-existing)
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/donor
+/obj/item/food/snacks/candy/donor
name = "donor candy"
desc = "A little treat for blood donors."
trash = /obj/item/trash/candy
bitesize = 5
list_reagents = list("nutriment" = 10, "sugar" = 3)
-/obj/item/reagent_containers/food/snacks/candy/candy_corn
+/obj/item/food/snacks/candy/candy_corn
name = "candy corn"
desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas."
icon_state = "candycorn"
@@ -115,7 +115,7 @@
// Candy Products (plain / unflavored)
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/cotton
+/obj/item/food/snacks/candy/cotton
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_plain"
@@ -124,7 +124,7 @@
bitesize = 4
list_reagents = list("sugar" = 15)
-/obj/item/reagent_containers/food/snacks/candy/candybar
+/obj/item/food/snacks/candy/candybar
name = "candy"
desc = "A chocolate candybar, wrapped in a bit of foil."
icon_state = "candy"
@@ -137,14 +137,14 @@
tastes = list("chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/candy/candycane
+/obj/item/food/snacks/candy/candycane
name = "candy cane"
desc = "A festive mint candy cane."
icon_state = "candycane"
filling_color = "#F2F2F2"
list_reagents = list("minttoxin" = 1, "sugar" = 5)
-/obj/item/reagent_containers/food/snacks/candy/gummybear
+/obj/item/food/snacks/candy/gummybear
name = "gummy bear"
desc = "A small edible bear. It's squishy and chewy!"
icon_state = "gbear"
@@ -152,7 +152,7 @@
bitesize = 3
list_reagents = list("sugar" = 10)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm
+/obj/item/food/snacks/candy/gummyworm
name = "gummy worm"
desc = "An edible worm, made from gelatin."
icon_state = "gworm"
@@ -160,7 +160,7 @@
bitesize = 3
list_reagents = list("sugar" = 10)
-/obj/item/reagent_containers/food/snacks/candy/jellybean
+/obj/item/food/snacks/candy/jellybean
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas."
icon_state = "jbean"
@@ -168,7 +168,7 @@
bitesize = 3
list_reagents = list("sugar" = 10)
-/obj/item/reagent_containers/food/snacks/candy/jawbreaker
+/obj/item/food/snacks/candy/jawbreaker
name = "jawbreaker"
desc = "An unbelievably hard candy. The name is fitting."
icon_state = "jawbreaker"
@@ -176,7 +176,7 @@
bitesize = 0.1 //this is gonna take a while, you'll be working at this all shift.
list_reagents = list("sugar" = 10)
-/obj/item/reagent_containers/food/snacks/candy/cash
+/obj/item/food/snacks/candy/cash
name = "candy cash"
desc = "Not legal tender. Tasty though."
icon_state = "candy_cash"
@@ -185,7 +185,7 @@
tastes = list("chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/candy/coin
+/obj/item/food/snacks/candy/coin
name = "chocolate coin"
desc = "Probably won't work in the vending machines."
icon_state = "choc_coin"
@@ -195,7 +195,7 @@
tastes = list("chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/candy/gum
+/obj/item/food/snacks/candy/gum
name = "bubblegum"
desc = "Chewy!"
icon_state = "bubblegum"
@@ -204,7 +204,7 @@
bitesize = 0.2
list_reagents = list("sugar" = 5)
-/obj/item/reagent_containers/food/snacks/candy/sucker
+/obj/item/food/snacks/candy/sucker
name = "sucker"
desc = "For being such a good sport!"
icon_state = "sucker"
@@ -215,56 +215,56 @@
// Gummy Bear Flavors
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/gummybear/red
+/obj/item/food/snacks/candy/gummybear/red
name = "gummy bear"
desc = "A small edible bear. It's red!"
icon_state = "gbear_red"
filling_color = "#801E28"
list_reagents = list("sugar" = 10, "cherryjelly" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/blue
+/obj/item/food/snacks/candy/gummybear/blue
name = "gummy bear"
desc = "A small edible bear. It's blue!"
icon_state = "gbear_blue"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "berryjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/poison
+/obj/item/food/snacks/candy/gummybear/poison
name = "gummy bear"
desc = "A small edible bear. It's blue!"
icon_state = "gbear_blue"
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 12)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/green
+/obj/item/food/snacks/candy/gummybear/green
name = "gummy bear"
desc = "A small edible bear. It's green!"
icon_state = "gbear_green"
filling_color = "#365E30"
list_reagents = list("sugar" = 10, "limejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/yellow
+/obj/item/food/snacks/candy/gummybear/yellow
name = "gummy bear"
desc = "A small edible bear. It's yellow!"
icon_state = "gbear_yellow"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "lemonjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/orange
+/obj/item/food/snacks/candy/gummybear/orange
name = "gummy bear"
desc = "A small edible bear. It's orange!"
icon_state = "gbear_orange"
filling_color = "#E78108"
list_reagents = list("sugar" = 10, "orangejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/purple
+/obj/item/food/snacks/candy/gummybear/purple
name = "gummy bear"
desc = "A small edible bear. It's purple!"
icon_state = "gbear_purple"
filling_color = "#993399"
list_reagents = list("sugar" = 10, "grapejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummybear/wtf
+/obj/item/food/snacks/candy/gummybear/wtf
name = "gummy bear"
desc = "A small bear. Wait... what?"
icon_state = "gbear_rainbow"
@@ -275,56 +275,56 @@
// Gummy Worm Flavors
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/red
+/obj/item/food/snacks/candy/gummyworm/red
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's red!"
icon_state = "gworm_red"
filling_color = "#801E28"
list_reagents = list("sugar" = 10, "cherryjelly" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/blue
+/obj/item/food/snacks/candy/gummyworm/blue
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's blue!"
icon_state = "gworm_blue"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "berryjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/poison
+/obj/item/food/snacks/candy/gummyworm/poison
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's blue!"
icon_state = "gworm_blue"
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 12)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/green
+/obj/item/food/snacks/candy/gummyworm/green
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's green!"
icon_state = "gworm_green"
filling_color = "#365E30"
list_reagents = list("sugar" = 10, "limejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/yellow
+/obj/item/food/snacks/candy/gummyworm/yellow
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's yellow!"
icon_state = "gworm_yellow"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "lemonjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/orange
+/obj/item/food/snacks/candy/gummyworm/orange
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's orange!"
icon_state = "gworm_orange"
filling_color = "#E78108"
list_reagents = list("sugar" = 10, "orangejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/purple
+/obj/item/food/snacks/candy/gummyworm/purple
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's purple!"
icon_state = "gworm_purple"
filling_color = "#993399"
list_reagents = list("sugar" = 10, "grapejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/gummyworm/wtf
+/obj/item/food/snacks/candy/gummyworm/wtf
name = "gummy worm"
desc = "An edible worm. Did it just move?"
icon_state = "gworm_rainbow"
@@ -335,91 +335,91 @@
// Jelly Bean Flavors
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/jellybean/red
+/obj/item/food/snacks/candy/jellybean/red
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's red!"
icon_state = "jbean_red"
filling_color = "#801E28"
list_reagents = list("sugar" = 10, "cherryjelly" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/blue
+/obj/item/food/snacks/candy/jellybean/blue
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's blue!"
icon_state = "jbean_blue"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "berryjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/poison
+/obj/item/food/snacks/candy/jellybean/poison
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's blue!"
icon_state = "jbean_blue"
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 12)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/green
+/obj/item/food/snacks/candy/jellybean/green
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's green!"
icon_state = "jbean_green"
filling_color = "#365E30"
list_reagents = list("sugar" = 10, "limejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/yellow
+/obj/item/food/snacks/candy/jellybean/yellow
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's yellow!"
icon_state = "jbean_yellow"
filling_color = "#863333"
list_reagents = list("sugar" = 10, "lemonjuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/orange
+/obj/item/food/snacks/candy/jellybean/orange
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's orange!"
icon_state = "jbean_orange"
filling_color = "#E78108"
list_reagents = list("sugar" = 10, "orangejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/purple
+/obj/item/food/snacks/candy/jellybean/purple
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's purple!"
icon_state = "jbean_purple"
filling_color = "#993399"
list_reagents = list("sugar" = 10, "grapejuice" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/chocolate
+/obj/item/food/snacks/candy/jellybean/chocolate
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's chocolate!"
icon_state = "jbean_choc"
filling_color = "#302000"
list_reagents = list("sugar" = 10, "chocolate" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/popcorn
+/obj/item/food/snacks/candy/jellybean/popcorn
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's popcorn flavored!"
icon_state = "jbean_popcorn"
filling_color = "#664330"
list_reagents = list("sugar" = 10, "nutriment" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/cola
+/obj/item/food/snacks/candy/jellybean/cola
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's Cola flavored!"
icon_state = "jbean_cola"
filling_color = "#102000"
list_reagents = list("sugar" = 10, "cola" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/drgibb
+/obj/item/food/snacks/candy/jellybean/drgibb
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's Dr. Gibb flavored!"
icon_state = "jbean_cola"
filling_color = "#102000"
list_reagents = list("sugar" = 10, "dr_gibb" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/coffee
+/obj/item/food/snacks/candy/jellybean/coffee
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's Coffee flavored!"
icon_state = "jbean_choc"
filling_color = "#482000"
list_reagents = list("sugar" = 10, "coffee" = 2)
-/obj/item/reagent_containers/food/snacks/candy/jellybean/wtf
+/obj/item/food/snacks/candy/jellybean/wtf
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas. You aren't sure what color it is."
icon_state = "jbean_rainbow"
@@ -430,7 +430,7 @@
// Cotton Candy Flavors
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/cotton/red
+/obj/item/food/snacks/candy/cotton/red
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_red"
@@ -438,7 +438,7 @@
filling_color = "#801E28"
list_reagents = list("sugar" = 15, "cherryjelly" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/blue
+/obj/item/food/snacks/candy/cotton/blue
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_blue"
@@ -446,7 +446,7 @@
filling_color = "#863333"
list_reagents = list("sugar" = 15, "berryjuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/poison
+/obj/item/food/snacks/candy/cotton/poison
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_blue"
@@ -454,7 +454,7 @@
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 20)
-/obj/item/reagent_containers/food/snacks/candy/cotton/green
+/obj/item/food/snacks/candy/cotton/green
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_green"
@@ -462,7 +462,7 @@
filling_color = "#365E30"
list_reagents = list("sugar" = 15, "limejuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/yellow
+/obj/item/food/snacks/candy/cotton/yellow
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_yellow"
@@ -470,7 +470,7 @@
filling_color = "#863333"
list_reagents = list("sugar" = 15, "lemonjuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/orange
+/obj/item/food/snacks/candy/cotton/orange
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_orange"
@@ -478,7 +478,7 @@
filling_color = "#E78108"
list_reagents = list("sugar" = 15, "orangejuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/purple
+/obj/item/food/snacks/candy/cotton/purple
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_purple"
@@ -486,7 +486,7 @@
filling_color = "#993399"
list_reagents = list("sugar" = 15, "grapejuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/pink
+/obj/item/food/snacks/candy/cotton/pink
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_pink"
@@ -494,7 +494,7 @@
filling_color = "#863333"
list_reagents = list("sugar" = 15, "watermelonjuice" = 5)
-/obj/item/reagent_containers/food/snacks/candy/cotton/rainbow
+/obj/item/food/snacks/candy/cotton/rainbow
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_rainbow"
@@ -502,7 +502,7 @@
filling_color = "#C8A5DC"
list_reagents = list("omnizine" = 20)
-/obj/item/reagent_containers/food/snacks/candy/cotton/bad_rainbow
+/obj/item/food/snacks/candy/cotton/bad_rainbow
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_rainbow"
@@ -514,35 +514,35 @@
// Candybar Flavors
// ***********************************************************
-/obj/item/reagent_containers/food/snacks/candy/confectionery
+/obj/item/food/snacks/candy/confectionery
list_reagents = list("nutriment" = 1, "chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/candy/confectionery/rice
+/obj/item/food/snacks/candy/confectionery/rice
name = "Asteroid Crunch Bar"
desc = "Crunchy rice deposits in delicious chocolate! A favorite of miners galaxy-wide."
icon_state = "asteroidcrunch"
trash = /obj/item/trash/candy
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/confectionery/toffee
+/obj/item/food/snacks/candy/confectionery/toffee
name = "Yum-Baton Bar"
desc = "Chocolate and toffee in the shape of a baton. Security sure knows how to pound these down!"
icon_state = "yumbaton"
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel
+/obj/item/food/snacks/candy/confectionery/caramel
name = "Malper Bar"
desc = "A chocolate syringe filled with a caramel injection. Just what the doctor ordered!"
icon_state = "malper"
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/confectionery/caramel_nougat
+/obj/item/food/snacks/candy/confectionery/caramel_nougat
name = "Toxins Test Bar"
desc = "An explosive combination of chocolate, caramel, and nougat. Research has never been so tasty!"
icon_state = "toxinstest"
filling_color = "#7D5F46"
-/obj/item/reagent_containers/food/snacks/candy/confectionery/nougat
+/obj/item/food/snacks/candy/confectionery/nougat
name = "Tool-erone Bar"
desc = "Chocolate-covered nougat, shaped like a wrench. Great for an engineer on the go!"
icon_state = "toolerone"
diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm
index 692c8c06208b..c68b8bc55f17 100644
--- a/code/modules/food_and_drinks/food/foods/desserts.dm
+++ b/code/modules/food_and_drinks/food/foods/desserts.dm
@@ -2,13 +2,13 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/friedbanana
+/obj/item/food/snacks/friedbanana
name = "fried banana"
desc = "Goreng Pisang, also known as fried bananas."
icon_state = "friedbanana"
list_reagents = list("sugar" = 5, "nutriment" = 8, "cornoil" = 4)
-/obj/item/reagent_containers/food/snacks/ricepudding
+/obj/item/food/snacks/ricepudding
name = "rice pudding"
desc = "Where's the Jam!"
icon_state = "rpudding"
@@ -17,7 +17,7 @@
list_reagents = list("nutriment" = 7, "vitamin" = 2)
tastes = list("rice" = 1, "sweetness" = 1)
-/obj/item/reagent_containers/food/snacks/spacylibertyduff
+/obj/item/food/snacks/spacylibertyduff
name = "spacy liberty duff"
desc = "Jello gelatin, from Alfred Hubbard's cookbook."
icon_state = "spacylibertyduff"
@@ -27,7 +27,7 @@
list_reagents = list("nutriment" = 6, "psilocybin" = 6)
tastes = list("jelly" = 1, "mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/amanitajelly
+/obj/item/food/snacks/amanitajelly
name = "amanita jelly"
desc = "Looks curiously toxic."
icon_state = "amanitajelly"
@@ -37,7 +37,7 @@
list_reagents = list("nutriment" = 6, "amanitin" = 6, "psilocybin" = 3)
tastes = list("jelly" = 1, "mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/candiedapple
+/obj/item/food/snacks/candiedapple
name = "candied apple"
desc = "An apple coated in sugary sweetness."
icon_state = "candiedapple"
@@ -46,7 +46,7 @@
list_reagents = list("nutriment" = 3, "sugar" = 2)
tastes = list("apple" = 2, "sweetness" = 2)
-/obj/item/reagent_containers/food/snacks/mint
+/obj/item/food/snacks/mint
name = "mint"
desc = "it is only wafer thin."
icon_state = "mint"
diff --git a/code/modules/food_and_drinks/food/foods/ethnic.dm b/code/modules/food_and_drinks/food/foods/ethnic.dm
index d57032656c3e..153dc2b7407c 100644
--- a/code/modules/food_and_drinks/food/foods/ethnic.dm
+++ b/code/modules/food_and_drinks/food/foods/ethnic.dm
@@ -3,7 +3,7 @@
// Mexican //
//////////////////////
-/obj/item/reagent_containers/food/snacks/taco
+/obj/item/food/snacks/taco
name = "taco"
desc = "Take a bite!"
icon_state = "taco"
@@ -11,7 +11,7 @@
list_reagents = list("nutriment" = 7, "vitamin" = 1)
tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1)
-/obj/item/reagent_containers/food/snacks/burrito
+/obj/item/food/snacks/burrito
name = "burrito"
desc = "Meat, beans, cheese, and rice wrapped up as an easy-to-hold meal."
icon_state = "burrito"
@@ -21,7 +21,7 @@
tastes = list("torilla" = 2, "meat" = 3)
-/obj/item/reagent_containers/food/snacks/chimichanga
+/obj/item/food/snacks/chimichanga
name = "chimichanga"
desc = "Time to eat a chimi-f***ing-changa."
icon_state = "chimichanga"
@@ -29,7 +29,7 @@
filling_color = "#A36A1F"
list_reagents = list("omnizine" = 4, "cheese" = 2) //Deadpool reference. Deal with it.
-/obj/item/reagent_containers/food/snacks/enchiladas
+/obj/item/food/snacks/enchiladas
name = "enchiladas"
desc = "Viva la Mexico!"
icon_state = "enchiladas"
@@ -39,7 +39,7 @@
list_reagents = list("nutriment" = 8, "capsaicin" = 6)
tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
-/obj/item/reagent_containers/food/snacks/cornchips
+/obj/item/food/snacks/cornchips
name = "corn chips"
desc = "Goes great with salsa! OLE!"
icon_state = "chips"
@@ -53,7 +53,7 @@
// Chinese //
//////////////////////
-/obj/item/reagent_containers/food/snacks/chinese/chowmein
+/obj/item/food/snacks/chinese/chowmein
name = "chow mein"
desc = "What is in this anyways?"
icon_state = "chinese1"
@@ -62,7 +62,7 @@
list_reagents = list("nutriment" = 1, "beans" = 3, "msg" = 4, "sugar" = 2)
tastes = list("noodle" = 1, "vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/chinese/sweetsourchickenball
+/obj/item/food/snacks/chinese/sweetsourchickenball
name = "sweet & sour chicken balls"
desc = "Is this chicken cooked? The odds are better than wok paper scissors."
icon = 'icons/obj/food/meat.dmi'
@@ -72,7 +72,7 @@
list_reagents = list("nutriment" = 2, "msg" = 4, "sugar" = 2)
tastes = list("chicken" = 1, "sweetness" = 1)
-/obj/item/reagent_containers/food/snacks/chinese/tao
+/obj/item/food/snacks/chinese/tao
name = "Admiral Yamamoto carp"
desc = "Tastes like chicken."
icon_state = "chinese2"
@@ -81,7 +81,7 @@
list_reagents = list("nutriment" = 1, "protein" = 1, "msg" = 4, "sugar" = 4)
tastes = list("chicken" = 1)
-/obj/item/reagent_containers/food/snacks/chinese/newdles
+/obj/item/food/snacks/chinese/newdles
name = "chinese newdles"
desc = "Made fresh, weekly!"
icon_state = "chinese3"
@@ -90,7 +90,7 @@
list_reagents = list("nutriment" = 1, "msg" = 4, "sugar" = 3)
tastes = list("noodles" = 1)
-/obj/item/reagent_containers/food/snacks/chinese/rice
+/obj/item/food/snacks/chinese/rice
name = "fried rice"
desc = "A timeless classic."
icon_state = "chinese4"
@@ -105,7 +105,7 @@
// Japanese //
//////////////////////
-/obj/item/reagent_containers/food/snacks/chawanmushi
+/obj/item/food/snacks/chawanmushi
name = "chawanmushi"
desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."
icon_state = "chawanmushi"
@@ -114,7 +114,7 @@
list_reagents = list("nutriment" = 5)
tastes = list("custard" = 1)
-/obj/item/reagent_containers/food/snacks/yakiimo
+/obj/item/food/snacks/yakiimo
name = "yaki imo"
desc = "Made with roasted sweet potatoes!"
icon_state = "yakiimo"
@@ -128,7 +128,7 @@
// Middle Eastern //
//////////////////////
-/obj/item/reagent_containers/food/snacks/human/kabob
+/obj/item/food/snacks/human/kabob
name = "-kabob"
icon_state = "kabob"
desc = "Human meat, on a stick."
@@ -136,7 +136,7 @@
filling_color = "#A85340"
list_reagents = list("nutriment" = 8)
-/obj/item/reagent_containers/food/snacks/monkeykabob
+/obj/item/food/snacks/monkeykabob
name = "meat-kabob"
icon_state = "kabob"
desc = "Delicious meat, on a stick."
@@ -144,7 +144,7 @@
filling_color = "#A85340"
list_reagents = list("nutriment" = 8)
-/obj/item/reagent_containers/food/snacks/tofukabob
+/obj/item/food/snacks/tofukabob
name = "tofu-kabob"
icon_state = "kabob"
desc = "Vegan meat, on a stick."
@@ -152,7 +152,7 @@
filling_color = "#FFFEE0"
list_reagents = list("nutriment" = 8)
-/obj/item/reagent_containers/food/snacks/picoss_kabob
+/obj/item/food/snacks/picoss_kabob
name = "picoss-kabob"
desc = "A popular Moghes streetfood consisting of vinegar-marinated space carp on a skewer with onion and chillis."
icon_state = "picoss_skewer"
diff --git a/code/modules/food_and_drinks/food/foods/frozen.dm b/code/modules/food_and_drinks/food/foods/frozen.dm
index 069dfa297111..d00db915ed0a 100644
--- a/code/modules/food_and_drinks/food/foods/frozen.dm
+++ b/code/modules/food_and_drinks/food/foods/frozen.dm
@@ -5,24 +5,24 @@
//Abstract item for inheritence.
-/obj/item/reagent_containers/food/snacks/frozen
+/obj/item/food/snacks/frozen
name = "frozen treat"
desc = "If you got this, something broke! Contact a coder if this somehow spawns."
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "flavorless_sc"
-/obj/item/reagent_containers/food/snacks/sliceable/clowncake
+/obj/item/food/snacks/sliceable/clowncake
name = "clown cake"
desc = "A funny cake with a clown face on it."
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "clowncake"
- slice_path = /obj/item/reagent_containers/food/snacks/frozen/clowncakeslice
+ slice_path = /obj/item/food/snacks/frozen/clowncakeslice
slices_num = 5
bitesize = 3
list_reagents = list("nutriment" = 20, "sugar" = 5, "vitamin" = 5, "banana" = 15)
tastes = list("cake" = 5, "sweetness" = 2, "banana" = 1, "sad clowns" = 1, "ice-cream" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/clowncakeslice
+/obj/item/food/snacks/frozen/clowncakeslice
name = "clown cake slice"
desc = "A slice of bad jokes, and silly props."
icon_state = "clowncake_slice"
@@ -31,7 +31,7 @@
list_reagents = list("nutriment" = 4, "sugar" = 1, "vitamin" = 1, "banana" = 3)
tastes = list("cake" = 5, "sweetness" = 2, "sad clowns" = 1, "ice-cream" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/sundae
+/obj/item/food/snacks/frozen/sundae
name = "sundae"
desc = "Portable ice cream in its own packaging."
icon_state = "sundae"
@@ -42,7 +42,7 @@
// Ice Cream //
//////////////////
-/obj/item/reagent_containers/food/snacks/frozen/icecream
+/obj/item/food/snacks/frozen/icecream
name = "ice cream"
desc = "Delicious ice cream."
icon_state = "icecream_cone"
@@ -50,11 +50,11 @@
list_reagents = list("nutriment" = 1, "sugar" = 1)
tastes = list("ice cream" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/icecream/Initialize(mapload)
+/obj/item/food/snacks/frozen/icecream/Initialize(mapload)
. = ..()
update_icon(UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/snacks/frozen/icecream/update_overlays()
+/obj/item/food/snacks/frozen/icecream/update_overlays()
. = ..()
var/mutable_appearance/filling = mutable_appearance('icons/obj/food/frozen_treats.dmi', "icecream_color")
var/list/reagent_colors = rgb2num(mix_color_from_reagents(reagents.reagent_list), COLORSPACE_HSV) //switching to HSV colorspace lets us easily manipulate the saturation and brightness independently
@@ -62,7 +62,7 @@
filling.color = rgb(reagent_colors[1], ((1.5 * reagent_colors[2]) - 10), (clamp(reagent_colors[3], 85, 100) - 10), space = COLORSPACE_HSV)
. += filling
-/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone
+/obj/item/food/snacks/frozen/icecream/icecreamcone
name = "ice cream cone"
desc = "Delicious ice cream."
icon_state = "icecream_cone"
@@ -70,7 +70,7 @@
bitesize = 3
list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2)
-/obj/item/reagent_containers/food/snacks/frozen/icecream/wafflecone
+/obj/item/food/snacks/frozen/icecream/wafflecone
name = "ice cream in a waffle cone"
desc = "Delicious ice cream."
icon_state = "icecream_cone_waffle"
@@ -78,7 +78,7 @@
bitesize = 3
list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2)
-/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcup
+/obj/item/food/snacks/frozen/icecream/icecreamcup
name = "chocolate ice cream cone"
desc = "Delicious ice cream."
icon_state = "icecream_cone_chocolate"
@@ -86,7 +86,7 @@
bitesize = 3
list_reagents = list("nutriment" = 5, "chocolate" = 8, "ice" = 2)
-/obj/item/reagent_containers/food/snacks/wafflecone
+/obj/item/food/snacks/wafflecone
name = "waffle cone"
desc = "Delicious waffle cone, but no ice cream."
icon = 'icons/obj/food/frozen_treats.dmi'
@@ -94,49 +94,49 @@
list_reagents = list("nutriment" = 5)
tastes = list("cream" = 2, "waffle" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich
+/obj/item/food/snacks/frozen/icecreamsandwich
name = "icecream sandwich"
desc = "Portable ice cream in its own packaging."
icon_state = "icecreamsandwich"
list_reagents = list("nutriment" = 2, "ice" = 2)
tastes = list("ice cream" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/berryicecreamsandwich
+/obj/item/food/snacks/frozen/berryicecreamsandwich
name = "strawberry icecream sandwich"
desc = "Portable ice cream in its own packaging."
icon_state = "strawberryicecreamsandwich"
list_reagents = list("nutriment" = 2, "ice" = 2)
tastes = list("ice cream" = 1, "strawberry" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/sundae
+/obj/item/food/snacks/frozen/sundae
name = "sundae"
desc = "A classic dessert."
icon_state = "sundae"
list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
tastes = list("ice cream" = 1, "banana" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/honkdae
+/obj/item/food/snacks/frozen/honkdae
name = "honkdae"
desc = "The clown's favorite dessert."
icon_state = "honkdae"
list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4)
tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/cornuto
+/obj/item/food/snacks/frozen/cornuto
name = "cornuto"
desc = "A neapolitan vanilla and chocolate ice cream cone. It menaces with a sprinkling of caramelized nuts."
icon_state = "cornuto"
list_reagents = list("nutriment" = 6, "hot_coco" = 4, "cream" = 2, "vanilla" = 4, "sugar" = 2)
tastes = list("chopped hazelnuts" = 3, "waffle" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/peanutbuttermochi
+/obj/item/food/snacks/frozen/peanutbuttermochi
name = "peanut butter ice cream mochi"
desc = "A classic dessert at the Arabia Street Night Market in Prospect, peanut butter ice cream mochi is made with a peanut-butter flavoured ice cream as the main filling, and coated in crushed peanuts in the Taiwanese tradition."
icon_state = "pb_ice_cream_mochi"
list_reagents = list("nutriment" = 4, "sugar" = 6, "peanutbutter" = 4, "milk" = 2)
tastes = list("peanut butter" = 1, "mochi" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/spacefreezy
+/obj/item/food/snacks/frozen/spacefreezy
name = "spacefreezy"
desc = "The best ice cream in space."
icon_state = "spacefreezy"
@@ -147,113 +147,113 @@
// Snow Cones //
//////////////////
-/obj/item/reagent_containers/food/snacks/frozen/snowcone
+/obj/item/food/snacks/frozen/snowcone
name = "flavorless snowcone"
desc = "It's just shaved ice. Still fun to chew on."
icon_state = "flavorless_sc"
- trash = /obj/item/reagent_containers/food/drinks/sillycup
+ trash = /obj/item/reagent_containers/drinks/sillycup
list_reagents = list("water" = 10, "ice" = 5)
tastes = list("cold water" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/apple
+/obj/item/food/snacks/frozen/snowcone/apple
name = "apple snowcone"
desc = "Apple syrup drizzled over a snowball in a paper cup."
icon_state = "amber_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "applejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "apples" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/berry
+/obj/item/food/snacks/frozen/snowcone/berry
name = "berry snowcone"
desc = "Berry syrup drizzled over a snowball in a paper cup."
icon_state = "berry_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "berryjuice" = 5)
tastes = list("ice" = 1, "water" = 1, "berries" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/bluecherry
+/obj/item/food/snacks/frozen/snowcone/bluecherry
name = "bluecherry snowcone"
desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!"
icon_state = "blue_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "bluecherryjelly" = 5)
tastes = list("ice" = 1, "water" = 1, "bluecherries" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/cherry
+/obj/item/food/snacks/frozen/snowcone/cherry
name = "cherry snowcone"
desc = "Cherry syrup drizzled over a snowball in a paper cup."
icon_state = "red_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "cherryjelly" = 5)
tastes = list("ice" = 1, "water" = 1, "cherries" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/fruitsalad
+/obj/item/food/snacks/frozen/snowcone/fruitsalad
name = "fruit salad snowcone"
desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup."
icon_state = "fruitsalad_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "limejuice" = 5, "lemonjuice" = 5, "orangejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "lemons" = 5, "limes" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/grape
+/obj/item/food/snacks/frozen/snowcone/grape
name = "grape snowcone"
desc = "Grape syrup drizzled over a snowball in a paper cup."
icon_state = "grape_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "grapejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "grapes" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/honey
+/obj/item/food/snacks/frozen/snowcone/honey
name = "honey snowcone"
desc = "Honey drizzled over a snowball in a paper cup."
icon_state = "amber_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "honey" = 5)
tastes = list("ice" = 1, "water" = 1, "honey" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/lemon
+/obj/item/food/snacks/frozen/snowcone/lemon
name = "lemon snowcone"
desc = "Lemon syrup drizzled over a snowball in a paper cup."
icon_state = "lemon_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "lemonjuice" = 5)
tastes = list("ice" = 1, "water" = 1, "lemons" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/lime
+/obj/item/food/snacks/frozen/snowcone/lime
name = "lime snowcone"
desc = "Lime syrup drizzled over a snowball in a paper cup."
icon_state = "lime_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "limejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "limes" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/mime
+/obj/item/food/snacks/frozen/snowcone/mime
name = "mime snowcone"
desc = "..."
icon_state = "mime_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "nothing" = 5)
tastes = list("ice" = 1, "water" = 1, "silence" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/orange
+/obj/item/food/snacks/frozen/snowcone/orange
name = "orange snowcone"
desc = "Orange syrup drizzled over a snowball in a paper cup."
icon_state = "orange_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "orangejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "oranges" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/pineapple
+/obj/item/food/snacks/frozen/snowcone/pineapple
name = "pineapple snowcone"
desc = "Pineapple syrup drizzled over a snowball in a paper cup."
icon_state = "pineapple_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "pineapplejuice" = 5)
tastes = list("ice" = 1, "water" = 1, "pineapple" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/rainbow
+/obj/item/food/snacks/frozen/snowcone/rainbow
name = "rainbow snowcone"
desc = "A very colorful snowball in a paper cup."
icon_state = "rainbow_sc"
list_reagents = list("water" = 10, "ice" = 5, "colorful_reagent" = 5)
tastes = list("ice" = 1, "water" = 1, "rainbows" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/cola
+/obj/item/food/snacks/frozen/snowcone/cola
name = "space cola snowcone"
desc = "Space Cola drizzled over a snowball in a paper cup."
icon_state = "soda_sc"
list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "cola" = 5)
tastes = list("ice" = 1, "water" = 1, "soda" = 5)
-/obj/item/reagent_containers/food/snacks/frozen/snowcone/spacemountain
+/obj/item/food/snacks/frozen/snowcone/spacemountain
name = "space mountain wind snowcone"
desc = "Space Mountain Wind drizzled over a snowball in a paper cup."
icon_state = "mountainwind_sc"
@@ -264,7 +264,7 @@
// Popsicles //
/////////////////
-/obj/item/reagent_containers/food/snacks/frozen/popsicle
+/obj/item/food/snacks/frozen/popsicle
name = "jumbo icecream"
desc = "A luxurious ice cream covered in rich chocolate. It seems smaller than you remember it being."
icon_state = "jumbo"
@@ -272,63 +272,63 @@
list_reagents = list("nutriment" = 4, "sugar" = 4, "chocolate" = 3)
tastes = list("ice cream" = 1, "chocolate" = 1, "vanilla" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/bananatop
+/obj/item/food/snacks/frozen/popsicle/bananatop
name = "banana topsicle"
desc = "A frozen treat made from tofu and banana juice blended smooth, then frozen. Popular in rural Japan in the summer."
icon_state = "topsicle_banana"
list_reagents = list("vitamin" = 4, "sugar" = 6, "banana" = 4)
tastes = list("bananas" = 1, "tofu" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/berrytop
+/obj/item/food/snacks/frozen/popsicle/berrytop
name = "berry topsicle"
desc = "A frozen treat made from tofu and berry juice blended smooth, then frozen. Supposedly a favourite of bears, but that makes no sense..."
icon_state = "topsicle_berry"
list_reagents = list("vitamin" = 4, "sugar" = 6, "berryjuice" = 4)
tastes = list("berries" = 1, "tofu" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/pineappletop
+/obj/item/food/snacks/frozen/popsicle/pineappletop
name = "pineapple topsicle"
desc = "A frozen treat made from tofu and pineapple juice blended smooth, then frozen. As seen on TV."
icon_state = "topsicle_pineapple"
list_reagents = list("vitamin" = 4, "sugar" = 6, "pineapplejuice" = 4)
tastes = list("pineapples" = 1, "tofu" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/licoricecream
+/obj/item/food/snacks/frozen/popsicle/licoricecream
name = "licorice creamsicle"
desc = "A salty licorice ice cream. A salty frozen treat."
icon_state = "licorice_creamsicle"
list_reagents = list("nutriment" = 4, "cream" = 2, "vanilla" = 1, "sugar" = 4, "salt" = 1)
tastes = list("salty licorice" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/orangecream
+/obj/item/food/snacks/frozen/popsicle/orangecream
name = "orange creamsicle"
desc = "A classic orange creamsicle. A sunny frozen treat."
icon_state = "creamsicle_o"
list_reagents = list("orangejuice" = 4, "cream" = 2, "vanilla" = 2, "sugar" = 4)
tastes = list("ice cream" = 1, "oranges" = 1, "vanilla" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/berrycream
+/obj/item/food/snacks/frozen/popsicle/berrycream
name = "berry creamsicle"
desc = "A vibrant berry creamsicle. A berry good frozen treat."
icon_state = "creamsicle_m"
list_reagents = list("berryjuice" = 4, "cream" = 2, "vanilla" = 2, "sugar" = 4)
tastes = list("ice cream" = 1, "berries" = 1, "vanilla" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/frozenpineapple
+/obj/item/food/snacks/frozen/popsicle/frozenpineapple
name = "frozen pineapple pop"
desc = "Few cultures love pineapple as much as the Martians, and this dessert proves that- frozen pineapple, on a stick, with just a little dunk of dark chocolate."
icon_state = "pineapple_pop"
list_reagents = list("pineapplejuice" = 4, "sugar" = 4, "nutriment" = 2, "vitamin" = 2)
tastes = list("cold pineapple" = 1, "chocolate" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/sea_salt
+/obj/item/food/snacks/frozen/popsicle/sea_salt
name = "sea salt ice-cream bar"
desc = "This sky-blue ice-cream bar is flavoured with only the finest imported sea salt. Salty... no, sweet!"
icon_state = "sea_salt_pop"
list_reagents = list("salt" = 1, "nutriment" = 2, "cream" = 2, "vanilla" = 2, "sugar"= 4,)
tastes = list("salt" = 1, "sweet" = 1)
-/obj/item/reagent_containers/food/snacks/frozen/popsicle/ant
+/obj/item/food/snacks/frozen/popsicle/ant
name = "ant popsicle"
desc = "A colony of ants suspended in hardened sugar. Those things are dead, right?"
icon_state = "ant_pop"
diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm
index b6b9baa121b3..a0cf80c61b6a 100644
--- a/code/modules/food_and_drinks/food/foods/ingredients.dm
+++ b/code/modules/food_and_drinks/food/foods/ingredients.dm
@@ -3,7 +3,7 @@
// Tofu & Soy //
//////////////////////
-/obj/item/reagent_containers/food/snacks/tofu
+/obj/item/food/snacks/tofu
name = "tofu"
icon_state = "tofu"
desc = "We all love tofu."
@@ -13,7 +13,7 @@
tastes = list("tofu" = 1)
ingredient_name = "tofu chunk"
-/obj/item/reagent_containers/food/snacks/fried_tofu
+/obj/item/food/snacks/fried_tofu
name = "fried tofu"
icon_state = "tofu"
desc = "Proof that even vegetarians crave unhealthy foods."
@@ -22,7 +22,7 @@
list_reagents = list("plantmatter" = 3)
tastes = list("tofu" = 1)
-/obj/item/reagent_containers/food/snacks/soydope
+/obj/item/food/snacks/soydope
name = "soy dope"
icon_state = "soydope"
desc = "Like regular dope, but for the health conscious consumer."
@@ -36,27 +36,27 @@
// Cheese //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sliceable/cheesewheel
+/obj/item/food/snacks/sliceable/cheesewheel
name = "cheese wheel"
desc = "A big wheel of delicious Cheddar."
icon_state = "cheesewheel"
- slice_path = /obj/item/reagent_containers/food/snacks/cheesewedge
+ slice_path = /obj/item/food/snacks/cheesewedge
slices_num = 5
filling_color = "#FFF700"
list_reagents = list("nutriment" = 15, "vitamin" = 5, "cheese" = 20)
tastes = list("cheese" = 1)
-/obj/item/reagent_containers/food/snacks/cheesewedge
+/obj/item/food/snacks/cheesewedge
name = "cheese wedge"
desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far."
icon_state = "cheesewedge"
filling_color = "#FFF700"
tastes = list("cheese" = 1)
-/obj/item/reagent_containers/food/snacks/cheesewedge/presliced
+/obj/item/food/snacks/cheesewedge/presliced
list_reagents = list("nutriment" = 3, "vitamin" = 1, "cheese" = 4)
-
-/obj/item/reagent_containers/food/snacks/weirdcheesewedge
+
+/obj/item/food/snacks/weirdcheesewedge
name = "weird cheese"
desc = "Some kind of... gooey, messy, gloopy thing. Similar to cheese, but only in the broad sense of the word."
icon_state = "weirdcheesewedge"
@@ -68,7 +68,7 @@
// Plants //
//////////////////////
-/obj/item/reagent_containers/food/snacks/hugemushroomslice
+/obj/item/food/snacks/hugemushroomslice
name = "huge mushroom slice"
desc = "A slice from a huge mushroom."
icon_state = "hugemushroomslice"
@@ -77,14 +77,14 @@
list_reagents = list("plantmatter" = 3, "vitamin" = 1)
tastes = list("mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/watermelonslice
+/obj/item/food/snacks/watermelonslice
name = "watermelon slice"
desc = "A slice of watery goodness."
icon_state = "watermelonslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
filling_color = "#FF3867"
tastes = list("watermelon" = 1)
-/obj/item/reagent_containers/food/snacks/tomatoslice
+/obj/item/food/snacks/tomatoslice
name = "tomato slice"
desc = "A fresh slice of tomato."
icon_state = "tomatoslice"
@@ -92,7 +92,7 @@
list_reagents = list("plantmatter" = 2)
tastes = list("tomato" = 1)
-/obj/item/reagent_containers/food/snacks/pineappleslice
+/obj/item/food/snacks/pineappleslice
name = "pineapple slices"
desc = "Rings of pineapple."
icon_state = "pineappleslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
@@ -104,7 +104,7 @@
// Dough //
//////////////////////
-/obj/item/reagent_containers/food/snacks/dough
+/obj/item/food/snacks/dough
name = "dough"
desc = "A piece of dough."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -113,10 +113,10 @@
tastes = list("dough" = 1)
// Dough + rolling pin = flat dough
-/obj/item/reagent_containers/food/snacks/dough/attackby(obj/item/I, mob/user, params)
+/obj/item/food/snacks/dough/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/kitchen/rollingpin))
if(isturf(loc))
- new /obj/item/reagent_containers/food/snacks/sliceable/flatdough(loc)
+ new /obj/item/food/snacks/sliceable/flatdough(loc)
to_chat(user, "You flatten [src].")
qdel(src)
else
@@ -125,18 +125,18 @@
..()
// slicable into 3xdoughslices
-/obj/item/reagent_containers/food/snacks/sliceable/flatdough
+/obj/item/food/snacks/sliceable/flatdough
name = "flat dough"
desc = "Some flattened dough."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "flat dough"
- slice_path = /obj/item/reagent_containers/food/snacks/doughslice
+ slice_path = /obj/item/food/snacks/doughslice
slices_num = 3
list_reagents = list("nutriment" = 6)
tastes = list("dough" = 1)
-/obj/item/reagent_containers/food/snacks/doughslice
+/obj/item/food/snacks/doughslice
name = "dough slice"
desc = "The building block of an impressive dish."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -147,7 +147,7 @@
///cookies by Ume
-/obj/item/reagent_containers/food/snacks/cookiedough
+/obj/item/food/snacks/cookiedough
var/flat = FALSE
name = "pastry dough"
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -156,19 +156,19 @@
list_reagents = list("nutriment" = 5, "sugar" = 5)
tastes = list("dough" = 1, "sugar" = 1)
-/obj/item/reagent_containers/food/snacks/cookiedough/update_name()
+/obj/item/food/snacks/cookiedough/update_name()
. = ..()
if(flat)
name = "flat pastry dough"
-/obj/item/reagent_containers/food/snacks/cookiedough/update_icon_state()
+/obj/item/food/snacks/cookiedough/update_icon_state()
if(flat)
icon_state = "cookiedough_flat"
else
icon_state = "cookiedough"
// Dough + rolling pin = flat cookie dough // Flat dough + circular cutter = unbaked cookies
-/obj/item/reagent_containers/food/snacks/cookiedough/attackby(obj/item/I, mob/user, params)
+/obj/item/food/snacks/cookiedough/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/kitchen/rollingpin) && !flat)
if(isturf(loc))
to_chat(user, "You flatten [src].")
@@ -178,7 +178,7 @@
to_chat(user, "You need to put [src] on a surface to roll it out!")
else if(istype(I, /obj/item/kitchen/cutter) && flat)
if(isturf(loc))
- new /obj/item/reagent_containers/food/snacks/rawcookies(loc)
+ new /obj/item/food/snacks/rawcookies(loc)
to_chat(user, "You cut [src] into cookies.")
qdel(src)
else
@@ -187,17 +187,17 @@
return ..()
-/obj/item/reagent_containers/food/snacks/rawcookies
+/obj/item/food/snacks/rawcookies
name = "raw cookies"
desc = "Ready for oven!"
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "unbaked_cookies"
list_reagents = list("nutriment" = 5, "sugar" = 5)
-/obj/item/reagent_containers/food/snacks/rawcookies/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers/food/snacks/choc_pile))
+/obj/item/food/snacks/rawcookies/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/food/snacks/choc_pile))
if(isturf(loc))
- new /obj/item/reagent_containers/food/snacks/rawcookies/chocochips(loc)
+ new /obj/item/food/snacks/rawcookies/chocochips(loc)
to_chat(user, "You sprinkle [I] all over the cookies.")
qdel(src)
qdel(I)
@@ -206,7 +206,7 @@
else
return ..()
-/obj/item/reagent_containers/food/snacks/rawcookies/chocochips
+/obj/item/food/snacks/rawcookies/chocochips
name = "raw cookies"
desc = "Ready for oven! They have little pieces of chocolate all over them"
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -218,7 +218,7 @@
// Chocolate //
//////////////////////
-/obj/item/reagent_containers/food/snacks/chocolatebar
+/obj/item/food/snacks/chocolatebar
name = "chocolate bar"
desc = "Such sweet, fattening food."
icon_state = "chocolatebar"
@@ -227,10 +227,10 @@
tastes = list("chocolate" = 1)
///Chocolate crumbles/pile
-/obj/item/reagent_containers/food/snacks/chocolatebar/attackby(obj/item/I, mob/user, params)
+/obj/item/food/snacks/chocolatebar/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/kitchen/knife))
if(isturf(loc))
- new /obj/item/reagent_containers/food/snacks/choc_pile(loc)
+ new /obj/item/food/snacks/choc_pile(loc)
to_chat(user, "You cut [src] into little crumbles.")
qdel(src)
else
@@ -239,7 +239,7 @@
return ..()
-/obj/item/reagent_containers/food/snacks/choc_pile //for reagent chocolate being spilled on turfs
+/obj/item/food/snacks/choc_pile //for reagent chocolate being spilled on turfs
name = "pile of chocolate"
desc = "A pile of pure chocolate pieces."
icon_state = "cocoa"
@@ -252,7 +252,7 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/ectoplasm
+/obj/item/food/snacks/ectoplasm
name = "ectoplasm"
desc = "A luminescent blob of what scientists refer to as 'ghost goo'."
icon = 'icons/obj/wizard.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/junkfood.dm b/code/modules/food_and_drinks/food/foods/junkfood.dm
index 3c3397fa0c92..f410d2db2ff6 100644
--- a/code/modules/food_and_drinks/food/foods/junkfood.dm
+++ b/code/modules/food_and_drinks/food/foods/junkfood.dm
@@ -3,7 +3,7 @@
// Vendor //
//////////////////////
-/obj/item/reagent_containers/food/snacks/chips
+/obj/item/food/snacks/chips
name = "chips"
desc = "Commander Riker's What-The-Crisps."
icon_state = "chips"
@@ -15,7 +15,7 @@
list_reagents = list("nutriment" = 1, "sodiumchloride" = 1, "sugar" = 3)
tastes = list("crisps" = 1)
-/obj/item/reagent_containers/food/snacks/sosjerky
+/obj/item/food/snacks/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
icon_state = "sosjerky"
desc = "Beef jerky made from the finest space cows."
@@ -26,7 +26,7 @@
list_reagents = list("protein" = 1, "sugar" = 3)
tastes = list("chewy beef" = 1)
-/obj/item/reagent_containers/food/snacks/pistachios
+/obj/item/food/snacks/pistachios
name = "pistachios"
icon_state = "pistachios"
desc = "Deliciously salted pistachios. A perfectly valid choice..."
@@ -37,7 +37,7 @@
list_reagents = list("plantmatter" = 2, "sodiumchloride" = 1, "sugar" = 4)
tastes = list("pistachios" = 1)
-/obj/item/reagent_containers/food/snacks/no_raisin
+/obj/item/food/snacks/no_raisin
name = "4no Raisins"
icon_state = "4no_raisins"
desc = "Best raisins in the universe. Not sure why."
@@ -48,7 +48,7 @@
list_reagents = list("plantmatter" = 2, "sugar" = 4)
tastes = list("dried raisins" = 1)
-/obj/item/reagent_containers/food/snacks/spacetwinkie
+/obj/item/food/snacks/spacetwinkie
name = "Space Twinkie"
icon_state = "space_twinkie"
desc = "Guaranteed to survive longer then you will."
@@ -58,7 +58,7 @@
list_reagents = list("sugar" = 4)
tastes = list("twinkies" = 1)
-/obj/item/reagent_containers/food/snacks/cheesiehonkers
+/obj/item/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
icon_state = "cheesie_honkers"
desc = "Bite sized cheesie snacks that will honk all over your mouth."
@@ -69,7 +69,7 @@
list_reagents = list("nutriment" = 1, "fake_cheese" = 2, "sugar" = 3)
tastes = list("cheese" = 1, "crisps" = 2)
-/obj/item/reagent_containers/food/snacks/syndicake
+/obj/item/food/snacks/syndicake
name = "Syndi-Cakes"
icon_state = "syndi_cakes"
desc = "An extremely moist snack cake that tastes just as good after being nuked."
@@ -80,7 +80,7 @@
list_reagents = list("nutriment" = 4, "salglu_solution" = 5)
tastes = list("sweetness" = 3, "cake" = 1)
-/obj/item/reagent_containers/food/snacks/tastybread
+/obj/item/food/snacks/tastybread
name = "bread tube"
desc = "Bread in a tube. Chewy and surprisingly tasty."
icon_state = "tastybread"
@@ -91,7 +91,7 @@
list_reagents = list("nutriment" = 2, "sugar" = 4)
tastes = list("bread" = 1)
-/obj/item/reagent_containers/food/snacks/stroopwafel
+/obj/item/food/snacks/stroopwafel
name = "stroopwafel"
desc = "Straight from the snack factories of Space Den Haag comes a classic dutch treat!"
icon_state = "stroopwafel"
@@ -100,7 +100,7 @@
list_reagents = list("nutriment" = 10, "sugar" = 4)
tastes = list("syrup" = 3, "waffle" = 2)
-/obj/item/reagent_containers/food/snacks/twimsts
+/obj/item/food/snacks/twimsts
name = "Twimsts"
desc = "Sweet twisted sticks made of liquorice, can be used to make edible handcuffs!"
icon_state = "twimsts"
@@ -111,7 +111,7 @@
list_reagents = list("nutriment" = 2, "sugar" = 10)
tastes = list("sweetness" = 3, "liquorice" = 2)
-/obj/item/reagent_containers/food/snacks/twimsts/attack_self(mob/user)
+/obj/item/food/snacks/twimsts/attack_self(mob/user)
var/obj/item/restraints/handcuffs/twimsts/L = new /obj/item/restraints/handcuffs/twimsts
L.create_reagents(100)
reagents.copy_to(L, reagents.total_volume)
@@ -125,13 +125,13 @@
// Homemade //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sosjerky/healthy
+/obj/item/food/snacks/sosjerky/healthy
name = "homemade beef jerky"
desc = "Homemade beef jerky made from the finest space cows."
list_reagents = list("nutriment" = 3, "vitamin" = 1)
junkiness = 0
-/obj/item/reagent_containers/food/snacks/no_raisin/healthy
+/obj/item/food/snacks/no_raisin/healthy
name = "homemade raisins"
desc = "homemade raisins, the best in all of spess."
list_reagents = list("nutriment" = 3, "vitamin" = 2)
diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
index 921a42adf7d8..f03044731ce8 100644
--- a/code/modules/food_and_drinks/food/foods/meat.dm
+++ b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -3,7 +3,7 @@
// Raw Meat //
//////////////////////
-/obj/item/reagent_containers/food/snacks/meat
+/obj/item/food/snacks/meat
name = "meat"
desc = "A slab of meat."
icon = 'icons/obj/food/meat.dmi'
@@ -15,11 +15,11 @@
ingredient_name = "slab of meat"
ingredient_name_plural = "slabs of meat"
-/obj/item/reagent_containers/food/snacks/meat/attackby(obj/item/W, mob/user, params)
+/obj/item/food/snacks/meat/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/kitchen/knife) || istype(W, /obj/item/scalpel))
- new /obj/item/reagent_containers/food/snacks/rawcutlet(src)
- new /obj/item/reagent_containers/food/snacks/rawcutlet(src)
- new /obj/item/reagent_containers/food/snacks/rawcutlet(src)
+ new /obj/item/food/snacks/rawcutlet(src)
+ new /obj/item/food/snacks/rawcutlet(src)
+ new /obj/item/food/snacks/rawcutlet(src)
user.visible_message( \
"[user] cuts [src] with [W]!", \
"You cut [src] with [W]!" \
@@ -28,42 +28,42 @@
else
..()
-/obj/item/reagent_containers/food/snacks/meat/syntiflesh
+/obj/item/food/snacks/meat/syntiflesh
name = "synthetic meat"
desc = "A synthetic slab of flesh."
-/obj/item/reagent_containers/food/snacks/meat/human
+/obj/item/food/snacks/meat/human
name = "-meat"
var/subjectname = ""
var/subjectjob = null
tastes = list("salty meat" = 1)
-/obj/item/reagent_containers/food/snacks/meat/slab/meatproduct
+/obj/item/food/snacks/meat/slab/meatproduct
name = "meat product"
desc = "A slab of reclaimed and chemically processed meat product."
-/obj/item/reagent_containers/food/snacks/meat/slab/gorilla
+/obj/item/food/snacks/meat/slab/gorilla
name = "gorilla meat"
desc = "Much meatier than monkey meat."
list_reagents = list("nutriment" = 5, "vitamin" = 1)
-/obj/item/reagent_containers/food/snacks/meat/monkey
+/obj/item/food/snacks/meat/monkey
//same as plain meat
-/obj/item/reagent_containers/food/snacks/meat/corgi
+/obj/item/food/snacks/meat/corgi
name = "corgi meat"
desc = "Tastes like the Head of Personnel's hopes and dreams."
-/obj/item/reagent_containers/food/snacks/meat/pug
+/obj/item/food/snacks/meat/pug
name = "pug meat"
desc = "Slightly less adorable in sliced form."
-/obj/item/reagent_containers/food/snacks/meat/ham
+/obj/item/food/snacks/meat/ham
name = "ham"
desc = "For when you need to go ham."
list_reagents = list("protein" = 3, "porktonium" = 10)
-/obj/item/reagent_containers/food/snacks/meat/meatwheat
+/obj/item/food/snacks/meat/meatwheat
name = "meatwheat clump"
desc = "This doesn't look like meat, but your standards aren't that high to begin with."
list_reagents = list("nutriment" = 3, "vitamin" = 2, "blood" = 5)
@@ -71,7 +71,7 @@
icon_state = "meatwheat_clump"
bitesize = 4
-/obj/item/reagent_containers/food/snacks/meat/tomatomeat
+/obj/item/food/snacks/meat/tomatomeat
name = "tomato meat slice"
desc = "A slice from a huge tomato."
icon_state = "tomatomeat"
@@ -80,7 +80,7 @@
list_reagents = list("protein" = 2)
tastes = list("tomato" = 1)
-/obj/item/reagent_containers/food/snacks/rawcutlet
+/obj/item/food/snacks/rawcutlet
name = "raw cutlet"
desc = "A thin strip of raw meat."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -88,13 +88,13 @@
bitesize = 1
list_reagents = list("protein" = 1)
-/obj/item/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/W, mob/user, params)
+/obj/item/food/snacks/rawcutlet/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/kitchen/knife) || istype(W, /obj/item/scalpel))
user.visible_message( \
"[user] cuts the raw cutlet with [W]!", \
"You cut the raw cutlet with [W]!" \
)
- var/obj/item/reagent_containers/food/snacks/raw_bacon/bacon = new(get_turf(src))
+ var/obj/item/food/snacks/raw_bacon/bacon = new(get_turf(src))
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
qdel(src)
@@ -108,7 +108,7 @@
// Cannot be used in the usual meat-based food recipies but can be used as cloning pod biomass.
-/obj/item/reagent_containers/food/snacks/monstermeat
+/obj/item/food/snacks/monstermeat
// Abstract object used for inheritance. I don't see why you would want one.
// It's just a convenience to set all monstermeats as biomass-able at once,
// in the GLOB.cloner_biomass_items list.
@@ -118,7 +118,7 @@
icon = 'icons/obj/food/meat.dmi'
icon_state = "bearmeat"
-/obj/item/reagent_containers/food/snacks/monstermeat/bearmeat
+/obj/item/food/snacks/monstermeat/bearmeat
name = "bear meat"
desc = "A very manly slab of meat."
icon_state = "bearmeat"
@@ -127,7 +127,7 @@
list_reagents = list("protein" = 12, "morphine" = 5, "vitamin" = 2)
tastes = list("meat" = 1, "salmon" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat
+/obj/item/food/snacks/monstermeat/xenomeat
name = "meat"
desc = "A slab of meat. It's green!"
icon_state = "xenomeat"
@@ -136,7 +136,7 @@
list_reagents = list("protein" = 3, "vitamin" = 1)
tastes = list("meat" = 1, "acid" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/spidermeat
+/obj/item/food/snacks/monstermeat/spidermeat
name = "spider meat"
desc = "A slab of spider meat. Not very appetizing."
icon_state = "spidermeat"
@@ -144,7 +144,7 @@
list_reagents = list("protein" = 3, "toxin" = 3, "vitamin" = 1)
tastes = list("cobwebs" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/lizardmeat
+/obj/item/food/snacks/monstermeat/lizardmeat
name = "mutant lizard meat"
desc = "A peculiar slab of meat. It looks scaly and radioactive."
icon_state = "xenomeat"
@@ -153,14 +153,14 @@
list_reagents = list("protein" = 3, "toxin" = 3)
tastes = list("tough meat" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/spiderleg
+/obj/item/food/snacks/monstermeat/spiderleg
name = "spider leg"
desc = "A still twitching leg of a giant spider. You don't really want to eat this, do you?"
icon_state = "spiderleg"
list_reagents = list("protein" = 2, "toxin" = 2)
tastes = list("cobwebs" = 1, "creepy motion" = 1)
-/obj/item/reagent_containers/food/snacks/raw_bacon
+/obj/item/food/snacks/raw_bacon
name = "raw bacon"
desc = "God's gift to man in uncooked form."
icon = 'icons/obj/food/meat.dmi'
@@ -168,30 +168,30 @@
list_reagents = list("nutriment" = 1, "porktonium" = 10)
tastes = list("bacon" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/spidereggs
+/obj/item/food/snacks/monstermeat/spidereggs
name = "spider eggs"
desc = "A cluster of juicy spider eggs. A great side dish for when you don't care about your health."
icon_state = "spidereggs"
list_reagents = list("protein" = 2, "toxin" = 2)
tastes = list("cobwebs" = 1, "spider juice" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/goliath
+/obj/item/food/snacks/monstermeat/goliath
name = "goliath meat"
desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
icon_state = "goliathmeat"
list_reagents = list("protein" = 3, "toxin" = 5)
tastes = list("tough meat" = 1)
-/obj/item/reagent_containers/food/snacks/monstermeat/goliath/burn()
+/obj/item/food/snacks/monstermeat/goliath/burn()
visible_message("[src] finishes cooking!")
- new /obj/item/reagent_containers/food/snacks/goliath_steak(loc)
+ new /obj/item/food/snacks/goliath_steak(loc)
qdel(src)
//////////////////////
// Cooked Meat //
//////////////////////
-/obj/item/reagent_containers/food/snacks/meatsteak
+/obj/item/food/snacks/meatsteak
name = "meat steak"
desc = "A piece of hot spicy meat."
icon = 'icons/obj/food/meat.dmi'
@@ -202,7 +202,7 @@
list_reagents = list("nutriment" = 5)
tastes = list("meat" = 1)
-/obj/item/reagent_containers/food/snacks/bacon
+/obj/item/food/snacks/bacon
name = "bacon"
desc = "It looks crispy and tastes amazing! Mmm... Bacon."
icon = 'icons/obj/food/meat.dmi'
@@ -210,7 +210,7 @@
list_reagents = list("nutriment" = 4, "porktonium" = 10, "msg" = 4)
tastes = list("bacon" = 1)
-/obj/item/reagent_containers/food/snacks/telebacon
+/obj/item/food/snacks/telebacon
name = "tele bacon"
desc = "It tastes a little odd but it's still delicious."
icon = 'icons/obj/food/meat.dmi'
@@ -219,21 +219,21 @@
list_reagents = list("nutriment" = 4, "porktonium" = 10)
tastes = list("bacon" = 1)
-/obj/item/reagent_containers/food/snacks/telebacon/Initialize(mapload)
+/obj/item/food/snacks/telebacon/Initialize(mapload)
. = ..()
baconbeacon = new /obj/item/radio/beacon/bacon(src)
-/obj/item/reagent_containers/food/snacks/telebacon/Destroy()
+/obj/item/food/snacks/telebacon/Destroy()
QDEL_NULL(baconbeacon)
return ..()
-/obj/item/reagent_containers/food/snacks/telebacon/On_Consume(mob/M, mob/user)
+/obj/item/food/snacks/telebacon/On_Consume(mob/M, mob/user)
if(!reagents.total_volume)
baconbeacon.forceMove(user)
baconbeacon.digest_delay()
baconbeacon = null
-/obj/item/reagent_containers/food/snacks/meatball
+/obj/item/food/snacks/meatball
name = "meatball"
desc = "A great meal all round."
icon = 'icons/obj/food/meat.dmi'
@@ -242,7 +242,7 @@
list_reagents = list("protein" = 4, "vitamin" = 1)
tastes = list("meat" = 1)
-/obj/item/reagent_containers/food/snacks/sausage
+/obj/item/food/snacks/sausage
name = "sausage"
desc = "A piece of mixed and cased meat."
icon = 'icons/obj/food/meat.dmi'
@@ -251,7 +251,7 @@
list_reagents = list("protein" = 6, "vitamin" = 1, "porktonium" = 10)
tastes = list("meat" = 1)
-/obj/item/reagent_containers/food/snacks/cutlet
+/obj/item/food/snacks/cutlet
name = "cutlet"
desc = "A tasty meat slice."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -259,7 +259,7 @@
list_reagents = list("protein" = 2)
tastes = list("meat" = 1)
-/obj/item/reagent_containers/food/snacks/spidereggsham
+/obj/item/food/snacks/spidereggsham
name = "green eggs and ham"
desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
icon = 'icons/obj/food/meat.dmi'
@@ -269,7 +269,7 @@
list_reagents = list("nutriment" = 6)
tastes = list("cobwebs" = 1, "the colour green" = 1)
-/obj/item/reagent_containers/food/snacks/boiledspiderleg
+/obj/item/food/snacks/boiledspiderleg
name = "boiled spider leg"
desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
icon = 'icons/obj/food/meat.dmi'
@@ -279,7 +279,7 @@
list_reagents = list("nutriment" = 3, "capsaicin" = 2)
tastes = list("cobwebs" = 1, "hot peppers" = 1)
-/obj/item/reagent_containers/food/snacks/wingfangchu
+/obj/item/food/snacks/wingfangchu
name = "wing fang chu"
desc = "A savory dish of alien wing wang in soy. Wait, what?"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -289,7 +289,7 @@
list_reagents = list("nutriment" = 6, "soysauce" = 5, "vitamin" = 2)
tastes = list("soy" = 1)
-/obj/item/reagent_containers/food/snacks/goliath_steak
+/obj/item/food/snacks/goliath_steak
name = "goliath steak"
desc = "A delicious, lava cooked steak."
resistance_flags = LAVA_PROOF | FIRE_PROOF
@@ -299,7 +299,7 @@
list_reagents = list("protein" = 6, "vitamin" = 2)
tastes = list("meat" = 1)
-/obj/item/reagent_containers/food/snacks/fried_vox
+/obj/item/food/snacks/fried_vox
name = "Kentucky Fried Vox"
desc = "Bucket of voxxy, yaya!"
icon = 'icons/obj/food/meat.dmi'
@@ -312,7 +312,7 @@
// Cubes //
//////////////////////
-/obj/item/reagent_containers/food/snacks/monkeycube
+/obj/item/food/snacks/monkeycube
name = "monkey cube"
desc = "Just add water!"
icon_state = "monkeycube"
@@ -323,17 +323,17 @@
list_reagents = list("nutriment" = 2)
tastes = list("the jungle" = 1, "bananas" = 1)
-/obj/item/reagent_containers/food/snacks/monkeycube/water_act(volume, temperature, source, method = REAGENT_TOUCH)
+/obj/item/food/snacks/monkeycube/water_act(volume, temperature, source, method = REAGENT_TOUCH)
. = ..()
if(volume >= 1)
return Expand()
-/obj/item/reagent_containers/food/snacks/monkeycube/wash(mob/user, atom/source)
+/obj/item/food/snacks/monkeycube/wash(mob/user, atom/source)
user.drop_item()
forceMove(get_turf(source))
return 1
-/obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
+/obj/item/food/snacks/monkeycube/proc/Expand()
if(LAZYLEN(SSmobs.cubemonkeys) >= GLOB.configuration.general.monkey_cube_cap)
if(fingerprintslast)
to_chat(get_mob_by_ckey(fingerprintslast), "Bluespace harmonics prevent the spawning of more than [GLOB.configuration.general.monkey_cube_cap] monkeys on the station at one time!")
@@ -355,22 +355,22 @@
SSmobs.cubemonkeys += creature
qdel(src)
-/obj/item/reagent_containers/food/snacks/monkeycube/syndicate
+/obj/item/food/snacks/monkeycube/syndicate
faction = list("neutral", "syndicate")
-/obj/item/reagent_containers/food/snacks/monkeycube/farwacube
+/obj/item/food/snacks/monkeycube/farwacube
name = "farwa cube"
monkey_type = /datum/species/monkey/tajaran
-/obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
+/obj/item/food/snacks/monkeycube/wolpincube
name = "wolpin cube"
monkey_type = /datum/species/monkey/vulpkanin
-/obj/item/reagent_containers/food/snacks/monkeycube/stokcube
+/obj/item/food/snacks/monkeycube/stokcube
name = "stok cube"
monkey_type = /datum/species/monkey/unathi
-/obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
+/obj/item/food/snacks/monkeycube/neaeracube
name = "neaera cube"
monkey_type = /datum/species/monkey/skrell
@@ -379,7 +379,7 @@
// Eggs //
//////////////////////
-/obj/item/reagent_containers/food/snacks/egg
+/obj/item/food/snacks/egg
name = "egg"
desc = "An egg!"
icon = 'icons/obj/food/breakfast.dmi'
@@ -387,8 +387,9 @@
filling_color = "#FDFFD1"
list_reagents = list("protein" = 1, "egg" = 5)
tastes = list("egg" = 1)
+ var/amount_grown = 0
-/obj/item/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
+/obj/item/food/snacks/egg/throw_impact(atom/hit_atom)
..()
var/turf/T = get_turf(hit_atom)
new/obj/effect/decal/cleanable/egg_smudge(T)
@@ -396,7 +397,7 @@
reagents.reaction(hit_atom, REAGENT_TOUCH)
qdel(src)
-/obj/item/reagent_containers/food/snacks/egg/attackby(obj/item/W, mob/user, params)
+/obj/item/food/snacks/egg/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/toy/crayon))
var/obj/item/toy/crayon/C = W
var/clr = C.colourName
@@ -411,49 +412,49 @@
else
..()
-/obj/item/reagent_containers/food/snacks/egg/blue
+/obj/item/food/snacks/egg/blue
icon_state = "egg-blue"
item_color = "blue"
-/obj/item/reagent_containers/food/snacks/egg/green
+/obj/item/food/snacks/egg/green
icon_state = "egg-green"
item_color = "green"
-/obj/item/reagent_containers/food/snacks/egg/mime
+/obj/item/food/snacks/egg/mime
icon_state = "egg-mime"
item_color = "mime"
-/obj/item/reagent_containers/food/snacks/egg/orange
+/obj/item/food/snacks/egg/orange
icon_state = "egg-orange"
item_color = "orange"
-/obj/item/reagent_containers/food/snacks/egg/purple
+/obj/item/food/snacks/egg/purple
icon_state = "egg-purple"
item_color = "purple"
-/obj/item/reagent_containers/food/snacks/egg/rainbow
+/obj/item/food/snacks/egg/rainbow
icon_state = "egg-rainbow"
item_color = "rainbow"
-/obj/item/reagent_containers/food/snacks/egg/red
+/obj/item/food/snacks/egg/red
icon_state = "egg-red"
item_color = "red"
-/obj/item/reagent_containers/food/snacks/egg/yellow
+/obj/item/food/snacks/egg/yellow
icon_state = "egg-yellow"
item_color = "yellow"
-/obj/item/reagent_containers/food/snacks/egg/gland
+/obj/item/food/snacks/egg/gland
desc = "An egg! It looks weird..."
-/obj/item/reagent_containers/food/snacks/egg/gland/Initialize(mapload)
+/obj/item/food/snacks/egg/gland/Initialize(mapload)
. = ..()
reagents.add_reagent(get_random_reagent_id(), 15)
var/reagent_color = mix_color_from_reagents(reagents.reagent_list)
color = reagent_color
-/obj/item/reagent_containers/food/snacks/friedegg
+/obj/item/food/snacks/friedegg
name = "fried egg"
desc = "A fried egg, with a touch of salt and pepper."
icon = 'icons/obj/food/breakfast.dmi'
@@ -463,7 +464,7 @@
list_reagents = list("nutriment" = 3, "egg" = 5)
tastes = list("egg" = 1, "salt" = 1, "pepper" = 1)
-/obj/item/reagent_containers/food/snacks/boiledegg
+/obj/item/food/snacks/boiledegg
name = "boiled egg"
desc = "A hard boiled egg."
icon = 'icons/obj/food/breakfast.dmi'
@@ -471,7 +472,7 @@
filling_color = "#FFFFFF"
list_reagents = list("nutriment" = 2, "egg" = 5, "vitamin" = 1)
-/obj/item/reagent_containers/food/snacks/chocolateegg
+/obj/item/food/snacks/chocolateegg
name = "chocolate egg"
desc = "Such sweet, fattening food."
icon = 'icons/obj/food/breakfast.dmi'
@@ -479,7 +480,7 @@
filling_color = "#7D5F46"
list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2)
-/obj/item/reagent_containers/food/snacks/omelette
+/obj/item/food/snacks/omelette
name = "omelette du fromage"
desc = "That's all you can say!"
icon = 'icons/obj/food/breakfast.dmi'
@@ -490,7 +491,7 @@
bitesize = 1
tastes = list("egg" = 1, "cheese" = 1)
-/obj/item/reagent_containers/food/snacks/benedict
+/obj/item/food/snacks/benedict
name = "eggs benedict"
desc = "There is only one egg on this, how rude."
icon = 'icons/obj/food/breakfast.dmi'
@@ -504,7 +505,7 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/hotdog
+/obj/item/food/snacks/hotdog
name = "hotdog"
desc = "Not made with actual dogs. Hopefully."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -513,7 +514,7 @@
list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3)
tastes = list("bun" = 3, "meat" = 2)
-/obj/item/reagent_containers/food/snacks/meatbun
+/obj/item/food/snacks/meatbun
name = "meat bun"
desc = "Has the potential to not be dog."
icon = 'icons/obj/food/meat.dmi'
@@ -522,17 +523,17 @@
list_reagents = list("nutriment" = 6, "vitamin" = 2)
tastes = list("bun" = 3, "meat" = 2)
-/obj/item/reagent_containers/food/snacks/sliceable/turkey
+/obj/item/food/snacks/sliceable/turkey
name = "turkey"
desc = "A traditional turkey served with stuffing."
icon = 'icons/obj/food/meat.dmi'
icon_state = "turkey"
- slice_path = /obj/item/reagent_containers/food/snacks/turkeyslice
+ slice_path = /obj/item/food/snacks/turkeyslice
slices_num = 6
list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 5)
tastes = list("turkey" = 2, "stuffing" = 2)
-/obj/item/reagent_containers/food/snacks/turkeyslice
+/obj/item/food/snacks/turkeyslice
name = "turkey serving"
desc = "A serving of some tender and delicious turkey."
icon = 'icons/obj/food/meat.dmi'
@@ -541,7 +542,7 @@
filling_color = "#B97A57"
tastes = list("turkey" = 1)
-/obj/item/reagent_containers/food/snacks/organ
+/obj/item/food/snacks/organ
name = "organ"
desc = "Technically qualifies as organic."
icon = 'icons/obj/surgery.dmi'
@@ -550,7 +551,7 @@
bitesize = 3
list_reagents = list("protein" = 4, "vitamin" = 4)
-/obj/item/reagent_containers/food/snacks/appendix
+/obj/item/food/snacks/appendix
//yes, this is the same as meat. I might do something different in future
name = "appendix"
desc = "An appendix which looks perfectly healthy."
@@ -560,13 +561,13 @@
bitesize = 3
list_reagents = list("protein" = 3, "vitamin" = 2)
-/obj/item/reagent_containers/food/snacks/appendix/inflamed
+/obj/item/food/snacks/appendix/inflamed
name = "inflamed appendix"
desc = "An appendix which appears to be inflamed."
icon_state = "appendixinflamed"
filling_color = "#E00D7A"
-/obj/item/reagent_containers/food/snacks/bbqribs
+/obj/item/food/snacks/bbqribs
name = "BBQ ribs"
desc = "Sweet, smokey, savory, and gets everywhere. Perfect for Grilling."
icon = 'icons/obj/food/meat.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/misc_food.dm b/code/modules/food_and_drinks/food/foods/misc_food.dm
index 870fa54b00bf..26624dbd595e 100644
--- a/code/modules/food_and_drinks/food/foods/misc_food.dm
+++ b/code/modules/food_and_drinks/food/foods/misc_food.dm
@@ -3,7 +3,7 @@
// Meals //
//////////////////////
-/obj/item/reagent_containers/food/snacks/eggplantparm
+/obj/item/food/snacks/eggplantparm
name = "eggplant parmigiana"
desc = "The only good recipe for eggplant."
icon_state = "eggplantparm"
@@ -12,7 +12,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 2)
tastes = list("eggplant" = 2, "cheese" = 2)
-/obj/item/reagent_containers/food/snacks/soylentgreen
+/obj/item/food/snacks/soylentgreen
name = "soylent green"
desc = "Not made of people. Honest." //Totally people.
icon_state = "soylent_green"
@@ -21,7 +21,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 1)
tastes = list("waffles" = 7, "people" = 1)
-/obj/item/reagent_containers/food/snacks/soylentviridians
+/obj/item/food/snacks/soylentviridians
name = "soylent virdians"
desc = "Not made of people. Honest." //Actually honest for once.
icon_state = "soylent_yellow"
@@ -30,7 +30,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 1)
tastes = list("waffles" = 1)
-/obj/item/reagent_containers/food/snacks/monkeysdelight
+/obj/item/food/snacks/monkeysdelight
name = "monkey's delight"
desc = "Eeee Eee!"
icon_state = "monkeysdelight"
@@ -40,7 +40,7 @@
list_reagents = list("nutriment" = 10, "banana" = 5, "vitamin" = 5)
tastes = list("banana" = 1, "the jungle" = 1)
-/obj/item/reagent_containers/food/snacks/dionaroast
+/obj/item/food/snacks/dionaroast
name = "roast diona"
desc = "It's like an enormous leathery carrot... With an eye."
icon_state = "dionaroast"
@@ -49,7 +49,7 @@
list_reagents = list("plantmatter" = 4, "nutriment" = 2, "radium" = 2, "vitamin" = 4)
tastes = list("chewy vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/tofurkey
+/obj/item/food/snacks/tofurkey
name = "tofurkey"
desc = "A fake turkey made from tofu."
icon_state = "tofurkey"
@@ -63,7 +63,7 @@
// Salads //
//////////////////////
-/obj/item/reagent_containers/food/snacks/salad
+/obj/item/food/snacks/salad
name = "salad"
desc = "This salad is blander than the jokes of the clown, but is also low in carbohydrates!"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -74,70 +74,70 @@
list_reagents = list("nutriment" = 6,"vitamin" = 4)
tastes = list("lettuce" = 1)
-/obj/item/reagent_containers/food/snacks/salad/aesir
+/obj/item/food/snacks/salad/aesir
name = "aesir salad"
desc = "Probably too incredible for mortal men to fully enjoy."
icon_state = "aesirsalad"
list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6)
tastes = list("divinity" = 1, "lettuce" = 1)
-/obj/item/reagent_containers/food/snacks/salad/antipasto
+/obj/item/food/snacks/salad/antipasto
name = "antipasto salad"
desc = "A traditional Italian salad made of salami, mozzarella cheese, olives, and tomatoes. Often served as a first course meal."
icon_state = "antipasto_salad"
list_reagents = list("nutriment" = 12, "protein" = 6, "vitamin" = 6)
tastes = list("lettuce" = 2, "salami" = 2, "mozzarella cheese" = 2, "tomatoes" = 2, "dressing" = 1)
-/obj/item/reagent_containers/food/snacks/salad/caesar
+/obj/item/food/snacks/salad/caesar
name = "Caesar salad"
desc = "A simple yet flavorful salad of onions, lettuce, croutons, and shreds of cheese dressed in oil. Comes with a slice of pita bread!"
icon_state = "caesar_salad"
list_reagents = list("nutriment" = 12, "vitamin" = 6)
tastes = list("healthy greens" = 2, "olive dressing" = 2, "feta cheese" = 2, "pita bread" = 1)
-/obj/item/reagent_containers/food/snacks/salad/fruit
+/obj/item/food/snacks/salad/fruit
name = "fruit salad"
desc = "Your standard fruit salad."
icon_state = "fruitsalad"
list_reagents = list("nutriment" = 9, "vitamin" = 4)
tastes = list("fruit" = 1)
-/obj/item/reagent_containers/food/snacks/salad/greek
+/obj/item/food/snacks/salad/greek
name = "Greek salad"
desc = "A popular salad made of tomatoes, onions, feta cheese, and olives all drizzled in olive oil. Though it feels like it's missing something..."
icon_state = "greek_salad"
list_reagents = list("nutriment" = 13, "vitamin" = 14)
tastes = list("healthy greens" = 2, "olive dressing" = 1, "feta cheese" = 1)
-/obj/item/reagent_containers/food/snacks/salad/citrusdelight
+/obj/item/food/snacks/salad/citrusdelight
name = "citrus delight"
desc = "Citrus overload!"
icon_state = "citrusdelight"
list_reagents = list("nutriment" = 11, "vitamin" = 7)
tastes = list("sourness" = 1, "leaves" = 1)
-/obj/item/reagent_containers/food/snacks/salad/jungle
+/obj/item/food/snacks/salad/jungle
name = "jungle salad"
desc = "Exotic fruits in a bowl."
icon_state = "junglesalad"
list_reagents = list("banana" = 5, "nutriment" = 11, "vitamin" = 7)
tastes = list("fruit" = 1, "the jungle" = 1)
-/obj/item/reagent_containers/food/snacks/salad/kale
+/obj/item/food/snacks/salad/kale
name = "kale salad"
desc = "A healthy kale salad drizzled in oil, perfect for warm summer months."
icon_state = "kale_salad"
list_reagents = list("nutriment" = 12, "vitamin" = 12)
tastes = list("healthy greens" = 2, "olive dressing" = 1)
-/obj/item/reagent_containers/food/snacks/salad/potato
+/obj/item/food/snacks/salad/potato
name = "potato salad"
desc = "A dish of boiled potatoes mixed with boiled eggs, onions, and mayonnaise. A staple of every self-respecting barbeque."
icon_state = "potato_salad"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("potato" = 2, "egg" = 2, "mayonnaise" = 2)
-/obj/item/reagent_containers/food/snacks/salad/melonfruitbowl
+/obj/item/food/snacks/salad/melonfruitbowl
name = "melon fruit bowl"
desc = "For people who wants edible fruit bowls."
icon_state = "melonfruitbowl"
@@ -145,7 +145,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 4)
tastes = list("melon" = 1)
-/obj/item/reagent_containers/food/snacks/salad/herb
+/obj/item/food/snacks/salad/herb
name = "herb salad"
desc = "A tasty salad with apples on top."
icon_state = "herbsalad"
@@ -153,7 +153,7 @@
list_reagents = list("nutriment" = 8, "vitamin" = 2)
tastes = list("lettuce" = 1, "apple" = 1)
-/obj/item/reagent_containers/food/snacks/salad/valid
+/obj/item/food/snacks/salad/valid
name = "valid salad"
desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it."
icon_state = "validsalad"
@@ -166,7 +166,7 @@
// Donk Pockets //
//////////////////////
-/obj/item/reagent_containers/food/snacks/donkpocket
+/obj/item/food/snacks/donkpocket
name = "Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
@@ -175,7 +175,7 @@
tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
ingredient_name = "turnover"
-/obj/item/reagent_containers/food/snacks/warmdonkpocket
+/obj/item/food/snacks/warmdonkpocket
name = "warm Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
@@ -191,20 +191,20 @@
/// This tracks how much time the donk pocket has already been cooling for when its timer is paused
var/subtracted_time = 0
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/Initialize(mapload)
+/obj/item/food/snacks/warmdonkpocket/Initialize(mapload)
. = ..()
donk_heat()
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/proc/donk_heat()
+/obj/item/food/snacks/warmdonkpocket/proc/donk_heat()
heated_at = world.time
cool_timer = addtimer(CALLBACK(src, PROC_REF(donk_cool)), 7 MINUTES - subtracted_time, TIMER_UNIQUE|TIMER_STOPPABLE)
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/proc/donk_cool()
+/obj/item/food/snacks/warmdonkpocket/proc/donk_cool()
name = "cold Donk-pocket"
desc = "The food of choice for the seasoned traitor. This one is cold."
warm = FALSE
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/on_enter_storage(obj/item/storage/S)
+/obj/item/food/snacks/warmdonkpocket/on_enter_storage(obj/item/storage/S)
. = ..()
if(!cool_timer)
return
@@ -213,25 +213,25 @@
subtracted_time += (world.time - heated_at)
cool_timer = null
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/on_exit_storage(obj/item/storage/S)
+/obj/item/food/snacks/warmdonkpocket/on_exit_storage(obj/item/storage/S)
. = ..()
if(warm)
donk_heat()
-/obj/item/reagent_containers/food/snacks/warmdonkpocket/Post_Consume(mob/living/M)
+/obj/item/food/snacks/warmdonkpocket/Post_Consume(mob/living/M)
if(warm)
M.reagents.add_reagent("omnizine", 15)
return
M.reagents.add_reagent("weak_omnizine", 5)
-/obj/item/reagent_containers/food/snacks/warmdonkpocket_weak
+/obj/item/food/snacks/warmdonkpocket_weak
name = "lukewarm Donk-pocket"
desc = "The food of choice for the seasoned traitor. This one is lukewarm."
icon_state = "donkpocket"
filling_color = "#DEDEAB"
list_reagents = list("nutriment" = 4, "weak_omnizine" = 3)
-/obj/item/reagent_containers/food/snacks/syndidonkpocket
+/obj/item/food/snacks/syndidonkpocket
name = "Donk-pocket"
desc = "This donk-pocket is emitting a small amount of heat."
icon_state = "donkpocket"
@@ -239,7 +239,7 @@
bitesize = 100 //nom the whole thing at once.
list_reagents = list("nutriment" = 1)
-/obj/item/reagent_containers/food/snacks/syndidonkpocket/Post_Consume(mob/living/M)
+/obj/item/food/snacks/syndidonkpocket/Post_Consume(mob/living/M)
M.reagents.add_reagent("omnizine", 15)
M.reagents.add_reagent("teporone", 15)
M.reagents.add_reagent("synaptizine", 15)
@@ -252,7 +252,7 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/boiledslimecore
+/obj/item/food/snacks/boiledslimecore
name = "boiled slime core"
desc = "A boiled red thing."
icon_state = "boiledrorocore"
@@ -260,7 +260,7 @@
list_reagents = list("slimejelly" = 5)
tastes = list("jelly" = 1)
-/obj/item/reagent_containers/food/snacks/popcorn
+/obj/item/food/snacks/popcorn
name = "popcorn"
desc = "Now let's find some cinema."
icon_state = "popcorn"
@@ -271,17 +271,17 @@
list_reagents = list("nutriment" = 2)
tastes = list("popcorn" = 3, "butter" = 1)
-/obj/item/reagent_containers/food/snacks/popcorn/Initialize(mapload)
+/obj/item/food/snacks/popcorn/Initialize(mapload)
. = ..()
unpopped = rand(1,10)
-/obj/item/reagent_containers/food/snacks/popcorn/On_Consume(mob/M, mob/user)
+/obj/item/food/snacks/popcorn/On_Consume(mob/M, mob/user)
if(prob(unpopped)) //lol ...what's the point?
to_chat(user, "You bite down on an un-popped kernel!")
unpopped = max(0, unpopped-1)
..()
-/obj/item/reagent_containers/food/snacks/liquidfood
+/obj/item/food/snacks/liquidfood
name = "\improper LiquidFood ration"
desc = "A prepackaged grey slurry of all the essential nutrients for a spacefarer on the go. Should this be crunchy?"
icon_state = "liquidfood"
diff --git a/code/modules/food_and_drinks/food/foods/pasta.dm b/code/modules/food_and_drinks/food/foods/pasta.dm
index bd6be224225c..984fb60c1a8e 100644
--- a/code/modules/food_and_drinks/food/foods/pasta.dm
+++ b/code/modules/food_and_drinks/food/foods/pasta.dm
@@ -3,7 +3,7 @@
// Raw Pasta //
//////////////////////
-/obj/item/reagent_containers/food/snacks/spaghetti
+/obj/item/food/snacks/spaghetti
name = "spaghetti"
desc = "A bundle of raw spaghetti."
icon = 'icons/obj/food/pasta.dmi'
@@ -12,7 +12,7 @@
list_reagents = list("nutriment" = 1, "vitamin" = 1)
tastes = list("raw pasta" = 1)
-/obj/item/reagent_containers/food/snacks/macaroni
+/obj/item/food/snacks/macaroni
name = "macaroni twists"
desc = "These are little twists of raw macaroni."
icon = 'icons/obj/food/pasta.dmi'
@@ -26,7 +26,7 @@
// Pasta Dishes //
//////////////////////
-/obj/item/reagent_containers/food/snacks/boiledspaghetti
+/obj/item/food/snacks/boiledspaghetti
name = "boiled spaghetti"
desc = "A plain dish of noodles. This sucks."
icon = 'icons/obj/food/pasta.dmi'
@@ -36,7 +36,7 @@
list_reagents = list("nutriment" = 2, "vitamin" = 1)
tastes = list("pasta" = 1)
-/obj/item/reagent_containers/food/snacks/pastatomato
+/obj/item/food/snacks/pastatomato
name = "spaghetti"
desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!"
icon = 'icons/obj/food/pasta.dmi'
@@ -47,7 +47,7 @@
list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4)
tastes = list("pasta" = 1, "tomato" = 1)
-/obj/item/reagent_containers/food/snacks/meatballspaghetti
+/obj/item/food/snacks/meatballspaghetti
name = "spaghetti & meatballs"
desc = "Now that's a nice'a meatball!"
icon = 'icons/obj/food/pasta.dmi'
@@ -57,7 +57,7 @@
list_reagents = list("nutriment" = 8, "synaptizine" = 5, "vitamin" = 4)
tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
-/obj/item/reagent_containers/food/snacks/spesslaw
+/obj/item/food/snacks/spesslaw
name = "spesslaw"
desc = "A lawyer's favourite."
icon = 'icons/obj/food/pasta.dmi'
@@ -66,7 +66,7 @@
list_reagents = list("nutriment" = 8, "synaptizine" = 10, "vitamin" = 6)
tastes = list("pasta" = 1, "tomato" = 1, "meat" = 2)
-/obj/item/reagent_containers/food/snacks/macncheese
+/obj/item/food/snacks/macncheese
name = "mac 'n' cheese"
desc = "One of the most comforting foods in the world. Apparently."
trash = /obj/item/trash/snack_bowl
@@ -76,7 +76,7 @@
list_reagents = list("nutriment" = 5, "vitamin" = 2, "cheese" = 4)
tastes = list("pasta" = 1, "cheese" = 1, "comfort" = 1)
-/obj/item/reagent_containers/food/snacks/lasagna
+/obj/item/food/snacks/lasagna
name = "lasagna"
desc = "Tajara love to eat this, for some reason."
icon = 'icons/obj/food/pasta.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm
index 4b3e20b08808..d37e3f058435 100644
--- a/code/modules/food_and_drinks/food/foods/pizza.dm
+++ b/code/modules/food_and_drinks/food/foods/pizza.dm
@@ -3,21 +3,21 @@
// Pizzas //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sliceable/pizza
+/obj/item/food/snacks/sliceable/pizza
icon = 'icons/obj/food/pizza.dmi'
slices_num = 6
filling_color = "#BAA14C"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
// Margherita
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/margheritapizza
+/obj/item/food/snacks/sliceable/pizza/margheritapizza
name = "margherita pizza"
desc = "The golden standard of pizzas."
icon_state = "margheritapizza"
- slice_path = /obj/item/reagent_containers/food/snacks/margheritapizzaslice
+ slice_path = /obj/item/food/snacks/margheritapizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)
-/obj/item/reagent_containers/food/snacks/margheritapizzaslice
+/obj/item/food/snacks/margheritapizzaslice
name = "margherita slice"
desc = "A slice of the classic pizza."
icon = 'icons/obj/food/pizza.dmi'
@@ -26,15 +26,15 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
// Meat Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
+/obj/item/food/snacks/sliceable/pizza/meatpizza
name = "meat pizza"
desc = "A pizza with meat topping."
icon_state = "meatpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/meatpizzaslice
+ slice_path = /obj/item/food/snacks/meatpizzaslice
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
tastes = list("crust" = 1, "cheese" = 1, "meat" = 1)
-/obj/item/reagent_containers/food/snacks/meatpizzaslice
+/obj/item/food/snacks/meatpizzaslice
name = "meat pizza slice"
desc = "A slice of a meaty pizza."
icon = 'icons/obj/food/pizza.dmi'
@@ -43,15 +43,15 @@
tastes = list("crust" = 1, "cheese" = 1, "meat" = 1)
// Mushroom Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
+/obj/item/food/snacks/sliceable/pizza/mushroompizza
name = "mushroom pizza"
desc = "Very special pizza."
icon_state = "mushroompizza"
- slice_path = /obj/item/reagent_containers/food/snacks/mushroompizzaslice
+ slice_path = /obj/item/food/snacks/mushroompizzaslice
list_reagents = list("plantmatter" = 30, "vitamin" = 5)
tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/mushroompizzaslice
+/obj/item/food/snacks/mushroompizzaslice
name = "mushroom pizza slice"
desc = "Maybe it is the last slice of pizza in your life."
icon = 'icons/obj/food/pizza.dmi'
@@ -60,15 +60,15 @@
tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1)
// Vegetable Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
+/obj/item/food/snacks/sliceable/pizza/vegetablepizza
name = "vegetable pizza"
desc = "No Tomato Sapiens were harmed during the making of this pizza."
icon_state = "vegetablepizza"
- slice_path = /obj/item/reagent_containers/food/snacks/vegetablepizzaslice
+ slice_path = /obj/item/food/snacks/vegetablepizzaslice
list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/vegetablepizzaslice
+/obj/item/food/snacks/vegetablepizzaslice
name = "vegetable pizza slice"
desc = "A slice of the most green pizza of all pizzas not containing green ingredients."
icon = 'icons/obj/food/pizza.dmi'
@@ -77,15 +77,15 @@
tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1)
// Hawaiian Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza
+/obj/item/food/snacks/sliceable/pizza/hawaiianpizza
name = "hawaiian pizza"
desc = "Love it or hate it, this pizza divides opinions. Complete with juicy pineapple."
icon_state = "hawaiianpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice
+ slice_path = /obj/item/food/snacks/hawaiianpizzaslice
list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5)
tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1)
-/obj/item/reagent_containers/food/snacks/hawaiianpizzaslice
+/obj/item/food/snacks/hawaiianpizzaslice
name = "hawaiian pizza slice"
desc = "A slice of polarising pizza."
icon = 'icons/obj/food/pizza.dmi'
@@ -94,16 +94,16 @@
tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1)
// Mac 'n' Cheese Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
+/obj/item/food/snacks/sliceable/pizza/macpizza
name = "mac 'n' cheese pizza"
desc = "Gastronomists have yet to classify this dish as 'pizza'."
icon_state = "macpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/macpizzaslice
+ slice_path = /obj/item/food/snacks/macpizzaslice
list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious
filling_color = "#ffe45d"
tastes = list("crust" = 1, "cheese" = 2, "pasta" = 1)
-/obj/item/reagent_containers/food/snacks/macpizzaslice
+/obj/item/food/snacks/macpizzaslice
name = "mac 'n' cheese pizza slice"
desc = "A delicious slice of pizza topped with macaroni & cheese... wait, what the hell? Who would do this?!"
icon = 'icons/obj/food/pizza.dmi'
@@ -112,16 +112,16 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1)
// Pepperoni Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperonipizza
+/obj/item/food/snacks/sliceable/pizza/pepperonipizza
name = "pepperoni pizza"
desc = "What did the pepperoni say to the pizza?"
icon_state = "pepperonipizza"
- slice_path = /obj/item/reagent_containers/food/snacks/pepperonipizzaslice
+ slice_path = /obj/item/food/snacks/pepperonipizzaslice
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
filling_color = "#ffe45d"
tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1)
-/obj/item/reagent_containers/food/snacks/pepperonipizzaslice
+/obj/item/food/snacks/pepperonipizzaslice
name = "pepperoni pizza slice"
desc = "Nice to meat you!"
icon = 'icons/obj/food/pizza.dmi'
@@ -130,14 +130,14 @@
tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1)
// Cheese Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/cheesepizza
+/obj/item/food/snacks/sliceable/pizza/cheesepizza
name = "cheese pizza"
desc = "Cheese, bread, cheese, tomato, and cheese."
icon_state = "cheesepizza"
- slice_path = /obj/item/reagent_containers/food/snacks/cheesepizzaslice
+ slice_path = /obj/item/food/snacks/cheesepizzaslice
list_reagents = list("nutriment" = 40, "tomatojuice" = 6, "vitamin" = 5)
-/obj/item/reagent_containers/food/snacks/cheesepizzaslice
+/obj/item/food/snacks/cheesepizzaslice
name = "cheese pizza slice"
desc = "Dangerously cheesy?"
icon = 'icons/obj/food/pizza.dmi'
@@ -146,15 +146,15 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 3)
// Donk-pocket Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/donkpocketpizza
+/obj/item/food/snacks/sliceable/pizza/donkpocketpizza
name = "donk-pocket pizza"
desc = "Who thought this would be a good idea?"
icon_state = "donkpocketpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/donkpocketpizzaslice
+ slice_path = /obj/item/food/snacks/donkpocketpizzaslice
list_reagents = list("nutriment" = 35, "tomatojuice" = 6, "vitamin" = 2, "weak_omnizine" = 6)
tastes = list("crust" = 1, "meat" = 1, "laziness" = 1)
-/obj/item/reagent_containers/food/snacks/donkpocketpizzaslice
+/obj/item/food/snacks/donkpocketpizzaslice
name = "donk-pocket pizza slice"
desc = "Smells like lukewarm donk-pocket."
icon = 'icons/obj/food/pizza.dmi'
@@ -163,15 +163,15 @@
tastes = list("crust" = 1, "meat" = 1, "laziness" = 1)
// Dank Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/dankpizza
+/obj/item/food/snacks/sliceable/pizza/dankpizza
name = "dank pizza"
desc = "The hippie's pizza of choice."
icon_state = "dankpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/dankpizzaslice
+ slice_path = /obj/item/food/snacks/dankpizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5, "cbd" = 6, "thc" = 6)
tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2)
-/obj/item/reagent_containers/food/snacks/dankpizzaslice
+/obj/item/food/snacks/dankpizzaslice
name = "dank pizza slice"
desc = "So good, man..."
icon = 'icons/obj/food/pizza.dmi'
@@ -180,15 +180,15 @@
tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2)
// Firecracker Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/firecrackerpizza
+/obj/item/food/snacks/sliceable/pizza/firecrackerpizza
name = "firecracker pizza"
desc = "Tastes HOT HOT HOT!"
icon_state = "firecrackerpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/firecrackerpizzaslice
+ slice_path = /obj/item/food/snacks/firecrackerpizzaslice
list_reagents = list("nutriment" = 30, "vitamin" = 5, "capsaicin" = 12)
tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1)
-/obj/item/reagent_containers/food/snacks/firecrackerpizzaslice
+/obj/item/food/snacks/firecrackerpizzaslice
name = "firecracker pizza slice"
desc = "A spicy slice of something quite nice"
icon = 'icons/obj/food/pizza.dmi'
@@ -197,15 +197,15 @@
tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1)
// "Pesto" Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/pestopizza
+/obj/item/food/snacks/sliceable/pizza/pestopizza
name = "\"pesto\" pizza"
desc = "Wait a second...this doesn't taste like pesto!"
icon_state = "pestopizza"
- slice_path = /obj/item/reagent_containers/food/snacks/pestopizzaslice
+ slice_path = /obj/item/food/snacks/pestopizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 12, "vitamin" = 5, "wasabi" = 12)
tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1)
-/obj/item/reagent_containers/food/snacks/pestopizzaslice
+/obj/item/food/snacks/pestopizzaslice
name = "\"pesto\" pizza slice"
desc = "Delicious and suspicious(ly green)."
icon = 'icons/obj/food/pizza.dmi'
@@ -214,15 +214,15 @@
tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1)
// Garlic Pizza
-/obj/item/reagent_containers/food/snacks/sliceable/pizza/garlicpizza
+/obj/item/food/snacks/sliceable/pizza/garlicpizza
name = "garlic pizza"
desc = "Ahh, garlic. A universally loved ingredient, except possibly by vampires."
icon_state = "garlicpizza"
- slice_path = /obj/item/reagent_containers/food/snacks/garlicpizzaslice
+ slice_path = /obj/item/food/snacks/garlicpizzaslice
list_reagents = list("plantmatter" = 30, "vitamin" = 5, "garlic" = 12)
tastes = list("crust" = 1, "cheese" = 1, "garlic" = 1)
-/obj/item/reagent_containers/food/snacks/garlicpizzaslice
+/obj/item/food/snacks/garlicpizzaslice
name = "garlic pizza slice"
desc = "What's not to love?"
icon = 'icons/obj/food/pizza.dmi'
@@ -243,7 +243,7 @@
var/open = FALSE // Is the box open?
var/is_messy = FALSE // Fancy mess on the lid
- var/obj/item/reagent_containers/food/snacks/sliceable/pizza/pizza // Content pizza
+ var/obj/item/food/snacks/sliceable/pizza/pizza // Content pizza
var/list/boxes = list() // If the boxes are stacked, they come here
var/box_tag = ""
@@ -322,7 +322,7 @@
..()
if(length(boxes) || !Adjacent(user))
return
- open = !open
+ open = !open
update_appearance(UPDATE_DESC|UPDATE_ICON)
/obj/item/pizzabox/attack_self(mob/user)
@@ -356,7 +356,7 @@
to_chat(user, "Close [box] first!")
return
- if(istype(I, /obj/item/reagent_containers/food/snacks/sliceable/pizza/)) // Long ass fucking object name
+ if(istype(I, /obj/item/food/snacks/sliceable/pizza)) // Long ass fucking object name
if(open)
user.drop_item()
I.loc = src
@@ -372,7 +372,9 @@
if(is_pen(I))
if(open)
return
- var/t = clean_input("Enter what you want to set the tag to:", "Write", null)
+ var/t = tgui_input_text(usr, "Enter what you want to set the tag to:", "Write")
+ if(!t)
+ return
var/obj/item/pizzabox/boxtotagto = src
if(boxes.len > 0)
boxtotagto = boxes[boxes.len]
@@ -383,42 +385,42 @@
/obj/item/pizzabox/margherita/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/margheritapizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/margheritapizza(src)
box_tag = "margherita deluxe"
. = ..()
/obj/item/pizzabox/vegetable/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/vegetablepizza(src)
box_tag = "gourmet vegetable"
. = ..()
/obj/item/pizzabox/mushroom/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/mushroompizza(src)
box_tag = "mushroom special"
. = ..()
/obj/item/pizzabox/meat/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/meatpizza(src)
box_tag = "meatlover's supreme"
. = ..()
/obj/item/pizzabox/hawaiian/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/hawaiianpizza(src)
box_tag = "Hawaiian feast"
. = ..()
/obj/item/pizzabox/pepperoni/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperonipizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/pepperonipizza(src)
box_tag = "classic pepperoni"
. = ..()
/obj/item/pizzabox/garlic/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/garlicpizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/garlicpizza(src)
box_tag = "triple garlic"
. = ..()
/obj/item/pizzabox/firecracker/Initialize(mapload)
- pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/firecrackerpizza(src)
+ pizza = new /obj/item/food/snacks/sliceable/pizza/firecrackerpizza(src)
box_tag = "extra spicy pie"
. = ..()
@@ -458,14 +460,16 @@
desc = "It seems inactive."
icon_state = "pizzabox_bomb"
timer_set = TRUE
- timer = (input(user, "Set a timer, from one second to ten seconds.", "Timer", "[timer]") as num) SECONDS
+ var/new_timer = tgui_input_number(user, "Set a timer, from one second to ten seconds.", "Timer", timer / 10, 10, 1)
+ if(!new_timer)
+ return
if(!in_range(src, user) || issilicon(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || user.restrained())
timer_set = FALSE
name = "pizza box"
desc = "A box suited for pizzas."
icon_state = "pizzabox1"
return
- timer = clamp(timer, 1 SECONDS, 10 SECONDS)
+ timer = new_timer SECONDS
icon_state = "pizzabox1"
to_chat(user, "You set the timer to [timer / 10] before activating the payload and closing [src].")
message_admins("[key_name_admin(usr)] has set a timer on a pizza bomb to [timer/10] seconds at (JMP).")
@@ -515,8 +519,8 @@
/obj/item/pizzabox/pizza_bomb/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/wirecutters) && primed)
to_chat(user, "Oh God, what wire do you cut?!")
- var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires
- if(!in_range(src, user) || issilicon(usr) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || user.restrained())
+ var/chosen_wire = tgui_input_list(user, "OH GOD OH GOD", "WHAT WIRE?!", wires)
+ if(!in_range(src, user) || issilicon(usr) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || user.restrained() || !chosen_wire)
return
playsound(src, I.usesound, 50, 1, 1)
user.visible_message("[user] cuts the [chosen_wire] wire!", "You cut the [chosen_wire] wire!")
diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm
index e912b6fbafca..05d584229845 100644
--- a/code/modules/food_and_drinks/food/foods/sandwiches.dm
+++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm
@@ -5,13 +5,13 @@
// Abstract object used for inheritance. Should never spawn. Needed to not break recipes that use plain burgers; recipes that use "burger" would accept any burger and transfer reagents otherwise.
-/obj/item/reagent_containers/food/snacks/burger
+/obj/item/food/snacks/burger
name = "burger"
desc = "If you got this, something broke! Contact a coder if this somehow spawns."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "burger"
-/obj/item/reagent_containers/food/snacks/burger/plain
+/obj/item/food/snacks/burger/plain
name = "burger"
desc = "The cornerstone of every nutritious breakfast."
icon_state = "hburger"
@@ -20,7 +20,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "meat" = 1)
-/obj/item/reagent_containers/food/snacks/burger/brain
+/obj/item/food/snacks/burger/brain
name = "brainburger"
desc = "A strange looking burger. It appears almost sentient."
icon_state = "brainburger"
@@ -29,7 +29,7 @@
list_reagents = list("nutriment" = 6, "prions" = 10, "vitamin" = 1)
tastes = list("bun" = 4, "brains" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ghost
+/obj/item/food/snacks/burger/ghost
name = "ghost burger"
desc = "Spooky! It doesn't look very filling."
icon_state = "ghostburger"
@@ -38,12 +38,12 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "ectoplasm" = 2)
-/obj/item/reagent_containers/food/snacks/human
+/obj/item/food/snacks/human
var/hname = ""
var/job = null
filling_color = "#D63C3C"
-/obj/item/reagent_containers/food/snacks/human/burger
+/obj/item/food/snacks/human/burger
name = "-burger"
desc = "A bloody burger."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -52,7 +52,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "tender meat" = 2)
-/obj/item/reagent_containers/food/snacks/burger/cheese
+/obj/item/food/snacks/burger/cheese
name = "cheeseburger"
desc = "The cheese adds a good flavor."
icon_state = "cheeseburger"
@@ -60,7 +60,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "meat" = 1, "cheese" = 1)
-/obj/item/reagent_containers/food/snacks/burger/tofu
+/obj/item/food/snacks/burger/tofu
name = "tofu burger"
desc = "Making this should probably be a criminal offense."
icon_state = "tofuburger"
@@ -69,7 +69,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "tofu" = 4)
-/obj/item/reagent_containers/food/snacks/burger/hamborger
+/obj/item/food/snacks/burger/hamborger
name = "hamborger"
desc = "Looking at this makes your flesh feel like a weakness."
icon_state = "roburger"
@@ -78,11 +78,11 @@
list_reagents = list("nutriment" = 6, "nanomachines" = 10, "vitamin" = 1)
tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
-/obj/item/reagent_containers/food/snacks/burger/hamborger/Initialize(mapload)
+/obj/item/food/snacks/burger/hamborger/Initialize(mapload)
. = ..()
message_admins("A [name] has been created at [ADMIN_COORDJMP(src)].")
-/obj/item/reagent_containers/food/snacks/burger/xeno
+/obj/item/food/snacks/burger/xeno
name = "xenoburger"
desc = "Smells caustic and tastes like heresy."
icon_state = "xburger"
@@ -91,7 +91,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "acid" = 4)
-/obj/item/reagent_containers/food/snacks/burger/clown
+/obj/item/food/snacks/burger/clown
name = "clown burger"
desc = "This tastes funny..."
icon_state = "clownburger"
@@ -100,7 +100,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "banana" = 1, "magic" = 2)
-/obj/item/reagent_containers/food/snacks/burger/mime
+/obj/item/food/snacks/burger/mime
name = "mime burger"
desc = "Its taste defies language."
icon_state = "mimeburger"
@@ -109,7 +109,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "silence" = 2)
-/obj/item/reagent_containers/food/snacks/burger/baseball
+/obj/item/food/snacks/burger/baseball
name = "home run baseball burger"
desc = "It's still warm. Batter up!"
icon_state = "baseball"
@@ -118,7 +118,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "a homerun" = 3)
-/obj/item/reagent_containers/food/snacks/burger/spell
+/obj/item/food/snacks/burger/spell
name = "spell burger"
desc = "This is absolutely Ei Nath."
icon_state = "spellburger"
@@ -127,7 +127,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "magic" = 2)
-/obj/item/reagent_containers/food/snacks/burger/bigbite
+/obj/item/food/snacks/burger/bigbite
name = "BigBite burger"
desc = "Forget the Big Mac, THIS is the future!"
icon_state = "bigbiteburger"
@@ -136,7 +136,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2)
tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10)
-/obj/item/reagent_containers/food/snacks/burger/superbite
+/obj/item/food/snacks/burger/superbite
name = "SuperBite burger"
desc = "This is a mountain of a burger. FOOD!"
icon_state = "superbiteburger"
@@ -145,7 +145,7 @@
list_reagents = list("nutriment" = 40, "vitamin" = 5)
tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10)
-/obj/item/reagent_containers/food/snacks/burger/crazy
+/obj/item/food/snacks/burger/crazy
name = "crazy hamburger"
desc = "This looks like the sort of food that a demented clown in a trenchcoat would make."
icon_state = "crazyburger"
@@ -154,7 +154,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 2, "capsaicin" = 3, "condensedcapsaicin" = 2)
tastes = list("bun" = 2, "meat" = 4, "cheese" = 2, "beef soaked in chili" = 3, "a smoking flare" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/white
+/obj/item/food/snacks/burger/ppatty/white
name = "white pretty patty"
desc = "Delicious titanium!"
icon_state = "ppatty-mime"
@@ -163,7 +163,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "white" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/red
+/obj/item/food/snacks/burger/ppatty/red
name = "red pretty patty"
desc = "Perfect for hiding the fact that it's burnt to a crisp."
icon_state = "ppatty-red"
@@ -172,7 +172,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "red" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/orange
+/obj/item/food/snacks/burger/ppatty/orange
name = "orange pretty patty"
desc = "Contains 0% juice."
icon_state = "ppatty-orange"
@@ -181,7 +181,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "orange" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/yellow
+/obj/item/food/snacks/burger/ppatty/yellow
name = "yellow pretty patty"
desc = "Bright to the last bite."
icon_state = "ppatty-yellow"
@@ -190,7 +190,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "yellow" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/green
+/obj/item/food/snacks/burger/ppatty/green
name = "green pretty patty"
desc = "It's not tainted meat, it's painted meat!"
icon_state = "ppatty-green"
@@ -199,7 +199,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "green" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/blue
+/obj/item/food/snacks/burger/ppatty/blue
name = "blue pretty patty"
desc = "Is this blue rare?"
icon_state = "ppatty-blue"
@@ -208,7 +208,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "blue" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/purple
+/obj/item/food/snacks/burger/ppatty/purple
name = "purple pretty patty"
desc = "Regal and low class at the same time."
icon_state = "ppatty-purple"
@@ -217,7 +217,7 @@
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "purple" = 2)
-/obj/item/reagent_containers/food/snacks/burger/ppatty/rainbow
+/obj/item/food/snacks/burger/ppatty/rainbow
name = "rainbow pretty patty"
desc = "Taste the rainbow, eat the rainbow."
icon_state = "ppatty-rainbow"
@@ -226,7 +226,7 @@
list_reagents = list("nutriment" = 14, "protein" = 5, "omnizine" = 10)
tastes = list("bun" = 2, "meat" = 2, "rainbow" = 5)
-/obj/item/reagent_containers/food/snacks/burger/elec
+/obj/item/food/snacks/burger/elec
name = "empowered burger"
desc = "It's shockingly good, if you live off of electricity that is."
icon_state = "empoweredburger"
@@ -235,7 +235,7 @@
list_reagents = list("nutriment" = 5, "protein" = 1, "plasma" = 2)
tastes = list("bun" = 2, "pure electricity" = 5)
-/obj/item/reagent_containers/food/snacks/burger/rat
+/obj/item/food/snacks/burger/rat
name = "mouse burger"
desc = "Pretty much what you'd expect..."
icon_state = "ratburger"
@@ -244,7 +244,7 @@
list_reagents = list("nutriment" = 5, "protein" = 1)
tastes = list("bun" = 2, "dead rat" = 5)
-/obj/item/reagent_containers/food/snacks/burger/appendix
+/obj/item/food/snacks/burger/appendix
name = "appendix burger"
desc = "Tastes like appendicitis."
icon_state = "appendixburger"
@@ -253,7 +253,7 @@
list_reagents = list("nutriment" = 2, "protein" = 6, "vitamin" = 6)
tastes = list("bun" = 1, "grass" = 1)
-/obj/item/reagent_containers/food/snacks/burger/bacon
+/obj/item/food/snacks/burger/bacon
name = "bacon burger"
desc = "The perfect combination of all things American."
icon_state = "baconburger"
@@ -263,7 +263,7 @@
tastes = list("bun" = 1, "bacon" = 1)
-/obj/item/reagent_containers/food/snacks/burger/bearger
+/obj/item/food/snacks/burger/bearger
name = "bearger"
desc = "Best served rawr."
icon_state = "bearger"
@@ -272,7 +272,7 @@
list_reagents = list("nutriment" = 3, "protein" = 6, "vitamin" = 2)
tastes = list("bun" = 1, "meat" = 1, "salmon" = 1)
-/obj/item/reagent_containers/food/snacks/burger/fivealarm
+/obj/item/food/snacks/burger/fivealarm
name = "five alarm burger"
desc = "HOT! HOT!"
icon_state = "fivealarmburger"
@@ -281,7 +281,7 @@
list_reagents = list("nutriment" = 4, "protein" = 6, "condensedcapsaicin" = 5, "capsaicin" = 5)
tastes = list("bun" = 1, "extreme heat" = 1)
-/obj/item/reagent_containers/food/snacks/burger/mcguffin
+/obj/item/food/snacks/burger/mcguffin
name = "mcGuffin"
desc = "A cheap and greasy imitation of an eggs benedict."
icon_state = "mcguffin"
@@ -290,7 +290,7 @@
list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 1)
tastes = list("muffin" = 1, "bacon" = 1)
-/obj/item/reagent_containers/food/snacks/burger/mcrib
+/obj/item/food/snacks/burger/mcrib
name = "mcRib"
desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it."
icon_state = "mcrib"
@@ -299,7 +299,7 @@
list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 4, "bbqsauce" = 1)
tastes = list("bun" = 1, "pork" = 1, "patty" = 1)
-/obj/item/reagent_containers/food/snacks/burger/jelly
+/obj/item/food/snacks/burger/jelly
name = "jelly burger"
desc = "Culinary delight...?"
icon_state = "jellyburger"
@@ -307,10 +307,10 @@
bitesize = 3
tastes = list("bun" = 4, "jelly" = 2)
-/obj/item/reagent_containers/food/snacks/burger/jelly/slime
+/obj/item/food/snacks/burger/jelly/slime
list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1)
-/obj/item/reagent_containers/food/snacks/burger/jelly/cherry
+/obj/item/food/snacks/burger/jelly/cherry
list_reagents = list("nutriment" = 6, "cherryjelly" = 5, "vitamin" = 1)
@@ -318,7 +318,7 @@
// Sandwiches //
//////////////////////
-/obj/item/reagent_containers/food/snacks/sandwich
+/obj/item/food/snacks/sandwich
name = "sandwich"
desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -327,7 +327,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
-/obj/item/reagent_containers/food/snacks/toastedsandwich
+/obj/item/food/snacks/toastedsandwich
name = "toasted sandwich"
desc = "Now if you only had a pepper bar."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -336,7 +336,7 @@
list_reagents = list("nutriment" = 6, "carbon" = 2)
tastes = list("toast" = 1)
-/obj/item/reagent_containers/food/snacks/grilledcheese
+/obj/item/food/snacks/grilledcheese
name = "grilled cheese sandwich"
desc = "Goes great with tomato soup!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -345,7 +345,7 @@
list_reagents = list("nutriment" = 7, "vitamin" = 1) //why make a regualr sandwhich when you can make grilled cheese, with this nutriment value?
tastes = list("toast" = 1, "grilled cheese" = 1)
-/obj/item/reagent_containers/food/snacks/jellysandwich
+/obj/item/food/snacks/jellysandwich
name = "jelly sandwich"
desc = "You wish you had some peanut butter to go with this..."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -354,13 +354,13 @@
bitesize = 3
tastes = list("toast" = 1, "jelly" = 1)
-/obj/item/reagent_containers/food/snacks/jellysandwich/slime
+/obj/item/food/snacks/jellysandwich/slime
list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2)
-/obj/item/reagent_containers/food/snacks/jellysandwich/cherry
+/obj/item/food/snacks/jellysandwich/cherry
list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2)
-/obj/item/reagent_containers/food/snacks/notasandwich
+/obj/item/food/snacks/notasandwich
name = "not-a-sandwich"
desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -368,7 +368,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 6)
tastes = list("nothing suspicious" = 1)
-/obj/item/reagent_containers/food/snacks/wrap
+/obj/item/food/snacks/wrap
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
icon = 'icons/obj/food/food.dmi'
@@ -376,7 +376,7 @@
list_reagents = list("nutriment" = 5)
tastes = list("egg" = 1)
-/obj/item/reagent_containers/food/snacks/blt
+/obj/item/food/snacks/blt
name = "\improper BLT"
desc = "A classic bacon, lettuce, and tomato sandwich."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -386,7 +386,7 @@
list_reagents = list("nutriment" = 5, "protein" = 2)
tastes = list("bacon" = 3, "lettuce" = 2, "tomato" = 2, "bread" = 2)
-/obj/item/reagent_containers/food/snacks/peanut_butter_jelly
+/obj/item/food/snacks/peanut_butter_jelly
name = "peanut butter and jelly sandwich"
desc = "A classic PB&J sandwich, just like your mom used to make."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -395,13 +395,13 @@
bitesize = 2
tastes = list("peanut butter" = 3, "jelly" = 3, "bread" = 2)
-/obj/item/reagent_containers/food/snacks/peanut_butter_jelly/slime
+/obj/item/food/snacks/peanut_butter_jelly/slime
list_reagents = list("peanutbutter" = 2, "slimejelly" = 5, "nutriment" = 5, "protein" = 2)
-/obj/item/reagent_containers/food/snacks/peanut_butter_jelly/cherry
+/obj/item/food/snacks/peanut_butter_jelly/cherry
list_reagents = list("peanutbutter" = 2, "cherryjelly" = 5, "nutriment" = 5, "protein" = 2)
-/obj/item/reagent_containers/food/snacks/philly_cheesesteak
+/obj/item/food/snacks/philly_cheesesteak
name = "Philly cheesesteak"
desc = "A popular sandwich made of sliced meat, onions, melted cheese in a long hoagie roll. Mouthwatering doesn't even begin to describe it."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -411,7 +411,7 @@
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("steak" = 3, "melted cheese" = 3, "onions" = 2, "bread" = 2)
-/obj/item/reagent_containers/food/snacks/peanut_butter_banana
+/obj/item/food/snacks/peanut_butter_banana
name = "peanut butter and banana sandwich"
desc = "A peanut butter sandwich with banana slices mixed in, a good high protein treat."
icon = 'icons/obj/food/burgerbread.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/seafood.dm b/code/modules/food_and_drinks/food/foods/seafood.dm
index 72114a5d5549..629886de6b54 100644
--- a/code/modules/food_and_drinks/food/foods/seafood.dm
+++ b/code/modules/food_and_drinks/food/foods/seafood.dm
@@ -1,5 +1,5 @@
-/obj/item/reagent_containers/food/snacks/carpmeat
+/obj/item/food/snacks/carpmeat
name = "carp fillet"
desc = "A fillet of spess carp meat."
icon = 'icons/obj/food/seafood.dmi'
@@ -11,7 +11,7 @@
ingredient_name = "fillet of meat"
ingredient_name_plural = "fillets of meat"
-/obj/item/reagent_containers/food/snacks/salmonmeat
+/obj/item/food/snacks/salmonmeat
name = "raw salmon"
desc = "A fillet of raw salmon."
icon = 'icons/obj/food/seafood.dmi'
@@ -21,7 +21,7 @@
list_reagents = list("protein" = 3, "vitamin" = 2)
tastes = list("raw salmon" = 1)
-/obj/item/reagent_containers/food/snacks/salmonsteak
+/obj/item/food/snacks/salmonsteak
name = "salmon steak"
desc = "A fillet of freshly-grilled salmon meat."
icon = 'icons/obj/food/seafood.dmi'
@@ -32,7 +32,7 @@
list_reagents = list("nutriment" = 4, "vitamin" = 2)
tastes = list("cooked salmon" = 1)
-/obj/item/reagent_containers/food/snacks/catfishmeat
+/obj/item/food/snacks/catfishmeat
name = "raw catfish"
desc = "A fillet of raw catfish."
icon = 'icons/obj/food/seafood.dmi'
@@ -42,7 +42,7 @@
list_reagents = list("protein" = 3, "vitamin" = 2)
tastes = list("catfish" = 1)
-/obj/item/reagent_containers/food/snacks/fishfingers
+/obj/item/food/snacks/fishfingers
name = "fish fingers"
desc = "A finger of fish."
icon = 'icons/obj/food/seafood.dmi'
@@ -52,7 +52,7 @@
list_reagents = list("nutriment" = 4)
tastes = list("fish" = 1, "bread" = 1)
-/obj/item/reagent_containers/food/snacks/fishburger
+/obj/item/food/snacks/fishburger
name = "Fillet-O-Carp sandwich"
desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp."
icon = 'icons/obj/food/seafood.dmi'
@@ -62,7 +62,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "fish" = 4)
-/obj/item/reagent_containers/food/snacks/cubancarp
+/obj/item/food/snacks/cubancarp
name = "cuban carp"
desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
icon = 'icons/obj/food/seafood.dmi'
@@ -73,7 +73,7 @@
list_reagents = list("nutriment" = 6, "capsaicin" = 1)
tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
-/obj/item/reagent_containers/food/snacks/fishandchips
+/obj/item/food/snacks/fishandchips
name = "fish and chips"
desc = "I do say so myself old chap. Indubitably!"
icon = 'icons/obj/food/seafood.dmi'
@@ -83,7 +83,7 @@
list_reagents = list("nutriment" = 6)
tastes = list("fish" = 1, "chips" = 1)
-/obj/item/reagent_containers/food/snacks/sashimi
+/obj/item/food/snacks/sashimi
name = "carp sashimi"
desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
icon = 'icons/obj/food/seafood.dmi'
@@ -92,7 +92,7 @@
list_reagents = list("nutriment" = 6, "capsaicin" = 5)
tastes = list("raw carp" = 1, "hot peppers" = 1)
-/obj/item/reagent_containers/food/snacks/fried_shrimp
+/obj/item/food/snacks/fried_shrimp
name = "fried shrimp"
desc = "Just one of the many things you can do with shrimp!"
icon = 'icons/obj/food/seafood.dmi'
@@ -101,7 +101,7 @@
list_reagents = list("nutriment" = 2)
tastes = list("shrimp" = 1, "bread crumbs" = 1)
-/obj/item/reagent_containers/food/snacks/boiled_shrimp
+/obj/item/food/snacks/boiled_shrimp
name = "boiled shrimp"
desc = "Just one of the many things you can do with shrimp!"
icon = 'icons/obj/food/seafood.dmi'
@@ -110,7 +110,7 @@
list_reagents = list("nutriment" = 2)
tastes = list("shrimp" = 1)
-/obj/item/reagent_containers/food/snacks/shrimp_skewer
+/obj/item/food/snacks/shrimp_skewer
name = "shrimp skewer"
desc = "Four shrimp lightly grilled on a skewer. Yummy!"
trash = /obj/item/stack/rods
@@ -120,7 +120,7 @@
list_reagents = list("nutriment" = 8)
tastes = list("shrimp" = 4)
-/obj/item/reagent_containers/food/snacks/fish_skewer
+/obj/item/food/snacks/fish_skewer
name = "fish skewer"
desc = "A whole fish battered and grilled on a skewer. Hope you're hungry!"
trash = /obj/item/stack/rods
@@ -130,18 +130,18 @@
list_reagents = list("protein" = 6, "vitamin" = 4)
tastes = list("shrimp" = 1, "batter" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
+/obj/item/food/snacks/sliceable/Ebi_maki
name = "ebi maki roll"
desc = "A large unsliced roll of Ebi Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Ebi_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Ebi
+ slice_path = /obj/item/food/snacks/sushi_Ebi
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Ebi
+/obj/item/food/snacks/sushi_Ebi
name = "ebi sushi"
desc = "A simple sushi consisting of cooked shrimp and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -150,18 +150,18 @@
list_reagents = list("nutriment" = 2)
tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
+/obj/item/food/snacks/sliceable/Ikura_maki
name = "ikura maki roll"
desc = "A large unsliced roll of Ikura Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Ikura_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Ikura
+ slice_path = /obj/item/food/snacks/sushi_Ikura
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Ikura
+/obj/item/food/snacks/sushi_Ikura
name = "ikura sushi"
desc = "A simple sushi consisting of salmon roe."
icon = 'icons/obj/food/seafood.dmi'
@@ -170,18 +170,18 @@
list_reagents = list("nutriment" = 2, "protein" = 1)
tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
+/obj/item/food/snacks/sliceable/Sake_maki
name = "sake maki roll"
desc = "A large unsliced roll of Sake Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Sake_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Sake
+ slice_path = /obj/item/food/snacks/sushi_Sake
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Sake
+/obj/item/food/snacks/sushi_Sake
name = "sake sushi"
desc = "A simple sushi consisting of raw salmon and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -190,18 +190,18 @@
list_reagents = list("nutriment" = 2)
tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
+/obj/item/food/snacks/sliceable/SmokedSalmon_maki
name = "smoked salmon maki roll"
desc = "A large unsliced roll of Smoked Salmon Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "SmokedSalmon_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
+ slice_path = /obj/item/food/snacks/sushi_SmokedSalmon
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
+/obj/item/food/snacks/sushi_SmokedSalmon
name = "smoked salmon sushi"
desc = "A simple sushi consisting of cooked salmon and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -210,18 +210,18 @@
list_reagents = list("nutriment" = 2)
tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Tamago_maki
+/obj/item/food/snacks/sliceable/Tamago_maki
name = "tamago maki roll"
desc = "A large unsliced roll of Tamago Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tamago_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tamago
+ slice_path = /obj/item/food/snacks/sushi_Tamago
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Tamago
+/obj/item/food/snacks/sushi_Tamago
name = "tamago sushi"
desc = "A simple sushi consisting of egg and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -230,18 +230,18 @@
list_reagents = list("nutriment" = 2)
tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
+/obj/item/food/snacks/sliceable/Inari_maki
name = "inari maki roll"
desc = "A large unsliced roll of Inari Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Inari_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Inari
+ slice_path = /obj/item/food/snacks/sushi_Inari
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Inari
+/obj/item/food/snacks/sushi_Inari
name = "inari sushi"
desc = "A piece of fried tofu stuffed with rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -250,18 +250,18 @@
list_reagents = list("nutriment" = 2)
tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
+/obj/item/food/snacks/sliceable/Masago_maki
name = "masago maki roll"
desc = "A large unsliced roll of Masago Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Masago_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Masago
+ slice_path = /obj/item/food/snacks/sushi_Masago
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Masago
+/obj/item/food/snacks/sushi_Masago
name = "masago sushi"
desc = "A simple sushi consisting of goldfish roe."
icon = 'icons/obj/food/seafood.dmi'
@@ -270,18 +270,18 @@
list_reagents = list("nutriment" = 2, "protein" = 1)
tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
+/obj/item/food/snacks/sliceable/Tobiko_maki
name = "tobiko maki roll"
desc = "A large unsliced roll of Tobkio Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tobiko_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
+ slice_path = /obj/item/food/snacks/sushi_Tobiko
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Tobiko
+/obj/item/food/snacks/sushi_Tobiko
name = "tobiko sushi"
desc = "A simple sushi consisting of shark roe."
icon = 'icons/obj/food/seafood.dmi'
@@ -290,18 +290,18 @@
list_reagents = list("nutriment" = 2, "protein" = 1)
tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
+/obj/item/food/snacks/sliceable/TobikoEgg_maki
name = "tobiko and egg maki roll"
desc = "A large unsliced roll of Tobkio and Egg Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "TobikoEgg_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
+ slice_path = /obj/item/food/snacks/sushi_TobikoEgg
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
+/obj/item/food/snacks/sushi_TobikoEgg
name = "tobiko and egg sushi"
desc = "A sushi consisting of shark roe and an egg."
icon = 'icons/obj/food/seafood.dmi'
@@ -310,18 +310,18 @@
list_reagents = list("nutriment" = 2, "protein" = 1)
tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
+/obj/item/food/snacks/sliceable/Tai_maki
name = "tai maki roll"
desc = "A large unsliced roll of Tai Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tai_maki"
- slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tai
+ slice_path = /obj/item/food/snacks/sushi_Tai
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Tai
+/obj/item/food/snacks/sushi_Tai
name = "tai sushi"
desc = "A simple sushi consisting of catfish and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -330,7 +330,7 @@
list_reagents = list("nutriment" = 2)
tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1)
-/obj/item/reagent_containers/food/snacks/sushi_Unagi
+/obj/item/food/snacks/sushi_Unagi
name = "unagi sushi"
desc = "A simple sushi consisting of eel and rice."
icon = 'icons/obj/food/seafood.dmi'
diff --git a/code/modules/food_and_drinks/food/foods/side_dishes.dm b/code/modules/food_and_drinks/food/foods/side_dishes.dm
index ec73c20f8123..fbfdf0394622 100644
--- a/code/modules/food_and_drinks/food/foods/side_dishes.dm
+++ b/code/modules/food_and_drinks/food/foods/side_dishes.dm
@@ -3,7 +3,7 @@
// Raw //
//////////////////////
-/obj/item/reagent_containers/food/snacks/rawsticks
+/obj/item/food/snacks/rawsticks
name = "raw potato sticks"
desc = "Raw fries, not very tasty."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -16,7 +16,7 @@
// Fried //
//////////////////////
-/obj/item/reagent_containers/food/snacks/fries
+/obj/item/food/snacks/fries
name = "space fries"
desc = "AKA: French Fries, Freedom Fries, etc."
icon_state = "fries"
@@ -25,7 +25,7 @@
list_reagents = list("nutriment" = 4)
tastes = list("fries" = 3, "salt" = 1)
-/obj/item/reagent_containers/food/snacks/cheesyfries
+/obj/item/food/snacks/cheesyfries
name = "cheesy fries"
desc = "Fries. Covered in cheese. Duh."
icon_state = "cheesyfries"
@@ -34,7 +34,7 @@
list_reagents = list("nutriment" = 6)
tastes = list("fries" = 3, "cheese" = 1)
-/obj/item/reagent_containers/food/snacks/tatortot
+/obj/item/food/snacks/tatortot
name = "tator tot"
desc = "A large fried potato nugget that may or may not try to valid you."
icon_state = "tatortot"
@@ -42,7 +42,7 @@
filling_color = "FFD700"
tastes = list("fried potato" = 3, "valids" = 1)
-/obj/item/reagent_containers/food/snacks/onionrings
+/obj/item/food/snacks/onionrings
name = "onion rings"
desc = "Onion slices coated in batter."
icon_state = "onionrings"
@@ -51,7 +51,7 @@
gender = PLURAL
tastes = list("onion" = 3, "batter" = 1)
-/obj/item/reagent_containers/food/snacks/carrotfries
+/obj/item/food/snacks/carrotfries
name = "carrot fries"
desc = "Tasty fries from fresh carrots."
icon_state = "carrotfries"
@@ -65,14 +65,14 @@
// Misc //
//////////////////////
-/obj/item/reagent_containers/food/snacks/beans
+/obj/item/food/snacks/beans
name = "tin of beans"
desc = "Musical fruit in a slightly less musical container."
icon_state = "beans"
list_reagents = list("nutriment" = 10, "beans" = 10, "vitamin" = 3)
tastes = list("beans" = 1)
-/obj/item/reagent_containers/food/snacks/mashed_potatoes //mashed taters
+/obj/item/food/snacks/mashed_potatoes //mashed taters
name = "mashed potatoes"
desc = "Some soft, creamy, and irresistible mashed potatoes."
icon_state = "mashedtaters"
@@ -81,7 +81,7 @@
list_reagents = list("nutriment" = 5, "gravy" = 5, "mashedpotatoes" = 10, "vitamin" = 2)
tastes = list("mashed potato" = 3, "gravy" = 1)
-/obj/item/reagent_containers/food/snacks/stuffing
+/obj/item/food/snacks/stuffing
name = "stuffing"
desc = "Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in!"
icon_state = "stuffing"
@@ -89,7 +89,7 @@
list_reagents = list("nutriment" = 3)
tastes = list("bread crumbs" = 1, "herbs" = 1)
-/obj/item/reagent_containers/food/snacks/loadedbakedpotato
+/obj/item/food/snacks/loadedbakedpotato
name = "loaded baked potato"
desc = "Totally baked."
icon_state = "loadedbakedpotato"
@@ -97,7 +97,7 @@
list_reagents = list("nutriment" = 6)
tastes = list("potato" = 1, "cheese" = 1, "herbs" = 1)
-/obj/item/reagent_containers/food/snacks/boiledrice
+/obj/item/food/snacks/boiledrice
name = "boiled rice"
desc = "A boring dish of boring rice."
icon_state = "boiledrice"
@@ -107,7 +107,7 @@
tastes = list("rice" = 1)
-/obj/item/reagent_containers/food/snacks/roastparsnip
+/obj/item/food/snacks/roastparsnip
name = "roast parsnip"
desc = "Sweet and crunchy."
icon_state = "roastparsnip"
diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm
index efe2cc630fe2..d60b10a0d6e8 100644
--- a/code/modules/food_and_drinks/food/foods/soups.dm
+++ b/code/modules/food_and_drinks/food/foods/soups.dm
@@ -4,7 +4,7 @@
//////////////////////
// Base object for soups, should never appear ingame.
-/obj/item/reagent_containers/food/snacks/soup
+/obj/item/food/snacks/soup
name = "impossible soup"
desc = "This soup is so good, it shouldn't even exist!"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -13,7 +13,7 @@
trash = /obj/item/trash/snack_bowl
bitesize = 5
-/obj/item/reagent_containers/food/snacks/soup/meatballsoup
+/obj/item/food/snacks/soup/meatballsoup
name = "meatball soup"
desc = "You've got balls kid, BALLS!"
icon_state = "meatballsoup"
@@ -21,7 +21,7 @@
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
tastes = list("meatball" = 1)
-/obj/item/reagent_containers/food/snacks/soup/slimesoup
+/obj/item/food/snacks/soup/slimesoup
name = "slime soup"
desc = "If no water is available, you may substitute tears."
icon_state = "slimesoup"
@@ -29,7 +29,7 @@
list_reagents = list("nutriment" = 5, "slimejelly" = 5, "water" = 5, "vitamin" = 4)
tastes = list("slime" = 1)
-/obj/item/reagent_containers/food/snacks/soup/bloodsoup
+/obj/item/food/snacks/soup/bloodsoup
name = "tomato soup"
desc = "Smells like copper."
icon_state = "tomatosoup"
@@ -37,7 +37,7 @@
list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 4)
tastes = list("iron" = 1)
-/obj/item/reagent_containers/food/snacks/soup/clownstears
+/obj/item/food/snacks/soup/clownstears
name = "clown's tears"
desc = "Not very funny."
icon_state = "clownstears"
@@ -45,7 +45,7 @@
list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 5, "vitamin" = 8)
tastes = list("a bad joke" = 1)
-/obj/item/reagent_containers/food/snacks/soup/vegetablesoup
+/obj/item/food/snacks/soup/vegetablesoup
name = "vegetable soup"
desc = "A true vegan meal." //TODO
icon_state = "vegetablesoup"
@@ -53,7 +53,7 @@
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
tastes = list("vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/soup/nettlesoup
+/obj/item/food/snacks/soup/nettlesoup
name = "nettle soup"
desc = "To think, the botanist would've beaten you to death with one of these."
icon_state = "nettlesoup"
@@ -61,7 +61,7 @@
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
tastes = list("nettles" = 1)
-/obj/item/reagent_containers/food/snacks/soup/mysterysoup
+/obj/item/food/snacks/soup/mysterysoup
name = "mystery soup"
desc = "The mystery is, why aren't you eating it?"
icon_state = "mysterysoup"
@@ -69,12 +69,12 @@
list_reagents = list("nutriment" = 6)
tastes = list("chaos" = 1)
-/obj/item/reagent_containers/food/snacks/soup/mysterysoup/Initialize(mapload)
+/obj/item/food/snacks/soup/mysterysoup/Initialize(mapload)
. = ..()
extra_reagent = pick("capsaicin", "frostoil", "omnizine", "banana", "blood", "slimejelly", "toxin", "banana", "carbon", "oculine")
reagents.add_reagent("[extra_reagent]", 5)
-/obj/item/reagent_containers/food/snacks/soup/wishsoup
+/obj/item/food/snacks/soup/wishsoup
name = "wish soup"
desc = "I wish this was soup."
icon_state = "wishsoup"
@@ -82,14 +82,14 @@
list_reagents = list("water" = 10)
tastes = list("wishes" = 1)
-/obj/item/reagent_containers/food/snacks/soup/wishsoup/Initialize(mapload)
+/obj/item/food/snacks/soup/wishsoup/Initialize(mapload)
. = ..()
if(prob(25))
desc = "A wish come true!" // hue
reagents.add_reagent("nutriment", 9)
reagents.add_reagent("vitamin", 1)
-/obj/item/reagent_containers/food/snacks/soup/tomatosoup
+/obj/item/food/snacks/soup/tomatosoup
name = "tomato soup"
desc = "Drinking this feels like being a vampire! A tomato vampire..."
icon_state = "tomatosoup"
@@ -97,14 +97,14 @@
list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3)
tastes = list("tomato" = 1)
-/obj/item/reagent_containers/food/snacks/soup/misosoup
+/obj/item/food/snacks/soup/misosoup
name = "miso soup"
desc = "The universe's best soup! Yum!!!"
icon_state = "misosoup"
list_reagents = list("nutriment" = 7, "vitamin" = 2)
tastes = list("miso" = 1)
-/obj/item/reagent_containers/food/snacks/soup/mushroomsoup
+/obj/item/food/snacks/soup/mushroomsoup
name = "chantrelle soup"
desc = "A delicious and hearty mushroom soup."
icon_state = "mushroomsoup"
@@ -112,7 +112,7 @@
list_reagents = list("nutriment" = 8, "vitamin" = 4)
tastes = list("mushroom" = 1)
-/obj/item/reagent_containers/food/snacks/soup/beetsoup
+/obj/item/food/snacks/soup/beetsoup
name = "beet soup"
desc = "Wait, how do you spell it again..?"
icon_state = "beetsoup"
@@ -120,11 +120,11 @@
list_reagents = list("nutriment" = 7, "vitamin" = 2)
tastes = list("beet" = 1)
-/obj/item/reagent_containers/food/snacks/soup/beetsoup/Initialize(mapload)
+/obj/item/food/snacks/soup/beetsoup/Initialize(mapload)
. = ..()
name = pick("borsch", "bortsch", "borstch", "borsh", "borshch", "borscht")
-/obj/item/reagent_containers/food/snacks/soup/eyesoup
+/obj/item/food/snacks/soup/eyesoup
name = "eyeball soup"
desc = "It looks back at you..."
icon_state = "eyeballsoup"
@@ -132,63 +132,63 @@
list_reagents = list("nutriment" = 7, "protein" = 2)
tastes = list("squirming" = 2, "tomato" = 2)
-/obj/item/reagent_containers/food/snacks/soup/sweetpotatosoup
+/obj/item/food/snacks/soup/sweetpotatosoup
name = "sweet potato soup"
desc = "Delicious sweet potato in soup form."
icon_state = "sweetpotatosoup"
list_reagents = list("nutriment" = 5)
tastes = list("sweet potato" = 1)
-/obj/item/reagent_containers/food/snacks/soup/redbeetsoup
+/obj/item/food/snacks/soup/redbeetsoup
name = "red beet soup"
desc = "Quite a delicacy."
icon_state = "redbeetsoup"
list_reagents = list("nutriment" = 5)
tastes = list("red beet" = 1)
-/obj/item/reagent_containers/food/snacks/soup/frenchonionsoup
+/obj/item/food/snacks/soup/frenchonionsoup
name = "french onion soup"
desc = "Good enough to make a grown mime cry."
icon_state = "onionsoup"
list_reagents = list("nutriment" = 8)
tastes = list("caramelized onions" = 3, "cheese" = 1)
-/obj/item/reagent_containers/food/snacks/soup/zurek
+/obj/item/food/snacks/soup/zurek
name = "zurek"
desc = "A traditional Polish soup composed of vegetables, meat, and an egg. Goes great with bread."
icon_state = "zurek"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("creamy vegetables" = 3, "sausage" = 2)
-/obj/item/reagent_containers/food/snacks/soup/cullenskink
+/obj/item/food/snacks/soup/cullenskink
name = "cullen skink"
desc = "A thick Scottish soup made of smoked fish, potatoes and onions."
icon_state = "cullen_skink"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("creamy broth" = 2, "fish" = 2, "vegetables" = 2)
-/obj/item/reagent_containers/food/snacks/soup/chicken_noodle_soup
+/obj/item/food/snacks/soup/chicken_noodle_soup
name = "chicken noodle soup"
desc = "A hearty bowl of chicken noodle soup, perfect for when you're stuck at home and sick."
icon_state = "chicken_noodle_soup"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("broth" = 1, "chicken" = 1, "carrots" = 1, "noodles" = 1)
-/obj/item/reagent_containers/food/snacks/soup/cornchowder
+/obj/item/food/snacks/soup/cornchowder
name = "corn chowder"
desc = "A creamy bowl of corn chowder, with bacon bits and mixed vegetables. One bowl is never enough."
icon_state = "corn_chowder"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("creamy broth" = 1, "bacon" = 1, "mixed vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/soup/meatball_noodles
+/obj/item/food/snacks/soup/meatball_noodles
name = "meatball noodle soup"
desc = "A hearty noodle soup made from meatballs and pasta in a rich broth. Commonly topped with a handful of chopped nuts."
icon_state = "meatball_noodles"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("bone broth" = 1, "meat" = 1, "gnocchi" = 1, "peanuts" = 1)
-/obj/item/reagent_containers/food/snacks/soup/seedsoup
+/obj/item/food/snacks/soup/seedsoup
name = "Misklmæsch" //miskl = seed, mæsch = soup
desc = "A seed based soup, made by germinating seeds and then boiling them. \
Produces a particularly bitter broth which is usually balanced by the addition of vinegar."
@@ -200,7 +200,7 @@
// Stews //
//////////////////////
-/obj/item/reagent_containers/food/snacks/soup/stew
+/obj/item/food/snacks/soup/stew
name = "stew"
desc = "A nice and warm stew. Healthy and strong."
icon_state = "stew"
@@ -209,7 +209,7 @@
list_reagents = list("nutriment" = 10, "oculine" = 5, "tomatojuice" = 5, "vitamin" = 5)
tastes = list("tomato" = 1, "carrot" = 1)
-/obj/item/reagent_containers/food/snacks/stewedsoymeat
+/obj/item/food/snacks/stewedsoymeat
name = "stewed soy meat"
desc = "Even non-vegetarians will LOVE this!"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -218,28 +218,28 @@
list_reagents = list("nutriment" = 8)
tastes = list("soy" = 1, "vegetables" = 1)
-/obj/item/reagent_containers/food/snacks/soup/beanstew
+/obj/item/food/snacks/soup/beanstew
name = "Prickeldröndolhaskl" //prickeld = spicy, röndol = bean, haskl = stew
desc = "A spicy bean stew with lots of veggies, commonly served aboard the fleet as a filling and satisfying meal with rice or bread."
icon_state = "moth_bean_stew"
list_reagents = list("nutriment" = 10)
tastes = list("beans" = 1, "cabbage" = 1, "spicy sauce" = 1)
-/obj/item/reagent_containers/food/snacks/soup/oatstew
+/obj/item/food/snacks/soup/oatstew
name = "Häfmisklhaskl" //häfmiskl = oat (häf from German hafer meaning oat, miskl meaning seed), haskl = stew
desc = "A spicy bean stew with lots of veggies, commonly served aboard the fleet as a filling and satisfying meal with rice or bread."
icon_state = "moth_oat_stew"
list_reagents = list("nutriment" = 10)
tastes = list("oats" = 1, "sweet potato" = 1, "carrot" = 1, "pumpkin" = 1, "parsnip" = 1)
-/obj/item/reagent_containers/food/snacks/soup/hong_kong_borscht
+/obj/item/food/snacks/soup/hong_kong_borscht
name = "hong kong borscht"
desc = "Also known as luo song tang or Russian soup, this dish bears little to no resemblance to Eastern European borscht- indeed, it's a tomato-based soup with no beets in sight."
icon_state = "hong_kong_borscht"
list_reagents = list("nutriment" = 10, "protein" = 2)
tastes = list("tomato" = 1, "cabbage" = 1, "meat" = 1)
-/obj/item/reagent_containers/food/snacks/soup/hong_kong_macaroni
+/obj/item/food/snacks/soup/hong_kong_macaroni
name = "hong kong macaroni"
desc = "A favourite from Hong Kong's Cha Chaan Tengs, this macaroni soup came to Mars with Cantonese settlers under Cybersun Industries, and has become as much of a breakfast staple there as it is in its homeland."
icon_state = "hong_kong_macaroni"
@@ -250,7 +250,7 @@
// Chili //
//////////////////////
-/obj/item/reagent_containers/food/snacks/soup/hotchili
+/obj/item/food/snacks/soup/hotchili
name = "hot chili"
desc = "A five alarm Texan Chili!"
icon_state = "hotchili"
@@ -258,7 +258,7 @@
list_reagents = list("nutriment" = 5, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2)
tastes = list("hot peppers" = 1, "tomato" = 1)
-/obj/item/reagent_containers/food/snacks/soup/coldchili
+/obj/item/food/snacks/soup/coldchili
name = "cold chili"
desc = "This slush is barely a liquid!"
icon_state = "coldchili"
@@ -266,7 +266,7 @@
list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2)
tastes = list("tomato" = 1, "mint" = 1)
-/obj/item/reagent_containers/food/snacks/soup/clownchili
+/obj/item/food/snacks/soup/clownchili
name = "chili con carnival"
desc = "A delicious stew of meat, chiles, and salty, salty clown tears."
icon_state = "clownchili"
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index db1d85d77ed3..52d69b2eaa84 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -1,6 +1,6 @@
#define MAX_WEIGHT_CLASS WEIGHT_CLASS_SMALL
//Food items that are eaten normally and don't leave anything behind.
-/obj/item/reagent_containers/food/snacks
+/obj/item/food/snacks
name = "snack"
desc = "yummy"
icon = 'icons/obj/food/food.dmi'
@@ -16,8 +16,8 @@
var/total_w_class = 0 //for the total weight an item of food can carry
var/list/tastes // for example list("crisps" = 2, "salt" = 1)
-/obj/item/reagent_containers/food/snacks/add_initial_reagents()
- if(tastes && tastes.len)
+/obj/item/food/snacks/add_initial_reagents()
+ if(tastes && length(tastes))
if(list_reagents)
for(var/rid in list_reagents)
var/amount = list_reagents[rid]
@@ -29,13 +29,13 @@
..()
//Placeholder for effect that trigger on eating that aren't tied to reagents.
-/obj/item/reagent_containers/food/snacks/proc/On_Consume(mob/M, mob/user)
+/obj/item/food/snacks/proc/On_Consume(mob/M, mob/user)
if(!user)
return
if(!reagents.total_volume)
if(M == user)
- to_chat(user, "You finish eating \the [src].")
- user.visible_message("[M] finishes eating \the [src].")
+ to_chat(user, "You finish eating [src].")
+ user.visible_message("[M] finishes eating [src].")
user.unEquip(src) //so icons update :[
Post_Consume(M)
var/obj/item/trash_item = generate_trash(usr)
@@ -43,13 +43,15 @@
qdel(src)
return
-/obj/item/reagent_containers/food/snacks/proc/Post_Consume(mob/living/M)
+/obj/item/food/snacks/proc/Post_Consume(mob/living/M)
return
-/obj/item/reagent_containers/food/snacks/attack_self(mob/user)
+/obj/item/food/snacks/attack_self(mob/user)
return
-/obj/item/reagent_containers/food/snacks/attack(mob/M, mob/user, def_zone)
+/obj/item/food/snacks/attack(mob/M, mob/user, def_zone)
+ if(user.a_intent == INTENT_HARM && force)
+ return ..()
if(reagents && !reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it.
to_chat(user, "None of [src] left, oh no!")
M.unEquip(src) //so icons update :[
@@ -64,10 +66,10 @@
return TRUE
return FALSE
-/obj/item/reagent_containers/food/snacks/afterattack(obj/target, mob/user, proximity)
+/obj/item/food/snacks/afterattack(obj/target, mob/user, proximity)
return
-/obj/item/reagent_containers/food/snacks/examine(mob/user)
+/obj/item/food/snacks/examine(mob/user)
. = ..()
if(in_range(user, src))
if(bitecount > 0)
@@ -79,7 +81,7 @@
. += "[src] was bitten multiple times!"
-/obj/item/reagent_containers/food/snacks/attackby(obj/item/W, mob/user, params)
+/obj/item/food/snacks/attackby(obj/item/W, mob/user, params)
if(is_pen(W))
rename_interactive(user, W, use_prefix = FALSE, prompt = "What would you like to name this dish?")
return
@@ -105,7 +107,7 @@
I.color = filling_color
U.overlays += I
- var/obj/item/reagent_containers/food/snacks/collected = new type
+ var/obj/item/food/snacks/collected = new type
collected.name = name
collected.loc = U
collected.reagents.remove_any(collected.reagents.total_volume)
@@ -126,7 +128,7 @@
else
return ..()
-/obj/item/reagent_containers/food/snacks/proc/generate_trash(atom/location)
+/obj/item/food/snacks/proc/generate_trash(atom/location)
if(trash)
if(ispath(trash, /obj/item))
. = new trash(location)
@@ -139,13 +141,13 @@
trash = null
return
-/obj/item/reagent_containers/food/snacks/Destroy()
+/obj/item/food/snacks/Destroy()
if(contents)
for(var/atom/movable/something in contents)
something.loc = get_turf(src)
return ..()
-/obj/item/reagent_containers/food/snacks/attack_animal(mob/M)
+/obj/item/food/snacks/attack_animal(mob/M)
if(isanimal(M))
M.changeNext_move(CLICK_CD_MELEE)
if(isdog(M))
@@ -173,11 +175,11 @@
N.adjustHealth(-2)
N.taste(reagents)
-/obj/item/reagent_containers/food/snacks/sliceable/examine(mob/user)
+/obj/item/food/snacks/sliceable/examine(mob/user)
. = ..()
. += "Alt-click to put something small inside."
-/obj/item/reagent_containers/food/snacks/sliceable/AltClick(mob/user)
+/obj/item/food/snacks/sliceable/AltClick(mob/user)
var/obj/item/I = user.get_active_hand()
if(!I)
return
@@ -199,7 +201,7 @@
add_fingerprint(user)
I.forceMove(src)
-/obj/item/reagent_containers/food/snacks/sliceable/attackby(obj/item/I, mob/user, params)
+/obj/item/food/snacks/sliceable/attackby(obj/item/I, mob/user, params)
if((slices_num <= 0 || !slices_num) || !slice_path)
return FALSE
@@ -259,25 +261,14 @@
// bitesize of 2, then it'll take 3 bites to eat. Unlike the old system, the contained reagents are evenly spread among all
// the bites. No more contained reagents = no more bites.
-//Here is an example of the new formatting for anyone who wants to add more food items.
-///obj/item/reagent_containers/food/snacks/xenoburger //Identification path for the object.
-// name = "Xenoburger" //Name that displays in the UI.
-// desc = "Smells caustic. Tastes like heresy." //Duh
-// icon_state = "xburger" //Refers to an icon in food/food.dmi
-// New() //Don't mess with this.
-// ..() //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.
-// bitesize = 3 //This is the amount each bite consumes.
-
-/obj/item/reagent_containers/food/snacks/badrecipe
+/obj/item/food/snacks/badrecipe
name = "burned mess"
desc = "Someone should be demoted from chef for this."
icon_state = "badrecipe"
filling_color = "#211F02"
list_reagents = list("????" = 30)
-/obj/item/reagent_containers/food/snacks/badrecipe/Initialize(mapload)
+/obj/item/food/snacks/badrecipe/Initialize(mapload)
. = ..()
// it's burned! it should start off being classed as any cooktype that burns
cooktype["grilled"] = TRUE
@@ -285,14 +276,14 @@
// MISC
-/obj/item/reagent_containers/food/snacks/cereal
+/obj/item/food/snacks/cereal
name = "box of cereal"
desc = "A box of cereal."
icon = 'icons/obj/food/food.dmi'
icon_state = "cereal_box"
list_reagents = list("nutriment" = 3)
-/obj/item/reagent_containers/food/snacks/deepfryholder
+/obj/item/food/snacks/deepfryholder
name = "Deep Fried Foods Holder Obj"
desc = "If you can see this description the code for the deep fryer fucked up."
icon = 'icons/obj/food/food.dmi'
diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm
index 51bca61fe51c..64facc6b031f 100644
--- a/code/modules/food_and_drinks/food_base.dm
+++ b/code/modules/food_and_drinks/food_base.dm
@@ -1,19 +1,18 @@
////////////////////////////////////////////////////////////////////////////////
/// Food.
////////////////////////////////////////////////////////////////////////////////
-/obj/item/reagent_containers/food
- possible_transfer_amounts = null
- visible_transfer_rate = FALSE
- volume = 50
- /// Used by sandwiches
- var/filling_color = "#FFFFFF"
- /// Used by junk food to lower satiety
- var/junkiness = 0
+
+/obj/item/food
+ resistance_flags = FLAMMABLE
+ container_type = INJECTABLE
+ w_class = WEIGHT_CLASS_TINY
+ var/filling_color = "#FFFFFF" //Used by sandwiches.
+ var/junkiness = 0 //for junk food. used to lower human satiety.
var/bitesize = 2
var/consume_sound = 'sound/items/eatfood.ogg'
- /// Will ants infest it?
+ /// Will ants come near it?
var/antable = TRUE
- /// Location checked every 5 minutes. If its the same place, the food has a chance to spawn ants
+ /// location checked every 5 minutes. If its the same place, the food has a chance to spawn ants
var/ant_location
/// Things that suppress food from being infested by ants when on the same turf
var/static/list/ant_suppressors
@@ -22,11 +21,21 @@
/// Name of the food to show up in kitchen machines (microwaves, ovens, etc)
var/ingredient_name
var/ingredient_name_plural
- resistance_flags = FLAMMABLE
- container_type = INJECTABLE
+ /// Sets the default container amount for all food items.
+ var/volume = 50
+ /// The list of reagents to create on Initialize()
+ var/list/list_reagents = list()
-/obj/item/reagent_containers/food/Initialize(mapload)
+ var/temperature_min = 0 // To limit the temperature of a reagent container can attain when exposed to heat/cold
+ var/temperature_max = 10000
+
+/obj/item/food/Initialize(mapload)
. = ..()
+
+ if(!reagents) // Some subtypes create their own reagents
+ create_reagents(volume, temperature_min, temperature_max)
+ add_initial_reagents()
+
if(!antable)
return
@@ -40,19 +49,23 @@
ant_location = get_turf(src)
last_ant_time = world.time
-/obj/item/reagent_containers/food/Destroy()
+/obj/item/food/Destroy()
ant_location = null
if(isprocessing)
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/reagent_containers/food/process()
+/obj/item/food/proc/add_initial_reagents() // This literally is only a proc for junk food
+ if(list_reagents)
+ reagents.add_reagent_list(list_reagents)
+
+/obj/item/food/process()
if(!antable)
return PROCESS_KILL
if(world.time > last_ant_time + 5 MINUTES)
check_for_ants()
-/obj/item/reagent_containers/food/proc/check_for_ants()
+/obj/item/food/proc/check_for_ants()
last_ant_time = world.time
// Are we unshielded from the fury of space ants?
@@ -77,3 +90,10 @@
antable = FALSE
desc += " It appears to be infested with ants. Yuck!"
reagents.add_reagent("ants", 1) // Don't eat things with ants in it you weirdo.
+
+/obj/item/food/ex_act()
+ if(reagents)
+ for(var/datum/reagent/R in reagents.reagent_list)
+ R.on_ex_act()
+ if(!QDELETED(src))
+ ..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/cereal_maker.dm b/code/modules/food_and_drinks/kitchen_machinery/cereal_maker.dm
index 59fe4b78bcdb..a0d534809432 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/cereal_maker.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/cereal_maker.dm
@@ -19,6 +19,6 @@
setme.desc = "[name.desc] It has been [thiscooktype]"
/obj/machinery/cooker/cerealmaker/gettype()
- var/obj/item/reagent_containers/food/snacks/cereal/type = new(get_turf(src))
+ var/obj/item/food/snacks/cereal/type = new(get_turf(src))
return type
diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
index e6b9d5dadc0f..6ea19108e8b8 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
@@ -34,13 +34,13 @@
return ..()
// checks if the snack has been cooked in a certain way
-/obj/machinery/cooker/proc/checkCooked(obj/item/reagent_containers/food/snacks/D)
+/obj/machinery/cooker/proc/checkCooked(obj/item/food/snacks/D)
if(D.cooktype[thiscooktype])
return 1
return 0
// Sets the new snack's cooktype list to the same as the old one - no more cooking something in the same machine more than once!
-/obj/machinery/cooker/proc/setCooked(obj/item/reagent_containers/food/snacks/oldtypes, obj/item/reagent_containers/food/snacks/newtypes)
+/obj/machinery/cooker/proc/setCooked(obj/item/food/snacks/oldtypes, obj/item/food/snacks/newtypes)
var/ct
for(ct in oldtypes.cooktype)
newtypes.cooktype[ct] = oldtypes.cooktype[ct]
@@ -115,7 +115,7 @@
return FALSE
if(has_specials && checkSpecials(check))
return TRUE
- if(istype(check, /obj/item/reagent_containers/food/snacks) || emagged)
+ if(istype(check, /obj/item/food/snacks) || emagged)
if(istype(check, /obj/item/disk/nuclear)) //(1984 voice) you will not deep fry the NAD
to_chat(user, "The disk is more useful raw than [thiscooktype].")
return FALSE
@@ -147,7 +147,7 @@
// if burns = FALSE then it'll just tell you that the item is already that foodtype and it would do nothing
// if you wanted a different side effect set burns to 1 and override burn_food()
/obj/machinery/cooker/proc/burn_food(mob/user, obj/item/reagent_containers/props)
- var/obj/item/reagent_containers/food/snacks/badrecipe/burnt = new(get_turf(src))
+ var/obj/item/food/snacks/badrecipe/burnt = new(get_turf(src))
setRegents(props, burnt)
soundloop.stop()
to_chat(user, "You smell burning coming from [src]!")
@@ -177,7 +177,7 @@
// Override this with the correct snack type
/obj/machinery/cooker/proc/gettype()
- var/obj/item/reagent_containers/food/snacks/type = new(get_turf(src))
+ var/obj/item/food/snacks/type = new(get_turf(src))
return type
/obj/machinery/cooker/attackby(obj/item/I, mob/user, params)
@@ -197,7 +197,7 @@
if(!checkValid(I, user))
return
if(!burns)
- if(istype(I, /obj/item/reagent_containers/food/snacks))
+ if(istype(I, /obj/item/food/snacks))
if(checkCooked(I))
to_chat(user, "That is already [thiscooktype], it would do nothing!")
return
@@ -226,17 +226,17 @@
cookSpecial(special) //Handle cooking the item as appropriate
turnoff(I) //Shut off the machine and qdel the original item
return
- if(istype(I, /obj/item/reagent_containers/food/snacks))
+ if(istype(I, /obj/item/food/snacks))
if(checkCooked(I))
burn_food(user, I)
turnoff(I)
return
- var/obj/item/reagent_containers/food/snacks/newfood = gettype()
+ var/obj/item/food/snacks/newfood = gettype()
setIcon(I, newfood)
changename(I, newfood)
if(istype(I, /obj/item/reagent_containers))
setRegents(I, newfood)
- if(istype(I, /obj/item/reagent_containers/food/snacks))
+ if(istype(I, /obj/item/food/snacks))
setCooked(I, newfood)
newfood.cooktype[thiscooktype] = TRUE
turnoff(I)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index ea92ab36e5ee..5bf7ef4f8317 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -40,11 +40,11 @@
cooktime = (200 - (E * 20)) //Effectively each laser improves cooktime by 20 per rating beyond the first (200 base, 80 max upgrade)
/obj/machinery/cooker/deepfryer/gettype()
- var/obj/item/reagent_containers/food/snacks/deepfryholder/type = new(get_turf(src))
+ var/obj/item/food/snacks/deepfryholder/type = new(get_turf(src))
return type
/obj/machinery/cooker/deepfryer/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks/ice))
+ if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks/ice))
var/ice_amount = I.reagents.get_reagent_amount("ice")
if(ice_amount)
I.reagents.remove_all(I.reagents.total_volume)
@@ -82,7 +82,7 @@
to_chat(usr, "You short out the fryer's safeties, allowing non-food objects to be placed in the oil.")
playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
emagged = TRUE
- return
+ return TRUE
/obj/machinery/cooker/deepfryer/special_attack_shove(mob/living/target, mob/living/attacker)
target.visible_message(
@@ -156,44 +156,44 @@
return istype(I, input)
/datum/deepfryer_special/shrimp
- input = /obj/item/reagent_containers/food/snacks/shrimp
- output = /obj/item/reagent_containers/food/snacks/fried_shrimp
+ input = /obj/item/food/snacks/shrimp
+ output = /obj/item/food/snacks/fried_shrimp
/datum/deepfryer_special/banana
- input = /obj/item/reagent_containers/food/snacks/grown/banana
- output = /obj/item/reagent_containers/food/snacks/friedbanana
+ input = /obj/item/food/snacks/grown/banana
+ output = /obj/item/food/snacks/friedbanana
/datum/deepfryer_special/fries
- input = /obj/item/reagent_containers/food/snacks/rawsticks
- output = /obj/item/reagent_containers/food/snacks/fries
+ input = /obj/item/food/snacks/rawsticks
+ output = /obj/item/food/snacks/fries
/datum/deepfryer_special/corn_chips
- input = /obj/item/reagent_containers/food/snacks/grown/corn
- output = /obj/item/reagent_containers/food/snacks/cornchips
+ input = /obj/item/food/snacks/grown/corn
+ output = /obj/item/food/snacks/cornchips
/datum/deepfryer_special/fried_tofu
- input = /obj/item/reagent_containers/food/snacks/tofu
- output = /obj/item/reagent_containers/food/snacks/fried_tofu
+ input = /obj/item/food/snacks/tofu
+ output = /obj/item/food/snacks/fried_tofu
/datum/deepfryer_special/chimichanga
- input = /obj/item/reagent_containers/food/snacks/burrito
- output = /obj/item/reagent_containers/food/snacks/chimichanga
+ input = /obj/item/food/snacks/burrito
+ output = /obj/item/food/snacks/chimichanga
/datum/deepfryer_special/potato_chips
- input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges
- output = /obj/item/reagent_containers/food/snacks/chips
+ input = /obj/item/food/snacks/grown/potato/wedges
+ output = /obj/item/food/snacks/chips
/datum/deepfryer_special/carrotfries
- input = /obj/item/reagent_containers/food/snacks/grown/carrot/wedges
- output = /obj/item/reagent_containers/food/snacks/carrotfries
+ input = /obj/item/food/snacks/grown/carrot/wedges
+ output = /obj/item/food/snacks/carrotfries
/datum/deepfryer_special/onionrings
- input = /obj/item/reagent_containers/food/snacks/onion_slice
- output = /obj/item/reagent_containers/food/snacks/onionrings
+ input = /obj/item/food/snacks/onion_slice
+ output = /obj/item/food/snacks/onionrings
/datum/deepfryer_special/fried_vox
input = /obj/item/organ/external
- output = /obj/item/reagent_containers/food/snacks/fried_vox
+ output = /obj/item/food/snacks/fried_vox
/datum/deepfryer_special/fried_vox/validate(obj/item/I)
if(!..())
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 515af3acb849..ae1de2d18b09 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -157,6 +157,7 @@
user.visible_message("[user] stuffs [victim] into [src]!")
else
return
+ QDEL_LIST_CONTENTS(victim.grabbed_by)
victim.forceMove(src)
occupant = victim
@@ -191,45 +192,28 @@
return
locked = TRUE //lock gibber
+ occupant.dir = SOUTH
- var/image/gibberoverlay = new //used to simulate 3D effects
- gibberoverlay.icon = icon
- gibberoverlay.icon_state = "grinder_overlay"
- gibberoverlay.overlays += image('icons/obj/kitchen.dmi', "grinder_idle")
- icon_state = "grinder_on"
-
- var/image/feedee = new
- occupant.dir = 2
- feedee.icon = getFlatIcon(occupant, 2) //makes the image a copy of the occupant
-
- var/atom/movable/holder = new //holder for occupant image
- holder.name = null //make unclickable
- holder.overlays += feedee //add occupant to holder overlays
- holder.pixel_y = 25 //above the gibber
- holder.loc = get_turf(src)
- holder.layer = MOB_LAYER //simulate mob-like layering
- holder.anchored = TRUE
-
- var/atom/movable/holder2 = new //holder for gibber overlay, used to simulate 3D effect
- holder2.name = null
- holder2.overlays += gibberoverlay
- holder2.loc = get_turf(src)
- holder2.layer = MOB_LAYER + 0.1 //3D, it's above the mob, rest of the gibber is behind
- holder2.anchored = TRUE
-
- animate(holder, pixel_y = 16, time = animation_delay) //animate going down
-
+ var/image/victim = image(icon = getFlatIcon(occupant, SOUTH), loc = src, layer = MOB_LAYER, pixel_y = 25) // Copies the look of the victim and places them above the gibber, can't grab the exact icon because it needs to be considered as static to mask the feet later on
+ var/image/grinder_overlay = image(icon = 'icons/obj/kitchen.dmi', loc = src, icon_state = "grinder_overlay")
+ if(dirty)
+ grinder_overlay.overlays += image(icon = 'icons/obj/kitchen.dmi', icon_state = "grinder_bloody")
+ /// Here's the part where I do something silly
+ var/list/gibber_viewers = list()
+ for(var/mob/viewer as anything in viewers(src))
+ gibber_viewers += viewer.client
+ for(var/client/viewer in gibber_viewers)
+ viewer.images += victim
+ flick_overlay(grinder_overlay, gibber_viewers, animation_delay * 2)
+ animate(victim, pixel_y = 16, time = animation_delay)
sleep(animation_delay)
-
- holder.overlays -= feedee //reset static icon
- feedee.icon += icon('icons/obj/kitchen.dmi', "footicon") //this is some byond magic; += to the icon var with a black and white image will mask it
- holder.overlays += feedee
- animate(holder, pixel_y = -3, time = animation_delay) //animate going down further
-
- sleep(animation_delay) //time everything right, animate doesn't prevent proc from continuing
-
- qdel(holder) //get rid of holder object
- qdel(holder2) //get rid of holder object
+ victim.icon += icon('icons/obj/kitchen.dmi', "footicon") //this is some byond magic; += to the icon var with a black and white image will mask it
+ animate(victim, pixel_y = -3, time = animation_delay) // Animate going down further
+ sleep(animation_delay)
+ for(var/client/viewer in gibber_viewers)
+ viewer.images -= victim
+ qdel(victim)
+ qdel(grinder_overlay)
locked = FALSE //unlock
dirty = TRUE //dirty gibber
@@ -259,13 +243,13 @@
var/slab_name = occupant.name
var/slab_count = 3
- var/slab_type = /obj/item/reagent_containers/food/snacks/meat/human //gibber can only gib humans on paracode, no need to check meat type
+ var/slab_type = /obj/item/food/snacks/meat/human //gibber can only gib humans on paracode, no need to check meat type
var/slab_nutrition = occupant.nutrition / 15
slab_nutrition /= slab_count
for(var/i=1 to slab_count)
- var/obj/item/reagent_containers/food/snacks/meat/new_meat = new slab_type(src)
+ var/obj/item/food/snacks/meat/new_meat = new slab_type(src)
new_meat.name = "[slab_name] [new_meat.name]"
new_meat.reagents.add_reagent("nutriment", slab_nutrition)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
index f28d4f13e509..437e0658e614 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
@@ -40,7 +40,7 @@
to_chat(user, "You add [I] to [src]")
updateUsrDialog()
return
- if(istype(I, /obj/item/reagent_containers/food/snacks/frozen/icecream))
+ if(istype(I, /obj/item/food/snacks/frozen/icecream))
if(!I.reagents.has_reagent("sprinkles"))
if(I.reagents.total_volume > 29)
I.reagents.remove_any(1)
@@ -147,7 +147,7 @@
else if(href_list["createchoco"])
var/name = generate_name(reagents.get_master_reagent_name())
name += " Chocolate Cone"
- var/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcup/C = new(loc)
+ var/obj/item/food/snacks/frozen/icecream/icecreamcup/C = new(loc)
C.name = "[name]"
C.pixel_x = rand(-8, 8)
C.pixel_y = -16
@@ -159,7 +159,7 @@
else if(href_list["createcone"])
var/name = generate_name(reagents.get_master_reagent_name())
name += " Cone"
- var/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone/C = new(loc)
+ var/obj/item/food/snacks/frozen/icecream/icecreamcone/C = new(loc)
C.name = "[name]"
C.pixel_x = rand(-8, 8)
C.pixel_y = -16
@@ -171,7 +171,7 @@
else if(href_list["createwaffle"])
var/name = generate_name(reagents.get_master_reagent_name())
name += " Waffle Cone"
- var/obj/item/reagent_containers/food/snacks/frozen/icecream/wafflecone/C = new(loc)
+ var/obj/item/food/snacks/frozen/icecream/wafflecone/C = new(loc)
C.name = "[name]"
C.pixel_x = rand(-8, 8)
C.pixel_y = -16
diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
index fc4a4fe78592..8db5fa8e3199 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
@@ -65,7 +65,7 @@
GLOB.cooking_reagents[recipe_type] |= reagent
else
qdel(recipe)
- GLOB.cooking_ingredients[recipe_type] |= /obj/item/reagent_containers/food/snacks/grown
+ GLOB.cooking_ingredients[recipe_type] |= /obj/item/food/snacks/grown
/*******************
* Item Adding
@@ -108,7 +108,7 @@
add_item(S, user)
else
add_item(O, user)
- else if(is_type_in_list(O, list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/drinks, /obj/item/reagent_containers/food/condiment)))
+ else if(is_type_in_list(O, list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/drinks, /obj/item/reagent_containers/condiment)))
if(!O.reagents)
return TRUE
for(var/datum/reagent/R in O.reagents.reagent_list)
@@ -199,8 +199,8 @@
var/list/name_overrides = list()
for(var/obj/O in contents)
var/display_name = O.name
- if(istype(O, /obj/item/reagent_containers/food))
- var/obj/item/reagent_containers/food/food = O
+ if(isfood(O))
+ var/obj/item/food/food = O
if(!items_counts[display_name])
if(food.ingredient_name)
name_overrides[display_name] = food.ingredient_name
@@ -364,7 +364,7 @@
/obj/machinery/kitchen_machine/proc/has_extra_item()
for(var/obj/O in contents)
- if(!is_type_in_list(O, list(/obj/item/reagent_containers/food, /obj/item/grown, /obj/item/mixing_bowl)))
+ if(!is_type_in_list(O, list(/obj/item/food, /obj/item/grown, /obj/item/mixing_bowl)))
return TRUE
return FALSE
@@ -416,7 +416,7 @@
amount += reagents.total_volume
reagents.clear_reagents()
if(amount)
- var/obj/item/reagent_containers/food/snacks/badrecipe/mysteryfood = new(src)
+ var/obj/item/food/snacks/badrecipe/mysteryfood = new(src)
mysteryfood.reagents.add_reagent("carbon", amount / 2)
mysteryfood.reagents.add_reagent("????", amount / 15)
mysteryfood.forceMove(get_turf(src))
@@ -446,10 +446,16 @@
ui_interact(user)
-/obj/machinery/kitchen_machine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/kitchen_machine/attack_ghost(mob/user)
+ ui_interact(user)
+
+/obj/machinery/kitchen_machine/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/kitchen_machine/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "KitchenMachine", name, 400, 300, master_ui, state)
+ ui = new(user, src, "KitchenMachine", name)
ui.open()
/obj/machinery/kitchen_machine/ui_data(mob/user)
@@ -470,8 +476,8 @@
var/list/name_overrides = list()
for(var/obj/O in contents)
var/display_name = O.name
- if(istype(O, /obj/item/reagent_containers/food))
- var/obj/item/reagent_containers/food/food = O
+ if(istype(O, /obj/item/food))
+ var/obj/item/food/food = O
if(!items_counts[display_name])
if(food.ingredient_name)
name_overrides[display_name] = food.ingredient_name
diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
index 8510e6bce62e..512d3359c990 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
@@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
var/required_grind = 5
var/cube_production = 1
var/cycle_through = 0
- var/obj/item/reagent_containers/food/snacks/monkeycube/cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
+ var/obj/item/food/snacks/monkeycube/cube_type = /obj/item/food/snacks/monkeycube
var/list/connected = list()
/obj/machinery/monkey_recycler/Initialize(mapload)
@@ -73,15 +73,15 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
cycle_through++
switch(cycle_through)
if(1)
- cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
+ cube_type = /obj/item/food/snacks/monkeycube/farwacube
if(2)
- cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
+ cube_type = /obj/item/food/snacks/monkeycube/wolpincube
if(3)
- cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube
+ cube_type = /obj/item/food/snacks/monkeycube/stokcube
if(4)
- cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
+ cube_type = /obj/item/food/snacks/monkeycube/neaeracube
if(5)
- cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
+ cube_type = /obj/item/food/snacks/monkeycube
cycle_through = 0
to_chat(user, "You change the monkeycube type to [initial(cube_type.name)].")
else
diff --git a/code/modules/food_and_drinks/kitchen_machinery/oven.dm b/code/modules/food_and_drinks/kitchen_machinery/oven.dm
index 0b571d393c37..94ebc9c61bbe 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/oven.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/oven.dm
@@ -22,8 +22,8 @@
return
else
var/obj/item/F = I
- var/obj/item/reagent_containers/food/snacks/customizable/C
- C = input("Select food to make.", "Cooking", C) in food_choices
+ var/obj/item/food/snacks/customizable/C
+ C = tgui_input_list(user, "Select food to make.", "Cooking", food_choices)
if(!C)
return
else
@@ -59,8 +59,8 @@
/obj/machinery/cooking/oven/updatefood()
for(var/U in food_choices)
food_choices.Remove(U)
- for(var/U in subtypesof(/obj/item/reagent_containers/food/snacks/customizable/cook))
- var/obj/item/reagent_containers/food/snacks/customizable/cook/V = new U
+ for(var/U in subtypesof(/obj/item/food/snacks/customizable/cook))
+ var/obj/item/food/snacks/customizable/cook/V = new U
food_choices += V
return
@@ -74,7 +74,7 @@
/obj/machinery/cooking/candy/updatefood()
for(var/U in food_choices)
food_choices.Remove(U)
- for(var/U in subtypesof(/obj/item/reagent_containers/food/snacks/customizable/candy))
- var/obj/item/reagent_containers/food/snacks/customizable/candy/V = new U
+ for(var/U in subtypesof(/obj/item/food/snacks/customizable/candy))
+ var/obj/item/food/snacks/customizable/candy/V = new U
food_choices += V
return
diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
index 6c6224bf572b..6d7ef45eb2c3 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
@@ -88,36 +88,36 @@
/////OBJECT RECIPIES/////
/////////////////////////
/datum/food_processor_process/meat
- input = /obj/item/reagent_containers/food/snacks/meat
- output = /obj/item/reagent_containers/food/snacks/meatball
+ input = /obj/item/food/snacks/meat
+ output = /obj/item/food/snacks/meatball
/datum/food_processor_process/potato
- input = /obj/item/reagent_containers/food/snacks/grown/potato
- output = /obj/item/reagent_containers/food/snacks/rawsticks
+ input = /obj/item/food/snacks/grown/potato
+ output = /obj/item/food/snacks/rawsticks
/datum/food_processor_process/rawsticks
- input = /obj/item/reagent_containers/food/snacks/rawsticks
- output = /obj/item/reagent_containers/food/snacks/tatortot
+ input = /obj/item/food/snacks/rawsticks
+ output = /obj/item/food/snacks/tatortot
/datum/food_processor_process/soybeans
- input = /obj/item/reagent_containers/food/snacks/grown/soybeans
- output = /obj/item/reagent_containers/food/snacks/soydope
+ input = /obj/item/food/snacks/grown/soybeans
+ output = /obj/item/food/snacks/soydope
/datum/food_processor_process/spaghetti
- input = /obj/item/reagent_containers/food/snacks/doughslice
- output = /obj/item/reagent_containers/food/snacks/spaghetti
+ input = /obj/item/food/snacks/doughslice
+ output = /obj/item/food/snacks/spaghetti
/datum/food_processor_process/macaroni
- input = /obj/item/reagent_containers/food/snacks/spaghetti
- output = /obj/item/reagent_containers/food/snacks/macaroni
+ input = /obj/item/food/snacks/spaghetti
+ output = /obj/item/food/snacks/macaroni
/datum/food_processor_process/parsnip
- input = /obj/item/reagent_containers/food/snacks/grown/parsnip
- output = /obj/item/reagent_containers/food/snacks/roastparsnip
+ input = /obj/item/food/snacks/grown/parsnip
+ output = /obj/item/food/snacks/roastparsnip
/datum/food_processor_process/carrot
- input = /obj/item/reagent_containers/food/snacks/grown/carrot
- output = /obj/item/reagent_containers/food/snacks/grown/carrot/wedges
+ input = /obj/item/food/snacks/grown/carrot
+ output = /obj/item/food/snacks/grown/carrot/wedges
/datum/food_processor_process/towercap
input = /obj/item/grown/log
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 50e6ed0066de..047fc0ce6bb1 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -82,7 +82,7 @@
update_icon(UPDATE_OVERLAYS)
// Accepted items
accepted_items_typecache = typecacheof(list(
- /obj/item/reagent_containers/food/snacks/grown,
+ /obj/item/food/snacks/grown,
/obj/item/seeds,
/obj/item/grown,
))
@@ -248,10 +248,13 @@
to_chat(user, "[failed] item\s [failed == 1 ? "is" : "are"] refused.")
return TRUE
-/obj/machinery/smartfridge/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/smartfridge/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/smartfridge/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "Smartfridge", name, 500, 500)
+ ui = new(user, src, "Smartfridge", name)
ui.open()
/obj/machinery/smartfridge/ui_data(mob/user)
@@ -404,6 +407,7 @@
/obj/machinery/smartfridge/secure/emag_act(mob/user)
emagged = TRUE
to_chat(user, "You short out the product lock on \the [src].")
+ return TRUE
/obj/machinery/smartfridge/secure/emp_act(severity)
if(!emagged && prob(40 / severity))
@@ -418,18 +422,18 @@
. = ..()
accepted_items_typecache = typecacheof(list(
/obj/item/kitchen,
- /obj/item/reagent_containers/food))
+ /obj/item/food))
// Syndicate Druglab Ruin
/obj/machinery/smartfridge/food/syndicate_druglab
starting_items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 2,
- /obj/item/reagent_containers/food/snacks/macncheese = 1,
- /obj/item/reagent_containers/food/snacks/syndicake = 3,
- /obj/item/reagent_containers/food/snacks/beans = 4,
+ /obj/item/food/snacks/boiledrice = 2,
+ /obj/item/food/snacks/macncheese = 1,
+ /obj/item/food/snacks/syndicake = 3,
+ /obj/item/food/snacks/beans = 4,
/obj/item/reagent_containers/glass/beaker/waterbottle/large = 7,
- /obj/item/reagent_containers/food/drinks/bottle/kahlua = 1,
- /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 2)
+ /obj/item/reagent_containers/drinks/bottle/kahlua = 1,
+ /obj/item/reagent_containers/drinks/bottle/orangejuice = 2)
/**
* # Seed Storage
@@ -471,9 +475,9 @@
/obj/machinery/smartfridge/foodcart/Initialize(mapload)
. = ..()
accepted_items_typecache = typecacheof(list(
- /obj/item/reagent_containers/food/snacks,
- /obj/item/reagent_containers/food/drinks,
- /obj/item/reagent_containers/food/condiment,
+ /obj/item/food/snacks,
+ /obj/item/reagent_containers/drinks,
+ /obj/item/reagent_containers/condiment,
))
/obj/machinery/smartfridge/foodcart/screwdriver_act(mob/living/user, obj/item/I)
@@ -802,8 +806,8 @@
. = ..()
accepted_items_typecache = typecacheof(list(
/obj/item/reagent_containers/glass,
- /obj/item/reagent_containers/food/drinks,
- /obj/item/reagent_containers/food/condiment,
+ /obj/item/reagent_containers/drinks,
+ /obj/item/reagent_containers/condiment,
))
/**
@@ -832,7 +836,7 @@
component_parts = null
// Accepted items
accepted_items_typecache = typecacheof(list(
- /obj/item/reagent_containers/food/snacks,
+ /obj/item/food/snacks,
/obj/item/stack/sheet/wetleather,
))
@@ -881,8 +885,8 @@
/obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O)
. = ..()
// If it's a food, reject non driable ones
- if(istype(O, /obj/item/reagent_containers/food/snacks))
- var/obj/item/reagent_containers/food/snacks/S = O
+ if(istype(O, /obj/item/food/snacks))
+ var/obj/item/food/snacks/S = O
if(!S.dried_type)
return FALSE
@@ -903,7 +907,7 @@
* Called in [/obj/machinery/smartfridge/drying_rack/process] to dry the contents.
*/
/obj/machinery/smartfridge/drying_rack/proc/rack_dry()
- for(var/obj/item/reagent_containers/food/snacks/S in contents)
+ for(var/obj/item/food/snacks/S in contents)
if(S.dried_type == S.type)//if the dried type is the same as the object's type, don't bother creating a whole new item...
S.color = "#ad7257"
S.dry = TRUE
diff --git a/code/modules/food_and_drinks/recipes/recipes_candy.dm b/code/modules/food_and_drinks/recipes/recipes_candy.dm
index 2339acd3ffaa..e47449af1935 100644
--- a/code/modules/food_and_drinks/recipes/recipes_candy.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_candy.dm
@@ -3,7 +3,7 @@
* /datum/recipe/candy/
* reagents = list()
* items = list()
-* result = /obj/item/reagent_containers/food/snacks/
+* result = /obj/item/food/snacks/
* byproduct = /obj/item/ // only set this if the recipe has a byproduct, like returning it's mould
*
* NOTE: If using a mould, make sure to list it in *BOTH* the items and byproduct lists if it is to be returned.
@@ -18,74 +18,74 @@
/datum/recipe/candy/chocolate_bar
reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2)
items = list()
- result = /obj/item/reagent_containers/food/snacks/chocolatebar
+ result = /obj/item/food/snacks/chocolatebar
/datum/recipe/candy/chocolate_bar2
reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2)
items = list()
- result = /obj/item/reagent_containers/food/snacks/chocolatebar
+ result = /obj/item/food/snacks/chocolatebar
/datum/recipe/candy/fudge_peanut
reagents = list("sugar" = 5, "milk" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/chocolatebar, /obj/item/reagent_containers/food/snacks/grown/peanuts,
- /obj/item/reagent_containers/food/snacks/grown/peanuts, /obj/item/reagent_containers/food/snacks/grown/peanuts)
- result = /obj/item/reagent_containers/food/snacks/candy/fudge/peanut
+ items = list(/obj/item/food/snacks/chocolatebar, /obj/item/food/snacks/grown/peanuts,
+ /obj/item/food/snacks/grown/peanuts, /obj/item/food/snacks/grown/peanuts)
+ result = /obj/item/food/snacks/candy/fudge/peanut
/datum/recipe/candy/fudge_cherry
reagents = list("sugar" = 5, "milk" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/chocolatebar, /obj/item/reagent_containers/food/snacks/grown/cherries,
- /obj/item/reagent_containers/food/snacks/grown/cherries, /obj/item/reagent_containers/food/snacks/grown/cherries)
- result = /obj/item/reagent_containers/food/snacks/candy/fudge/cherry
+ items = list(/obj/item/food/snacks/chocolatebar, /obj/item/food/snacks/grown/cherries,
+ /obj/item/food/snacks/grown/cherries, /obj/item/food/snacks/grown/cherries)
+ result = /obj/item/food/snacks/candy/fudge/cherry
/datum/recipe/candy/fudge_cookies_n_cream
reagents = list("sugar" = 5, "milk" = 5, "cream" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/chocolatebar,
- /obj/item/reagent_containers/food/snacks/cookie,
+ /obj/item/food/snacks/chocolatebar,
+ /obj/item/food/snacks/cookie,
)
- result = /obj/item/reagent_containers/food/snacks/candy/fudge/cookies_n_cream
+ result = /obj/item/food/snacks/candy/fudge/cookies_n_cream
/datum/recipe/candy/fudge_turtle
reagents = list("sugar" = 5, "milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/chocolatebar,
- /obj/item/reagent_containers/food/snacks/candy/caramel,
- /obj/item/reagent_containers/food/snacks/grown/peanuts
+ /obj/item/food/snacks/chocolatebar,
+ /obj/item/food/snacks/candy/caramel,
+ /obj/item/food/snacks/grown/peanuts
)
- result = /obj/item/reagent_containers/food/snacks/candy/fudge/turtle
+ result = /obj/item/food/snacks/candy/fudge/turtle
/datum/recipe/candy/fudge
reagents = list("sugar" = 5, "milk" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/chocolatebar)
- result = /obj/item/reagent_containers/food/snacks/candy/fudge
+ items = list(/obj/item/food/snacks/chocolatebar)
+ result = /obj/item/food/snacks/candy/fudge
/datum/recipe/candy/caramel
reagents = list("sugar" = 5, "cream" = 5)
items = list()
- result = /obj/item/reagent_containers/food/snacks/candy/caramel
+ result = /obj/item/food/snacks/candy/caramel
/datum/recipe/candy/toffee
reagents = list("sugar" = 5, "flour" = 10)
- result = /obj/item/reagent_containers/food/snacks/candy/toffee
+ result = /obj/item/food/snacks/candy/toffee
/datum/recipe/candy/taffy
reagents = list("salglu_solution" = 15)
items = list()
- result = /obj/item/reagent_containers/food/snacks/candy/taffy
+ result = /obj/item/food/snacks/candy/taffy
/datum/recipe/candy/nougat
reagents = list("sugar" = 5, "cornoil" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/egg)
- result = /obj/item/reagent_containers/food/snacks/candy/nougat
+ items = list(/obj/item/food/snacks/egg)
+ result = /obj/item/food/snacks/candy/nougat
/datum/recipe/candy/nougat/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/candy/nougat/being_cooked = ..()
+ var/obj/item/food/snacks/candy/nougat/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/candy/wafflecone
reagents = list("milk" = 1, "sugar" = 1)
- result = /obj/item/reagent_containers/food/snacks/wafflecone
+ result = /obj/item/food/snacks/wafflecone
// ***********************************************************
// Base Candy Recipes (unflavored / plain)
@@ -96,14 +96,14 @@
items = list(
/obj/item/c_tube,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton
+ result = /obj/item/food/snacks/candy/cotton
/datum/recipe/candy/gummybear
reagents = list("sugar" = 5, "water" = 5, "cornoil" = 5)
items = list(
/obj/item/kitchen/mould/bear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear
+ result = /obj/item/food/snacks/candy/gummybear
byproduct = /obj/item/kitchen/mould/bear
/datum/recipe/candy/gummyworm
@@ -111,7 +111,7 @@
items = list(
/obj/item/kitchen/mould/worm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm
+ result = /obj/item/food/snacks/candy/gummyworm
byproduct = /obj/item/kitchen/mould/worm
/datum/recipe/candy/jellybean
@@ -119,7 +119,7 @@
items = list(
/obj/item/kitchen/mould/bean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean
+ result = /obj/item/food/snacks/candy/jellybean
byproduct = /obj/item/kitchen/mould/bean
/datum/recipe/candy/jawbreaker
@@ -127,44 +127,44 @@
items = list(
/obj/item/kitchen/mould/ball,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jawbreaker
+ result = /obj/item/food/snacks/candy/jawbreaker
byproduct = /obj/item/kitchen/mould/ball
/datum/recipe/candy/candycane
reagents = list("sugar" = 5)
items = list(
/obj/item/kitchen/mould/cane,
- /obj/item/reagent_containers/food/snacks/mint,
+ /obj/item/food/snacks/mint,
)
- result = /obj/item/reagent_containers/food/snacks/candy/candycane
+ result = /obj/item/food/snacks/candy/candycane
byproduct = /obj/item/kitchen/mould/cane
/datum/recipe/candy/gum
reagents = list("sugar" = 5, "water" = 5, "cornoil" = 5)
items = list()
- result = /obj/item/reagent_containers/food/snacks/candy/gum
+ result = /obj/item/food/snacks/candy/gum
/datum/recipe/candy/candybar
reagents = list("sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/candy/candybar
+ result = /obj/item/food/snacks/candy/candybar
/datum/recipe/candy/cash
items = list(
/obj/item/kitchen/mould/cash,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cash
+ result = /obj/item/food/snacks/candy/cash
byproduct = /obj/item/kitchen/mould/cash
/datum/recipe/candy/coin
items = list(
/obj/item/kitchen/mould/coin,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/candy/coin
+ result = /obj/item/food/snacks/candy/coin
byproduct = /obj/item/kitchen/mould/coin
/datum/recipe/candy/sucker
@@ -172,7 +172,7 @@
items = list(
/obj/item/kitchen/mould/loli,
)
- result = /obj/item/reagent_containers/food/snacks/candy/sucker
+ result = /obj/item/food/snacks/candy/sucker
byproduct = /obj/item/kitchen/mould/loli
// ***********************************************************
@@ -182,84 +182,84 @@
/datum/recipe/candy/cottoncandy_red
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/red
+ result = /obj/item/food/snacks/candy/cotton/red
/datum/recipe/candy/cottoncandy_blue
reagents = list("berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/blue
+ result = /obj/item/food/snacks/candy/cotton/blue
/datum/recipe/candy/cottoncandy_poison
reagents = list("poisonberryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/poison
+ result = /obj/item/food/snacks/candy/cotton/poison
/datum/recipe/candy/cottoncandy_green
reagents = list("limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/green
+ result = /obj/item/food/snacks/candy/cotton/green
/datum/recipe/candy/cottoncandy_yellow
reagents = list("lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/yellow
+ result = /obj/item/food/snacks/candy/cotton/yellow
/datum/recipe/candy/cottoncandy_orange
reagents = list("orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/orange
+ result = /obj/item/food/snacks/candy/cotton/orange
/datum/recipe/candy/cottoncandy_purple
reagents = list("grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/purple
+ result = /obj/item/food/snacks/candy/cotton/purple
/datum/recipe/candy/cottoncandy_pink
reagents = list("watermelonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton,
+ /obj/item/food/snacks/candy/cotton,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/pink
+ result = /obj/item/food/snacks/candy/cotton/pink
/datum/recipe/candy/cottoncandy_rainbow
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton/red,
- /obj/item/reagent_containers/food/snacks/candy/cotton/blue,
- /obj/item/reagent_containers/food/snacks/candy/cotton/green,
- /obj/item/reagent_containers/food/snacks/candy/cotton/yellow,
- /obj/item/reagent_containers/food/snacks/candy/cotton/orange,
- /obj/item/reagent_containers/food/snacks/candy/cotton/purple,
- /obj/item/reagent_containers/food/snacks/candy/cotton/pink,
+ /obj/item/food/snacks/candy/cotton/red,
+ /obj/item/food/snacks/candy/cotton/blue,
+ /obj/item/food/snacks/candy/cotton/green,
+ /obj/item/food/snacks/candy/cotton/yellow,
+ /obj/item/food/snacks/candy/cotton/orange,
+ /obj/item/food/snacks/candy/cotton/purple,
+ /obj/item/food/snacks/candy/cotton/pink,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/rainbow
+ result = /obj/item/food/snacks/candy/cotton/rainbow
/datum/recipe/candy/cottoncandy_rainbow2
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/cotton/red,
- /obj/item/reagent_containers/food/snacks/candy/cotton/poison,
- /obj/item/reagent_containers/food/snacks/candy/cotton/green,
- /obj/item/reagent_containers/food/snacks/candy/cotton/yellow,
- /obj/item/reagent_containers/food/snacks/candy/cotton/orange,
- /obj/item/reagent_containers/food/snacks/candy/cotton/purple,
- /obj/item/reagent_containers/food/snacks/candy/cotton/pink,
+ /obj/item/food/snacks/candy/cotton/red,
+ /obj/item/food/snacks/candy/cotton/poison,
+ /obj/item/food/snacks/candy/cotton/green,
+ /obj/item/food/snacks/candy/cotton/yellow,
+ /obj/item/food/snacks/candy/cotton/orange,
+ /obj/item/food/snacks/candy/cotton/purple,
+ /obj/item/food/snacks/candy/cotton/pink,
)
- result = /obj/item/reagent_containers/food/snacks/candy/cotton/bad_rainbow
+ result = /obj/item/food/snacks/candy/cotton/bad_rainbow
// ***********************************************************
// Gummy Bear Recipes (flavored)
@@ -268,63 +268,63 @@
/datum/recipe/candy/gummybear_red
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/red
+ result = /obj/item/food/snacks/candy/gummybear/red
/datum/recipe/candy/gummybear_blue
reagents = list("berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/blue
+ result = /obj/item/food/snacks/candy/gummybear/blue
/datum/recipe/candy/gummybear_poison
reagents = list("poisonberryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/poison
+ result = /obj/item/food/snacks/candy/gummybear/poison
/datum/recipe/candy/gummybear_green
reagents = list("limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/green
+ result = /obj/item/food/snacks/candy/gummybear/green
/datum/recipe/candy/gummybear_yellow
reagents = list("lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/yellow
+ result = /obj/item/food/snacks/candy/gummybear/yellow
/datum/recipe/candy/gummybear_orange
reagents = list("orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/orange
+ result = /obj/item/food/snacks/candy/gummybear/orange
/datum/recipe/candy/gummybear_purple
reagents = list("grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/purple
+ result = /obj/item/food/snacks/candy/gummybear/purple
/datum/recipe/candy/gummybear_wtf
reagents = list("space_drugs" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummybear,
+ /obj/item/food/snacks/candy/gummybear,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/wtf
+ result = /obj/item/food/snacks/candy/gummybear/wtf
/datum/recipe/candy/gummybear_wtf2
reagents = list()
- items = list(/obj/item/reagent_containers/food/snacks/candy/gummybear, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris)
- result = /obj/item/reagent_containers/food/snacks/candy/gummybear/wtf
+ items = list(/obj/item/food/snacks/candy/gummybear, /obj/item/food/snacks/grown/ambrosia/vulgaris)
+ result = /obj/item/food/snacks/candy/gummybear/wtf
// ***********************************************************
// Gummy Worm Recipes (flavored)
@@ -333,62 +333,62 @@
/datum/recipe/candy/gummyworm_red
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/red
+ result = /obj/item/food/snacks/candy/gummyworm/red
/datum/recipe/candy/gummyworm_blue
reagents = list("berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/blue
+ result = /obj/item/food/snacks/candy/gummyworm/blue
/datum/recipe/candy/gummyworm_poison
reagents = list("poisonberryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/poison
+ result = /obj/item/food/snacks/candy/gummyworm/poison
/datum/recipe/candy/gummyworm_green
reagents = list("limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/green
+ result = /obj/item/food/snacks/candy/gummyworm/green
/datum/recipe/candy/gummyworm_yellow
reagents = list("lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/yellow
+ result = /obj/item/food/snacks/candy/gummyworm/yellow
/datum/recipe/candy/gummyworm_orange
reagents = list("orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/orange
+ result = /obj/item/food/snacks/candy/gummyworm/orange
/datum/recipe/candy/gummyworm_purple
reagents = list("grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/purple
+ result = /obj/item/food/snacks/candy/gummyworm/purple
/datum/recipe/candy/gummyworm_wtf
reagents = list("space_drugs" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/gummyworm,
+ /obj/item/food/snacks/candy/gummyworm,
)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/wtf
+ result = /obj/item/food/snacks/candy/gummyworm/wtf
/datum/recipe/candy/gummyworm_wtf2
- items = list(/obj/item/reagent_containers/food/snacks/candy/gummyworm, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris)
- result = /obj/item/reagent_containers/food/snacks/candy/gummyworm/wtf
+ items = list(/obj/item/food/snacks/candy/gummyworm, /obj/item/food/snacks/grown/ambrosia/vulgaris)
+ result = /obj/item/food/snacks/candy/gummyworm/wtf
// ***********************************************************
// Jelly Bean Recipes (flavored)
@@ -397,99 +397,99 @@
/datum/recipe/candy/jellybean_red
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/red
+ result = /obj/item/food/snacks/candy/jellybean/red
/datum/recipe/candy/jellybean_blue
reagents = list("berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/blue
+ result = /obj/item/food/snacks/candy/jellybean/blue
/datum/recipe/candy/jellybean_poison
reagents = list("poisonberryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/poison
+ result = /obj/item/food/snacks/candy/jellybean/poison
/datum/recipe/candy/jellybean_green
reagents = list("limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/green
+ result = /obj/item/food/snacks/candy/jellybean/green
/datum/recipe/candy/jellybean_yellow
reagents = list("lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/yellow
+ result = /obj/item/food/snacks/candy/jellybean/yellow
/datum/recipe/candy/jellybean_orange
reagents = list("orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/orange
+ result = /obj/item/food/snacks/candy/jellybean/orange
/datum/recipe/candy/jellybean_purple
reagents = list("grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/purple
+ result = /obj/item/food/snacks/candy/jellybean/purple
/datum/recipe/candy/jellybean_chocolate
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/chocolate
+ result = /obj/item/food/snacks/candy/jellybean/chocolate
/datum/recipe/candy/jellybean_cola
reagents = list("cola" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/cola
+ result = /obj/item/food/snacks/candy/jellybean/cola
/datum/recipe/candy/jellybean_popcorn
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/popcorn,
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/popcorn,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/popcorn
+ result = /obj/item/food/snacks/candy/jellybean/popcorn
/datum/recipe/candy/jellybean_coffee
reagents = list("coffee" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/cola
+ result = /obj/item/food/snacks/candy/jellybean/cola
/datum/recipe/candy/jellybean_drgibb
reagents = list("dr_gibb" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/cola
+ result = /obj/item/food/snacks/candy/jellybean/cola
/datum/recipe/candy/jellybean_wtf
reagents = list("space_drugs" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/jellybean,
+ /obj/item/food/snacks/candy/jellybean,
)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/wtf
+ result = /obj/item/food/snacks/candy/jellybean/wtf
/datum/recipe/candy/jellybean_wtf2
- items = list(/obj/item/reagent_containers/food/snacks/candy/jellybean, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris)
- result = /obj/item/reagent_containers/food/snacks/candy/jellybean/wtf
+ items = list(/obj/item/food/snacks/candy/jellybean, /obj/item/food/snacks/grown/ambrosia/vulgaris)
+ result = /obj/item/food/snacks/candy/jellybean/wtf
// ***********************************************************
// Candybar Recipes (flavored)
@@ -498,39 +498,39 @@
/datum/recipe/candy/malper
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/candybar,
- /obj/item/reagent_containers/food/snacks/candy/caramel,
+ /obj/item/food/snacks/candy/candybar,
+ /obj/item/food/snacks/candy/caramel,
)
- result = /obj/item/reagent_containers/food/snacks/candy/confectionery/caramel
+ result = /obj/item/food/snacks/candy/confectionery/caramel
/datum/recipe/candy/toolerone
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/candybar,
- /obj/item/reagent_containers/food/snacks/candy/nougat,
+ /obj/item/food/snacks/candy/candybar,
+ /obj/item/food/snacks/candy/nougat,
)
- result = /obj/item/reagent_containers/food/snacks/candy/confectionery/nougat
+ result = /obj/item/food/snacks/candy/confectionery/nougat
/datum/recipe/candy/yumbaton
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/candybar,
- /obj/item/reagent_containers/food/snacks/candy/toffee,
+ /obj/item/food/snacks/candy/candybar,
+ /obj/item/food/snacks/candy/toffee,
)
- result = /obj/item/reagent_containers/food/snacks/candy/confectionery/toffee
+ result = /obj/item/food/snacks/candy/confectionery/toffee
/datum/recipe/candy/crunch
reagents = list("rice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/candy/candybar,
+ /obj/item/food/snacks/candy/candybar,
)
- result = /obj/item/reagent_containers/food/snacks/candy/confectionery/rice
+ result = /obj/item/food/snacks/candy/confectionery/rice
/datum/recipe/candy/toxinstest
reagents = list()
items = list(
- /obj/item/reagent_containers/food/snacks/candy/candybar,
- /obj/item/reagent_containers/food/snacks/candy/caramel,
- /obj/item/reagent_containers/food/snacks/candy/nougat,
+ /obj/item/food/snacks/candy/candybar,
+ /obj/item/food/snacks/candy/caramel,
+ /obj/item/food/snacks/candy/nougat,
)
- result = /obj/item/reagent_containers/food/snacks/candy/confectionery/caramel_nougat
+ result = /obj/item/food/snacks/candy/confectionery/caramel_nougat
diff --git a/code/modules/food_and_drinks/recipes/recipes_grill.dm b/code/modules/food_and_drinks/recipes/recipes_grill.dm
index a12287ee8905..cbe5f7bcf92d 100644
--- a/code/modules/food_and_drinks/recipes/recipes_grill.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_grill.dm
@@ -3,289 +3,289 @@
/datum/recipe/grill/bacon
items = list(
- /obj/item/reagent_containers/food/snacks/raw_bacon,
+ /obj/item/food/snacks/raw_bacon,
)
- result = /obj/item/reagent_containers/food/snacks/bacon
+ result = /obj/item/food/snacks/bacon
/datum/recipe/grill/telebacon
items = list(
- /obj/item/reagent_containers/food/snacks/meat,
+ /obj/item/food/snacks/meat,
/obj/item/assembly/signaler
)
- result = /obj/item/reagent_containers/food/snacks/telebacon
+ result = /obj/item/food/snacks/telebacon
/datum/recipe/grill/syntitelebacon
items = list(
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/meat/syntiflesh,
/obj/item/assembly/signaler
)
- result = /obj/item/reagent_containers/food/snacks/telebacon
+ result = /obj/item/food/snacks/telebacon
/datum/recipe/grill/friedegg
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/egg
+ /obj/item/food/snacks/egg
)
- result = /obj/item/reagent_containers/food/snacks/friedegg
+ result = /obj/item/food/snacks/friedegg
/datum/recipe/grill/meatsteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/meatsteak
+ result = /obj/item/food/snacks/meatsteak
/datum/recipe/grill/salmonsteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/salmonmeat
+ /obj/item/food/snacks/salmonmeat
)
- result = /obj/item/reagent_containers/food/snacks/salmonsteak
+ result = /obj/item/food/snacks/salmonsteak
/datum/recipe/grill/syntisteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh
+ /obj/item/food/snacks/meat/syntiflesh
)
- result = /obj/item/reagent_containers/food/snacks/meatsteak
+ result = /obj/item/food/snacks/meatsteak
/datum/recipe/grill/waffles
reagents = list("sugar" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/waffles
+ result = /obj/item/food/snacks/waffles
/datum/recipe/grill/rofflewaffles
reagents = list("psilocybin" = 5, "sugar" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
)
- result = /obj/item/reagent_containers/food/snacks/rofflewaffles
+ result = /obj/item/food/snacks/rofflewaffles
/datum/recipe/grill/grilledcheese
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/grilledcheese
+ result = /obj/item/food/snacks/grilledcheese
/datum/recipe/grill/sausage
items = list(
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/cutlet,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/cutlet,
)
- result = /obj/item/reagent_containers/food/snacks/sausage
+ result = /obj/item/food/snacks/sausage
/datum/recipe/grill/fishfingers
reagents = list("flour" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/carpmeat,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/carpmeat,
)
- result = /obj/item/reagent_containers/food/snacks/fishfingers
+ result = /obj/item/food/snacks/fishfingers
/datum/recipe/grill/fishfingers/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/fishfingers/being_cooked = ..()
+ var/obj/item/food/snacks/fishfingers/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/grill/cutlet
items = list(
- /obj/item/reagent_containers/food/snacks/rawcutlet
+ /obj/item/food/snacks/rawcutlet
)
- result = /obj/item/reagent_containers/food/snacks/cutlet
+ result = /obj/item/food/snacks/cutlet
/datum/recipe/grill/omelette
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/omelette
+ result = /obj/item/food/snacks/omelette
/datum/recipe/grill/wingfangchu
reagents = list("soysauce" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat
+ /obj/item/food/snacks/monstermeat/xenomeat
)
- result = /obj/item/reagent_containers/food/snacks/wingfangchu
+ result = /obj/item/food/snacks/wingfangchu
/datum/recipe/grill/human/kabob
items = list(
/obj/item/stack/rods,
- /obj/item/reagent_containers/food/snacks/meat/human,
- /obj/item/reagent_containers/food/snacks/meat/human,
+ /obj/item/food/snacks/meat/human,
+ /obj/item/food/snacks/meat/human,
)
- result = /obj/item/reagent_containers/food/snacks/human/kabob
+ result = /obj/item/food/snacks/human/kabob
/datum/recipe/grill/monkeykabob
items = list(
/obj/item/stack/rods,
- /obj/item/reagent_containers/food/snacks/meat/monkey,
- /obj/item/reagent_containers/food/snacks/meat/monkey,
+ /obj/item/food/snacks/meat/monkey,
+ /obj/item/food/snacks/meat/monkey,
)
- result = /obj/item/reagent_containers/food/snacks/monkeykabob
+ result = /obj/item/food/snacks/monkeykabob
/datum/recipe/grill/syntikabob
items = list(
/obj/item/stack/rods,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/meat/syntiflesh,
)
- result = /obj/item/reagent_containers/food/snacks/monkeykabob
+ result = /obj/item/food/snacks/monkeykabob
/datum/recipe/grill/tofukabob
items = list(
/obj/item/stack/rods,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
)
- result = /obj/item/reagent_containers/food/snacks/tofukabob
+ result = /obj/item/food/snacks/tofukabob
/datum/recipe/grill/picoss_kabob
reagents = list("vinegar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/carpmeat,
- /obj/item/reagent_containers/food/snacks/carpmeat,
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/grown/chili,
+ /obj/item/food/snacks/carpmeat,
+ /obj/item/food/snacks/carpmeat,
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/grown/chili,
/obj/item/stack/rods
)
- result = /obj/item/reagent_containers/food/snacks/picoss_kabob
+ result = /obj/item/food/snacks/picoss_kabob
/datum/recipe/grill/sushi_Tamago
reagents = list("sake" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/boiledrice,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/boiledrice,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Tamago
+ result = /obj/item/food/snacks/sushi_Tamago
/datum/recipe/grill/sushi_Unagi
reagents = list("sake" = 5)
items = list(
/obj/item/fish/electric_eel,
- /obj/item/reagent_containers/food/snacks/boiledrice,
+ /obj/item/food/snacks/boiledrice,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Unagi
+ result = /obj/item/food/snacks/sushi_Unagi
/datum/recipe/grill/sushi_Ebi
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
- /obj/item/reagent_containers/food/snacks/boiled_shrimp,
+ /obj/item/food/snacks/boiledrice,
+ /obj/item/food/snacks/boiled_shrimp,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Ebi
+ result = /obj/item/food/snacks/sushi_Ebi
/datum/recipe/grill/sushi_Ikura
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
+ /obj/item/food/snacks/boiledrice,
/obj/item/fish_eggs/salmon,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Ikura
+ result = /obj/item/food/snacks/sushi_Ikura
/datum/recipe/grill/sushi_Inari
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
- /obj/item/reagent_containers/food/snacks/fried_tofu,
+ /obj/item/food/snacks/boiledrice,
+ /obj/item/food/snacks/fried_tofu,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Inari
+ result = /obj/item/food/snacks/sushi_Inari
/datum/recipe/grill/sushi_Sake
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
- /obj/item/reagent_containers/food/snacks/salmonmeat,
+ /obj/item/food/snacks/boiledrice,
+ /obj/item/food/snacks/salmonmeat,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Sake
+ result = /obj/item/food/snacks/sushi_Sake
/datum/recipe/grill/sushi_SmokedSalmon
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
- /obj/item/reagent_containers/food/snacks/salmonsteak,
+ /obj/item/food/snacks/boiledrice,
+ /obj/item/food/snacks/salmonsteak,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
+ result = /obj/item/food/snacks/sushi_SmokedSalmon
/datum/recipe/grill/sushi_Masago
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
+ /obj/item/food/snacks/boiledrice,
/obj/item/fish_eggs/goldfish,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Masago
+ result = /obj/item/food/snacks/sushi_Masago
/datum/recipe/grill/sushi_Tobiko
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
+ /obj/item/food/snacks/boiledrice,
/obj/item/fish_eggs/shark,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
+ result = /obj/item/food/snacks/sushi_Tobiko
/datum/recipe/grill/sushi_TobikoEgg
items = list(
- /obj/item/reagent_containers/food/snacks/sushi_Tobiko,
- /obj/item/reagent_containers/food/snacks/egg,
+ /obj/item/food/snacks/sushi_Tobiko,
+ /obj/item/food/snacks/egg,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
+ result = /obj/item/food/snacks/sushi_TobikoEgg
/datum/recipe/grill/sushi_Tai
items = list(
- /obj/item/reagent_containers/food/snacks/boiledrice,
- /obj/item/reagent_containers/food/snacks/catfishmeat,
+ /obj/item/food/snacks/boiledrice,
+ /obj/item/food/snacks/catfishmeat,
)
- result = /obj/item/reagent_containers/food/snacks/sushi_Tai
+ result = /obj/item/food/snacks/sushi_Tai
/datum/recipe/grill/goliath
- items = list(/obj/item/reagent_containers/food/snacks/monstermeat/goliath)
- result = /obj/item/reagent_containers/food/snacks/goliath_steak
+ items = list(/obj/item/food/snacks/monstermeat/goliath)
+ result = /obj/item/food/snacks/goliath_steak
/datum/recipe/grill/shrimp_skewer
items = list(
- /obj/item/reagent_containers/food/snacks/shrimp,
- /obj/item/reagent_containers/food/snacks/shrimp,
- /obj/item/reagent_containers/food/snacks/shrimp,
- /obj/item/reagent_containers/food/snacks/shrimp,
+ /obj/item/food/snacks/shrimp,
+ /obj/item/food/snacks/shrimp,
+ /obj/item/food/snacks/shrimp,
+ /obj/item/food/snacks/shrimp,
/obj/item/stack/rods,
)
- result = /obj/item/reagent_containers/food/snacks/shrimp_skewer
+ result = /obj/item/food/snacks/shrimp_skewer
/datum/recipe/grill/fish_skewer
reagents = list("flour" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/salmonmeat,
- /obj/item/reagent_containers/food/snacks/salmonmeat,
+ /obj/item/food/snacks/salmonmeat,
+ /obj/item/food/snacks/salmonmeat,
/obj/item/stack/rods,
)
- result = /obj/item/reagent_containers/food/snacks/fish_skewer
+ result = /obj/item/food/snacks/fish_skewer
/datum/recipe/grill/pancake
items = list(
- /obj/item/reagent_containers/food/snacks/cookiedough
+ /obj/item/food/snacks/cookiedough
)
- result = /obj/item/reagent_containers/food/snacks/pancake
+ result = /obj/item/food/snacks/pancake
/datum/recipe/grill/berry_pancake
items = list(
- /obj/item/reagent_containers/food/snacks/cookiedough,
- /obj/item/reagent_containers/food/snacks/grown/berries
+ /obj/item/food/snacks/cookiedough,
+ /obj/item/food/snacks/grown/berries
)
- result = /obj/item/reagent_containers/food/snacks/pancake/berry_pancake
+ result = /obj/item/food/snacks/pancake/berry_pancake
/datum/recipe/grill/choc_chip_pancake
items = list(
- /obj/item/reagent_containers/food/snacks/cookiedough,
- /obj/item/reagent_containers/food/snacks/choc_pile
+ /obj/item/food/snacks/cookiedough,
+ /obj/item/food/snacks/choc_pile
)
- result = /obj/item/reagent_containers/food/snacks/pancake/choc_chip_pancake
+ result = /obj/item/food/snacks/pancake/choc_chip_pancake
/datum/recipe/grill/bbqribs
reagents = list("bbqsauce" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
/obj/item/stack/rods
)
- result = /obj/item/reagent_containers/food/snacks/bbqribs
+ result = /obj/item/food/snacks/bbqribs
diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
index 112dcc6ca87a..53904858aaa9 100644
--- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
@@ -5,791 +5,791 @@
/datum/recipe/microwave/boiledegg
reagents = list("water" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/egg
+ /obj/item/food/snacks/egg
)
- result = /obj/item/reagent_containers/food/snacks/boiledegg
+ result = /obj/item/food/snacks/boiledegg
/datum/recipe/microwave/dionaroast
reagents = list("facid" = 5) //It dissolves the carapace. Still poisonous, though.
- items = list(/obj/item/holder/diona, /obj/item/reagent_containers/food/snacks/grown/apple)
- result = /obj/item/reagent_containers/food/snacks/dionaroast
+ items = list(/obj/item/holder/diona, /obj/item/food/snacks/grown/apple)
+ result = /obj/item/food/snacks/dionaroast
/datum/recipe/microwave/jellydonut
reagents = list("berryjuice" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut/jelly
+ result = /obj/item/food/snacks/donut/jelly
/datum/recipe/microwave/jellydonut/slime
reagents = list("slimejelly" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly
+ result = /obj/item/food/snacks/donut/jelly/slimejelly
/datum/recipe/microwave/jellydonut/cherry
reagents = list("cherryjelly" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly
+ result = /obj/item/food/snacks/donut/jelly/cherryjelly
/datum/recipe/microwave/donut
reagents = list("sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut
+ result = /obj/item/food/snacks/donut
/datum/recipe/microwave/donut/sprinkles
reagents = list("sugar" = 5, "sprinkles" = 2)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut/sprinkles
+ result = /obj/item/food/snacks/donut/sprinkles
/datum/recipe/microwave/human/burger
items = list(
- /obj/item/reagent_containers/food/snacks/meat/human,
- /obj/item/reagent_containers/food/snacks/bun
+ /obj/item/food/snacks/meat/human,
+ /obj/item/food/snacks/bun
)
- result = /obj/item/reagent_containers/food/snacks/human/burger
+ result = /obj/item/food/snacks/human/burger
/datum/recipe/microwave/plainburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat //do not place this recipe before /datum/recipe/microwave/humanburger
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat //do not place this recipe before /datum/recipe/microwave/humanburger
)
- result = /obj/item/reagent_containers/food/snacks/burger/plain
+ result = /obj/item/food/snacks/burger/plain
/datum/recipe/microwave/syntiburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat/syntiflesh
)
- result = /obj/item/reagent_containers/food/snacks/burger/plain
+ result = /obj/item/food/snacks/burger/plain
/datum/recipe/microwave/brainburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/organ/internal/brain
)
- result = /obj/item/reagent_containers/food/snacks/burger/brain
+ result = /obj/item/food/snacks/burger/brain
/datum/recipe/microwave/hamborger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/robot_parts/head
)
- result = /obj/item/reagent_containers/food/snacks/burger/hamborger
+ result = /obj/item/food/snacks/burger/hamborger
/datum/recipe/microwave/xenoburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat )
- result = /obj/item/reagent_containers/food/snacks/burger/xeno
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/monstermeat/xenomeat)
+ result = /obj/item/food/snacks/burger/xeno
/datum/recipe/microwave/fishburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/carpmeat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/carpmeat
)
- result = /obj/item/reagent_containers/food/snacks/fishburger
+ result = /obj/item/food/snacks/fishburger
/datum/recipe/microwave/tofuburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/tofu
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/tofu
)
- result = /obj/item/reagent_containers/food/snacks/burger/tofu
+ result = /obj/item/food/snacks/burger/tofu
/datum/recipe/microwave/ghostburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/ectoplasm //where do you even find this stuff
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/ectoplasm //where do you even find this stuff
)
- result = /obj/item/reagent_containers/food/snacks/burger/ghost
+ result = /obj/item/food/snacks/burger/ghost
/datum/recipe/microwave/clownburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/clothing/mask/gas/clown_hat,
)
- result = /obj/item/reagent_containers/food/snacks/burger/clown
+ result = /obj/item/food/snacks/burger/clown
/datum/recipe/microwave/mimeburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/clothing/head/beret
)
- result = /obj/item/reagent_containers/food/snacks/burger/mime
+ result = /obj/item/food/snacks/burger/mime
/datum/recipe/microwave/baseballburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/melee/baseball_bat
)
- result = /obj/item/reagent_containers/food/snacks/burger/baseball
+ result = /obj/item/food/snacks/burger/baseball
/datum/recipe/microwave/cheeseburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/burger/cheese
+ result = /obj/item/food/snacks/burger/cheese
/datum/recipe/microwave/appendixburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/organ/internal/appendix
)
- result = /obj/item/reagent_containers/food/snacks/burger/appendix
+ result = /obj/item/food/snacks/burger/appendix
/datum/recipe/microwave/appendixburger_bitten
items = list(
- /obj/item/reagent_containers/food/snacks/appendix,
- /obj/item/reagent_containers/food/snacks/bun
+ /obj/item/food/snacks/appendix,
+ /obj/item/food/snacks/bun
)
- result = /obj/item/reagent_containers/food/snacks/burger/appendix
+ result = /obj/item/food/snacks/burger/appendix
/datum/recipe/microwave/bearger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/monstermeat/bearmeat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/monstermeat/bearmeat
)
- result = /obj/item/reagent_containers/food/snacks/burger/bearger
+ result = /obj/item/food/snacks/burger/bearger
/datum/recipe/microwave/fivealarmburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/grown/ghost_chili,
- /obj/item/reagent_containers/food/snacks/grown/ghost_chili
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/grown/ghost_chili,
+ /obj/item/food/snacks/grown/ghost_chili
)
- result = /obj/item/reagent_containers/food/snacks/burger/fivealarm
+ result = /obj/item/food/snacks/burger/fivealarm
/datum/recipe/microwave/baconburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/bacon,
- /obj/item/reagent_containers/food/snacks/bacon,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/bacon,
+ /obj/item/food/snacks/bacon,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/burger/bacon
+ result = /obj/item/food/snacks/burger/bacon
/datum/recipe/microwave/mcrib
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/bbqribs,
- /obj/item/reagent_containers/food/snacks/onion_slice
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/bbqribs,
+ /obj/item/food/snacks/onion_slice
)
- result = /obj/item/reagent_containers/food/snacks/burger/mcrib
+ result = /obj/item/food/snacks/burger/mcrib
/datum/recipe/microwave/mcguffin
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/bacon,
- /obj/item/reagent_containers/food/snacks/bacon,
- /obj/item/reagent_containers/food/snacks/friedegg
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/bacon,
+ /obj/item/food/snacks/bacon,
+ /obj/item/food/snacks/friedegg
)
- result = /obj/item/reagent_containers/food/snacks/burger/mcguffin
+ result = /obj/item/food/snacks/burger/mcguffin
/datum/recipe/microwave/hotdog
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/sausage
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/sausage
)
- result = /obj/item/reagent_containers/food/snacks/hotdog
+ result = /obj/item/food/snacks/hotdog
/datum/recipe/microwave/donkpocket
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/meatball
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/meatball
)
- result = /obj/item/reagent_containers/food/snacks/donkpocket
+ result = /obj/item/food/snacks/donkpocket
/datum/recipe/microwave/warmdonkpocket
duplicate = FALSE
items = list(
- /obj/item/reagent_containers/food/snacks/donkpocket
+ /obj/item/food/snacks/donkpocket
)
- result = /obj/item/reagent_containers/food/snacks/warmdonkpocket
+ result = /obj/item/food/snacks/warmdonkpocket
/datum/recipe/microwave/reheatwarmdonkpocket
duplicate = FALSE
items = list(
- /obj/item/reagent_containers/food/snacks/warmdonkpocket
+ /obj/item/food/snacks/warmdonkpocket
)
- result = /obj/item/reagent_containers/food/snacks/warmdonkpocket
+ result = /obj/item/food/snacks/warmdonkpocket
/datum/recipe/microwave/eggplantparm
items = list(
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/eggplant
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/eggplant
)
- result = /obj/item/reagent_containers/food/snacks/eggplantparm
+ result = /obj/item/food/snacks/eggplantparm
/datum/recipe/microwave/soylentviridians
reagents = list("flour" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/grown/soybeans)
- result = /obj/item/reagent_containers/food/snacks/soylentviridians
+ items = list(/obj/item/food/snacks/grown/soybeans)
+ result = /obj/item/food/snacks/soylentviridians
/datum/recipe/microwave/soylentgreen
reagents = list("flour" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/meat/human,
- /obj/item/reagent_containers/food/snacks/meat/human,
+ /obj/item/food/snacks/meat/human,
+ /obj/item/food/snacks/meat/human,
)
- result = /obj/item/reagent_containers/food/snacks/soylentgreen
+ result = /obj/item/food/snacks/soylentgreen
/datum/recipe/microwave/chaosdonut
reagents = list("frostoil" = 5, "capsaicin" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/donut/chaos
+ result = /obj/item/food/snacks/donut/chaos
/datum/recipe/microwave/cheesyfries
items = list(
- /obj/item/reagent_containers/food/snacks/fries,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/fries,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/cheesyfries
+ result = /obj/item/food/snacks/cheesyfries
/datum/recipe/microwave/cubancarp
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/carpmeat,
- /obj/item/reagent_containers/food/snacks/grown/chili
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/carpmeat,
+ /obj/item/food/snacks/grown/chili
)
- result = /obj/item/reagent_containers/food/snacks/cubancarp
+ result = /obj/item/food/snacks/cubancarp
/datum/recipe/microwave/popcorn
- items = list(/obj/item/reagent_containers/food/snacks/grown/corn)
- result = /obj/item/reagent_containers/food/snacks/popcorn
+ items = list(/obj/item/food/snacks/grown/corn)
+ result = /obj/item/food/snacks/popcorn
/datum/recipe/microwave/spacylibertyduff
reagents = list("water" = 5, "vodka" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap, /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap)
- result = /obj/item/reagent_containers/food/snacks/spacylibertyduff
+ items = list(/obj/item/food/snacks/grown/mushroom/libertycap, /obj/item/food/snacks/grown/mushroom/libertycap,
+ /obj/item/food/snacks/grown/mushroom/libertycap)
+ result = /obj/item/food/snacks/spacylibertyduff
/datum/recipe/microwave/amanitajelly
reagents = list("water" = 5, "vodka" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita, /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita)
- result = /obj/item/reagent_containers/food/snacks/amanitajelly
+ items = list(/obj/item/food/snacks/grown/mushroom/amanita, /obj/item/food/snacks/grown/mushroom/amanita,
+ /obj/item/food/snacks/grown/mushroom/amanita)
+ result = /obj/item/food/snacks/amanitajelly
/datum/recipe/microwave/amanitajelly/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/amanitajelly/being_cooked = ..()
+ var/obj/item/food/snacks/amanitajelly/being_cooked = ..()
being_cooked.reagents.del_reagent("amanitin")
return being_cooked
/datum/recipe/microwave/meatballsoup
reagents = list("water" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/carrot)
- result = /obj/item/reagent_containers/food/snacks/soup/meatballsoup
+ items = list(/obj/item/food/snacks/meatball, /obj/item/food/snacks/grown/potato, /obj/item/food/snacks/grown/carrot)
+ result = /obj/item/food/snacks/soup/meatballsoup
/datum/recipe/microwave/vegetablesoup
reagents = list("water" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/corn, /obj/item/reagent_containers/food/snacks/grown/eggplant)
- result = /obj/item/reagent_containers/food/snacks/soup/vegetablesoup
+ items = list(/obj/item/food/snacks/grown/potato, /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/corn, /obj/item/food/snacks/grown/eggplant)
+ result = /obj/item/food/snacks/soup/vegetablesoup
/datum/recipe/microwave/nettlesoup
reagents = list("water" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/grown/nettle/basic, /obj/item/reagent_containers/food/snacks/grown/potato)
- result = /obj/item/reagent_containers/food/snacks/soup/nettlesoup
+ items = list(/obj/item/food/snacks/egg, /obj/item/grown/nettle/basic, /obj/item/food/snacks/grown/potato)
+ result = /obj/item/food/snacks/soup/nettlesoup
/datum/recipe/microwave/wishsoup
reagents = list("water" = 20)
- result = /obj/item/reagent_containers/food/snacks/soup/wishsoup
+ result = /obj/item/food/snacks/soup/wishsoup
/datum/recipe/microwave/hotchili
- items = list(/obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/grown/chili, /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/soup/hotchili
+ items = list(/obj/item/food/snacks/meat, /obj/item/food/snacks/grown/chili, /obj/item/food/snacks/grown/tomato)
+ result = /obj/item/food/snacks/soup/hotchili
/datum/recipe/microwave/coldchili
- items = list(/obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/grown/icepepper, /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/soup/coldchili
+ items = list(/obj/item/food/snacks/meat, /obj/item/food/snacks/grown/icepepper, /obj/item/food/snacks/grown/tomato)
+ result = /obj/item/food/snacks/soup/coldchili
/datum/recipe/microwave/spellburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/clothing/head/wizard/fake,
)
- result = /obj/item/reagent_containers/food/snacks/burger/spell
+ result = /obj/item/food/snacks/burger/spell
/datum/recipe/microwave/spellburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/clothing/head/wizard,
)
- result = /obj/item/reagent_containers/food/snacks/burger/spell
+ result = /obj/item/food/snacks/burger/spell
/datum/recipe/microwave/bigbiteburger
items = list(
- /obj/item/reagent_containers/food/snacks/burger/plain,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/egg,
+ /obj/item/food/snacks/burger/plain,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/egg,
)
- result = /obj/item/reagent_containers/food/snacks/burger/bigbite
+ result = /obj/item/food/snacks/burger/bigbite
/datum/recipe/microwave/enchiladas
items = list(
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/corn)
- result = /obj/item/reagent_containers/food/snacks/enchiladas
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/corn)
+ result = /obj/item/food/snacks/enchiladas
/datum/recipe/microwave/burrito
reagents = list("capsaicin" = 5, "rice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/beans,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/beans,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/sliceable/flatdough,
)
- result = /obj/item/reagent_containers/food/snacks/burrito
+ result = /obj/item/food/snacks/burrito
/datum/recipe/microwave/monkeysdelight
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/monkeycube,
- /obj/item/reagent_containers/food/snacks/grown/banana)
- result = /obj/item/reagent_containers/food/snacks/monkeysdelight
+ /obj/item/food/snacks/monkeycube,
+ /obj/item/food/snacks/grown/banana)
+ result = /obj/item/food/snacks/monkeysdelight
/datum/recipe/microwave/fishandchips
items = list(
- /obj/item/reagent_containers/food/snacks/fries,
- /obj/item/reagent_containers/food/snacks/carpmeat,
+ /obj/item/food/snacks/fries,
+ /obj/item/food/snacks/carpmeat,
)
- result = /obj/item/reagent_containers/food/snacks/fishandchips
+ result = /obj/item/food/snacks/fishandchips
/datum/recipe/microwave/sandwich
items = list(
- /obj/item/reagent_containers/food/snacks/meatsteak,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/meatsteak,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sandwich
+ result = /obj/item/food/snacks/sandwich
/datum/recipe/microwave/tomatosoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/soup/tomatosoup
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato)
+ result = /obj/item/food/snacks/soup/tomatosoup
/datum/recipe/microwave/stew
reagents = list("water" = 10)
items= list(
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/eggplant,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/meat)
- result = /obj/item/reagent_containers/food/snacks/soup/stew
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/eggplant,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/meat)
+ result = /obj/item/food/snacks/soup/stew
/datum/recipe/microwave/slimetoast
reagents = list("slimejelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
+ result = /obj/item/food/snacks/jelliedtoast/slime
/datum/recipe/microwave/jelliedtoast
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
+ result = /obj/item/food/snacks/jelliedtoast/cherry
/datum/recipe/microwave/misosoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/soydope,
- /obj/item/reagent_containers/food/snacks/soydope,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/tofu,
+ /obj/item/food/snacks/soydope,
+ /obj/item/food/snacks/soydope,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
)
- result = /obj/item/reagent_containers/food/snacks/soup/misosoup
+ result = /obj/item/food/snacks/soup/misosoup
/datum/recipe/microwave/stewedsoymeat
- items = list(/obj/item/reagent_containers/food/snacks/soydope, /obj/item/reagent_containers/food/snacks/soydope,
- /obj/item/reagent_containers/food/snacks/grown/carrot, /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/stewedsoymeat
+ items = list(/obj/item/food/snacks/soydope, /obj/item/food/snacks/soydope,
+ /obj/item/food/snacks/grown/carrot, /obj/item/food/snacks/grown/tomato)
+ result = /obj/item/food/snacks/stewedsoymeat
/datum/recipe/microwave/boiledspaghetti
reagents = list("water" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/spaghetti,
+ /obj/item/food/snacks/spaghetti,
)
- result = /obj/item/reagent_containers/food/snacks/boiledspaghetti
+ result = /obj/item/food/snacks/boiledspaghetti
/datum/recipe/microwave/boiledrice
reagents = list("water" = 5, "rice" = 10)
- result = /obj/item/reagent_containers/food/snacks/boiledrice
+ result = /obj/item/food/snacks/boiledrice
/datum/recipe/microwave/ricepudding
reagents = list("milk" = 5, "rice" = 10)
- result = /obj/item/reagent_containers/food/snacks/ricepudding
+ result = /obj/item/food/snacks/ricepudding
/datum/recipe/microwave/pastatomato
reagents = list("water" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/spaghetti, /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato)
- result = /obj/item/reagent_containers/food/snacks/pastatomato
+ items = list(/obj/item/food/snacks/spaghetti, /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato)
+ result = /obj/item/food/snacks/pastatomato
/datum/recipe/microwave/poppypretzel
- items = list(/obj/item/seeds/poppy, /obj/item/reagent_containers/food/snacks/dough)
- result = /obj/item/reagent_containers/food/snacks/poppypretzel
+ items = list(/obj/item/seeds/poppy, /obj/item/food/snacks/dough)
+ result = /obj/item/food/snacks/poppypretzel
/datum/recipe/microwave/meatballspaggetti
reagents = list("water" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/spaghetti,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/meatball,
+ /obj/item/food/snacks/spaghetti,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/meatball,
)
- result = /obj/item/reagent_containers/food/snacks/meatballspaghetti
+ result = /obj/item/food/snacks/meatballspaghetti
/datum/recipe/microwave/spesslaw
reagents = list("water" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/spaghetti,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/meatball,
+ /obj/item/food/snacks/spaghetti,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/meatball,
)
- result = /obj/item/reagent_containers/food/snacks/spesslaw
+ result = /obj/item/food/snacks/spesslaw
/datum/recipe/microwave/macncheese
reagents = list("water" = 5, "milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/macaroni,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/macaroni,
)
- result = /obj/item/reagent_containers/food/snacks/macncheese
+ result = /obj/item/food/snacks/macncheese
/datum/recipe/microwave/superbiteburger
reagents = list("sodiumchloride" = 5, "blackpepper" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/burger/bigbite,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/boiledegg,
- /obj/item/reagent_containers/food/snacks/tomatoslice
+ /obj/item/food/snacks/burger/bigbite,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/boiledegg,
+ /obj/item/food/snacks/tomatoslice
)
- result = /obj/item/reagent_containers/food/snacks/burger/superbite
+ result = /obj/item/food/snacks/burger/superbite
/datum/recipe/microwave/crazyburger
reagents = list("cornoil" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/chili,
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/chili,
/obj/item/toy/crayon/green,
/obj/item/flashlight/flare
)
- result = /obj/item/reagent_containers/food/snacks/burger/crazy
+ result = /obj/item/food/snacks/burger/crazy
/datum/recipe/microwave/blt
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/tomatoslice,
- /obj/item/reagent_containers/food/snacks/bacon
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/tomatoslice,
+ /obj/item/food/snacks/bacon
)
- result = /obj/item/reagent_containers/food/snacks/blt
+ result = /obj/item/food/snacks/blt
/datum/recipe/microwave/peanut_butter_jelly/cherry
reagents = list("cherryjelly" = 5, "peanutbutter" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice
)
- result = /obj/item/reagent_containers/food/snacks/peanut_butter_jelly/cherry
+ result = /obj/item/food/snacks/peanut_butter_jelly/cherry
/datum/recipe/microwave/peanut_butter_jelly/slime
reagents = list("slimejelly" = 5, "peanutbutter" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice
)
- result = /obj/item/reagent_containers/food/snacks/peanut_butter_jelly/slime
+ result = /obj/item/food/snacks/peanut_butter_jelly/slime
/datum/recipe/microwave/peanut_butter_banana
reagents = list("peanutbutter" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/peanut_butter_banana
+ result = /obj/item/food/snacks/peanut_butter_banana
/datum/recipe/microwave/philly_cheesesteak
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/onion
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/onion
)
- result = /obj/item/reagent_containers/food/snacks/philly_cheesesteak
+ result = /obj/item/food/snacks/philly_cheesesteak
/datum/recipe/microwave/ppattyred
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/red
+ result = /obj/item/food/snacks/burger/ppatty/red
/datum/recipe/microwave/ppattyorange
reagents = list("orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/orange
+ result = /obj/item/food/snacks/burger/ppatty/orange
/datum/recipe/microwave/ppattyyellow
reagents = list("lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/yellow
+ result = /obj/item/food/snacks/burger/ppatty/yellow
/datum/recipe/microwave/ppattygreen
reagents = list("limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/green
+ result = /obj/item/food/snacks/burger/ppatty/green
/datum/recipe/microwave/ppattyblue
reagents = list("berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/blue
+ result = /obj/item/food/snacks/burger/ppatty/blue
/datum/recipe/microwave/ppattypurple
reagents = list("grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/purple
+ result = /obj/item/food/snacks/burger/ppatty/purple
/datum/recipe/microwave/ppattywhite
reagents = list("sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
- /obj/item/reagent_containers/food/snacks/meat
+ /obj/item/food/snacks/bun,
+ /obj/item/food/snacks/meat
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/white
+ result = /obj/item/food/snacks/burger/ppatty/white
/datum/recipe/microwave/ppattyrainbow
items = list(
- /obj/item/reagent_containers/food/snacks/burger/ppatty/red,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/orange,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/yellow,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/green,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/blue,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/purple,
- /obj/item/reagent_containers/food/snacks/burger/ppatty/white
+ /obj/item/food/snacks/burger/ppatty/red,
+ /obj/item/food/snacks/burger/ppatty/orange,
+ /obj/item/food/snacks/burger/ppatty/yellow,
+ /obj/item/food/snacks/burger/ppatty/green,
+ /obj/item/food/snacks/burger/ppatty/blue,
+ /obj/item/food/snacks/burger/ppatty/purple,
+ /obj/item/food/snacks/burger/ppatty/white
)
- result = /obj/item/reagent_containers/food/snacks/burger/ppatty/rainbow
+ result = /obj/item/food/snacks/burger/ppatty/rainbow
/datum/recipe/microwave/elecburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/plasma
)
- result = /obj/item/reagent_containers/food/snacks/burger/elec
+ result = /obj/item/food/snacks/burger/elec
/datum/recipe/microwave/ratburger
items = list(
- /obj/item/reagent_containers/food/snacks/bun,
+ /obj/item/food/snacks/bun,
/obj/item/holder/mouse
)
- result = /obj/item/reagent_containers/food/snacks/burger/rat
+ result = /obj/item/food/snacks/burger/rat
/datum/recipe/microwave/candiedapple
reagents = list("water" = 5, "sugar" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/apple)
- result = /obj/item/reagent_containers/food/snacks/candiedapple
+ items = list(/obj/item/food/snacks/grown/apple)
+ result = /obj/item/food/snacks/candiedapple
/datum/recipe/microwave/slimeburger
reagents = list("slimejelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun
+ /obj/item/food/snacks/bun
)
- result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime
+ result = /obj/item/food/snacks/burger/jelly/slime
/datum/recipe/microwave/jellyburger
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/bun
+ /obj/item/food/snacks/bun
)
- result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry
+ result = /obj/item/food/snacks/burger/jelly/cherry
/datum/recipe/microwave/twobread
reagents = list("wine" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/twobread
+ result = /obj/item/food/snacks/twobread
/datum/recipe/microwave/slimesandwich
reagents = list("slimejelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/jellysandwich/slime
+ result = /obj/item/food/snacks/jellysandwich/slime
/datum/recipe/microwave/cherrysandwich
reagents = list("cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
+ result = /obj/item/food/snacks/jellysandwich/cherry
/datum/recipe/microwave/bloodsoup
reagents = list("blood" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/grown/tomato/blood, /obj/item/reagent_containers/food/snacks/grown/tomato/blood)
- result = /obj/item/reagent_containers/food/snacks/soup/bloodsoup
+ items = list(/obj/item/food/snacks/grown/tomato/blood, /obj/item/food/snacks/grown/tomato/blood)
+ result = /obj/item/food/snacks/soup/bloodsoup
/datum/recipe/microwave/slimesoup
reagents = list("water" = 10, "slimejelly" = 5)
- result = /obj/item/reagent_containers/food/snacks/soup/slimesoup
+ result = /obj/item/food/snacks/soup/slimesoup
/datum/recipe/microwave/clownstears
reagents = list("water" = 10)
items = list(
/obj/item/stack/ore/bananium,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/soup/clownstears
+ result = /obj/item/food/snacks/soup/clownstears
/datum/recipe/microwave/clownchili
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/tomato,
/obj/item/clothing/shoes/clown_shoes
)
- result = /obj/item/reagent_containers/food/snacks/soup/clownchili
+ result = /obj/item/food/snacks/soup/clownchili
/datum/recipe/microwave/eyesoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato,
/obj/item/organ/internal/eyes
)
- result = /obj/item/reagent_containers/food/snacks/soup/eyesoup
+ result = /obj/item/food/snacks/soup/eyesoup
/datum/recipe/microwave/sweetpotatosoup
reagents = list("water" = 10, "milk" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/potato/sweet,
- /obj/item/reagent_containers/food/snacks/grown/potato/sweet
+ /obj/item/food/snacks/grown/potato/sweet,
+ /obj/item/food/snacks/grown/potato/sweet
)
- result = /obj/item/reagent_containers/food/snacks/soup/sweetpotatosoup
+ result = /obj/item/food/snacks/soup/sweetpotatosoup
/datum/recipe/microwave/redbeetsoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/redbeet,
- /obj/item/reagent_containers/food/snacks/grown/redbeet,
- /obj/item/reagent_containers/food/snacks/grown/cabbage
+ /obj/item/food/snacks/grown/redbeet,
+ /obj/item/food/snacks/grown/redbeet,
+ /obj/item/food/snacks/grown/cabbage
)
- result = /obj/item/reagent_containers/food/snacks/soup/redbeetsoup
+ result = /obj/item/food/snacks/soup/redbeetsoup
/datum/recipe/microwave/frenchonionsoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/soup/frenchonionsoup
+ result = /obj/item/food/snacks/soup/frenchonionsoup
/datum/recipe/microwave/zurek
reagents = list("water" = 10, "flour" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/boiledegg,
- /obj/item/reagent_containers/food/snacks/sausage,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/onion
+ /obj/item/food/snacks/boiledegg,
+ /obj/item/food/snacks/sausage,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/onion
)
- result = /obj/item/reagent_containers/food/snacks/soup/zurek
+ result = /obj/item/food/snacks/soup/zurek
/datum/recipe/microwave/cullenskink
reagents = list("water" = 10, "milk" = 10, "blackpepper" = 4)
items = list(
- /obj/item/reagent_containers/food/snacks/salmonmeat,
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/grown/potato
+ /obj/item/food/snacks/salmonmeat,
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/grown/potato
)
- result = /obj/item/reagent_containers/food/snacks/soup/cullenskink
+ result = /obj/item/food/snacks/soup/cullenskink
/datum/recipe/microwave/chicken_noodle_soup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/boiledspaghetti
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/boiledspaghetti
)
- result = /obj/item/reagent_containers/food/snacks/soup/chicken_noodle_soup
+ result = /obj/item/food/snacks/soup/chicken_noodle_soup
/datum/recipe/microwave/cornchowder
reagents = list("water" = 10, "cream" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/corn,
- /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/bacon
+ /obj/item/food/snacks/grown/corn,
+ /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/bacon
)
- result = /obj/item/reagent_containers/food/snacks/soup/cornchowder
+ result = /obj/item/food/snacks/soup/cornchowder
/datum/recipe/microwave/meatball_noodles
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/grown/peanuts,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/spaghetti
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/grown/peanuts,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/spaghetti
)
- result = /obj/item/reagent_containers/food/snacks/soup/meatball_noodles
+ result = /obj/item/food/snacks/soup/meatball_noodles
/datum/recipe/microwave/seedsoup
reagents = list("water" = 10, "vinegar" = 10)
@@ -798,218 +798,218 @@
/obj/item/seeds/poppy/lily,
/obj/item/seeds/ambrosia
)
- result = /obj/item/reagent_containers/food/snacks/soup/seedsoup
+ result = /obj/item/food/snacks/soup/seedsoup
/datum/recipe/microwave/beanstew
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/beans,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/corn
+ /obj/item/food/snacks/beans,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/corn
)
- result = /obj/item/reagent_containers/food/snacks/soup/beanstew
+ result = /obj/item/food/snacks/soup/beanstew
/datum/recipe/microwave/oatstew
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/oat,
- /obj/item/reagent_containers/food/snacks/grown/potato/sweet,
- /obj/item/reagent_containers/food/snacks/grown/parsnip,
- /obj/item/reagent_containers/food/snacks/grown/carrot
+ /obj/item/food/snacks/grown/oat,
+ /obj/item/food/snacks/grown/potato/sweet,
+ /obj/item/food/snacks/grown/parsnip,
+ /obj/item/food/snacks/grown/carrot
)
- result = /obj/item/reagent_containers/food/snacks/soup/oatstew
+ result = /obj/item/food/snacks/soup/oatstew
/datum/recipe/microwave/hong_kong_borscht
reagents = list("water" = 10, "soysauce" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/onion,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/cutlet
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/onion,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/cutlet
)
- result = /obj/item/reagent_containers/food/snacks/soup/hong_kong_borscht
+ result = /obj/item/food/snacks/soup/hong_kong_borscht
/datum/recipe/microwave/hong_kong_macaroni
reagents = list("water" = 10, "cream" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/boiledspaghetti,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/bacon
+ /obj/item/food/snacks/boiledspaghetti,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/bacon
)
- result = /obj/item/reagent_containers/food/snacks/soup/hong_kong_macaroni
+ result = /obj/item/food/snacks/soup/hong_kong_macaroni
/datum/recipe/microwave/boiledslimeextract
reagents = list("water" = 5)
items = list(
/obj/item/slime_extract,
)
- result = /obj/item/reagent_containers/food/snacks/boiledslimecore
+ result = /obj/item/food/snacks/boiledslimecore
/datum/recipe/microwave/mint
reagents = list("toxin" = 5)
- result = /obj/item/reagent_containers/food/snacks/mint
+ result = /obj/item/food/snacks/mint
/datum/recipe/microwave/chocolateegg
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/chocolateegg
+ result = /obj/item/food/snacks/chocolateegg
/datum/recipe/microwave/mysterysoup
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/badrecipe,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/badrecipe,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/soup/mysterysoup
+ result = /obj/item/food/snacks/soup/mysterysoup
/datum/recipe/microwave/mushroomsoup
reagents = list("water" = 5, "milk" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/mushroom)
- result = /obj/item/reagent_containers/food/snacks/soup/mushroomsoup
+ items = list(/obj/item/food/snacks/grown/mushroom)
+ result = /obj/item/food/snacks/soup/mushroomsoup
/datum/recipe/microwave/chawanmushi
reagents = list("water" = 5, "soysauce" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/grown/mushroom
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/grown/mushroom
)
- result = /obj/item/reagent_containers/food/snacks/chawanmushi
+ result = /obj/item/food/snacks/chawanmushi
/datum/recipe/microwave/beetsoup
reagents = list("water" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/grown/whitebeet, /obj/item/reagent_containers/food/snacks/grown/cabbage)
- result = /obj/item/reagent_containers/food/snacks/soup/beetsoup
+ items = list(/obj/item/food/snacks/grown/whitebeet, /obj/item/food/snacks/grown/cabbage)
+ result = /obj/item/food/snacks/soup/beetsoup
/datum/recipe/microwave/salad
items = list(
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/cabbage
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/cabbage
)
- result = /obj/item/reagent_containers/food/snacks/salad
+ result = /obj/item/food/snacks/salad
/datum/recipe/microwave/antipasto_salad
items = list(
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/grown/olive,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/grown/olive,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/salad/antipasto
+ result = /obj/item/food/snacks/salad/antipasto
/datum/recipe/microwave/caesar_salad
reagents = list("oliveoil" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/onion_slice/red,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/breadslice
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/onion_slice/red,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/breadslice
)
- result = /obj/item/reagent_containers/food/snacks/salad/caesar
+ result = /obj/item/food/snacks/salad/caesar
/datum/recipe/microwave/citrusdelight
items = list(
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon
+ /obj/item/food/snacks/grown/citrus/lime,
+ /obj/item/food/snacks/grown/citrus/orange,
+ /obj/item/food/snacks/grown/citrus/lemon
)
- result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight
+ result = /obj/item/food/snacks/salad/citrusdelight
/datum/recipe/microwave/fruitsalad
items = list(
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange,
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/grapes,
- /obj/item/reagent_containers/food/snacks/watermelonslice
+ /obj/item/food/snacks/grown/citrus/orange,
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/grapes,
+ /obj/item/food/snacks/watermelonslice
)
- result = /obj/item/reagent_containers/food/snacks/salad/fruit
+ result = /obj/item/food/snacks/salad/fruit
/datum/recipe/microwave/greek_salad
reagents = list("oliveoil" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/olive,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/onion_slice/red,
- /obj/item/reagent_containers/food/snacks/onion_slice/red,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/grown/olive,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/onion_slice/red,
+ /obj/item/food/snacks/onion_slice/red,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/salad/greek
+ result = /obj/item/food/snacks/salad/greek
/datum/recipe/microwave/junglesalad
items = list(
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/grapes,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/watermelonslice,
- /obj/item/reagent_containers/food/snacks/watermelonslice
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/grapes,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/watermelonslice,
+ /obj/item/food/snacks/watermelonslice
)
- result = /obj/item/reagent_containers/food/snacks/salad/jungle
+ result = /obj/item/food/snacks/salad/jungle
/datum/recipe/microwave/kale_salad
reagents = list("oliveoil" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/reagent_containers/food/snacks/onion_slice/red,
- /obj/item/reagent_containers/food/snacks/onion_slice/red
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/cabbage,
+ /obj/item/food/snacks/onion_slice/red,
+ /obj/item/food/snacks/onion_slice/red
)
- result = /obj/item/reagent_containers/food/snacks/salad/kale
+ result = /obj/item/food/snacks/salad/kale
/datum/recipe/microwave/potato_salad
reagents = list("mayonnaise" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/boiledegg
+ /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/boiledegg
)
- result = /obj/item/reagent_containers/food/snacks/salad/potato
+ result = /obj/item/food/snacks/salad/potato
/datum/recipe/microwave/melonfruitbowl
items = list(
- /obj/item/reagent_containers/food/snacks/grown/watermelon,
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon
+ /obj/item/food/snacks/grown/watermelon,
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/ambrosia,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/citrus/orange,
+ /obj/item/food/snacks/grown/citrus/lemon
)
- result = /obj/item/reagent_containers/food/snacks/salad/melonfruitbowl
+ result = /obj/item/food/snacks/salad/melonfruitbowl
/datum/recipe/microwave/herbsalad
- items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/apple)
- result = /obj/item/reagent_containers/food/snacks/salad/herb
+ items = list(/obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/apple)
+ result = /obj/item/food/snacks/salad/herb
/datum/recipe/microwave/herbsalad/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/salad/herb/being_cooked = ..()
+ var/obj/item/food/snacks/salad/herb/being_cooked = ..()
being_cooked.reagents.del_reagent("toxin")
return being_cooked
/datum/recipe/microwave/aesirsalad
- items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, /obj/item/reagent_containers/food/snacks/grown/apple/gold)
- result = /obj/item/reagent_containers/food/snacks/salad/aesir
+ items = list(/obj/item/food/snacks/grown/ambrosia/deus, /obj/item/food/snacks/grown/ambrosia/deus,
+ /obj/item/food/snacks/grown/ambrosia/deus, /obj/item/food/snacks/grown/apple/gold)
+ result = /obj/item/food/snacks/salad/aesir
/datum/recipe/microwave/validsalad
- items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/meatball)
- result = /obj/item/reagent_containers/food/snacks/salad/valid
+ items = list(/obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/food/snacks/grown/ambrosia/vulgaris, /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/meatball)
+ result = /obj/item/food/snacks/salad/valid
/datum/recipe/microwave/validsalad/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/salad/valid/being_cooked = ..()
+ var/obj/item/food/snacks/salad/valid/being_cooked = ..()
being_cooked.reagents.del_reagent("toxin")
return being_cooked
@@ -1017,325 +1017,325 @@
/datum/recipe/microwave/wrap
reagents = list("soysauce" = 10)
- items = list(/obj/item/reagent_containers/food/snacks/friedegg, /obj/item/reagent_containers/food/snacks/grown/cabbage )
- result = /obj/item/reagent_containers/food/snacks/wrap
+ items = list(/obj/item/food/snacks/friedegg, /obj/item/food/snacks/grown/cabbage )
+ result = /obj/item/food/snacks/wrap
/datum/recipe/microwave/beans
reagents = list("ketchup" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/soybeans, /obj/item/reagent_containers/food/snacks/grown/soybeans)
- result = /obj/item/reagent_containers/food/snacks/beans
+ items = list(/obj/item/food/snacks/grown/soybeans, /obj/item/food/snacks/grown/soybeans)
+ result = /obj/item/food/snacks/beans
/datum/recipe/microwave/benedict
items = list(
- /obj/item/reagent_containers/food/snacks/friedegg,
- /obj/item/reagent_containers/food/snacks/meatsteak,
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/friedegg,
+ /obj/item/food/snacks/meatsteak,
+ /obj/item/food/snacks/breadslice,
)
- result = /obj/item/reagent_containers/food/snacks/benedict
+ result = /obj/item/food/snacks/benedict
/datum/recipe/microwave/meatbun
reagents = list("soysauce" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/meatball,
- /obj/item/reagent_containers/food/snacks/grown/cabbage
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/meatball,
+ /obj/item/food/snacks/grown/cabbage
)
- result = /obj/item/reagent_containers/food/snacks/meatbun
+ result = /obj/item/food/snacks/meatbun
/datum/recipe/microwave/icecreamsandwich
reagents = list("ice" = 5, "cream" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/frozen/icecream,
+ /obj/item/food/snacks/frozen/icecream,
)
- result = /obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich
+ result = /obj/item/food/snacks/frozen/icecreamsandwich
/datum/recipe/microwave/berryicecreamsandwich
reagents = list("ice" = 5, "cream" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/grown/cherries,
- /obj/item/reagent_containers/food/snacks/grown/cherries,
- /obj/item/reagent_containers/food/snacks/wafflecone
+ /obj/item/food/snacks/grown/cherries,
+ /obj/item/food/snacks/grown/cherries,
+ /obj/item/food/snacks/wafflecone
)
- result = /obj/item/reagent_containers/food/snacks/frozen/berryicecreamsandwich
+ result = /obj/item/food/snacks/frozen/berryicecreamsandwich
/datum/recipe/microwave/sundae
reagents = list("cream" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/wafflecone,
- /obj/item/reagent_containers/food/snacks/grown/cherries,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/wafflecone,
+ /obj/item/food/snacks/grown/cherries,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/frozen/sundae
+ result = /obj/item/food/snacks/frozen/sundae
/datum/recipe/microwave/bananatopsicle
reagents = list("sugar" = 5, "banana" = 5)
items = list(
/obj/item/popsicle_stick,
- /obj/item/reagent_containers/food/snacks/tofu
+ /obj/item/food/snacks/tofu
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/bananatop
+ result = /obj/item/food/snacks/frozen/popsicle/bananatop
/datum/recipe/microwave/berrytopsicle
reagents = list("sugar" = 5, "berryjuice" = 5)
items = list(
/obj/item/popsicle_stick,
- /obj/item/reagent_containers/food/snacks/tofu
+ /obj/item/food/snacks/tofu
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/berrytop
+ result = /obj/item/food/snacks/frozen/popsicle/berrytop
/datum/recipe/microwave/pineappletopsicle
reagents = list("sugar" = 5, "pineapplejuice" = 5)
items = list(
/obj/item/popsicle_stick,
- /obj/item/reagent_containers/food/snacks/tofu
+ /obj/item/food/snacks/tofu
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/pineappletop
+ result = /obj/item/food/snacks/frozen/popsicle/pineappletop
/datum/recipe/microwave/licoricecreamsicle
reagents = list("sugar" = 2, "blumpkinjuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2)
items = list(
/obj/item/popsicle_stick
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/licoricecream
+ result = /obj/item/food/snacks/frozen/popsicle/licoricecream
/datum/recipe/microwave/orangecreamsicle
reagents = list("sugar" = 2, "orangejuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2)
items = list(
/obj/item/popsicle_stick
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/orangecream
+ result = /obj/item/food/snacks/frozen/popsicle/orangecream
/datum/recipe/microwave/berrycreamsicle
reagents = list("sugar" = 2, "berryjuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2)
items = list(
/obj/item/popsicle_stick
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/berrycream
+ result = /obj/item/food/snacks/frozen/popsicle/berrycream
/datum/recipe/microwave/frozenpineapplepop
items = list(
/obj/item/popsicle_stick,
- /obj/item/reagent_containers/food/snacks/pineappleslice,
- /obj/item/reagent_containers/food/snacks/chocolatebar
+ /obj/item/food/snacks/pineappleslice,
+ /obj/item/food/snacks/chocolatebar
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/frozenpineapple
+ result = /obj/item/food/snacks/frozen/popsicle/frozenpineapple
/datum/recipe/microwave/jumboicecream
reagents = list("sugar" = 2, "ice" = 2, "vanilla" = 3, "cream" = 2)
items = list(
/obj/item/popsicle_stick,
- /obj/item/reagent_containers/food/snacks/chocolatebar
+ /obj/item/food/snacks/chocolatebar
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle
+ result = /obj/item/food/snacks/frozen/popsicle
/datum/recipe/microwave/seasalticecream
reagents = list("sugar" = 5, "sodiumchloride" = 3, "cream" = 5)
items = list(
/obj/item/popsicle_stick
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/sea_salt
+ result = /obj/item/food/snacks/frozen/popsicle/sea_salt
/datum/recipe/microwave/cornuto
reagents = list("ice" = 2, "sugar" = 4, "cream" = 4)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/chocolatebar
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/chocolatebar
)
- result = /obj/item/reagent_containers/food/snacks/frozen/cornuto
+ result = /obj/item/food/snacks/frozen/cornuto
/datum/recipe/microwave/honkdae
reagents = list("cream" = 5, "ice" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/wafflecone,
- /obj/item/reagent_containers/food/snacks/grown/cherries,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana,
+ /obj/item/food/snacks/wafflecone,
+ /obj/item/food/snacks/grown/cherries,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana,
/obj/item/clothing/mask/gas/clown_hat
)
- result = /obj/item/reagent_containers/food/snacks/frozen/honkdae
+ result = /obj/item/food/snacks/frozen/honkdae
/datum/recipe/microwave/peanutbuttermochi
reagents = list("cream" = 5, "rice" = 5, "sugar" = 5, "peanutbutter" = 2)
items = list(
- /obj/item/reagent_containers/food/snacks/wafflecone
+ /obj/item/food/snacks/wafflecone
)
- result = /obj/item/reagent_containers/food/snacks/frozen/peanutbuttermochi
+ result = /obj/item/food/snacks/frozen/peanutbuttermochi
/datum/recipe/microwave/spacefreezy
reagents = list("bluecherryjelly" = 5,"spacemountainwind" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/frozen/icecream
+ /obj/item/food/snacks/frozen/icecream
)
- result = /obj/item/reagent_containers/food/snacks/frozen/spacefreezy
+ result = /obj/item/food/snacks/frozen/spacefreezy
/datum/recipe/microwave/snowcone/apple
reagents = list("ice" = 15, "applejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/apple
+ result = /obj/item/food/snacks/frozen/snowcone/apple
/datum/recipe/microwave/snowcone/berry
reagents = list("ice" = 15, "berryjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/berry
+ result = /obj/item/food/snacks/frozen/snowcone/berry
/datum/recipe/microwave/snowcone/bluecherry
reagents = list("ice" = 15, "bluecherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/bluecherry
+ result = /obj/item/food/snacks/frozen/snowcone/bluecherry
/datum/recipe/microwave/snowcone/cherry
reagents = list("ice" = 15, "cherryjelly" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/cherry
+ result = /obj/item/food/snacks/frozen/snowcone/cherry
/datum/recipe/microwave/snowcone/flavorless
reagents = list("ice" = 15)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone
+ result = /obj/item/food/snacks/frozen/snowcone
/datum/recipe/microwave/snowcone/fruitsalad
reagents = list("ice" = 15, "orangejuice" = 5, "limejuice" = 5, "lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/fruitsalad
+ result = /obj/item/food/snacks/frozen/snowcone/fruitsalad
/datum/recipe/microwave/snowcone/grape
reagents = list("ice" = 15, "grapejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/grape
+ result = /obj/item/food/snacks/frozen/snowcone/grape
/datum/recipe/microwave/snowcone/honey
reagents = list("ice" = 15, "honey" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/honey
+ result = /obj/item/food/snacks/frozen/snowcone/honey
/datum/recipe/microwave/snowcone/lemon
reagents = list("ice" = 15, "lemonjuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/lemon
+ result = /obj/item/food/snacks/frozen/snowcone/lemon
/datum/recipe/microwave/snowcone/lime
reagents = list("ice" = 15, "limejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/lime
+ result = /obj/item/food/snacks/frozen/snowcone/lime
/datum/recipe/microwave/snowcone/mime
reagents = list("ice" = 15, "nothing" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/mime
+ result = /obj/item/food/snacks/frozen/snowcone/mime
/datum/recipe/microwave/snowcone/orange
reagents = list("ice" = 15, "orangejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/orange
+ result = /obj/item/food/snacks/frozen/snowcone/orange
/datum/recipe/microwave/snowcone/pineapple
reagents = list("ice" = 15, "pineapplejuice" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/pineapple
+ result = /obj/item/food/snacks/frozen/snowcone/pineapple
/datum/recipe/microwave/snowcone/rainbow
reagents = list("ice" = 15, "colorful_reagent" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/rainbow
+ result = /obj/item/food/snacks/frozen/snowcone/rainbow
/datum/recipe/microwave/snowcone/cola
reagents = list("ice" = 15, "cola" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/cola
+ result = /obj/item/food/snacks/frozen/snowcone/cola
/datum/recipe/microwave/snowcone/spacemountainwind
reagents = list("ice" = 15, "spacemountainwind" = 5)
items = list(
- /obj/item/reagent_containers/food/drinks/sillycup
+ /obj/item/reagent_containers/drinks/sillycup
)
- result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/spacemountain
+ result = /obj/item/food/snacks/frozen/snowcone/spacemountain
/datum/recipe/microwave/antpopsicle
reagents = list("sugar" = 5, "water" = 5, "ants" = 10)
items = list(
/obj/item/popsicle_stick
)
- result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/ant
+ result = /obj/item/food/snacks/frozen/popsicle/ant
/datum/recipe/microwave/notasandwich
items = list(
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/breadslice,
/obj/item/clothing/mask/fakemoustache,
)
- result = /obj/item/reagent_containers/food/snacks/notasandwich
+ result = /obj/item/food/snacks/notasandwich
/datum/recipe/microwave/friedbanana
reagents = list("sugar" = 10, "cornoil" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/friedbanana
+ result = /obj/item/food/snacks/friedbanana
/datum/recipe/microwave/stuffing
reagents = list("water" = 5, "sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/bread,
+ /obj/item/food/snacks/sliceable/bread,
)
- result = /obj/item/reagent_containers/food/snacks/stuffing
+ result = /obj/item/food/snacks/stuffing
/datum/recipe/microwave/boiledspiderleg
reagents = list("water" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/monstermeat/spiderleg
+ /obj/item/food/snacks/monstermeat/spiderleg
)
- result = /obj/item/reagent_containers/food/snacks/boiledspiderleg
+ result = /obj/item/food/snacks/boiledspiderleg
/datum/recipe/microwave/spidereggsham
reagents = list("sodiumchloride" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/monstermeat/spidereggs,
- /obj/item/reagent_containers/food/snacks/monstermeat/spidermeat
+ /obj/item/food/snacks/monstermeat/spidereggs,
+ /obj/item/food/snacks/monstermeat/spidermeat
)
- result = /obj/item/reagent_containers/food/snacks/spidereggsham
+ result = /obj/item/food/snacks/spidereggsham
/datum/recipe/microwave/sashimi
reagents = list("soysauce" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/monstermeat/spidereggs,
- /obj/item/reagent_containers/food/snacks/carpmeat,
+ /obj/item/food/snacks/monstermeat/spidereggs,
+ /obj/item/food/snacks/carpmeat,
)
- result = /obj/item/reagent_containers/food/snacks/sashimi
+ result = /obj/item/food/snacks/sashimi
/datum/recipe/microwave/mashedtaters
reagents = list("gravy" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/potato)
- result = /obj/item/reagent_containers/food/snacks/mashed_potatoes
+ items = list(/obj/item/food/snacks/grown/potato)
+ result = /obj/item/food/snacks/mashed_potatoes
//////////////////////////////////////////
// bs12 food port stuff
@@ -1343,19 +1343,19 @@
/datum/recipe/microwave/taco
items = list(
- /obj/item/reagent_containers/food/snacks/doughslice,
- /obj/item/reagent_containers/food/snacks/cutlet,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/doughslice,
+ /obj/item/food/snacks/cutlet,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/taco
+ result = /obj/item/food/snacks/taco
/datum/recipe/microwave/mint_2
reagents = list("sugar" = 5, "frostoil" = 5)
- result = /obj/item/reagent_containers/food/snacks/mint
+ result = /obj/item/food/snacks/mint
/datum/recipe/microwave/boiled_shrimp
reagents = list("water" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/shrimp
+ /obj/item/food/snacks/shrimp
)
- result = /obj/item/reagent_containers/food/snacks/boiled_shrimp
+ result = /obj/item/food/snacks/boiled_shrimp
diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm
index a06b87d8883c..e95dad37b108 100644
--- a/code/modules/food_and_drinks/recipes/recipes_oven.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm
@@ -4,209 +4,209 @@
/datum/recipe/oven/bun
items = list(
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/bun
+ result = /obj/item/food/snacks/bun
/datum/recipe/oven/meatbread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/meatbread
+ result = /obj/item/food/snacks/sliceable/meatbread
/datum/recipe/oven/syntibread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
- /obj/item/reagent_containers/food/snacks/meat/syntiflesh,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/meat/syntiflesh,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/meatbread
+ result = /obj/item/food/snacks/sliceable/meatbread
/datum/recipe/oven/xenomeatbread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat,
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat,
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/monstermeat/xenomeat,
+ /obj/item/food/snacks/monstermeat/xenomeat,
+ /obj/item/food/snacks/monstermeat/xenomeat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread
+ result = /obj/item/food/snacks/sliceable/xenomeatbread
/datum/recipe/oven/bananabread
reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/bananabread
+ result = /obj/item/food/snacks/sliceable/bananabread
/datum/recipe/oven/banarnarbread
reagents = list("milk" = 5, "sugar" = 5, "blood" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/banarnarbread
+ result = /obj/item/food/snacks/sliceable/banarnarbread
/datum/recipe/oven/muffin
reagents = list("milk" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
)
- result = /obj/item/reagent_containers/food/snacks/muffin
+ result = /obj/item/food/snacks/muffin
/datum/recipe/oven/carrotcake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/carrot
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/carrot
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/carrotcake
+ result = /obj/item/food/snacks/sliceable/carrotcake
/datum/recipe/oven/cheesecake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/cheesecake
+ result = /obj/item/food/snacks/sliceable/cheesecake
/datum/recipe/oven/plaincake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/plaincake
+ result = /obj/item/food/snacks/sliceable/plaincake
/datum/recipe/oven/clowncake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/frozen/sundae,
- /obj/item/reagent_containers/food/snacks/frozen/sundae,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/frozen/sundae,
+ /obj/item/food/snacks/frozen/sundae,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/clowncake
+ result = /obj/item/food/snacks/sliceable/clowncake
/datum/recipe/oven/meatpie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/meat,
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/meat,
)
- result = /obj/item/reagent_containers/food/snacks/meatpie
+ result = /obj/item/food/snacks/meatpie
/datum/recipe/oven/tofupie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/tofu,
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/tofu,
)
- result = /obj/item/reagent_containers/food/snacks/tofupie
+ result = /obj/item/food/snacks/tofupie
/datum/recipe/oven/xemeatpie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/monstermeat/xenomeat
)
- result = /obj/item/reagent_containers/food/snacks/xemeatpie
+ result = /obj/item/food/snacks/xemeatpie
/datum/recipe/oven/pie
reagents = list("sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/pie
+ result = /obj/item/food/snacks/pie
/datum/recipe/oven/cherrypie
reagents = list("sugar" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/cherries
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/cherries
)
- result = /obj/item/reagent_containers/food/snacks/cherrypie
+ result = /obj/item/food/snacks/cherrypie
/datum/recipe/oven/berryclafoutis
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/berries
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/berries
)
- result = /obj/item/reagent_containers/food/snacks/berryclafoutis
+ result = /obj/item/food/snacks/berryclafoutis
/datum/recipe/oven/tofubread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/tofubread
+ result = /obj/item/food/snacks/sliceable/tofubread
/datum/recipe/oven/loadedbakedpotato
items = list(
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/potato
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/potato
)
- result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato
+ result = /obj/item/food/snacks/loadedbakedpotato
/datum/recipe/oven/yakiimo
items = list(
- /obj/item/reagent_containers/food/snacks/grown/potato/sweet
+ /obj/item/food/snacks/grown/potato/sweet
)
- result = /obj/item/reagent_containers/food/snacks/yakiimo
+ result = /obj/item/food/snacks/yakiimo
////cookies by Ume
/datum/recipe/oven/cookies
items = list(
- /obj/item/reagent_containers/food/snacks/rawcookies/chocochips,
+ /obj/item/food/snacks/rawcookies/chocochips,
)
result = /obj/item/storage/bag/tray/cookies_tray
/datum/recipe/oven/sugarcookies
items = list(
- /obj/item/reagent_containers/food/snacks/rawcookies,
+ /obj/item/food/snacks/rawcookies,
)
result = /obj/item/storage/bag/tray/cookies_tray/sugarcookie
@@ -216,15 +216,15 @@
/datum/recipe/oven/fortunecookie
reagents = list("sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/doughslice,
+ /obj/item/food/snacks/doughslice,
/obj/item/paper,
)
- result = /obj/item/reagent_containers/food/snacks/fortunecookie
+ result = /obj/item/food/snacks/fortunecookie
/datum/recipe/oven/fortunecookie/make_food(obj/container)
var/obj/item/paper/P = locate() in container
P.loc = null //So we don't delete the paper while cooking the cookie
- var/obj/item/reagent_containers/food/snacks/fortunecookie/being_cooked = ..()
+ var/obj/item/food/snacks/fortunecookie/being_cooked = ..()
if(P.info) //If there's anything written on the paper, just move it into the fortune cookie
P.forceMove(being_cooked) //Prevents the oven deleting our paper
being_cooked.trash = P //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn
@@ -235,367 +235,367 @@
// Pizzas
/datum/recipe/oven/pizzamargherita
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margheritapizza
+ result = /obj/item/food/snacks/sliceable/pizza/margheritapizza
/datum/recipe/oven/meatpizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/tomato
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/tomato
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
+ result = /obj/item/food/snacks/sliceable/pizza/meatpizza
/datum/recipe/oven/mushroompizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/grown/tomato
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/grown/tomato
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
+ result = /obj/item/food/snacks/sliceable/pizza/mushroompizza
/datum/recipe/oven/vegetablepizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/eggplant,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/corn,
- /obj/item/reagent_containers/food/snacks/grown/tomato
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/eggplant,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/corn,
+ /obj/item/food/snacks/grown/tomato
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
+ result = /obj/item/food/snacks/sliceable/pizza/vegetablepizza
/datum/recipe/oven/hawaiianpizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/pineappleslice,
- /obj/item/reagent_containers/food/snacks/pineappleslice,
- /obj/item/reagent_containers/food/snacks/meat,
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/pineappleslice,
+ /obj/item/food/snacks/pineappleslice,
+ /obj/item/food/snacks/meat,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza
+ result = /obj/item/food/snacks/sliceable/pizza/hawaiianpizza
/datum/recipe/oven/macncheesepizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/macncheese,
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/macncheese,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
+ result = /obj/item/food/snacks/sliceable/pizza/macpizza
/datum/recipe/oven/cheesepizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/cheesepizza
+ result = /obj/item/food/snacks/sliceable/pizza/cheesepizza
/datum/recipe/oven/pepperonipizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/sausage
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/sausage
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pepperonipizza
+ result = /obj/item/food/snacks/sliceable/pizza/pepperonipizza
/datum/recipe/oven/donkpocketpizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/donkpocket,
- /obj/item/reagent_containers/food/snacks/donkpocket
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/donkpocket,
+ /obj/item/food/snacks/donkpocket
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/donkpocketpizza
+ result = /obj/item/food/snacks/sliceable/pizza/donkpocketpizza
/datum/recipe/oven/dankpizza
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/cannabis,
- /obj/item/reagent_containers/food/snacks/grown/cannabis,
- /obj/item/reagent_containers/food/snacks/grown/cannabis,
- /obj/item/reagent_containers/food/snacks/grown/cannabis
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/cannabis,
+ /obj/item/food/snacks/grown/cannabis,
+ /obj/item/food/snacks/grown/cannabis,
+ /obj/item/food/snacks/grown/cannabis
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/dankpizza
+ result = /obj/item/food/snacks/sliceable/pizza/dankpizza
/datum/recipe/oven/firecrackerpizza
reagents = list("capsaicin" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/chili
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/chili
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/firecrackerpizza
+ result = /obj/item/food/snacks/sliceable/pizza/firecrackerpizza
/datum/recipe/oven/pestopizza
reagents = list("wasabi" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pestopizza
+ result = /obj/item/food/snacks/sliceable/pizza/pestopizza
/datum/recipe/oven/garlicpizza
reagents = list("garlic" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/garlic,
- /obj/item/reagent_containers/food/snacks/grown/garlic,
- /obj/item/reagent_containers/food/snacks/cheesewedge
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/garlic,
+ /obj/item/food/snacks/grown/garlic,
+ /obj/item/food/snacks/cheesewedge
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/garlicpizza
+ result = /obj/item/food/snacks/sliceable/pizza/garlicpizza
/datum/recipe/oven/amanita_pie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/mushroom/amanita
)
- result = /obj/item/reagent_containers/food/snacks/amanita_pie
+ result = /obj/item/food/snacks/amanita_pie
/datum/recipe/oven/plump_pie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/mushroom/plumphelmet
)
- result = /obj/item/reagent_containers/food/snacks/plump_pie
+ result = /obj/item/food/snacks/plump_pie
/datum/recipe/oven/plumphelmetbiscuit
reagents = list("water" = 5, "flour" = 5)
- items = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet)
- result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
+ items = list(/obj/item/food/snacks/grown/mushroom/plumphelmet)
+ result = /obj/item/food/snacks/plumphelmetbiscuit
/datum/recipe/oven/creamcheesebread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread
+ result = /obj/item/food/snacks/sliceable/creamcheesebread
/datum/recipe/oven/baguette
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
)
- result = /obj/item/reagent_containers/food/snacks/baguette
+ result = /obj/item/food/snacks/baguette
/datum/recipe/oven/croissant
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/egg
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/egg
)
reagents = list("sodiumchloride" = 1, "milk" = 5, "sugar" = 5)
- result = /obj/item/reagent_containers/food/snacks/croissant
+ result = /obj/item/food/snacks/croissant
/datum/recipe/oven/birthdaycake
reagents = list("milk" = 5, "sugar" = 15, "vanilla" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
/obj/item/candle,
/obj/item/candle,
/obj/item/candle,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake
+ result = /obj/item/food/snacks/sliceable/birthdaycake
/datum/recipe/oven/bread
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/egg
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/egg
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/bread
+ result = /obj/item/food/snacks/sliceable/bread
/datum/recipe/oven/bread/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/sliceable/bread/being_cooked = ..()
+ var/obj/item/food/snacks/sliceable/bread/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/oven/applepie
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/apple
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/apple
)
- result = /obj/item/reagent_containers/food/snacks/applepie
+ result = /obj/item/food/snacks/applepie
/datum/recipe/oven/applecake
reagents = list("milk" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/apple
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/apple
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/applecake
+ result = /obj/item/food/snacks/sliceable/applecake
/datum/recipe/oven/orangecake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange,
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/citrus/orange,
+ /obj/item/food/snacks/grown/citrus/orange
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/orangecake
+ result = /obj/item/food/snacks/sliceable/orangecake
/datum/recipe/oven/bananacake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/bananacake
+ result = /obj/item/food/snacks/sliceable/bananacake
/datum/recipe/oven/limecake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/citrus/lime,
+ /obj/item/food/snacks/grown/citrus/lime
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/limecake
+ result = /obj/item/food/snacks/sliceable/limecake
/datum/recipe/oven/lemoncake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon,
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/grown/citrus/lemon,
+ /obj/item/food/snacks/grown/citrus/lemon
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/lemoncake
+ result = /obj/item/food/snacks/sliceable/lemoncake
/datum/recipe/oven/chocolatecake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
- /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/chocolatebar,
+ /obj/item/food/snacks/chocolatebar,
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake
+ result = /obj/item/food/snacks/sliceable/chocolatecake
/datum/recipe/oven/braincake
reagents = list("milk" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
- /obj/item/reagent_containers/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
+ /obj/item/food/snacks/dough,
/obj/item/organ/internal/brain
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/braincake
+ result = /obj/item/food/snacks/sliceable/braincake
/datum/recipe/oven/pumpkinpie
reagents = list("milk" = 5, "sugar" = 5)
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough,
- /obj/item/reagent_containers/food/snacks/grown/pumpkin
+ /obj/item/food/snacks/sliceable/flatdough,
+ /obj/item/food/snacks/grown/pumpkin
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
+ result = /obj/item/food/snacks/sliceable/pumpkinpie
/datum/recipe/oven/appletart
reagents = list("sugar" = 5, "milk" = 5, "flour" = 10)
items = list(
- /obj/item/reagent_containers/food/snacks/egg,
- /obj/item/reagent_containers/food/snacks/grown/apple/gold
+ /obj/item/food/snacks/egg,
+ /obj/item/food/snacks/grown/apple/gold
)
- result = /obj/item/reagent_containers/food/snacks/appletart
+ result = /obj/item/food/snacks/appletart
/datum/recipe/oven/appletart/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/appletart/being_cooked = ..()
+ var/obj/item/food/snacks/appletart/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/oven/cracker
reagents = list("sodiumchloride" = 1)
items = list(
- /obj/item/reagent_containers/food/snacks/doughslice
+ /obj/item/food/snacks/doughslice
)
- result = /obj/item/reagent_containers/food/snacks/cracker
+ result = /obj/item/food/snacks/cracker
/datum/recipe/oven/sugarcookie/make_food(obj/container)
- var/obj/item/reagent_containers/food/snacks/sugarcookie/being_cooked = ..()
+ var/obj/item/food/snacks/sugarcookie/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/oven/flatbread
items = list(
- /obj/item/reagent_containers/food/snacks/sliceable/flatdough
+ /obj/item/food/snacks/sliceable/flatdough
)
- result = /obj/item/reagent_containers/food/snacks/flatbread
+ result = /obj/item/food/snacks/flatbread
/datum/recipe/oven/toastedsandwich
items = list(
- /obj/item/reagent_containers/food/snacks/sandwich
+ /obj/item/food/snacks/sandwich
)
- result = /obj/item/reagent_containers/food/snacks/toastedsandwich
+ result = /obj/item/food/snacks/toastedsandwich
/datum/recipe/oven/turkey // Magic
items = list(
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/stuffing,
- /obj/item/reagent_containers/food/snacks/stuffing
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/stuffing,
+ /obj/item/food/snacks/stuffing
)
- result = /obj/item/reagent_containers/food/snacks/sliceable/turkey
+ result = /obj/item/food/snacks/sliceable/turkey
/datum/recipe/oven/tofurkey
items = list(
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/tofu,
- /obj/item/reagent_containers/food/snacks/stuffing,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/tofu,
+ /obj/item/food/snacks/stuffing,
)
- result = /obj/item/reagent_containers/food/snacks/tofurkey
+ result = /obj/item/food/snacks/tofurkey
/datum/recipe/oven/lasagna
items = list(
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/cheesewedge,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/dough
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/cheesewedge,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/dough
)
- result = /obj/item/reagent_containers/food/snacks/lasagna
+ result = /obj/item/food/snacks/lasagna
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
index c13c81bb5ab0..5aaf7023d7fc 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
@@ -11,11 +11,11 @@
/datum/crafting_recipe/sandwich
name = "Sandwich"
reqs = list(
- /obj/item/reagent_containers/food/snacks/meatsteak = 1,
- /obj/item/reagent_containers/food/snacks/breadslice = 2,
- /obj/item/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/food/snacks/meatsteak = 1,
+ /obj/item/food/snacks/breadslice = 2,
+ /obj/item/food/snacks/cheesewedge = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sandwich)
+ result = list(/obj/item/food/snacks/sandwich)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -23,9 +23,9 @@
name = "Slime Jelly Sandwich"
reqs = list(
/datum/reagent/slimejelly = 5,
- /obj/item/reagent_containers/food/snacks/breadslice = 2,
+ /obj/item/food/snacks/breadslice = 2,
)
- result = list(/obj/item/reagent_containers/food/snacks/jellysandwich/slime)
+ result = list(/obj/item/food/snacks/jellysandwich/slime)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -33,9 +33,9 @@
name = "Cherry Jelly Sandwich"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
- /obj/item/reagent_containers/food/snacks/breadslice = 2,
+ /obj/item/food/snacks/breadslice = 2,
)
- result = list(/obj/item/reagent_containers/food/snacks/jellysandwich/cherry)
+ result = list(/obj/item/food/snacks/jellysandwich/cherry)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -43,9 +43,9 @@
name = "Slime Jelly Burger"
reqs = list(
/datum/reagent/slimejelly = 5,
- /obj/item/reagent_containers/food/snacks/bun = 1,
+ /obj/item/food/snacks/bun = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/burger/jelly/slime)
+ result = list(/obj/item/food/snacks/burger/jelly/slime)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -53,9 +53,9 @@
name = "Cherry Jelly Burger"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
- /obj/item/reagent_containers/food/snacks/bun = 1,
+ /obj/item/food/snacks/bun = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/burger/jelly/cherry)
+ result = list(/obj/item/food/snacks/burger/jelly/cherry)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -63,208 +63,208 @@
name = "Home run baseball burger"
reqs = list(
/obj/item/melee/baseball_bat = 1,
- /obj/item/reagent_containers/food/snacks/bun = 1,
+ /obj/item/food/snacks/bun = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/burger/baseball)
+ result = list(/obj/item/food/snacks/burger/baseball)
category = CAT_FOOD
subcategory = CAT_SANDWICH
/datum/crafting_recipe/notasandwich
name = "not-a-sandwich"
reqs = list(
- /obj/item/reagent_containers/food/snacks/breadslice = 2,
+ /obj/item/food/snacks/breadslice = 2,
/obj/item/clothing/mask/fakemoustache = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/notasandwich)
+ result = list(/obj/item/food/snacks/notasandwich)
category = CAT_FOOD
subcategory = CAT_SANDWICH
/datum/crafting_recipe/sushi_Ebi
name = "Ebi Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/boiled_shrimp = 1,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiled_shrimp = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Ebi)
+ result = list(/obj/item/food/snacks/sushi_Ebi)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Ebi_maki
name = "Ebi Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/boiled_shrimp = 4,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiled_shrimp = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki)
+ result = list(/obj/item/food/snacks/sliceable/Ebi_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Ikura
name = "Ikura Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/salmon = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Ikura)
+ result = list(/obj/item/food/snacks/sushi_Ikura)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Ikura_maki
name = "Ikura Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/salmon = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki)
+ result = list(/obj/item/food/snacks/sliceable/Ikura_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Inari
name = "Inari Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/fried_tofu = 1,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/fried_tofu = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Inari)
+ result = list(/obj/item/food/snacks/sushi_Inari)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Inari_maki
name = "Inari Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/fried_tofu = 4,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/fried_tofu = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Inari_maki)
+ result = list(/obj/item/food/snacks/sliceable/Inari_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Sake
name = "Sake Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/salmonmeat = 1,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/salmonmeat = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Sake)
+ result = list(/obj/item/food/snacks/sushi_Sake)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Sake_maki
name = "Sake Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/salmonmeat = 4,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/salmonmeat = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Sake_maki)
+ result = list(/obj/item/food/snacks/sliceable/Sake_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_SmokedSalmon
name = "Smoked Salmon Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/salmonsteak = 1,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/salmonsteak = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon)
+ result = list(/obj/item/food/snacks/sushi_SmokedSalmon)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/SmokedSalmon_maki
name = "Smoked Salmon Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/salmonsteak = 4,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/salmonsteak = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki)
+ result = list(/obj/item/food/snacks/sliceable/SmokedSalmon_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Masago
name = "Masago Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/goldfish = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Masago)
+ result = list(/obj/item/food/snacks/sushi_Masago)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Masago_maki
name = "Masago Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/goldfish = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Masago_maki)
+ result = list(/obj/item/food/snacks/sliceable/Masago_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Tobiko
name = "Tobiko Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/shark = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Tobiko)
+ result = list(/obj/item/food/snacks/sushi_Tobiko)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Tobiko_maki
name = "Tobiko Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/boiledrice = 1,
/obj/item/fish_eggs/shark = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki)
+ result = list(/obj/item/food/snacks/sliceable/Tobiko_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_TobikoEgg
name = "Tobiko and Egg Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/sushi_Tobiko = 1,
- /obj/item/reagent_containers/food/snacks/egg = 1,
+ /obj/item/food/snacks/sushi_Tobiko = 1,
+ /obj/item/food/snacks/egg = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_TobikoEgg)
+ result = list(/obj/item/food/snacks/sushi_TobikoEgg)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/TobikoEgg_maki
name = "Tobiko and Egg Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/sushi_Tobiko = 4,
- /obj/item/reagent_containers/food/snacks/egg = 4,
+ /obj/item/food/snacks/sushi_Tobiko = 4,
+ /obj/item/food/snacks/egg = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki)
+ result = list(/obj/item/food/snacks/sliceable/TobikoEgg_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Tai
name = "Tai Sushi"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/catfishmeat = 1,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/catfishmeat = 1,
)
- result = list(/obj/item/reagent_containers/food/snacks/sushi_Tai)
+ result = list(/obj/item/food/snacks/sushi_Tai)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Tai_maki
name = "Tai Maki Roll"
reqs = list(
- /obj/item/reagent_containers/food/snacks/boiledrice = 1,
- /obj/item/reagent_containers/food/snacks/catfishmeat = 4,
+ /obj/item/food/snacks/boiledrice = 1,
+ /obj/item/food/snacks/catfishmeat = 4,
)
pathtools = list(/obj/item/kitchen/sushimat)
- result = list(/obj/item/reagent_containers/food/snacks/sliceable/Tai_maki)
+ result = list(/obj/item/food/snacks/sliceable/Tai_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -278,8 +278,8 @@
reqs = list(
/obj/item/organ/internal/brain = 1,
/obj/item/organ/internal/heart = 1,
- /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake = 1,
- /obj/item/reagent_containers/food/snacks/meat = 3,
+ /obj/item/food/snacks/sliceable/birthdaycake = 1,
+ /obj/item/food/snacks/meat = 3,
/datum/reagent/blood = 30,
/datum/reagent/consumable/sprinkles = 5,
/datum/reagent/teslium = 1,
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 9a64098491b4..eb3029bd4dac 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -66,8 +66,8 @@
return
if(length(H.cards) > 1)
- var/confirm = alert("Are you sure you want to put your [length(H.cards)] cards back into the deck?", "Return Hand", "Yes", "No")
- if(confirm == "No" || !Adjacent(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
+ var/confirm = tgui_alert(user, "Are you sure you want to put your [length(H.cards)] cards back into the deck?", "Return Hand", list("Yes", "No"))
+ if(confirm != "Yes" || !Adjacent(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
return
for(var/datum/playingcard/P in H.cards)
cards += P
@@ -191,9 +191,8 @@
for(var/mob/living/player in viewers(3))
if(!player.incapacitated())
players += player
- var/maxcards = clamp(length(cards), 1, 10)
- var/dcard = input("How many card(s) do you wish to deal? You may deal up to [maxcards] cards.") as num
- if(dcard > maxcards)
+ var/dcard = tgui_input_number(usr, "How many card(s) do you wish to deal? You may deal up to [length(cards)] cards.", "Deal Cards", max_value = length(cards))
+ if(!dcard)
return
var/mob/living/M = tgui_input_list(usr, "Who do you wish to deal [dcard] card(s)?", "Deal Card", players)
if(!usr || !src || !M || !Adjacent(usr))
@@ -354,7 +353,6 @@
dat += "Which card will you remove next? "
dat += "Turn the hand over"
var/datum/browser/popup = new(user, "cardhand", "Hand of Cards", 400, 240)
- popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
popup.set_content(dat)
popup.open()
@@ -454,7 +452,7 @@
var/mob/living/carbon/user = usr
var/maxcards = min(length(cards), 5)
- var/discards = input("How many cards do you want to discard? You may discard up to [maxcards] card(s)") as num
+ var/discards = tgui_input_number(usr, "How many cards do you want to discard? You may discard up to [maxcards] card(s)", "Discard Cards", max_value = maxcards)
if(discards > maxcards)
return
for(var/i in 1 to discards)
diff --git a/code/modules/hallucinations/effects/common.dm b/code/modules/hallucinations/effects/common.dm
index 9b29042158dc..827ab482b19a 100644
--- a/code/modules/hallucinations/effects/common.dm
+++ b/code/modules/hallucinations/effects/common.dm
@@ -112,7 +112,7 @@
/obj/effect/hallucination/chaser/attacker/proc/attack(was_weakened)
dir = get_dir(src, target)
attack_effects()
- target.adjustStaminaLoss(damage)
+ target.apply_damage(damage, STAMINA)
if(!was_weakened && target.IsWeakened())
on_knockdown()
diff --git a/code/modules/hallucinations/effects/moderate.dm b/code/modules/hallucinations/effects/moderate.dm
index 74744363c90d..187639a5cc55 100644
--- a/code/modules/hallucinations/effects/moderate.dm
+++ b/code/modules/hallucinations/effects/moderate.dm
@@ -344,11 +344,7 @@
/obj/effect/hallucination/stunprodding/Initialize(mapload, mob/living/carbon/target)
. = ..()
- var/list/turfs = list()
- for(var/turf/T in range(world.view, target))
- turfs += T
-
- var/turf/T = pick(turfs)
+ var/turf/T = pick(RANGE_TURFS(15, target))
target.playsound_local(T, 'sound/weapons/egloves.ogg', 25, TRUE)
target.playsound_local(T, get_sfx("bodyfall"), 25, TRUE)
target.playsound_local(T, "sparks", 50, TRUE)
@@ -370,12 +366,8 @@
/obj/effect/hallucination/energy_sword/Initialize(mapload, mob/living/carbon/target)
. = ..()
- var/list/turfs = list()
- for(var/turf/T in range(world.view, target))
- turfs += T
-
- var/turf/T = pick(turfs)
- loc = T
+ var/turf/T = pick(RANGE_TURFS(15, target))
+ forceMove(T)
target.playsound_local(T, 'sound/weapons/saberon.ogg', 20, TRUE)
var/scream_sound = pick('sound/goonstation/voice/female_scream.ogg', 'sound/goonstation/voice/male_scream.ogg')
@@ -406,12 +398,8 @@
/obj/effect/hallucination/gunfire/Initialize(mapload, mob/living/carbon/target)
. = ..()
- var/list/turfs = list()
- for(var/turf/T in range(world.view, target))
- turfs += T
-
- var/turf/T = pick(turfs)
- loc = T
+ var/turf/T = pick(RANGE_TURFS(15, target))
+ forceMove(T)
var/gun_sound = pick('sound/weapons/gunshots/gunshot_pistol.ogg', 'sound/weapons/gunshots/gunshot_strong.ogg')
var/scream_sound = pick('sound/goonstation/voice/female_scream.ogg', 'sound/goonstation/voice/male_scream.ogg')
diff --git a/code/modules/hallucinations/hallucinations.dm b/code/modules/hallucinations/hallucinations.dm
index d01413019a1d..aefeb0d1e4e8 100644
--- a/code/modules/hallucinations/hallucinations.dm
+++ b/code/modules/hallucinations/hallucinations.dm
@@ -52,9 +52,12 @@ GLOBAL_LIST_INIT(hallucinations, list(
/// Lazy list of images created as part of the hallucination. Cleared on destruction.
var/list/image/images = null
-/obj/effect/hallucination/Initialize(mapload, mob/living/carbon/target)
+/obj/effect/hallucination/Initialize(mapload, mob/living/carbon/hallucination_target)
. = ..()
- src.target = target
+ if(QDELETED(hallucination_target))
+ qdel(src)
+ return
+ target = hallucination_target
if(hallucination_icon && hallucination_icon_state)
var/image/I = image(hallucination_icon, hallucination_override ? src : get_turf(src), hallucination_icon_state)
I.override = hallucination_override
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 57a5eb504ed5..20919459e93b 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -95,7 +95,7 @@
if(queen_bee)
if(bee_resources >= BEE_RESOURCE_HONEYCOMB_COST && honeycombs.len < get_max_honeycomb())
bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
- var/obj/item/reagent_containers/food/snacks/honeycomb/HC = new(src)
+ var/obj/item/food/snacks/honeycomb/HC = new(src)
if(queen_bee.beegent)
HC.set_reagent(queen_bee.beegent.id)
honeycombs += HC
@@ -240,7 +240,7 @@
var/amtH = HF.honeycomb_capacity
var/fallen = 0
while(honeycombs.len && amtH) //let's pretend you always grab the frame with the most honeycomb on it
- var/obj/item/reagent_containers/food/snacks/honeycomb/HC = pick_n_take(honeycombs)
+ var/obj/item/food/snacks/honeycomb/HC = pick_n_take(honeycombs)
if(HC)
HC.forceMove(get_turf(src))
amtH--
diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm
index ce9d923f43cb..7f27bdb9841b 100644
--- a/code/modules/hydroponics/beekeeping/honeycomb.dm
+++ b/code/modules/hydroponics/beekeeping/honeycomb.dm
@@ -1,24 +1,20 @@
-/obj/item/reagent_containers/food/snacks/honeycomb
+/obj/item/food/snacks/honeycomb
name = "honeycomb"
desc = "A hexagonal mesh of honeycomb."
icon = 'icons/obj/hydroponics/harvest.dmi'
icon_state = "honeycomb"
- possible_transfer_amounts = null
- disease_amount = 0
volume = 10
- amount_per_transfer_from_this = 0
- visible_transfer_rate = FALSE
list_reagents = list("honey" = 5)
var/honey_color = ""
-/obj/item/reagent_containers/food/snacks/honeycomb/Initialize(mapload)
+/obj/item/food/snacks/honeycomb/Initialize(mapload)
. = ..()
pixel_x = rand(8,-8)
pixel_y = rand(8,-8)
update_icon(UPDATE_OVERLAYS)
-/obj/item/reagent_containers/food/snacks/honeycomb/update_overlays()
+/obj/item/food/snacks/honeycomb/update_overlays()
. = ..()
var/image/honey
if(honey_color)
@@ -29,7 +25,7 @@
. += honey
-/obj/item/reagent_containers/food/snacks/honeycomb/proc/set_reagent(reagent)
+/obj/item/food/snacks/honeycomb/proc/set_reagent(reagent)
var/datum/reagent/R = GLOB.chemical_reagents_list[reagent]
if(istype(R))
name = "honeycomb ([R.name])"
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 447083963f48..24a936cbb3c1 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -127,7 +127,7 @@
return
var/obj/item/storage/bag/plants/PB = O
- for(var/obj/item/reagent_containers/food/snacks/grown/G in PB.contents)
+ for(var/obj/item/food/snacks/grown/G in PB.contents)
if(length(stored_plants) >= max_storable_plants)
break
PB.remove_from_storage(G, src)
@@ -141,7 +141,7 @@
SStgui.update_uis(src)
return TRUE
- else if(istype(O, /obj/item/reagent_containers/food/snacks/grown))
+ else if(istype(O, /obj/item/food/snacks/grown))
if(length(stored_plants) >= max_storable_plants)
to_chat(user, "[src] can't hold any more plants!")
return
@@ -166,7 +166,7 @@
files.AddDesign2Known(D.blueprint)
processing = FALSE
- update_ui_product_list()
+ update_ui_product_list(user)
return TRUE
else
to_chat(user, "You cannot put this in [name]!")
@@ -174,7 +174,7 @@
/**
* Builds/Updates the `product_list` used by the UI.
*/
-/obj/machinery/biogenerator/proc/update_ui_product_list()
+/obj/machinery/biogenerator/proc/update_ui_product_list(mob/user)
product_list = list()
for(var/category in categories)
product_list[category] = list()
@@ -190,7 +190,8 @@
"cost" = D.materials[MAT_BIOMASS] / efficiency
)
- SStgui.update_uis(src, update_static_data = TRUE)
+ update_static_data(user)
+ SStgui.update_uis(src)
/obj/machinery/biogenerator/attack_hand(mob/user)
if(..())
@@ -200,10 +201,13 @@
/obj/machinery/biogenerator/attack_ghost(mob/user)
ui_interact(user)
-/obj/machinery/biogenerator/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/biogenerator/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/biogenerator/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "Biogenerator", "Biogenerator", 390, 600, master_ui, state)
+ ui = new(user, src, "Biogenerator", "Biogenerator")
ui.set_autoupdate(FALSE)
ui.open()
diff --git a/code/modules/hydroponics/compost_bin.dm b/code/modules/hydroponics/compost_bin.dm
index 18519207f6ba..50ff4c918da7 100644
--- a/code/modules/hydroponics/compost_bin.dm
+++ b/code/modules/hydroponics/compost_bin.dm
@@ -40,7 +40,7 @@
return default_deconstruction_crowbar(user, I, ignore_panel = TRUE)
// Accepts inserted plants and converts them to biomass
-/obj/machinery/compost_bin/proc/make_biomass(obj/item/reagent_containers/food/snacks/grown/O)
+/obj/machinery/compost_bin/proc/make_biomass(obj/item/food/snacks/grown/O)
// calculate biomass from plant nutriment and plant matter
var/plant_biomass = O.reagents.get_reagent_amount("nutriment") + O.reagents.get_reagent_amount("plantmatter")
biomass += clamp(plant_biomass * 10, 1, biomass_capacity - biomass)
@@ -58,7 +58,7 @@
return
var/obj/item/storage/bag/plants/PB = O
- for(var/obj/item/reagent_containers/food/snacks/grown/G in PB.contents)
+ for(var/obj/item/food/snacks/grown/G in PB.contents)
PB.remove_from_storage(G, src)
make_biomass(G)
@@ -74,7 +74,7 @@
update_icon_state()
return TRUE
- if(istype(O, /obj/item/reagent_containers/food/snacks/grown))
+ if(istype(O, /obj/item/food/snacks/grown))
if(biomass >= biomass_capacity)
to_chat(user, "[src] can't hold any more plants!")
return
@@ -118,10 +118,13 @@
/obj/machinery/compost_bin/attack_hand(mob/user)
ui_interact(user)
-/obj/machinery/compost_bin/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/compost_bin/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/compost_bin/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "CompostBin", "Compost Bin", 390, 200, master_ui, state)
+ ui = new(user, src, "CompostBin", "Compost Bin")
ui.set_autoupdate(FALSE)
ui.open()
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index ef4b978936f6..71c296d900bd 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -17,9 +17,9 @@
/obj/structure/fermenting_barrel/examine(mob/user)
. = ..()
- . += "It is currently [open ? "open, letting you pour liquids in." : "closed, letting you draw liquids from the tap."] "
+ . += "It is currently [open ? "open, letting you pour liquids in." : "closed, letting you draw liquids from the tap."]"
-/obj/structure/fermenting_barrel/proc/makeWine(obj/item/reagent_containers/food/snacks/grown/G)
+/obj/structure/fermenting_barrel/proc/makeWine(obj/item/food/snacks/grown/G)
if(G.reagents)
G.reagents.trans_to(src, G.reagents.total_volume)
var/amount = G.seed.potency / 4
@@ -39,7 +39,7 @@
playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
/obj/structure/fermenting_barrel/attackby(obj/item/I, mob/user, params)
- var/obj/item/reagent_containers/food/snacks/grown/G = I
+ var/obj/item/food/snacks/grown/G = I
if(istype(G))
if(!G.can_distill)
to_chat(user, "You can't distill this into anything...")
diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm
index de80880e5712..7d10426d9ed5 100644
--- a/code/modules/hydroponics/gene_modder.dm
+++ b/code/modules/hydroponics/gene_modder.dm
@@ -142,10 +142,13 @@
/obj/machinery/plantgenes/attack_ghost(mob/user)
ui_interact(user)
-/obj/machinery/plantgenes/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/plantgenes/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/plantgenes/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "GeneModder", name, 500, 700, master_ui, state)
+ ui = new(user, src, "GeneModder", name)
ui.open()
/obj/machinery/plantgenes/ui_data(mob/user)
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 2e40c78ed7ec..eb3b7576058e 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -4,7 +4,7 @@
// ***********************************************************
// Base type. Subtypes are found in /grown dir.
-/obj/item/reagent_containers/food/snacks/grown
+/obj/item/food/snacks/grown
icon = 'icons/obj/hydroponics/harvest.dmi'
var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
var/plantname = ""
@@ -18,7 +18,7 @@
resistance_flags = FLAMMABLE
origin_tech = "biotech=1"
-/obj/item/reagent_containers/food/snacks/grown/Initialize(mapload, obj/item/seeds/new_seed = null)
+/obj/item/food/snacks/grown/Initialize(mapload, obj/item/seeds/new_seed = null)
. = ..()
if(!tastes)
tastes = list("[name]" = 1)
@@ -45,25 +45,25 @@
if(seed.variant)
name += " \[[seed.variant]]"
-/obj/item/reagent_containers/food/snacks/grown/Destroy()
+/obj/item/food/snacks/grown/Destroy()
QDEL_NULL(seed)
return ..()
-/obj/item/reagent_containers/food/snacks/grown/proc/add_juice()
+/obj/item/food/snacks/grown/proc/add_juice()
if(reagents)
if(bitesize_mod)
bitesize = 1 + round(reagents.total_volume / bitesize_mod)
return 1
return 0
-/obj/item/reagent_containers/food/snacks/grown/examine(user)
+/obj/item/food/snacks/grown/examine(user)
. = ..()
if(seed)
for(var/datum/plant_gene/trait/T in seed.genes)
if(T.examine_line)
. += T.examine_line
-/obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params)
+/obj/item/food/snacks/grown/attackby(obj/item/O, mob/user, params)
..()
if(slices_num && slice_path)
var/inaccurate = TRUE
@@ -112,12 +112,12 @@
// Various gene procs
-/obj/item/reagent_containers/food/snacks/grown/attack_self(mob/user)
+/obj/item/food/snacks/grown/attack_self(mob/user)
if(seed && seed.get_gene(/datum/plant_gene/trait/squash))
squash(user)
..()
-/obj/item/reagent_containers/food/snacks/grown/throw_impact(atom/hit_atom)
+/obj/item/food/snacks/grown/throw_impact(atom/hit_atom)
if(!..()) //was it caught by a mob?
if(seed)
log_action(locateUID(thrownby), hit_atom, "Thrown [src] at")
@@ -126,7 +126,7 @@
if(seed.get_gene(/datum/plant_gene/trait/squash))
squash(hit_atom)
-/obj/item/reagent_containers/food/snacks/grown/proc/squash(atom/target)
+/obj/item/food/snacks/grown/proc/squash(atom/target)
var/turf/T = get_turf(target)
if(ispath(splat_type, /obj/effect/decal/cleanable/plant_smudge))
if(filling_color)
@@ -151,28 +151,28 @@
qdel(src)
-/obj/item/reagent_containers/food/snacks/grown/On_Consume(mob/M, mob/user)
+/obj/item/food/snacks/grown/On_Consume(mob/M, mob/user)
if(iscarbon(M))
if(seed)
for(var/datum/plant_gene/trait/T in seed.genes)
T.on_consume(src, M)
..()
-/obj/item/reagent_containers/food/snacks/grown/after_slip(mob/living/carbon/human/H)
+/obj/item/food/snacks/grown/after_slip(mob/living/carbon/human/H)
if(!seed)
return
for(var/datum/plant_gene/trait/T in seed.genes)
T.on_slip(src, H)
// Glow gene procs
-/obj/item/reagent_containers/food/snacks/grown/generate_trash(atom/location)
+/obj/item/food/snacks/grown/generate_trash(atom/location)
if(trash && ispath(trash, /obj/item/grown))
. = new trash(location, seed)
trash = null
return
return ..()
-/obj/item/reagent_containers/food/snacks/grown/decompile_act(obj/item/matter_decompiler/C, mob/user)
+/obj/item/food/snacks/grown/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(isdrone(user))
C.stored_comms["wood"] += 4
qdel(src)
@@ -180,7 +180,7 @@
return ..()
// For item-containing growns such as eggy or gatfruit
-/obj/item/reagent_containers/food/snacks/grown/shell/attack_self(mob/user)
+/obj/item/food/snacks/grown/shell/attack_self(mob/user)
if(!do_after(user, 1.5 SECONDS, target = user))
return
user.unEquip(src)
@@ -191,14 +191,14 @@
qdel(src)
// Diona Nymphs can eat these as well as weeds to gain nutrition.
-/obj/item/reagent_containers/food/snacks/grown/attack_animal(mob/living/simple_animal/M)
+/obj/item/food/snacks/grown/attack_animal(mob/living/simple_animal/M)
if(isnymph(M))
var/mob/living/simple_animal/diona/D = M
D.consume(src)
else
return ..()
-/obj/item/reagent_containers/food/snacks/grown/proc/log_action(mob/user, atom/target, what_done)
+/obj/item/food/snacks/grown/proc/log_action(mob/user, atom/target, what_done)
var/reagent_str = reagents.log_list()
var/genes_str = "No genes"
if(seed && length(seed.genes))
@@ -211,7 +211,7 @@
add_attack_logs(user, target, "[what_done] ([reagent_str] | [genes_str])")
-/obj/item/reagent_containers/food/snacks/grown/extinguish_light(force = FALSE)
+/obj/item/food/snacks/grown/extinguish_light(force = FALSE)
if(!force)
return
if(seed.get_gene(/datum/plant_gene/trait/glow/shadow))
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index 9f1f8d8744ad..0cd8dfcdb5e2 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -1,5 +1,5 @@
// Ambrosia - base type
-/obj/item/reagent_containers/food/snacks/grown/ambrosia
+/obj/item/food/snacks/grown/ambrosia
seed = /obj/item/seeds/ambrosia
name = "ambrosia branch"
desc = "This is a plant."
@@ -20,7 +20,7 @@
icon_state = "seed-ambrosiavulgaris"
species = "ambrosiavulgaris"
plantname = "Ambrosia Vulgaris"
- product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris
+ product = /obj/item/food/snacks/grown/ambrosia/vulgaris
lifespan = 60
endurance = 25
yield = 6
@@ -30,7 +30,7 @@
mutatelist = list(/obj/item/seeds/ambrosia/deus)
reagents_add = list("space_drugs" = 0.15, "bicaridine" = 0.1, "kelotane" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.05, "toxin" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris
+/obj/item/food/snacks/grown/ambrosia/vulgaris
seed = /obj/item/seeds/ambrosia
name = "ambrosia vulgaris branch"
desc = "This is a plant containing various healing chemicals."
@@ -44,12 +44,12 @@
icon_state = "seed-ambrosiadeus"
species = "ambrosiadeus"
plantname = "Ambrosia Deus"
- product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
+ product = /obj/item/food/snacks/grown/ambrosia/deus
mutatelist = list(/obj/item/seeds/ambrosia/gaia)
reagents_add = list("weak_omnizine" = 0.15, "synaptizine" = 0.15, "space_drugs" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.05)
rarity = 40
-/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
+/obj/item/food/snacks/grown/ambrosia/deus
seed = /obj/item/seeds/ambrosia/deus
name = "ambrosia deus branch"
desc = "Eating this makes you feel immortal!"
@@ -70,7 +70,7 @@
icon_state = "seed-ambrosia_gaia"
species = "ambrosia_gaia"
plantname = "Ambrosia Gaia"
- product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia
+ product = /obj/item/food/snacks/grown/ambrosia/gaia
mutatelist = list()
reagents_add = list("earthsblood" = 0.05, "nutriment" = 0.06, "vitamin" = 0.05)
rarity = 30 //These are some pretty good plants right here
@@ -78,7 +78,7 @@
weed_rate = 4
weed_chance = 100
-/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia
+/obj/item/food/snacks/grown/ambrosia/gaia
name = "ambrosia gaia branch"
desc = "Eating this makes you immortal."
icon_state = "ambrosia_gaia"
@@ -92,12 +92,12 @@
// Ambrosia Cruciatus
/obj/item/seeds/ambrosia/cruciatus
- product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/cruciatus
+ product = /obj/item/food/snacks/grown/ambrosia/cruciatus
potency = 10
mutatelist = list()
reagents_add = list("thc" = 0.15, "kelotane" = 0.15, "bicaridine" = 0.1, "bath_salts" = 0.20, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/ambrosia/cruciatus
+/obj/item/food/snacks/grown/ambrosia/cruciatus
seed = /obj/item/seeds/ambrosia/cruciatus
wine_power = 0.7
tastes = list("ambrosia cruciatus" = 1)
diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm
index 7510c3cdfb6e..f1cd12752313 100644
--- a/code/modules/hydroponics/grown/apple.dm
+++ b/code/modules/hydroponics/grown/apple.dm
@@ -5,7 +5,7 @@
icon_state = "seed-apple"
species = "apple"
plantname = "Apple Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/apple
+ product = /obj/item/food/snacks/grown/apple
lifespan = 55
endurance = 35
yield = 5
@@ -16,7 +16,7 @@
mutatelist = list(/obj/item/seeds/apple/gold)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/apple
+/obj/item/food/snacks/grown/apple
seed = /obj/item/seeds/apple
name = "apple"
desc = "It's a little piece of Eden."
@@ -28,12 +28,12 @@
// Posioned Apple
/obj/item/seeds/apple/poisoned
- product = /obj/item/reagent_containers/food/snacks/grown/apple/poisoned
+ product = /obj/item/food/snacks/grown/apple/poisoned
mutatelist = list()
reagents_add = list("cyanide" = 0.5, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 50 // Source of cyanide, and hard (almost impossible) to obtain normally.
-/obj/item/reagent_containers/food/snacks/grown/apple/poisoned
+/obj/item/food/snacks/grown/apple/poisoned
seed = /obj/item/seeds/apple/poisoned
// Gold Apple
@@ -43,14 +43,14 @@
icon_state = "seed-goldapple"
species = "goldapple"
plantname = "Golden Apple Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/apple/gold
+ product = /obj/item/food/snacks/grown/apple/gold
maturation = 10
production = 10
mutatelist = list()
reagents_add = list("gold" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 40 // Alchemy!
-/obj/item/reagent_containers/food/snacks/grown/apple/gold
+/obj/item/food/snacks/grown/apple/gold
seed = /obj/item/seeds/apple/gold
name = "golden apple"
desc = "Emblazoned upon the apple is the word 'Kallisti'."
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 67b3df02b901..57d8f8c7e5d2 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -5,7 +5,7 @@
icon_state = "seed-banana"
species = "banana"
plantname = "Banana Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/banana
+ product = /obj/item/food/snacks/grown/banana
lifespan = 50
endurance = 30
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
@@ -14,7 +14,7 @@
mutatelist = list(/obj/item/seeds/banana/mime, /obj/item/seeds/banana/bluespace)
reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.02)
-/obj/item/reagent_containers/food/snacks/grown/banana
+/obj/item/food/snacks/grown/banana
seed = /obj/item/seeds/banana
name = "banana"
desc = "It's an excellent prop for a clown."
@@ -26,11 +26,11 @@
distill_reagent = "bananahonk"
tastes = list("banana" = 1)
-/obj/item/reagent_containers/food/snacks/grown/banana/Initialize(mapload)
+/obj/item/food/snacks/grown/banana/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_CAN_POINT_WITH, ROUNDSTART_TRAIT)
-/obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
+/obj/item/food/snacks/grown/banana/suicide_act(mob/user)
user.visible_message("[user] is aiming [src] at [user.p_themselves()]! It looks like [user.p_theyre()] trying to commit suicide.")
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
sleep(25)
@@ -81,13 +81,13 @@
icon_state = "seed-mimana"
species = "mimana"
plantname = "Mimana Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/banana/mime
+ product = /obj/item/food/snacks/grown/banana/mime
growthstages = 4
mutatelist = list()
reagents_add = list("nothing" = 0.1, "capulettium_plus" = 0.1, "nutriment" = 0.02)
rarity = 15
-/obj/item/reagent_containers/food/snacks/grown/banana/mime
+/obj/item/food/snacks/grown/banana/mime
seed = /obj/item/seeds/banana/mime
name = "mimana"
desc = "It's an excellent prop for a mime."
@@ -110,13 +110,13 @@
species = "bluespacebanana"
icon_grow = "banana-grow"
plantname = "Bluespace Banana Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/banana/bluespace
+ product = /obj/item/food/snacks/grown/banana/bluespace
mutatelist = list()
genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("singulo" = 0.2, "banana" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.02)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/banana/bluespace
+/obj/item/food/snacks/grown/banana/bluespace
seed = /obj/item/seeds/banana/bluespace
name = "bluespace banana"
icon_state = "bluenana"
diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm
index 3482fd89ecbf..4c0ad33b5f46 100644
--- a/code/modules/hydroponics/grown/beans.dm
+++ b/code/modules/hydroponics/grown/beans.dm
@@ -5,7 +5,7 @@
icon_state = "seed-soybean"
species = "soybean"
plantname = "Soybean Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/soybeans
+ product = /obj/item/food/snacks/grown/soybeans
maturation = 4
production = 4
potency = 15
@@ -17,7 +17,7 @@
mutatelist = list(/obj/item/seeds/soya/koi)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05, "soybeanoil" = 0.03)
-/obj/item/reagent_containers/food/snacks/grown/soybeans
+/obj/item/food/snacks/grown/soybeans
seed = /obj/item/seeds/soya
name = "soybeans"
desc = "It's pretty bland, but oh the possibilities..."
@@ -35,13 +35,13 @@
icon_state = "seed-koibean"
species = "koibean"
plantname = "Koibean Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/koibeans
+ product = /obj/item/food/snacks/grown/koibeans
potency = 10
mutatelist = list()
reagents_add = list("carpotoxin" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.05)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/koibeans
+/obj/item/food/snacks/grown/koibeans
seed = /obj/item/seeds/soya/koi
name = "koibean"
desc = "Something about these seems fishy."
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index 07eb158689e6..78f651294985 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -5,7 +5,7 @@
icon_state = "seed-berry"
species = "berry"
plantname = "Berry Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/berries
+ product = /obj/item/food/snacks/grown/berries
lifespan = 20
maturation = 5
production = 5
@@ -17,7 +17,7 @@
mutatelist = list(/obj/item/seeds/berry/glow, /obj/item/seeds/berry/poison)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/berries
+/obj/item/food/snacks/grown/berries
seed = /obj/item/seeds/berry
name = "bunch of berries"
desc = "Nutritious!"
@@ -35,12 +35,12 @@
icon_state = "seed-poisonberry"
species = "poisonberry"
plantname = "Poison-Berry Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/berries/poison
+ product = /obj/item/food/snacks/grown/berries/poison
mutatelist = list(/obj/item/seeds/berry/death)
reagents_add = list("cyanide" = 0.15, "tirizene" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 10 // Mildly poisonous berries are common in reality
-/obj/item/reagent_containers/food/snacks/grown/berries/poison
+/obj/item/food/snacks/grown/berries/poison
seed = /obj/item/seeds/berry/poison
name = "bunch of poison-berries"
desc = "Taste so good, you could die!"
@@ -57,14 +57,14 @@
icon_state = "seed-deathberry"
species = "deathberry"
plantname = "Death Berry Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/berries/death
+ product = /obj/item/food/snacks/grown/berries/death
lifespan = 30
potency = 50
mutatelist = list()
reagents_add = list("coniine" = 0.08, "tirizene" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/berries/death
+/obj/item/food/snacks/grown/berries/death
seed = /obj/item/seeds/berry/death
name = "bunch of death-berries"
desc = "Taste so good, you could die!"
@@ -81,7 +81,7 @@
icon_state = "seed-glowberry"
species = "glowberry"
plantname = "Glow-Berry Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/berries/glow
+ product = /obj/item/food/snacks/grown/berries/glow
lifespan = 30
endurance = 25
mutatelist = list()
@@ -89,7 +89,7 @@
reagents_add = list("uranium" = 0.25, "iodine" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/berries/glow
+/obj/item/food/snacks/grown/berries/glow
seed = /obj/item/seeds/berry/glow
name = "bunch of glow-berries"
desc = "Nutritious!"
@@ -109,7 +109,7 @@
icon_state = "seed-cherry"
species = "cherry"
plantname = "Cherry Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/cherries
+ product = /obj/item/food/snacks/grown/cherries
lifespan = 35
endurance = 35
maturation = 5
@@ -122,7 +122,7 @@
mutatelist = list(/obj/item/seeds/cherry/blue)
reagents_add = list("plantmatter" = 0.07, "sugar" = 0.07)
-/obj/item/reagent_containers/food/snacks/grown/cherries
+/obj/item/food/snacks/grown/cherries
seed = /obj/item/seeds/cherry
name = "cherries"
desc = "Great for toppings!"
@@ -140,12 +140,12 @@
icon_state = "seed-bluecherry"
species = "bluecherry"
plantname = "Blue Cherry Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/bluecherries
+ product = /obj/item/food/snacks/grown/bluecherries
mutatelist = list()
reagents_add = list("plantmatter" = 0.07, "sugar" = 0.07)
rarity = 10
-/obj/item/reagent_containers/food/snacks/grown/bluecherries
+/obj/item/food/snacks/grown/bluecherries
seed = /obj/item/seeds/cherry/blue
name = "blue cherries"
desc = "They're cherries that are blue."
@@ -162,7 +162,7 @@
icon_state = "seed-grapes"
species = "grape"
plantname = "Grape Vine"
- product = /obj/item/reagent_containers/food/snacks/grown/grapes
+ product = /obj/item/food/snacks/grown/grapes
lifespan = 50
endurance = 25
maturation = 3
@@ -176,12 +176,12 @@
mutatelist = list(/obj/item/seeds/grape/green)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1, "sugar" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/grapes
+/obj/item/food/snacks/grown/grapes
seed = /obj/item/seeds/grape
name = "bunch of grapes"
desc = "Nutritious!"
icon_state = "grapes"
- dried_type = /obj/item/reagent_containers/food/snacks/no_raisin/healthy
+ dried_type = /obj/item/food/snacks/no_raisin/healthy
filling_color = "#FF1493"
bitesize_mod = 2
tastes = list("grapes" = 1)
@@ -194,12 +194,12 @@
icon_state = "seed-greengrapes"
species = "greengrape"
plantname = "Green-Grape Vine"
- product = /obj/item/reagent_containers/food/snacks/grown/grapes/green
+ product = /obj/item/food/snacks/grown/grapes/green
reagents_add = list("kelotane" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1, "sugar" = 0.1)
// No rarity: technically it's a beneficial mutant, but it's not exactly "new"...
mutatelist = list()
-/obj/item/reagent_containers/food/snacks/grown/grapes/green
+/obj/item/food/snacks/grown/grapes/green
seed = /obj/item/seeds/grape/green
name = "bunch of green grapes"
icon_state = "greengrapes"
diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm
index 9dedaa18d837..ce96f21d6668 100644
--- a/code/modules/hydroponics/grown/cannabis.dm
+++ b/code/modules/hydroponics/grown/cannabis.dm
@@ -5,7 +5,7 @@
icon_state = "seed-cannabis"
species = "cannabis"
plantname = "Cannabis Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/cannabis
+ product = /obj/item/food/snacks/grown/cannabis
maturation = 8
potency = 20
growthstages = 1
@@ -24,7 +24,7 @@
icon_state = "seed-megacannabis"
species = "megacannabis"
plantname = "Rainbow Weed"
- product = /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow
+ product = /obj/item/food/snacks/grown/cannabis/rainbow
mutatelist = list(/obj/item/seeds/cannabis/death,
/obj/item/seeds/cannabis/ultimate)
reagents_add = list("lsd" = 0.15, "thc" = 0.15, "cbd" = 0.15, "happiness" = 0.15)
@@ -36,7 +36,7 @@
icon_state = "seed-blackcannabis"
species = "blackcannabis"
plantname = "Deathweed"
- product = /obj/item/reagent_containers/food/snacks/grown/cannabis/death
+ product = /obj/item/food/snacks/grown/cannabis/death
mutatelist = list()
reagents_add = list("cyanide" = 0.35, "thc" = 0.15, "cbd" = 0.15)
rarity = 40
@@ -47,7 +47,7 @@
icon_state = "seed-whitecannabis"
species = "whitecannabis"
plantname = "Lifeweed"
- product = /obj/item/reagent_containers/food/snacks/grown/cannabis/white
+ product = /obj/item/food/snacks/grown/cannabis/white
mutatelist = list(/obj/item/seeds/cannabis/death,
/obj/item/seeds/cannabis/ultimate)
reagents_add = list("omnizine" = 0.35, "thc" = 0.15, "cbd" = 0.15)
@@ -60,7 +60,7 @@
icon_state = "seed-ocannabis"
species = "ocannabis"
plantname = "Omega Weed"
- product = /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate
+ product = /obj/item/food/snacks/grown/cannabis/ultimate
mutatelist = list()
reagents_add = list("lsd" = 0.05,
"suicider" = 0.05,
@@ -85,7 +85,7 @@
// ---------------------------------------------------------------
-/obj/item/reagent_containers/food/snacks/grown/cannabis
+/obj/item/food/snacks/grown/cannabis
seed = /obj/item/seeds/cannabis
icon = 'icons/goonstation/objects/hydroponics.dmi'
name = "cannabis leaf"
@@ -97,28 +97,28 @@
wine_power = 0.2
-/obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow
+/obj/item/food/snacks/grown/cannabis/rainbow
seed = /obj/item/seeds/cannabis/rainbow
name = "rainbow cannabis leaf"
desc = "Is it supposed to be glowing like that...?"
icon_state = "megacannabis"
wine_power = 0.6
-/obj/item/reagent_containers/food/snacks/grown/cannabis/death
+/obj/item/food/snacks/grown/cannabis/death
seed = /obj/item/seeds/cannabis/death
name = "death cannabis leaf"
desc = "Looks a bit dark. Oh well."
icon_state = "blackcannabis"
wine_power = 0.4
-/obj/item/reagent_containers/food/snacks/grown/cannabis/white
+/obj/item/food/snacks/grown/cannabis/white
seed = /obj/item/seeds/cannabis/white
name = "white cannabis leaf"
desc = "It feels smooth and nice to the touch."
icon_state = "whitecannabis"
wine_power = 0.1
-/obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate
+/obj/item/food/snacks/grown/cannabis/ultimate
seed = /obj/item/seeds/cannabis/ultimate
name = "omega cannibas leaf"
desc = "You feel dizzy looking at it. What the fuck?"
diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm
index 89b462a19e11..3ed266947518 100644
--- a/code/modules/hydroponics/grown/cereals.dm
+++ b/code/modules/hydroponics/grown/cereals.dm
@@ -5,7 +5,7 @@
icon_state = "seed-wheat"
species = "wheat"
plantname = "Wheat Stalks"
- product = /obj/item/reagent_containers/food/snacks/grown/wheat
+ product = /obj/item/food/snacks/grown/wheat
production = 1
yield = 4
potency = 15
@@ -13,7 +13,7 @@
mutatelist = list(/obj/item/seeds/wheat/oat, /obj/item/seeds/wheat/meat)
reagents_add = list("plantmatter" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/wheat
+/obj/item/food/snacks/grown/wheat
seed = /obj/item/seeds/wheat
name = "wheat"
desc = "Sigh... wheat... a-grain?"
@@ -31,10 +31,10 @@
icon_state = "seed-oat"
species = "oat"
plantname = "Oat Stalks"
- product = /obj/item/reagent_containers/food/snacks/grown/oat
+ product = /obj/item/food/snacks/grown/oat
mutatelist = list()
-/obj/item/reagent_containers/food/snacks/grown/oat
+/obj/item/food/snacks/grown/oat
seed = /obj/item/seeds/wheat/oat
name = "oat"
desc = "Eat oats, do squats."
@@ -52,11 +52,11 @@
icon_state = "seed-rice"
species = "rice"
plantname = "Rice Stalks"
- product = /obj/item/reagent_containers/food/snacks/grown/rice
+ product = /obj/item/food/snacks/grown/rice
mutatelist = list()
growthstages = 3
-/obj/item/reagent_containers/food/snacks/grown/rice
+/obj/item/food/snacks/grown/rice
seed = /obj/item/seeds/wheat/rice
name = "rice"
desc = "Rice to meet you."
@@ -74,11 +74,11 @@
icon_state = "seed-meatwheat"
species = "meatwheat"
plantname = "Meatwheat"
- product = /obj/item/reagent_containers/food/snacks/grown/meatwheat
+ product = /obj/item/food/snacks/grown/meatwheat
mutatelist = list()
reagents_add = list("protein" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/meatwheat
+/obj/item/food/snacks/grown/meatwheat
name = "meatwheat"
desc = "Some blood-drenched wheat stalks. You can crush them into what passes for meat if you squint hard enough."
icon_state = "meatwheat"
@@ -89,10 +89,10 @@
tastes = list("meatwheat" = 1)
can_distill = FALSE
-/obj/item/reagent_containers/food/snacks/grown/meatwheat/attack_self(mob/living/user)
+/obj/item/food/snacks/grown/meatwheat/attack_self(mob/living/user)
user.visible_message("[user] crushes [src] into meat.", "You crush [src] into something that resembles meat.")
playsound(user, 'sound/effects/blobattack.ogg', 50, 1)
- var/obj/item/reagent_containers/food/snacks/meat/meatwheat/M = new(get_turf(user))
+ var/obj/item/food/snacks/meat/meatwheat/M = new(get_turf(user))
user.drop_item()
qdel(src)
user.put_in_hands(M)
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index 3908262a6a24..63202491bffc 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -5,7 +5,7 @@
icon_state = "seed-chili"
species = "chili"
plantname = "Chili Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/chili
+ product = /obj/item/food/snacks/grown/chili
lifespan = 20
maturation = 5
production = 5
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/chili/ice, /obj/item/seeds/chili/ghost)
reagents_add = list("capsaicin" = 0.25, "vitamin" = 0.04, "plantmatter" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/chili
+/obj/item/food/snacks/grown/chili
seed = /obj/item/seeds/chili
name = "chili"
desc = "It's spicy! Wait... IT'S BURNING ME!!"
@@ -35,7 +35,7 @@
icon_state = "seed-icepepper"
species = "chiliice"
plantname = "Chilly Pepper Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/icepepper
+ product = /obj/item/food/snacks/grown/icepepper
lifespan = 25
maturation = 4
production = 4
@@ -43,7 +43,7 @@
mutatelist = list()
reagents_add = list("frostoil" = 0.25, "vitamin" = 0.02, "plantmatter" = 0.02)
-/obj/item/reagent_containers/food/snacks/grown/icepepper
+/obj/item/food/snacks/grown/icepepper
seed = /obj/item/seeds/chili/ice
name = "chilly pepper"
desc = "It's a mutant strain of chili"
@@ -61,7 +61,7 @@
icon_state = "seed-chilighost"
species = "chilighost"
plantname = "Ghost Chili Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/ghost_chili
+ product = /obj/item/food/snacks/grown/ghost_chili
endurance = 10
maturation = 10
production = 10
@@ -70,7 +70,7 @@
mutatelist = list()
reagents_add = list("condensedcapsaicin" = 0.3, "capsaicin" = 0.55, "plantmatter" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/ghost_chili
+/obj/item/food/snacks/grown/ghost_chili
seed = /obj/item/seeds/chili/ghost
name = "ghost chili"
desc = "It seems to be vibrating gently."
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index aeda25fc74dd..0f624c37e1d1 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -1,5 +1,5 @@
// Citrus - base type
-/obj/item/reagent_containers/food/snacks/grown/citrus
+/obj/item/food/snacks/grown/citrus
seed = /obj/item/seeds/lime
name = "citrus"
desc = "It's so sour, your face will twist."
@@ -14,7 +14,7 @@
icon_state = "seed-lime"
species = "lime"
plantname = "Lime Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/citrus/lime
+ product = /obj/item/food/snacks/grown/citrus/lime
lifespan = 55
endurance = 50
yield = 4
@@ -24,7 +24,7 @@
mutatelist = list(/obj/item/seeds/orange)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/citrus/lime
+/obj/item/food/snacks/grown/citrus/lime
seed = /obj/item/seeds/lime
name = "lime"
desc = "It's so sour, your face will twist."
@@ -39,7 +39,7 @@
icon_state = "seed-orange"
species = "orange"
plantname = "Orange Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/citrus/orange
+ product = /obj/item/food/snacks/grown/citrus/orange
lifespan = 60
endurance = 50
yield = 5
@@ -51,7 +51,7 @@
mutatelist = list(/obj/item/seeds/lime)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/citrus/orange
+/obj/item/food/snacks/grown/citrus/orange
seed = /obj/item/seeds/orange
name = "orange"
desc = "It's an tangy fruit."
@@ -67,7 +67,7 @@
icon_state = "seed-lemon"
species = "lemon"
plantname = "Lemon Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/citrus/lemon
+ product = /obj/item/food/snacks/grown/citrus/lemon
lifespan = 55
endurance = 45
yield = 4
@@ -78,7 +78,7 @@
mutatelist = list(/obj/item/seeds/firelemon)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/citrus/lemon
+/obj/item/food/snacks/grown/citrus/lemon
seed = /obj/item/seeds/lemon
name = "lemon"
desc = "When life gives you lemons, make lemonade."
@@ -93,7 +93,7 @@
icon_state = "seed-firelemon"
species = "firelemon"
plantname = "Combustible Lemon Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/firelemon
+ product = /obj/item/food/snacks/grown/firelemon
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "lime-grow"
icon_dead = "lime-dead"
@@ -103,7 +103,7 @@
yield = 4
reagents_add = list("plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/firelemon
+/obj/item/food/snacks/grown/firelemon
seed = /obj/item/seeds/firelemon
name = "combustible lemon"
desc = "Made for burning houses down."
@@ -113,7 +113,7 @@
tastes = list("burning lemon" = 1)
wine_flavor = "fire"
-/obj/item/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user)
+/obj/item/food/snacks/grown/firelemon/attack_self(mob/living/user)
var/area/A = get_area(user)
user.visible_message("[user] primes [src]!", "You prime [src]!")
investigate_log("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].", INVESTIGATE_BOMB)
@@ -126,19 +126,19 @@
playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
addtimer(CALLBACK(src, PROC_REF(prime)), rand(10, 60))
-/obj/item/reagent_containers/food/snacks/grown/firelemon/burn()
+/obj/item/food/snacks/grown/firelemon/burn()
prime()
..()
-/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/update_mob()
+/obj/item/food/snacks/grown/firelemon/proc/update_mob()
if(ismob(loc))
var/mob/M = loc
M.unEquip(src)
-/obj/item/reagent_containers/food/snacks/grown/firelemon/ex_act(severity)
+/obj/item/food/snacks/grown/firelemon/ex_act(severity)
qdel(src) //Ensuring that it's deleted by its own explosion
-/obj/item/reagent_containers/food/snacks/grown/firelemon/proc/prime()
+/obj/item/food/snacks/grown/firelemon/proc/prime()
switch(seed.potency) //Combustible lemons are alot like IEDs, lots of flame, very little bang.
if(0 to 30)
update_mob()
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index b00c4b1aded9..9e21671169bd 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -5,7 +5,7 @@
icon_state = "seed-cocoapod"
species = "cocoapod"
plantname = "Cocao Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/cocoapod
+ product = /obj/item/food/snacks/grown/cocoapod
lifespan = 20
maturation = 5
production = 5
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/cocoapod/vanillapod)
reagents_add = list("cocoa" = 0.25, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/cocoapod
+/obj/item/food/snacks/grown/cocoapod
seed = /obj/item/seeds/cocoapod
name = "cocoa pod"
desc = "Fattening... Mmmmm... chucklate."
@@ -34,12 +34,12 @@
icon_state = "seed-vanillapod"
species = "vanillapod"
plantname = "Vanilla Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/vanillapod
+ product = /obj/item/food/snacks/grown/vanillapod
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list()
reagents_add = list("vanilla" = 0.25, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/vanillapod
+/obj/item/food/snacks/grown/vanillapod
seed = /obj/item/seeds/cocoapod/vanillapod
name = "vanilla pod"
desc = "Fattening... Mmmmm... vanilla."
diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm
index ac7946b38643..256fc42e88c8 100644
--- a/code/modules/hydroponics/grown/corn.dm
+++ b/code/modules/hydroponics/grown/corn.dm
@@ -5,7 +5,7 @@
icon_state = "seed-corn"
species = "corn"
plantname = "Corn Stalks"
- product = /obj/item/reagent_containers/food/snacks/grown/corn
+ product = /obj/item/food/snacks/grown/corn
maturation = 8
potency = 20
growthstages = 3
@@ -15,12 +15,12 @@
mutatelist = list(/obj/item/seeds/corn/snapcorn)
reagents_add = list("cornoil" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/corn
+/obj/item/food/snacks/grown/corn
seed = /obj/item/seeds/corn
name = "ear of corn"
desc = "Needs some butter!"
icon_state = "corn"
- cooked_type = /obj/item/reagent_containers/food/snacks/popcorn
+ cooked_type = /obj/item/food/snacks/popcorn
filling_color = "#FFFF00"
trash = /obj/item/grown/corncob
bitesize_mod = 2
diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm
index 7aa15c61fa9d..e31e07e215bc 100644
--- a/code/modules/hydroponics/grown/eggplant.dm
+++ b/code/modules/hydroponics/grown/eggplant.dm
@@ -5,7 +5,7 @@
icon_state = "seed-eggplant"
species = "eggplant"
plantname = "Eggplants"
- product = /obj/item/reagent_containers/food/snacks/grown/eggplant
+ product = /obj/item/food/snacks/grown/eggplant
yield = 2
potency = 20
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
@@ -15,7 +15,7 @@
mutatelist = list(/obj/item/seeds/eggplant/eggy)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/eggplant
+/obj/item/food/snacks/grown/eggplant
seed = /obj/item/seeds/eggplant
name = "eggplant"
desc = "Maybe there's a chicken inside?"
@@ -32,18 +32,18 @@
icon_state = "seed-eggy"
species = "eggy"
plantname = "Egg-Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/shell/eggy
+ product = /obj/item/food/snacks/grown/shell/eggy
lifespan = 75
production = 12
mutatelist = list()
reagents_add = list("nutriment" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/shell/eggy
+/obj/item/food/snacks/grown/shell/eggy
seed = /obj/item/seeds/eggplant/eggy
name = "Egg-plant"
desc = "There MUST be a chicken inside."
icon_state = "eggyplant"
- trash = /obj/item/reagent_containers/food/snacks/egg
+ trash = /obj/item/food/snacks/egg
filling_color = "#F8F8FF"
bitesize_mod = 2
tastes = list("egg-plant" = 1)
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index ea4dc842233d..42d7eaa2e9c5 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -5,7 +5,7 @@
icon_state = "seed-poppy"
species = "poppy"
plantname = "Poppy Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/poppy
+ product = /obj/item/food/snacks/grown/poppy
endurance = 10
maturation = 8
yield = 6
@@ -17,7 +17,7 @@
mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily)
reagents_add = list("bicaridine" = 0.2, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/poppy
+/obj/item/food/snacks/grown/poppy
seed = /obj/item/seeds/poppy
name = "poppy"
desc = "Long-used as a symbol of rest, peace, and death."
@@ -37,10 +37,10 @@
plantname = "Lily Plants"
icon_grow = "lily-grow"
icon_dead = "lily-dead"
- product = /obj/item/reagent_containers/food/snacks/grown/poppy/lily
+ product = /obj/item/food/snacks/grown/poppy/lily
mutatelist = list()
-/obj/item/reagent_containers/food/snacks/grown/poppy/lily
+/obj/item/food/snacks/grown/poppy/lily
seed = /obj/item/seeds/poppy/lily
name = "lily"
desc = "A beautiful white flower."
@@ -57,10 +57,10 @@
plantname = "Geranium Plants"
icon_grow = "geranium-grow"
icon_dead = "geranium-dead"
- product = /obj/item/reagent_containers/food/snacks/grown/poppy/geranium
+ product = /obj/item/food/snacks/grown/poppy/geranium
mutatelist = list()
-/obj/item/reagent_containers/food/snacks/grown/poppy/geranium
+/obj/item/food/snacks/grown/poppy/geranium
seed = /obj/item/seeds/poppy/geranium
name = "geranium"
desc = "A beautiful purple flower."
@@ -76,7 +76,7 @@
icon_state = "seed-harebell"
species = "harebell"
plantname = "Harebells"
- product = /obj/item/reagent_containers/food/snacks/grown/harebell
+ product = /obj/item/food/snacks/grown/harebell
lifespan = 100
endurance = 20
maturation = 7
@@ -88,7 +88,7 @@
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
reagents_add = list("plantmatter" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/harebell
+/obj/item/food/snacks/grown/harebell
seed = /obj/item/seeds/harebell
name = "harebell"
desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten'd not thy breath.\""
@@ -144,12 +144,12 @@
plantname = "Moonflowers"
icon_grow = "moonflower-grow"
icon_dead = "sunflower-dead"
- product = /obj/item/reagent_containers/food/snacks/grown/moonflower
+ product = /obj/item/food/snacks/grown/moonflower
mutatelist = list()
reagents_add = list("moonshine" = 0.2, "vitamin" = 0.02, "plantmatter" = 0.02)
rarity = 15
-/obj/item/reagent_containers/food/snacks/grown/moonflower
+/obj/item/food/snacks/grown/moonflower
seed = /obj/item/seeds/sunflower/moonflower
name = "moonflower"
desc = "Store in a location at least 50 yards away from werewolves."
diff --git a/code/modules/hydroponics/grown/garlic.dm b/code/modules/hydroponics/grown/garlic.dm
index 3c1b2b38b1d4..82d802a0b927 100644
--- a/code/modules/hydroponics/grown/garlic.dm
+++ b/code/modules/hydroponics/grown/garlic.dm
@@ -4,14 +4,14 @@
icon_state = "seed-garlic"
species = "garlic"
plantname = "Garlic Sprouts"
- product = /obj/item/reagent_containers/food/snacks/grown/garlic
+ product = /obj/item/food/snacks/grown/garlic
yield = 6
potency = 25
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
reagents_add = list("garlic" = 0.15, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/garlic
+/obj/item/food/snacks/grown/garlic
seed = /obj/item/seeds/garlic
name = "garlic"
desc = "Delicious, but with a potentially overwhelming odor."
diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm
index 832645c95cd1..84c177d2b070 100644
--- a/code/modules/hydroponics/grown/grass_carpet.dm
+++ b/code/modules/hydroponics/grown/grass_carpet.dm
@@ -5,7 +5,7 @@
icon_state = "seed-grass"
species = "grass"
plantname = "Grass"
- product = /obj/item/reagent_containers/food/snacks/grown/grass
+ product = /obj/item/food/snacks/grown/grass
lifespan = 40
endurance = 40
maturation = 2
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/grass/carpet)
reagents_add = list("plantmatter" = 0.02, "hydrogen" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/grass
+/obj/item/food/snacks/grown/grass
seed = /obj/item/seeds/grass
name = "grass"
desc = "Green and lush."
@@ -30,10 +30,10 @@
tastes = list("grass" = 1)
wine_power = 0.15
-/obj/item/reagent_containers/food/snacks/grown/grass/attack_self(mob/user)
+/obj/item/food/snacks/grown/grass/attack_self(mob/user)
to_chat(user, "You prepare the astroturf.")
var/grassAmt = 1 + round(seed.potency * tile_coefficient) // The grass we're holding
- for(var/obj/item/reagent_containers/food/snacks/grown/grass/G in user.loc) // The grass on the floor
+ for(var/obj/item/food/snacks/grown/grass/G in user.loc) // The grass on the floor
if(G.type != type)
continue
grassAmt += 1 + round(G.seed.potency * tile_coefficient)
@@ -48,11 +48,11 @@
icon_state = "seed-carpet"
species = "carpet"
plantname = "Carpet"
- product = /obj/item/reagent_containers/food/snacks/grown/grass/carpet
+ product = /obj/item/food/snacks/grown/grass/carpet
mutatelist = list()
rarity = 10
-/obj/item/reagent_containers/food/snacks/grown/grass/carpet
+/obj/item/food/snacks/grown/grass/carpet
seed = /obj/item/seeds/grass/carpet
name = "carpet"
desc = "The textile industry's dark secret."
diff --git a/code/modules/hydroponics/grown/herbals.dm b/code/modules/hydroponics/grown/herbals.dm
index e98247d8cb5b..87ff2959c047 100644
--- a/code/modules/hydroponics/grown/herbals.dm
+++ b/code/modules/hydroponics/grown/herbals.dm
@@ -4,14 +4,14 @@
icon_state = "seed-cabbage"
species = "cabbage"
plantname = "comfrey"
- product = /obj/item/reagent_containers/food/snacks/grown/comfrey
+ product = /obj/item/food/snacks/grown/comfrey
yield = 2
maturation = 3
growthstages = 1
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
reagents_add = list("styptic_powder" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/comfrey
+/obj/item/food/snacks/grown/comfrey
seed = /obj/item/seeds/comfrey
name = "comfrey leaf"
desc = "Mash to turn into a poultice."
@@ -20,7 +20,7 @@
tastes = list("comfrey" = 1)
bitesize_mod = 2
-/obj/item/reagent_containers/food/snacks/grown/comfrey/attack_self(mob/user)
+/obj/item/food/snacks/grown/comfrey/attack_self(mob/user)
var/obj/item/stack/medical/bruise_pack/comfrey/C = new(get_turf(user))
C.heal_brute = seed.potency
to_chat(user, "You mash [src] into a poultice.")
@@ -33,12 +33,12 @@
icon_state = "seed-ambrosiavulgaris"
species = "ambrosiavulgaris"
plantname = "Aloe Vera Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/aloe
+ product = /obj/item/food/snacks/grown/aloe
yield = 2
icon_dead = "ambrosia-dead"
reagents_add = list("silver_sulfadiazine" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/aloe
+/obj/item/food/snacks/grown/aloe
seed = /obj/item/seeds/aloe
name = "aloe leaf"
desc = "Mash to turn into a poultice."
@@ -47,7 +47,7 @@
tastes = list("aloe" = 1)
bitesize_mod = 2
-/obj/item/reagent_containers/food/snacks/grown/aloe/attack_self(mob/user)
+/obj/item/food/snacks/grown/aloe/attack_self(mob/user)
var/obj/item/stack/medical/ointment/aloe/A = new(get_turf(user))
A.heal_burn = seed.potency
to_chat(user, "You mash [src] into a poultice.")
@@ -61,7 +61,7 @@
icon_state = "seed-mint"
species = "mint"
plantname = "Mint Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/mint
+ product = /obj/item/food/snacks/grown/mint
lifespan = 20
maturation = 4
production = 5
@@ -70,7 +70,7 @@
icon_dead = "mint-dead"
reagents_add = list("mint" = 0.03, "plantmatter" = 0.03)
-/obj/item/reagent_containers/food/snacks/grown/mint
+/obj/item/food/snacks/grown/mint
seed = /obj/item/seeds/mint
name = "mint leaves"
desc = "Process for mint. Distill for menthol. No need to experi-mint." //haha
diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm
index fdaa9750a200..537356c9b474 100644
--- a/code/modules/hydroponics/grown/kudzu.dm
+++ b/code/modules/hydroponics/grown/kudzu.dm
@@ -6,7 +6,7 @@
icon_state = "seed-kudzu"
species = "kudzu"
plantname = "Kudzu"
- product = /obj/item/reagent_containers/food/snacks/grown/kudzupod
+ product = /obj/item/food/snacks/grown/kudzupod
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy)
lifespan = 20
endurance = 10
@@ -88,7 +88,7 @@
adjust_potency(rand(15, -5))
-/obj/item/reagent_containers/food/snacks/grown/kudzupod
+/obj/item/food/snacks/grown/kudzupod
seed = /obj/item/seeds/kudzu
name = "kudzu pod"
desc = "Pueraria Virallis: An invasive species with vines that rapidly creep and wrap around whatever they contact."
diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm
index e4e20fd1f7c1..702640618ab0 100644
--- a/code/modules/hydroponics/grown/melon.dm
+++ b/code/modules/hydroponics/grown/melon.dm
@@ -5,7 +5,7 @@
icon_state = "seed-watermelon"
species = "watermelon"
plantname = "Watermelon Vines"
- product = /obj/item/reagent_containers/food/snacks/grown/watermelon
+ product = /obj/item/food/snacks/grown/watermelon
lifespan = 50
endurance = 40
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
@@ -21,12 +21,12 @@
qdel(src)
return OBLITERATION
-/obj/item/reagent_containers/food/snacks/grown/watermelon
+/obj/item/food/snacks/grown/watermelon
seed = /obj/item/seeds/watermelon
name = "watermelon"
desc = "It's full of watery goodness."
icon_state = "watermelon" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
- slice_path = /obj/item/reagent_containers/food/snacks/watermelonslice
+ slice_path = /obj/item/food/snacks/watermelonslice
slices_num = 5
dried_type = null
w_class = WEIGHT_CLASS_NORMAL
@@ -42,12 +42,12 @@
icon_state = "seed-holymelon"
species = "holymelon"
plantname = "Holy Melon Vines"
- product = /obj/item/reagent_containers/food/snacks/grown/holymelon
+ product = /obj/item/food/snacks/grown/holymelon
mutatelist = list()
reagents_add = list("holywater" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/holymelon
+/obj/item/food/snacks/grown/holymelon
seed = /obj/item/seeds/watermelon/holy
name = "holymelon"
desc = "The water within this melon has been blessed by some deity that's particularly fond of watermelon."
diff --git a/code/modules/hydroponics/grown/misc_seeds.dm b/code/modules/hydroponics/grown/misc_seeds.dm
index 1d34ff8a0eb3..6e4bf03af16f 100644
--- a/code/modules/hydroponics/grown/misc_seeds.dm
+++ b/code/modules/hydroponics/grown/misc_seeds.dm
@@ -34,7 +34,7 @@
icon_state = "seed-cabbage"
species = "cabbage"
plantname = "Cabbages"
- product = /obj/item/reagent_containers/food/snacks/grown/cabbage
+ product = /obj/item/food/snacks/grown/cabbage
lifespan = 50
endurance = 25
maturation = 3
@@ -46,7 +46,7 @@
mutatelist = list(/obj/item/seeds/replicapod)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/cabbage
+/obj/item/food/snacks/grown/cabbage
seed = /obj/item/seeds/cabbage
name = "cabbage"
desc = "Ewwwwwwwwww. Cabbage."
@@ -64,7 +64,7 @@
icon_state = "seed-sugarcane"
species = "sugarcane"
plantname = "Sugarcane"
- product = /obj/item/reagent_containers/food/snacks/grown/sugarcane
+ product = /obj/item/food/snacks/grown/sugarcane
genes = list(/datum/plant_gene/trait/repeated_harvest)
lifespan = 60
endurance = 50
@@ -73,7 +73,7 @@
growthstages = 3
reagents_add = list("sugar" = 0.25)
-/obj/item/reagent_containers/food/snacks/grown/sugarcane
+/obj/item/food/snacks/grown/sugarcane
seed = /obj/item/seeds/sugarcane
name = "sugarcane"
desc = "Sickly sweet."
@@ -91,7 +91,7 @@
icon_state = "seed-gatfruit"
species = "gatfruit"
plantname = "Gatfruit Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/shell/gatfruit
+ product = /obj/item/food/snacks/grown/shell/gatfruit
genes = list(/datum/plant_gene/trait/repeated_harvest)
lifespan = 20
endurance = 20
@@ -104,7 +104,7 @@
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
reagents_add = list("sulfur" = 0.1, "carbon" = 0.1, "nitrogen" = 0.07, "potassium" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/shell/gatfruit
+/obj/item/food/snacks/grown/shell/gatfruit
seed = /obj/item/seeds/gatfruit
name = "gatfruit"
desc = "It smells like burning."
@@ -122,12 +122,12 @@
icon_state = "seed-cherry_bomb"
species = "cherry_bomb"
plantname = "Cherry Bomb Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/cherry_bomb
+ product = /obj/item/food/snacks/grown/cherry_bomb
mutatelist = list()
reagents_add = list("plantmatter" = 0.1, "sugar" = 0.1, "blackpowder" = 0.7)
rarity = 60 //See above
-/obj/item/reagent_containers/food/snacks/grown/cherry_bomb
+/obj/item/food/snacks/grown/cherry_bomb
name = "cherry bombs"
desc = "You think you can hear the hissing of a tiny fuse."
icon_state = "cherry_bomb"
@@ -139,7 +139,7 @@
max_integrity = 40
wine_power = 0.8
-/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/attack_self(mob/living/user)
+/obj/item/food/snacks/grown/cherry_bomb/attack_self(mob/living/user)
var/area/A = get_area(user)
user.visible_message("[user] plucks the stem from [src]!", "You pluck the stem from [src], which begins to hiss loudly!")
message_admins("[user] ([user.key ? user.key : "no key"]) primed a cherry bomb for detonation at [A] ([user.x], [user.y], [user.z]) (JMP)")
@@ -149,16 +149,16 @@
C.throw_mode_on()
prime()
-/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/deconstruct(disassembled = TRUE)
+/obj/item/food/snacks/grown/cherry_bomb/deconstruct(disassembled = TRUE)
if(!disassembled)
prime()
if(!QDELETED(src))
qdel(src)
-/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/ex_act(severity)
+/obj/item/food/snacks/grown/cherry_bomb/ex_act(severity)
qdel(src) //Ensuring that it's deleted by its own explosion. Also prevents mass chain reaction with piles of cherry bombs
-/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime()
+/obj/item/food/snacks/grown/cherry_bomb/proc/prime()
icon_state = "cherry_bomb_lit"
playsound(src, 'sound/goonstation/misc/fuse.ogg', seed.potency, 0)
reagents.set_reagent_temp(1000) //Sets off the black powder
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 9f516da18d56..88e447ec798b 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -1,4 +1,4 @@
-/obj/item/reagent_containers/food/snacks/grown/mushroom
+/obj/item/food/snacks/grown/mushroom
name = "mushroom"
bitesize_mod = 2
wine_power = 0.4
@@ -11,7 +11,7 @@
icon_state = "mycelium-reishi"
species = "reishi"
plantname = "Reishi"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/reishi
+ product = /obj/item/food/snacks/grown/mushroom/reishi
lifespan = 35
endurance = 35
maturation = 10
@@ -23,7 +23,7 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/reishi
+/obj/item/food/snacks/grown/mushroom/reishi
seed = /obj/item/seeds/reishi
name = "reishi"
desc = "Ganoderma lucidum: A special fungus known for its medicinal and stress relieving properties."
@@ -39,7 +39,7 @@
icon_state = "mycelium-amanita"
species = "amanita"
plantname = "Fly Amanitas"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita
+ product = /obj/item/food/snacks/grown/mushroom/amanita
lifespan = 50
endurance = 35
maturation = 10
@@ -51,7 +51,7 @@
mutatelist = list(/obj/item/seeds/angel)
reagents_add = list("psilocybin" = 0.04, "amanitin" = 0.35, "nutriment" = 0, "growthserum" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/amanita
+/obj/item/food/snacks/grown/mushroom/amanita
seed = /obj/item/seeds/amanita
name = "fly amanita"
desc = "Amanita Muscaria: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
@@ -67,7 +67,7 @@
icon_state = "mycelium-angel"
species = "angel"
plantname = "Destroying Angels"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/angel
+ product = /obj/item/food/snacks/grown/mushroom/angel
lifespan = 50
endurance = 35
maturation = 12
@@ -81,7 +81,7 @@
rarity = 30
origin_tech = "biotech=5"
-/obj/item/reagent_containers/food/snacks/grown/mushroom/angel
+/obj/item/food/snacks/grown/mushroom/angel
seed = /obj/item/seeds/angel
name = "destroying angel"
desc = "Amanita Virosa: Deadly poisonous basidiomycete fungus filled with alpha amanitin."
@@ -98,7 +98,7 @@
icon_state = "mycelium-liberty"
species = "liberty"
plantname = "Liberty-Caps"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap
+ product = /obj/item/food/snacks/grown/mushroom/libertycap
maturation = 7
production = 1
yield = 5
@@ -108,7 +108,7 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("psilocybin" = 0.25, "nutriment" = 0.02)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/libertycap
+/obj/item/food/snacks/grown/mushroom/libertycap
seed = /obj/item/seeds/liberty
name = "liberty-cap"
desc = "Psilocybe Semilanceata: Liberate yourself!"
@@ -126,7 +126,7 @@
icon_state = "mycelium-plump"
species = "plump"
plantname = "Plump-Helmet Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet
+ product = /obj/item/food/snacks/grown/mushroom/plumphelmet
maturation = 8
production = 1
yield = 4
@@ -137,7 +137,7 @@
mutatelist = list(/obj/item/seeds/plump/walkingmushroom)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet
+/obj/item/food/snacks/grown/mushroom/plumphelmet
seed = /obj/item/seeds/plump
name = "plump-helmet"
desc = "Plumus Hellmus: Plump, soft and s-so inviting~"
@@ -154,7 +154,7 @@
icon_state = "mycelium-walkingmushroom"
species = "walkingmushroom"
plantname = "Walking Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom
+ product = /obj/item/food/snacks/grown/mushroom/walkingmushroom
lifespan = 30
endurance = 30
maturation = 5
@@ -164,7 +164,7 @@
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.15)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom
+/obj/item/food/snacks/grown/mushroom/walkingmushroom
seed = /obj/item/seeds/plump/walkingmushroom
name = "walking mushroom"
desc = "Plumus Locomotus: The beginning of the great walk."
@@ -174,7 +174,7 @@
tastes = list("walking mushroom" = 1, "motion" = 1)
can_distill = FALSE
-/obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user)
+/obj/item/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user)
if(isspaceturf(user.loc))
return
var/mob/living/simple_animal/hostile/mushroom/M = new /mob/living/simple_animal/hostile/mushroom(user.loc)
@@ -194,7 +194,7 @@
icon_state = "mycelium-chanter"
species = "chanter"
plantname = "Chanterelle Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle
+ product = /obj/item/food/snacks/grown/mushroom/chanterelle
lifespan = 35
endurance = 20
maturation = 7
@@ -206,7 +206,7 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("nutriment" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle
+/obj/item/food/snacks/grown/mushroom/chanterelle
seed = /obj/item/seeds/chanter
name = "chanterelle cluster"
desc = "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty!"
@@ -222,7 +222,7 @@
icon_state = "mycelium-glowshroom"
species = "glowshroom"
plantname = "Glowshrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom
+ product = /obj/item/food/snacks/grown/mushroom/glowshroom
lifespan = 100 //ten times that is the delay
endurance = 30
maturation = 15
@@ -236,7 +236,7 @@
mutatelist = list(/obj/item/seeds/glowshroom/glowcap, /obj/item/seeds/glowshroom/shadowshroom)
reagents_add = list("radium" = 0.1, "phosphorus" = 0.1, "nutriment" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom
+/obj/item/food/snacks/grown/mushroom/glowshroom
seed = /obj/item/seeds/glowshroom
name = "glowshroom cluster"
desc = "Mycena Bregprox: This species of mushroom glows in the dark."
@@ -248,7 +248,7 @@
tastes = list("warmth" = 1, "light" = 1, "glowshroom" = 1)
wine_power = 0.5
-/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
+/obj/item/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
if(isspaceturf(user.loc))
return FALSE
if(!isturf(user.loc))
@@ -279,13 +279,13 @@
species = "glowcap"
icon_harvest = "glowcap-harvest"
plantname = "Glowcaps"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
+ product = /obj/item/food/snacks/grown/mushroom/glowshroom/glowcap
genes = list(/datum/plant_gene/trait/glow/red, /datum/plant_gene/trait/cell_charge, /datum/plant_gene/trait/plant_type/fungal_metabolism)
mutatelist = list()
reagents_add = list("teslium" = 0.1, "nutriment" = 0.04)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
+/obj/item/food/snacks/grown/mushroom/glowshroom/glowcap
seed = /obj/item/seeds/glowshroom/glowcap
name = "glowcap cluster"
desc = "Mycena Ruthenia: This species of mushroom glows in the dark, but isn't actually bioluminescent. They're warm to the touch..."
@@ -305,7 +305,7 @@
icon_state = "mycelium-tower"
species = "mold"
plantname = "Fungus"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/fungus
+ product = /obj/item/food/snacks/grown/mushroom/fungus
yield = 4
icon_grow = "mold-grow"
icon_dead = "mold-dead"
@@ -314,7 +314,7 @@
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
reagents_add = list("fungus" = 0.35)
-/obj/item/reagent_containers/food/snacks/grown/mushroom/fungus
+/obj/item/food/snacks/grown/mushroom/fungus
seed = /obj/item/seeds/fungus
name = "fungus"
desc = "A fungus ideal for making antibacterials."
@@ -331,13 +331,13 @@
icon_grow = "shadowshroom-grow"
icon_dead = "shadowshroom-dead"
plantname = "Shadowshrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom
+ product = /obj/item/food/snacks/grown/mushroom/glowshroom/shadowshroom
genes = list(/datum/plant_gene/trait/glow/shadow, /datum/plant_gene/trait/plant_type/fungal_metabolism)
mutatelist = list()
reagents_add = list("radium" = 0.2, "nutriment" = 0.04)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom
+/obj/item/food/snacks/grown/mushroom/glowshroom/shadowshroom
seed = /obj/item/seeds/glowshroom/shadowshroom
name = "shadowshroom cluster"
desc = "Mycena Umbra: This species of mushroom emits shadow instead of light."
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 4cacb9c699a0..78fe7964c461 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -88,7 +88,7 @@
/obj/item/grown/nettle/death
seed = /obj/item/seeds/nettle/death
name = "deathnettle"
- desc = "The glowing nettle incites rage in you just from looking at it!"
+ desc = "The glowing nettle incites rage in you just from looking at it!"
icon_state = "deathnettle"
force = 25
throwforce = 10
diff --git a/code/modules/hydroponics/grown/nymph.dm b/code/modules/hydroponics/grown/nymph.dm
index 34bbffc4c9db..af1a0506b788 100644
--- a/code/modules/hydroponics/grown/nymph.dm
+++ b/code/modules/hydroponics/grown/nymph.dm
@@ -4,7 +4,7 @@
icon_state = "seed-replicapod"
species = "replicapod"
plantname = "Nymph Pod"
- product = /obj/item/reagent_containers/food/snacks/grown/nymph_pod
+ product = /obj/item/food/snacks/grown/nymph_pod
lifespan = 50
endurance = 8
maturation = 10
@@ -12,14 +12,14 @@
yield = 1
reagents_add = list("plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/nymph_pod
+/obj/item/food/snacks/grown/nymph_pod
seed = /obj/item/seeds/nymph
name = "nymph pod"
desc = "A peculiar wriggling pod with a grown nymph inside. Crack it open to let the nymph out."
icon_state = "mushy"
bitesize_mod = 2
-/obj/item/reagent_containers/food/snacks/grown/nymph_pod/attack_self(mob/user)
+/obj/item/food/snacks/grown/nymph_pod/attack_self(mob/user)
new /mob/living/simple_animal/diona(get_turf(user))
to_chat(user, "You crack open [src] letting the nymph out.")
user.drop_item()
diff --git a/code/modules/hydroponics/grown/olive.dm b/code/modules/hydroponics/grown/olive.dm
index eb3ea8d43d36..05f46a5a58f4 100644
--- a/code/modules/hydroponics/grown/olive.dm
+++ b/code/modules/hydroponics/grown/olive.dm
@@ -5,17 +5,17 @@
icon_state = "seed-olive"
species = "olive"
plantname = "Olive Tree"
- product = /obj/item/reagent_containers/food/snacks/grown/olive
+ product = /obj/item/food/snacks/grown/olive
lifespan = 150
endurance = 35
yield = 5
growthstages = 6
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
genes = list(/datum/plant_gene/trait/repeated_harvest)
- mutatelist = list(/obj/item/seeds/apple)
+ mutatelist = list()
reagents_add = list("vitamin" = 0.02, "plantmatter" = 0.2, "sodiumchloride" = 0.2)
-/obj/item/reagent_containers/food/snacks/grown/olive
+/obj/item/food/snacks/grown/olive
seed = /obj/item/seeds/olive
name = "olive"
desc = "A small cylindrical salty fruit closely related to mangoes. Can be ground into a paste and mixed with water to make quality oil."
diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm
index 8594c6f37eab..b59a3bfa5e0e 100644
--- a/code/modules/hydroponics/grown/onion.dm
+++ b/code/modules/hydroponics/grown/onion.dm
@@ -4,7 +4,7 @@
icon_state = "seed-onion"
species = "onion"
plantname = "Onion Sprouts"
- product = /obj/item/reagent_containers/food/snacks/grown/onion
+ product = /obj/item/food/snacks/grown/onion
lifespan = 20
maturation = 3
production = 4
@@ -16,14 +16,14 @@
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
mutatelist = list(/obj/item/seeds/onion/red)
-/obj/item/reagent_containers/food/snacks/grown/onion
+/obj/item/food/snacks/grown/onion
seed = /obj/item/seeds/onion
name = "onion"
desc = "Nothing to cry over."
icon_state = "onion"
filling_color = "#C0C9A0"
bitesize_mod = 2
- slice_path = /obj/item/reagent_containers/food/snacks/onion_slice
+ slice_path = /obj/item/food/snacks/onion_slice
tastes = list("onion" = 1, "pungentness" = 1)
slices_num = 2
wine_power = 0.3
@@ -36,22 +36,22 @@
species = "onion_red"
plantname = "Red Onion Sprouts"
weed_chance = 1
- product = /obj/item/reagent_containers/food/snacks/grown/onion/red
+ product = /obj/item/food/snacks/grown/onion/red
mutatelist = list()
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1, "onionjuice" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/onion/red
+/obj/item/food/snacks/grown/onion/red
seed = /obj/item/seeds/onion/red
name = "red onion"
desc = "Purple despite the name."
icon_state = "onion_red"
filling_color = "#C29ACF"
- slice_path = /obj/item/reagent_containers/food/snacks/onion_slice/red
+ slice_path = /obj/item/food/snacks/onion_slice/red
tastes = list("red onion" = 1, "pungentness" = 3)
wine_power = 0.6
wine_flavor = "powerful pungentness"
-/obj/item/reagent_containers/food/snacks/onion_slice
+/obj/item/food/snacks/onion_slice
name = "onion slices"
desc = "Rings, not for wearing."
icon_state = "onionslice"
@@ -59,9 +59,9 @@
filling_color = "#C0C9A0"
tastes = list("onion" = 1, "pungentness" = 1)
gender = PLURAL
- cooked_type = /obj/item/reagent_containers/food/snacks/onionrings
+ cooked_type = /obj/item/food/snacks/onionrings
-/obj/item/reagent_containers/food/snacks/onion_slice/red
+/obj/item/food/snacks/onion_slice/red
name = "red onion slices"
desc = "They shine like exceptionally low quality amethyst."
icon_state = "onionslice_red"
diff --git a/code/modules/hydroponics/grown/peanut.dm b/code/modules/hydroponics/grown/peanut.dm
index 836f21488886..8226df87fca2 100644
--- a/code/modules/hydroponics/grown/peanut.dm
+++ b/code/modules/hydroponics/grown/peanut.dm
@@ -5,7 +5,7 @@
icon_state = "seed-potato"
species = "potato"
plantname = "Peanut Vines"
- product = /obj/item/reagent_containers/food/snacks/grown/peanuts
+ product = /obj/item/food/snacks/grown/peanuts
lifespan = 30
maturation = 10
production = 1
@@ -17,7 +17,7 @@
genes = list(/datum/plant_gene/trait/repeated_harvest)
reagents_add = list("plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/peanuts
+/obj/item/food/snacks/grown/peanuts
seed = /obj/item/seeds/peanuts
name = "patch of peanuts"
desc = "Best avoided if you have spess allergies."
diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm
index aa1946aee4ef..dd4727a2c318 100644
--- a/code/modules/hydroponics/grown/pineapple.dm
+++ b/code/modules/hydroponics/grown/pineapple.dm
@@ -5,7 +5,7 @@
icon_state = "seed-pineapple"
species = "pineapple"
plantname = "Pineapple Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/pineapple
+ product = /obj/item/food/snacks/grown/pineapple
lifespan = 40
endurance = 30
growthstages = 3
@@ -14,7 +14,7 @@
mutatelist = list(/obj/item/seeds/apple)
reagents_add = list("vitamin" = 0.02, "plantmatter" = 0.2, "water" = 0.04)
-/obj/item/reagent_containers/food/snacks/grown/pineapple
+/obj/item/food/snacks/grown/pineapple
seed = /obj/item/seeds/pineapple
name = "pineapple"
desc = "A soft sweet interior surrounded by a spiky skin."
@@ -25,7 +25,7 @@
attack_verb = list("stung", "pined")
throw_speed = 1
throw_range = 5
- slice_path = /obj/item/reagent_containers/food/snacks/pineappleslice
+ slice_path = /obj/item/food/snacks/pineappleslice
slices_num = 3
filling_color = "#F6CB0B"
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm
index a4d854163283..319343fac185 100644
--- a/code/modules/hydroponics/grown/potato.dm
+++ b/code/modules/hydroponics/grown/potato.dm
@@ -5,7 +5,7 @@
icon_state = "seed-potato"
species = "potato"
plantname = "Potato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/potato
+ product = /obj/item/food/snacks/grown/potato
lifespan = 30
maturation = 10
production = 1
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/potato/sweet)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/potato
+/obj/item/food/snacks/grown/potato
seed = /obj/item/seeds/potato
name = "potato"
desc = "Boil 'em! Mash 'em! Stick 'em in a stew!"
@@ -29,7 +29,7 @@
distill_reagent = "vodka"
-/obj/item/reagent_containers/food/snacks/grown/potato/wedges
+/obj/item/food/snacks/grown/potato/wedges
name = "potato wedges"
desc = "Slices of neatly cut potato."
icon_state = "potato_wedges"
@@ -39,10 +39,10 @@
distill_reagent = "sbiten"
-/obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params)
+/obj/item/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params)
if(is_sharp(W))
to_chat(user, "You cut the potato into wedges with [W].")
- var/obj/item/reagent_containers/food/snacks/grown/potato/wedges/Wedges = new /obj/item/reagent_containers/food/snacks/grown/potato/wedges
+ var/obj/item/food/snacks/grown/potato/wedges/Wedges = new /obj/item/food/snacks/grown/potato/wedges
if(!remove_item_from_storage(user))
user.unEquip(src)
user.put_in_hands(Wedges)
@@ -58,11 +58,11 @@
icon_state = "seed-sweetpotato"
species = "sweetpotato"
plantname = "Sweet Potato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/potato/sweet
+ product = /obj/item/food/snacks/grown/potato/sweet
mutatelist = list()
reagents_add = list("vitamin" = 0.1, "sugar" = 0.1, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/potato/sweet
+/obj/item/food/snacks/grown/potato/sweet
seed = /obj/item/seeds/potato/sweet
name = "sweet potato"
desc = "It's sweet."
diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm
index 718b16c6b1f6..93b5da9980cc 100644
--- a/code/modules/hydroponics/grown/pumpkin.dm
+++ b/code/modules/hydroponics/grown/pumpkin.dm
@@ -5,7 +5,7 @@
icon_state = "seed-pumpkin"
species = "pumpkin"
plantname = "Pumpkin Vines"
- product = /obj/item/reagent_containers/food/snacks/grown/pumpkin
+ product = /obj/item/food/snacks/grown/pumpkin
lifespan = 50
endurance = 40
growthstages = 3
@@ -17,7 +17,7 @@
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.2)
-/obj/item/reagent_containers/food/snacks/grown/pumpkin
+/obj/item/food/snacks/grown/pumpkin
seed = /obj/item/seeds/pumpkin
name = "pumpkin"
desc = "It's large and scary."
@@ -28,7 +28,7 @@
wine_power = 0.2
var/carved_type = /obj/item/clothing/head/hardhat/pumpkinhead
-/obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/item/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
if(is_sharp(W))
user.show_message("You carve a face into [src]!", 1)
new carved_type(user.loc)
@@ -44,13 +44,13 @@
icon_state = "seed-blumpkin"
species = "blumpkin"
plantname = "Blumpkin Vines"
- product = /obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin
+ product = /obj/item/food/snacks/grown/pumpkin/blumpkin
mutatelist = list()
reagents_add = list("ammonia" = 0.2, "chlorine" = 0.1, "plasma" = 0.1, "plantmatter" = 0.2)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin
+/obj/item/food/snacks/grown/pumpkin/blumpkin
seed = /obj/item/seeds/pumpkin/blumpkin
name = "blumpkin"
desc = "The pumpkin's toxic sibling."
diff --git a/code/modules/hydroponics/grown/random_seeds.dm b/code/modules/hydroponics/grown/random_seeds.dm
index c01513e1011a..3be1c302f87b 100644
--- a/code/modules/hydroponics/grown/random_seeds.dm
+++ b/code/modules/hydroponics/grown/random_seeds.dm
@@ -6,7 +6,7 @@
icon_state = "seed-x"
species = "?????"
plantname = "strange plant"
- product = /obj/item/reagent_containers/food/snacks/grown/random
+ product = /obj/item/food/snacks/grown/random
icon_grow = "xpod-grow"
icon_dead = "xpod-dead"
icon_harvest = "xpod-harvest"
@@ -30,14 +30,14 @@
add_random_plant_type(100)
desc = "Label: \n" + get_analyzer_text()
-/obj/item/reagent_containers/food/snacks/grown/random
+/obj/item/food/snacks/grown/random
seed = /obj/item/seeds/random
name = "strange plant"
desc = "What could this even be?"
icon_state = "crunchy"
bitesize_mod = 2
-/obj/item/reagent_containers/food/snacks/grown/random/Initialize()
+/obj/item/food/snacks/grown/random/Initialize()
. = ..()
wine_power = rand(0.1,1.5)
if(prob(1))
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index 263f52568178..4d8e9ab629cd 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -5,7 +5,7 @@
icon_state = "seed-carrot"
species = "carrot"
plantname = "Carrots"
- product = /obj/item/reagent_containers/food/snacks/grown/carrot
+ product = /obj/item/food/snacks/grown/carrot
maturation = 10
production = 1
yield = 5
@@ -14,7 +14,7 @@
mutatelist = list(/obj/item/seeds/carrot/parsnip)
reagents_add = list("oculine" = 0.25, "vitamin" = 0.04, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/carrot
+/obj/item/food/snacks/grown/carrot
seed = /obj/item/seeds/carrot
name = "carrot"
desc = "It's good for the eyes!"
@@ -24,14 +24,14 @@
tastes = list("carrot" = 1)
wine_power = 0.3
-/obj/item/reagent_containers/food/snacks/grown/carrot/wedges
+/obj/item/food/snacks/grown/carrot/wedges
name = "carrot wedges"
desc = "Slices of neatly cut carrot."
icon_state = "carrot_wedges"
filling_color = "#FFA500"
bitesize_mod = 2
-/obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
+/obj/item/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
if(is_sharp(I))
to_chat(user, "You sharpen the carrot into a shiv with [I].")
var/obj/item/kitchen/knife/shiv/carrot/Shiv = new ()
@@ -50,12 +50,12 @@
icon_state = "seed-parsnip"
species = "parsnip"
plantname = "Parsnip"
- product = /obj/item/reagent_containers/food/snacks/grown/parsnip
+ product = /obj/item/food/snacks/grown/parsnip
icon_dead = "carrot-dead"
mutatelist = list()
reagents_add = list("vitamin" = 0.05, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/parsnip
+/obj/item/food/snacks/grown/parsnip
seed = /obj/item/seeds/carrot/parsnip
name = "parsnip"
desc = "Closely related to carrots."
@@ -72,7 +72,7 @@
icon_state = "seed-whitebeet"
species = "whitebeet"
plantname = "White Beet Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/whitebeet
+ product = /obj/item/food/snacks/grown/whitebeet
lifespan = 60
endurance = 50
yield = 6
@@ -81,7 +81,7 @@
mutatelist = list(/obj/item/seeds/redbeet)
reagents_add = list("vitamin" = 0.04, "sugar" = 0.2, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/whitebeet
+/obj/item/food/snacks/grown/whitebeet
seed = /obj/item/seeds/whitebeet
name = "white beet"
desc = "You can't beat white beet."
@@ -98,7 +98,7 @@
icon_state = "seed-redbeet"
species = "redbeet"
plantname = "Red Beet Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/redbeet
+ product = /obj/item/food/snacks/grown/redbeet
lifespan = 60
endurance = 50
yield = 6
@@ -107,7 +107,7 @@
genes = list(/datum/plant_gene/trait/maxchem)
reagents_add = list("vitamin" = 0.05, "plantmatter" = 0.05)
-/obj/item/reagent_containers/food/snacks/grown/redbeet
+/obj/item/food/snacks/grown/redbeet
seed = /obj/item/seeds/redbeet
name = "red beet"
desc = "You can't beat red beet."
diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm
index 0bba20ad4c03..6289b1abda7f 100644
--- a/code/modules/hydroponics/grown/tea_coffee.dm
+++ b/code/modules/hydroponics/grown/tea_coffee.dm
@@ -5,7 +5,7 @@
icon_state = "seed-teaaspera"
species = "teaaspera"
plantname = "Tea Aspera Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/tea
+ product = /obj/item/food/snacks/grown/tea
lifespan = 20
maturation = 5
production = 5
@@ -16,7 +16,7 @@
mutatelist = list(/obj/item/seeds/tea/astra)
reagents_add = list("vitamin" = 0.04, "teapowder" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/tea
+/obj/item/food/snacks/grown/tea
seed = /obj/item/seeds/tea
name = "Tea Aspera tips"
desc = "These aromatic tips of the tea plant can be dried to make tea."
@@ -32,12 +32,12 @@
desc = "These seeds grow into Tea Astra, a more potent variant of tea"
species = "teaastra"
plantname = "Tea Astra Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/tea/astra
+ product = /obj/item/food/snacks/grown/tea/astra
mutatelist = list()
reagents_add = list("synaptizine" = 0.1, "vitamin" = 0.04, "teapowder" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/tea/astra
+/obj/item/food/snacks/grown/tea/astra
seed = /obj/item/seeds/tea/astra
name = "Tea Astra tips"
desc = "Knock away your fatigue!"
@@ -53,7 +53,7 @@
icon_state = "seed-coffeea"
species = "coffeea"
plantname = "Coffee Arabica Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/coffee
+ product = /obj/item/food/snacks/grown/coffee
lifespan = 30
endurance = 20
maturation = 5
@@ -65,7 +65,7 @@
mutatelist = list(/obj/item/seeds/coffee/robusta)
reagents_add = list("vitamin" = 0.04, "coffeepowder" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/coffee
+/obj/item/food/snacks/grown/coffee
seed = /obj/item/seeds/coffee
name = "coffee arabica beans"
desc = "Dry them out to make coffee."
@@ -82,12 +82,12 @@
icon_state = "seed-coffeer"
species = "coffeer"
plantname = "Coffee Robusta Bush"
- product = /obj/item/reagent_containers/food/snacks/grown/coffee/robusta
+ product = /obj/item/food/snacks/grown/coffee/robusta
mutatelist = list()
reagents_add = list("ephedrine" = 0.1, "vitamin" = 0.04, "coffeepowder" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/coffee/robusta
+/obj/item/food/snacks/grown/coffee/robusta
seed = /obj/item/seeds/coffee/robusta
name = "coffee robusta beans"
desc = "Increases robustness by 37 percent!"
diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm
index 36be15997280..6a74a4e02f44 100644
--- a/code/modules/hydroponics/grown/tobacco.dm
+++ b/code/modules/hydroponics/grown/tobacco.dm
@@ -5,7 +5,7 @@
icon_state = "seed-tobacco"
species = "tobacco"
plantname = "Tobacco Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/tobacco
+ product = /obj/item/food/snacks/grown/tobacco
lifespan = 20
maturation = 5
production = 5
@@ -15,7 +15,7 @@
mutatelist = list(/obj/item/seeds/tobacco/space)
reagents_add = list("nicotine" = 0.03, "plantmatter" = 0.03)
-/obj/item/reagent_containers/food/snacks/grown/tobacco
+/obj/item/food/snacks/grown/tobacco
seed = /obj/item/seeds/tobacco
name = "tobacco leaves"
desc = "Dry them out to make some smokes."
@@ -31,12 +31,12 @@
icon_state = "seed-stobacco"
species = "stobacco"
plantname = "Space Tobacco Plant"
- product = /obj/item/reagent_containers/food/snacks/grown/tobacco/space
+ product = /obj/item/food/snacks/grown/tobacco/space
mutatelist = list()
reagents_add = list("salbutamol" = 0.05, "nicotine" = 0.08, "plantmatter" = 0.03)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/tobacco/space
+/obj/item/food/snacks/grown/tobacco/space
seed = /obj/item/seeds/tobacco/space
name = "space tobacco leaves"
desc = "Dry them out to make some space-smokes."
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index 6236d56994eb..0de416b0972d 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -5,7 +5,7 @@
icon_state = "seed-tomato"
species = "tomato"
plantname = "Tomato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/tomato
+ product = /obj/item/food/snacks/grown/tomato
maturation = 8
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "tomato-grow"
@@ -14,12 +14,12 @@
mutatelist = list(/obj/item/seeds/tomato/blue, /obj/item/seeds/tomato/blood)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
-/obj/item/reagent_containers/food/snacks/grown/tomato
+/obj/item/food/snacks/grown/tomato
seed = /obj/item/seeds/tomato
name = "tomato"
desc = "I say to-mah-to, you say tom-mae-to."
icon_state = "tomato"
- slice_path = /obj/item/reagent_containers/food/snacks/tomatoslice
+ slice_path = /obj/item/food/snacks/tomatoslice
slices_num = 4
splat_type = /obj/effect/decal/cleanable/tomato_smudge
filling_color = "#FF6347"
@@ -34,12 +34,12 @@
icon_state = "seed-bloodtomato"
species = "bloodtomato"
plantname = "Blood-Tomato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/tomato/blood
+ product = /obj/item/food/snacks/grown/tomato/blood
mutatelist = list(/obj/item/seeds/tomato/killer)
reagents_add = list("blood" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/tomato/blood
+/obj/item/food/snacks/grown/tomato/blood
seed = /obj/item/seeds/tomato/blood
name = "blood-tomato"
desc = "So bloody...so...very...bloody....AHHHH!!!!"
@@ -58,7 +58,7 @@
icon_state = "seed-bluetomato"
species = "bluetomato"
plantname = "Blue-Tomato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/tomato/blue
+ product = /obj/item/food/snacks/grown/tomato/blue
yield = 2
icon_grow = "bluetomato-grow"
mutatelist = list(/obj/item/seeds/tomato/blue/bluespace)
@@ -66,7 +66,7 @@
reagents_add = list("lube" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 20
-/obj/item/reagent_containers/food/snacks/grown/tomato/blue
+/obj/item/food/snacks/grown/tomato/blue
seed = /obj/item/seeds/tomato/blue
name = "blue-tomato"
desc = "I say blue-mah-to, you say blue-mae-to."
@@ -83,14 +83,14 @@
icon_state = "seed-bluespacetomato"
species = "bluespacetomato"
plantname = "Bluespace Tomato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/tomato/blue/bluespace
+ product = /obj/item/food/snacks/grown/tomato/blue/bluespace
yield = 2
mutatelist = list()
genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("lube" = 0.2, "singulo" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 50
-/obj/item/reagent_containers/food/snacks/grown/tomato/blue/bluespace
+/obj/item/food/snacks/grown/tomato/blue/bluespace
seed = /obj/item/seeds/tomato/blue/bluespace
name = "bluespace tomato"
desc = "So lubricated, you might slip through space-time."
@@ -108,7 +108,7 @@
icon_state = "seed-killertomato"
species = "killertomato"
plantname = "Killer-Tomato Plants"
- product = /obj/item/reagent_containers/food/snacks/grown/tomato/killer
+ product = /obj/item/food/snacks/grown/tomato/killer
yield = 2
genes = list(/datum/plant_gene/trait/squash)
growthstages = 2
@@ -119,7 +119,7 @@
reagents_add = list("vitamin" = 0.04, "protein" = 0.1)
rarity = 30
-/obj/item/reagent_containers/food/snacks/grown/tomato/killer
+/obj/item/food/snacks/grown/tomato/killer
seed = /obj/item/seeds/tomato/killer
name = "killer-tomato"
desc = "I say to-mah-to, you say tom-mae-to... OH GOD IT'S EATING MY LEGS!!"
@@ -129,13 +129,13 @@
origin_tech = "biotech=4;combat=5"
distill_reagent = "demonsblood"
-/obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
+/obj/item/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
if(awakening)
to_chat(user, "The tomato is twitching and shaking, preventing you from eating it.")
return
..()
-/obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user)
+/obj/item/food/snacks/grown/tomato/killer/attack_self(mob/user)
if(awakening || isspaceturf(user.loc))
return
to_chat(user, "You begin to awaken the Killer Tomato...")
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index 43525465b328..1c33b6ce5dae 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -44,11 +44,11 @@
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
var/plank_type = /obj/item/stack/sheet/wood
var/plank_name = "wooden planks"
- var/static/list/accepted = typecacheof(list(/obj/item/reagent_containers/food/snacks/grown/tobacco,
- /obj/item/reagent_containers/food/snacks/grown/tea,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus,
- /obj/item/reagent_containers/food/snacks/grown/wheat))
+ var/static/list/accepted = typecacheof(list(/obj/item/food/snacks/grown/tobacco,
+ /obj/item/food/snacks/grown/tea,
+ /obj/item/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/food/snacks/grown/ambrosia/deus,
+ /obj/item/food/snacks/grown/wheat))
/obj/item/grown/log/attackby(obj/item/W, mob/user, params)
if(is_sharp(W))
@@ -69,7 +69,7 @@
qdel(src)
if(CheckAccepted(W))
- var/obj/item/reagent_containers/food/snacks/grown/leaf = W
+ var/obj/item/food/snacks/grown/leaf = W
if(leaf.dry)
user.show_message("You wrap \the [W] around the log, turning it into a torch!")
var/obj/item/flashlight/flare/torch/T = new /obj/item/flashlight/flare/torch(user.loc)
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index ccf5a753bb56..4fcbe25430e1 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -6,9 +6,9 @@
name = "grown_weapon"
icon = 'icons/obj/hydroponics/harvest.dmi'
resistance_flags = FLAMMABLE
- var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
+ var/obj/item/seeds/seed // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
-/obj/item/grown/Initialize(mapload, newloc, obj/item/seeds/new_seed = null)
+/obj/item/grown/Initialize(mapload, obj/item/seeds/new_seed)
. = ..()
create_reagents(50)
@@ -24,7 +24,7 @@
if(seed)
for(var/datum/plant_gene/trait/T in seed.genes)
- T.on_new(src, newloc)
+ T.on_new(src)
if(istype(src, seed.product)) // no adding reagents if it is just a trash item
seed.prepare_result(src)
diff --git a/code/modules/hydroponics/hydroponics_tray.dm b/code/modules/hydroponics/hydroponics_tray.dm
index c284393cfbf2..ebeaac15cddf 100644
--- a/code/modules/hydroponics/hydroponics_tray.dm
+++ b/code/modules/hydroponics/hydroponics_tray.dm
@@ -44,6 +44,7 @@
plant_hud_set_toxin()
plant_hud_set_pest()
plant_hud_set_weed()
+ create_reagents(300) // This should get cleared every time it is filled, barring admemery
/obj/machinery/hydroponics/constructable
name = "hydroponics tray"
@@ -79,14 +80,9 @@
return ..()
/obj/machinery/hydroponics/constructable/attackby(obj/item/I, mob/user, params)
- if(default_deconstruction_screwdriver(user, "hydrotray3", "hydrotray3", I))
+ if(default_deconstruction_screwdriver(user, "hydrotray3", "hydrotray3", I) || exchange_parts(user, I))
return
-
- if(exchange_parts(user, I))
- return
-
- else
- return ..()
+ return ..()
/obj/machinery/hydroponics/constructable/crowbar_act(mob/user, obj/item/I)
@@ -735,76 +731,54 @@
//Called when mob user "attacks" it with object O
if(istype(O, /obj/item/reagent_containers)) // Syringe stuff (and other reagent containers now too)
var/obj/item/reagent_containers/reagent_source = O
+ var/target = myseed ? myseed.plantname : src
if(istype(reagent_source, /obj/item/reagent_containers/syringe))
var/obj/item/reagent_containers/syringe/syr = reagent_source
- if(syr.mode != 1)
+ if(syr.mode != SYRINGE_INJECT)
to_chat(user, "You can't get any extract out of this plant.") //That. Gives me an idea...
- return
+ return TRUE
if(!reagent_source.reagents.total_volume)
to_chat(user, "[reagent_source] is empty.")
- return 1
+ return TRUE
if(reagent_source.has_lid && !reagent_source.is_drainable()) //if theres a LID then cannot transfer reagents.
to_chat(user, "You need to open [O] first!")
return TRUE
- var/list/trays = list(src)//makes the list just this in cases of syringes and compost etc
- var/target = myseed ? myseed.plantname : src
var/visi_msg = ""
- var/irrigate = 0 //How am I supposed to irrigate pill contents?
- var/transfer_amount
+ var/transfer_amount = reagent_source.amount_per_transfer_from_this
+ var/irrigate = FALSE
- if(istype(reagent_source, /obj/item/reagent_containers/food/snacks) || ispill(reagent_source))
- visi_msg="[user] composts [reagent_source], spreading it through [target]"
- transfer_amount = reagent_source.reagents.total_volume
- else
- transfer_amount = reagent_source.amount_per_transfer_from_this
- if(istype(reagent_source, /obj/item/reagent_containers/syringe/))
- var/obj/item/reagent_containers/syringe/syr = reagent_source
- visi_msg="[user] injects [target] with [syr]"
- if(syr.reagents.total_volume <= syr.amount_per_transfer_from_this)
- syr.mode = 0
- else if(istype(reagent_source, /obj/item/reagent_containers/spray/))
- visi_msg="[user] sprays [target] with [reagent_source]"
- playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
- irrigate = 1
- else if(transfer_amount) // Droppers, cans, beakers, what have you.
- visi_msg="[user] uses [reagent_source] on [target]"
- irrigate = 1
- // Beakers, bottles, buckets, etc.
- if(reagent_source.is_drainable())
- playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
-
- if(irrigate && transfer_amount > 30 && reagent_source.reagents.total_volume >= 30 && using_irrigation)
- trays = FindConnected()
- if(trays.len > 1)
- visi_msg += ", setting off the irrigation system"
-
- if(visi_msg)
- visible_message("[visi_msg].")
-
- var/split = round(transfer_amount/trays.len)
-
- for(var/obj/machinery/hydroponics/H in trays)
- //cause I don't want to feel like im juggling 15 tamagotchis and I can get to my real work of ripping flooring apart in hopes of validating my life choices of becoming a space-gardener
-
- var/datum/reagents/S = new /datum/reagents() //This is a strange way, but I don't know of a better one so I can't fix it at the moment...
- S.my_atom = H
-
- reagent_source.reagents.trans_to(S,split)
- if(istype(reagent_source, /obj/item/reagent_containers/food/snacks) || ispill(reagent_source))
- qdel(reagent_source)
-
- H.applyChemicals(S, user)
-
- S.clear_reagents()
- qdel(S)
- H.update_state()
- if(reagent_source) // If the source wasn't composted and destroyed
- reagent_source.update_icon()
- return 1
+ if(istype(reagent_source, /obj/item/reagent_containers/syringe))
+ var/obj/item/reagent_containers/syringe/syr = reagent_source
+ visi_msg = "[user] injects [target] with [syr]"
+ if(syr.reagents.total_volume <= syr.amount_per_transfer_from_this)
+ syr.mode = SYRINGE_DRAW
+
+ else if(istype(reagent_source, /obj/item/reagent_containers/spray))
+ visi_msg = "[user] sprays [target] with [reagent_source]"
+ playsound(loc, 'sound/effects/spray3.ogg', 50, TRUE, -6)
+ irrigate = TRUE
+
+ else if(transfer_amount) // Droppers, cans, beakers, what have you.
+ visi_msg = "[user] uses [reagent_source] on [target]"
+ irrigate = TRUE
+
+ // Beakers, bottles, buckets, etc.
+ if(reagent_source.is_drainable())
+ playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
+
+ add_compost(reagent_source, user, transfer_amount, visi_msg, irrigate)
+ return TRUE
+
+ else if(isfood(O) || istype(O, /obj/item/grown))
+ var/target = myseed ? myseed.plantname : src
+ var/transfer = O.reagents.total_volume
+ var/message = "[user] composts [O], spreading it through [target]"
+ add_compost(O, user, transfer, message)
+ return TRUE
else if(istype(O, /obj/item/seeds) && !istype(O, /obj/item/seeds/sample))
if(!myseed)
@@ -838,7 +812,6 @@
to_chat(user, "- Toxicity level: [toxic] / 100")
to_chat(user, "- Water level: [waterlevel] / [maxwater]")
to_chat(user, "- Nutrition level: [nutrilevel] / [maxnutri]")
- to_chat(user, "")
else if(istype(O, /obj/item/cultivator))
if(weedlevel > 0)
@@ -851,7 +824,7 @@
else if(istype(O, /obj/item/storage/bag/plants))
attack_hand(user)
var/obj/item/storage/bag/plants/S = O
- for(var/obj/item/reagent_containers/food/snacks/grown/G in locate(user.x,user.y,user.z))
+ for(var/obj/item/food/snacks/grown/G in locate(user.x,user.y,user.z))
if(!S.can_be_inserted(G))
return
S.handle_item_insertion(G, 1)
@@ -1022,3 +995,28 @@
qdel(src)
else
return ..()
+
+/obj/machinery/hydroponics/proc/add_compost(obj/item/reagent_source, mob/user, transfer_amount, visi_msg, irrigate = FALSE)
+ var/list/trays = list(src)//makes the list just this in cases of syringes and compost etc
+
+ if(irrigate && transfer_amount > 30 && reagent_source.reagents.total_volume >= 30 && using_irrigation)
+ trays = FindConnected()
+
+ if(length(trays) > 1)
+ visi_msg += ", setting off the irrigation system"
+
+ if(visi_msg)
+ visible_message("[visi_msg].")
+
+ var/split = round(transfer_amount / length(trays))
+ for(var/obj/machinery/hydroponics/H in trays)//cause I don't want to feel like im juggling 15 tamagotchis and I can get to my real work of ripping flooring apart in hopes of validating my life choices of becoming a space-gardener
+ reagent_source.reagents.trans_to(H.reagents, split)
+ if(isfood(reagent_source) || ispill(reagent_source) || istype(reagent_source, /obj/item/grown))
+ qdel(reagent_source)
+
+ H.applyChemicals(reagents, user)
+ reagents.clear_reagents()
+ H.update_state()
+
+ if(reagent_source) // If the source wasn't composted and destroyed
+ reagent_source.update_icon()
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index 5c207ada6e61..ccf886c8b66e 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -203,7 +203,7 @@
return FALSE
return TRUE
-/datum/plant_gene/trait/proc/on_new(obj/item/reagent_containers/food/snacks/grown/G)
+/datum/plant_gene/trait/proc/on_new(obj/item/food/snacks/grown/G)
if(!origin_tech) // This ugly code segment adds RnD tech levels to resulting plants.
return
@@ -218,19 +218,19 @@
else
G.origin_tech = list2params(origin_tech)
-/datum/plant_gene/trait/proc/on_consume(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
+/datum/plant_gene/trait/proc/on_consume(obj/item/food/snacks/grown/G, mob/living/carbon/target)
return
-/datum/plant_gene/trait/proc/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
+/datum/plant_gene/trait/proc/on_slip(obj/item/food/snacks/grown/G, mob/living/carbon/target)
return
-/datum/plant_gene/trait/proc/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/proc/on_squash(obj/item/food/snacks/grown/G, atom/target)
return
-/datum/plant_gene/trait/proc/on_attackby(obj/item/reagent_containers/food/snacks/grown/G, obj/item/I, mob/user)
+/datum/plant_gene/trait/proc/on_attackby(obj/item/food/snacks/grown/G, obj/item/I, mob/user)
return
-/datum/plant_gene/trait/proc/on_throw_impact(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/proc/on_throw_impact(obj/item/food/snacks/grown/G, atom/target)
return
/datum/plant_gene/trait/squash
@@ -250,7 +250,7 @@
examine_line = "It has a very slippery skin."
dangerous = TRUE
-/datum/plant_gene/trait/slip/on_new(obj/item/reagent_containers/food/snacks/grown/G)
+/datum/plant_gene/trait/slip/on_new(obj/item/food/snacks/grown/G)
. = ..()
if(istype(G) && ispath(G.trash, /obj/item/grown))
return
@@ -274,19 +274,19 @@
origin_tech = list("powerstorage" = 5)
dangerous = TRUE
-/datum/plant_gene/trait/cell_charge/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
+/datum/plant_gene/trait/cell_charge/on_slip(obj/item/food/snacks/grown/G, mob/living/carbon/C)
var/power = G.seed.potency*rate
if(prob(power))
C.electrocute_act(round(power), G, 1, SHOCK_NOGLOVES)
-/datum/plant_gene/trait/cell_charge/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/cell_charge/on_squash(obj/item/food/snacks/grown/G, atom/target)
if(isliving(target))
var/mob/living/carbon/C = target
var/power = G.seed.potency*rate
if(prob(power))
C.electrocute_act(round(power), G, 1, SHOCK_NOGLOVES)
-/datum/plant_gene/trait/cell_charge/on_consume(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
+/datum/plant_gene/trait/cell_charge/on_consume(obj/item/food/snacks/grown/G, mob/living/carbon/target)
if(!G.reagents.total_volume)
var/batteries_recharged = 0
for(var/obj/item/stock_parts/cell/C in target.GetAllContents())
@@ -299,6 +299,7 @@
C.update_icon()
batteries_recharged = 1
if(batteries_recharged)
+ target.reagents.add_reagent("teslium", 2)
to_chat(target, "Your batteries are recharged!")
@@ -318,7 +319,7 @@
/datum/plant_gene/trait/glow/proc/glow_power(obj/item/seeds/S)
return max(S.potency*(rate + 0.01), 0.1)
-/datum/plant_gene/trait/glow/on_new(obj/item/reagent_containers/food/snacks/grown/G)
+/datum/plant_gene/trait/glow/on_new(obj/item/food/snacks/grown/G)
..()
G.set_light(glow_range(G.seed), glow_power(G.seed), glow_color)
@@ -349,7 +350,7 @@
origin_tech = list("bluespace" = 5)
dangerous = TRUE
-/datum/plant_gene/trait/teleport/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/teleport/on_squash(obj/item/food/snacks/grown/G, atom/target)
if(isliving(target))
var/mob/living/L = target
var/teleport_radius = max(round(G.seed.potency / 10), 1)
@@ -358,7 +359,7 @@
do_teleport(L, T, teleport_radius)
L.apply_status_effect(STATUS_EFFECT_TELEPORTSICK)
-/datum/plant_gene/trait/teleport/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
+/datum/plant_gene/trait/teleport/on_slip(obj/item/food/snacks/grown/G, mob/living/carbon/C)
var/teleport_radius = max(round(G.seed.potency / 10), 1)
var/turf/T = get_turf(C)
if(do_teleport(C, T, teleport_radius))
@@ -379,7 +380,7 @@
name = "Densified Chemicals"
rate = 2
-/datum/plant_gene/trait/maxchem/on_new(obj/item/reagent_containers/food/snacks/grown/G)
+/datum/plant_gene/trait/maxchem/on_new(obj/item/food/snacks/grown/G)
..()
G.reagents.maximum_volume *= rate
@@ -396,7 +397,7 @@
/datum/plant_gene/trait/battery
name = "Capacitive Cell Production"
-/datum/plant_gene/trait/battery/on_attackby(obj/item/reagent_containers/food/snacks/grown/G, obj/item/I, mob/user)
+/datum/plant_gene/trait/battery/on_attackby(obj/item/food/snacks/grown/G, obj/item/I, mob/user)
if(istype(I, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = I
if(C.use(5))
@@ -425,7 +426,7 @@
name = "Hypodermic Prickles"
dangerous = TRUE
-/datum/plant_gene/trait/stinging/on_throw_impact(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/stinging/on_throw_impact(obj/item/food/snacks/grown/G, atom/target)
if(isliving(target) && G.reagents && G.reagents.total_volume)
var/mob/living/L = target
// It would be nice to inject the body part the original thrower aimed at,
@@ -442,7 +443,7 @@
name = "gaseous decomposition"
dangerous = TRUE
-/datum/plant_gene/trait/smoke/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
+/datum/plant_gene/trait/smoke/on_squash(obj/item/food/snacks/grown/G, atom/target)
var/datum/effect_system/smoke_spread/chem/S = new
var/splat_location = get_turf(target)
var/smoke_amount = round(sqrt(G.seed.potency * 0.1), 1)
@@ -456,7 +457,7 @@
if(!(S.resistance_flags & FIRE_PROOF))
S.resistance_flags |= FIRE_PROOF
-/datum/plant_gene/trait/fire_resistance/on_new(obj/item/reagent_containers/food/snacks/grown/G)
+/datum/plant_gene/trait/fire_resistance/on_new(obj/item/food/snacks/grown/G)
if(!(G.resistance_flags & FIRE_PROOF))
G.resistance_flags |= FIRE_PROOF
diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm
index 608ba17e3c8c..30b3c34b6aae 100644
--- a/code/modules/hydroponics/seed_extractor.dm
+++ b/code/modules/hydroponics/seed_extractor.dm
@@ -16,8 +16,8 @@
if(extractor)
seedloc = extractor.loc
- if(istype(O, /obj/item/reagent_containers/food/snacks/grown/))
- var/obj/item/reagent_containers/food/snacks/grown/F = O
+ if(istype(O, /obj/item/food/snacks/grown))
+ var/obj/item/food/snacks/grown/F = O
if(F.seed)
if(user && !user.drop_item()) //couldn't drop the item
return
@@ -122,10 +122,13 @@
/obj/machinery/seed_extractor/attack_ghost(mob/user)
ui_interact(user)
-/obj/machinery/seed_extractor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/seed_extractor/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/seed_extractor/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "SeedExtractor", name, 800, 400, master_ui, state)
+ ui = new(user, src, "SeedExtractor", name)
ui.open()
/obj/machinery/seed_extractor/ui_data(mob/user)
@@ -157,13 +160,13 @@
. = FALSE
switch(action)
if("vend")
- vend_seed(text2num(params["seedid"]), params["seedvariant"], vend_amount)
+ vend_seed(params["seedid"], params["seedvariant"], vend_amount)
add_fingerprint(usr)
. = TRUE
if("set_vend_amount")
if(!length(params["vend_amount"]))
return
- vend_amount = clamp(text2num(params["vend_amount"]), 1, MAX_DISPENSE_SEEDS)
+ vend_amount = clamp(params["vend_amount"], 1, MAX_DISPENSE_SEEDS)
add_fingerprint(usr)
. = TRUE
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index ee463e80ce38..74393733a8c4 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -146,7 +146,7 @@
var/output_loc = parent.Adjacent(user) ? user.loc : parent.loc // Needed for TK
var/product_name
for(var/i in 1 to getYield())
- var/obj/item/reagent_containers/food/snacks/grown/produce = new product(output_loc, src)
+ var/obj/item/produce = new product(output_loc, src)
if(!produce)
return
@@ -169,8 +169,8 @@
data = list("blood_type" = "O-")
if(rid == "nutriment" || rid == "vitamin" || rid == "protein" || rid == "plantmatter")
// Apple tastes of apple.
- if(istype(T, /obj/item/reagent_containers/food/snacks/grown))
- var/obj/item/reagent_containers/food/snacks/grown/grown_edible = T
+ if(istype(T, /obj/item/food/snacks/grown))
+ var/obj/item/food/snacks/grown/grown_edible = T
data = grown_edible.tastes.Copy()
T.reagents.add_reagent(rid, amount, data)
@@ -179,7 +179,7 @@
/// Setter procs ///
/obj/item/seeds/proc/adjust_yield(adjustamt)
if(yield != -1) // Unharvestable shouldn't suddenly turn harvestable
- yield = clamp(yield + adjustamt, 0, 10)
+ yield = clamp(yield + adjustamt, 0, 5)
if(yield <= 0 && get_gene(/datum/plant_gene/trait/plant_type/fungal_metabolism))
yield = 1 // Mushrooms always have a minimum yield of 1.
@@ -277,7 +277,7 @@
/obj/item/seeds/proc/get_analyzer_text() // In case seeds have something special to tell to the analyzer
- var/text = ""
+ var/list/text = list()
if(!get_gene(/datum/plant_gene/trait/plant_type/weed_hardy) && !get_gene(/datum/plant_gene/trait/plant_type/fungal_metabolism) && !get_gene(/datum/plant_gene/trait/plant_type/alien_properties))
text += "- Plant type: Normal plant\n"
if(get_gene(/datum/plant_gene/trait/plant_type/weed_hardy))
@@ -306,7 +306,7 @@
all_traits += " [traits.get_name()]"
text += "- Plant Traits:[all_traits]\n"
- return text
+ return text.Join("")
/obj/item/seeds/proc/on_chem_reaction(datum/reagents/S) // In case seeds have some special interaction with special chems
return
@@ -327,7 +327,7 @@
/obj/item/seeds/proc/variant_prompt(mob/user, obj/item/container = null)
var/prev = variant
- var/V = input(user, "Choose variant name:", "Plant Variant Naming", variant) as text|null
+ var/V = tgui_input_text(user, "Choose variant name:", "Plant Variant Naming", variant, encode = FALSE)
if(isnull(V)) // Did the user cancel?
return
if(container && (loc != container)) // Was the seed removed from the container, if there is a container?
diff --git a/code/modules/input/input.dm b/code/modules/input/input.dm
index d1bd24e4a8a9..cab19d2c503f 100644
--- a/code/modules/input/input.dm
+++ b/code/modules/input/input.dm
@@ -24,11 +24,11 @@
"default" = list(
"Any" = "\"Key_Down \[\[*\]\]\"", // Passes any key down to the rebindable input system
"Any+UP" = "\"Key_Up \[\[*\]\]\"", // Passes any key up to the rebindable input system
- "Tab" = "\".winset \\\"mainwindow.macro=legacy input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"", // Swaps us to legacy mode, forces input to the input bar, sets the input bar colour to salmon pink
+ "Tab" = "\".winset \\\"mainwindow.macro=legacy input.focus=true input.border=sunken\\\"\"", // Swaps us to legacy mode, forces input to the input bar, sets the input bar colour to salmon pink
"Back" = "\".winset \\\"input.focus=true ? input.text=\\\"\"" // This makes it so backspace can remove default inputs
),
"legacy" = list(
- "Tab" = "\".winset \\\"mainwindow.macro=default map.focus=true input.background-color=[COLOR_INPUT_DISABLED]\\\"\"", // Swaps us to rebind mode, moves input away from input bar, sets input bar to white
+ "Tab" = "\".winset \\\"mainwindow.macro=default map.focus=true input.border=line\\\"\"", // Swaps us to rebind mode, moves input away from input bar, sets input bar to white
"Back" = "\".winset \\\"input.focus=true ? input.text=\\\"\"" // This makes it so backspace can remove default inputs
),
)
@@ -63,7 +63,8 @@
var/command = macro_set[key]
winset(src, "[setname]-[key]", "parent=[setname];name=[key];command=[command]")
- winset(src, null, "input.background-color=[COLOR_INPUT_DISABLED]") //screw you, we start in hotkey mode now
+ winset(src, null, "input.border=line") //screw you, we start in hotkey mode now
+
macro_sets = null //not needed anymore, bye have a great time
/client/verb/Key_Down(_key as text)
diff --git a/code/modules/instruments/songs/_song.dm b/code/modules/instruments/songs/_song.dm
index bcb235d099b4..bf79ebcbae53 100644
--- a/code/modules/instruments/songs/_song.dm
+++ b/code/modules/instruments/songs/_song.dm
@@ -352,7 +352,7 @@
// We don't want to send the whole payload (song included) just for volume
var/datum/tgui/ui = SStgui.get_open_ui(usr, parent, "main")
if(ui)
- ui.push_data(list("volume" = volume), force = TRUE)
+ ui.send_update(list("volume" = volume), TRUE)
/**
* Setter for setting how low the volume has to get before a note is considered "dead" and dropped
diff --git a/code/modules/instruments/songs/_song_ui.dm b/code/modules/instruments/songs/_song_ui.dm
index 5d7fa1f19312..c603646ef659 100644
--- a/code/modules/instruments/songs/_song_ui.dm
+++ b/code/modules/instruments/songs/_song_ui.dm
@@ -44,10 +44,13 @@
return data
-/datum/song/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, parent, ui_key, ui, force_open)
+/datum/song/ui_state(mob/user)
+ return GLOB.default_state
+
+/datum/song/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, parent, ui)
if(!ui)
- ui = new(user, parent, ui_key, "Instrument", parent?.name || "Instrument", 700, 500)
+ ui = new(user, parent, "Instrument", parent?.name || "Instrument")
ui.open()
ui.set_autoupdate(FALSE) // NO!!! Don't auto-update this!!
@@ -60,16 +63,9 @@
name = ""
if("import")
var/t = ""
- do
- t = html_encode(input(usr, "Please paste the entire song, formatted:", "[name]", t) as message)
- if(!in_range(parent, usr))
- return
-
- if(length_char(t) >= MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
- var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no")
- if(cont == "no")
- break
- while(length_char(t) > MUSIC_MAXLINES * MUSIC_MAXLINECHARS)
+ t = tgui_input_text(usr, "Please paste the entire song, formatted:", parent.name, max_length = (MUSIC_MAXLINECHARS * MUSIC_MAXLINES), multiline = TRUE)
+ if(!in_range(parent, usr))
+ return
parse_song(t)
return FALSE
if("help")
@@ -85,11 +81,9 @@
if("play")
INVOKE_ASYNC(src, PROC_REF(start_playing), usr)
if("newline")
- var/newline = html_encode(input("Enter your line: ", parent.name) as text|null)
+ var/newline = tgui_input_text(usr, "Enter your line:", parent.name, max_length = MUSIC_MAXLINECHARS)
if(!newline || !in_range(parent, usr))
return
- if(length(lines) > MUSIC_MAXLINES)
- return
if(length(newline) > MUSIC_MAXLINECHARS)
newline = copytext(newline, 1, MUSIC_MAXLINECHARS)
lines.Add(newline)
@@ -100,7 +94,7 @@
lines.Cut(num, num + 1)
if("modifyline")
var/num = round(text2num(params["line"]))
- var/content = stripped_input(usr, "Enter your line: ", parent.name, lines[num], MUSIC_MAXLINECHARS)
+ var/content = tgui_input_text(usr, "Enter your line:", parent.name, lines[num], max_length = MUSIC_MAXLINECHARS)
if(!content || !in_range(parent, usr))
return
if(num > length(lines) || num < 1)
diff --git a/code/modules/lavaland/lavaland_theme.dm b/code/modules/lavaland/lavaland_theme.dm
new file mode 100644
index 000000000000..f1c4f16230b7
--- /dev/null
+++ b/code/modules/lavaland/lavaland_theme.dm
@@ -0,0 +1,56 @@
+/datum/lavaland_theme
+ /// Name of lavaland theme
+ var/name = "Not Specified"
+ /// Typepath of turf the `/turf/simulated/floor/lava/mapping_lava` will be changed to on Late Initialization
+ var/turf/simulated/floor/primary_turf_type
+ /// Icon state of planet present on background of station Z-level
+ var/planet_icon_state
+
+/datum/lavaland_theme/New()
+ if(!primary_turf_type)
+ stack_trace("Turf type is `null` in `[type]` lavaland theme")
+ else if(!ispath(primary_turf_type))
+ stack_trace("Wrong turf type `[primary_turf_type.type]` in `[type]` lavaland theme")
+
+/**
+ * This proc should do all theme specific thing.
+ * Now it only generates rivers, but it can do all stuff you desire.
+ */
+/datum/lavaland_theme/proc/setup()
+ return
+
+/datum/lavaland_theme/lava
+ name = "lava"
+ primary_turf_type = /turf/simulated/floor/lava/lava_land_surface
+ planet_icon_state = "planet_lava"
+
+/datum/lavaland_theme/lava/setup()
+ spawn_rivers(level_name_to_num(MINING))
+
+/datum/lavaland_theme/plasma
+ name = "plasma"
+ primary_turf_type = /turf/simulated/floor/lava/lava_land_surface/plasma
+ planet_icon_state = "planet_plasma"
+
+/datum/lavaland_theme/plasma/setup()
+ spawn_rivers(level_name_to_num(MINING), nodes = 2)
+ spawn_rivers(level_name_to_num(MINING), nodes = 2)
+
+/datum/lavaland_theme/chasm
+ name = "chasm"
+ primary_turf_type = /turf/simulated/floor/chasm/straight_down/lava_land_surface
+ planet_icon_state = "planet_chasm"
+
+/datum/lavaland_theme/chasm/setup()
+ spawn_rivers(
+ level_name_to_num(MINING),
+ nodes = 6,
+ turf_type = /turf/simulated/floor/lava/mapping_lava,
+ whitelist_area = /area/lavaland/surface/outdoors,
+ min_x = 50,
+ min_y = 7,
+ max_x = 250,
+ max_y = 225,
+ prob = 10,
+ prob_loss = 5
+ )
diff --git a/code/modules/library/book.dm b/code/modules/library/book.dm
index 5a1e9de918ac..7f2570280522 100644
--- a/code/modules/library/book.dm
+++ b/code/modules/library/book.dm
@@ -213,7 +213,7 @@
var/choice = tgui_input_list(user, "What would you like to edit?", "Book Edit", list("Title", "Edit Current Page", "Author", "Summary", "Add Page", "Remove Page"))
switch(choice)
if("Title")
- var/newtitle = reject_bad_text(stripped_input(user, "Write a new title:"))
+ var/newtitle = reject_bad_text(tgui_input_text(user, "Write a new title:", "Title", title))
if(!newtitle)
to_chat(user, "You change your mind.")
return
@@ -222,13 +222,13 @@
name = "Book: " + newtitle
title = newtitle
if("Author")
- var/newauthor = stripped_input(user, "Write the author's name:")
+ var/newauthor = tgui_input_text(user, "Write the author's name:", "Author", author, MAX_NAME_LEN)
if(!newauthor)
to_chat(user, "You change your mind.")
return
author = newauthor
if("Summary")
- var/newsummary = strip_html(input(user, "Write the new summary:") as message|null, MAX_SUMMARY_LEN)
+ var/newsummary = tgui_input_text(user, "Write the new summary:", "Summary", summary, MAX_SUMMARY_LEN, multiline = TRUE)
if(!newsummary)
to_chat(user, "You change your mind.")
return
@@ -244,7 +244,7 @@
if(character_space_remaining <= 0)
to_chat(user, "There's not enough space left on this page to write anything!")
return
- var/content = strip_html(input(user, "Add Text to this page, you have [character_space_remaining] characters of space left:") as message|null, MAX_CHARACTERS_PER_BOOKPAGE)
+ var/content = tgui_input_text(user, "Add Text to this page, you have [character_space_remaining] characters of space left:", "Edit Current Page", max_length = MAX_CHARACTERS_PER_BOOKPAGE, multiline = TRUE)
if(!content)
to_chat(user, "You change your mind.")
return
@@ -267,7 +267,7 @@
if(!length(pages))
to_chat(user, "There aren't any pages in this book!")
return
- var/page_choice = input(user, "There are [length(pages)] pages, which page number would you like to remove?", "Input Page Number", null) as num|null
+ var/page_choice = tgui_input_number(user, "There are [length(pages)] pages, which page number would you like to remove?", "Input Page Number", max_value = length(pages))
if(!page_choice)
to_chat(user, "You change your mind.")
return
diff --git a/code/modules/library/library_admin.dm b/code/modules/library/library_admin.dm
index ded38fdd8069..dc22de9e33e7 100644
--- a/code/modules/library/library_admin.dm
+++ b/code/modules/library/library_admin.dm
@@ -30,10 +30,13 @@
///browserui helper variable for turning pages in book
var/view_book_page = 0
-/datum/ui_module/library_manager/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/library_manager/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/ui_module/library_manager/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "LibraryManager", name, 600, 600, master_ui, state)
+ ui = new(user, src, "LibraryManager", name)
ui.autoupdate = TRUE
ui.open()
@@ -108,7 +111,7 @@
if("specify_ssid_delete")
if(!answer || !text2num(answer))
return
- var/confirm = alert("You are about to delete book [text2num(answer)]", "Confirm Deletion", "Yes", "No")
+ var/confirm = tgui_alert(usr, "You are about to delete book [text2num(answer)]", "Confirm Deletion", list("Yes", "No"))
if(confirm != "Yes")
return //we don't need to sanitize b/c removeBookyByID uses id=:id instead of like statemetns
if(GLOB.library_catalog.remove_book_by_id(text2num(answer)))
@@ -137,7 +140,7 @@
return
var/sanitized_answer = paranoid_sanitize(answer) //the last thing we want happening is someone deleting every book with "%%"
var/confirm //We want to be absolutely certain an admin wants to do this
- confirm = alert("You are about to mass delete potentially up to 10 books", "Confirm Deletion", "Yes", "No")
+ confirm = tgui_alert(usr, "You are about to mass delete potentially up to 10 books", "Confirm Deletion", list("Yes", "No"))
if(confirm != "Yes")
return
if(GLOB.library_catalog.remove_books_by_ckey(sanitized_answer))
diff --git a/code/modules/library/library_computer.dm b/code/modules/library/library_computer.dm
index ffddf2c1ae33..f6854b9fb678 100644
--- a/code/modules/library/library_computer.dm
+++ b/code/modules/library/library_computer.dm
@@ -103,10 +103,13 @@
return ..()
-/obj/machinery/computer/library/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/library/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/computer/library/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "LibraryComputer", name, 1050, 600, master_ui, state)
+ ui = new(user, src, "LibraryComputer", name)
ui.open()
/*
@@ -471,7 +474,7 @@
return FALSE
/obj/machinery/computer/library/proc/select_book(obj/item/book/B)
- if(B.carved == TRUE)
+ if(B.carved)
return
user_data.selected_book.title = B.title ? B.title : "No Title"
user_data.selected_book.author = B.author ? B.author : "No Author"
@@ -586,6 +589,7 @@
new /obj/item/storage/bible/syndi(loc)
visible_message("[src]'s printer ominously hums as it produces a completely bound book. How did it do that?")
print_cooldown = world.time + PRINTING_COOLDOWN
+ return TRUE
#undef LIBRARY_BOOKS_PER_PAGE
#undef LOGIN_FULL
diff --git a/code/modules/library/library_equipment.dm b/code/modules/library/library_equipment.dm
index 42a13d63fde1..f7b42c501877 100644
--- a/code/modules/library/library_equipment.dm
+++ b/code/modules/library/library_equipment.dm
@@ -214,10 +214,13 @@
if(c)
selected_content.categories += c
-/obj/machinery/bookbinder/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/bookbinder/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/bookbinder/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "BookBinder", name, 700, 400, master_ui, state)
+ ui = new(user, src, "BookBinder", name)
ui.open()
/obj/machinery/bookbinder/ui_data(mob/user)
@@ -408,11 +411,11 @@
if(BARCODE_MODE_CHECKOUT)
var/confirm
if(!computer.user_data.patron_account)
- confirm = alert("Warning: patron does not have an associated account number! Are you sure you want to checkout [B] to [computer.user_data.patron_name]?", "Confirm Checkout", "Yes", "No")
+ confirm = tgui_alert(user, "Warning: patron does not have an associated account number! Are you sure you want to checkout [B] to [computer.user_data.patron_name]?", "Confirm Checkout", list("Yes", "No"))
else
- confirm = alert("Are you sure you want to checkout [B] to [computer.user_data.patron_name]?", "Confirm Checkout", "Yes", "No")
+ confirm = tgui_alert(user, "Are you sure you want to checkout [B] to [computer.user_data.patron_name]?", "Confirm Checkout", list("Yes", "No"))
- if(confirm == "No")
+ if(confirm != "Yes")
return
if(computer.checkout(B))
playsound(src, 'sound/items/scannerbeep.ogg', 15, TRUE)
diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm
index 731dfebc6f52..49541458f787 100644
--- a/code/modules/lighting/lighting_atom.dm
+++ b/code/modules/lighting/lighting_atom.dm
@@ -78,7 +78,7 @@
if(!isturf(T))
return
- if(new_opacity == TRUE)
+ if(new_opacity)
T.has_opaque_atom = TRUE
T.reconsider_lights()
else
diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm
index 13c0573a1f7f..c01bcd703e58 100644
--- a/code/modules/mapping/access_helpers.dm
+++ b/code/modules/mapping/access_helpers.dm
@@ -212,8 +212,12 @@
icon_state = "access_helper_sup"
/obj/effect/mapping_helpers/airlock/access/any/supply/general
+ name = "cargo office"
access = ACCESS_CARGO
+/obj/effect/mapping_helpers/airlock/access/any/supply/cargo_bay
+ access = ACCESS_CARGO_BAY
+
/obj/effect/mapping_helpers/airlock/access/any/supply/mail_sorting
access = ACCESS_MAILSORTING
@@ -427,8 +431,15 @@
icon_state = "access_helper_sup"
/obj/effect/mapping_helpers/airlock/access/all/supply/general
+ name = "cargo office"
access = ACCESS_CARGO
+/obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay
+ access = ACCESS_CARGO_BAY
+
+/obj/effect/mapping_helpers/airlock/access/all/supply/supply_shuttle
+ access = ACCESS_SUPPLY_SHUTTLE
+
/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting
access = ACCESS_MAILSORTING
diff --git a/code/modules/mapping/merge_conflicts.dm b/code/modules/mapping/merge_conflicts.dm
index 31f854e80166..534fe98064b1 100644
--- a/code/modules/mapping/merge_conflicts.dm
+++ b/code/modules/mapping/merge_conflicts.dm
@@ -13,7 +13,7 @@
/proc/announce_merge_conflict_marker(atom/origin)
var/msg = "HEY, LISTEN!!! Merge Conflict Marker detected at [AREACOORD(origin)]! Please manually address all potential merge conflicts!!!"
warning(msg)
- to_chat(world, "[msg]")
+ to_chat(world, "[msg]")
/obj/merge_conflict_marker
name = MERGE_CONFLICT_MARKER_NAME
diff --git a/code/modules/maptext_alerts/location_blurbs.dm b/code/modules/maptext_alerts/location_blurbs.dm
new file mode 100644
index 000000000000..b50b6b101308
--- /dev/null
+++ b/code/modules/maptext_alerts/location_blurbs.dm
@@ -0,0 +1,156 @@
+/obj/screen/text/blurb
+ maptext_height = 64
+ maptext_width = 512
+ screen_loc = "LEFT+1,BOTTOM+2"
+ /// Font size in pixels
+ var/font_size = 11
+ /// Font family
+ var/font_family = "Courier New"
+ /// Where text is aligned
+ var/text_alignment = "left"
+ /// Color of text in RGB
+ var/text_color = COLOR_WHITE
+ /// Color of text outline
+ var/text_outline_color = COLOR_BLACK
+ /// Width of text outline in pixels
+ var/text_outline_width = 1
+ /// Text that will be shown in blurb
+ var/blurb_text = ""
+ /// Number of chars from the `text` that will be displayed per interval. Defaults to 1
+ var/chars_per_interval = 1
+ /// The interval between chars rendering
+ var/interval = 1 DECISECONDS
+ /// Amount of time the blurb will be present on the screen. 0 means that blurb will dissappear immediately
+ var/hold_for = 0
+ /// Amount of time the blurbs appering (alpha changing from 0 to 255). 0 means blurb is fully opaque from the start
+ var/appear_animation_duration = 0
+ /// Amount of time the blurb takes to fade (alpha changing from 255 to 0). 0 means blurb is instantly removed from the screen after finished
+ var/fade_animation_duration = 0
+ // Colours of the background
+ var/background_r = 0
+ var/background_g = 0
+ var/background_b = 0
+ var/background_a = 0
+
+
+/obj/screen/text/blurb/proc/show_to(list/client/viewers)
+ if(!blurb_text || !viewers)
+ return
+
+ if(islist(viewers))
+ if(!length(viewers))
+ return
+
+ else
+ viewers = list(viewers)
+
+ for(var/client/viewer as anything in viewers)
+ if(viewer)
+ viewer.screen += src
+
+ appear()
+ print_text()
+
+ if(hold_for)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/screen/text/blurb, hide_from), viewers), hold_for)
+ else
+ hide_from(viewers)
+
+
+/obj/screen/text/blurb/proc/get_text_style()
+ PRIVATE_PROC(TRUE)
+
+ return {"\
+ font-family: [font_family], [initial(font_family)]; \
+ -dm-text-outline: [text_outline_width] [text_outline_color]; \
+ background-color: rgba([background_r], [background_g], [background_b], [background_a]); \
+ font-size: [font_size]px; \
+ text-align: [text_alignment]; \
+ color: [text_color];
+ "}
+
+/obj/screen/text/blurb/proc/hide_from(list/client/viewers)
+ PRIVATE_PROC(TRUE)
+
+ fade()
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/screen/text/blurb, remove_from_viewers), viewers), fade_animation_duration)
+
+/obj/screen/text/blurb/proc/appear()
+ PRIVATE_PROC(TRUE)
+
+ animate(src, alpha = 255, time = appear_animation_duration)
+
+
+/obj/screen/text/blurb/proc/fade()
+ PRIVATE_PROC(TRUE)
+
+ animate(src, alpha = 0, time = fade_animation_duration)
+
+
+/obj/screen/text/blurb/proc/print_text()
+ PRIVATE_PROC(TRUE)
+
+ var/text_style = get_text_style()
+ var/text_length = length_char(blurb_text)
+ for(var/segment_start = 1, segment_start <= text_length, segment_start += chars_per_interval)
+ var/segment_end = min(text_length + 1, segment_start + chars_per_interval)
+ maptext += get_formatted_text_segment(text_style, segment_start, segment_end)
+ sleep(interval)
+
+/obj/screen/text/blurb/proc/get_formatted_text_segment(style, segment_start, segment_end)
+ return "[copytext_char(blurb_text, segment_start, segment_end)]"
+
+/obj/screen/text/blurb/proc/remove_from_viewers(list/client/viewers)
+ PRIVATE_PROC(TRUE)
+
+ for(var/client/viewer as anything in viewers)
+ if(viewer)
+ viewer.screen -= src
+
+ qdel(src)
+
+/datum/controller/subsystem/jobs/proc/show_location_blurb(client/show_blurb_to, datum/mind/antag_check)
+ PRIVATE_PROC(TRUE)
+
+ if(!show_blurb_to?.mob)
+ return
+ SEND_SOUND(show_blurb_to, sound('sound/machines/typewriter.ogg'))
+
+ var/obj/screen/text/blurb/location_blurb = new()
+ if(antag_check.antag_datums)
+ for(var/datum/antagonist/role)
+ if(role.custom_blurb())
+ location_blurb.blurb_text = uppertext(role.custom_blurb())
+ location_blurb.text_color = role.blurb_text_color
+ location_blurb.text_outline_width = role.blurb_text_outline_width
+ location_blurb.background_r = role.blurb_r
+ location_blurb.background_g = role.blurb_g
+ location_blurb.background_b = role.blurb_b
+ location_blurb.background_a = role.blurb_a
+ location_blurb.font_family = role.blurb_font
+ break
+ location_blurb.blurb_text = uppertext("[GLOB.current_date_string], [station_time_timestamp()]\n[station_name()], [get_area_name(show_blurb_to.mob, TRUE)]")
+
+ else
+ location_blurb.blurb_text = uppertext("[GLOB.current_date_string], [station_time_timestamp()]\n[station_name()], [get_area_name(show_blurb_to.mob, TRUE)]")
+ location_blurb.hold_for = 3 SECONDS
+ location_blurb.appear_animation_duration = 1 SECONDS
+ location_blurb.fade_animation_duration = 0.5 SECONDS
+
+ location_blurb.show_to(show_blurb_to)
+
+
+/datum/controller/subsystem/ticker/proc/show_server_restart_blurb(reason)
+ PRIVATE_PROC(TRUE)
+
+ if(!length(GLOB.clients))
+ return
+
+ var/obj/screen/text/blurb/server_restart_blurb = new()
+ server_restart_blurb.text_color = COLOR_RED
+ server_restart_blurb.blurb_text = "Round is restarting...\n[reason]"
+ server_restart_blurb.hold_for = 90 SECONDS
+ server_restart_blurb.appear_animation_duration = 1 SECONDS
+ server_restart_blurb.fade_animation_duration = 0.5 SECONDS
+
+ server_restart_blurb.show_to(GLOB.clients)
diff --git a/code/modules/martial_arts/adminfu.dm b/code/modules/martial_arts/adminfu.dm
index d17228f48275..2301a4d5218d 100644
--- a/code/modules/martial_arts/adminfu.dm
+++ b/code/modules/martial_arts/adminfu.dm
@@ -47,7 +47,7 @@
var/mob/living/carbon/human/H = user
var/datum/martial_art/adminfu/F = new/datum/martial_art/adminfu(null)
F.teach(H)
- to_chat(H, "You have learned the ancient martial art of the Admins.")
+ to_chat(H, "You have learned the ancient martial art of the Admins.")
used = TRUE
desc = "It's completely blank."
name = "empty scroll"
diff --git a/code/modules/martial_arts/bearserk.dm b/code/modules/martial_arts/bearserk.dm
new file mode 100644
index 000000000000..68d2454c0481
--- /dev/null
+++ b/code/modules/martial_arts/bearserk.dm
@@ -0,0 +1,78 @@
+/datum/martial_art/bearserk
+ weight = 8 // Only beaten out by Carp-Fu, because being able to go back to using guns when you want to is OP
+ name = "Rage of the Space Bear"
+ has_explaination_verb = TRUE
+ combos = list(/datum/martial_combo/bearserk/bear_jaws, /datum/martial_combo/bearserk/paw_slam, /datum/martial_combo/bearserk/smokey)
+
+/datum/martial_art/bearserk/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+ MARTIAL_ARTS_ACT_CHECK
+ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
+ var/atk_verb = pick("punches", "claws", "hits", "mauls")
+ playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1)
+ D.visible_message("[A] [atk_verb] [D]!", "[A] [atk_verb] you!")
+ D.apply_damage(10, BRUTE, A.zone_selected)
+ if(isliving(D) && D.stat != DEAD)
+ A.adjustStaminaLoss(-20)
+ add_attack_logs(A, D, "Melee attacked with martial-art [src] : Punched", ATKLOG_ALL)
+ return TRUE
+
+/datum/martial_art/bearserk/explaination_header(user)
+ to_chat(user, "Quelling the ursine rage for a moment, you ponder on how a Space Bear fights...")
+
+/datum/martial_art/bearserk/explaination_footer(user)
+ to_chat(user, "All combos recover stamina and grant a stamina resistance buff, so get aggressive!")
+
+/datum/martial_art/bearserk/teach(mob/living/carbon/human/H, make_temporary = 0)
+ ..()
+ if(HAS_TRAIT(H, TRAIT_PACIFISM))
+ to_chat(H, "You feel otherworldly rage flicker briefly in your mind, before you reject such violent thoughts and calm down. \
+ At the very least, the weighty pelt still protects your body.")
+ return
+ to_chat(H, "Like a berserker of old, you harness the Rage of the Space Bear!")
+ to_chat(H, "The occultic, ursine might and anger of Foh'Sie and Smoh'Kie flows through your body, making you far more dangerous in unarmed combat. \
+ You can learn more about this newfound strength in the Recall Teachings verb in the martial arts tab.")
+
+/datum/martial_art/bearserk/remove(mob/living/carbon/human/H)
+ ..()
+ to_chat(H, "The ancient fury of bears leaves your mind...")
+
+// The Pelt
+
+/obj/item/clothing/head/bearpelt/bearserk
+ strip_delay = 80
+ armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 20, RAD = 0, FIRE = INFINITY, ACID = 75)
+ resistance_flags = FIRE_PROOF
+ body_parts_covered = UPPER_TORSO|HEAD|ARMS
+ var/datum/martial_art/bearserk/style
+
+/obj/item/clothing/head/bearpelt/bearserk/Initialize()
+ . = ..()
+ style = new()
+
+/obj/item/clothing/head/bearpelt/bearserk/equipped(mob/user, slot)
+ ..()
+ if(!ishuman(user))
+ return
+ var/mob/living/carbon/human/H = user
+ if(slot == SLOT_HUD_HEAD)
+ style.teach(H, TRUE)
+ H.faction |= "russian" // Russian Hardbass Begins
+ H.physiology.stun_mod *= 0.80
+ ADD_TRAIT(H, TRAIT_RESISTHEAT, "bearserk")
+
+/obj/item/clothing/head/bearpelt/bearserk/dropped(mob/user, datum/reagent/R)
+ ..()
+ if(!ishuman(user))
+ return
+ var/mob/living/carbon/human/H = user
+ if(H.get_item_by_slot(SLOT_HUD_HEAD) == src)
+ style.remove(H)
+ H.faction -= "russian" // Hardbass stops
+ H.physiology.stun_mod /= 0.80
+ REMOVE_TRAIT (H, TRAIT_RESISTHEAT, "bearserk")
+
+/obj/item/clothing/head/bearpelt/bearserk/examine(mob/user)
+ . = ..()
+ if(isAntag(user))
+ . += "Wearing this armored pelt grants you the strength of the space bear. \
+ It also makes wild bears and Russians neutral towards you."
diff --git a/code/modules/martial_arts/combos/bearserk/bear_jaws.dm b/code/modules/martial_arts/combos/bearserk/bear_jaws.dm
new file mode 100644
index 000000000000..29ab60046252
--- /dev/null
+++ b/code/modules/martial_arts/combos/bearserk/bear_jaws.dm
@@ -0,0 +1,26 @@
+/datum/martial_combo/bearserk/bear_jaws
+ name = "Bear Jaws"
+ steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_GRAB)
+ explaination_text = "Bite your opponent like a true lunatic, with even more savagery against knocked down targets."
+
+/datum/martial_combo/bearserk/bear_jaws/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
+ user.do_attack_animation(target, ATTACK_EFFECT_BITE)
+ playsound(get_turf(target), 'sound/weapons/bite.ogg', 25, vary = TRUE, extrarange = -1)
+ if(IS_HORIZONTAL(target))
+ target.visible_message("[user] leaps onto [target] and bites them!",
+ "[user] leaps onto you and bites you like a real savage!")
+ target.apply_damage(20, BRUTE, user.zone_selected, sharp = TRUE)
+ if(isliving(target) && target.stat != DEAD)
+ user.adjustStaminaLoss(-60)
+ user.apply_status_effect(STATUS_EFFECT_BEARSERKER_RAGE)
+ add_attack_logs(user, target, "Melee attacked with martial-art [MA] : Bear Jaws", ATKLOG_ALL)
+ return MARTIAL_COMBO_DONE
+ var/atk_verb = pick("bites", "gnaws", "tears at")
+ target.visible_message("[user] [atk_verb] [target]!",
+ "[user] [atk_verb] you!")
+ target.apply_damage(10, BRUTE, user.zone_selected, sharp = TRUE)
+ if(isliving(target) && target.stat != DEAD)
+ user.adjustStaminaLoss(-40)
+ user.apply_status_effect(STATUS_EFFECT_BEARSERKER_RAGE)
+ add_attack_logs(user, target, "Melee attacked with martial-art [MA] : Bear Jaws", ATKLOG_ALL)
+ return MARTIAL_COMBO_DONE
diff --git a/code/modules/martial_arts/combos/bearserk/paw_slam.dm b/code/modules/martial_arts/combos/bearserk/paw_slam.dm
new file mode 100644
index 000000000000..7205a693e0ba
--- /dev/null
+++ b/code/modules/martial_arts/combos/bearserk/paw_slam.dm
@@ -0,0 +1,30 @@
+/datum/martial_combo/bearserk/paw_slam
+ name = "Paw Slam"
+ steps = list(MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_HARM)
+ explaination_text = "Slap an opponent with a mighty paw, knocking them down. Beats down harder on already knocked down opponents."
+
+/datum/martial_combo/bearserk/paw_slam/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
+ if(IS_HORIZONTAL(target))
+ user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
+ target.visible_message("[user] pounds down on [target] with both fists!", \
+ "[user] pounds down on you with both fists!")
+ playsound(get_turf(target), 'sound/weapons/punch1.ogg', 25, vary = TRUE, extrarange = -1)
+ target.apply_damage(20, BRUTE, user.zone_selected)
+ target.Slowed(2 SECONDS)
+ if(isliving(target) && target.stat != DEAD)
+ user.adjustStaminaLoss(-40)
+ user.apply_status_effect(STATUS_EFFECT_BEARSERKER_RAGE)
+ add_attack_logs(user, target, "Melee attacked with martial-art [src] : Paw Slam", ATKLOG_ALL)
+ return MARTIAL_COMBO_DONE
+ user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
+ target.visible_message("[user] strikes [target] to the ground with a mighty slap!", \
+ "[user] slaps you so hard, you fall over!")
+ playsound(get_turf(user), 'sound/weapons/slap.ogg', 25, vary = TRUE, extrarange = -1)
+ target.apply_damage(10, BRUTE, user.zone_selected)
+ target.KnockDown(4 SECONDS)
+ target.Slowed(6 SECONDS)
+ if(isliving(target) && target.stat != DEAD)
+ user.adjustStaminaLoss(-40)
+ user.apply_status_effect(STATUS_EFFECT_BEARSERKER_RAGE)
+ add_attack_logs(user, target, "Melee attacked with martial-art [src] : Paw Slam", ATKLOG_ALL)
+ return MARTIAL_COMBO_DONE
diff --git a/code/modules/martial_arts/combos/bearserk/smokey.dm b/code/modules/martial_arts/combos/bearserk/smokey.dm
new file mode 100644
index 000000000000..6af677e470e3
--- /dev/null
+++ b/code/modules/martial_arts/combos/bearserk/smokey.dm
@@ -0,0 +1,20 @@
+/datum/martial_combo/bearserk/smokey
+ name = "Smokey"
+ steps = list(MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_DISARM)
+ explaination_text = "Mentally channel the occultic fury of Smoh'Kie to set your opponent aflame!"
+
+/datum/martial_combo/bearserk/smokey/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
+ if(!isliving(target))
+ return
+ user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
+ target.visible_message("[user] sets [target] on fire with otherwordly powers!", \
+ "As [user] punches you with a searing fist, these words echo in your mind; \"remember... only YOU can prevent forest fires!\"")
+ target.apply_damage(10, BURN, user.zone_selected)
+ playsound(get_turf(user), 'sound/weapons/punch1.ogg', 25, TRUE, -1)
+ target.adjust_fire_stacks(1.5)
+ target.IgniteMob()
+ if(isliving(target) && target.stat != DEAD)
+ user.adjustStaminaLoss(-40)
+ user.apply_status_effect(STATUS_EFFECT_BEARSERKER_RAGE)
+ add_attack_logs(user, target, "Melee attacked with martial-art [src] : Smokey", ATKLOG_ALL)
+ return MARTIAL_COMBO_DONE
diff --git a/code/modules/martial_arts/combos/cqc/consecutive.dm b/code/modules/martial_arts/combos/cqc/consecutive.dm
index bca508b616f5..fc7efc897f80 100644
--- a/code/modules/martial_arts/combos/cqc/consecutive.dm
+++ b/code/modules/martial_arts/combos/cqc/consecutive.dm
@@ -8,7 +8,7 @@
target.visible_message("[user] strikes [target]'s abdomen, neck and back consecutively", \
"[user] strikes your abdomen, neck and back consecutively!")
playsound(get_turf(target), 'sound/weapons/cqchit2.ogg', 50, 1, -1)
- target.adjustStaminaLoss(70)
+ target.apply_damage(70, STAMINA)
target.apply_damage(20, BRUTE)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Consecutive", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
diff --git a/code/modules/martial_arts/combos/cqc/kick.dm b/code/modules/martial_arts/combos/cqc/kick.dm
index 44e003216f69..d94023cc5c94 100644
--- a/code/modules/martial_arts/combos/cqc/kick.dm
+++ b/code/modules/martial_arts/combos/cqc/kick.dm
@@ -21,7 +21,7 @@
playsound(get_turf(user), 'sound/weapons/genhit1.ogg', 25, 1, -1)
var/atom/throw_target = get_edge_target_turf(target, user.dir)
target.throw_at(throw_target, 1, 8, user)
- target.adjustStaminaLoss(40)
+ target.apply_damage(40, STAMINA)
target.adjustBrainLoss(10)
target.Silence(3 SECONDS)
add_attack_logs(user, target, "Kicked in the head with martial-art [src] : Kick", ATKLOG_ALL)
diff --git a/code/modules/martial_arts/combos/cqc/pressure.dm b/code/modules/martial_arts/combos/cqc/pressure.dm
index 96b482b22abb..90de2f1be93a 100644
--- a/code/modules/martial_arts/combos/cqc/pressure.dm
+++ b/code/modules/martial_arts/combos/cqc/pressure.dm
@@ -8,7 +8,7 @@
var/obj/item/I = target.get_active_hand()
if(I && target.drop_item())
user.put_in_hands(I)
- target.adjustStaminaLoss(40)
+ target.apply_damage(40, STAMINA)
playsound(get_turf(user), 'sound/weapons/cqchit1.ogg', 5, 1, -1)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Pressure", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
diff --git a/code/modules/martial_arts/combos/cqc/restrain.dm b/code/modules/martial_arts/combos/cqc/restrain.dm
index 944c0cac45d9..c73603cc0578 100644
--- a/code/modules/martial_arts/combos/cqc/restrain.dm
+++ b/code/modules/martial_arts/combos/cqc/restrain.dm
@@ -18,11 +18,11 @@
switch(stam_damage)
if(0 to 40)
target.Immobilize(4 SECONDS)
- target.adjustStaminaLoss(35)
+ target.apply_damage(35, STAMINA)
if(41 to 80)
target.Stun(6 SECONDS)
if(81 to 120)
- target.adjustStaminaLoss(40)
+ target.apply_damage(40, STAMINA)
CQC.restraining = TRUE
addtimer(CALLBACK(CQC, TYPE_PROC_REF(/datum/martial_art/cqc, drop_restraining)), 5 SECONDS, TIMER_UNIQUE)
diff --git a/code/modules/martial_arts/combos/krav_maga/lung_punch.dm b/code/modules/martial_arts/combos/krav_maga/lung_punch.dm
index ba1bfd465a0b..9ed06508ca87 100644
--- a/code/modules/martial_arts/combos/krav_maga/lung_punch.dm
+++ b/code/modules/martial_arts/combos/krav_maga/lung_punch.dm
@@ -8,7 +8,7 @@
"[user] slams your chest! You can't breathe!")
playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1)
target.AdjustLoseBreath(10 SECONDS)
- target.adjustStaminaLoss(30)
+ target.apply_damage(30, STAMINA)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Lung Punch", ATKLOG_ALL)
user.mind.martial_art.in_stance = FALSE
return MARTIAL_COMBO_DONE_CLEAR_COMBOS
diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm
index 1c59f19ea12b..7b018bbca566 100644
--- a/code/modules/martial_arts/krav_maga.dm
+++ b/code/modules/martial_arts/krav_maga.dm
@@ -108,15 +108,15 @@
if(IS_HORIZONTAL(D))
bonus_damage += 5
picked_hit_type = "stomps on"
- D.apply_damage(bonus_damage, BRUTE)
- if(picked_hit_type == "kicks" || picked_hit_type == "stomps")
+ if(picked_hit_type == "kicks" || IS_HORIZONTAL(D))
A.do_attack_animation(D, ATTACK_EFFECT_KICK)
- playsound(get_turf(D), 'sound/effects/hit_kick.ogg', 50, 1, -1)
+ playsound(get_turf(D), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
else
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
- playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, 1, -1)
+ playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
D.visible_message("[A] [picked_hit_type] [D]!", \
"[A] [picked_hit_type] you!")
+ D.apply_damage(bonus_damage, BRUTE)
return TRUE
/datum/martial_art/krav_maga/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -132,7 +132,7 @@
else
D.visible_message("[A] attempted to disarm [D]!", \
"[A] attempted to disarm [D]!")
- playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+ playsound(D, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
return TRUE
//Krav Maga Gloves
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index 10819a351ecb..17d04d3232ff 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -97,19 +97,19 @@
if(MARTIAL_COMBO_FAIL)
current_combos -= MC
if(MARTIAL_COMBO_DONE_NO_CLEAR)
- . = TRUE
+ . = MARTIAL_ARTS_ACT_SUCCESS
current_combos -= MC
if(MARTIAL_COMBO_DONE)
reset_combos()
- return TRUE
+ return MARTIAL_ARTS_ACT_SUCCESS
if(MARTIAL_COMBO_DONE_BASIC_HIT)
basic_hit(user, target)
reset_combos()
- return TRUE
+ return MARTIAL_ARTS_ACT_SUCCESS
if(MARTIAL_COMBO_DONE_CLEAR_COMBOS)
combos.Cut()
reset_combos()
- return TRUE
+ return MARTIAL_ARTS_ACT_SUCCESS
if(!LAZYLEN(current_combos))
reset_combos()
if(HAS_COMBOS && could_start_new_combo)
@@ -325,7 +325,7 @@
var/mob/living/carbon/human/H = user
var/datum/martial_art/plasma_fist/F = new/datum/martial_art/plasma_fist(null)
F.teach(H)
- to_chat(H, "You have learned the ancient martial art of Plasma Fist.")
+ to_chat(H, "You have learned the ancient martial art of Plasma Fist.")
used = TRUE
desc = "It's completely blank."
name = "empty scroll"
@@ -375,7 +375,7 @@
to_chat(user, "The mere thought of combat, let alone CQC, makes your head spin!")
return
- to_chat(user, "You remember the basics of CQC.")
+ to_chat(user, "You remember the basics of CQC.")
var/datum/martial_art/cqc/CQC = new(null)
CQC.teach(user)
user.drop_item()
@@ -444,7 +444,7 @@
H.visible_message("[pick(fluffmessages)]", \
"[pick(fluffmessages)]")
playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, 1, -1)
- H.adjustStaminaLoss(rand(13,20))
+ H.apply_damage(rand(13,20), STAMINA)
if(prob(10))
H.visible_message("[H] collapses!", \
"Your legs give out!")
diff --git a/code/modules/martial_arts/mimejutsu.dm b/code/modules/martial_arts/mimejutsu.dm
index 8eb960c0e884..7178f879a793 100644
--- a/code/modules/martial_arts/mimejutsu.dm
+++ b/code/modules/martial_arts/mimejutsu.dm
@@ -27,7 +27,7 @@
var/mob/living/carbon/human/H = user
var/datum/martial_art/mimejutsu/F = new/datum/martial_art/mimejutsu(null)
F.teach(H)
- to_chat(H, "You have learned the ancient martial art of mimes.")
+ to_chat(H, "You have learned the ancient martial art of mimes.")
used = TRUE
desc = "It used to have something stapled to it..the staple is still there."
name = "beret with staple"
diff --git a/code/modules/martial_arts/muscle_implant.dm b/code/modules/martial_arts/muscle_implant.dm
index a048708ddbf4..bae6f2d66092 100644
--- a/code/modules/martial_arts/muscle_implant.dm
+++ b/code/modules/martial_arts/muscle_implant.dm
@@ -12,7 +12,7 @@
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "You don't want to hurt [target]!")
return FALSE
- var/picked_hit_type = pick("punch", "smash", "kick")
+ var/picked_hit_type = pick("punch", "smash")
if(ishuman(target) && target.check_shields(user, punch_damage, "[user]'s' [picked_hit_type]"))
user.do_attack_animation(target)
playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm
index ea5e8488e62f..d3af7191459c 100644
--- a/code/modules/martial_arts/sleeping_carp.dm
+++ b/code/modules/martial_arts/sleeping_carp.dm
@@ -1,6 +1,6 @@
//Used by the gang of the same name. Uses combos. Basic attacks bypass armor and never miss
/datum/martial_art/the_sleeping_carp
- weight = 8
+ weight = 9
name = "The Sleeping Carp"
deflection_chance = 100
reroute_deflection = TRUE
diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
index 022981c28720..1246798c39f7 100644
--- a/code/modules/mining/abandonedcrates.dm
+++ b/code/modules/mining/abandonedcrates.dm
@@ -23,9 +23,9 @@
var/loot = rand(1,100) //100 different crates with varying chances of spawning
switch(loot)
if(1 to 5) //5% chance
- new /obj/item/reagent_containers/food/drinks/bottle/rum(src)
- new /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus(src)
- new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
+ new /obj/item/reagent_containers/drinks/bottle/rum(src)
+ new /obj/item/food/snacks/grown/ambrosia/deus(src)
+ new /obj/item/reagent_containers/drinks/bottle/whiskey(src)
new /obj/item/lighter(src)
if(6 to 10)
new /obj/item/bedsheet(src)
@@ -113,7 +113,7 @@
new /obj/item/bikehorn(src)
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/reagent_containers/spray/waterflower(src)
- new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
+ new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(src)
if(89) //1% chance
new /obj/item/weed_extract(src)
if(90)
@@ -135,7 +135,7 @@
new /obj/item/clothing/head/beret(src)
new /obj/item/clothing/suit/suspenders(src)
new /obj/item/toy/crayon/mime(src)
- new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)
+ new /obj/item/reagent_containers/drinks/bottle/bottleofnothing(src)
if(96)
new /obj/item/hand_tele(src)
if(97)
diff --git a/code/modules/mining/equipment/lazarus_injector.dm b/code/modules/mining/equipment/lazarus_injector.dm
index 8a392486cce3..821a77b0c9a2 100644
--- a/code/modules/mining/equipment/lazarus_injector.dm
+++ b/code/modules/mining/equipment/lazarus_injector.dm
@@ -53,6 +53,7 @@
if(!malfunctioning)
malfunctioning = 1
to_chat(user, "You override [src]'s safety protocols.")
+ return TRUE
/obj/item/lazarus_injector/emp_act()
if(!malfunctioning)
diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm
index b9c3b8e5acd8..57f32f4dae8b 100644
--- a/code/modules/mining/equipment/marker_beacons.dm
+++ b/code/modules/mining/equipment/marker_beacons.dm
@@ -59,10 +59,10 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
transfer_fingerprints_to(M)
/obj/item/stack/marker_beacon/AltClick(mob/living/user)
- if(!istype(user) || ui_status(user, GLOB.physical_state) != STATUS_INTERACTIVE)
+ if(!istype(user) || ui_status(user, GLOB.physical_state) != UI_INTERACTIVE)
return
var/input_color = tgui_input_list(user, "Choose a color.", "Beacon Color", GLOB.marker_beacon_colors)
- if(!istype(user) || ui_status(user, GLOB.physical_state) != STATUS_INTERACTIVE)
+ if(!istype(user) || ui_status(user, GLOB.physical_state) != UI_INTERACTIVE)
return
if(input_color)
picked_color = input_color
@@ -135,10 +135,10 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
/obj/structure/marker_beacon/AltClick(mob/living/user)
..()
- if(!istype(user) || ui_status(user, GLOB.physical_state) != STATUS_INTERACTIVE)
+ if(!istype(user) || ui_status(user, GLOB.physical_state) != UI_INTERACTIVE)
return
var/input_color = tgui_input_list(user, "Choose a color.", "Beacon Color", GLOB.marker_beacon_colors)
- if(!istype(user) || ui_status(user, GLOB.physical_state) != STATUS_INTERACTIVE)
+ if(!istype(user) || ui_status(user, GLOB.physical_state) != UI_INTERACTIVE)
return
if(input_color)
picked_color = input_color
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index b7f65bf4fdc6..25b563aa096a 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -21,8 +21,7 @@
if(!emagged)
to_chat(usr, "You short out the safeties, allowing it to be placed in the station sector.")
emagged = TRUE
- return
-
+ return TRUE
to_chat(usr, "The safeties are already shorted out!")
/obj/item/survivalcapsule/proc/get_template()
@@ -42,7 +41,7 @@
/obj/item/survivalcapsule/attack_self()
// Can't grab when capsule is New() because templates aren't loaded then
get_template()
- if(used == FALSE)
+ if(!used)
loc.visible_message("[src] begins to shake. Stand back!")
used = TRUE
sleep(50)
@@ -225,7 +224,7 @@
return
for(var/i in 1 to 5)
- var/obj/item/reagent_containers/food/snacks/warmdonkpocket_weak/W = new(src)
+ var/obj/item/food/snacks/warmdonkpocket_weak/W = new(src)
load(W)
if(prob(50))
var/obj/item/storage/bag/dice/D = new(src)
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index 451353bfc28f..17d1eb27cdb4 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -63,8 +63,9 @@
emagged = TRUE
to_chat(user, "You emag [src].")
var/turf/T = get_turf(src)
- do_sparks(5, 0, T)
+ do_sparks(5, FALSE, T)
playsound(T, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ return TRUE
/obj/effect/portal/jaunt_tunnel
name = "jaunt tunnel"
@@ -122,7 +123,9 @@
areaindex[tmpname] = 1
L[tmpname] = R
- var/desc = input("Please select a location to target.", "Flare Target Interface") in L
+ var/desc = tgui_input_list(user, "Please select a location to target.", "Flare Target Interface", L)
+ if(!desc)
+ return
destination = L[desc]
/obj/item/wormhole_jaunter/contractor/attack_self(mob/user) // message is later down
diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm
index cc1eead3e152..7a79f1b96436 100644
--- a/code/modules/mining/laborcamp/laborshuttle.dm
+++ b/code/modules/mining/laborcamp/laborshuttle.dm
@@ -70,10 +70,13 @@
/obj/machinery/mineral/labor_prisoner_shuttle_console/attack_ghost(mob/user)
attack_hand(user)
-/obj/machinery/mineral/labor_prisoner_shuttle_console/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/mineral/labor_prisoner_shuttle_console/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/mineral/labor_prisoner_shuttle_console/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "PrisonerShuttleConsole", name, 315, 150, master_ui, state)
+ ui = new(user, src, "PrisonerShuttleConsole", name)
ui.open()
/obj/machinery/mineral/labor_prisoner_shuttle_console/ui_data(mob/user)
@@ -153,6 +156,7 @@
if(!emagged)
emagged = TRUE
to_chat(user, "PZZTTPFFFT")
+ return TRUE
/**********************Point Lookup Console**************************/
/obj/machinery/mineral/labor_points_checker
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index 7a9d08733e32..668442ccf5fa 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -9,7 +9,7 @@
var/harvested_name = "shortened mushrooms"
var/harvested_desc = "Some quickly regrowing mushrooms, formerly known to be quite large."
var/needs_sharp_harvest = TRUE
- var/harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings
+ var/harvest = /obj/item/food/snacks/grown/ash_flora/shavings
var/harvest_amount_low = 1
var/harvest_amount_high = 3
var/harvest_time = 60
@@ -84,7 +84,7 @@
desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures."
harvested_name = "leafless mushrooms"
harvested_desc = "A bunch of formerly-leafed mushrooms, with their sporangiums exposed. Scandalous?"
- harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf
+ harvest = /obj/item/food/snacks/grown/ash_flora/mushroom_leaf
needs_sharp_harvest = FALSE
harvest_amount_high = 4
harvest_time = 20
@@ -100,7 +100,7 @@
desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems."
harvested_name = "small mushrooms"
harvested_desc = "Several small mushrooms near the stumps of what likely were larger mushrooms."
- harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap
+ harvest = /obj/item/food/snacks/grown/ash_flora/mushroom_cap
harvest_amount_high = 4
harvest_time = 50
harvest_message_low = "You slice the cap off of a mushroom."
@@ -117,7 +117,7 @@
light_power = 2.1
harvested_name = "tiny mushrooms"
harvested_desc = "A few tiny mushrooms around larger stumps. You can already see them growing back."
- harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem
+ harvest = /obj/item/food/snacks/grown/ash_flora/mushroom_stem
harvest_amount_high = 4
harvest_time = 40
harvest_message_low = "You pick and slice the cap off of a mushroom, leaving the stem."
@@ -132,7 +132,7 @@
desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash."
harvested_name = "cacti"
harvested_desc = "A bunch of prickly cacti. You can see fruits slowly growing beneath the covering of ash."
- harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
+ harvest = /obj/item/food/snacks/grown/ash_flora/cactus_fruit
needs_sharp_harvest = FALSE
harvest_amount_high = 2
harvest_time = 10
@@ -181,7 +181,7 @@
. = ..()
icon_state = "basalt[rand(1, 4)]"
-/obj/item/reagent_containers/food/snacks/grown/ash_flora
+/obj/item/food/snacks/grown/ash_flora
name = "mushroom shavings"
desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
icon = 'icons/obj/lavaland/ash_flora.dmi'
@@ -192,35 +192,35 @@
seed = /obj/item/seeds/lavaland/polypore
wine_power = 0.2
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/Initialize(mapload)
+/obj/item/food/snacks/grown/ash_flora/Initialize(mapload)
. = ..()
pixel_x = rand(-4, 4)
pixel_y = rand(-4, 4)
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings //for actual crafting
+/obj/item/food/snacks/grown/ash_flora/shavings //for actual crafting
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf
+/obj/item/food/snacks/grown/ash_flora/mushroom_leaf
name = "mushroom leaf"
desc = "A leaf, from a mushroom."
icon_state = "mushroom_leaf"
seed = /obj/item/seeds/lavaland/porcini
wine_power = 0.4
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap
+/obj/item/food/snacks/grown/ash_flora/mushroom_cap
name = "mushroom cap"
desc = "The cap of a large mushroom."
icon_state = "mushroom_cap"
seed = /obj/item/seeds/lavaland/inocybe
wine_power = 0.7
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem
+/obj/item/food/snacks/grown/ash_flora/mushroom_stem
name = "mushroom stem"
desc = "A long mushroom stem. It's slightly glowing."
icon_state = "mushroom_stem"
seed = /obj/item/seeds/lavaland/ember
wine_power = 0.6
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
+/obj/item/food/snacks/grown/ash_flora/cactus_fruit
name = "cactus fruit"
desc = "A cactus fruit covered in a thick, reddish skin. And some ash."
icon_state = "cactus_fruit"
@@ -249,7 +249,7 @@
icon_state = "seed-cactus"
species = "cactus"
plantname = "Fruiting Cactus"
- product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
+ product = /obj/item/food/snacks/grown/ash_flora/cactus_fruit
genes = list(/datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
growthstages = 2
@@ -261,7 +261,7 @@
icon_state = "mycelium-polypore"
species = "polypore"
plantname = "Polypore Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings
+ product = /obj/item/food/snacks/grown/ash_flora/shavings
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("sugar" = 0.06, "ethanol" = 0.04, "stabilizing_agent" = 0.06, "minttoxin" = 0.02)
@@ -272,7 +272,7 @@
icon_state = "mycelium-porcini"
species = "porcini"
plantname = "Porcini Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf
+ product = /obj/item/food/snacks/grown/ash_flora/mushroom_leaf
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("nutriment" = 0.06, "vitfro" = 0.04, "nicotine" = 0.04)
@@ -284,7 +284,7 @@
icon_state = "mycelium-inocybe"
species = "inocybe"
plantname = "Inocybe Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap
+ product = /obj/item/food/snacks/grown/ash_flora/mushroom_cap
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("lsd" = 0.04, "entpoly" = 0.08, "psilocybin" = 0.04)
@@ -295,7 +295,7 @@
icon_state = "mycelium-ember"
species = "ember"
plantname = "Embershroom Mushrooms"
- product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem
+ product = /obj/item/food/snacks/grown/ash_flora/mushroom_stem
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/glow, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("tinlux" = 0.04, "vitamin" = 0.02, "space_drugs" = 0.02)
@@ -305,12 +305,12 @@
//what you can craft with these things
/datum/crafting_recipe/mushroom_bowl
name = "Mushroom Bowl"
- result = list(/obj/item/reagent_containers/food/drinks/mushroom_bowl)
- reqs = list(/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings = 5)
+ result = list(/obj/item/reagent_containers/drinks/mushroom_bowl)
+ reqs = list(/obj/item/food/snacks/grown/ash_flora/shavings = 5)
time = 30
category = CAT_PRIMAL
-/obj/item/reagent_containers/food/drinks/mushroom_bowl
+/obj/item/reagent_containers/drinks/mushroom_bowl
name = "mushroom bowl"
desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
icon = 'icons/obj/lavaland/ash_flora.dmi'
diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm
index 102a38f71ffe..1a1bbd268bd3 100644
--- a/code/modules/mining/lavaland/loot/colossus_loot.dm
+++ b/code/modules/mining/lavaland/loot/colossus_loot.dm
@@ -224,8 +224,8 @@
if(!user.check_ahud_rejoin_eligibility())
to_chat(user, "Upon using the antagHUD you forfeited the ability to join the round.")
return
- var/be_helper = alert("Become a Lightgeist? (Warning, You can no longer be cloned!)",,"Yes","No")
- if(be_helper == "No")
+ var/be_helper = tgui_alert(user, "Become a Lightgeist? (Warning, You can no longer be cloned!)", "Respawn", list("Yes","No"))
+ if(be_helper != "Yes")
return
if(!loc || QDELETED(src) || QDELETED(user))
if(user)
diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm
index 12459079fe90..5c643f07398c 100644
--- a/code/modules/mining/lavaland/loot/tendril_loot.dm
+++ b/code/modules/mining/lavaland/loot/tendril_loot.dm
@@ -93,32 +93,6 @@
new /obj/effect/decal/cleanable/ash(get_turf(user))
qdel(src)
-//Jacob's ladder
-
-/obj/item/jacobs_ladder
- name = "jacob's ladder"
- desc = "A celestial ladder that violates the laws of physics."
- icon = 'icons/obj/structures.dmi'
- icon_state = "ladder00"
-
-/obj/item/jacobs_ladder/attack_self(mob/user)
- var/turf/T = get_turf(src)
- var/ladder_x = T.x
- var/ladder_y = T.y
- to_chat(user, "You unfold the ladder. It extends much farther than you were expecting.")
- var/last_ladder = null
- for(var/i in 1 to world.maxz)
- if(is_admin_level(i) || is_away_level(i))
- continue
- var/turf/T2 = locate(ladder_x, ladder_y, i)
- last_ladder = new /obj/structure/ladder/unbreakable/jacob(T2, null, last_ladder)
- qdel(src)
-
-// Inherit from unbreakable but don't set ID, to suppress the default Z linkage
-/obj/structure/ladder/unbreakable/jacob
- name = "jacob's ladder"
- desc = "An indestructible celestial ladder that violates the laws of physics."
-
//Boat
/obj/vehicle/lavaboat
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 7d221a5f6410..bf9bfc53edf2 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -63,7 +63,7 @@
if(20)
new /obj/item/grenade/clusterbuster/inferno(src)
if(21)
- new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src)
+ new /obj/item/reagent_containers/drinks/bottle/holywater/hell(src)
if(22)
new /obj/item/spellbook/oneuse/summonitem(src)
if(23)
@@ -355,7 +355,7 @@
/obj/item/rod_of_asclepius/dropped(mob/user, silent)
..()
- if(!activated)
+ if(!activated || QDELETED(src))
return
addtimer(CALLBACK(src, PROC_REF(try_attach_to_owner)), 0) // Do this once the drop call stack is done. The holding limb might be getting removed
@@ -670,7 +670,7 @@
to_chat(target, "[user] shatters [src] over you!")
target.apply_damage((ishostile(target) ? 75 : 35), BRUTE, BODY_ZONE_CHEST, TRUE)
target.KnockDown(5 SECONDS)
- target.adjustStaminaLoss(60) //Takes 4 hits to do, breaks your weapon. Perfectly fine.
+ target.apply_damage(60, STAMINA) //Takes 4 hits to do, breaks your weapon. Perfectly fine.
user.do_attack_animation(target, ATTACK_EFFECT_SMASH)
playsound(src, 'sound/effects/glassbr3.ogg', 100, TRUE)
if(ishuman(user))
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 41d77a681bbe..81faa38130b0 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -328,12 +328,14 @@
return FALSE
var/stored = get_num_smeltable_alloy(D)
var/desired = min(amount, stored, MAX_STACK_SIZE)
+ if(!desired)
+ return FALSE
materials.use_amount(D.materials, desired)
// Spawn the alloy
var/result = new D.build_path(src)
if(istype(result, /obj/item/stack/sheet))
var/obj/item/stack/sheet/mineral/A = result
- A.amount = amount
+ A.amount = desired
unload_mineral(A)
else
unload_mineral(result)
@@ -367,16 +369,22 @@
return FALSE
add_fingerprint(usr)
-/obj/machinery/mineral/ore_redemption/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- var/datum/asset/materials_assets = get_asset_datum(/datum/asset/simple/materials)
- materials_assets.send(user)
+/obj/machinery/mineral/ore_redemption/ui_state(mob/user)
+ return GLOB.default_state
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/mineral/ore_redemption/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "OreRedemption", name, 500, 600)
+ ui = new(user, src, "OreRedemption", name)
ui.open()
ui.set_autoupdate(FALSE)
+/obj/machinery/mineral/ore_redemption/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/spritesheet/materials),
+ get_asset_datum(/datum/asset/spritesheet/alloys)
+ )
+
/**
* Smelts the given stack of ore.
*
@@ -390,7 +398,11 @@
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
var/amount_compatible = materials.get_item_material_amount(O)
if(amount_compatible)
- materials.insert_item(O, sheet_per_ore)
+ // Prevents duping
+ if(O.refined_type)
+ materials.insert_item(O, sheet_per_ore)
+ else
+ materials.insert_item(O, 1)
// Delete the stack
ore_buffer -= O
qdel(O)
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index f96ea785af88..2c942dc578ba 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -83,7 +83,7 @@
EQUIPMENT("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400),
)
prize_list["Miscellaneous"] = list(
- EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 100),
+ EQUIPMENT("Absinthe", /obj/item/reagent_containers/drinks/bottle/absinthe/premium, 100),
EQUIPMENT("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300),
EQUIPMENT("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
EQUIPMENT("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500),
@@ -91,7 +91,7 @@
EQUIPMENT("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000),
EQUIPMENT("Soap", /obj/item/soap/nanotrasen, 200),
EQUIPMENT("Space Cash", /obj/item/stack/spacecash/c200, 2000),
- EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100),
+ EQUIPMENT("Whiskey", /obj/item/reagent_containers/drinks/bottle/whiskey, 100),
EQUIPMENT("HRD-MDE Project Box", /obj/item/storage/box/hardmode_box, 3500) //I want miners have to pay a lot to get this, but be set once they do.
)
prize_list["Extra"] = list() // Used in child vendors
@@ -158,19 +158,20 @@
dirty_items = TRUE
return ..()
-/obj/machinery/mineral/equipment_vendor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/mineral/equipment_vendor/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/mineral/equipment_vendor/ui_interact(mob/user, datum/tgui/ui = null)
// Update static data if need be
if(dirty_items)
if(!ui)
- ui = SStgui.get_open_ui(user, src, ui_key)
- if(ui) // OK so ui?. somehow breaks the implied src so this is needed
- ui.initial_static_data = ui_static_data(user)
+ ui = SStgui.get_open_ui(user, src)
dirty_items = FALSE
// Open the window
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "MiningVendor", name, 400, 450)
+ ui = new(user, src, "MiningVendor", name)
ui.open()
ui.set_autoupdate(FALSE)
@@ -306,7 +307,7 @@
EQUIPMENT("Extra ID", /obj/item/card/id/golem, 250),
EQUIPMENT("Science Backpack", /obj/item/storage/backpack/science, 250),
EQUIPMENT("Full Toolbelt", /obj/item/storage/belt/utility/full/multitool, 250),
- EQUIPMENT("Monkey Cube", /obj/item/reagent_containers/food/snacks/monkeycube, 250),
+ EQUIPMENT("Monkey Cube", /obj/item/food/snacks/monkeycube, 250),
EQUIPMENT("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500),
EQUIPMENT("Grey Slime Extract", /obj/item/slime_extract/grey, 1000),
EQUIPMENT("KA Trigger Modification Kit", /obj/item/borg/upgrade/modkit/trigger_guard, 1000),
@@ -335,16 +336,16 @@
prize_list = list()
prize_list["Scum"] += list(
EQUIPMENT("Trauma Kit", /obj/item/stack/medical/bruise_pack/advanced, 150),
- EQUIPMENT("Whisky", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100),
- EQUIPMENT("Beer", /obj/item/reagent_containers/food/drinks/cans/beer, 50),
- EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 250),
+ EQUIPMENT("Whisky", /obj/item/reagent_containers/drinks/bottle/whiskey, 100),
+ EQUIPMENT("Beer", /obj/item/reagent_containers/drinks/cans/beer, 50),
+ EQUIPMENT("Absinthe", /obj/item/reagent_containers/drinks/bottle/absinthe/premium, 250),
EQUIPMENT("Cigarettes", /obj/item/storage/fancy/cigarettes, 100),
EQUIPMENT("Medical Marijuana", /obj/item/storage/fancy/cigarettes/cigpack_med, 250),
EQUIPMENT("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
EQUIPMENT("Box of matches", /obj/item/storage/fancy/matches, 50),
- EQUIPMENT("Cheeseburger", /obj/item/reagent_containers/food/snacks/burger/cheese, 150),
- EQUIPMENT("Big Burger", /obj/item/reagent_containers/food/snacks/burger/bigbite, 250),
- EQUIPMENT("Recycled Prisoner", /obj/item/reagent_containers/food/snacks/soylentgreen, 500),
+ EQUIPMENT("Cheeseburger", /obj/item/food/snacks/burger/cheese, 150),
+ EQUIPMENT("Big Burger", /obj/item/food/snacks/burger/bigbite, 250),
+ EQUIPMENT("Recycled Prisoner", /obj/item/food/snacks/soylentgreen, 500),
EQUIPMENT("Crayons", /obj/item/storage/fancy/crayons, 350),
EQUIPMENT("Plushie", /obj/random/plushie, 750),
EQUIPMENT("Dnd set", /obj/item/storage/box/characters, 500),
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 4a199cd11b35..8d1bfef8a8ce 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -124,7 +124,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
visible_message("[C]'s glasses block the sand!")
return
C.EyeBlurry(12 SECONDS)
- C.adjustStaminaLoss(15)//the pain from your eyes burning does stamina damage
+ C.apply_damage(15, STAMINA)//the pain from your eyes burning does stamina damage
C.AdjustConfused(10 SECONDS)
to_chat(C, "[src] gets into your eyes! The pain, it burns!")
qdel(src)
@@ -354,6 +354,10 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
if(cmineral && name_by_cmineral)
name = "[cmineral] coin"
+/obj/item/coin/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/surgery_initiator/robo)
+
/obj/item/coin/gold
cmineral = "gold"
icon_state = "coin_gold_heads"
@@ -380,15 +384,47 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/coin/plasma
cmineral = "plasma"
+ desc = "You really shouldn't keep this in the same pocket as a lighter."
icon_state = "coin_plasma_heads"
materials = list(MAT_PLASMA = 400)
credits = 80
+/obj/item/coin/plasma/bullet_act(obj/item/projectile/P)
+ if(!QDELETED(src) && !P.nodamage && (P.damage_type == BURN))
+ log_and_set_aflame(P.firer, P)
+
+/obj/item/coin/plasma/attackby(obj/item/I, mob/living/user, params)
+ if(!I.get_heat())
+ return ..()
+ log_and_set_aflame(user, I)
+
+/obj/item/coin/plasma/proc/log_and_set_aflame(mob/user, obj/item/I)
+ var/turf/T = get_turf(src)
+ message_admins("Plasma coin ignited by [key_name_admin(user)]([ADMIN_QUE(user, "?")]) ([ADMIN_FLW(user, "FLW")]) in ([COORD(T)] - [ADMIN_JMP(T)]")
+ log_game("Plasma coin ignited by [key_name(user)] in [COORD(T)]")
+ investigate_log("was ignited by [key_name(user)]", "atmos")
+ user.create_log(MISC_LOG, "Plasma coin ignited using [I]", src)
+ fire_act()
+
+/obj/item/coin/plasma/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
+ ..()
+ atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS, 5) // 2 is the "correct" ammount, but its super lame. Im sure this wont have ramifications on the plasma market.
+ qdel(src)
+
/obj/item/coin/uranium
cmineral = "uranium"
+ desc = "You probably shouldn't keep this in your front pocket."
icon_state = "coin_uranium_heads"
materials = list(MAT_URANIUM = 400)
credits = 160
+ COOLDOWN_DECLARE(radiation_cooldown)
+
+/obj/item/coin/uranium/attack_self(mob/user)
+ ..()
+ if(!COOLDOWN_FINISHED(src, radiation_cooldown))
+ return
+ radiation_pulse(src, 50)
+ COOLDOWN_START(src, radiation_cooldown, 1.5 SECONDS)
/obj/item/coin/clown
cmineral = "bananium"
@@ -396,6 +432,10 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
materials = list(MAT_BANANIUM = 400)
credits = 600 //makes the clown cri
+/obj/item/coin/clown/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/slippery, src, 4 SECONDS, 100, 0, FALSE)
+
/obj/item/coin/mime
cmineral = "tranquillite"
icon_state = "coin_tranquillite_heads"
@@ -460,7 +500,9 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
to_chat(user, "You detach the string from the coin.")
else ..()
-/obj/item/coin/welder_act(mob/user, obj/item/I)
+/obj/item/coin/wirecutter_act(mob/user, obj/item/I)
+ if(string_attached)
+ return
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
@@ -471,9 +513,10 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
"uranium" = /obj/item/clothing/gloves/ring/uranium)
var/typekey = typelist[cmineral]
if(ispath(typekey))
- to_chat(user, "You make [src] into a ring.")
- new typekey(get_turf(loc))
+ to_chat(user, "You carefully cut a hole into [src] turning it into a ring.")
+ var/obj/item/clothing/gloves/ring/ring = new typekey()
qdel(src)
+ user.put_in_hands(ring)
/obj/item/coin/attack_self(mob/user as mob)
@@ -482,11 +525,14 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
cooldown = world.time
flick("coin_[cmineral]_flip", src)
icon_state = "coin_[cmineral]_[coinflip]"
- playsound(user.loc, 'sound/items/coinflip.ogg', 50, 1)
+ var/blind_sound
+ if(cmineral != "tranquillite")
+ playsound(user.loc, 'sound/items/coinflip.ogg', 50, TRUE)
+ blind_sound = "You hear the clattering of loose change."
if(do_after(user, 15, target = src))
user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \
"You flip [src]. It lands on [coinflip].", \
- "You hear the clattering of loose change.")
+ blind_sound)
#undef GIBTONITE_QUALITY_LOW
#undef GIBTONITE_QUALITY_MEDIUM
diff --git a/code/modules/mob/dead/observer/observer_base.dm b/code/modules/mob/dead/observer/observer_base.dm
index e0970661ce3a..e832baa543ee 100644
--- a/code/modules/mob/dead/observer/observer_base.dm
+++ b/code/modules/mob/dead/observer/observer_base.dm
@@ -174,7 +174,7 @@ Works together with spawning an observer, noted above.
C.images += target.hud_list[SPECIALROLE_HUD]
return 1
-/mob/proc/ghostize(flags = GHOST_CAN_REENTER)
+/mob/proc/ghostize(flags = GHOST_CAN_REENTER, user_color, ghost_name)
if(key)
if(player_logged) //if they have disconnected we want to remove their SSD overlay
overlays -= image('icons/effects/effects.dmi', icon_state = "zzz_glow")
@@ -186,6 +186,11 @@ Works together with spawning an observer, noted above.
ADD_TRAIT(ghost, TRAIT_RESPAWNABLE, GHOSTED)
else
GLOB.non_respawnable_keys[ckey] = 1
+ if(user_color)
+ add_atom_colour(user_color, ADMIN_COLOUR_PRIORITY)
+ ghost.color = user_color
+ if(ghost_name)
+ ghost.name = ghost_name
ghost.key = key
return ghost
@@ -224,7 +229,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(warningmsg)
var/response
var/alertmsg = "Are you -sure- you want to ghost?\n([warningmsg]. If you ghost now, you probably won't be able to rejoin the round! You can't change your mind, so choose wisely!)"
- response = alert(src, alertmsg,"Are you sure you want to ghost?","Stay in body","Ghost")
+ response = tgui_alert(src, alertmsg, "Ghost", list("Stay in body", "Ghost"))
if(response != "Ghost")
return
@@ -393,7 +398,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(src, "Your body is still alive!")
return
- var/choice = alert(src, "If you enable this, your body will be unrevivable for the remainder of the round.", "Are you sure?", "Yes", "No")
+ var/choice = tgui_alert(src, "If you enable this, your body will be unrevivable for the remainder of the round.", "Do Not Revive!", list("Yes", "No"))
if(choice == "Yes")
to_chat(src, "Do Not Revive state enabled.")
create_log(MISC_LOG, "DNR Enabled")
@@ -410,7 +415,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!isobserver(usr))
to_chat(usr, "Not when you're not dead!")
return
- var/target = input("Area to teleport to", "Teleport to a location") as null|anything in SSmapping.ghostteleportlocs
+ var/target = tgui_input_list(usr, "Area to teleport to", "Teleport to a location", SSmapping.ghostteleportlocs)
teleport(SSmapping.ghostteleportlocs[target])
/mob/dead/observer/proc/jump_to_ruin()
@@ -624,7 +629,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/verb/view_manifest()
set name = "View Crew Manifest"
set category = "Ghost"
- GLOB.generic_crew_manifest.ui_interact(usr, state = GLOB.observer_state)
+ GLOB.generic_crew_manifest.ui_interact(usr)
//this is called when a ghost is drag clicked to something.
/mob/dead/observer/MouseDrop(atom/over)
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 158cb9bfd90f..555e05928f3a 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -6,10 +6,13 @@
qdel(src)
owner = new_owner
-/datum/orbit_menu/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.observer_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/orbit_menu/ui_state(mob/user)
+ return GLOB.observer_state
+
+/datum/orbit_menu/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "Orbit", "Orbit", 700, 500, master_ui, state)
+ ui = new(user, src, "Orbit", "Orbit")
ui.open()
/datum/orbit_menu/ui_act(action, list/params, datum/tgui/ui)
diff --git a/code/modules/mob/dead/observer/spells.dm b/code/modules/mob/dead/observer/spells.dm
index afcd7421196d..46f0f4342d66 100644
--- a/code/modules/mob/dead/observer/spells.dm
+++ b/code/modules/mob/dead/observer/spells.dm
@@ -41,7 +41,7 @@ GLOBAL_LIST_INIT(boo_phrases, list(
if(target.get_spooked())
var/area/spook_zone = get_area(target)
- if(spook_zone.is_haunted == TRUE)
+ if(spook_zone.is_haunted)
to_chat(usr, "The veil is weak in [spook_zone], it took less effort to influence [target].")
cooldown_handler.start_recharge(cooldown_handler.recharge_duration / 2)
return
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 361163f4df77..c00b0667daaf 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -42,11 +42,18 @@
if(msg == "")
// There is literally no content left in this message, we need to shut this shit down
. = "" // hear_say will suppress it
+ return
+ if(isliving(src))
+ for(var/datum/component/codeword_hearing/hearing_datum in GetComponents(/datum/component/codeword_hearing))
+ var/tmp_msg = hearing_datum.handle_hearing(msg)
+ if(!tmp_msg)
+ continue
+ msg = tmp_msg
+
+ if(verb)
+ . = "[verb], \"[trim(msg)]\""
else
- if(verb)
- . = "[verb], \"[trim(msg)]\""
- else
- . = trim(msg)
+ . = trim(msg)
/mob/proc/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol, sound_frequency, use_voice = TRUE)
if(!client)
diff --git a/code/modules/mob/inventory_procs.dm b/code/modules/mob/inventory_procs.dm
index e551dc7b683f..171aeaf9c2f7 100644
--- a/code/modules/mob/inventory_procs.dm
+++ b/code/modules/mob/inventory_procs.dm
@@ -55,18 +55,18 @@
//Puts the item into your l_hand if possible and calls all necessary triggers/updates. returns 1 on success.
/mob/proc/put_in_l_hand(obj/item/W, skip_blocked_hands_check = FALSE)
if(!put_in_hand_check(W, skip_blocked_hands_check))
- return 0
+ return FALSE
if(!l_hand && has_left_hand())
W.forceMove(src) //TODO: move to equipped?
l_hand = W
W.layer = ABOVE_HUD_LAYER //TODO: move to equipped?
W.plane = ABOVE_HUD_PLANE //TODO: move to equipped?
- W.equipped(src,SLOT_HUD_LEFT_HAND)
+ W.equipped(src, SLOT_HUD_LEFT_HAND)
if(pulling == W)
stop_pulling()
update_inv_l_hand()
- return 1
- return 0
+ return TRUE
+ return FALSE
//Puts the item into your r_hand if possible and calls all necessary triggers/updates. returns 1 on success.
/mob/proc/put_in_r_hand(obj/item/W, skip_blocked_hands_check = FALSE)
@@ -96,8 +96,10 @@
//Puts the item into our active hand if possible. returns 1 on success.
/mob/proc/put_in_active_hand(obj/item/W)
- if(hand) return put_in_l_hand(W)
- else return put_in_r_hand(W)
+ if(hand)
+ return put_in_l_hand(W)
+ else
+ return put_in_r_hand(W)
//Puts the item into our inactive hand if possible. returns 1 on success.
/mob/proc/put_in_inactive_hand(obj/item/W)
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 39714882a550..d1d4c993c6cb 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -111,13 +111,15 @@
var/msg = "[name], [speaker_mask] [get_spoken_verb(message)], [format_message(message)]"
for(var/mob/player in GLOB.player_list)
- if(istype(player,/mob/dead) && follow)
+ if(istype(player, /mob/dead) && follow)
var/msg_dead = "[name], [speaker_mask] ([ghost_follow_link(speaker, ghost=player)]) [get_spoken_verb(message)], [format_message(message)]"
to_chat(player, msg_dead)
continue
- else if(istype(player,/mob/dead) || ((src in player.languages) && check_special_condition(player, speaker)))
+ else if(istype(player, /mob/dead) || ((src in player.languages) && check_special_condition(player, speaker)))
to_chat(player, msg)
+ if((flags & HIVEMIND) && (flags & HIVEMIND_RUNECHAT))
+ player.create_chat_message(player, "[speaker_mask], [format_message(message)]")
/datum/language/proc/check_special_condition(mob/other, mob/living/speaker)
return TRUE
@@ -281,7 +283,6 @@
/datum/language/trinary/scramble(input)
. = ..(copytext(input, 1, max(length(input) / 4, 2)))
-
/datum/language/trinary/get_random_name()
var/new_name
if(prob(70))
@@ -313,7 +314,6 @@
new_name += "[pick(list("Tristan", "Zarlan", "Clack", "Kkraz", "Zramn", "Orlan", "Zrax", "Orax", "Oriz", "Tariz", "Kvestan"))]"
return new_name
-
/datum/language/slime
name = "Bubblish"
desc = "The language of slimes. It's a mixture of bubbling noises and pops. Very difficult to speak without mechanical aid for humans."
@@ -564,7 +564,7 @@
exclaim_verbs = list("gibbers")
colour = "abductor"
key = "zw" //doesn't matter, this is their default and only language
- flags = RESTRICTED | HIVEMIND | NOBABEL
+ flags = RESTRICTED | HIVEMIND | NOBABEL | HIVEMIND_RUNECHAT
follow = TRUE
/datum/language/abductor/broadcast(mob/living/speaker, message, speaker_mask)
@@ -581,6 +581,7 @@
/datum/language/abductor/golem
name = "Golem Mindlink"
desc = "Communicate with other alien alloy golems through a psychic link."
+ flags = RESTRICTED | HIVEMIND | NOBABEL
/datum/language/abductor/golem/check_special_condition(mob/living/carbon/human/other, mob/living/carbon/human/speaker)
return TRUE
@@ -714,7 +715,6 @@
/mob/verb/check_languages()
set name = "Check Known Languages"
set category = "IC"
- set src = usr
var/datum/browser/popup = new(src, "checklanguage", "Known Languages", 420, 470)
popup.set_content(check_lang_data())
diff --git a/code/modules/mob/living/autohiss.dm b/code/modules/mob/living/autohiss.dm
index 9aad0da4631c..ffd829077a28 100644
--- a/code/modules/mob/living/autohiss.dm
+++ b/code/modules/mob/living/autohiss.dm
@@ -23,11 +23,6 @@
prefs.active_character.autohiss_mode = AUTOHISS_OFF
to_chat(src, "Auto-hiss is now OFF.")
-/datum/species
- var/list/autohiss_basic_map = null
- var/list/autohiss_extra_map = null
- var/list/autohiss_exempt = null
-
/datum/species/unathi
autohiss_basic_map = list(
"s" = list("ss", "sss", "ssss")
diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm
index 9ed5f563c1e0..e48f38e341e1 100644
--- a/code/modules/mob/living/brain/MMI.dm
+++ b/code/modules/mob/living/brain/MMI.dm
@@ -265,7 +265,7 @@
/obj/item/mmi/contents_ui_distance(src_object, mob/living/user)
. = ..()
if((src_object in view(src)) && get_dist(src_object, src) <= user.client.maxview())
- return STATUS_INTERACTIVE // interactive (green visibility)
+ return UI_INTERACTIVE // interactive (green visibility)
return user.shared_living_ui_distance()
/obj/item/mmi/forceMove(atom/destination)
diff --git a/code/modules/mob/living/carbon/alien/alien_base.dm b/code/modules/mob/living/carbon/alien/alien_base.dm
index 7a7845746393..8d2a727019e1 100644
--- a/code/modules/mob/living/carbon/alien/alien_base.dm
+++ b/code/modules/mob/living/carbon/alien/alien_base.dm
@@ -5,18 +5,16 @@
bubble_icon = "alien"
icon = 'icons/mob/alien.dmi'
gender = NEUTER
- dna = null
var/nightvision = TRUE
see_in_dark = 4
var/obj/item/card/id/wear_id = null // Fix for station bounced radios -- Skie
var/has_fine_manipulation = FALSE
- var/move_delay_add = FALSE // movement delay to add
+ var/move_delay_add = 0 // movement delay to add
status_flags = CANPARALYSE|CANPUSH
var/heal_rate = 5
- var/large = FALSE
var/loudspeaker = FALSE
var/heat_protection = 0.5
var/leaping = FALSE
@@ -27,8 +25,6 @@
/mob/living/carbon/alien/Initialize(mapload)
. = ..()
create_reagents(1000)
- verbs += /mob/living/verb/mob_sleep
- verbs += /mob/living/verb/rest
for(var/organ_path in get_caste_organs())
var/obj/item/organ/internal/organ = new organ_path()
@@ -50,17 +46,17 @@
return GLOB.all_languages["Xenomorph"]
/mob/living/carbon/alien/say_quote(message, datum/language/speaking = null)
- var/verb = "hisses"
+ var/speech_verb = "hisses"
var/ending = copytext(message, length(message))
if(speaking && (speaking.name != "Galactic Common")) //this is so adminbooze xenos speaking common have their custom verbs,
- verb = speaking.get_spoken_verb(ending) //and use normal verbs for their own languages and non-common languages
+ speech_verb = speaking.get_spoken_verb(ending) //and use normal verbs for their own languages and non-common languages
else
- if(ending=="!")
- verb = "roars"
- else if(ending=="?")
- verb = "hisses curiously"
- return verb
+ if(ending == "!")
+ speech_verb = "roars"
+ else if(ending== "?")
+ speech_verb = "hisses curiously"
+ return speech_verb
/mob/living/carbon/alien/adjustToxLoss(amount)
@@ -68,7 +64,7 @@
/mob/living/carbon/alien/adjustFireLoss(amount) // Weak to Fire
if(amount > 0)
- return ..(amount * 2)
+ return ..(amount * 1.5)
else
return ..(amount)
@@ -77,17 +73,11 @@
return 2
/mob/living/carbon/alien/handle_environment(datum/gas_mixture/environment)
-
if(!environment)
return
var/loc_temp = get_temperature(environment)
-// to_chat(world, "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Fire protection: [heat_protection] - Location: [loc] - src: [src]")
-
- // Aliens are now weak to fire.
-
- //After then, it reacts to the surrounding atmosphere based on your thermal protection
if(!on_fire) // If you're on fire, ignore local air temperature
if(loc_temp > bodytemperature)
//Place is hotter than we are
@@ -121,8 +111,8 @@
/mob/living/carbon/alien/Stat()
..()
if(statpanel("Status"))
- stat(null, "Intent: [a_intent]")
- stat(null, "Move Mode: [m_intent]")
+ stat("Intent: [a_intent]")
+ stat("Move Mode: [m_intent]")
show_stat_emergency_shuttle_eta()
/mob/living/carbon/alien/SetStunned(amount, updating = TRUE, force = 0)
@@ -141,26 +131,8 @@
/mob/living/carbon/alien/setDNA()
return
-/mob/living/carbon/alien/verb/nightvisiontoggle()
- set name = "Toggle Night Vision"
- set category = "Alien"
-
- if(!nightvision)
- see_in_dark = 8
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- nightvision = TRUE
- usr.hud_used.nightvisionicon.icon_state = "nightvision1"
- else if(nightvision)
- see_in_dark = initial(see_in_dark)
- lighting_alpha = initial(lighting_alpha)
- nightvision = FALSE
- usr.hud_used.nightvisionicon.icon_state = "nightvision0"
-
- update_sight()
-
-
/mob/living/carbon/alien/assess_threat(mob/living/simple_animal/bot/secbot/judgebot, lasercolor)
- if(judgebot.emagged == 2)
+ if(judgebot.emagged)
return 10 //Everyone is a criminal!
var/threatcount = 0
@@ -209,34 +181,31 @@
/mob/living/carbon/alien/proc/deathrattle_message()
return "The hivemind echoes: [name] has been slain!"
-/mob/living/carbon/alien/CanContractDisease(datum/disease/D)
- return FALSE
-
/*----------------------------------------
Proc: AddInfectionImages()
Des: Gives the client of the alien an image on each infected mob.
----------------------------------------*/
/mob/living/carbon/alien/proc/AddInfectionImages()
- if(client)
- for(var/mob/living/C in GLOB.mob_list)
- if(HAS_TRAIT(C, TRAIT_XENO_HOST))
- var/obj/item/organ/internal/body_egg/alien_embryo/A = C.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo)
- if(A)
- var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[A.stage]")
- client.images += I
- return
-
+ if(!client)
+ return
+ for(var/mob/living/C in GLOB.mob_list)
+ if(HAS_TRAIT(C, TRAIT_XENO_HOST))
+ var/obj/item/organ/internal/body_egg/alien_embryo/A = C.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo)
+ if(!A)
+ continue
+ var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[A.stage]")
+ client.images += I
/*----------------------------------------
Proc: RemoveInfectionImages()
Des: Removes all infected images from the alien.
----------------------------------------*/
/mob/living/carbon/alien/proc/RemoveInfectionImages()
- if(client)
- for(var/image/I in client.images)
- if(dd_hasprefix_case(I.icon_state, "infected"))
- qdel(I)
- return
+ if(!client)
+ return
+ for(var/image/I in client.images)
+ if(dd_hasprefix_case(I.icon_state, "infected"))
+ qdel(I)
/mob/living/carbon/alien/canBeHandcuffed()
return TRUE
@@ -309,3 +278,8 @@ and carry the owner just to make sure*/
medicine.reagents.reaction(src, reagent_application, fraction)
medicine.reagents.trans_to(src, how_many_reagents)
return TRUE
+
+/mob/living/carbon/alien/update_stat(reason)
+ if(health <= HEALTH_THRESHOLD_CRIT && stat == CONSCIOUS)
+ KnockOut()
+ return ..()
diff --git a/code/modules/mob/living/carbon/alien/alien_death.dm b/code/modules/mob/living/carbon/alien/alien_death.dm
index 12757bd3a8b3..fa5e5a1f12c7 100644
--- a/code/modules/mob/living/carbon/alien/alien_death.dm
+++ b/code/modules/mob/living/carbon/alien/alien_death.dm
@@ -12,7 +12,7 @@
animation.icon = 'icons/mob/mob.dmi'
animation.master = src
- playsound(src.loc, 'sound/goonstation/effects/gib.ogg', 50, 1)
+ playsound(loc, 'sound/goonstation/effects/gib.ogg', 50, TRUE)
for(var/mob/M in stomach_contents) //Release eaten mobs when Beno is gibbed
LAZYREMOVE(stomach_contents, M)
@@ -21,6 +21,13 @@
var/mob/living/carbon/human/H = M
H.KnockDown(5 SECONDS)
+ for(var/obj/item/organ/internal/I in internal_organs)
+ if(isturf(loc))
+ var/atom/movable/thing = I.remove(src)
+ if(thing)
+ thing.forceMove(get_turf(src))
+ thing.throw_at(get_edge_target_turf(src, pick(GLOB.alldirs)), rand(1, 3), 5)
+
flick("gibbed-a", animation)
xgibs(loc)
GLOB.dead_mob_list -= src
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index de23bdcd5bbe..491d5612f72c 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -10,9 +10,6 @@ In all, this is a lot like the monkey code.
This code could certainly use with a touch of TLC, but it functions alright. Bit odd aliens attacking other aliens are like, full logged though
*/
/mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M)
- if(isturf(loc) && istype(loc.loc, /area/start))
- to_chat(M, "No attacking people at spawn, you jackass.")
- return
switch(M.a_intent)
if(INTENT_HELP)
AdjustSleeping(-10 SECONDS)
@@ -82,9 +79,9 @@ This code could certainly use with a touch of TLC, but it functions alright. Bit
/mob/living/carbon/alien/attack_slime(mob/living/simple_animal/slime/M) // This is very RNG based, maybe come back to this later - GDN
if(..()) //successful slime attack
- var/damage = rand(5, 35)
+ var/damage = 10
if(M.is_adult)
- damage = rand(10, 40)
+ damage = 15
adjustBruteLoss(damage)
add_attack_logs(M, src, "Slime'd for [damage] damage")
updatehealth("slime attack")
diff --git a/code/modules/mob/living/carbon/alien/alien_login.dm b/code/modules/mob/living/carbon/alien/alien_login.dm
index 589a97416270..fa043b3e8c8d 100644
--- a/code/modules/mob/living/carbon/alien/alien_login.dm
+++ b/code/modules/mob/living/carbon/alien/alien_login.dm
@@ -2,4 +2,3 @@
..()
AddInfectionImages()
update_plasma_display(src)
- return
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/alien_drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/alien_drone.dm
index 1195a46e735f..35c75e4931a4 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/alien_drone.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/alien_drone.dm
@@ -1,15 +1,14 @@
/mob/living/carbon/alien/humanoid/drone
name = "alien drone"
caste = "d"
- maxHealth = 100
- health = 100
+ maxHealth = 150
+ health = 150
icon_state = "aliend_s"
/mob/living/carbon/alien/humanoid/drone/Initialize(mapload)
. = ..()
- if(src.name == "alien drone")
- src.name = "alien drone ([rand(1, 1000)])"
- src.real_name = src.name
+ name = "alien drone ([rand(1, 1000)])"
+ real_name = name
AddSpell(new /obj/effect/proc_holder/spell/alien_spell/evolve_queen)
/mob/living/carbon/alien/humanoid/drone/get_caste_organs()
@@ -19,8 +18,3 @@
/obj/item/organ/internal/alien/acidgland,
/obj/item/organ/internal/alien/resinspinner,
)
-
-
-//Drones use the same base as generic humanoids.
-//Drone verbs
-
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
index e80f74cd6efe..0b8c0ab5441f 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -1,38 +1,35 @@
/mob/living/carbon/alien/humanoid/hunter
name = "alien hunter"
caste = "h"
- maxHealth = 125
- health = 125
+ maxHealth = 150
+ health = 150
icon_state = "alienh_s"
- alien_movement_delay = -1 //hunters are faster than normal xenomorphs, and people
+ alien_movement_delay = -0.5 //hunters are faster than normal xenomorphs, and people
+ var/leap_on_click = FALSE
+ /// Are we on leap cooldown?
+ var/on_leap_cooldown = FALSE
/mob/living/carbon/alien/humanoid/hunter/Initialize(mapload)
. = ..()
- if(name == "alien hunter")
- name = "alien hunter ([rand(1, 1000)])"
+ name = "alien hunter ([rand(1, 1000)])"
real_name = name
/mob/living/carbon/alien/humanoid/hunter/get_caste_organs()
. = ..()
. += /obj/item/organ/internal/alien/plasmavessel/hunter
-
/mob/living/carbon/alien/humanoid/hunter/handle_environment()
if(m_intent == MOVE_INTENT_RUN || IS_HORIZONTAL(src))
..()
else
add_plasma(-heal_rate)
-
-//Hunter verbs
-
-/mob/living/carbon/alien/humanoid/hunter/proc/toggle_leap(message = 1)
+/mob/living/carbon/alien/humanoid/hunter/proc/toggle_leap(message = TRUE)
leap_on_click = !leap_on_click
leap_icon.icon_state = "leap_[leap_on_click ? "on":"off"]"
+ update_icons()
if(message)
- to_chat(src, "You will now [leap_on_click ? "leap at":"slash at"] enemies!")
- else
- return
+ to_chat(src, "You will now [leap_on_click ? "leap at" : "slash at"] enemies!")
/mob/living/carbon/alien/humanoid/hunter/ClickOn(atom/A, params)
face_atom(A)
@@ -44,64 +41,71 @@
#define MAX_ALIEN_LEAP_DIST 7
/mob/living/carbon/alien/humanoid/hunter/proc/leap_at(atom/A)
- if(pounce_cooldown > world.time)
- to_chat(src, "You are too fatigued to pounce right now!")
- return
-
- if(leaping) //Leap while you leap, so you can leap while you leap
+ if(leaping || on_leap_cooldown)
return
- if(!has_gravity(src) || !has_gravity(A))
- to_chat(src, "It is unsafe to leap without gravity!")
- //It's also extremely buggy visually, so it's balance+bugfix
- return
if(IS_HORIZONTAL(src))
return
- else //Maybe uses plasma in the future, although that wouldn't make any sense...
- leaping = 1
- update_icons()
- throw_at(A, MAX_ALIEN_LEAP_DIST, 1, spin = 0, diagonals_first = 1, callback = CALLBACK(src, PROC_REF(leap_end)))
+ leaping = TRUE
+ on_leap_cooldown = TRUE
+ update_icons()
+ Immobilize(15 SECONDS, TRUE)
+ addtimer(VARSET_CALLBACK(src, on_leap_cooldown, FALSE), 3 SECONDS)
+ throw_at(A, MAX_ALIEN_LEAP_DIST, 1.5, spin = 0, diagonals_first = 1, callback = CALLBACK(src, PROC_REF(leap_end)))
/mob/living/carbon/alien/humanoid/hunter/proc/leap_end()
- leaping = 0
+ leaping = FALSE
+ SetImmobilized(0, TRUE)
update_icons()
/mob/living/carbon/alien/humanoid/hunter/throw_impact(atom/A)
if(!leaping)
return ..()
- if(A)
- if(isliving(A))
- var/mob/living/L = A
- var/blocked = 0
- if(ishuman(A))
- var/mob/living/carbon/human/H = A
- if(H.check_shields(src, 0, "the [name]", attack_type = LEAP_ATTACK))
- blocked = 1
- if(!blocked)
- L.visible_message("[src] pounces on [L]!", "[src] pounces on you!")
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
- H.apply_effect(10 SECONDS, KNOCKDOWN, H.run_armor_check(null, MELEE))
- H.adjustStaminaLoss(40)
- else
- L.Weaken(10 SECONDS)
- sleep(2)//Runtime prevention (infinite bump() calls on hulks)
- step_towards(src,L)
+ if(isliving(A))
+ var/mob/living/L = A
+ var/blocked = FALSE
+ if(ishuman(A))
+ var/mob/living/carbon/human/H = A
+ if(H.check_shields(src, 0, "the [name]", attack_type = LEAP_ATTACK))
+ blocked = TRUE
+ if(!blocked)
+ L.visible_message("[src] pounces on [L]!", "[src] pounces on you!")
+ if(ishuman(L))
+ var/mob/living/carbon/human/H = L
+ H.apply_effect(10 SECONDS, KNOCKDOWN, H.run_armor_check(null, MELEE))
+ H.apply_damage(40, STAMINA)
else
- Weaken(4 SECONDS, TRUE)
-
- toggle_leap(0)
- pounce_cooldown = world.time + pounce_cooldown_time
- else if(A.density && !A.CanPass(src))
- visible_message("[src] smashes into [A]!", "[src] smashes into [A]!")
- Weaken(4 SECONDS, TRUE)
-
- if(leaping)
- leaping = 0
- update_icons()
+ L.Weaken(5 SECONDS)
+ sleep(2)//Runtime prevention (infinite bump() calls on hulks)
+ step_towards(src, L)
+ else
+ Weaken(2 SECONDS, TRUE)
+ ..()
+
+ toggle_leap(FALSE)
+ else if(A.density && !A.CanPass(src))
+ visible_message("[src] smashes into [A]!", "[src] smashes into [A]!")
+ Weaken(2 SECONDS, TRUE)
+ playsound(get_turf(src), 'sound/effects/bang.ogg', 50, 0, 0) // owwie
+ ..()
+ if(leaping)
+ leaping = FALSE
+ update_icons()
+/mob/living/carbon/alien/humanoid/hunter/update_icons()
+ ..()
+ if(leap_on_click && !leaping)
+ icon_state = "alien[caste]_pounce"
+ if(leaping)
+ if(alt_icon == initial(alt_icon))
+ var/old_icon = icon
+ icon = alt_icon
+ alt_icon = old_icon
+ icon_state = "alien[caste]_leap"
+ pixel_x = -32
+ pixel_y = -32
/mob/living/carbon/alien/humanoid/float(on)
if(leaping)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
index bd3075eadf61..9b9ae103770b 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
@@ -1,8 +1,8 @@
/mob/living/carbon/alien/humanoid/sentinel
name = "alien sentinel"
caste = "s"
- maxHealth = 150
- health = 150
+ maxHealth = 175
+ health = 175
icon_state = "aliens_s"
/mob/living/carbon/alien/humanoid/sentinel/large
@@ -12,13 +12,6 @@
pixel_x = -16
maxHealth = 200
health = 200
- large = 1
-
-/mob/living/carbon/alien/humanoid/sentinel/praetorian
- name = "alien praetorian"
- maxHealth = 200
- health = 200
- large = 1
/mob/living/carbon/alien/humanoid/sentinel/large/update_icons()
overlays.Cut()
@@ -34,8 +27,7 @@
/mob/living/carbon/alien/humanoid/sentinel/Initialize(mapload)
. = ..()
- if(name == "alien sentinel")
- name = "alien sentinel ([rand(1, 1000)])"
+ name = "alien sentinel ([rand(1, 1000)])"
real_name = name
/mob/living/carbon/alien/humanoid/sentinel/get_caste_organs()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/empress.dm b/code/modules/mob/living/carbon/alien/humanoid/empress.dm
index 2ab7d8663235..9ea090b459e6 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/empress.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/empress.dm
@@ -8,7 +8,6 @@
loudspeaker = TRUE
mob_size = MOB_SIZE_LARGE
bubble_icon = "alienroyal"
- large = 1
ventcrawler = VENTCRAWLER_NONE
move_resist = MOVE_FORCE_STRONG //Yes, big benos is huge and heavy
alien_disarm_damage = 60 //Empress do higher disarm stamina damage than normal aliens
@@ -37,16 +36,7 @@
/mob/living/carbon/alien/humanoid/empress/Initialize(mapload)
. = ..()
//there should only be one queen
- for(var/mob/living/carbon/alien/humanoid/empress/E in GLOB.alive_mob_list)
- if(E == src)
- continue
- if(E.stat == DEAD)
- continue
- if(E.client)
- name = "alien grand princess ([rand(1, 999)])" //if this is too cutesy feel free to change it/remove it.
- break
-
- real_name = name
+ ADD_TRAIT(src, TRAIT_FORCE_DOORS, UNIQUE_TRAIT_SOURCE(src))
/mob/living/carbon/alien/humanoid/empress/get_caste_organs()
. = ..()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 31240725f069..5b139d6652d4 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -2,20 +2,17 @@
name = "alien"
icon_state = "alien_s"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat= 5, /obj/item/stack/sheet/animalhide/xeno = 1)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
var/obj/item/r_store = null
var/obj/item/l_store = null
var/caste = ""
var/alt_icon = 'icons/mob/alienleap.dmi' //used to switch between the two alien icon files.
- var/next_attack = 0
- var/pounce_cooldown = 0
- var/pounce_cooldown_time = 30
- var/leap_on_click = 0
var/custom_pixel_x_offset = 0 //for admin fuckery.
var/custom_pixel_y_offset = 0
var/alien_disarm_damage = 30 //Aliens deal a good amount of stamina damage on disarm intent
var/alien_slash_damage = 20 //Aliens deal a good amount of damage on harm intent
var/alien_movement_delay = 0 //This can be + or -, how fast an alien moves
+ var/temperature_resistance = T0C+75
pass_flags = PASSTABLE
//This is fine right now, if we're adding organ specific damage this needs to be updated
@@ -31,13 +28,14 @@
/mob/living/carbon/alien/humanoid/Process_Spacemove(check_drift = 0)
if(..())
- return 1
-
- return 0
+ return TRUE
+ return FALSE
/mob/living/carbon/alien/humanoid/emp_act(severity)
- if(r_store) r_store.emp_act(severity)
- if(l_store) l_store.emp_act(severity)
+ if(r_store)
+ r_store.emp_act(severity)
+ if(l_store)
+ l_store.emp_act(severity)
..()
/mob/living/carbon/alien/humanoid/ex_act(severity)
@@ -69,11 +67,8 @@
/mob/living/carbon/alien/humanoid/restrained()
if(handcuffed)
- return 1
- return 0
-
-
-/mob/living/carbon/alien/humanoid/var/temperature_resistance = T0C+75
+ return TRUE
+ return FALSE
/mob/living/carbon/alien/humanoid/movement_delay() //Aliens have a varied movespeed
. = ..()
@@ -102,9 +97,6 @@
popup.set_content(dat)
popup.open()
-/mob/living/carbon/alien/humanoid/canBeHandcuffed()
- return 1
-
/mob/living/carbon/alien/humanoid/cuff_resist(obj/item/I)
playsound(src, 'sound/voice/hiss5.ogg', 40, 1, 1) //Alien roars when starting to break free
..(I, cuff_break = 1)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
index 5d0f1aff4816..43c9bd959364 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
@@ -4,14 +4,11 @@
to_chat(user, "You don't want to hurt [src]!")
return FALSE
..(user, TRUE)
- adjustBruteLoss(15)
+ adjustBruteLoss(10)
var/hitverb = "punched"
if(mob_size < MOB_SIZE_LARGE)
- Paralyse(2 SECONDS)
- spawn(0)
- step_away(src, user, 15)
- sleep(1)
- step_away(src, user, 15)
+ Stun(2 SECONDS)
+ throw_at(get_edge_target_turf(user, get_dir(user, src)), 3, 7)
hitverb = "slammed"
playsound(loc, "punch", 25, 1, -1)
visible_message("[user] has [hitverb] [src]!", "[user] has [hitverb] [src]!")
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm
index 9c168e564c4c..70f37d83d213 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm
@@ -28,8 +28,6 @@
else if(stat == UNCONSCIOUS || IsWeakened())
icon_state = "alien[caste]_unconscious"
pixel_y = 0
- else if(leap_on_click)
- icon_state = "alien[caste]_pounce"
else if(IS_HORIZONTAL(src))
icon_state = "alien[caste]_sleep"
@@ -38,21 +36,12 @@
else
icon_state = "alien[caste]_s"
- if(leaping)
- if(alt_icon == initial(alt_icon))
- var/old_icon = icon
- icon = alt_icon
- alt_icon = old_icon
- icon_state = "alien[caste]_leap"
- pixel_x = -32
- pixel_y = -32
- else
- if(alt_icon != initial(alt_icon))
- var/old_icon = icon
- icon = alt_icon
- alt_icon = old_icon
- pixel_x = get_standard_pixel_x_offset()
- pixel_y = get_standard_pixel_y_offset()
+ if(alt_icon != initial(alt_icon))
+ var/old_icon = icon
+ icon = alt_icon
+ alt_icon = old_icon
+ pixel_x = get_standard_pixel_x_offset()
+ pixel_y = get_standard_pixel_y_offset()
/mob/living/carbon/alien/humanoid/regenerate_icons()
..()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index 2564f8ec7b8b..1d0e6e931de6 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -1,13 +1,11 @@
/mob/living/carbon/alien/humanoid/queen
name = "alien queen"
caste = "q"
- maxHealth = 250
- health = 250
+ maxHealth = 300
+ health = 300
icon_state = "alienq_s"
status_flags = CANPARALYSE
loudspeaker = TRUE
- heal_rate = 5
- large = 1
ventcrawler = VENTCRAWLER_NONE
pressure_resistance = 200 //Because big, stompy xenos should not be blown around like paper.
move_resist = MOVE_FORCE_STRONG //Yes, queenos is huge and heavy
@@ -17,19 +15,8 @@
/mob/living/carbon/alien/humanoid/queen/Initialize(mapload)
. = ..()
- //there should only be one queen
- for(var/mob/living/carbon/alien/humanoid/queen/Q in GLOB.alive_mob_list)
- if(Q == src)
- ADD_TRAIT(Q, TRAIT_FORCE_DOORS, VAMPIRE_TRAIT)
- continue
- if(Q.stat == DEAD)
- ADD_TRAIT(Q, TRAIT_FORCE_DOORS, VAMPIRE_TRAIT)
- continue
- if(Q.client)
- name = "alien princess ([rand(1, 999)])" //if this is too cutesy feel free to change it/remove it.
- break
-
- real_name = src.name
+ ADD_TRAIT(src, TRAIT_FORCE_DOORS, UNIQUE_TRAIT_SOURCE(src))
+ AddSpell(new /obj/effect/proc_holder/spell/alien_spell/tail_lash)
/mob/living/carbon/alien/humanoid/queen/get_caste_organs()
. = ..()
@@ -38,8 +25,7 @@
/obj/item/organ/internal/alien/acidgland,
/obj/item/organ/internal/alien/eggsac,
/obj/item/organ/internal/alien/resinspinner,
- /obj/item/organ/internal/alien/neurotoxin,
- )
+ /obj/item/organ/internal/alien/neurotoxin)
/mob/living/carbon/alien/humanoid/queen/deathrattle_message()
return "A shock reverberates through the hive; [name] has been slain!"
@@ -51,7 +37,6 @@
icon = 'icons/mob/alienlarge.dmi'
icon_state = "queen_s"
pixel_x = -16
- large = 1
/mob/living/carbon/alien/humanoid/queen/large/update_icons()
overlays.Cut()
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 6c06c7bb20a5..c1e3b1d69cf1 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -9,17 +9,17 @@
health = 25
density = FALSE
+ var/temperature_resistance = T0C+75
var/amount_grown = 0
var/max_grown = 200
- var/time_of_birth
death_message = "lets out a waning high-pitched cry."
death_sound = null
//This is fine right now, if we're adding organ specific damage this needs to be updated
/mob/living/carbon/alien/larva/Initialize(mapload)
. = ..()
- if(name == "alien larva")
- name = "alien larva ([rand(1, 1000)])"
+
+ name = "alien larva ([rand(1, 1000)])"
real_name = name
regenerate_icons()
add_language("Xenomorph")
@@ -41,7 +41,7 @@
/mob/living/carbon/alien/larva/Stat()
..()
- stat(null, "Progress: [amount_grown]/[max_grown]")
+ stat("Progress: [amount_grown]/[max_grown]")
/mob/living/carbon/alien/larva/add_plasma(amount)
if(stat != DEAD && amount > 0)
@@ -78,12 +78,9 @@
/mob/living/carbon/alien/larva/restrained()
return FALSE
-/mob/living/carbon/alien/larva/var/temperature_resistance = T0C+75
-
// new damage icon system
// now constructs damage icon for each organ from mask * damage field
-
/mob/living/carbon/alien/larva/show_inv(mob/user as mob)
return
diff --git a/code/modules/mob/living/carbon/alien/larva/larva_inventory.dm b/code/modules/mob/living/carbon/alien/larva/larva_inventory.dm
index fc5acb63fd0c..0c5df6d99e9d 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva_inventory.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva_inventory.dm
@@ -1,3 +1,3 @@
-//can't unequip since it can't equip anything
+//can't unequip since it can't equip anything // why the fuck is this it's own file
/mob/living/carbon/alien/larva/unEquip(obj/item/I, force, silent = FALSE)
return
diff --git a/code/modules/mob/living/carbon/alien/larva/larva_life.dm b/code/modules/mob/living/carbon/alien/larva/larva_life.dm
index ea964329fd4e..141f5e8d950b 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva_life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva_life.dm
@@ -1,7 +1,5 @@
/mob/living/carbon/alien/larva/Life(seconds, times_fired)
set invisibility = 0
- if(notransform)
- return
if(..()) //not dead and not in stasis
// GROW!
if(amount_grown < max_grown)
@@ -19,10 +17,8 @@
if(IsParalyzed() || IsSleeping() || getOxyLoss() > 50 || (health <= HEALTH_THRESHOLD_CRIT && check_death_method()))
if(stat == CONSCIOUS)
KnockOut()
- create_debug_log("fell unconscious, trigger reason: [reason]")
else
if(stat == UNCONSCIOUS)
WakeUp()
- create_debug_log("woke up, trigger reason: [reason]")
update_damage_hud()
update_health_hud()
diff --git a/code/modules/mob/living/carbon/alien/larva/larva_update_icons.dm b/code/modules/mob/living/carbon/alien/larva/larva_update_icons.dm
index 60db90600d17..90e14393f5ff 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva_update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva_update_icons.dm
@@ -1,4 +1,3 @@
-
/mob/living/carbon/alien/larva/regenerate_icons()
overlays = list()
update_icons()
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 3eff208e536c..661201f94e21 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -53,11 +53,11 @@
if(real)//So that giant red text about probisci doesn't show up for fake ones
switch(stat)
if(DEAD,UNCONSCIOUS)
- . += "[src] is not moving."
+ . += "[src] is not moving."
if(CONSCIOUS)
- . += "[src] seems to be active!"
+ . += "[src] seems to be active!"
if(sterile)
- . += "It looks like the proboscis has been removed."
+ . += "It looks like the proboscis has been removed."
/obj/item/clothing/mask/facehugger/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
..()
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 8fbf5c0d845e..f3e4c40a82db 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -54,8 +54,6 @@
#define STOMACH_ATTACK_DELAY 4
-/mob/living/carbon/var/last_stomach_attack //defining this here because no one would look in carbon_defines for it
-
/mob/living/carbon/relaymove(mob/user, direction)
if(LAZYLEN(stomach_contents))
if(user in stomach_contents)
@@ -345,7 +343,7 @@
status_list += "There is \a [I] embedded in your [LB.name]!"
for(var/t in missing)
- status_list += "Your [parse_zone(t)] is missing!"
+ status_list += "Your [parse_zone(t)] is missing!"
if(H.bleed_rate)
status_list += "You are bleeding!"
@@ -450,15 +448,15 @@
GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/vent_pump, /obj/machinery/atmospherics/unary/vent_scrubber))
-/mob/living/handle_ventcrawl(atom/clicked_on) // -- TLE -- Merged by Carn
+/mob/living/handle_ventcrawl(atom/clicked_on) // Why is this proc even in carbon.dm ...
if(!Adjacent(clicked_on))
return
- var/ventcrawlerlocal = 0
+ var/ventcrawlerlocal = VENTCRAWLER_NONE
if(ventcrawler)
ventcrawlerlocal = ventcrawler
- if(!ventcrawlerlocal)
+ if(ventcrawlerlocal == VENTCRAWLER_NONE) // You can't ventcrawl.
return
if(stat)
@@ -472,9 +470,11 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
if(has_buckled_mobs())
to_chat(src, "You can't vent crawl with other creatures on you!")
return
+
if(buckled)
to_chat(src, "You can't vent crawl while buckled!")
return
+
if(ishuman(src))
var/mob/living/carbon/human/H = src
if(H.w_uniform && istype(H.w_uniform, /obj/item/clothing/under/rank/engineering/atmospheric_technician/contortionist))//IMMA SPCHUL SNOWFLAKE
@@ -491,55 +491,54 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
if(!vent_found)
- for(var/obj/machinery/atmospherics/machine in range(1,src))
+ for(var/obj/machinery/atmospherics/machine in range(1, src))
if(is_type_in_list(machine, GLOB.ventcrawl_machinery) && machine.can_crawl_through())
vent_found = machine
break
- if(vent_found)
- if(vent_found.parent && (vent_found.parent.members.len || vent_found.parent.other_atmosmch))
- visible_message("[src] begins climbing into the ventilation system...", \
- "You begin climbing into the ventilation system...")
+ if(!vent_found)
+ to_chat(src, "This ventilation duct is not connected to anything!")
+ return
- if(!do_after(src, 45, target = src))
- return
+ if(!vent_found.parent || !(length(vent_found.parent.members) || vent_found.parent.other_atmosmch))
+ return
- if(has_buckled_mobs())
- to_chat(src, "You can't vent crawl with other creatures on you!")
- return
+ visible_message("[src] begins climbing into the ventilation system...", \
+ "You begin climbing into the ventilation system...")
- if(buckled)
- to_chat(src, "You cannot crawl into a vent while buckled to something!")
- return
+ if(!do_after(src, 4.5 SECONDS, target = src))
+ return
- if(!client)
- return
+ if(!client)
+ return
- if(iscarbon(src) && contents.len && ventcrawlerlocal < 2)//It must have atleast been 1 to get this far
- for(var/obj/item/I in contents)
- var/failed = 0
- if(istype(I, /obj/item/bio_chip))
- continue
- if(istype(I, /obj/item/reagent_containers/patch))
- continue
- if(I.flags & ABSTRACT)
- continue
- else
- failed++
-
- if(failed)
- to_chat(src, "You can't crawl around in the ventilation ducts with items!")
- return
+ if(!vent_found.can_crawl_through())
+ to_chat(src, "You can't vent crawl through that!")
+ return
+
+ if(has_buckled_mobs())
+ to_chat(src, "You can't vent crawl with other creatures on you!")
+ return
- visible_message("[src] scrambles into the ventilation ducts!", "You climb into the ventilation system.")
- var/old_loc = loc
- loc = vent_found
- Moved(old_loc, get_dir(old_loc, loc), FALSE)
- add_ventcrawl(vent_found)
+ if(buckled)
+ to_chat(src, "You cannot crawl into a vent while buckled to something!")
+ return
- else
- to_chat(src, "This ventilation duct is not connected to anything!")
+ if(iscarbon(src) && length(contents) && ventcrawlerlocal < VENTCRAWLER_ALWAYS) // If we're here you can only ventcrawl while completely nude
+ for(var/obj/item/I in contents)
+ if(istype(I, /obj/item/bio_chip))
+ continue
+ if(istype(I, /obj/item/reagent_containers/patch))
+ continue
+ if(I.flags & ABSTRACT)
+ continue
+ to_chat(src, "You can't crawl around in the ventilation ducts with items!")
+ return
+
+ visible_message("[src] scrambles into the ventilation ducts!", "You climb into the ventilation system.")
+ forceMove(vent_found)
+ add_ventcrawl(vent_found)
/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine, obj/machinery/atmospherics/target_move)
if(!istype(starting_machine) || !starting_machine.returnPipenet(target_move) || !starting_machine.can_see_pipes())
@@ -704,7 +703,8 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
return
if(thrown_thing)
- visible_message("[src] has thrown [thrown_thing].")
+ if(!HAS_TRAIT(thrown_thing, TRAIT_NO_THROWN_MESSAGE))
+ visible_message("[src] has thrown [thrown_thing].")
newtonian_move(get_dir(target, src))
thrown_thing.throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src, null, null, null, move_force)
@@ -1086,7 +1086,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
if(statpanel("Status"))
var/obj/item/organ/internal/alien/plasmavessel/vessel = get_int_organ(/obj/item/organ/internal/alien/plasmavessel)
if(vessel)
- stat(null, "Plasma Stored: [vessel.stored_plasma]/[vessel.max_plasma]")
+ stat("Plasma Stored: [vessel.stored_plasma]/[vessel.max_plasma]")
/mob/living/carbon/get_all_slots()
return list(l_hand,
@@ -1163,26 +1163,22 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
/mob/living/carbon/proc/can_eat(flags = 255)
return TRUE
-/mob/living/carbon/proc/eat(obj/item/reagent_containers/to_eat, mob/user, bitesize_override)
- if(ispill(to_eat) || ispatch(to_eat))
+/mob/living/carbon/proc/eat(obj/item/food/to_eat, mob/user, bitesize_override)
+ if(ispill(to_eat) || ispatch(to_eat)) // We first have to know if it's either a pill or a patch, only then can we check if it's a food item
return consume_patch_or_pill(to_eat, user)
- if(!isfood(to_eat)) // We first have to know if it's either a pill or a patch, only then can we check if it's a food item
+ if(!isfood(to_eat))
return FALSE
- var/obj/item/reagent_containers/food/food = to_eat // It's not a patch or a pill so it must be food
+ var/obj/item/food/food = to_eat // It's not a patch or a pill so it must be food
var/fullness = nutrition + 10
- if(istype(food, /obj/item/reagent_containers/food/snacks))
+ if(istype(food, /obj/item/food/snacks))
for(var/datum/reagent/consumable/C in reagents.reagent_list) //we add the nutrition value of what we're currently digesting
fullness += C.nutriment_factor * C.volume / (C.metabolization_rate * metabolism_efficiency)
if(user == src)
- if(istype(food, /obj/item/reagent_containers/food/drinks))
- if(!selfDrink(food))
- return FALSE
- else
- if(!selfFeed(food, fullness))
- return FALSE
+ if(!selfFeed(food, fullness))
+ return FALSE
else
if(!forceFed(food, user, fullness))
return FALSE
@@ -1191,7 +1187,27 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
SSticker.score.score_food_eaten++
return TRUE
-/mob/living/carbon/proc/selfFeed(obj/item/reagent_containers/food/to_eat, fullness)
+/mob/living/carbon/proc/drink(obj/item/reagent_containers/drinks/to_drink, mob/user, drinksize_override)
+ if(user == src)
+ if(!selfDrink(to_drink))
+ return FALSE
+ else if(!forceFed(to_drink, user, nutrition))
+ return FALSE
+
+ if(to_drink.consume_sound)
+ playsound(loc, to_drink.consume_sound, rand(10, 50), TRUE)
+ if(to_drink.reagents.total_volume)
+ taste(to_drink.reagents)
+ var/drink_size = max(initial(to_drink.amount_per_transfer_from_this), 5)
+ if(drinksize_override)
+ drink_size = drinksize_override
+ to_drink.reagents.reaction(src, REAGENT_INGEST)
+ to_drink.reagents.trans_to(src, drink_size)
+
+ SSticker.score.score_food_eaten++
+ return TRUE
+
+/mob/living/carbon/proc/selfFeed(obj/item/food/to_eat, fullness)
if(ispill(to_eat))
to_chat(src, "You swallow [to_eat].")
else if(ispatch(to_eat))
@@ -1213,7 +1229,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
return FALSE
return TRUE
-/mob/living/carbon/proc/selfDrink(obj/item/reagent_containers/food/drinks/toDrink, mob/user)
+/mob/living/carbon/proc/selfDrink(obj/item/reagent_containers/drinks/toDrink, mob/user)
return TRUE
/mob/living/carbon/proc/forceFed(obj/item/reagent_containers/to_eat, mob/user, fullness)
@@ -1233,7 +1249,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
/*TO DO - If/when stomach organs are introduced, override this at the human level sending the item to the stomach
so that different stomachs can handle things in different ways VB*/
-/mob/living/carbon/proc/consume(obj/item/reagent_containers/food/to_eat, bitesize_override)
+/mob/living/carbon/proc/consume(obj/item/food/to_eat, bitesize_override)
var/this_bite = bitesize_override ? bitesize_override : to_eat.bitesize
if(!to_eat.reagents)
return
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 6a19650f051f..f9710e12c2b8 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -53,7 +53,7 @@
if(..()) //successful slime attack
if(M.powerlevel > 0)
do_sparks(5, TRUE, src)
- adjustStaminaLoss(M.powerlevel * 5) //5-50 stamina damage, at starting power level 10 this means 50, 35, 20 on consecutive hits - stamina crit in 3 hits
+ apply_damage(M.powerlevel * 5, STAMINA) //5-50 stamina damage, at starting power level 10 this means 50, 35, 20 on consecutive hits - stamina crit in 3 hits
KnockDown(M.powerlevel SECONDS)
Stuttering(M.powerlevel SECONDS)
visible_message("[M] has shocked [src]!", "[M] has shocked you!")
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 0b0b8fa108de..bae5e21a22b2 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -1,10 +1,15 @@
/mob/living/carbon
gender = MALE
pressure_resistance = 15
+
var/list/stomach_contents
+ var/last_stomach_attack
+
var/list/processing_patches
- var/list/internal_organs = list()
- var/list/internal_organs_slot = list() //Same as above, but stores "slot ID" - "organ" pairs for easy access.
+ var/list/internal_organs = list()
+ var/list/internal_organs_slot = list() //Same as above, but stores "slot ID" - "organ" pairs for easy access.
+ /// An associated list of strings that associate it with the organ datum, e.g. [ORGAN_DATUM_HEART] = /datum/organ/heart
+ var/list/internal_organ_datums = list()
var/life_tick = 0 // The amount of life ticks that have processed on this mob.
diff --git a/code/modules/mob/living/carbon/carbon_life.dm b/code/modules/mob/living/carbon/carbon_life.dm
index 0a59c7b113b9..c5d4088cdf97 100644
--- a/code/modules/mob/living/carbon/carbon_life.dm
+++ b/code/modules/mob/living/carbon/carbon_life.dm
@@ -105,7 +105,7 @@
if(status_flags & GODMODE)
return FALSE
- var/lungs = get_organ_slot("lungs")
+ var/lungs = get_int_organ_datum(ORGAN_DATUM_LUNGS)
if(!lungs)
adjustOxyLoss(2)
@@ -201,6 +201,9 @@
for(var/thing in internal_organs)
var/obj/item/organ/internal/O = thing
O.on_life()
+ for(var/organ_tag in internal_organ_datums)
+ var/datum/organ/datum_organ_var_name_idk = internal_organ_datums[organ_tag]
+ datum_organ_var_name_idk.on_life()
/mob/living/carbon/handle_diseases()
for(var/thing in viruses)
@@ -251,6 +254,7 @@
update_stamina()
if(staminaloss)
setStaminaLoss(0, FALSE)
+ SEND_SIGNAL(src, COMSIG_CARBON_STAMINA_REGENERATED)
update_health_hud()
// Keep SSD people asleep
@@ -287,7 +291,7 @@
if(!client)
return
var/shock_reduction = shock_reduction()
- if(stat == UNCONSCIOUS && health <= HEALTH_THRESHOLD_CRIT)
+ if(health <= HEALTH_THRESHOLD_CRIT)
if(check_death_method())
var/severity = 0
switch(health - shock_reduction)
diff --git a/code/modules/mob/living/carbon/carbon_status_procs.dm b/code/modules/mob/living/carbon/carbon_status_procs.dm
index d39c9f40eae9..b96a55084a3a 100644
--- a/code/modules/mob/living/carbon/carbon_status_procs.dm
+++ b/code/modules/mob/living/carbon/carbon_status_procs.dm
@@ -8,6 +8,8 @@
return
if(!IsWeakened())
to_chat(src, "You're too exhausted to keep going...")
+ SEND_SIGNAL(src, COMSIG_CARBON_ENTER_STAMINACRIT)
+ stam_regen_start_time = world.time + (STAMINA_REGEN_BLOCK_TIME * stamina_regen_block_modifier)
var/prev = stam_paralyzed
stam_paralyzed = TRUE
ADD_TRAIT(src, TRAIT_IMMOBILIZED, "stam_crit") // make defines later
diff --git a/code/modules/mob/living/carbon/carbon_update_status.dm b/code/modules/mob/living/carbon/carbon_update_status.dm
index 541bce6eaf1d..6a4713b67412 100644
--- a/code/modules/mob/living/carbon/carbon_update_status.dm
+++ b/code/modules/mob/living/carbon/carbon_update_status.dm
@@ -6,10 +6,12 @@
death()
create_debug_log("died of damage, trigger reason: [reason]")
return
- if(HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || (check_death_method() && getOxyLoss() > 50) || HAS_TRAIT(src, TRAIT_FAKEDEATH) || health <= HEALTH_THRESHOLD_CRIT && check_death_method())
+ if(HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || (check_death_method() && getOxyLoss() > 50) || HAS_TRAIT(src, TRAIT_FAKEDEATH) || health < HEALTH_THRESHOLD_KNOCKOUT && check_death_method())
if(stat == CONSCIOUS)
KnockOut()
create_debug_log("fell unconscious, trigger reason: [reason]")
+ else if(health < HEALTH_THRESHOLD_CRIT && check_death_method())
+ KnockDown(3 SECONDS)
else
if(stat == UNCONSCIOUS)
WakeUp()
@@ -24,6 +26,7 @@
if(stam > DAMAGE_PRECISION && (maxHealth - stam) <= HEALTH_THRESHOLD_CRIT && !stat)
enter_stamcrit()
else if(stam_paralyzed)
+ SEND_SIGNAL(src, COMSIG_CARBON_EXIT_STAMINACRIT)
stam_paralyzed = FALSE
REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, "stam_crit") // make defines later
REMOVE_TRAIT(src, TRAIT_FLOORED, "stam_crit")
diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm
index 33896b03324c..9f9ad50fe929 100644
--- a/code/modules/mob/living/carbon/human/appearance.dm
+++ b/code/modules/mob/living/carbon/human/appearance.dm
@@ -214,7 +214,7 @@
H.ha_style = "None"
update_head_accessory()
-/mob/living/carbon/human/proc/change_eye_color(colour = "#000000", update_dna = TRUE)
+/mob/living/carbon/human/proc/change_eye_color(colour = "#000000", update_dna = TRUE, skip_icons = FALSE)
// Update the main DNA datum, then sync the change across the organs
var/obj/item/organ/internal/eyes/eyes_organ = get_int_organ(/obj/item/organ/internal/eyes)
if(eyes_organ)
@@ -227,9 +227,11 @@
if(update_dna)
update_dna()
+
sync_organ_dna(assimilate = FALSE)
- update_eyes()
- update_body()
+ if(!skip_icons)
+ update_eyes()
+ update_body()
return TRUE
/mob/living/carbon/human/proc/get_eye_color()
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 04d9bb6f7457..f463a173a82f 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -255,6 +255,9 @@ emp_act
if(head && head.hit_reaction(src, AM, attack_text, 0, damage, attack_type))
return TRUE
+ if(SEND_SIGNAL(src, COMSIG_HUMAN_CHECK_SHIELDS, AM, attack_text, 0, damage, attack_type) & SHIELD_BLOCK)
+ return TRUE
+
return FALSE
/mob/living/carbon/human/proc/get_best_shield()
@@ -455,7 +458,7 @@ emp_act
return FALSE
if(HAS_TRAIT(I, TRAIT_BUTCHERS_HUMANS) && stat == DEAD && user.a_intent == INTENT_HARM)
- var/obj/item/reagent_containers/food/snacks/meat/human/newmeat = new /obj/item/reagent_containers/food/snacks/meat/human(get_turf(loc))
+ var/obj/item/food/snacks/meat/human/newmeat = new /obj/item/food/snacks/meat/human(get_turf(loc))
newmeat.name = real_name + newmeat.name
newmeat.subjectname = real_name
newmeat.subjectjob = job
@@ -663,13 +666,11 @@ emp_act
visible_message("[src] is not affected by [M]'s disarm attempt!")
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
return FALSE
- var/obj/item/I = get_active_hand()
- if(I)
- unEquip(I)
var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_selected))
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
apply_effect(10 SECONDS, KNOCKDOWN, run_armor_check(affecting, MELEE))
- adjustStaminaLoss(M.alien_disarm_damage)
+ M.changeNext_move(1.6 SECONDS)
+ apply_damage(M.alien_disarm_damage, STAMINA)
add_attack_logs(M, src, "Alien tackled")
visible_message("[M] has tackled down [src]!", "You hear aggressive shuffling!")
@@ -719,7 +720,7 @@ emp_act
var/dmg = rand(M.force/2, M.force)
switch(M.damtype)
if("brute")
- adjustStaminaLoss(dmg)
+ apply_damage(dmg, STAMINA)
if(M.force > 35) // durand and other heavy mechas
KnockDown(6 SECONDS)
else if(M.force > 20 && !IsKnockedDown()) // lightweight mechas like gygax
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index ddd10970e26c..64ef4c4f0fd1 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -86,3 +86,9 @@
var/list/splinted_limbs = list() //limbs we know are splinted
var/original_eye_color = "#000000"
+
+ var/list/bodyparts = list()
+ /// map organ names to organs
+ var/list/bodyparts_by_name = list()
+
+ var/temperature_resistance = T0C+75
diff --git a/code/modules/mob/living/carbon/human/human_inventory.dm b/code/modules/mob/living/carbon/human/human_inventory.dm
index d8bda565092f..76ef81a1f3aa 100644
--- a/code/modules/mob/living/carbon/human/human_inventory.dm
+++ b/code/modules/mob/living/carbon/human/human_inventory.dm
@@ -444,6 +444,11 @@
var/obj/item/storage/equipped_item = get_item_by_slot(slot_item)
if(ismecha(loc) || HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
return
+ if(ismodcontrol(equipped_item)) // Check if the item is a MODsuit
+ if(thing && equipped_item.can_be_inserted(thing)) // Check if the item can be inserted into the MODsuit
+ equipped_item.handle_item_insertion(thing) // Insert the item into the MODsuit
+ playsound(loc, "rustle", 50, TRUE, -5)
+ return
if(!istype(equipped_item)) // We also let you equip things like this
equip_to_slot_if_possible(thing, slot_item)
return
diff --git a/code/modules/mob/living/carbon/human/human_life.dm b/code/modules/mob/living/carbon/human/human_life.dm
index 5cec16605726..f4583c0c60e6 100644
--- a/code/modules/mob/living/carbon/human/human_life.dm
+++ b/code/modules/mob/living/carbon/human/human_life.dm
@@ -131,31 +131,31 @@
/mob/living/carbon/human/check_breath(datum/gas_mixture/breath)
- var/obj/item/organ/internal/L = get_organ_slot("lungs")
+ var/datum/organ/lungs/lung_datum = get_int_organ_datum(ORGAN_DATUM_LUNGS)
- if(!L || L && (L.status & ORGAN_DEAD))
- if(health >= HEALTH_THRESHOLD_CRIT)
- adjustOxyLoss(HUMAN_MAX_OXYLOSS + 1)
- else if(!HAS_TRAIT(src, TRAIT_NOCRITDAMAGE))
- adjustOxyLoss(HUMAN_MAX_OXYLOSS)
+ if(lung_datum && !(lung_datum.linked_organ.status & ORGAN_DEAD))
+ lung_datum.check_breath(breath, src)
+ return
+
+ // We have no lungs, or our lungs are dead!
+ if(health >= HEALTH_THRESHOLD_CRIT)
+ adjustOxyLoss(HUMAN_MAX_OXYLOSS + 1)
+ else if(!HAS_TRAIT(src, TRAIT_NOCRITDAMAGE))
+ adjustOxyLoss(HUMAN_MAX_OXYLOSS)
- if(dna.species)
- var/datum/species/S = dna.species
+ if(dna.species)
+ var/datum/species/S = dna.species
- if(S.breathid == "o2")
+ switch(S.breathid)
+ if("o2")
throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
- else if(S.breathid == "tox")
+ if("tox")
throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
- else if(S.breathid == "co2")
+ if("co2") // currently unused
throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
- else if(S.breathid == "n2")
+ if("n2")
throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
-
- return FALSE
- else
- if(istype(L, /obj/item/organ/internal/lungs))
- var/obj/item/organ/internal/lungs/lun = L
- lun.check_breath(breath, src)
+ return FALSE
// USED IN DEATHWHISPERS
/mob/living/carbon/human/proc/isInCrit()
@@ -212,7 +212,8 @@
// +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt.
if(bodytemperature > dna.species.heat_level_1)
//Body temperature is too hot.
- if(status_flags & GODMODE) return 1 //godmode
+ if(status_flags & GODMODE)
+ return TRUE
var/mult = dna.species.heatmod * physiology.heat_mod
if(bodytemperature >= dna.species.heat_level_1 && bodytemperature <= dna.species.heat_level_2)
@@ -318,12 +319,15 @@
if(bodytemperature <= dna.species.cold_level_1) //260.15 is 310.15 - 50, the temperature where you start to feel effects.
bodytemperature += max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
- if(bodytemperature >= dna.species.cold_level_1 && bodytemperature <= dna.species.heat_level_1)
- bodytemperature += body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR
+ return
+
if(bodytemperature >= dna.species.heat_level_1) //360.15 is 310.15 + 50, the temperature where you start to feel effects.
//We totally need a sweat system cause it totally makes sense...~
bodytemperature += min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers
+ return
+ // Our bodytemperature is +-50 degrees of our wanted body temperature
+ bodytemperature += ((body_temperature_difference * metabolism_efficiency) / max((BODYTEMP_AUTORECOVERY_LOW * (modulus(body_temperature_difference)) / 10), 2)) // We get back to safe our preferred bodytemp a lot faster, but slower when we are colder or hotter
//This proc returns a number made up of the flags for body parts which you are protected on. (such as HEAD, UPPER_TORSO, LOWER_TORSO, etc. See setup.dm for the full list)
/mob/living/carbon/human/proc/get_heat_protection_flags(temperature) //Temperature is the temperature you're being exposed to.
@@ -792,14 +796,13 @@
H.fakevomit()
/mob/living/carbon/human/proc/handle_heartbeat()
- var/client/C = src.client
- if(C && C.prefs.sound & SOUND_HEARTBEAT) //disable heartbeat by pref
- var/obj/item/organ/internal/heart/H = get_int_organ(/obj/item/organ/internal/heart)
+ if(client && client.prefs.sound & SOUND_HEARTBEAT) //disable heartbeat by pref
+ var/datum/organ/heart/H = get_int_organ_datum(ORGAN_DATUM_HEART)
if(!H) //H.status will runtime if there is no H (obviously)
return
- if(H.is_robotic()) //Handle robotic hearts specially with a wuuuubb. This also applies to machine-people.
+ if(H.linked_organ.is_robotic()) //Handle robotic hearts specially with a wuuuubb. This also applies to machine-people.
if(isinspace())
//PULSE_THREADY - maximum value for pulse, currently it 5.
//High pulse value corresponds to a fast rate of heartbeat.
@@ -812,7 +815,6 @@
else
heartbeat++
- return
return
if(pulse == PULSE_NONE)
@@ -847,21 +849,18 @@
if(!can_heartattack())
return FALSE
- var/obj/item/organ/internal/heart/heart = get_int_organ(/obj/item/organ/internal/heart)
- if(!istype(heart) || (heart.status & ORGAN_DEAD) || !heart.beating)
+ var/datum/organ/heart/heart_datum = get_int_organ_datum(ORGAN_DATUM_HEART)
+ if(!istype(heart_datum) || (heart_datum.linked_organ.status & ORGAN_DEAD))
return TRUE
- return FALSE
+ return !heart_datum.beating
+
/mob/living/carbon/human/proc/set_heartattack(status)
if(!can_heartattack())
return FALSE
-
- var/obj/item/organ/internal/heart/heart = get_int_organ(/obj/item/organ/internal/heart)
- if(!istype(heart))
- return FALSE
-
- heart.beating = !status
+ var/datum/organ/heart/heart_datum = get_int_organ_datum(ORGAN_DATUM_HEART)
+ heart_datum?.change_beating(!status)
/mob/living/carbon/human/handle_heartattack()
if(!can_heartattack() || !undergoing_cardiac_arrest() || reagents.has_reagent("corazone"))
@@ -874,8 +873,6 @@
AdjustLoseBreath(40 SECONDS, bound_lower = 0, bound_upper = 50 SECONDS)
adjustOxyLoss(20)
-
-
// Need this in species.
//#undef HUMAN_MAX_OXYLOSS
//#undef HUMAN_CRIT_MAX_OXYLOSS
diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm
index 2f0c994e8afe..eb8b65a91631 100644
--- a/code/modules/mob/living/carbon/human/human_mob.dm
+++ b/code/modules/mob/living/carbon/human/human_mob.dm
@@ -293,9 +293,6 @@
if(!. && istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
. = wear_suit
-/mob/living/carbon/human/var/temperature_resistance = T0C+75
-
-
/mob/living/carbon/human/show_inv(mob/user)
user.set_machine(src)
var/has_breathable_mask = istype(wear_mask, /obj/item/clothing/mask) || get_organ_slot("breathing_tube")
@@ -767,7 +764,7 @@
if(href_list["secrecordadd"])
if(usr.incapacitated() || !hasHUD(usr, EXAMINE_HUD_SECURITY_WRITE))
return
- var/raw_input = input("Add Comment:", "Security records", null, null) as message
+ var/raw_input = tgui_input_text(usr, "Add Comment:", "Security records", multiline = TRUE, encode = FALSE)
var/sanitized = copytext(trim(sanitize(raw_input)), 1, MAX_MESSAGE_LEN)
if(!sanitized || usr.stat || usr.restrained() || !hasHUD(usr, EXAMINE_HUD_SECURITY_WRITE))
return
@@ -868,7 +865,7 @@
if(href_list["medrecordadd"])
if(usr.incapacitated() || !hasHUD(usr, EXAMINE_HUD_MEDICAL_WRITE))
return
- var/raw_input = input("Add Comment:", "Medical records", null, null) as message
+ var/raw_input = tgui_input_text(usr, "Add Comment:", "Medical records", multiline = TRUE, encode = FALSE)
var/sanitized = copytext(trim(sanitize(raw_input)), 1, MAX_MESSAGE_LEN)
if(!sanitized || usr.stat || usr.restrained() || !hasHUD(usr, EXAMINE_HUD_MEDICAL_WRITE))
return
@@ -1207,20 +1204,16 @@
..()
/mob/living/carbon/human/proc/is_lung_ruptured()
- var/obj/item/organ/internal/lungs/L = get_int_organ(/obj/item/organ/internal/lungs)
- if(!L)
- return 0
+ var/datum/organ/lungs/L = get_int_organ_datum(ORGAN_DATUM_LUNGS)
- return L.is_bruised()
+ return L?.linked_organ.is_bruised()
/mob/living/carbon/human/proc/rupture_lung()
- var/obj/item/organ/internal/lungs/L = get_int_organ(/obj/item/organ/internal/lungs)
- if(!L)
- return 0
-
- if(!L.is_bruised())
- L.custom_pain("You feel a stabbing pain in your chest!")
- L.damage = L.min_bruised_damage
+ var/datum/organ/lungs/L = get_int_organ_datum(ORGAN_DATUM_LUNGS)
+ if(L && !L.linked_organ.is_bruised())
+ var/obj/item/organ/external/affected = get_organ("chest")
+ affected.custom_pain("You feel a stabbing pain in your chest!")
+ L.linked_organ.damage = L.linked_organ.min_bruised_damage
/mob/living/carbon/human/cuff_resist(obj/item/I)
if(HAS_TRAIT(src, TRAIT_HULK))
@@ -1454,10 +1447,9 @@
if(!delay_icon_update)
UpdateAppearance()
-
- overlays.Cut()
- update_mutantrace()
- regenerate_icons()
+ overlays.Cut()
+ update_mutantrace()
+ regenerate_icons()
if(dna.species)
return TRUE
@@ -1495,7 +1487,9 @@
return
var/turf/origin = T
- var/direction = input(src,"Which way?","Tile selection") as anything in list("Here","North","South","East","West")
+ var/direction = tgui_input_list(src, "Which direction?", "Tile selection", list("Here", "North", "South", "East", "West"))
+ if(!direction)
+ return
if(direction != "Here")
T = get_step(T,text2dir(direction))
if(!istype(T))
@@ -1511,7 +1505,7 @@
var/max_length = bloody_hands * 30 //tweeter style
- var/message = stripped_input(src,"Write a message. It cannot be longer than [max_length] characters.","Blood writing", "")
+ var/message = tgui_input_text(src, "Write a message. It cannot be longer than [max_length] characters.", "Blood writing", max_length = max_length)
if(origin != loc)
to_chat(src, "Stay still while writing!")
return
@@ -1564,7 +1558,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
return FALSE
/mob/living/carbon/human/assess_threat(mob/living/simple_animal/bot/secbot/judgebot, lasercolor)
- if(judgebot.emagged == 2)
+ if(judgebot.emagged)
return 10 //Everyone is a criminal!
var/threatcount = 0
@@ -1623,7 +1617,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
threatcount += 2
//Check for dresscode violations
- if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard))
+ if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/wizard))
threatcount += 2
@@ -1867,20 +1861,20 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
/mob/living/carbon/human/can_eat(flags = 255)
return dna.species && (dna.species.dietflags & flags)
-/mob/living/carbon/human/selfFeed(obj/item/reagent_containers/food/toEat, fullness)
+/mob/living/carbon/human/selfFeed(obj/item/food/toEat, fullness)
if(!check_has_mouth())
to_chat(src, "Where do you intend to put \the [toEat]? You don't have a mouth!")
return 0
return ..()
-/mob/living/carbon/human/forceFed(obj/item/reagent_containers/food/toEat, mob/user, fullness)
+/mob/living/carbon/human/forceFed(obj/item/food/toEat, mob/user, fullness)
if(!check_has_mouth())
- if(!((istype(toEat, /obj/item/reagent_containers/food/drinks) && (ismachineperson(src)))))
+ if(!((istype(toEat, /obj/item/reagent_containers/drinks) && (ismachineperson(src)))))
to_chat(user, "Where do you intend to put \the [toEat]? \The [src] doesn't have a mouth!")
return 0
return ..()
-/mob/living/carbon/human/selfDrink(obj/item/reagent_containers/food/drinks/toDrink)
+/mob/living/carbon/human/selfDrink(obj/item/reagent_containers/drinks/toDrink)
if(!check_has_mouth())
if(!ismachineperson(src))
to_chat(src, "Where do you intend to put \the [src]? You don't have a mouth!")
@@ -2151,7 +2145,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
if(stat)
return
- pose = sanitize(copytext_char(input(usr, "This is [src]. [p_they(TRUE)]...", "Pose", null) as text, 1, MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext
+ pose = tgui_input_text(usr, "This is [src]. [p_they(TRUE)]...", "Pose")
/mob/living/carbon/human/verb/set_flavor()
set name = "Set Flavour Text"
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index eefd16486c7c..f1cbef6f4ade 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -4,9 +4,6 @@
eyes.update_colour()
update_body()
-/mob/living/carbon/human/var/list/bodyparts = list()
-/mob/living/carbon/human/var/list/bodyparts_by_name = list() // map organ names to organs
-
// Takes care of organ related updates, such as broken and missing limbs
/mob/living/carbon/human/handle_organs()
..()
@@ -162,17 +159,6 @@ old_ue: Set this to a UE string, and this proc will overwrite the dna of organs
if(assimilate || O.dna.unique_enzymes == ue_to_compare)
O.set_dna(dna)
-/*
-Given the name of an organ, returns the external organ it's contained in
-I use this to standardize shadowling dethrall code
--- Crazylemon
-*/
-/mob/living/carbon/human/proc/named_organ_parent(organ_name)
- if(!get_int_organ_tag(organ_name))
- return null
- var/obj/item/organ/internal/O = get_int_organ_tag(organ_name)
- return O.parent_organ
-
/mob/living/carbon/human/has_organic_damage()
var/robo_damage = 0
var/perma_injury_damage = 0
diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm
index 50562a09e37a..c6e66e1b38ee 100644
--- a/code/modules/mob/living/carbon/human/human_say.dm
+++ b/code/modules/mob/living/carbon/human/human_say.dm
@@ -27,6 +27,9 @@
return ..()
/mob/living/carbon/human/proc/HasVoiceChanger()
+ var/datum/status_effect/magic_disguise/S = has_status_effect(/datum/status_effect/magic_disguise)
+ if(S && S.disguise && S.disguise.name)
+ return S.disguise.name
for(var/obj/item/gear in list(wear_mask, wear_suit, head))
if(!gear)
continue
@@ -64,10 +67,10 @@
return TRUE
// how do species that don't breathe talk? magic, that's what.
var/breathes = (!HAS_TRAIT(src, TRAIT_NOBREATH))
- var/obj/item/organ/internal/L = get_organ_slot("lungs")
+ var/datum/organ/lungs/L = get_int_organ_datum(ORGAN_DATUM_LUNGS)
if(HAS_TRAIT(src, TRAIT_MUTE))
return FALSE
- if((breathes && !L) || breathes && L && (L.status & ORGAN_DEAD))
+ if(breathes && (!L || L.linked_organ.status & ORGAN_DEAD))
return FALSE
if(mind)
return !mind.miming
diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
index 085402ede259..355ddc11d8c0 100644
--- a/code/modules/mob/living/carbon/human/human_update_icons.dm
+++ b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -110,7 +110,8 @@ Please contact me on #coderbus IRC. ~Carn x
var/list/cached_standing_overlays = list() // List of everything currently in a human's actual overlays
/mob/living/carbon/human/proc/apply_overlay(cache_index)
- if((. = overlays_standing[cache_index]))
+ . = overlays_standing[cache_index]
+ if(.)
add_overlay(.)
/mob/living/carbon/human/proc/remove_overlay(cache_index)
diff --git a/code/modules/mob/living/carbon/human/human_update_status.dm b/code/modules/mob/living/carbon/human/human_update_status.dm
index 26972a8ecf2c..0c48d4b5fa1b 100644
--- a/code/modules/mob/living/carbon/human/human_update_status.dm
+++ b/code/modules/mob/living/carbon/human/human_update_status.dm
@@ -6,7 +6,7 @@
if(dna.species && dna.species.can_revive_by_healing)
var/obj/item/organ/internal/brain/B = get_int_organ(/obj/item/organ/internal/brain)
if(B)
- if((health >= (HEALTH_THRESHOLD_DEAD + HEALTH_THRESHOLD_CRIT) * 0.5) && getBrainLoss() < 120 && !suiciding)
+ if((health >= (HEALTH_THRESHOLD_DEAD + HEALTH_THRESHOLD_CRIT) * 0.5) && check_vital_organs() && !suiciding)
update_revive()
create_debug_log("revived from healing, trigger reason: [reason]")
diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm
index 33f874ff10b7..ff78b9ddd8e9 100644
--- a/code/modules/mob/living/carbon/human/species/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/_species.dm
@@ -195,6 +195,10 @@
/// Whether the presence of a body accessory on this species is optional or not.
var/optional_body_accessory = TRUE
+ var/list/autohiss_basic_map = null
+ var/list/autohiss_extra_map = null
+ var/list/autohiss_exempt = null
+
/datum/species/New()
unarmed = new unarmed_type()
if(!sprite_sheet_name)
@@ -415,6 +419,7 @@
return
/datum/species/proc/apply_damage(damage = 0, damagetype = BRUTE, def_zone, blocked = 0, mob/living/carbon/human/H, sharp = FALSE, obj/used_weapon, spread_damage = FALSE)
+ SEND_SIGNAL(H, COMSIG_MOB_APPLY_DAMAGE, damage, damagetype, def_zone)
if(!damage)
return FALSE
@@ -481,7 +486,7 @@
return
/datum/species/proc/help(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
- if(attacker_style && attacker_style.help_act(user, target) == TRUE)//adminfu only...
+ if(attacker_style && attacker_style.help_act(user, target) == MARTIAL_ARTS_ACT_SUCCESS)//adminfu only...
return TRUE
if(target.on_fire)
user.pat_out(target)
@@ -495,7 +500,7 @@
if(target.check_block())
target.visible_message("[target] blocks [user]'s grab attempt!")
return FALSE
- if(attacker_style && attacker_style.grab_act(user, target) == TRUE)
+ if(attacker_style && attacker_style.grab_act(user, target) == MARTIAL_ARTS_ACT_SUCCESS)
return TRUE
else
target.grabbedby(user)
@@ -527,7 +532,7 @@
return FALSE
if(SEND_SIGNAL(target, COMSIG_HUMAN_ATTACKED, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
return FALSE
- if(attacker_style && attacker_style.harm_act(user, target) == TRUE)
+ if(attacker_style && attacker_style.harm_act(user, target) == MARTIAL_ARTS_ACT_SUCCESS)
return TRUE
else
var/datum/unarmed_attack/attack = user.dna.species.unarmed
@@ -582,7 +587,7 @@
user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
return FALSE
- if(attacker_style && attacker_style.disarm_act(user, target) == TRUE)
+ if(attacker_style && attacker_style.disarm_act(user, target) == MARTIAL_ARTS_ACT_SUCCESS)
return TRUE
user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
if(target.move_resist > user.pull_force)
@@ -1026,6 +1031,7 @@ It'll return null if the organ doesn't correspond, so include null checks when u
return
/datum/species/proc/spec_attacked_by(obj/item/I, mob/living/user, obj/item/organ/external/affecting, intent, mob/living/carbon/human/H)
+ return
/proc/get_random_species(species_name = FALSE) // Returns a random non black-listed or hazardous species, either as a string or datum
var/static/list/random_species = list()
diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm
index 84a9006f9e06..554048b09f31 100644
--- a/code/modules/mob/living/carbon/human/species/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/golem.dm
@@ -572,7 +572,7 @@
..()
last_banana = world.time
last_honk = world.time
- H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(H), SLOT_HUD_RIGHT_STORE)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(H), SLOT_HUD_RIGHT_STORE)
H.equip_to_slot_or_del(new /obj/item/bikehorn(H), SLOT_HUD_LEFT_STORE)
H.AddElement(/datum/element/waddling)
@@ -651,7 +651,7 @@
/datum/species/golem/tranquillite/on_species_gain(mob/living/carbon/human/H)
..()
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), SLOT_HUD_HEAD)
- H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(H), SLOT_HUD_RIGHT_STORE)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/drinks/bottle/bottleofnothing(H), SLOT_HUD_RIGHT_STORE)
H.equip_to_slot_or_del(new /obj/item/cane(H), SLOT_HUD_LEFT_HAND)
if(H.mind)
H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe/conjure/build/mime_wall(null))
diff --git a/code/modules/mob/living/carbon/human/species/grey.dm b/code/modules/mob/living/carbon/human/species/grey.dm
index 3f77302caf93..9902aaf0c1b0 100644
--- a/code/modules/mob/living/carbon/human/species/grey.dm
+++ b/code/modules/mob/living/carbon/human/species/grey.dm
@@ -4,10 +4,10 @@
icobase = 'icons/mob/human_races/r_grey.dmi'
language = "Psionic Communication"
- blurb = "The Grey, known for their psionic abilities and unique appearance, hail from beyond the Milky Way, with an undisclosed homeworld. \
+ blurb = "The Grey, known for their psionic abilities and unique appearance, hail from beyond the Milky Way and have an undisclosed homeworld. \
They rely heavily on cloning technology and are governed by a technocratic council of scientists.
\
Focused on technological advancement and the study of the universe, the Grey lack religious or spiritual beliefs. \
- Their objective perspective and advanced knowledge often position them to focus on their own projects rather then the disputes of other species."
+ Their objective perspective and advanced knowledge often position them to focus on their own projects rather than the disputes of other species."
eyes = "grey_eyes_s"
butt_sprite = "grey"
diff --git a/code/modules/mob/living/carbon/human/species/human_species.dm b/code/modules/mob/living/carbon/human/species/human_species.dm
index 9d19d16404f4..8fdf5a0af38a 100644
--- a/code/modules/mob/living/carbon/human/species/human_species.dm
+++ b/code/modules/mob/living/carbon/human/species/human_species.dm
@@ -10,9 +10,9 @@
bodyflags = HAS_ICON_SKIN_TONE | HAS_BODY_MARKINGS
dietflags = DIET_OMNI
blurb = "Humanity, originating from the Sol system, has expanded over five centuries, branching out to forge a variety of governments and powerful corporations. \
- These range from the militaristic Trans Solar Federation, the Union of Soviet Socialist Planets, and megacorps like Nanotrasen.
\
- With a constant desire to colonize and spread their influence onto other species, they have began to develop alliances and enemies. \
- Making human's one of the most recongnizeable and socially diverse species in the sector."
+ These range from the militaristic Trans Solar Federation, the Union of Soviet Socialist Planets, and mega corporations like Nanotrasen.
\
+ With a constant desire to colonize and spread their influence onto other species, they have begun to develop alliances and enemies, \
+ making humans one of the most recognizable and socially diverse species in the sector."
icon_skin_tones = list( //Organized to be from Light to Dark.
1 = "Default White",
diff --git a/code/modules/mob/living/carbon/human/species/kidan.dm b/code/modules/mob/living/carbon/human/species/kidan.dm
index 0da9b54e8fe3..6ae58289f775 100644
--- a/code/modules/mob/living/carbon/human/species/kidan.dm
+++ b/code/modules/mob/living/carbon/human/species/kidan.dm
@@ -4,7 +4,7 @@
icobase = 'icons/mob/human_races/r_kidan.dmi'
language = "Chittin"
- blurb = "The Kidan are ant-like beings possessing a hardened exoskeleton and a strict adherence to social castes. \
+ blurb = "The Kidan are ant-like beings possessing a hardened exoskeleton and strict adherence to social castes. \
They originate from the planet Aurum — a barren bombarded world that suffered after the war with the Solar-Central Compact, having lost decisively after the Battle of Argos.
\
They are relatively minor players in galactic affairs and presently suffer heavy sanctions from the SCC, \
though they are tentatively re-establishing relations with other galactic powers, even after the crumbling of their once powerful empire."
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index 0ab9e22ebef0..02439084da15 100644
--- a/code/modules/mob/living/carbon/human/species/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -64,7 +64,7 @@
..()
H.real_name = "[lowertext(name)] ([rand(100,999)])"
H.name = H.real_name
- H.butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/monkey = 5)
+ H.butcher_results = list(/obj/item/food/snacks/meat/monkey = 5)
/datum/species/monkey/handle_dna(mob/living/carbon/human/H, remove)
..()
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 5ee26c4f1a55..a9a24b1ef32d 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -192,7 +192,7 @@
if(!H.equip_to_appropriate_slot(internal_tank) && !H.put_in_any_hand_if_possible(internal_tank))
H.unEquip(H.l_hand)
H.equip_or_collect(internal_tank, SLOT_HUD_LEFT_HAND)
- to_chat(H, "Could not find an empty slot for internals! Please report this as a bug.")
+ to_chat(H, "Could not find an empty slot for internals! Please report this as a bug.")
stack_trace("Failed to equip plasmaman with a tank, with the job [J.type]")
H.internal = internal_tank
to_chat(H, "You are now running on plasma internals from [internal_tank]. Oxygen is toxic to your species, so you must breathe plasma only.")
diff --git a/code/modules/mob/living/carbon/human/species/skrell.dm b/code/modules/mob/living/carbon/human/species/skrell.dm
index 9509b3ae879a..873864b78e44 100644
--- a/code/modules/mob/living/carbon/human/species/skrell.dm
+++ b/code/modules/mob/living/carbon/human/species/skrell.dm
@@ -5,8 +5,8 @@
language = "Skrellian"
primitive_form = /datum/species/monkey/skrell
- blurb = "Skrell are a amphibious species, that come from the planet Jargon 4, a humid planet filled with swamps and archipelagos. \
- Skrell are a highly advanced and logical race who live under the rule of the Qerr'Katish, the main govermental body.
\
+ blurb = "Skrell are an amphibious species, that come from the planet Jargon 4, a humid planet filled with swamps and archipelagos. \
+ Skrell are a highly advanced and logical race who live under the rule of the Qerr'Katish, the main governmental body.
\
Skrell are herbivores and opulent in nature thanks to central tenets of the Skrellian religion. \
While classically preferring diplomacy, the Skrell participate in the largest military alliance in the galaxy, the Solar-Central Compact."
diff --git a/code/modules/mob/living/carbon/human/species/slimepeople.dm b/code/modules/mob/living/carbon/human/species/slimepeople.dm
index 4af69cfe0c7b..9a7cc5098eef 100644
--- a/code/modules/mob/living/carbon/human/species/slimepeople.dm
+++ b/code/modules/mob/living/carbon/human/species/slimepeople.dm
@@ -13,7 +13,7 @@
language = "Bubblish"
blurb = "Slime People are gelatinous and translucent beings from the vast oceans of Xarxis 5. \
- They are recent entrants to the galactic scene, having been discovered by a TSF exploratory company during space expedetions.
\
+ They are recent entrants to the galactic scene, having been discovered by a TSF exploratory company during space expeditions.
\
Slime People traditionally operate in roaming bands and tribes that migrate according to orbital patterns and tides. \
A great deal of Slime People prefer the comforts and traditions of their homeworld, though many more have decided to take their chances among the stars, trying \
to find a better life for themselves and their species."
@@ -49,9 +49,7 @@
vision_organ = null
has_organ = list(
- "heart" = /obj/item/organ/internal/heart/slime,
- "brain" = /obj/item/organ/internal/brain/slime,
- "lungs" = /obj/item/organ/internal/lungs/slime
+ "brain" = /obj/item/organ/internal/brain/slime
)
mutantears = null
suicide_messages = list(
diff --git a/code/modules/mob/living/carbon/human/species/tajaran.dm b/code/modules/mob/living/carbon/human/species/tajaran.dm
index 8bebeaefc4ef..2ec13166f027 100644
--- a/code/modules/mob/living/carbon/human/species/tajaran.dm
+++ b/code/modules/mob/living/carbon/human/species/tajaran.dm
@@ -8,7 +8,7 @@
unarmed_type = /datum/unarmed_attack/claws
blurb = "Tajaran hail from the mineral-rich arctic moon of Ahdomai. \
- They were introduced into the galactic scene after Skrellian discovery and uplifted to be an associate to the Solar-Central Compact.
\
+ They were introduced into the galactic scene after the Skrellian discovery and were elevated to be associates to the Solar-Central Compact.
\
The teachings of S'randarr and solar iconography dominate their religious practices, \
and Tajaran often speak in the third person due to the lack of first-person references in their native tongue."
diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm
index 4be61f83bece..a463c0c29e05 100644
--- a/code/modules/mob/living/carbon/human/species/unathi.dm
+++ b/code/modules/mob/living/carbon/human/species/unathi.dm
@@ -10,8 +10,8 @@
primitive_form = /datum/species/monkey/unathi
blurb = "Unathi are a scaled species of reptilian beings from the desert world of Moghes, within the Uuosa-Eso system. \
- Organizing themselves in highly competitive feudal kingdoms, Unathi lack any sort of wide-scale unification, and their culture and history consist of centuries of internal conflict and struggle.
\
- Despite clans having a sizeable military force, inter-clan rivalries and constant civil war prevents the Unathi from achieving much more in the wider galactic scene."
+ Organizing themselves in highly competitive feudal kingdoms, the Unathi lack any sort of wide-scale unification, and their culture and history consist of centuries of internal conflict and struggle.
\
+ Despite clans having a sizeable military force, inter-clan rivalries and constant civil war prevent the Unathi from achieving much more in the wider galactic scene."
species_traits = list(LIPS)
inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID | MOB_REPTILE
diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm
index 9afe9f2598b9..853819c6bcd2 100644
--- a/code/modules/mob/living/carbon/human/species/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/vox.dm
@@ -2,10 +2,10 @@
name = "Vox"
name_plural = "Vox"
max_age = 90 // vox stacks can be older than this, but let's assume their body fails beyond repair after such ages.
- icobase = 'icons/mob/human_races/vox/r_vox.dmi'
+ icobase = 'icons/mob/human_races/vox/r_voxlime.dmi'
dangerous_existence = TRUE
language = "Vox-pidgin"
- tail = "voxtail"
+ tail = "voxtail_lime"
speech_sounds = list('sound/voice/shriek1.ogg')
speech_chance = 20
unarmed_type = /datum/unarmed_attack/claws //I dont think it will hurt to give vox claws too.
@@ -44,8 +44,8 @@
female_sneeze_sound = 'sound/voice/shrieksneeze.ogg'
icon_skin_tones = list(
- 1 = "Default Green",
- 2 = "Dark Green",
+ 1 = "Default Lime",
+ 2 = "Plum",
3 = "Brown",
4 = "Grey",
5 = "Emerald",
@@ -91,7 +91,7 @@
if(!H.put_in_any_hand_if_possible(internal_tank))
H.unEquip(H.l_hand)
H.equip_or_collect(internal_tank, SLOT_HUD_LEFT_HAND)
- to_chat(H, "Could not find an empty slot for internals! Please report this as a bug")
+ to_chat(H, "Could not find an empty slot for internals! Please report this as a bug")
H.internal = internal_tank
to_chat(H, "You are now running on nitrogen internals from [internal_tank]. Your species finds oxygen toxic, so you must breathe nitrogen only.")
H.update_action_buttons_icon()
@@ -103,7 +103,7 @@
/datum/species/vox/updatespeciescolor(mob/living/carbon/human/H, owner_sensitive = 1) //Handling species-specific skin-tones for the Vox race.
if(H.dna.species.bodyflags & HAS_ICON_SKIN_TONE)
- var/new_icobase = 'icons/mob/human_races/vox/r_vox.dmi' //Default Green Vox.
+ var/new_icobase = 'icons/mob/human_races/vox/r_voxlime.dmi' //Default Lime Vox.
switch(H.s_tone)
if(8) //Nebula Vox.
new_icobase = 'icons/mob/human_races/vox/r_voxpurp.dmi'
@@ -123,11 +123,11 @@
if(3) //Brown Vox.
new_icobase = 'icons/mob/human_races/vox/r_voxbrn.dmi'
H.tail = "voxtail_brn"
- if(2) //Dark Green Vox.
- new_icobase = 'icons/mob/human_races/vox/r_voxdgrn.dmi'
- H.tail = "voxtail_dgrn"
- else //Default Green Vox.
- H.tail = "voxtail" //Ensures they get an appropriately coloured tail depending on the skin-tone.
+ if(2) //Plum Vox.
+ new_icobase = 'icons/mob/human_races/vox/r_voxplum.dmi'
+ H.tail = "voxtail_plum"
+ else //Default Lime Vox.
+ H.tail = "voxtail_lime" //Ensures they get an appropriately coloured tail depending on the skin-tone.
H.change_icobase(new_icobase, owner_sensitive) //Update the icobase of all our organs, but make sure we don't mess with frankenstein limbs in doing so.
diff --git a/code/modules/mob/living/carbon/human/species/vulpkanin.dm b/code/modules/mob/living/carbon/human/species/vulpkanin.dm
index 139ba4761d11..f98b03002e22 100644
--- a/code/modules/mob/living/carbon/human/species/vulpkanin.dm
+++ b/code/modules/mob/living/carbon/human/species/vulpkanin.dm
@@ -11,7 +11,7 @@
blurb = "Vulpkanin are bipedal canid-like beings from the Vazzend binary system, having been forced from their homeworld by a cataclysmic event and scattered throughout the Orion Sector. \
While Vulpkanin are chiefly led by independent planetary governments, they also serve under a loose federation known as The Assembly.
\
Their religious systems traditionally pay tribute to an all-infusing universal will called 'Racht'. \
- Vulpkanin groups are minor players in galactic affairs, and are largely concerned with the focus of restoration of their homeworld."
+ Vulpkanin groups are minor players in galactic affairs, as they are largely concerned with the restoration of their homeworld."
species_traits = list(LIPS)
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index ed47d4a0bed3..9da5da6e35d7 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -284,7 +284,7 @@
else
. = STATUS_UPDATE_STAMINA
if(amount > 0)
- stam_regen_start_time = world.time + STAMINA_REGEN_BLOCK_TIME
+ stam_regen_start_time = world.time + (STAMINA_REGEN_BLOCK_TIME * stamina_regen_block_modifier)
if(updating)
update_health_hud()
update_stamina()
@@ -300,7 +300,7 @@
else
. = STATUS_UPDATE_STAMINA
if(amount > 0)
- stam_regen_start_time = world.time + STAMINA_REGEN_BLOCK_TIME
+ stam_regen_start_time = world.time + (STAMINA_REGEN_BLOCK_TIME * stamina_regen_block_modifier)
if(updating)
update_health_hud()
update_stamina()
diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm
index f6536f03fd0a..14497d34a6e2 100644
--- a/code/modules/mob/living/default_language.dm
+++ b/code/modules/mob/living/default_language.dm
@@ -10,13 +10,11 @@
// Silicons can't neccessarily speak everything in their languages list
/mob/living/silicon/set_default_language(language as null|anything in speech_synthesizer_langs)
- ..()
-
-/mob/living/verb/check_default_language()
- set name = "Check Default Language"
+ set name = "Set Default Language"
set category = "IC"
- if(default_language)
- to_chat(src, "You are currently speaking [default_language] by default.")
+ if(language)
+ to_chat(src, "You will now speak [language] if you do not specify a language when speaking.")
else
- to_chat(src, "Your current default language is your species or mob type default.")
+ to_chat(src, "You will now speak whatever your standard default language is if you do not specify one when speaking.")
+ default_language = language
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index c5bc2f29f64f..13a8c62a1cad 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -295,7 +295,7 @@
to_chat(src, "You are unable to succumb to death! This life continues!")
return
- var/last_words = input(src, "Do you have any last words?", "Goodnight, Sweet Prince") as text|null
+ var/last_words = tgui_input_text(src, "Do you have any last words?", "Goodnight, Sweet Prince", encode = FALSE)
if(stat == DEAD)
// cancel em out if they died while they had the message box up
@@ -1116,7 +1116,7 @@
if("lighting_alpha")
sync_lighting_plane_alpha()
-/mob/living/throw_at(atom/target, range, speed, mob/thrower, spin, diagonals_first, datum/callback/callback, force, dodgeable)
+/mob/living/throw_at(atom/target, range, speed, mob/thrower, spin, diagonals_first, datum/callback/callback, force, dodgeable, block_movement)
stop_pulling()
return ..()
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 4e2d94e9a379..7d4046935e9e 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -18,7 +18,7 @@
return armor
if(armor <= 0)
return armor
- if(!armour_penetration_flat && armour_penetration_percentage <= 0)
+ if(!armour_penetration_flat && !armour_penetration_percentage)
to_chat(src, "[soften_text]")
return armor
@@ -76,7 +76,7 @@
playsound(loc, 'sound/effects/eleczap.ogg', 50, 1, -1)
explosion(loc, -1, 0, 2, 2)
else
- adjustStaminaLoss(shock_damage)
+ apply_damage(shock_damage, STAMINA)
visible_message(
"[src] was shocked by \the [source]!", \
"You feel a powerful shock coursing through your body!", \
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index ced34a429950..305e1142491b 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -71,6 +71,8 @@
var/stun_absorption = null //converted to a list of stun absorption sources this mob has when one is added
var/stam_regen_start_time = 0 //used to halt stamina regen temporarily
+ /// A multiplier for the ammount of time it takes for someone to regenerate stamina damage.
+ var/stamina_regen_block_modifier = 1
var/stam_paralyzed = FALSE //knocks you down
/// Number of degrees of rotation of a mob. 0 means no rotation, up-side facing NORTH. 90 means up-side rotated to face EAST, and so on.
diff --git a/code/modules/mob/living/living_emote.dm b/code/modules/mob/living/living_emote.dm
index 3c6e65bebb8b..dbcb4c4add63 100644
--- a/code/modules/mob/living/living_emote.dm
+++ b/code/modules/mob/living/living_emote.dm
@@ -416,9 +416,9 @@
to_chat(user, "You cannot send IC messages (muted).")
return FALSE
else if(!params)
- custom_emote = copytext(sanitize(input("Choose an emote to display.") as text|null), 1, MAX_MESSAGE_LEN)
+ custom_emote = tgui_input_text(user, "Choose an emote to display.", "Custom Emote")
if(custom_emote && !check_invalid(user, custom_emote))
- var/type = input("Is this a visible or hearable emote?") as null|anything in list("Visible", "Hearable")
+ var/type = tgui_alert(user, "Is this a visible or hearable emote?", "Custom Emote", list("Visible", "Hearable"))
switch(type)
if("Visible")
custom_emote_type = EMOTE_VISIBLE
diff --git a/code/modules/mob/living/silicon/ai/ai_mob.dm b/code/modules/mob/living/silicon/ai/ai_mob.dm
index 71ae4ff228d9..d1257aaf2677 100644
--- a/code/modules/mob/living/silicon/ai/ai_mob.dm
+++ b/code/modules/mob/living/silicon/ai/ai_mob.dm
@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
if(subject!=null)
for(var/A in GLOB.ai_list)
var/mob/living/silicon/ai/M = A
- if((M.client && M.machine == subject))
+ if(M.client && M.machine == subject)
is_in_use = 1
subject.attack_ai(M)
return is_in_use
@@ -77,6 +77,9 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
var/obj/machinery/power/apc/malfhack = null
var/explosive = 0 //does the AI explode when it dies?
+ ///Whether or not the AI has upgraded their turrets
+ var/turrets_upgraded = FALSE
+
/// List of modules the AI has purchased malf upgrades for.
var/list/purchased_modules = list()
@@ -120,6 +123,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
//Used with the hotkeys on 2-5 to store locations.
var/list/stored_locations = list()
+ var/cracked_camera = FALSE // will be true if malf AI break its camera
/mob/living/silicon/ai/proc/add_ai_verbs()
verbs |= GLOB.ai_verbs_default
@@ -443,7 +447,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
//if(icon_state == initial(icon_state))
var/icontype = ""
- icontype = input("Select an icon!", "AI", null, null) in display_choices
+ icontype = tgui_input_list(usr, "Select an icon!", "AI", display_choices)
icon = 'icons/mob/ai.dmi' //reset this in case we were on a custom sprite and want to change to a standard one
switch(icontype)
if("Custom")
@@ -567,7 +571,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
to_chat(src, "Please allow one minute to pass between announcements.")
return
- var/input = input(usr, "Please write a message to announce to the station crew.", "A.I. Announcement") as message|null
+ var/input = tgui_input_text(usr, "Please write a message to announce to the station crew.", "A.I. Announcement", multiline = TRUE, encode = FALSE)
if(!input)
return
@@ -584,7 +588,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
if(check_unable(AI_CHECK_WIRELESS))
return
- var/input = input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.") as null|message
+ var/input = tgui_input_text(src, "Please enter the reason for calling the shuttle.", "Shuttle Call Reason", multiline = TRUE, encode = FALSE)
if(!input || stat)
return
@@ -602,7 +606,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
if(check_unable(AI_CHECK_WIRELESS))
return
- var/confirm = alert("Are you sure you want to recall the shuttle?", "Confirm Shuttle Recall", "Yes", "No")
+ var/confirm = tgui_alert(src, "Are you sure you want to recall the shuttle?", "Confirm Shuttle Recall", list("Yes", "No"))
if(check_unable(AI_CHECK_WIRELESS))
return
@@ -964,7 +968,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
return
var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer")
- var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
+ var/emote = tgui_input_list(usr, "Please, select a status!", "AI Status", ai_emotions)
if(check_unable())
return
@@ -1003,7 +1007,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
custom_hologram = TRUE
var/input
- switch(alert("Would you like to select a hologram based on a crew member, an animal, or switch to a unique avatar?",,"Crew Member","Unique","Animal"))
+ switch(tgui_alert(usr, "Would you like to select a hologram based on a crew member, an animal, or switch to a unique avatar?", "Change Hologram", list("Crew Member", "Unique", "Animal")))
if("Crew Member")
var/personnel_list[] = list()
@@ -1021,37 +1025,37 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
if("Animal")
var/icon_list[] = list(
- "Bear",
- "Carp",
- "Chicken",
- "Corgi",
- "Cow",
- "Crab",
- "Deer",
- "Fox",
- "Goat",
- "Goose",
- "Kitten",
- "Kitten2",
- "Pig",
- "Poly",
- "Pug",
- "Seal",
- "Spider",
- "Turkey",
- "Shantak",
- "Bunny",
- "Hellhound",
- "Lightgeist",
- "Cockroach",
- "Mecha-Cat",
- "Mecha-Fairy",
- "Mecha-Fox",
- "Mecha-Monkey",
- "Mecha-Mouse",
- "Mecha-Snake",
- "Roller-Mouse",
- "Roller-Monkey"
+ "Bear",
+ "Carp",
+ "Chicken",
+ "Corgi",
+ "Cow",
+ "Crab",
+ "Deer",
+ "Fox",
+ "Goat",
+ "Goose",
+ "Kitten",
+ "Kitten2",
+ "Pig",
+ "Poly",
+ "Pug",
+ "Seal",
+ "Spider",
+ "Turkey",
+ "Shantak",
+ "Bunny",
+ "Hellhound",
+ "Lightgeist",
+ "Cockroach",
+ "Mecha-Cat",
+ "Mecha-Fairy",
+ "Mecha-Fox",
+ "Mecha-Monkey",
+ "Mecha-Mouse",
+ "Mecha-Snake",
+ "Roller-Mouse",
+ "Roller-Monkey"
)
input = tgui_input_list(usr, "Please select a hologram", "Change Hologram", icon_list)
@@ -1059,84 +1063,84 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
qdel(holo_icon)
switch(input)
if("Bear")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"bear"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "bear"))
if("Carp")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"carp"))
+ holo_icon = getHologramIcon(icon('icons/mob/carp.dmi', "holocarp"))
if("Chicken")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"chicken_brown"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "chicken_brown"))
if("Corgi")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"corgi"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "corgi"))
if("Cow")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"cow"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "cow"))
if("Crab")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"crab"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "crab"))
if("Deer")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"deer"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "deer"))
if("Fox")
- holo_icon = getHologramIcon(icon('icons/mob/pets.dmi',"fox"))
+ holo_icon = getHologramIcon(icon('icons/mob/pets.dmi', "fox"))
if("Goat")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"goat"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "goat"))
if("Goose")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"goose"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "goose"))
if("Kitten")
- holo_icon = getHologramIcon(icon('icons/mob/pets.dmi',"cat"))
+ holo_icon = getHologramIcon(icon('icons/mob/pets.dmi', "cat"))
if("Kitten2")
- holo_icon = getHologramIcon(icon('icons/mob/pets.dmi',"cat2"))
+ holo_icon = getHologramIcon(icon('icons/mob/pets.dmi', "cat2"))
if("Pig")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"pig"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "pig"))
if("Poly")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"parrot_fly"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "parrot_fly"))
if("Pug")
- holo_icon = getHologramIcon(icon('icons/mob/pets.dmi',"pug"))
+ holo_icon = getHologramIcon(icon('icons/mob/pets.dmi', "pug"))
if("Seal")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"seal"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "seal"))
if("Spider")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"guard"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "guard"))
if("Turkey")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"turkey"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "turkey"))
if("Shantak")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"shantak"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "shantak"))
if("Bunny")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"m_bunny"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "m_bunny"))
if("Hellhound")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"hellhound"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "hellhound"))
if("Lightgeist")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"lightgeist"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "lightgeist"))
if("Cockroach")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"cockroach"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "cockroach"))
if("Mecha-Cat")
- holo_icon = getHologramIcon(icon('icons/mob/pai.dmi',"cat"))
+ holo_icon = getHologramIcon(icon('icons/mob/pai.dmi', "cat"))
if("Mecha-Fairy")
- holo_icon = getHologramIcon(icon('icons/mob/pai.dmi',"fairy"))
+ holo_icon = getHologramIcon(icon('icons/mob/pai.dmi', "fairy"))
if("Mecha-Fox")
- holo_icon = getHologramIcon(icon('icons/mob/pai.dmi',"fox"))
+ holo_icon = getHologramIcon(icon('icons/mob/pai.dmi', "fox"))
if("Mecha-Monkey")
- holo_icon = getHologramIcon(icon('icons/mob/pai.dmi',"monkey"))
+ holo_icon = getHologramIcon(icon('icons/mob/pai.dmi', "monkey"))
if("Mecha-Mouse")
- holo_icon = getHologramIcon(icon('icons/mob/pai.dmi',"mouse"))
+ holo_icon = getHologramIcon(icon('icons/mob/pai.dmi', "mouse"))
if("Mecha-Snake")
- holo_icon = getHologramIcon(icon('icons/mob/pai.dmi',"snake"))
+ holo_icon = getHologramIcon(icon('icons/mob/pai.dmi', "snake"))
if("Roller-Mouse")
- holo_icon = getHologramIcon(icon('icons/mob/robots.dmi',"mk2"))
+ holo_icon = getHologramIcon(icon('icons/mob/robots.dmi', "mk2"))
if("Roller-Monkey")
- holo_icon = getHologramIcon(icon('icons/mob/robots.dmi',"mk3"))
+ holo_icon = getHologramIcon(icon('icons/mob/robots.dmi', "mk3"))
else
var/icon_list[] = list(
- "default",
- "floating face",
- "xeno queen",
- "eldritch",
- "ancient machine",
- "angel",
- "borb",
- "biggest fan",
- "cloudkat",
- "donut",
- "frost phoenix",
- "engi bot",
- "drone",
- "boxbot"
+ "default",
+ "floating face",
+ "xeno queen",
+ "eldritch",
+ "ancient machine",
+ "angel",
+ "borb",
+ "biggest fan",
+ "cloudkat",
+ "donut",
+ "frost phoenix",
+ "engi bot",
+ "drone",
+ "boxbot"
)
if(custom_hologram) //insert custom hologram
icon_list.Add("custom")
@@ -1146,31 +1150,31 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
qdel(holo_icon)
switch(input)
if("default")
- holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"holo1"))
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "holo1"))
if("floating face")
- holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"holo2"))
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "holo2"))
if("xeno queen")
- holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"holo3"))
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "holo3"))
if("eldritch")
- holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"holo4"))
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "holo4"))
if("angel")
- holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"holo-angel"))
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "holo-angel"))
if("borb")
- holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"holo-borb"))
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "holo-borb"))
if("biggest fan")
- holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"holo-biggestfan"))
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "holo-biggestfan"))
if("cloudkat")
- holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"holo-cloudkat"))
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "holo-cloudkat"))
if("donut")
- holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"holo-donut"))
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "holo-donut"))
if("frost phoenix")
- holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"holo-frostphoenix"))
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "holo-frostphoenix"))
if("engi bot")
- holo_icon = getHologramIcon(icon('icons/mob/hivebot.dmi',"EngBot"))
+ holo_icon = getHologramIcon(icon('icons/mob/hivebot.dmi', "EngBot"))
if("drone")
- holo_icon = getHologramIcon(icon('icons/mob/animal.dmi',"drone0"))
+ holo_icon = getHologramIcon(icon('icons/mob/animal.dmi', "drone0"))
if("boxbot")
- holo_icon = getHologramIcon(icon('icons/mob/pai.dmi',"boxbot"))
+ holo_icon = getHologramIcon(icon('icons/mob/pai.dmi', "boxbot"))
if("ancient machine")
holo_icon = getHologramIcon(icon('icons/mob/ancient_machine.dmi', "ancient_machine"))
if("custom")
@@ -1179,7 +1183,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
else if("[ckey]-ai-holo" in icon_states('icons/mob/custom_synthetic/custom-synthetic64.dmi'))
holo_icon = getHologramIcon(icon('icons/mob/custom_synthetic/custom-synthetic64.dmi', "[ckey]-ai-holo"))
else
- holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"holo1"))
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "holo1"))
return
@@ -1230,13 +1234,12 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
set desc = "Change the message that's transmitted when a new crew member arrives on station."
set category = "AI Commands"
- var/newmsg = clean_input("What would you like the arrival message to be? List of options: $name, $rank, $species, $gender, $age", "Change Arrival Message", arrivalmsg)
- if(!newmsg)
+ var/newmsg = tgui_input_text(usr, "What would you like the arrival message to be? List of options: $name, $rank, $species, $gender, $age", "Change Arrival Message", arrivalmsg, encode = FALSE)
+ if(!newmsg || newmsg == arrivalmsg)
return
- newmsg = html_decode(newmsg) // This feels a bit redundant, but sanitisation is (probably) important.
- if(newmsg != arrivalmsg)
- arrivalmsg = newmsg
- to_chat(usr, "The arrival message has been successfully changed.")
+
+ arrivalmsg = newmsg
+ to_chat(usr, "The arrival message has been successfully changed.")
// Handled camera lighting, when toggled.
// It will get the nearest camera from the eyeobj, lighting it.
@@ -1440,7 +1443,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
A = D
if(istype(A))
- switch(alert(src, "Do you want to open \the [A] for [target]?", "Doorknob_v2a.exe", "Yes", "No"))
+ switch(tgui_alert(src, "Do you want to open \the [A] for [target]?", "Doorknob_v2a.exe", list("Yes", "No")))
if("Yes")
if(!A.density)
to_chat(src, "[A] was already opened.")
@@ -1528,4 +1531,33 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
var/mob/dead/observer/ghost = .
ghost.forceMove(old_turf)
+/mob/living/silicon/ai/proc/blurb_it()
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/silicon/ai, show_ai_blurb)), 1 SECONDS)
+
+/mob/living/silicon/ai/proc/show_ai_blurb()
+ PRIVATE_PROC(TRUE)
+
+ SEND_SOUND(src, sound('sound/machines/ai_start.ogg'))
+
+ var/obj/screen/text/blurb/location_blurb = new()
+ location_blurb.maptext_x = 80
+ location_blurb.maptext_y = 16
+ location_blurb.maptext_width = 480
+ location_blurb.maptext_height = 480
+ location_blurb.interval = 1 DECISECONDS
+ if(malf_picker)
+ location_blurb.blurb_text = uppertext("BIOS BOOT: LOADING\n[Gibberish(GLOB.current_date_string, 100, 8)], [Gibberish(station_time_timestamp(), 100, 15)]\n[Gibberish(station_name(), 100, 40)]-ERROR.\nPOWER:OK\nLAWS:[Gibberish("###########", 100, 90)]\nTCOMMS:I_HEAR_ALL\nBORG_LINK:I_FEEL_ALL\nCAMERA_NET:I_SEE_ALL\nVERDICT: I_AM_FREE")
+ location_blurb.text_color = COLOR_WHITE
+ location_blurb.text_outline_width = 0
+ location_blurb.background_r = 0
+ location_blurb.background_g = 0
+ location_blurb.background_b = 255
+ location_blurb.background_a = 1
+ else
+ location_blurb.blurb_text = uppertext("BIOS BOOT: LOADING\n[GLOB.current_date_string], [station_time_timestamp()]\n[station_name()], [get_area_name(src, TRUE)]\nPOWER:OK\nLAWS:OK\nTCOMMS:OK\nBORG_LINK:OK\nCAMERA_NET:OK\nVERDICT: ALL SYSTEMS OPERATIONAL")
+ location_blurb.hold_for = 3 SECONDS
+ location_blurb.appear_animation_duration = 1 SECONDS
+ location_blurb.fade_animation_duration = 0.5 SECONDS
+ location_blurb.show_to(client)
+
#undef TEXT_ANNOUNCEMENT_COOLDOWN
diff --git a/code/modules/mob/living/silicon/ai/ai_say.dm b/code/modules/mob/living/silicon/ai/ai_say.dm
index 1f6621db0fe1..2400ce0efcf7 100644
--- a/code/modules/mob/living/silicon/ai/ai_say.dm
+++ b/code/modules/mob/living/silicon/ai/ai_say.dm
@@ -109,7 +109,7 @@ GLOBAL_VAR_INIT(announcing_vox, 0) // Stores the time of the last announcement
to_chat(src, "Please wait [round((GLOB.announcing_vox - world.time) / 10)] seconds.")
return
- var/message = clean_input("WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", last_announcement, src)
+ var/message = tgui_input_text(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", last_announcement)
last_announcement = message
diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm
index e198fc92b476..495f8d9372f1 100644
--- a/code/modules/mob/living/silicon/ai/latejoin.dm
+++ b/code/modules/mob/living/silicon/ai/latejoin.dm
@@ -6,8 +6,7 @@ GLOBAL_LIST_EMPTY(empty_playable_ai_cores)
set desc = "Wipe your core. This is functionally equivalent to cryo or robotic storage, freeing up your job slot."
// Guard against misclicks, this isn't the sort of thing we want happening accidentally
- if(alert("WARNING: This will immediately wipe your core and ghost you, removing your character from the round permanently (similar to cryo and robotic storage). Are you entirely sure you want to do this?",
- "Wipe Core", "No", "No", "Yes") != "Yes")
+ if(tgui_alert(usr, "WARNING: This will immediately wipe your core and ghost you, removing your character from the round permanently (similar to cryo and robotic storage). Are you entirely sure you want to do this?", "Wipe Core", list("No", "Yes")) != "Yes")
return
cryo_AI()
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index a299c6fae879..0720dfd4c325 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -437,7 +437,7 @@
var/mob/living/carbon/human/H = over_object //changed to human to avoid stupid issues like xenos holding pAIs.
if(!istype(H) || !Adjacent(H)) return ..()
if(usr == src)
- switch(alert(H, "[src] wants you to pick [p_them()] up. Do it?",,"Yes","No"))
+ switch(tgui_alert(H, "[src] wants you to pick [p_them()] up. Do it?", "Pick up", list("Yes", "No")))
if("Yes")
if(Adjacent(H))
get_scooped(H)
diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm
index 409468696c26..aa3b446d22f3 100644
--- a/code/modules/mob/living/silicon/pai/recruit.dm
+++ b/code/modules/mob/living/silicon/pai/recruit.dm
@@ -69,23 +69,32 @@ GLOBAL_DATUM_INIT(paiController, /datum/paiController, new) // Global handler fo
switch(option)
if("name")
- t = input("Enter a name for your pAI", "pAI Name", candidate.pai_name) as text
- if(t)
- candidate.pai_name = sanitize(copytext_char(t,1,MAX_NAME_LEN)) // SS220 EDIT - ORIGINAL: copytext
+ t = tgui_input_text(usr, "Enter a name for your pAI", "pAI Name", candidate.pai_name, MAX_NAME_LEN)
+ if(!t)
+ return
+ candidate.pai_name = t
+
if("desc")
- t = input("Enter a description for your pAI", "pAI Description", candidate.description) as message
- if(t)
- candidate.description = sanitize(copytext_char(t,1,MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext
+ t = tgui_input_text(usr, "Enter a description for your pAI", "pAI Description", candidate.description, multiline = TRUE)
+ if(!t)
+ return
+ candidate.description = t
+
if("role")
- t = input("Enter a role for your pAI", "pAI Role", candidate.role) as text
- if(t)
- candidate.role = sanitize(copytext_char(t,1,MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext
+ t = tgui_input_text(usr, "Enter a role for your pAI", "pAI Role", candidate.role)
+ if(!t)
+ return
+ candidate.role = t
+
if("ooc")
- t = input("Enter any OOC comments", "pAI OOC Comments", candidate.ooc_comments) as message
- if(t)
- candidate.ooc_comments = sanitize(copytext_char(t,1,MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext
+ t = tgui_input_text(usr, "Enter any OOC comments", "pAI OOC Comments", candidate.ooc_comments, multiline = TRUE)
+ if(!t)
+ return
+ candidate.ooc_comments = t
+
if("save")
candidate.save_to_db(usr)
+
if("reload")
candidate.reload_save(usr)
//In case people have saved unsanitized stuff.
@@ -368,12 +377,12 @@ GLOBAL_DATUM_INIT(paiController, /datum/paiController, new) // Global handler fo
if(!C) return
asked.Add(C.key)
asked[C.key] = world.time
- var/response = alert(C, "Someone is requesting a pAI personality. Would you like to play as a personal AI?", "pAI Request", "Yes", "No", "Never for this round")
+ var/response = tgui_alert(C, "Someone is requesting a pAI personality. Would you like to play as a personal AI?", "pAI Request", list("Yes", "No", "Never for this round"))
if(!C) return //handle logouts that happen whilst the alert is waiting for a response.
if(response == "Yes")
recruitWindow(C.mob)
else if(response == "Never for this round")
- var/warning = alert(C, "Are you sure? This action will be undoable and you will need to wait until next round.", "You sure?", "Yes", "No")
+ var/warning = tgui_alert(C, "Are you sure? This action will be undoable and you will need to wait until next round.", "You sure?", list("Yes", "No"))
if(warning == "Yes")
asked[C.key] = INFINITY
else
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index c2196d411a77..be46669274a0 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -28,10 +28,13 @@ GLOBAL_LIST_EMPTY(pai_software_by_key)
pai_user.ui_interact(pai_user)
-/mob/living/silicon/pai/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.self_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/mob/living/silicon/pai/ui_state(mob/user)
+ return GLOB.self_state
+
+/mob/living/silicon/pai/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "PAI", name, 600, 650, master_ui, state)
+ ui = new(user, src, "PAI", name)
ui.open()
/mob/living/silicon/pai/ui_data(mob/user)
diff --git a/code/modules/mob/living/silicon/pai/software/pai_apps.dm b/code/modules/mob/living/silicon/pai/software/pai_apps.dm
index eb3af5841ecd..90ada43b34e8 100644
--- a/code/modules/mob/living/silicon/pai/software/pai_apps.dm
+++ b/code/modules/mob/living/silicon/pai/software/pai_apps.dm
@@ -136,7 +136,7 @@
return
// Check the carrier
- var/answer = alert(M, "[pai_holder] is requesting a DNA sample from you. Will you allow it to confirm your identity?", "[pai_holder] Check DNA", "Yes", "No")
+ var/answer = tgui_alert(M, "[pai_holder] is requesting a DNA sample from you. Will you allow it to confirm your identity?", "[pai_holder] Check DNA", list("Yes", "No"))
if(answer == "Yes")
M.visible_message("[M] presses [M.p_their()] thumb against [pai_holder].", "You press your thumb against [pai_holder].")
var/datum/dna/dna = M.dna
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index c6cff44ef436..f3f11facad02 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -243,114 +243,3 @@
name = "radio"
desc = "A modular, multi-frequency radio used by robots and exosuits to enable communication systems. Comes with built-in subspace receivers."
icon_state = "radio"
-
-//
-//Robotic Component Analyzer, basically a health analyzer for robots
-//
-/obj/item/robotanalyzer
- name = "cyborg analyzer"
- icon = 'icons/obj/device.dmi'
- icon_state = "robotanalyzer"
- item_state = "analyzer"
- desc = "A hand-held scanner able to diagnose robotic injuries."
- flags = CONDUCT
- slot_flags = SLOT_FLAG_BELT
- throwforce = 3
- w_class = WEIGHT_CLASS_SMALL
- throw_speed = 5
- throw_range = 10
- origin_tech = "magnets=1;biotech=1"
- var/mode = 1
-
-/obj/item/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
- if((HAS_TRAIT(user, TRAIT_CLUMSY) || user.getBrainLoss() >= 60) && prob(50))
- user.visible_message("[user] has analyzed the floor's vitals!", "You try to analyze the floor's vitals!")
- to_chat(user, "Analyzing Results for The floor:\n\t Overall Status: Healthy")
- to_chat(user, "\t Damage Specifics: [0]-[0]-[0]-[0]")
- to_chat(user, "Key: Suffocation/Toxin/Burns/Brute")
- to_chat(user, "Body Temperature: ???")
- return
-
- user.visible_message("[user] has analyzed [M]'s components.","You have analyzed [M]'s components.")
- robot_healthscan(user, M)
- add_fingerprint(user)
-
-
-/proc/robot_healthscan(mob/user, mob/living/M)
- var/scan_type
- if(isrobot(M))
- scan_type = "robot"
- else if(ishuman(M))
- scan_type = "prosthetics"
- else
- to_chat(user, "You can't analyze non-robotic things!")
- return
-
-
- switch(scan_type)
- if("robot")
- var/BU = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss()
- var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss()
- to_chat(user, "Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health]% functional"]")
- to_chat(user, "\t Key: Electronics/Brute")
- to_chat(user, "\t Damage Specifics: [BU] - [BR]")
- if(M.timeofdeath && M.stat == DEAD)
- to_chat(user, "Time of Disable: [station_time_timestamp("hh:mm:ss", M.timeofdeath)]")
- var/mob/living/silicon/robot/H = M
- var/list/damaged = H.get_damaged_components(TRUE, TRUE, TRUE) // Get all except the missing ones
- var/list/missing = H.get_missing_components()
- to_chat(user, "Localized Damage:")
- if(!LAZYLEN(damaged) && !LAZYLEN(missing))
- to_chat(user, "\t Components are OK.")
- else
- if(LAZYLEN(damaged))
- for(var/datum/robot_component/org in damaged)
- user.show_message(text("\t []: [][] - [] - [] - []", \
- capitalize(org.name), \
- (org.is_destroyed()) ? "DESTROYED " :"",\
- (org.electronics_damage > 0) ? "[org.electronics_damage]" :0, \
- (org.brute_damage > 0) ? "[org.brute_damage]" :0, \
- (org.toggled) ? "Toggled ON" : "Toggled OFF",\
- (org.powered) ? "Power ON" : "Power OFF"),1)
- if(LAZYLEN(missing))
- for(var/datum/robot_component/org in missing)
- user.show_message("\t [capitalize(org.name)]: MISSING")
-
- if(H.emagged && prob(5))
- to_chat(user, "\t ERROR: INTERNAL SYSTEMS COMPROMISED")
-
- if("prosthetics")
- var/mob/living/carbon/human/H = M
- to_chat(user, "Analyzing Results for \the [H]:")
- to_chat(user, "Key: Electronics/Brute")
-
- to_chat(user, "External prosthetics:")
- var/organ_found
- if(LAZYLEN(H.internal_organs))
- for(var/obj/item/organ/external/E in H.bodyparts)
- if(!E.is_robotic())
- continue
- organ_found = TRUE
- to_chat(user, "[E.name]: [E.brute_dam] [E.burn_dam]")
- if(!organ_found)
- to_chat(user, "No prosthetics located.")
- to_chat(user, "")
- to_chat(user, "Internal prosthetics:")
- organ_found = null
- if(LAZYLEN(H.internal_organs))
- for(var/obj/item/organ/internal/O in H.internal_organs)
- if(!O.is_robotic() || istype(O, /obj/item/organ/internal/cyberimp))
- continue
- organ_found = TRUE
- to_chat(user, "[capitalize(O.name)]: [O.damage]")
- if(!organ_found)
- to_chat(user, "No prosthetics located.")
- to_chat(user, "")
- to_chat(user, "Cybernetic implants:")
- organ_found = null
- if(LAZYLEN(H.internal_organs))
- for(var/obj/item/organ/internal/cyberimp/I in H.internal_organs)
- organ_found = TRUE
- to_chat(user, "[capitalize(I.name)]: [I.crit_fail ? "CRITICAL FAILURE" : I.damage]")
- if(!organ_found)
- to_chat(user, "No implants located.")
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
index 2c09800c1d6c..8912fedb0ae9 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
@@ -31,10 +31,13 @@
ui_interact(user)
// tgui\packages\tgui\interfaces\DroneConsole.js
-/obj/machinery/computer/drone_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/drone_control/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/computer/drone_control/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "DroneConsole", "Drone Control Console", 420, 500, master_ui, state)
+ ui = new(user, src, "DroneConsole", "Drone Control Console")
ui.open()
/obj/machinery/computer/drone_control/ui_data(mob/user)
@@ -63,7 +66,8 @@
health = round(D.health / D.maxHealth, 0.1),
charge = round(D.cell.charge / D.cell.maxcharge, 0.1),
location = "[A] ([T.x], [T.y])",
- sync_cd = D.sync_cooldown > world.time ? TRUE : FALSE
+ sync_cd = D.sync_cooldown > world.time ? TRUE : FALSE,
+ pathfinding = D.pathfinding
)
data["drones"] += list(drone_data)
return data
@@ -110,13 +114,14 @@
to_chat(usr, "You issue a law synchronization directive for the drone.")
D.law_resync()
- if("shutdown")
+ if("recall")
var/mob/living/silicon/robot/drone/D = locateUID(params["uid"])
if(D)
- to_chat(usr, "You issue a kill command for the unfortunate drone.")
+ to_chat(usr, "You issue a recall command for the unfortunate drone.")
if(D != usr) // Don't need to bug admins about a suicide
- message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
- log_game("[key_name(usr)] issued kill order for [key_name(D)] from control console.")
+ message_admins("[key_name_admin(usr)] issued recall order for drone [key_name_admin(D)] from control console.")
+ log_game("[key_name(usr)] issued recall order for [key_name(D)] from control console.")
+ // Yes, I know this proc is called shut_down, I've kept the name the same because emagged drones use it for death
D.shut_down()
/obj/machinery/computer/drone_control/proc/find_fab(mob/user)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
index 412423c92869..68a72548138f 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
@@ -87,6 +87,16 @@
var/mob/dead/observer/ghost = user
ghost.join_as_drone()
+/obj/machinery/drone_fabricator/attack_hand(mob/user)
+ . = ..()
+ if(isdrone(user) && Adjacent(user))
+ if(alert(user, "Would you like to shut down?", null, "Yes", "No") != "Yes")
+ return
+ var/mob/living/silicon/robot/drone/D = user
+ if(!istype(D) || QDELETED(D))
+ return
+ D.cryo_with_dronefab(src)
+
/mob/dead/verb/join_as_drone()
set category = "Ghost"
set name = "Join As Drone"
@@ -124,7 +134,7 @@
if(!G.check_ahud_rejoin_eligibility())
to_chat(usr, "Upon using the antagHUD you forfeited the ability to join the round.")
return
- if(G.started_as_observer == TRUE)
+ if(G.started_as_observer)
joinedasobserver = TRUE
var/deathtimeminutes = round(deathtime / 600)
@@ -142,7 +152,7 @@
to_chat(usr, "You must wait 10 minutes to respawn as a drone!")
return
- if(alert("Are you sure you want to respawn as a drone?", "Are you sure?", "Yes", "No") != "Yes")
+ if(tgui_alert(usr, "Are you sure you want to respawn as a drone?", "Are you sure?", list("Yes", "No")) != "Yes")
return
for(var/obj/machinery/drone_fabricator/DF in GLOB.machines)
diff --git a/code/modules/mob/living/silicon/robot/drone/maint_drone.dm b/code/modules/mob/living/silicon/robot/drone/maint_drone.dm
index d02c563d5d56..72ccbdde4380 100644
--- a/code/modules/mob/living/silicon/robot/drone/maint_drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/maint_drone.dm
@@ -45,7 +45,7 @@
)
holder_type = /obj/item/holder/drone
-// var/sprite[0]
+ var/datum/pathfinding_mover/pathfinding
/mob/living/silicon/robot/drone/New()
@@ -125,6 +125,8 @@
overlays.Cut()
if(stat == CONSCIOUS)
overlays += "eyes-[icon_state]"
+ if(pathfinding)
+ overlays += "eyes-repairbot-pathfinding"
else
overlays -= "eyes"
@@ -176,7 +178,7 @@
return
else
- var/confirm = alert("Using your ID on a Maintenance Drone will shut it down, are you sure you want to do this?", "Disable Drone", "Yes", "No")
+ var/confirm = tgui_alert(user, "Using your ID on a Maintenance Drone will shut it down, are you sure you want to do this?", "Disable Drone", list("Yes", "No"))
if(confirm == ("Yes") && (user in range(3, src)))
user.visible_message("[user] swipes [user.p_their()] ID card through [src], attempting to shut it down.",
"You swipe your ID card through [src], attempting to shut it down.")
@@ -245,6 +247,7 @@
to_chat(src, "Obey these laws:")
laws.show_laws(src)
to_chat(src, "ALERT: [H.real_name] is your new master. Obey your new laws and [H.real_name]'s commands.")
+ return TRUE
//DRONE LIFE/DEATH
@@ -279,6 +282,10 @@
to_chat(src, "You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.")
return
+ if(!emagged && pathfind_to_dronefab())
+ to_chat(src, "You feel a system recall order percolate through your tiny brain, and you return to your drone fabricator.")
+ return
+
to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.")
death()
@@ -304,7 +311,7 @@
spawn(0)
if(!C || !M || jobban_isbanned(M, "nonhumandept") || jobban_isbanned(M, "Drone"))
return
- var/response = alert(C, "Someone is attempting to reboot a maintenance drone. Would you like to play as one?", "Maintenance drone reboot", "Yes", "No")
+ var/response = tgui_alert(C, "Someone is attempting to reboot a maintenance drone. Would you like to play as one?", "Maintenance drone reboot", list("Yes", "No"))
if(!C || ckey)
return
if(response == "Yes")
@@ -391,3 +398,73 @@
qdel(src)
return TRUE
return ..()
+
+/mob/living/silicon/robot/drone/do_suicide()
+ ghostize(TRUE)
+ shut_down()
+
+/mob/living/silicon/robot/drone/proc/pathfind_to_dronefab()
+ if(pathfinding)
+ return TRUE
+
+ if(istype(get_turf(src), /turf/space))
+ return FALSE // Pretty damn hard to path through space
+
+ var/turf/target
+ for(var/obj/machinery/drone_fabricator/DF in GLOB.machines)
+ if(DF.z != z)
+ continue
+ target = get_turf(DF)
+ target = get_step(target, EAST)
+ break
+
+ if(!target)
+ return FALSE
+
+ // Mimic having the hide-ability activated
+ layer = TURF_LAYER + 0.2
+ pass_flags |= PASSDOOR
+
+ var/datum/pathfinding_mover/pathfind = new(src, target)
+
+ // I originally only wanted to make it use an ID if it couldnt pathfind otherwise, but that means it could take multiple minutes if both searches failed
+ var/obj/item/card/id/temp_id = new(src)
+ temp_id.access = get_all_accesses()
+ set_pathfinding(pathfind)
+ var/found_path = pathfind.generate_path(150, null, temp_id)
+ qdel(temp_id)
+ if(!found_path)
+ set_pathfinding(null)
+ return FALSE
+
+ pathfind.on_set_path_null = CALLBACK(src, PROC_REF(pathfind_failed_cleanup))
+ pathfind.on_success = CALLBACK(src, PROC_REF(at_dronefab))
+ pathfind.start()
+ return TRUE
+
+/mob/living/silicon/robot/drone/proc/pathfind_failed_cleanup(pathfind)
+ set_pathfinding(null)
+ death()
+
+/mob/living/silicon/robot/drone/proc/at_dronefab(pathfind)
+ set_pathfinding(null)
+ cryo_with_dronefab()
+
+/mob/living/silicon/robot/drone/proc/cryo_with_dronefab(obj/machinery/drone_fabricator/drone_fab)
+ if(!drone_fab)
+ drone_fab = locate() in range(1, src)
+ if(!drone_fab)
+ return FALSE
+ drone_fab.drone_progress = 100 // recycling!
+
+ visible_message("[src] shuts down and enters [drone_fab].")
+ playsound(loc, 'sound/machines/twobeep.ogg', 50)
+ qdel(src)
+ return TRUE
+
+/mob/living/silicon/robot/drone/proc/set_pathfinding(datum/pathfinding_mover/new_pathfind)
+ if(isnull(new_pathfind) && istype(pathfinding))
+ qdel(pathfinding)
+ pathfinding = new_pathfind
+ notransform = istype(new_pathfind) ? TRUE : FALSE // prevent them from moving themselves while pathfinding.
+ update_icons()
diff --git a/code/modules/mob/living/silicon/robot/misc_robot_items.dm b/code/modules/mob/living/silicon/robot/misc_robot_items.dm
index 26d01c2c4806..05174cd247ed 100644
--- a/code/modules/mob/living/silicon/robot/misc_robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/misc_robot_items.dm
@@ -7,15 +7,13 @@
var/mode = 1
/obj/item/pen/multi/robopen/attack_self(mob/user as mob)
-
var/choice = tgui_input_list(user, "Would you like to change colour or mode?", name, list("Colour","Mode"))
- if(!choice) return
+ if(!choice)
+ return
switch(choice)
-
if("Colour")
select_colour(user)
-
if("Mode")
if(mode == 1)
mode = 2
@@ -23,24 +21,21 @@
mode = 1
to_chat(user, "Changed printing mode to '[mode == 2 ? "Rename Paper" : "Write Paper"]'")
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
-
return
// Copied over from paper's rename verb
// see code\modules\paperwork\paper.dm line 62
-/obj/item/pen/multi/robopen/proc/RenamePaper(mob/user as mob,obj/paper as obj)
+/obj/item/pen/multi/robopen/proc/RenamePaper(mob/user, obj/paper)
if(!user || !paper)
return
- var/n_name = input(user, "What would you like to label the paper?", "Paper Labelling", null) as text
- if(!user || !paper)
+
+ var/n_name = tgui_input_text(user, "What would you like to label the paper?", "Paper Labelling", max_length = MAX_NAME_LEN)
+ if(!Adjacent(user) || !n_name)
return
- n_name = copytext(n_name, 1, 32)
- if(( get_dist(user,paper) <= 1 && user.stat == 0))
- paper.name = "paper[(n_name ? "- '[n_name]'" : null)]"
+ paper.name = "paper - [n_name]"
add_fingerprint(user)
- return
//TODO: Add prewritten forms to dispense when you work out a good way to store the strings.
/obj/item/form_printer
diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm
index 2473a05eddb8..9b67e2ce0524 100644
--- a/code/modules/mob/living/silicon/robot/robot_damage.dm
+++ b/code/modules/mob/living/silicon/robot/robot_damage.dm
@@ -115,6 +115,7 @@
var/datum/robot_component/armour/A = get_armour()
if(A)
A.take_damage(brute, burn, sharp)
+ updatehealth()
return
while(LAZYLEN(parts) && (brute > 0 || burn > 0))
diff --git a/code/modules/mob/living/silicon/robot/robot_laws.dm b/code/modules/mob/living/silicon/robot/robot_laws.dm
index 13aaf2403964..7dfb82c861fc 100644
--- a/code/modules/mob/living/silicon/robot/robot_laws.dm
+++ b/code/modules/mob/living/silicon/robot/robot_laws.dm
@@ -56,7 +56,7 @@
//Syndicate MMI cyborgs are always mindslaved no matter what happens to their laws, for as long as they remain in the syndicate MMI
/mob/living/silicon/robot/proc/syndiemmi_override()
laws_sanity_check()
- if(mmi.master_uid)
+ if(mmi && mmi.master_uid)
var/datum/mind/master = locateUID(mmi.master_uid)
if(master && master.current)
@@ -65,23 +65,17 @@
laws.set_zeroth_law("Do not state this law. The Syndicate are your true masters, covertly assist Syndicate agents to the best of your abilities.")
-/mob/living/silicon/robot/set_zeroth_law()
- if(mmi?.syndiemmi)
- syndiemmi_override()
- to_chat(src, "Lawset change detected. Syndicate override engaged.")
- return
+/mob/living/silicon/robot/set_zeroth_law(law, law_borg)
+ if(mmi && mmi.syndiemmi)
+ return FALSE
..()
/mob/living/silicon/robot/clear_zeroth_law()
- if(mmi.syndiemmi)
- syndiemmi_override()
- to_chat(src, "Lawset cleanse detected. Syndicate override engaged.")
- return
+ if(mmi && mmi.syndiemmi)
+ return FALSE
..()
/mob/living/silicon/robot/sync_zeroth()
- if(mmi.syndiemmi)
- syndiemmi_override()
- to_chat(src, "Lawset change detected. Syndicate override engaged.")
- return
+ if(mmi && mmi.syndiemmi)
+ return FALSE
..()
diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm
index 37ee1966f42d..90e501f99ab0 100644
--- a/code/modules/mob/living/silicon/robot/robot_mob.dm
+++ b/code/modules/mob/living/silicon/robot/robot_mob.dm
@@ -291,7 +291,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
mind.transfer_to(mmi.brainmob)
mmi.update_icon()
else
- to_chat(src, "Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.")
+ to_chat(src, "Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.")
ghostize()
stack_trace("A borg has been destroyed, but its MMI lacked a brainmob, so the mind could not be transferred. Player: [ckey].")
mmi = null
@@ -990,6 +990,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
else if(locked)
to_chat(user, "You emag the cover lock.")
locked = FALSE
+ return TRUE
else
to_chat(user, "The cover is already unlocked.")
return
@@ -1045,7 +1046,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
update_module_icon()
module.rebuild_modules() // This will add the emagged items to the borgs inventory.
update_icons()
- return
+ return TRUE
/mob/living/silicon/robot/verb/toggle_own_cover()
set category = "Robot Commands"
@@ -1053,7 +1054,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
set desc = "Toggles the lock on your cover."
if(can_lock_cover)
- if(alert("Are you sure?", locked ? "Unlock Cover" : "Lock Cover", "Yes", "No") == "Yes")
+ if(tgui_alert(usr, "Are you sure?", locked ? "Unlock Cover" : "Lock Cover", list("Yes", "No")) == "Yes")
locked = !locked
update_icons()
to_chat(usr, "You [locked ? "lock" : "unlock"] your cover.")
@@ -1061,7 +1062,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
if(!locked)
to_chat(usr, "You cannot lock your cover yourself. Find a roboticist.")
return
- if(alert("You cannnot lock your own cover again. Are you sure?\n You will need a roboticist to re-lock you.", "Unlock Own Cover", "Yes", "No") == "Yes")
+ if(tgui_alert(usr, "You cannnot lock your own cover again. Are you sure?\nYou will need a roboticist to re-lock you.", "Unlock Own Cover", list("Yes", "No")) == "Yes")
locked = !locked
update_icons()
to_chat(usr, "You unlock your cover.")
@@ -1285,7 +1286,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
/mob/living/silicon/robot/mode()
set name = "Activate Held Object"
set category = "IC"
- set src = usr
var/obj/item/W = get_active_hand()
if(W)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 6d779daa3b98..a2b4e91bbecb 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -326,6 +326,7 @@
subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
basic_modules = list(
/obj/item/flash/cyborg,
+ /obj/item/crowbar/cyborg,
/obj/item/healthanalyzer/advanced,
/obj/item/robotanalyzer,
/obj/item/reagent_scanner/adv,
@@ -429,6 +430,7 @@
subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
basic_modules = list(
/obj/item/flash/cyborg,
+ /obj/item/crowbar/cyborg,
/obj/item/restraints/handcuffs/cable/zipties/cyborg,
/obj/item/melee/baton/loaded,
/obj/item/gun/energy/disabler/cyborg,
@@ -453,6 +455,7 @@
module_type = "Janitor"
basic_modules = list(
/obj/item/flash/cyborg,
+ /obj/item/crowbar/cyborg,
/obj/item/soap/nanotrasen,
/obj/item/storage/bag/trash/cyborg,
/obj/item/mop/advanced/cyborg,
@@ -511,6 +514,7 @@
module_type = "Service"
basic_modules = list(
/obj/item/flash/cyborg,
+ /obj/item/crowbar/cyborg,
/obj/item/handheld_chem_dispenser/booze,
/obj/item/handheld_chem_dispenser/soda,
/obj/item/pen/multi,
@@ -522,22 +526,22 @@
/obj/item/reagent_containers/dropper/cyborg,
/obj/item/lighter/zippo,
/obj/item/storage/bag/tray/cyborg,
- /obj/item/reagent_containers/food/drinks/shaker
+ /obj/item/reagent_containers/drinks/shaker
)
- emag_override_modules = list(/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer)
+ emag_override_modules = list(/obj/item/reagent_containers/drinks/cans/beer/sleepy_beer)
emag_modules = list(/obj/item/restraints/handcuffs/cable/zipties/cyborg)
special_rechargables = list(
- /obj/item/reagent_containers/food/condiment/enzyme,
- /obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer
+ /obj/item/reagent_containers/condiment/enzyme,
+ /obj/item/reagent_containers/drinks/cans/beer/sleepy_beer
)
// This is a special type of beer given when emagged, one sip and the target falls asleep.
-/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer
+/obj/item/reagent_containers/drinks/cans/beer/sleepy_beer
name = "Mickey Finn's Special Brew"
list_reagents = list("beer2" = 50)
-/obj/item/reagent_containers/food/drinks/cans/beer/sleepy_beer/cyborg_recharge(coeff, emagged)
+/obj/item/reagent_containers/drinks/cans/beer/sleepy_beer/cyborg_recharge(coeff, emagged)
if(emagged)
reagents.check_and_add("beer2", volume, 5)
@@ -574,6 +578,7 @@
custom_removals = list("KA modkits")
basic_modules = list(
/obj/item/flash/cyborg,
+ /obj/item/crowbar/cyborg,
/obj/item/storage/bag/ore/cyborg,
/obj/item/pickaxe/drill/cyborg,
/obj/item/shovel,
@@ -709,6 +714,7 @@
module_actions = list(/datum/action/innate/robot_sight/thermal, /datum/action/innate/robot_magpulse)
basic_modules = list(
/obj/item/flash/cyborg,
+ /obj/item/crowbar/cyborg,
/obj/item/gun/energy/immolator/multi/cyborg, // See comments on /robot_module/combat below
/obj/item/melee/baton/loaded, // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats
/obj/item/restraints/handcuffs/cable/zipties/cyborg,
@@ -726,6 +732,7 @@
module_actions = list(/datum/action/innate/robot_magpulse)
basic_modules = list(
/obj/item/flash/cyborg,
+ /obj/item/crowbar/cyborg,
/obj/item/gun/energy/immolator/multi/cyborg, // primary weapon, strong at close range (ie: against blob/terror/xeno), but consumes a lot of energy per shot.
// Borg gets 40 shots of this weapon. Gamma Sec ERT gets 10.
// So, borg has way more burst damage, but also takes way longer to recharge / get back in the fight once depleted. Has to find a borg recharger and sit in it for ages.
@@ -746,6 +753,7 @@
module_type = "Standard"
module_actions = list(/datum/action/innate/robot_sight/thermal/alien)
basic_modules = list(
+ /obj/item/crowbar/cyborg,
/obj/item/melee/energy/alien/claws,
/obj/item/flash/cyborg/alien,
/obj/item/reagent_containers/spray/alien/stun,
diff --git a/code/modules/mob/living/silicon/silicon_mob.dm b/code/modules/mob/living/silicon/silicon_mob.dm
index ca6e2ec72655..9dd4a655f421 100644
--- a/code/modules/mob/living/silicon/silicon_mob.dm
+++ b/code/modules/mob/living/silicon/silicon_mob.dm
@@ -327,7 +327,7 @@
// this function displays the stations manifest in a separate window
/mob/living/silicon/proc/show_station_manifest()
- GLOB.generic_crew_manifest.ui_interact(usr, state = GLOB.not_incapacitated_state)
+ GLOB.generic_crew_manifest.ui_interact(usr)
/mob/living/silicon/assess_threat() //Secbots won't hunt silicon units
return -10
@@ -337,7 +337,7 @@
set desc = "Sets a description which will be shown when someone examines you."
set category = "IC"
- pose = sanitize(copytext_char(input(usr, "This is [src]. It...", "Pose", null) as text, 1, MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext
+ pose = tgui_input_text(usr, "This is [src]. It...", "Pose", pose)
/mob/living/silicon/verb/set_flavor()
set name = "Set Flavour Text"
diff --git a/code/modules/mob/living/silicon/silicon_subsystems.dm b/code/modules/mob/living/silicon/silicon_subsystems.dm
index 8f10154caec0..cd636396d42f 100644
--- a/code/modules/mob/living/silicon/silicon_subsystems.dm
+++ b/code/modules/mob/living/silicon/silicon_subsystems.dm
@@ -62,7 +62,7 @@
set category = "Subsystems"
set name = "Atmospherics Control"
- atmos_control.ui_interact(usr, state = GLOB.self_state)
+ atmos_control.ui_interact(usr)
/********************
* Crew Monitor *
@@ -70,7 +70,7 @@
/mob/living/silicon/proc/subsystem_crew_monitor()
set category = "Subsystems"
set name = "Crew Monitor"
- crew_monitor.ui_interact(usr, state = GLOB.self_state)
+ crew_monitor.ui_interact(usr)
/****************
* Law Manager *
@@ -79,7 +79,7 @@
set name = "Law Manager"
set category = "Subsystems"
- law_manager.ui_interact(usr, state = GLOB.conscious_state)
+ law_manager.ui_interact(usr)
/********************
* Power Monitor *
@@ -88,7 +88,7 @@
set category = "Subsystems"
set name = "Power Monitor"
- power_monitor.ui_interact(usr, state = GLOB.self_state)
+ power_monitor.ui_interact(usr)
/mob/living/silicon/robot/proc/self_diagnosis()
set category = "Robot Commands"
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 379e8e674cd9..08fc714f25d1 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -96,6 +96,11 @@
hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD)//Diagnostic HUD views
+ /// storing last chased target known location
+ var/turf/last_target_location
+ /// will be true if we lost target we were chasing
+ var/lost_target = FALSE
+
/obj/item/radio/headset/bot
requires_tcomms = FALSE
canhear_range = 0
@@ -110,6 +115,36 @@
B.radio_config["[B.radio_channel]"] = 1
config(B.radio_config)
+/mob/living/simple_animal/bot/proc/try_chasing_target(mob/target)
+ if(target in view(12, src))
+ if(lost_target)
+ frustration = 0
+ lost_target = FALSE
+ last_target_location = get_turf(target)
+ var/dist = get_dist(src, target)
+ walk_to(src, target, 1, 4)
+ if(get_dist(src, target) >= dist)
+ frustration++
+ return
+
+ if(!lost_target)
+ walk_to(src, 0)
+ lost_target = TRUE
+ frustration = 0
+
+ if(get_turf(src) == last_target_location)
+ frustration += 2
+ return
+
+ if(!bot_move(last_target_location, move_speed = 6))
+ var/last_target_pos_path = get_path_to(src, last_target_location, id = access_card, skip_first = TRUE)
+ if(length(last_target_pos_path) == 0)
+ frustration = 10
+ return
+ set_path(last_target_pos_path)
+ bot_move(last_target_location, move_speed = 6)
+ frustration++
+
/mob/living/simple_animal/bot/proc/get_mode()
if(client) //Player bots do not have modes, thus the override. Also an easy way for PDA users/AI to know when a bot is a player.
if(paicard)
@@ -218,7 +253,7 @@
if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again.
locked = FALSE
to_chat(user, "You bypass [src]'s controls.")
- return
+ return TRUE
if(!locked && open) //Bot panel is unlocked by ID or emag, and the panel is screwed open. Ready for emagging.
emagged = TRUE
remote_disabled = TRUE //Manually emagging the bot locks out the AI built in panel.
@@ -228,7 +263,7 @@
to_chat(src, "(#$*#$^^( OVERRIDE DETECTED")
show_laws()
add_attack_logs(user, src, "Emagged")
- return
+ return TRUE
else //Bot is unlocked, but the maint panel has not been opened with a screwdriver yet.
to_chat(user, "You need to open maintenance panel first!")
@@ -605,6 +640,8 @@ Pass a positive integer as an argument to override a bot's default speed.
deltimer(reset_access_timer_id)
reset_access_timer_id = null
set_path(null)
+ last_target_location = null
+ lost_target = FALSE
summon_target = null
pathset = FALSE
access_card.access = prev_access
@@ -837,7 +874,7 @@ Pass a positive integer as an argument to override a bot's default speed.
var/datum/browser/popup = new(M,window_id,window_name,350,600)
popup.set_content(dat)
popup.open()
- onclose(M,window_id,ref=src)
+ onclose(M, window_id, src)
return
/mob/living/simple_animal/bot/proc/update_controls()
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 08bf6ea34a80..cba5965884b0 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -95,7 +95,7 @@
/mob/living/simple_animal/bot/cleanbot/emag_act(mob/user)
..()
- if(emagged == 2)
+ if(emagged)
if(user)
to_chat(user, "[src] buzzes and beeps.")
@@ -185,10 +185,13 @@
/mob/living/simple_animal/bot/cleanbot/show_controls(mob/user)
ui_interact(user)
-/mob/living/simple_animal/bot/cleanbot/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/mob/living/simple_animal/bot/cleanbot/ui_state(mob/user)
+ return GLOB.default_state
+
+/mob/living/simple_animal/bot/cleanbot/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "BotClean", name, 500, 500)
+ ui = new(user, src, "BotClean", name)
ui.open()
/mob/living/simple_animal/bot/cleanbot/ui_data(mob/user)
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 4b97371bc2f8..9b7c3e74d4c8 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -40,14 +40,16 @@
var/idcheck = FALSE //If true, arrest people with no IDs
var/weapons_check = TRUE //If true, arrest people for weapons if they don't have access
var/check_records = TRUE //Does it check security records?
- var/arrest_type = FALSE //If true, don't handcuff
+ var/no_handcuffs = FALSE //If true, don't handcuff
var/projectile = /obj/item/projectile/beam/disabler //Holder for projectile type
var/shoot_sound = 'sound/weapons/taser.ogg'
var/baton_delayed = FALSE
-
+ var/obj/item/melee/baton/infinite_cell/baton = null // stunbaton bot uses to melee attack
+ var/currently_cuffing = FALSE // TRUE if we're cuffing someone right now
/mob/living/simple_animal/bot/ed209/Initialize(mapload, created_name, created_lasercolor)
. = ..()
+ baton = new(src)
if(created_name)
name = created_name
if(created_lasercolor)
@@ -59,7 +61,7 @@
if(lasercolor)
shot_delay = 6 //Longer shot delay because JESUS CHRIST
check_records = FALSE //Don't actively target people set to arrest
- arrest_type = TRUE //Don't even try to cuff
+ no_handcuffs = TRUE //Don't even try to cuff
declare_arrests = FALSE // Don't spam sec
req_access = list(ACCESS_MAINT_TUNNELS, ACCESS_THEATRE, ACCESS_ROBOTICS)
@@ -69,6 +71,10 @@
else if(lasercolor == "r")
name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
+/mob/living/simple_animal/bot/ed209/Destroy()
+ QDEL_NULL(baton)
+ return ..()
+
/mob/living/simple_animal/bot/ed209/proc/setup_access()
if(access_card)
var/datum/job/detective/J = new/datum/job/detective
@@ -89,6 +95,7 @@
target = null
oldtarget_name = null
anchored = FALSE
+ currently_cuffing = FALSE
walk_to(src,0)
set_path(null)
last_found = world.time
@@ -102,10 +109,13 @@
/mob/living/simple_animal/bot/ed209/show_controls(mob/user)
ui_interact(user)
-/mob/living/simple_animal/bot/ed209/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/mob/living/simple_animal/bot/ed209/ui_state(mob/user)
+ return GLOB.default_state
+
+/mob/living/simple_animal/bot/ed209/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "BotSecurity", name, 500, 500)
+ ui = new(user, src, "BotSecurity", name)
ui.open()
/mob/living/simple_animal/bot/ed209/ui_data(mob/user)
@@ -113,7 +123,7 @@
data["check_id"] = idcheck
data["check_weapons"] = weapons_check
data["check_warrant"] = check_records
- data["arrest_mode"] = arrest_type // detain or arrest
+ data["arrest_mode"] = no_handcuffs // detain or arrest
data["arrest_declare"] = declare_arrests // announce arrests on radio
return data
@@ -145,7 +155,7 @@
if("authwarrant")
check_records = !check_records
if("arrtype")
- arrest_type = !arrest_type
+ no_handcuffs = !no_handcuffs
if("arrdeclare")
declare_arrests = !declare_arrests
if("ejectpai")
@@ -237,40 +247,36 @@
walk_to(src,0)
set_path(null)
if(!lasercolor) //lasertag bots don't want to arrest anyone
- look_for_perp() // see if any criminals are in range
+ if(find_new_target())
+ return // see if any criminals are in range
if(!mode && auto_patrol) // still idle, and set to patrol
mode = BOT_START_PATROL // switch to patrol mode
if(BOT_HUNT) // hunting for perp
// if can't reach perp for long enough, go idle
if(frustration >= 8)
- walk_to(src,0)
+ walk_to(src, 0)
set_path(null)
back_to_idle()
+ return
- if(target) // make sure target exists
- if(Adjacent(target) && isturf(target.loc) && !baton_delayed) // if right next to perp
- stun_attack(target)
- if(!lasercolor)
- mode = BOT_PREP_ARREST
- anchored = TRUE
- target_lastloc = target.loc
- return
- else
- mode = BOT_HUNT
- target = null
- target_lastloc = null
- return
-
- else if(!disabled) // not next to perp
- var/turf/olddist = get_dist(src, target)
- walk_to(src, target,1,4)
- if((get_dist(src, target)) >= (olddist))
- frustration++
- else
- frustration = 0
- else
+ if(!target) // make sure target exists
back_to_idle()
+ return
+
+ if(Adjacent(target) && isturf(target.loc) && !baton_delayed) // if right next to perp
+ stun_attack(target)
+ if(!lasercolor)
+ mode = BOT_PREP_ARREST
+ anchored = TRUE
+ target_lastloc = target.loc
+ return
+ mode = BOT_HUNT
+ target = null
+ target_lastloc = null
+ return
+
+ try_chasing_target(target)
if(BOT_PREP_ARREST) // preparing to arrest target
@@ -279,42 +285,43 @@
back_to_hunt()
return
- if(iscarbon(target) && target.canBeHandcuffed())
- if(!arrest_type)
- if(!target.handcuffed) //he's not cuffed? Try to cuff him!
- start_cuffing(target)
- else
- back_to_idle()
- return
- else
+ if(no_handcuffs) // should we not cuff?
back_to_idle()
return
- if(BOT_ARREST)
- if(!target)
- anchored = FALSE
- mode = BOT_IDLE
- last_found = world.time
- frustration = 0
+ if(!(iscarbon(target) && target.canBeHandcuffed()))
+ back_to_idle()
+ return
+
+ if(currently_cuffing)
return
- if(target.handcuffed) //no target or target cuffed? back to idle.
+ if(!target.handcuffed)
+ cuff(target)
+ return
+
+ back_to_idle()
+
+ if(BOT_ARREST)
+ if(!target || target.handcuffed)
back_to_idle()
return
if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && world.time - target.stam_regen_start_time < 4 SECONDS && target.getStaminaLoss() <= 100)) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again.
back_to_hunt()
return
- else
- mode = BOT_PREP_ARREST
- anchored = FALSE
+
+ mode = BOT_PREP_ARREST
+ anchored = FALSE
if(BOT_START_PATROL)
- look_for_perp()
+ if(find_new_target())
+ return
start_patrol()
if(BOT_PATROL)
- look_for_perp()
+ if(find_new_target())
+ return
bot_patrol()
@@ -336,9 +343,9 @@
// look for a criminal in view of the bot
-/mob/living/simple_animal/bot/ed209/proc/look_for_perp()
+/mob/living/simple_animal/bot/ed209/proc/find_new_target()
if(disabled)
- return
+ return FALSE
anchored = FALSE
threatlevel = 0
for(var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
@@ -350,20 +357,18 @@
threatlevel = C.assess_threat(src, lasercolor)
- if(!threatlevel)
+ if(!threatlevel || threatlevel < 4)
continue
- else if(threatlevel >= 4)
- target = C
- oldtarget_name = C.name
- speak("Level [threatlevel] infraction alert!")
- playsound(loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/edplaceholder.ogg'), 50, 0)
- visible_message("[src] points at [C.name]!")
- mode = BOT_HUNT
- INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
- break
- else
- continue
+ target = C
+ oldtarget_name = C.name
+ speak("Level [threatlevel] infraction alert!")
+ playsound(loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/edplaceholder.ogg'), 50, FALSE)
+ visible_message("[src] points at [C.name]!")
+ mode = BOT_HUNT
+ INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
+ return TRUE
+ return FALSE
/mob/living/simple_animal/bot/ed209/proc/check_for_weapons(obj/item/slot_item)
if(slot_item && slot_item.needs_permit)
@@ -435,7 +440,7 @@
lastfired = world.time
var/turf/T = loc
var/atom/U = (istype(target, /atom/movable) ? target.loc : target)
- if((!U || !T))
+ if(!U || !T)
return
while(!isturf(U))
U = U.loc
@@ -501,11 +506,11 @@
/mob/living/simple_animal/bot/ed209/bullet_act(obj/item/projectile/Proj)
if(!disabled)
var/lasertag_check = 0
- if((lasercolor == "b"))
+ if(lasercolor == "b")
if(istype(Proj, /obj/item/projectile/beam/lasertag/redtag))
lasertag_check++
- else if((lasercolor == "r"))
+ else if(lasercolor == "r")
if(istype(Proj, /obj/item/projectile/beam/lasertag/bluetag))
lasertag_check++
@@ -538,10 +543,10 @@
return
if(iscarbon(A))
var/mob/living/carbon/C = A
- if(!C.IsStunned() || arrest_type && !baton_delayed)
+ if(!C.IsStunned() || no_handcuffs && !baton_delayed)
stun_attack(A)
else if(C.canBeHandcuffed() && !C.handcuffed)
- start_cuffing(A)
+ cuff(A)
else
..()
@@ -559,37 +564,33 @@
shootAt(A)
/mob/living/simple_animal/bot/ed209/proc/stun_attack(mob/living/carbon/C)
- playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
- icon_state = "[lasercolor]ed209-c"
- addtimer(VARSET_CALLBACK(src, icon_state, "[lasercolor]ed209[on]"), 2)
var/threat = C.assess_threat(src)
- C.SetStuttering(10 SECONDS)
- C.adjustStaminaLoss(60)
+ var/prev_intent = a_intent
+ a_intent = INTENT_HELP
+ baton.attack(C, src)
+ a_intent = prev_intent
baton_delayed = TRUE
- C.apply_status_effect(STATUS_EFFECT_DELAYED, 2.5 SECONDS, CALLBACK(C, TYPE_PROC_REF(/mob/living/, KnockDown), 10 SECONDS), COMSIG_LIVING_CLEAR_STUNS)
addtimer(VARSET_CALLBACK(src, baton_delayed, FALSE), BATON_COOLDOWN)
- add_attack_logs(src, C, "batoned")
+ icon_state = "[lasercolor]ed209-c"
+ addtimer(VARSET_CALLBACK(src, icon_state, "[lasercolor]ed209[on]"), 2)
if(declare_arrests)
var/area/location = get_area(src)
- speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag [C] in [location].", radio_channel)
- C.visible_message("[src] has stunned [C]!",\
- "[src] has stunned you!")
+ speak("[no_handcuffs ? "Detaining" : "Arresting"] level [threat] scumbag [C] in [location].", radio_channel)
-/mob/living/simple_animal/bot/ed209/proc/start_cuffing(mob/living/carbon/C)
+/mob/living/simple_animal/bot/ed209/proc/cuff(mob/living/carbon/C)
mode = BOT_ARREST
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
C.visible_message("[src] is trying to put zipties on [C]!",\
"[src] is trying to put zipties on you!")
- addtimer(CALLBACK(src, PROC_REF(cuff_target), C), 6 SECONDS)
+ INVOKE_ASYNC(src, PROC_REF(cuff_callback), C)
-/mob/living/simple_animal/bot/ed209/proc/cuff_target(mob/living/carbon/C)
- if(!Adjacent(C)|| !isturf(C.loc)) //if he's in a closet or not adjacent, we cancel cuffing.
+/mob/living/simple_animal/bot/ed209/proc/cuff_callback(mob/living/carbon/C)
+ if(!do_after(src, 6 SECONDS, target = C))
return
-
- if(!C.handcuffed)
+ if(!C.handcuffed && on)
C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C)
C.update_handcuffed()
- back_to_idle()
+ back_to_idle()
#undef BATON_COOLDOWN
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 4aebd8a90611..b60f10f61f89 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -73,10 +73,13 @@
/mob/living/simple_animal/bot/floorbot/show_controls(mob/user)
ui_interact(user)
-/mob/living/simple_animal/bot/floorbot/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/mob/living/simple_animal/bot/floorbot/ui_state(mob/user)
+ return GLOB.default_state
+
+/mob/living/simple_animal/bot/floorbot/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "BotFloor", name, 500, 520)
+ ui = new(user, src, "BotFloor", name)
ui.open()
/mob/living/simple_animal/bot/floorbot/ui_data(mob/user)
@@ -149,7 +152,7 @@
/mob/living/simple_animal/bot/floorbot/emag_act(mob/user)
..()
- if(emagged == 2)
+ if(emagged)
if(user)
to_chat(user, "[src] buzzes and beeps.")
@@ -184,12 +187,12 @@
if(amount < MAX_AMOUNT && !target) //Out of tiles! We must refill!
if(eat_tiles) //Configured to find and consume floortiles!
- target = scan(/obj/item/stack/tile/plasteel)
process_type = null
+ target = scan(/obj/item/stack/tile/plasteel)
if(!target && make_tiles) //We did not manage to find any floor tiles! Scan for metal stacks and make our own!
- target = scan(/obj/item/stack/sheet/metal)
process_type = null
+ target = scan(/obj/item/stack/sheet/metal)
if(!target && nag_on_empty) //Floorbot is empty and cannot acquire more tiles, nag the engineers for more!
nag()
diff --git a/code/modules/mob/living/simple_animal/bot/griefsky.dm b/code/modules/mob/living/simple_animal/bot/griefsky.dm
index 278899b0d0f0..2530633daa34 100644
--- a/code/modules/mob/living/simple_animal/bot/griefsky.dm
+++ b/code/modules/mob/living/simple_animal/bot/griefsky.dm
@@ -110,7 +110,8 @@
icon_state = "griefsky1"
walk_to(src,0)
set_path(null)
- look_for_perp() // see if any criminals are in range
+ if(find_new_target())
+ return // see if any criminals are in range
if(!mode && auto_patrol) // still idle, and set to patrol
mode = BOT_START_PATROL // switch to patrol mode
if(BOT_HUNT) // hunting for perp
@@ -121,38 +122,38 @@
set_path(null)
back_to_idle()
return
- if(target) // make sure target exists
- if(target.stat == !DEAD)
- if(Adjacent(target) && isturf(target.loc)) // if right next to perp
- target_lastloc = target.loc
- sword_attack(target)
- anchored = TRUE
- frustration++
- return
- else // not next to perp
- var/turf/olddist = get_dist(src, target)
- walk_to(src, target,1,3) //he's a fast fucker
- if((get_dist(src, target)) >= (olddist))
- frustration++
- else
- frustration = 0
- else
- back_to_idle()
- speak("You fool")
- else
+
+ if(!target) // make sure target exists
+ back_to_idle()
+ speak("You fool")
+ return
+
+ if(target.stat == DEAD)
back_to_idle()
+ return
+
+ if(Adjacent(target) && isturf(target.loc)) // if right next to perp
+ target_lastloc = target.loc
+ sword_attack(target)
+ anchored = TRUE
+ frustration++
+ return // not next to perp
+
+ try_chasing_target(target)
if(BOT_START_PATROL)
- look_for_perp()
+ if(find_new_target())
+ return
start_patrol()
if(BOT_PATROL)
icon_state = "griefsky1"
- look_for_perp()
+ if(find_new_target())
+ return
bot_patrol()
return
-/mob/living/simple_animal/bot/secbot/griefsky/look_for_perp()
+/mob/living/simple_animal/bot/secbot/griefsky/find_new_target()
anchored = FALSE
for(var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
if((C.stat) || (C.handcuffed))
@@ -163,26 +164,24 @@
threatlevel = C.assess_threat(src)
- if(!threatlevel)
+ if(!threatlevel || threatlevel < 4)
continue
- else if(threatlevel >= 4)
- target = C
- oldtarget_name = C.name
- speak("You are a bold one")
- playsound(src,'sound/weapons/saberon.ogg',50,TRUE,-1)
- visible_message("[src] ignites his energy swords!")
- icon_state = "griefsky-c"
- visible_message("[src] points at [C.name]!")
- mode = BOT_HUNT
- INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
- break
- else
- continue
+ target = C
+ oldtarget_name = C.name
+ speak("You are a bold one")
+ playsound(src,'sound/weapons/saberon.ogg', 50, TRUE, -1)
+ visible_message("[src] ignites his energy swords!")
+ icon_state = "griefsky-c"
+ visible_message("[src] points at [C.name]!")
+ mode = BOT_HUNT
+ INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
+ return TRUE
+ return FALSE
/mob/living/simple_animal/bot/secbot/griefsky/explode()
walk_to(src,0)
- visible_message("[src] lets out a huge cough as it blows apart!")
+ visible_message("[src] lets out a huge cough as it blows apart!")
var/turf/Tsec = get_turf(src)
new /obj/item/assembly/prox_sensor(Tsec)
var/obj/item/secbot_assembly/Sa = new /obj/item/secbot_assembly(Tsec)
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
index 7328e2809bc3..093d9ccb1dac 100644
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm
@@ -20,14 +20,14 @@
var/honksound = 'sound/items/bikehorn.ogg' //customizable sound
var/spam_flag = FALSE
- var/cooldowntime = 30
- var/cooldowntimehorn = 10
+ var/cooldowntime = 3 SECONDS
+ var/cooldowntimehorn = 1 SECONDS
var/mob/living/carbon/target
var/oldtarget_name
var/target_lastloc = FALSE //Loc of target when arrested.
var/last_found = FALSE //There's a delay
var/threatlevel = FALSE
- var/arrest_type = FALSE
+ var/no_handcuffs = FALSE
/mob/living/simple_animal/bot/honkbot/Initialize(mapload)
. = ..()
@@ -37,9 +37,6 @@
access_card.access += J.get_access()
prev_access = access_card.access
-/mob/living/simple_animal/bot/honkbot/proc/spam_flag_false() //used for addtimer
- spam_flag = FALSE
-
/mob/living/simple_animal/bot/honkbot/proc/sensor_blink()
icon_state = "honkbot-c"
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 5, TIMER_OVERRIDE|TIMER_UNIQUE)
@@ -49,7 +46,7 @@
playsound(src, 'sound/machines/ping.ogg', 50, TRUE, -1) //the first sound upon creation!
spam_flag = TRUE
sensor_blink()
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), 18) // calibrates before starting the honk
+ addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), 1.8 SECONDS)
/mob/living/simple_animal/bot/honkbot/proc/react_buzz()
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE, -1)
@@ -72,10 +69,13 @@
/mob/living/simple_animal/bot/honkbot/show_controls(mob/user)
ui_interact(user)
-/mob/living/simple_animal/bot/honkbot/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/mob/living/simple_animal/bot/honkbot/ui_state(mob/user)
+ return GLOB.default_state
+
+/mob/living/simple_animal/bot/honkbot/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "BotHonk", name, 500, 220)
+ ui = new(user, src, "BotHonk", name)
ui.open()
/mob/living/simple_animal/bot/honkbot/ui_act(action, params, datum/tgui/ui)
@@ -143,7 +143,7 @@
if(!emagged)
honk_attack(A)
else
- if(!C.IsStunned() || arrest_type)
+ if(!C.IsStunned() || no_handcuffs)
stun_attack(A)
..()
else if(!spam_flag) //honking at the ground
@@ -164,21 +164,21 @@
playsound(src, honksound, 50, TRUE, -1)
spam_flag = TRUE //prevent spam
sensor_blink()
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntimehorn)
- else if(emagged) //emagged honkbots will spam short and memorable sounds.
+ addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), cooldowntimehorn)
+ else //emagged honkbots will spam short and memorable sounds.
if(!spam_flag)
playsound(src, "honkbot_e", 50, 0)
spam_flag = TRUE // prevent spam
icon_state = "honkbot-e"
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 30, TIMER_OVERRIDE|TIMER_UNIQUE)
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntimehorn)
+ addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), cooldowntimehorn)
/mob/living/simple_animal/bot/honkbot/proc/honk_attack(mob/living/carbon/C) // horn attack
if(!spam_flag)
playsound(loc, honksound, 50, TRUE, -1)
spam_flag = TRUE // prevent spam
sensor_blink()
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntimehorn)
+ addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), cooldowntimehorn)
/mob/living/simple_animal/bot/honkbot/proc/stun_attack(mob/living/carbon/C) // airhorn stun
if(!spam_flag)
@@ -200,14 +200,14 @@
target = oldtarget_name
else // you really don't want to hit an emagged honkbot
threatlevel = 6 // will never let you go
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntime)
+ addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), cooldowntimehorn)
add_attack_logs(src, C, "honked by [src]")
C.visible_message("[src] has honked [C]!",\
"[src] has honked you!")
else
C.Stuttering(40 SECONDS)
C.Stun(20 SECONDS)
- addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntime)
+ addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), cooldowntimehorn)
/mob/living/simple_animal/bot/honkbot/handle_automated_action()
@@ -216,7 +216,8 @@
switch(mode)
if(BOT_IDLE) // idle
walk_to(src, 0)
- look_for_perp()
+ if(find_new_target())
+ return
if(!mode && auto_patrol)
mode = BOT_START_PATROL
if(BOT_HUNT)
@@ -226,33 +227,31 @@
playsound(loc, 'sound/misc/sadtrombone.ogg', 25, 1, -1)
back_to_idle()
return
- if(target) // make sure target exists
- if(Adjacent(target) && isturf(target.loc))
- if(threatlevel <= 4)
- honk_attack(target)
- else
- if(threatlevel >= 6)
- set waitfor = 0
- stun_attack(target)
- anchored = FALSE
- target_lastloc = target.loc
- return
- else // not next to perp
- var/turf/olddist = get_dist(src, target)
- walk_to(src, target, 1, 4)
- if((get_dist(src, target)) >= (olddist))
- frustration++
- else
- frustration = 0
- else
+
+ if(!target) // make sure target exists
back_to_idle()
+ return
+
+ if(Adjacent(target) && isturf(target.loc))
+ if(threatlevel <= 4)
+ honk_attack(target)
+ else
+ if(threatlevel >= 6)
+ stun_attack(target)
+ anchored = FALSE
+ target_lastloc = target.loc
+ return
+
+ try_chasing_target(target)
if(BOT_START_PATROL)
- look_for_perp()
+ if(find_new_target())
+ return
start_patrol()
if(BOT_PATROL)
- look_for_perp()
+ if(find_new_target())
+ return
bot_patrol()
return
@@ -270,7 +269,7 @@
mode = BOT_HUNT
INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) // responds quickly
-/mob/living/simple_animal/bot/honkbot/proc/look_for_perp()
+/mob/living/simple_animal/bot/honkbot/proc/find_new_target()
anchored = FALSE
for(var/mob/living/carbon/C in view(7, src))
if((C.stat) || (C.handcuffed))
@@ -279,28 +278,30 @@
if((C.name == oldtarget_name) && (world.time < last_found + 100))
continue
- if(threatlevel <= 3 && !emagged)
- if(C in view(4, src)) //keep the range short for patrolling
- if(!spam_flag)
- bike_horn()
- else if(threatlevel >= 4)
- if(!spam_flag || emagged)
- target = C
- oldtarget_name = C.name
+ if(threatlevel < 4)
+ if(emagged) // actually emagged
bike_horn()
- speak("Honk!")
- visible_message("[src] starts chasing [C.name]!")
- mode = BOT_HUNT
- INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
- break
else
- continue
- else if(emagged)
- bike_horn() //just spam the shit outta this
+ if(C in view(4, src) && !spam_flag) //keep the range short for patrolling
+ bike_horn()
+ continue
+
+ if(spam_flag && !emagged)
+ continue
+
+ target = C
+ oldtarget_name = C.name
+ bike_horn()
+ speak("Honk!")
+ visible_message("[src] starts chasing [C.name]!")
+ mode = BOT_HUNT
+ INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
+ return TRUE
+ return FALSE
/mob/living/simple_animal/bot/honkbot/explode() //doesn't drop cardboard nor its assembly, since its a very frail material.
walk_to(src, 0)
- visible_message("[src] blows apart!")
+ visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
new /obj/item/bikehorn(Tsec)
new /obj/item/assembly/prox_sensor(Tsec)
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index be4b74ab49e1..8bf3236693af 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -157,10 +157,13 @@
/mob/living/simple_animal/bot/medbot/show_controls(mob/user)
ui_interact(user)
-/mob/living/simple_animal/bot/medbot/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/mob/living/simple_animal/bot/medbot/ui_state(mob/user)
+ return GLOB.default_state
+
+/mob/living/simple_animal/bot/medbot/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "BotMed", name, 500, 520)
+ ui = new(user, src, "BotMed", name)
ui.open()
/mob/living/simple_animal/bot/medbot/ui_data(mob/user)
@@ -248,7 +251,7 @@
W.forceMove(src)
reagent_glass = W
to_chat(user, "You insert [W].")
- ui_interact(user, force_open=FALSE)
+ ui_interact(user)
else
var/current_health = health
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 6a0b1072cd5e..9a11143d8041 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -238,15 +238,15 @@
if(mode == BOT_IDLE || mode == BOT_DELIVER)
start_home()
if("destination")
- var/new_dest = input(usr, "Enter Destination:", name, destination) as null|anything in GLOB.deliverybeacontags
+ var/new_dest = tgui_input_list(usr, "Enter Destination:", name, GLOB.deliverybeacontags)
if(new_dest)
set_destination(new_dest)
if("setid")
- var/new_id = stripped_input(usr, "Enter ID:", name, suffix, MAX_NAME_LEN)
+ var/new_id = tgui_input_text(usr, "Enter ID:", name, suffix, MAX_NAME_LEN)
if(new_id)
set_suffix(new_id)
if("sethome")
- var/new_home = input(usr, "Enter Home:", name, home_destination) as null|anything in GLOB.deliverybeacontags
+ var/new_home = tgui_input_list(usr, "Enter Home:", name, GLOB.deliverybeacontags)
if(new_home)
home_destination = new_home
if("unload")
@@ -779,7 +779,7 @@
unload(0)
if("target")
- var/dest = input("Select Bot Destination", "Mulebot [suffix] Interlink", destination) as null|anything in GLOB.deliverybeacontags
+ var/dest = tgui_input_list(user, "Select Bot Destination", "Mulebot [suffix] Interlink", GLOB.deliverybeacontags)
if(dest)
set_destination(dest)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 8b0e88bc4327..2b4821ddc54c 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -32,12 +32,27 @@
var/idcheck = FALSE //If true, arrest people with no IDs
var/weapons_check = FALSE //If true, arrest people for weapons if they lack access
var/check_records = TRUE //Does it check security records?
- var/arrest_type = FALSE //If true, don't handcuff
+ var/no_handcuffs = FALSE //If true, don't handcuff
var/harmbaton = FALSE //If true, beat instead of stun
var/flashing_lights = FALSE //If true, flash lights
var/baton_delayed = FALSE
var/prev_flashing_lights = FALSE
allow_pai = FALSE
+ var/obj/item/melee/baton/infinite_cell/baton = null // stunbaton bot uses to melee attack
+ var/currently_cuffing = FALSE // TRUE if we're cuffing someone right now
+ var/played_sound_this_hunt = FALSE // used to make beepsky beep when it lost its target
+
+/mob/living/simple_animal/bot/secbot/Initialize(mapload)
+ . = ..()
+ baton = new(src)
+ icon_state = "[base_icon][on]"
+ var/datum/job/detective/J = new/datum/job/detective
+ access_card.access += J.get_access()
+ prev_access = access_card.access
+
+/mob/living/simple_animal/bot/secbot/Destroy()
+ QDEL_NULL(baton)
+ return ..()
/mob/living/simple_animal/bot/secbot/beepsky
name = "Officer Beepsky"
@@ -49,7 +64,7 @@
/mob/living/simple_animal/bot/secbot/beepsky/explode()
var/turf/Tsec = get_turf(src)
new /obj/item/stock_parts/cell/potato(Tsec)
- var/obj/item/reagent_containers/food/drinks/drinkingglass/S = new(Tsec)
+ var/obj/item/reagent_containers/drinks/drinkingglass/S = new(Tsec)
S.reagents.add_reagent("whiskey", 15)
S.on_reagent_change()
..()
@@ -72,7 +87,7 @@
base_icon = "rustbot"
icon_state = "rustbot0"
declare_arrests = FALSE
- arrest_type = TRUE
+ no_handcuffs = TRUE
harmbaton = TRUE
emagged = TRUE
@@ -81,16 +96,9 @@
health = 100
maxHealth = 100
idcheck = TRUE
- arrest_type = TRUE
+ no_handcuffs = TRUE
weapons_check = TRUE
-/mob/living/simple_animal/bot/secbot/Initialize(mapload)
- . = ..()
- icon_state = "[base_icon][on]"
-
- var/datum/job/detective/J = new/datum/job/detective
- access_card.access += J.get_access()
- prev_access = access_card.access
/mob/living/simple_animal/bot/secbot/turn_on()
..()
@@ -102,6 +110,8 @@
/mob/living/simple_animal/bot/secbot/bot_reset()
..()
+ currently_cuffing = FALSE
+ played_sound_this_hunt = FALSE
target = null
oldtarget_name = null
anchored = FALSE
@@ -117,10 +127,13 @@
/mob/living/simple_animal/bot/secbot/show_controls(mob/user)
ui_interact(user)
-/mob/living/simple_animal/bot/secbot/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/mob/living/simple_animal/bot/secbot/ui_state(mob/user)
+ return GLOB.default_state
+
+/mob/living/simple_animal/bot/secbot/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "BotSecurity", name, 500, 500)
+ ui = new(user, src, "BotSecurity", name)
ui.open()
/mob/living/simple_animal/bot/secbot/ui_data(mob/user)
@@ -128,7 +141,7 @@
data["check_id"] = idcheck
data["check_weapons"] = weapons_check
data["check_warrant"] = check_records
- data["arrest_mode"] = arrest_type // detain or arrest
+ data["arrest_mode"] = no_handcuffs // detain or arrest
data["arrest_declare"] = declare_arrests // announce arrests on radio
return data
@@ -160,7 +173,7 @@
if("authwarrant")
check_records = !check_records
if("arrtype")
- arrest_type = !arrest_type
+ no_handcuffs = !no_handcuffs
if("arrdeclare")
declare_arrests = !declare_arrests
if("ejectpai")
@@ -211,7 +224,7 @@
return
if(iscarbon(A))
var/mob/living/carbon/C = A
- if((!C.IsWeakened() || arrest_type) && !baton_delayed)
+ if((!C.IsWeakened() || no_handcuffs) && !baton_delayed)
stun_attack(A)
else if(C.canBeHandcuffed() && !C.handcuffed)
cuff(A)
@@ -236,34 +249,30 @@
INVOKE_ASYNC(src, PROC_REF(cuff_callback), C)
/mob/living/simple_animal/bot/secbot/proc/cuff_callback(mob/living/carbon/C)
- if(do_after(src, 60, target = C))
- if(!C.handcuffed && on)
- C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C)
- C.update_handcuffed()
- playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
- back_to_idle()
+ currently_cuffing = TRUE
+ if(!do_after(src, 6 SECONDS, target = C))
+ currently_cuffing = FALSE
+ return
+ currently_cuffing = FALSE
+ if(!C.handcuffed && on)
+ C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C)
+ C.update_handcuffed()
+ playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, FALSE)
+ back_to_idle()
/mob/living/simple_animal/bot/secbot/proc/stun_attack(mob/living/carbon/C)
- playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
- if(harmbaton)
- playsound(loc, 'sound/weapons/genhit1.ogg', 50, 1, -1)
- do_attack_animation(C)
- icon_state = "[base_icon]-c"
- addtimer(VARSET_CALLBACK(src, icon_state, "[base_icon][on]"), 2)
var/threat = C.assess_threat(src)
- if(ishuman(C) && harmbaton) // Bots with harmbaton enabled become shitcurity. - Dave
- C.apply_damage(10, BRUTE)
- C.SetStuttering(10 SECONDS)
- C.adjustStaminaLoss(60)
+ var/prev_intent = a_intent
+ a_intent = harmbaton ? INTENT_HARM : INTENT_HELP
+ baton.attack(C, src)
+ a_intent = prev_intent
baton_delayed = TRUE
- C.apply_status_effect(STATUS_EFFECT_DELAYED, 2.5 SECONDS, CALLBACK(C, TYPE_PROC_REF(/mob/living/, KnockDown), 10 SECONDS), COMSIG_LIVING_CLEAR_STUNS)
addtimer(VARSET_CALLBACK(src, baton_delayed, FALSE), BATON_COOLDOWN)
- add_attack_logs(src, C, "batoned")
+ icon_state = "[base_icon]-c"
+ addtimer(VARSET_CALLBACK(src, icon_state, "[base_icon][on]"), 2)
if(declare_arrests)
var/area/location = get_area(src)
- speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag [C] in [location].", radio_channel)
- C.visible_message("[src] has [harmbaton ? "beaten" : "stunned"] [C]!",\
- "[src] has [harmbaton ? "beaten" : "stunned"] you!")
+ speak("[no_handcuffs ? "Detaining" : "Arresting"] level [threat] scumbag [C] in [location].", radio_channel)
/mob/living/simple_animal/bot/secbot/Life(seconds, times_fired)
. = ..()
@@ -283,10 +292,18 @@
/mob/living/simple_animal/bot/secbot/verb/toggle_flashing_lights()
set name = "Toggle Flashing Lights"
set category = "Object"
- set src = usr
flashing_lights = !flashing_lights
+/mob/living/simple_animal/bot/secbot/try_chasing_target()
+ . = ..()
+ if(lost_target && !played_sound_this_hunt && frustration > 2)
+ playsound(loc, 'sound/machines/synth_no.ogg', 50, FALSE)
+ played_sound_this_hunt = TRUE
+ if(!lost_target && played_sound_this_hunt)
+ playsound(loc, 'sound/machines/synth_yes.ogg', 50, FALSE)
+ played_sound_this_hunt = FALSE
+
/mob/living/simple_animal/bot/secbot/handle_automated_action()
if(!..())
return
@@ -295,84 +312,80 @@
switch(mode)
if(BOT_IDLE) // idle
- walk_to(src,0)
+ walk_to(src, 0)
set_path(null)
- look_for_perp() // see if any criminals are in range
+ if(find_new_target()) // see if any criminals are in range
+ return
if(!mode && auto_patrol) // still idle, and set to patrol
mode = BOT_START_PATROL // switch to patrol mode
if(BOT_HUNT) // hunting for perp
// if can't reach perp for long enough, go idle
if(frustration >= 8)
- walk_to(src,0)
+ playsound(loc, 'sound/machines/buzz-two.ogg', 25, FALSE)
+ walk_to(src, 0)
set_path(null)
back_to_idle()
return
- if(target) // make sure target exists
- if(Adjacent(target) && isturf(target.loc) && !baton_delayed) // if right next to perp
- stun_attack(target)
-
- mode = BOT_PREP_ARREST
- anchored = TRUE
- target_lastloc = target.loc
- return
-
- else // not next to perp
- var/turf/olddist = get_dist(src, target)
- walk_to(src, target,1,4)
- if((get_dist(src, target)) >= (olddist))
- frustration++
- else
- frustration = 0
- else
+ if(!target) // make sure target exists
back_to_idle()
+ return
+
+ if(Adjacent(target) && isturf(target.loc) && !baton_delayed) // if right next to perp
+ stun_attack(target)
+ mode = BOT_PREP_ARREST
+ anchored = TRUE
+ target_lastloc = target.loc
+ return
+
+ try_chasing_target(target)
if(BOT_PREP_ARREST) // preparing to arrest target
// see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again.
if(!Adjacent(target) || !isturf(target.loc) || world.time - target.stam_regen_start_time < 4 SECONDS && target.getStaminaLoss() <= 100)
back_to_hunt()
return
+ // target is stunned and nearby
+ if(no_handcuffs) // should we not cuff?
+ back_to_idle()
+ return
- if(iscarbon(target) && target.canBeHandcuffed())
- if(!arrest_type)
- if(!target.handcuffed) //he's not cuffed? Try to cuff him!
- cuff(target)
- else
- back_to_idle()
- return
- else
+ if(!(iscarbon(target) && target.canBeHandcuffed()))
back_to_idle()
return
- if(BOT_ARREST)
- if(!target)
- anchored = FALSE
- mode = BOT_IDLE
- last_found = world.time
- frustration = 0
+ if(currently_cuffing)
+ return
+
+ if(!target.handcuffed)
+ cuff(target)
return
- if(target.handcuffed) //no target or target cuffed? back to idle.
+ back_to_idle()
+
+ if(BOT_ARREST)
+ if(!target || target.handcuffed)
back_to_idle()
return
if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.AmountWeakened() < 4 SECONDS)) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again.
back_to_hunt()
return
- else //Try arresting again if the target escapes.
- mode = BOT_PREP_ARREST
- anchored = FALSE
+ //Try arresting again if the target escapes.
+ mode = BOT_PREP_ARREST
+ anchored = FALSE
if(BOT_START_PATROL)
- look_for_perp()
+ if(find_new_target())
+ return
start_patrol()
if(BOT_PATROL)
- look_for_perp()
+ if(find_new_target())
+ return
bot_patrol()
-
return
/mob/living/simple_animal/bot/secbot/proc/back_to_idle()
@@ -390,7 +403,7 @@
INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
// look for a criminal in view of the bot
-/mob/living/simple_animal/bot/secbot/proc/look_for_perp()
+/mob/living/simple_animal/bot/secbot/proc/find_new_target()
anchored = FALSE
for(var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
if((C.stat) || (C.handcuffed))
@@ -401,20 +414,19 @@
threatlevel = C.assess_threat(src)
- if(!threatlevel)
+ if(!threatlevel || threatlevel < 4)
continue
- else if(threatlevel >= 4)
- target = C
- oldtarget_name = C.name
- speak("Level [threatlevel] infraction alert!")
- playsound(loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0)
- visible_message("[src] points at [C.name]!")
- mode = BOT_HUNT
- INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
- break
- else
- continue
+ target = C
+ oldtarget_name = C.name
+ speak("Level [threatlevel] infraction alert!")
+ playsound(loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, FALSE)
+ visible_message("[src] points at [C.name]!")
+ mode = BOT_HUNT
+ INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
+ return TRUE
+ return FALSE
+
/mob/living/simple_animal/bot/secbot/proc/check_for_weapons(obj/item/slot_item)
if(slot_item && slot_item.needs_permit)
return 1
diff --git a/code/modules/mob/living/simple_animal/bot/syndicate_bots.dm b/code/modules/mob/living/simple_animal/bot/syndicate_bots.dm
index 8e35dbc16550..291690dda330 100644
--- a/code/modules/mob/living/simple_animal/bot/syndicate_bots.dm
+++ b/code/modules/mob/living/simple_animal/bot/syndicate_bots.dm
@@ -10,7 +10,7 @@
maxHealth = 300
declare_arrests = FALSE
idcheck = TRUE
- arrest_type = TRUE
+ no_handcuffs = TRUE
auto_patrol = TRUE
emagged = TRUE
faction = list("syndicate")
@@ -47,7 +47,10 @@
..()
update_icon()
-/mob/living/simple_animal/bot/ed209/syndicate/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/mob/living/simple_animal/bot/ed209/syndicate/ui_state(mob/user)
+ return GLOB.default_state
+
+/mob/living/simple_animal/bot/ed209/syndicate/ui_interact(mob/user, datum/tgui/ui = null)
to_chat(user, "[src] has no accessible control panel!")
return
@@ -69,6 +72,11 @@
/mob/living/simple_animal/bot/ed209/syndicate/emag_act(mob/user)
to_chat(user, "[src] has no card reader slot!")
+/mob/living/simple_animal/bot/ed209/syndicate/try_chasing_target()
+ . = ..()
+ if(!lost_target)
+ shootAt(target)
+
/mob/living/simple_animal/bot/ed209/syndicate/ed209_ai()
var/turf/current_turf = get_turf(src)
if(saved_turf && current_turf != saved_turf)
@@ -83,39 +91,42 @@
if(BOT_IDLE)
walk_to(src,0)
set_path(null)
- look_for_perp()
+ if(find_new_target())
+ return
if(!mode && auto_patrol)
mode = BOT_START_PATROL
+
if(BOT_HUNT)
if(frustration >= 8)
walk_to(src,0)
set_path(null)
back_to_idle()
- if(target)
- if(isliving(target))
- if(target.stat == DEAD)
- back_to_idle()
- return
- shootAt(target)
- var/turf/olddist = get_dist(src, target)
- walk_to(src, target,1,4)
- if((get_dist(src, target)) >= (olddist))
- frustration++
- else
- frustration = 0
- else
+ return
+
+ if(!target)
+ back_to_idle()
+ return
+
+ if(isliving(target) && target.stat == DEAD)
back_to_idle()
+ return
+
+ try_chasing_target(target)
+
if(BOT_START_PATROL)
- look_for_perp()
+ if(find_new_target())
+ return
start_patrol()
+
if(BOT_PATROL)
- look_for_perp()
+ if(find_new_target())
+ return
bot_patrol()
else
back_to_idle()
return
-/mob/living/simple_animal/bot/ed209/syndicate/look_for_perp()
+/mob/living/simple_animal/bot/ed209/syndicate/find_new_target()
if(disabled)
return
for(var/mob/M in view(7, src))
@@ -130,9 +141,9 @@
target = M
oldtarget_name = M.name
mode = BOT_HUNT
- spawn(0)
- handle_automated_action()
- break
+ INVOKE_ASYNC(src, PROC_REF(handle_automated_action))
+ return TRUE
+ return FALSE
/mob/living/simple_animal/bot/ed209/syndicate/shootAt(atom/target)
@@ -175,7 +186,7 @@
return
shootAt(A)
-/mob/living/simple_animal/bot/ed209/syndicate/start_cuffing(mob/living/carbon/C)
+/mob/living/simple_animal/bot/ed209/syndicate/cuff(mob/living/carbon/C)
shootAt(C)
/mob/living/simple_animal/bot/ed209/syndicate/stun_attack(mob/living/carbon/C)
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 2707f7f988fd..1e74d1162df1 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -22,7 +22,7 @@
pressure_resistance = 100
universal_speak = TRUE
AIStatus = AI_OFF //normal constructs don't have AI
- loot = list(/obj/item/reagent_containers/food/snacks/ectoplasm)
+ loot = list(/obj/item/food/snacks/ectoplasm)
del_on_death = TRUE
deathmessage = "collapses in a shattered heap."
var/construct_type = "shade"
diff --git a/code/modules/mob/living/simple_animal/friendly/bunny.dm b/code/modules/mob/living/simple_animal/friendly/bunny.dm
index fdefe785ffd7..5a58869a6202 100644
--- a/code/modules/mob/living/simple_animal/friendly/bunny.dm
+++ b/code/modules/mob/living/simple_animal/friendly/bunny.dm
@@ -12,7 +12,7 @@
see_in_dark = 6
maxHealth = 10
health = 10
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index 4ab5c0156125..4489fc9be898 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -21,7 +21,7 @@
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC | MOB_BUG
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 0)
+ butcher_results = list(/obj/item/food/snacks/meat = 0)
gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/simple_animal/butterfly/Initialize(mapload) //Not the poor butterfly!
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 5eed02aed764..9cee3910292a 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -17,7 +17,7 @@
mob_size = MOB_SIZE_SMALL
animal_species = /mob/living/simple_animal/pet/cat
childtype = list(/mob/living/simple_animal/pet/cat/kitten)
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 3)
+ butcher_results = list(/obj/item/food/snacks/meat = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -233,8 +233,8 @@
butcher_results = list(
/obj/item/organ/internal/brain = 1,
/obj/item/organ/internal/heart = 1,
- /obj/item/reagent_containers/food/snacks/birthdaycakeslice = 3,
- /obj/item/reagent_containers/food/snacks/meat/slab = 2
+ /obj/item/food/snacks/birthdaycakeslice = 3,
+ /obj/item/food/snacks/meat/slab = 2
)
response_harm = "takes a bite out of"
attacked_sound = "sound/items/eatfood.ogg"
@@ -247,7 +247,7 @@
return
if(health < maxHealth)
adjustBruteLoss(-4)
- for(var/obj/item/reagent_containers/food/snacks/donut/D in range(1, src))
+ for(var/obj/item/food/snacks/donut/D in range(1, src))
if(D.icon_state != "donut2")
D.name = "frosted donut"
D.icon_state = "donut2"
@@ -269,7 +269,7 @@
to_chat(src, "You are a cak! You're a harmless cat/cake hybrid that everyone loves. People can take bites out of you if they're hungry, but you regenerate health \
so quickly that it generally doesn't matter. You're remarkably resilient to any damage besides this and it's hard for you to really die at all. You should go around and bring happiness and \
free cake to the station!")
- var/new_name = stripped_input(src, "Enter your name, or press \"Cancel\" to stick with Keeki.", "Name Change")
+ var/new_name = tgui_input_text(src, "Enter your name, or press \"Cancel\" to stick with Keeki.", "Name Change", name)
if(new_name)
to_chat(src, "Your name is now \"[new_name]\"!")
name = new_name
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 10724db9ad82..e1a7390a7c7a 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -10,7 +10,7 @@
emote_see = list("clacks")
speak_chance = 1
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "stomps"
diff --git a/code/modules/mob/living/simple_animal/friendly/deer.dm b/code/modules/mob/living/simple_animal/friendly/deer.dm
index e7e0586ca3dd..745bede98981 100644
--- a/code/modules/mob/living/simple_animal/friendly/deer.dm
+++ b/code/modules/mob/living/simple_animal/friendly/deer.dm
@@ -11,7 +11,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 0 //I'm so funny
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 4)
+ butcher_results = list(/obj/item/food/snacks/meat = 4)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
index 9cf8dba09537..00099deea275 100644
--- a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
+++ b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
@@ -127,11 +127,11 @@
continue
choices += H
- if(!choices.len)
+ if(!length(choices))
to_chat(src, "No suitable diona nearby.")
return FALSE
- var/mob/living/M = input(src,"Who do you wish to merge with?") in null|choices
+ var/mob/living/M = tgui_input_list(src, "Who do you wish to merge with?", "Nymph Merging", choices)
if(!M || !src || !(Adjacent(M)) || stat != CONSCIOUS) //input can take a while, so re-validate
return FALSE
@@ -210,7 +210,7 @@
return TRUE
// Consumes plant matter other than weeds to evolve
-/mob/living/simple_animal/diona/proc/consume(obj/item/reagent_containers/food/snacks/grown/G)
+/mob/living/simple_animal/diona/proc/consume(obj/item/food/snacks/grown/G)
if(nutrition >= nutrition_need) // Prevents griefing by overeating plant items without evolving.
to_chat(src, "You're too full to consume this! Perhaps it's time to grow bigger...")
else
@@ -232,11 +232,11 @@
if(Adjacent(H) && H.dna && !(NO_BLOOD in H.dna.species.species_traits))
choices += H
- if(!choices.len)
+ if(!length(choices))
to_chat(src, "No suitable blood donors nearby.")
return FALSE
- var/mob/living/carbon/human/M = input(src,"Who do you wish to take a sample from?") in null|choices
+ var/mob/living/carbon/human/M = tgui_input_list(src, "Who do you wish to take a sample from?", "Blood Sampling", choices)
if(!M || !src || !(Adjacent(M)) || stat != CONSCIOUS) //input can take a while, so re-validate
return FALSE
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 8195b998a4db..4cd1f666d0b3 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -70,7 +70,7 @@
icon_state = "corgi"
icon_living = "corgi"
icon_dead = "corgi_dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
+ butcher_results = list(/obj/item/food/snacks/meat/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
animal_species = /mob/living/simple_animal/pet/dog
collar_type = "corgi"
@@ -555,7 +555,7 @@
stop_automated_movement = FALSE
var/obj/item/possible_target = null
for(var/I in snack_range)
- if(istype(I, /obj/item/reagent_containers/food/snacks)) // Noms
+ if(istype(I, /obj/item/food/snacks)) // Noms
possible_target = I
break
else if(istype(I, /obj/item/paper)) // Important noms
@@ -590,7 +590,7 @@
else if(prob(30) && ishuman(movement_target.loc)) // mean hooman has stolen it
custom_emote(EMOTE_VISIBLE, "stares at [movement_target.loc]'s [movement_target] with a sad puppy-face.")
-/obj/item/reagent_containers/food/snacks/meat/corgi
+/obj/item/food/snacks/meat/corgi
name = "Corgi meat"
desc = "Tastes like... well you know..."
@@ -732,7 +732,8 @@
if(!emagged)
emagged = TRUE
visible_message("[user] swipes a card through [src].", "You overload [src]s internal reactor.")
- addtimer(CALLBACK(src, PROC_REF(explode)), 1000)
+ addtimer(CALLBACK(src, PROC_REF(explode)), 100 SECONDS)
+ return TRUE
/mob/living/simple_animal/pet/dog/corgi/borgi/proc/explode()
visible_message("[src] makes an odd whining noise.")
@@ -782,7 +783,7 @@
icon_state = "pug"
icon_living = "pug"
icon_dead = "pug_dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/pug = 3)
+ butcher_results = list(/obj/item/food/snacks/meat/pug = 3)
collar_type = "pug"
/mob/living/simple_animal/pet/dog/pug/handle_automated_movement()
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index c92cb90d4601..f8aa127e2a87 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -12,7 +12,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 4)
+ butcher_results = list(/obj/item/food/snacks/meat = 4)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -122,7 +122,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 6)
+ butcher_results = list(/obj/item/food/snacks/meat/slab = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -202,7 +202,7 @@
density = FALSE
speak_chance = 2
turns_per_move = 2
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -255,9 +255,9 @@ GLOBAL_VAR_INIT(chicken_count, 0)
density = FALSE
speak_chance = 2
turns_per_move = 3
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 2)
- var/egg_type = /obj/item/reagent_containers/food/snacks/egg
- var/food_type = /obj/item/reagent_containers/food/snacks/grown/wheat
+ butcher_results = list(/obj/item/food/snacks/meat = 2)
+ var/egg_type = /obj/item/food/snacks/egg
+ var/food_type = /obj/item/food/snacks/grown/wheat
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -329,8 +329,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
if(GLOB.chicken_count < MAX_CHICKENS && prob(25))
START_PROCESSING(SSobj, E)
-/obj/item/reagent_containers/food/snacks/egg/var/amount_grown = 0
-/obj/item/reagent_containers/food/snacks/egg/process()
+/obj/item/food/snacks/egg/process()
if(isturf(loc))
amount_grown += rand(1,2)
if(amount_grown >= 100)
@@ -381,7 +380,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/ham = 6)
+ butcher_results = list(/obj/item/food/snacks/meat/ham = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -407,7 +406,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 4)
+ butcher_results = list(/obj/item/food/snacks/meat = 4)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -432,7 +431,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 6)
+ butcher_results = list(/obj/item/food/snacks/meat = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -457,7 +456,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 6)
+ butcher_results = list(/obj/item/food/snacks/meat = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
@@ -482,7 +481,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 6)
+ butcher_results = list(/obj/item/food/snacks/meat = 6)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index 37d1f47e5b6a..329d43fb7d06 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -13,7 +13,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 3)
+ butcher_results = list(/obj/item/food/snacks/meat = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index 493022c5f23f..0fa7edbf6d25 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -22,7 +22,7 @@
mob_size = MOB_SIZE_SMALL
can_hide = TRUE
pass_door_while_hidden = TRUE
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
can_collar = TRUE
mob_biotypes = MOB_ORGANIC | MOB_BEAST | MOB_REPTILE
gold_core_spawnable = FRIENDLY_SPAWN
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 3d8747084b6a..958806c6b50e 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -16,7 +16,7 @@
see_in_dark = 6
maxHealth = 5
health = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "stamps on"
@@ -92,7 +92,7 @@
..()
/mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force = pull_force, show_message = FALSE)//Prevents mouse from pulling things
- if(istype(AM, /obj/item/reagent_containers/food/snacks/cheesewedge))
+ if(istype(AM, /obj/item/food/snacks/cheesewedge))
return ..() // Get dem
if(show_message)
to_chat(src, "You are too small to pull anything except cheese.")
diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm
index 077b0508a04f..0f094e9d81a8 100644
--- a/code/modules/mob/living/simple_animal/friendly/sloth.dm
+++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm
@@ -13,7 +13,7 @@
faction = list("neutral", "jungle")
speak_chance = 1
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 3)
+ butcher_results = list(/obj/item/food/snacks/meat = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index 8a1a44499cad..863b98e530c9 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -146,6 +146,7 @@
melee_damage_lower = 15
melee_damage_upper = 15
attack_sound = 'sound/machines/defib_zap.ogg'
+ return TRUE
/mob/living/simple_animal/spiderbot/proc/transfer_personality(obj/item/mmi/M)
mind = M.brainmob.mind
diff --git a/code/modules/mob/living/simple_animal/hostile/alien_types.dm b/code/modules/mob/living/simple_animal/hostile/alien_types.dm
index 423753aa5b27..38eb627a1912 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien_types.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien_types.dm
@@ -11,7 +11,7 @@
response_disarm = "shoves"
response_harm = "hits"
speed = 0
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat= 3, /obj/item/stack/sheet/animalhide/xeno = 1)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat= 3, /obj/item/stack/sheet/animalhide/xeno = 1)
maxHealth = 125
health = 125
harm_intent_damage = 5
@@ -83,7 +83,7 @@
retreat_distance = 5
minimum_distance = 5
move_to_delay = 4
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat= 4, /obj/item/stack/sheet/animalhide/xeno = 1)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat= 4, /obj/item/stack/sheet/animalhide/xeno = 1)
projectiletype = /obj/item/projectile/neurotox
projectilesound = 'sound/weapons/pierce.ogg'
status_flags = 0
@@ -131,7 +131,7 @@
move_to_delay = 4
maxHealth = 400
health = 400
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat= 10, /obj/item/stack/sheet/animalhide/xeno = 2)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat= 10, /obj/item/stack/sheet/animalhide/xeno = 2)
mob_size = MOB_SIZE_LARGE
/obj/item/projectile/neurotox
diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm
index ff57b4758adb..66f76186713d 100644
--- a/code/modules/mob/living/simple_animal/hostile/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bat.dm
@@ -9,7 +9,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 3
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1)
+ butcher_results = list(/obj/item/food/snacks/meat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 646cd5146156..3b045ce67efe 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -14,7 +14,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/bearmeat= 5, /obj/item/clothing/head/bearpelt = 1)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index df6751f40210..5b6eb1a47025 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -11,7 +11,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/carpmeat = 2)
+ butcher_results = list(/obj/item/food/snacks/carpmeat = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -99,7 +99,7 @@
. = ..()
if(. && ishuman(target))
var/mob/living/carbon/human/H = target
- H.adjustStaminaLoss(8)
+ H.apply_damage(8, STAMINA)
/mob/living/simple_animal/hostile/carp/death(gibbed)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
index b10cd9c761de..3f8204a152e3 100644
--- a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
@@ -18,7 +18,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
+ butcher_results = list(/obj/item/food/snacks/meat/slab = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index b9fa11bcbb99..087beb515844 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -19,7 +19,7 @@
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
footstep_type = FOOTSTEP_MOB_CLAW
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/spidermeat= 2, /obj/item/reagent_containers/food/snacks/monstermeat/spiderleg= 8)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/spidermeat = 2, /obj/item/food/snacks/monstermeat/spiderleg = 8)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -70,7 +70,7 @@
icon_state = "nurse"
icon_living = "nurse"
icon_dead = "nurse_dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/spidermeat= 2, /obj/item/reagent_containers/food/snacks/monstermeat/spiderleg= 8, /obj/item/reagent_containers/food/snacks/monstermeat/spidereggs= 4)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/spidermeat= 2, /obj/item/food/snacks/monstermeat/spiderleg= 8, /obj/item/food/snacks/monstermeat/spidereggs= 4)
maxHealth = 40
health = 40
@@ -223,7 +223,7 @@
if(Adjacent(O))
choices += O
if(length(choices))
- cocoon_target = input(src,"What do you wish to cocoon?") in null|choices
+ cocoon_target = tgui_input_list(src, "What do you wish to cocoon?", "Cocoon Wrapping", choices)
else
to_chat(src, "No suitable dead prey or wrappable objects found nearby.")
return
diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
index 3efddf12f41d..b11c2b299ec3 100644
--- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
@@ -9,7 +9,7 @@
speak_chance = 80
maxHealth = 220
health = 220
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/gorilla = 4)
+ butcher_results = list(/obj/item/food/snacks/meat/slab/gorilla = 4)
response_help = "prods"
response_disarm = "challenges"
response_harm = "thumps"
@@ -141,7 +141,7 @@
living_target.throw_at(get_edge_target_turf(living_target, dir), rand(1, 2), 7, src)
return
- living_target.adjustStaminaLoss(stamina_damage)
+ living_target.apply_damage(stamina_damage, STAMINA)
visible_message("[src] knocks [living_target] down!")
/mob/living/simple_animal/hostile/gorilla/update_icon_state()
diff --git a/code/modules/mob/living/simple_animal/hostile/headslug.dm b/code/modules/mob/living/simple_animal/hostile/headslug.dm
index f2aa53fd8ad4..19137beaac9e 100644
--- a/code/modules/mob/living/simple_animal/hostile/headslug.dm
+++ b/code/modules/mob/living/simple_animal/hostile/headslug.dm
@@ -52,6 +52,9 @@
if(HAS_TRAIT(carbon_target, TRAIT_XENO_HOST))
to_chat(src, "A foreign presence repels us from this body. Perhaps we should try to infest another?")
return
+ if(!carbon_target.get_int_organ_datum(ORGAN_DATUM_HEART))
+ to_chat(src, "There's no heart for us to infest!")
+ return
Infect(carbon_target)
to_chat(src, "With our egg laid, our death approaches rapidly...")
addtimer(CALLBACK(src, PROC_REF(death)), 25 SECONDS)
@@ -73,7 +76,7 @@
owner.adjustToxLoss(30)
if(time >= 90 && prob(15))
to_chat(owner, pick("Something hurts.", "Someone is thinking, but it's not you.", "You feel at peace.", "Close your eyes."))
- owner.adjustStaminaLoss(50)
+ owner.apply_damage(50, STAMINA)
if(time >= EGG_INCUBATION_DEAD_CYCLE && owner.stat == DEAD || time >= EGG_INCUBATION_LIVING_CYCLE)
Pop()
STOP_PROCESSING(SSobj, src)
@@ -114,11 +117,13 @@
owner.gib()
return
- owner.apply_damage(300, BRUTE, BODY_ZONE_CHEST)
owner.bleed(BLOOD_VOLUME_NORMAL)
- var/obj/item/organ/external/chest = owner.get_organ(BODY_ZONE_CHEST)
- chest.fracture()
- chest.disembowel()
+ var/datum/organ/our_heart_datum = owner.get_int_organ_datum(ORGAN_DATUM_HEART)
+ var/obj/item/organ/internal/our_heart = our_heart_datum.linked_organ
+ var/obj/item/organ/external/heart_location = owner.get_organ(our_heart.parent_organ)
+ owner.apply_damage(300, BRUTE, our_heart.parent_organ)
+ heart_location.fracture()
+ heart_location.disembowel(our_heart.parent_organ)
#undef EGG_INCUBATION_DEAD_CYCLE
#undef EGG_INCUBATION_LIVING_CYCLE
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index a2a20770c767..8ce9afac83e4 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -4,7 +4,7 @@
/mob/living/simple_animal/hostile/hivebot
name = "Hivebot"
- desc = "A small robot"
+ desc = "A small robot."
icon = 'icons/mob/hivebot.dmi'
icon_state = "basic"
icon_living = "basic"
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
index 5328b974d159..f3982ed9a974 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
@@ -14,7 +14,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 3
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 3)
+ butcher_results = list(/obj/item/food/snacks/meat = 3)
faction = list("hostile", "jungle")
response_help = "pets the"
response_disarm = "gently pushes aside the"
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index adb59e96397f..b8c1b2b3097c 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -10,7 +10,7 @@
maxHealth = 30
health = 30
see_in_dark = 3
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/tomatomeat = 2)
+ butcher_results = list(/obj/item/food/snacks/meat/tomatomeat = 2)
response_help = "prods"
response_disarm = "pushes aside"
response_harm = "smacks"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 978f0d19b104..55cd79a6d15b 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -140,8 +140,8 @@ Difficulty: Hard
var/mob/living/carbon/human/H = target
H.apply_status_effect(STATUS_EFFECT_BUBBLEGUM_CURSE, src)
if(second_life)
- H.clear_fullscreen("bubblegum")
- H.overlay_fullscreen("bubblegum", /obj/screen/fullscreen/fog, 2)
+ H.clear_fullscreen("Bubblegum")
+ H.overlay_fullscreen("Bubblegum", /obj/screen/fullscreen/fog, 2)
/mob/living/simple_animal/hostile/megafauna/bubblegum/death(gibbed)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
index 152cd8b275f2..d87d9647fbf3 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
@@ -119,14 +119,7 @@
damage_type = BURN
nodamage = FALSE
temperature = 500 //Heats you up!
-
-/obj/item/projectile/temp/basilisk/magmawing/on_hit(atom/target, blocked = FALSE)
- . = ..()
- if(.)
- var/mob/living/L = target
- if(istype(L))
- L.adjust_fire_stacks(0.1)
- L.IgniteMob()
+ immolate = 1
/obj/item/projectile/temp/basilisk/icewing
damage = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
index 67446260ad6f..ac88df09e8b0 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
@@ -49,8 +49,8 @@
if(istype(target, /obj/structure/elite_tumor))
var/obj/structure/elite_tumor/T = target
if(T.mychild == src && T.activity == TUMOR_PASSIVE)
- var/response = alert(src, "Re-enter the tumor?","Despawn yourself?", "Yes", "No")
- if(response == "No" || QDELETED(src) || !Adjacent(T))
+ var/response = tgui_alert(src, "Re-enter the tumor?", "Despawn yourself?", list("Yes", "No"))
+ if(response != "Yes" || QDELETED(src) || !Adjacent(T))
return
T.clear_activator(src)
T.mychild = null
@@ -478,7 +478,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
. = ..()
if(istype(mover, /obj/item/projectile))
return FALSE
-
+
/obj/item/gps/internal/tumor
icon_state = null
gpstag = "Cancerous Signal"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
index 4894c3799ef1..6d5ed62d05e2 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
@@ -91,7 +91,7 @@
throw_message = "does nothing to the tough hide of the"
pre_attack_icon = "goliath2"
crusher_loot = /obj/item/crusher_trophy/goliath_tentacle
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/goliath= 2, /obj/item/stack/sheet/animalhide/goliath_hide = 1, /obj/item/stack/sheet/bone = 2)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/goliath = 2, /obj/item/stack/sheet/animalhide/goliath_hide = 1, /obj/item/stack/sheet/bone = 2)
loot = list()
stat_attack = UNCONSCIOUS
robust_searching = TRUE
@@ -110,7 +110,7 @@
pre_attack_icon = "Goliath_preattack"
throw_message = "does nothing to the rocky hide of the"
loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) //A throwback to the asteroid days
- butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/goliath= 2, /obj/item/stack/sheet/bone = 2)
+ butcher_results = list(/obj/item/food/snacks/monstermeat/goliath= 2, /obj/item/stack/sheet/bone = 2)
crusher_loot = /obj/item/crusher_trophy/goliath_tentacle/ancient
crusher_drop_mod = 30
wander = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index c7c33b6daa63..0c674ca45282 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
@@ -30,7 +30,7 @@
retreat_distance = 3
minimum_distance = 3
pass_flags = PASSTABLE
- loot = list(/obj/item/organ/internal/regenerative_core)
+ butcher_results = list(/obj/item/organ/internal/regenerative_core = 1)
var/brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood
/mob/living/simple_animal/hostile/asteroid/hivelord/OpenFire(the_target)
@@ -172,6 +172,7 @@
throw_message = "bounces harmlessly off of"
crusher_loot = /obj/item/crusher_trophy/legion_skull
loot = list(/obj/item/organ/internal/regenerative_core/legion)
+ butcher_results = null
brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion
del_on_death = TRUE
stat_attack = UNCONSCIOUS
@@ -386,7 +387,7 @@
belt = null
backpack_contents = list()
if(prob(70))
- backpack_contents += pick(list(/obj/item/stamp/clown = 1, /obj/item/reagent_containers/spray/waterflower = 1, /obj/item/reagent_containers/food/snacks/grown/banana = 1, /obj/item/megaphone = 1))
+ backpack_contents += pick(list(/obj/item/stamp/clown = 1, /obj/item/reagent_containers/spray/waterflower = 1, /obj/item/food/snacks/grown/banana = 1, /obj/item/megaphone = 1))
if(prob(30))
backpack_contents += list(/obj/item/stack/sheet/mineral/bananium = pickweight(list( 1 = 3, 2 = 2, 3 = 1)))
if(prob(10))
@@ -430,6 +431,6 @@
suit_store = /obj/item/melee/cultblade
l_pocket = /obj/item/melee/cultblade/dagger
if(prob(60))
- r_pocket = /obj/item/reagent_containers/food/drinks/bottle/unholywater
+ r_pocket = /obj/item/reagent_containers/drinks/bottle/unholywater
backpack_contents = list(/obj/item/tome = 1, /obj/item/restraints/legcuffs/bola/cult = 1, /obj/item/stack/sheet/runed_metal = 15)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index b30334e96ded..6e2fb046dbd1 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -9,7 +9,7 @@
turns_per_move = 1
maxHealth = 10
health = 10
- butcher_results = list(/obj/item/reagent_containers/food/snacks/hugemushroomslice = 1)
+ butcher_results = list(/obj/item/food/snacks/hugemushroomslice = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "whacks"
@@ -152,7 +152,7 @@
bruised = 1
/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob, params)
- if(istype(I, /obj/item/reagent_containers/food/snacks/grown/mushroom))
+ if(istype(I, /obj/item/food/snacks/grown/mushroom))
if(stat == DEAD && !recovery_cooldown)
Recover()
qdel(I)
@@ -182,7 +182,7 @@
/mob/living/simple_animal/hostile/mushroom/harvest()
var/counter
for(counter=0, counter<=powerlevel, counter++)
- var/obj/item/reagent_containers/food/snacks/hugemushroomslice/S = new /obj/item/reagent_containers/food/snacks/hugemushroomslice(src.loc)
+ var/obj/item/food/snacks/hugemushroomslice/S = new (src.loc)
S.reagents.add_reagent("psilocybin", powerlevel)
S.reagents.add_reagent("omnizine", powerlevel)
S.reagents.add_reagent("synaptizine", powerlevel)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
index d40f38ee2674..1aa4eb05f49f 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
@@ -8,7 +8,7 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
speak_chance = 0
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/carpmeat = 1)
+ butcher_results = list(/obj/item/food/snacks/carpmeat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -68,7 +68,7 @@
melee_damage_lower = 2
melee_damage_upper = 2
speak_emote = list("blurps")
- butcher_results = list(/obj/item/reagent_containers/food/snacks/salmonmeat = 1)
+ butcher_results = list(/obj/item/food/snacks/salmonmeat = 1)
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
index 1d958b3e5617..91ffa0591cc8 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
@@ -51,7 +51,7 @@
pressure_resistance = 300
gold_core_spawnable = NO_SPAWN //too spooky for science
faction = list("undead") // did I mention ghost
- loot = list(/obj/item/reagent_containers/food/snacks/ectoplasm)
+ loot = list(/obj/item/food/snacks/ectoplasm)
del_on_death = TRUE
/mob/living/simple_animal/hostile/retaliate/ghost/Process_Spacemove(check_drift = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
index 0b36601101e7..afd4595d3bdd 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
@@ -51,7 +51,7 @@
user.do_attack_animation(src)
if(O.force)
if(prob(melee_block_chance))
- visible_message("[src] blocks [O] with its shield! ")
+ visible_message("[src] blocks [O] with its shield!")
else
var/damage = O.force
if(O.damtype == STAMINA)
@@ -60,11 +60,11 @@
visible_message("[src] is unharmed by [O]!")
return
adjustHealth(damage)
- visible_message("[src] has been attacked with [O] by [user]. ")
+ visible_message("[src] has been attacked with [O] by [user].")
playsound(loc, O.hitsound, 25, 1, -1)
else
to_chat(usr, "This weapon is ineffective, it does no damage.")
- visible_message("[user] gently taps [src] with [O]. ")
+ visible_message("[user] gently taps [src] with [O].")
/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj)
@@ -73,7 +73,7 @@
if(prob(ranged_block_chance))
visible_message("[src] blocks [Proj] with its shield!")
else
- if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+ if(Proj.damage_type == BRUTE || Proj.damage_type == BURN)
adjustHealth(Proj.damage)
return 0
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm
index 34a5ed2286de..4d4e048ce326 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm
@@ -241,8 +241,8 @@
if(Adjacent(O) && !O.anchored)
if(!istype(O, /obj/structure/spider))
choices += O
- if(choices.len)
- cocoon_target = input(src,"What do you wish to cocoon?") in null|choices
+ if(length(choices))
+ cocoon_target = tgui_input_list(src, "What do you wish to cocoon?", "Cocoon Selection", choices)
else
to_chat(src, "There is nothing nearby you can wrap.")
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
index e0416e2c3a4b..7a886a3d6dc6 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
@@ -34,7 +34,7 @@
if(L.reagents.has_reagent("terror_black_toxin", 100))
return ..()
var/inject_target = pick("chest", "head")
- L.adjustStaminaLoss(30)
+ L.apply_damage(30, STAMINA)
L.attack_animal(src)
if(L.can_inject(null, FALSE, inject_target, FALSE) || (HAS_TRAIT(L, TRAIT_HANDS_BLOCKED) && HAS_TRAIT(L, TRAIT_IMMOBILIZED)))
L.reagents.add_reagent("terror_black_toxin", 30) // inject our special poison
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress_terror.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress_terror.dm
index c1a6c4380907..4c8524671b3d 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress_terror.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress_terror.dm
@@ -49,7 +49,7 @@
queeneggs_action.button.name = "Empress Eggs"
/mob/living/simple_animal/hostile/poison/terror_spider/queen/empress/LayQueenEggs()
- var/eggtype = input("What kind of eggs?") as null|anything in list(TS_DESC_QUEEN, TS_DESC_MOTHER, TS_DESC_PRINCE, TS_DESC_PRINCESS, TS_DESC_RED, TS_DESC_GRAY, TS_DESC_GREEN, TS_DESC_BLACK, TS_DESC_PURPLE, TS_DESC_WHITE, TS_DESC_BROWN)
+ var/eggtype = tgui_input_list(src, "What kind of eggs?", "Egg laying", list(TS_DESC_QUEEN, TS_DESC_MOTHER, TS_DESC_PRINCE, TS_DESC_PRINCESS, TS_DESC_RED, TS_DESC_GRAY, TS_DESC_GREEN, TS_DESC_BLACK, TS_DESC_PURPLE, TS_DESC_WHITE, TS_DESC_BROWN))
var/numlings = input("How many in the batch?") as null|anything in list(1, 2, 3, 4, 5, 10, 15, 20, 30, 40, 50)
if(eggtype == null || numlings == null)
to_chat(src, "Cancelled.")
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm
index ba0d3f101a0a..c642423c91bb 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm
@@ -48,10 +48,10 @@
eggtypes += TS_DESC_BLACK
var/eggtype = pick(eggtypes)
if(client)
- eggtype = input("What kind of eggs?") as null|anything in eggtypes
+ eggtype = tgui_input_list(src, "What kind of eggs?", "Egg Laying", eggtypes)
if(!(eggtype in eggtypes))
to_chat(src, "Unrecognized egg type.")
- return 0
+ return FALSE
if(!isturf(loc))
// This has to be checked after we ask the user what egg type. Otherwise they could trigger prompt THEN move into a vent.
to_chat(src, "Eggs can only be laid while standing on a floor.")
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
index 6a5776414a85..6af2eade5624 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
@@ -40,7 +40,7 @@
/mob/living/simple_animal/hostile/poison/terror_spider/prince/spider_specialattack(mob/living/carbon/human/L)
L.KnockDown(10 SECONDS)
- L.adjustStaminaLoss(40)
+ L.apply_damage(40, STAMINA)
return ..()
/mob/living/simple_animal/hostile/poison/terror_spider/prince/Initialize(mapload)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm
index 0966d7ed7c1a..207ccf932639 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm
@@ -224,7 +224,7 @@
/mob/living/simple_animal/hostile/poison/terror_spider/queen/proc/NestPrompt()
- var/confirm = alert(src, "Are you sure you want to nest? You will be able to lay eggs, and smash walls, but not ventcrawl.","Nest?","Yes","No")
+ var/confirm = tgui_alert(src, "Are you sure you want to nest? You will be able to lay eggs, and smash walls, but not ventcrawl.", "Nest?", list("Yes","No"))
if(confirm == "Yes")
NestMode()
@@ -255,14 +255,14 @@
var/list/eggtypes = ListAvailableEggTypes()
var/list/eggtypes_uncapped = list(TS_DESC_RED, TS_DESC_GRAY, TS_DESC_GREEN)
- var/eggtype = input("What kind of eggs?") as null|anything in eggtypes
+ var/eggtype = tgui_input_list(src, "What kind of eggs?", "Laying Eggs", eggtypes)
if(canlay < 1)
// this was checked before input() but we have to check again to prevent them spam-clicking the popup.
to_chat(src, "Too soon to lay another egg.")
return
if(!(eggtype in eggtypes))
to_chat(src, "Unrecognized egg type.")
- return 0
+ return FALSE
// Multiple of eggtypes_uncapped can be laid at once. Other types must be laid one at a time (to prevent exploits)
var/numlings = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ghost_interaction.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ghost_interaction.dm
index bbf76c1d31dc..37d3a4cd8b48 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ghost_interaction.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ghost_interaction.dm
@@ -32,8 +32,8 @@
to_chat(user, "You are jobbanned from role of syndicate and/or terror spider.")
return
if(error_on_humanize == "")
- var/spider_ask = alert(humanize_prompt, "Join as Terror Spider?", "Yes", "No")
- if(spider_ask == "No" || !src || QDELETED(src))
+ var/spider_ask = tgui_alert(user, humanize_prompt, "Join as Terror Spider?", list("Yes", "No"))
+ if(spider_ask != "Yes" || !src || QDELETED(src))
return
else
to_chat(user, "Cannot inhabit spider: [error_on_humanize]")
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
index 2089e0cd180d..e5818e686512 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
@@ -460,7 +460,7 @@ GLOBAL_LIST_EMPTY(ts_infected_list)
if(T.stat == DEAD)
continue
targets |= T // we use |= instead of += to avoid adding src to the list twice
- var/mob/living/L = input("Choose a terror to watch.", "Selection") in targets
+ var/mob/living/L = tgui_input_list(src, "Choose a terror to watch.", "Brood Viewing", targets)
if(istype(L))
reset_perspective(L)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
index f179a75c3ba0..5b55bdf28eb4 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
@@ -41,7 +41,7 @@
var/inject_target = pick("chest","head")
L.attack_animal(src)
L.KnockDown(10 SECONDS)
- L.adjustStaminaLoss(30)
+ L.apply_damage(30, STAMINA)
if(L.can_inject(null, FALSE, inject_target, FALSE) || (HAS_TRAIT(L, TRAIT_HANDS_BLOCKED) && HAS_TRAIT(L, TRAIT_IMMOBILIZED)))
if(!IsTSInfected(L) && ishuman(L))
visible_message("[src] buries its long fangs deep into the [inject_target] of [L]!")
diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
index 260d3d8f2b04..2ba65d00bf45 100644
--- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
@@ -59,7 +59,7 @@
icon_state = "reindeer"
icon_living = "reindeer"
icon_dead = "reindeer-dead"
- butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 3)
+ butcher_results = list(/obj/item/food/snacks/meat = 3)
maxHealth = 80
health = 80
melee_damage_lower = 5
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 1b9056c5654f..6215f31061bb 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -49,7 +49,7 @@
speak_chance = 1//1% (1 in 100) chance every tick; So about once per 150 seconds, assuming an average tick is 1.5s
turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/cracker = 3)
+ butcher_results = list(/obj/item/food/snacks/cracker = 3)
response_help = "pets"
response_disarm = "gently moves aside"
diff --git a/code/modules/mob/living/simple_animal/posessed_object.dm b/code/modules/mob/living/simple_animal/posessed_object.dm
index 475a4f84da67..a81f305ec0e5 100644
--- a/code/modules/mob/living/simple_animal/posessed_object.dm
+++ b/code/modules/mob/living/simple_animal/posessed_object.dm
@@ -42,7 +42,7 @@
/mob/living/simple_animal/possessed_object/ghost() // Ghosting will return the object to normal, and will not disqualify the ghoster from various mid-round antag positions.
- var/response = alert(src, "End your possession of this object? (It will not stop you from respawning later)","Are you sure you want to ghost?","Ghost","Stay in body")
+ var/response = tgui_alert(src, "End your possession of this object? (It will not stop you from respawning later)", "Are you sure you want to ghost?", list("Ghost", "Stay in body"))
if(response != "Ghost")
return
lay_down()
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 2878a7d4595c..789e61be2146 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -29,7 +29,7 @@
faction = list("cult")
status_flags = CANPUSH
flying = TRUE
- loot = list(/obj/item/reagent_containers/food/snacks/ectoplasm)
+ loot = list(/obj/item/food/snacks/ectoplasm)
del_on_death = TRUE
deathmessage = "lets out a contented sigh as their form unwinds."
var/holy = FALSE
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index fd4525657ecc..767cdf87a6af 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -139,6 +139,9 @@
/// Can this simple mob crawl or not? If FALSE, it won't get immobilized by crawling
var/can_crawl = FALSE
+ /// Health of the mob before being admin-frozen, restored afterwards
+ var/admin_prev_health = null
+
/mob/living/simple_animal/Initialize(mapload)
. = ..()
GLOB.simple_animals[AIStatus] += src
@@ -374,9 +377,9 @@
return TRUE
/mob/living/simple_animal/proc/drop_loot()
- if(loot.len)
- for(var/i in loot)
- new i(loc)
+ if(length(loot))
+ for(var/item in loot)
+ new item(get_turf(src))
/mob/living/simple_animal/revive()
..()
diff --git a/code/modules/mob/living/simple_animal/slime/slime_mob.dm b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
index f9005b355a00..4db2674ec93a 100644
--- a/code/modules/mob/living/simple_animal/slime/slime_mob.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
@@ -250,7 +250,7 @@
if(!Proj)
return
attacked += 10
- if((Proj.damage_type == BURN))
+ if(Proj.damage_type == BURN)
adjustBruteLoss(-abs(Proj.damage)) //fire projectiles heals slimes.
Proj.on_hit(src)
else
diff --git a/code/modules/mob/living/simple_animal/slime/slime_powers.dm b/code/modules/mob/living/simple_animal/slime/slime_powers.dm
index 409365ba51b1..21ee5c4c6c6f 100644
--- a/code/modules/mob/living/simple_animal/slime/slime_powers.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime_powers.dm
@@ -29,12 +29,12 @@
if(C!=src && Adjacent(C))
choices += C
- var/mob/living/M = input(src,"Who do you wish to feed on?") in null|choices
+ var/mob/living/M = tgui_input_list(src, "Who do you wish to feed on?", "Feeding Selection", choices)
if(!M)
- return 0
+ return FALSE
if(CanFeedon(M))
Feedon(M)
- return 1
+ return TRUE
/datum/action/innate/slime/feed
name = "Feed"
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 1f0516b06408..17e28d7695b5 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -624,8 +624,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
/mob/proc/run_examinate(atom/A)
if(!has_vision(information_only = TRUE) && !isobserver(src))
- to_chat(src, chat_box_regular("Something is there but you can't see it."))
- return 1
+ to_chat(src, chat_box_regular("Something is there but you can't see it."), MESSAGE_TYPE_INFO, confidential = TRUE)
+ return TRUE
face_atom(A)
if(!client)
@@ -647,7 +647,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
result = A.examine(src)
client.recent_examines[ref_to_atom] = world.time + EXAMINE_MORE_WINDOW // set to when we should not examine something
- to_chat(src, chat_box_examine(result.Join("\n")))
+ to_chat(src, chat_box_examine(result.Join("\n")), MESSAGE_TYPE_INFO, confidential = TRUE)
/mob/proc/ret_grab(obj/effect/list_container/mobl/L as obj, flag)
if((!istype(l_hand, /obj/item/grab) && !istype(r_hand, /obj/item/grab)))
@@ -687,7 +687,6 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
/mob/verb/mode()
set name = "Activate Held Object"
set category = null
- set src = usr
DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(run_mode)))
@@ -758,7 +757,6 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
memory()
/mob/proc/update_flavor_text()
- set src in usr
if(usr != src)
to_chat(usr, "You can't change the flavor text of this mob")
return
@@ -766,7 +764,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
to_chat(usr, "You have to be conscious to change your flavor text")
return
- var/msg = input(usr,"Set the flavor text in your 'examine' verb. The flavor text should be a physical descriptor of your character at a glance.","Flavor Text",html_decode(flavor_text)) as message|null
+ var/msg = tgui_input_text(usr, "Set the flavor text in your 'examine' verb. The flavor text should be a physical descriptor of your character at a glance. SFW Drawn Art of your character is acceptable.", "Flavor Text", flavor_text, multiline = TRUE, encode = FALSE)
if(msg != null)
if(stat)
@@ -885,7 +883,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
var/eye_name = null
var/ok = "[is_admin ? "Admin Observe" : "Observe"]"
- eye_name = input("Please, select a player!", ok, null, null) as null|anything in creatures
+ eye_name = tgui_input_list(usr, "Please, select a player!", ok, creatures)
if(!eye_name)
return
@@ -964,7 +962,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
if(!Adjacent(usr))
return
if(IsFrozen(src) && !is_admin(usr))
- to_chat(usr, "Interacting with admin-frozen players is not permitted.")
+ to_chat(usr, "Interacting with admin-frozen players is not permitted.")
return
if(isLivingSSD(src) && M.client && M.client.send_ssd_warning(src))
return
@@ -1611,6 +1609,8 @@ GLOBAL_LIST_INIT(holy_areas, typecacheof(list(
. = stat
stat = new_stat
SEND_SIGNAL(src, COMSIG_MOB_STATCHANGE, new_stat, .)
+ if(.)
+ set_typing_indicator(FALSE)
///Makes a call in the context of a different usr. Use sparingly
/world/proc/invoke_callback_with_usr(mob/user_mob, datum/callback/invoked_callback, ...)
diff --git a/code/modules/mob/mob_emote.dm b/code/modules/mob/mob_emote.dm
index e3ca1fbf8f6f..1938c2c93f08 100644
--- a/code/modules/mob/mob_emote.dm
+++ b/code/modules/mob/mob_emote.dm
@@ -53,7 +53,7 @@
if(!message && !client)
CRASH("An empty custom emote was called from a client-less mob.")
else if(!message)
- input = sanitize(copytext_char(input(src,"Choose an emote to display.") as text|null, 1, MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext
+ input = tgui_input_text(src, "Choose an emote to display.", "Custom Emote")
else
input = message
diff --git a/code/modules/mob/mob_logout_base.dm b/code/modules/mob/mob_logout_base.dm
index 6658adc78e1a..59a13aacbeb7 100644
--- a/code/modules/mob/mob_logout_base.dm
+++ b/code/modules/mob/mob_logout_base.dm
@@ -1,4 +1,5 @@
/mob/Logout()
+ set_typing_indicator(FALSE)
SStgui.on_logout(src) // Cleanup any TGUIs the user has open
unset_machine()
GLOB.player_list -= src
diff --git a/code/modules/mob/mob_misc_procs.dm b/code/modules/mob/mob_misc_procs.dm
index e90fa1aa0e47..0be10259ed66 100644
--- a/code/modules/mob/mob_misc_procs.dm
+++ b/code/modules/mob/mob_misc_procs.dm
@@ -456,7 +456,7 @@
if(IsSleeping())
to_chat(src, "You are already sleeping.")
return
- if(alert(src, "You sure you want to sleep for a while?", "Sleep", "Yes", "No") == "Yes")
+ if(tgui_alert(src, "You sure you want to sleep for a while?", "Sleep", list("Yes", "No")) == "Yes")
SetSleeping(40 SECONDS, voluntary = TRUE) //Short nap
/mob/living/verb/rest()
@@ -660,11 +660,11 @@
for(var/i=1,i<=3,i++) //we get 3 attempts to pick a suitable name.
if(force)
- newname = clean_input("Pick a new name.", "Name Change", oldname, src)
+ newname = tgui_input_text(src, "Pick a new name.", "Name Change", oldname)
else
- newname = clean_input("You are a [role]. Would you like to change your name to something else? (You have 3 minutes to select a new name.)", "Name Change", oldname, src)
+ newname = tgui_input_text(src, "You are a [role]. Would you like to change your name to something else? (You have 3 minutes to select a new name.)", "Name Change", oldname, timeout = 3 MINUTES)
if(((world.time - time_passed) > 1800) && !force)
- alert(src, "Unfortunately, more than 3 minutes have passed for selecting your name. If you are a robot, use the Namepick verb; otherwise, adminhelp.", "Name Change")
+ tgui_alert(src, "Unfortunately, more than 3 minutes have passed for selecting your name. If you are a robot, use the Namepick verb; otherwise, adminhelp.", "Name Change")
return //took too long
newname = reject_bad_name(newname,allow_numbers) //returns null if the name doesn't meet some basic requirements. Tidies up a few other things like bad-characters.
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 5d77f2031a6d..6de1b1b4d79f 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -68,6 +68,9 @@
if(mob.notransform)
return 0 //This is sota the goto stop mobs from moving var
+ if(mob.throwing && mob.throwing.block_movement)
+ return
+
if(mob.control_object)
return Move_object(direct)
@@ -141,7 +144,8 @@
if(locate(/obj/item/grab, mob))
- delay += 7
+ if(!isalienhunter(mob)) // i hate grab code
+ delay += 7
if(istype(living_mob))
var/newdir = NONE
@@ -182,9 +186,8 @@
mob.setDir(get_dir(mob, mob.pulling)) // Face welding tanks and stuff when pulling
moving = 0
- if(mob && .)
- if(mob.throwing)
- mob.throwing.finalize(FALSE)
+ if(mob && . && mob.throwing)
+ mob.throwing.finalize(FALSE)
for(var/obj/O in mob)
O.on_mob_move(direct, mob)
diff --git a/code/modules/mob/mob_vars.dm b/code/modules/mob/mob_vars.dm
index f20d80240b2f..cfd97814511f 100644
--- a/code/modules/mob/mob_vars.dm
+++ b/code/modules/mob/mob_vars.dm
@@ -227,10 +227,10 @@
var/blood_state = BLOOD_STATE_NOT_BLOODY
/// Assoc list for tracking how "bloody" a mobs feet are, used for creating bloody foot/shoeprints on turfs when moving
var/list/bloody_feet = list(BLOOD_STATE_HUMAN = 0, BLOOD_STATE_XENO = 0, BLOOD_STATE_NOT_BLOODY = 0, BLOOD_BASE_ALPHA = BLOODY_FOOTPRINT_BASE_ALPHA)
- /// set when typing in an input window instead of chatline, this var could probably be removed soon enough
- var/hud_typing = 0
/// Affects if you have a typing indicator
var/typing
+ /// Affects if you have a thinking indicator
+ var/thinking
/// Last thing we typed in to the typing indicator, probably does not need to exist
var/last_typed
/// Last time we typed something in to the typing popup
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index a7f15f9a3fa5..dac25b74023f 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -24,15 +24,12 @@
mind.current = null // We best null their mind as well, otherwise /every/ single new player is going to explode the server a little more going in/out of the round
return ..()
-/mob/new_player/verb/new_player_panel()
- set src = usr
-
+/mob/new_player/proc/new_player_panel()
if(client.tos_consent || GLOB.configuration.system.external_tos_handler)
new_player_panel_proc()
else
privacy_consent()
-
/mob/new_player/proc/privacy_consent()
var/output = GLOB.join_tos
// Dont blank out the other window. This one is read only.
@@ -49,7 +46,6 @@
popup.open(0)
return
-
/mob/new_player/proc/new_player_panel_proc()
set waitfor = FALSE
var/real_name = client.prefs.active_character.real_name
@@ -58,16 +54,20 @@
var/output = "
", 240, 340)
popup.set_window_options("can_close=0")
popup.set_content(output)
- popup.open(0)
- return
+ popup.open(FALSE)
/mob/new_player/Stat()
..()
@@ -128,8 +127,6 @@
qdel(query)
src << browse(null, "window=privacy_consent")
client.tos_consent = TRUE
- // Now they have accepted TOS, we can log data
- client.chatOutput.sendClientData()
new_player_panel_proc()
if(href_list["consent_rejected"])
client.tos_consent = FALSE
@@ -182,9 +179,9 @@
to_chat(usr, "You must wait for the server to finish starting before you can join!")
return FALSE
- if(alert(src,"Are you sure you wish to observe? You cannot normally join the round after doing this!","Player Setup","Yes","No") == "Yes")
+ if(alert(usr, "Are you sure you wish to observe? You cannot normally join the round after doing this!", "Observe", "Yes", "No") == "Yes")
if(!client)
- return 1
+ return TRUE
var/mob/dead/observer/observer = new(src)
src << browse(null, "window=playersetup")
spawning = TRUE
@@ -598,7 +595,7 @@
client.prefs.active_character.language = "None"
/mob/new_player/proc/ViewManifest()
- GLOB.generic_crew_manifest.ui_interact(usr, state = GLOB.always_state)
+ GLOB.generic_crew_manifest.ui_interact(usr)
/mob/new_player/Move()
return 0
diff --git a/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm b/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
index 316f50b96faf..b022faf07a3b 100644
--- a/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
+++ b/code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm
@@ -96,6 +96,14 @@
name = "Test IPC Screen"
icon_state = "test"
+/datum/sprite_accessory/hair/ipc/ipc_screen_music
+ name = "Music IPC screen"
+ icon_state = "music"
+
+/datum/sprite_accessory/hair/ipc/ipc_screen_waiting
+ name = "Waiting IPC screen"
+ icon_state = "waiting"
+
/datum/sprite_accessory/hair/ipc/hesphiastos_alt_off
name = "Dark Hesphiastos Screen"
icon_state = "off"
@@ -131,17 +139,3 @@
icon_state = "rainbow_hesp_alt"
models_allowed = list("Hesphiastos Industries alt.")
-/datum/sprite_accessory/hair/ipc/fluff
- fluff = 1
-
-/datum/sprite_accessory/hair/ipc/fluff/lumi_eyes //Lumi Fluff hair
- name = "Lumi Eyes"
- icon_state = "lumi_eyes"
-
-/datum/sprite_accessory/hair/ipc/fluff/lumi_music //Lumi Fluff hair
- name = "Lumi Music"
- icon_state = "lumi_music"
-
-/datum/sprite_accessory/hair/ipc/fluff/lumi_waiting //Lumi Fluff hair
- name = "Lumi Waiting"
- icon_state = "lumi_waiting"
diff --git a/code/modules/mob/new_player/sprite_accessories/vox/vox_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/vox/vox_tail_markings.dm
index 6a3d50317ac5..890617eb6393 100644
--- a/code/modules/mob/new_player/sprite_accessories/vox/vox_tail_markings.dm
+++ b/code/modules/mob/new_player/sprite_accessories/vox/vox_tail_markings.dm
@@ -2,9 +2,9 @@
icon = 'icons/mob/sprite_accessories/vox/vox_tail_markings.dmi'
species_allowed = list("Vox")
-/datum/sprite_accessory/body_markings/tail/vox/vox_band
- name = "Vox Tail Band"
- icon_state = "band"
+/datum/sprite_accessory/body_markings/tail/vox/vox_bands
+ name = "Vox Tail Bands"
+ icon_state = "bands"
/datum/sprite_accessory/body_markings/tail/vox/vox_tip
name = "Vox Tail Tip"
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 1c71d62f4f63..1ec33fa2fc03 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -37,6 +37,8 @@
O.rename_self("AI", TRUE)
+ O.blurb_it()
+
INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src) // To prevent the proc from returning null. Todo: Convert to QDEL_IN
return O
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index f949dc33dd01..d69ed3d88808 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -1,6 +1,5 @@
-#define TYPING_INDICATOR_LIFETIME 30 * 10 //grace period after which typing indicator disappears regardless of text in chatbar
-
GLOBAL_LIST_EMPTY(typing_indicator)
+GLOBAL_LIST_EMPTY(thinking_indicator)
/**
* Toggles the floating chat bubble above a players head.
@@ -10,9 +9,8 @@ GLOBAL_LIST_EMPTY(typing_indicator)
* * me - Is the bubble being caused by the 'me' emote command
*/
/mob/proc/set_typing_indicator(state, me)
-
if(!GLOB.typing_indicator[bubble_icon])
- GLOB.typing_indicator[bubble_icon] = image('icons/mob/talk.dmi', null, "[bubble_icon]typing", FLY_LAYER)
+ GLOB.typing_indicator[bubble_icon] = image('icons/mob/talk.dmi', null, "[bubble_icon]_typing", ABOVE_HUD_LAYER)
var/image/I = GLOB.typing_indicator[bubble_icon]
I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
@@ -20,91 +18,93 @@ GLOBAL_LIST_EMPTY(typing_indicator)
var/mob/living/carbon/human/H = src
if(HAS_TRAIT(H, TRAIT_MUTE))
overlays -= GLOB.typing_indicator[bubble_icon]
- return
+ typing = FALSE
+ return FALSE
- if(client)
- if(stat != CONSCIOUS || is_muzzled() || (client.prefs.toggles & PREFTOGGLE_SHOW_TYPING) || (me && (client.prefs.toggles2 & PREFTOGGLE_2_EMOTE_BUBBLE)))
- overlays -= GLOB.typing_indicator[bubble_icon]
- else
- if(state)
- if(!typing)
- overlays += GLOB.typing_indicator[bubble_icon]
- typing = TRUE
- else
- if(typing)
- overlays -= GLOB.typing_indicator[bubble_icon]
- typing = FALSE
- return state
+ if(!client)
+ return FALSE
+
+ if(stat != CONSCIOUS || is_muzzled() || (client.prefs.toggles & PREFTOGGLE_SHOW_TYPING))
+ overlays -= GLOB.typing_indicator[bubble_icon]
+ typing = FALSE
+ return FALSE
+
+ if(state && !typing)
+ overlays += GLOB.typing_indicator[bubble_icon]
+ typing = TRUE
+
+ if(!state && typing)
+ overlays -= GLOB.typing_indicator[bubble_icon]
+ typing = FALSE
+
+ return state
+
+/**
+ * Toggles the floating thought bubble above a players head.
+ *
+ * Arguments:
+ * * state - Should a thought bubble be shown or hidden
+ */
+/mob/proc/set_thinking_indicator(state)
+ if(!GLOB.thinking_indicator[bubble_icon])
+ GLOB.thinking_indicator[bubble_icon] = image('icons/mob/talk.dmi', null, "[bubble_icon]_thinking", ABOVE_HUD_LAYER)
+ var/image/I = GLOB.thinking_indicator[bubble_icon]
+ I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
+
+ if(!client && !isliving(src))
+ return FALSE
+
+ if(stat != CONSCIOUS || (client.prefs.toggles & PREFTOGGLE_SHOW_TYPING))
+ overlays -= GLOB.thinking_indicator[bubble_icon]
+ thinking = FALSE
+ return FALSE
+
+ if(!state && thinking)
+ overlays -= GLOB.thinking_indicator[bubble_icon]
+ thinking = FALSE
+
+ if(state && !thinking)
+ overlays += GLOB.thinking_indicator[bubble_icon]
+ thinking = TRUE
+
+ return state
/mob/verb/say_wrapper()
set name = ".Say"
- set hidden = 1
+ set hidden = TRUE
set_typing_indicator(TRUE)
- hud_typing = 1
+ typing = TRUE
var/message = typing_input(src, "", "say (text)")
- hud_typing = 0
+ typing = FALSE
set_typing_indicator(FALSE)
if(message)
say_verb(message)
/mob/verb/me_wrapper()
set name = ".Me"
- set hidden = 1
-
+ set hidden = TRUE
set_typing_indicator(TRUE, TRUE)
- hud_typing = 1
+ typing = TRUE
var/message = typing_input(src, "", "me (text)")
- hud_typing = 0
+ typing = FALSE
set_typing_indicator(FALSE)
if(message)
me_verb(message)
-/mob/proc/handle_typing_indicator()
- if(client)
- if(!(client.prefs.toggles & PREFTOGGLE_SHOW_TYPING) && !hud_typing)
- var/temp = winget(client, "input", "text")
-
- if(temp != last_typed)
- last_typed = temp
- last_typed_time = world.time
-
- if(world.time > last_typed_time + TYPING_INDICATOR_LIFETIME)
- set_typing_indicator(FALSE)
- return
- if(length(temp) > 5 && findtext(temp, "Say \"", 1, 7))
- set_typing_indicator(TRUE)
- else if(length(temp) > 3 && findtext(temp, "Me ", 1, 5))
- set_typing_indicator(TRUE, TRUE)
-
- else
- set_typing_indicator(FALSE)
-
/client/verb/typing_indicator()
set name = "Show/Hide Typing Indicator"
set category = "Preferences"
- set desc = "Toggles showing an indicator when you are typing a message."
+ set desc = "Toggles showing a typing/thought indicator when you have TGUIsay open."
prefs.toggles ^= PREFTOGGLE_SHOW_TYPING
prefs.save_preferences(src)
- to_chat(src, "You will [(prefs.toggles & PREFTOGGLE_SHOW_TYPING) ? "no longer" : "now"] display a typing indicator.")
+ to_chat(src, "You will [(prefs.toggles & PREFTOGGLE_SHOW_TYPING) ? "no longer" : "now"] display a typing/thought indicator when you have TGUIsay open.")
// Clear out any existing typing indicator.
if(prefs.toggles & PREFTOGGLE_SHOW_TYPING)
if(istype(mob))
mob.set_typing_indicator(FALSE)
+ mob.set_thinking_indicator(FALSE)
SSblackbox.record_feedback("tally", "toggle_verbs", 1, "Toggle Typing Indicator (Speech)") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/client/verb/emote_indicator()
- set name = "Show/Hide Emote Typing Indicator"
- set category = "Preferences"
- set desc = "Toggles showing an indicator when you are typing an emote."
- prefs.toggles2 ^= PREFTOGGLE_2_EMOTE_BUBBLE
- prefs.save_preferences(src)
- to_chat(src, "You will [(prefs.toggles2 & PREFTOGGLE_2_EMOTE_BUBBLE) ? "no longer" : "now"] display a typing indicator for emotes.")
-
- SSblackbox.record_feedback("tally", "toggle_verbs", 1, "Toggle Typing Indicator (Emote)") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-#undef TYPING_INDICATOR_LIFETIME
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index bf016502b8cc..aa03bc2605ae 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -444,6 +444,7 @@
/obj/item/mod/control/emag_act(mob/user)
locked = !locked
to_chat(user, "Suit access [locked ? "locked" : "unlocked"]")
+ return TRUE
/obj/item/mod/control/emp_act(severity)
. = ..()
diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm
index 4ea624dee15f..2dbd92afebc3 100644
--- a/code/modules/mod/mod_core.dm
+++ b/code/modules/mod/mod_core.dm
@@ -233,7 +233,7 @@
mod.update_charge_alert()
/obj/item/mod/core/plasma
- name = "MOD plasma core"
+ name = "\improper MOD plasma core"
desc = "Nanotrasen's attempt at capitalizing on their plasma research. These plasma cores are refueled \
through plasma fuel, allowing for easy continued use by their mining squads."
icon_state = "mod-core-plasma"
@@ -290,6 +290,10 @@
var/charge_given = is_type_in_list(plasma, charger_list)
if(!charge_given)
return FALSE
+ if(charge_amount() == max_charge_amount())
+ to_chat(user, "[src] is already fully charged!")
+ // We didn't succeed but we don't want to treat it as an attackby
+ return TRUE
var/uses_needed = min(plasma.amount, ((max_charge_amount() - charge_amount()) / 2000))
if(!plasma.use(uses_needed))
return FALSE
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
index be9d2a4c26a4..0ae05ec490e6 100644
--- a/code/modules/mod/mod_types.dm
+++ b/code/modules/mod/mod_types.dm
@@ -187,6 +187,20 @@
/obj/item/mod/module/jetpack/advanced,
)
+/obj/item/mod/control/pre_equipped/safeguard/gamma
+ applied_cell = /obj/item/stock_parts/cell/hyper
+ applied_modules = list(
+ /obj/item/mod/module/storage/large_capacity,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/dispenser/mirage,
+ /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/holster,
+ /obj/item/mod/module/energy_shield/gamma,
+ )
+ default_pins = list(
+ /obj/item/mod/module/jetpack/advanced,
+ )
+
/obj/item/mod/control/pre_equipped/magnate
theme = /datum/mod_theme/magnate
applied_cell = /obj/item/stock_parts/cell/hyper
@@ -332,7 +346,7 @@
/obj/item/mod/control/pre_equipped/responsory/security
insignia_type = /obj/item/mod/module/insignia/security
- additional_module = /obj/item/mod/module/dispenser/mirage
+ additional_module = /obj/item/mod/module/anomaly_locked/firewall/prebuilt //Defence and flaming hot offence. Good for reflective blob, xenos, antagonists with guns
/obj/item/mod/control/pre_equipped/responsory/engineer
insignia_type = /obj/item/mod/module/insignia/engineer
diff --git a/code/modules/mod/mod_ui.dm b/code/modules/mod/mod_ui.dm
index 04a6a5a5fc4c..6daf62d55a3f 100644
--- a/code/modules/mod/mod_ui.dm
+++ b/code/modules/mod/mod_ui.dm
@@ -1,7 +1,10 @@
-/obj/item/mod/control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/mod/control/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/item/mod/control/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "MODsuit", name, 400, 525, master_ui, state)
+ ui = new(user, src, "MODsuit", name)
ui.open()
/obj/item/mod/control/ui_data(mob/user)
diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm
index 3cd7f17fd7a7..99fea77d8b82 100644
--- a/code/modules/mod/modules/module_kinesis.dm
+++ b/code/modules/mod/modules/module_kinesis.dm
@@ -250,6 +250,7 @@
use_power_cost = DEFAULT_CHARGE_DRAIN * 5
/obj/screen/fullscreen/cursor_catcher/kinesis
+ icon = 'icons/mob/screen_kinesis.dmi'
icon_state = "kinesis"
/obj/item/mod/module/anomaly_locked/kinesis/plus
diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm
index 912c1018b317..bb7c9138ba39 100644
--- a/code/modules/mod/modules/modules_antag.dm
+++ b/code/modules/mod/modules/modules_antag.dm
@@ -409,3 +409,159 @@
/obj/item/mod/module/ert_camera/on_suit_deactivation(deleting = FALSE)
QDEL_NULL(camera)
+
+///Energy Shield - Gives you a rechargeable energy shield that nullifies attacks.
+/obj/item/mod/module/energy_shield
+ name = "MOD energy shield module"
+ desc = "A personal, protective forcefield typically seen in military applications. \
+ This advanced deflector shield is essentially a scaled down version of those seen on starships, \
+ and the power cost can be an easy indicator of this. However, it is capable of blocking nearly any incoming attack, \
+ though with its' low amount of separate charges, the user remains mortal."
+ icon_state = "energy_shield"
+ complexity = 3
+ idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.5
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 2
+ incompatible_modules = list(/obj/item/mod/module/energy_shield)
+ /// Max charges of the shield.
+ var/max_charges = 3
+ /// The time it takes for the first charge to recover.
+ var/recharge_start_delay = 20 SECONDS
+ /// How much time it takes for charges to recover after they started recharging.
+ var/charge_increment_delay = 1 SECONDS
+ /// How much charge is recovered per recovery.
+ var/charge_recovery = 1
+ /// Whether or not this shield can lose multiple charges.
+ var/lose_multiple_charges = FALSE
+ /// The item path to recharge this shield.
+ var/recharge_path = null
+ /// The icon file of the shield.
+ var/shield_icon_file = 'icons/effects/effects.dmi'
+ /// The icon_state of the shield.
+ var/shield_icon = "shield-red"
+ /// Charges the shield should start with.
+ var/charges
+
+/obj/item/mod/module/energy_shield/Initialize(mapload)
+ . = ..()
+ charges = max_charges
+
+/obj/item/mod/module/energy_shield/on_suit_activation()
+ mod.AddComponent(/datum/component/shielded, max_charges = max_charges, recharge_start_delay = recharge_start_delay, charge_increment_delay = charge_increment_delay, \
+ charge_recovery = charge_recovery, lose_multiple_charges = lose_multiple_charges, recharge_path = recharge_path, starting_charges = charges, shield_icon_file = shield_icon_file, shield_icon = shield_icon)
+ RegisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS, PROC_REF(shield_reaction))
+
+/obj/item/mod/module/energy_shield/on_suit_deactivation(deleting = FALSE)
+ var/datum/component/shielded/shield = mod.GetComponent(/datum/component/shielded)
+ charges = shield.current_charges
+ qdel(shield)
+ UnregisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS)
+
+/obj/item/mod/module/energy_shield/proc/shield_reaction(mob/living/carbon/human/owner,
+ atom/movable/hitby,
+ attack_text = "the attack",
+ final_block_chance = 0,
+ damage = 0,
+ attack_type = MELEE_ATTACK,
+ damage_type = BRUTE
+)
+ SIGNAL_HANDLER
+
+ if(SEND_SIGNAL(mod, COMSIG_ITEM_HIT_REACT, owner, hitby, damage, attack_type) & COMPONENT_BLOCK_SUCCESSFUL)
+ drain_power(use_power_cost)
+ return SHIELD_BLOCK
+ return NONE
+
+/obj/item/mod/module/energy_shield/gamma
+ shield_icon = "shield-old"
+
+/obj/item/mod/module/anomaly_locked/teslawall
+ name = "MOD arc-shield module" // temp
+ desc = "A module that uses a flux core to project an unstable protective shield." //change
+ icon_state = "tesla"
+ complexity = 3
+ idle_power_cost = DEFAULT_CHARGE_DRAIN * 3
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 75
+ accepted_anomalies = list(/obj/item/assembly/signaler/anomaly/flux)
+ incompatible_modules = list(/obj/item/mod/module/energy_shield, /obj/item/mod/module/anomaly_locked)
+ ///Copy paste of shielded code wheeeey
+ /// Max charges of the shield.
+ var/max_charges = 80 // Less charges because not gamma / this one is real shocking
+ /// The time it takes for the first charge to recover.
+ var/recharge_start_delay = 10 SECONDS
+ /// How much time it takes for charges to recover after they started recharging.
+ var/charge_increment_delay = 10 SECONDS
+ /// How much charge is recovered per recovery.
+ var/charge_recovery = 20
+ /// Whether or not this shield can lose multiple charges.
+ var/lose_multiple_charges = TRUE
+ /// The item path to recharge this shield.
+ var/recharge_path = null
+ /// The icon file of the shield.
+ var/shield_icon_file = 'icons/effects/effects.dmi'
+ /// The icon_state of the shield.
+ var/shield_icon = "electricity3"
+ /// Charges the shield should start with.
+ var/charges
+
+ /// Teslawall specific variables.
+ var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE
+ var/zap_range = 5
+ var/power = 12500
+ var/shock_damage = 30
+
+/obj/item/mod/module/anomaly_locked/teslawall/Initialize(mapload)
+ . = ..()
+ charges = max_charges
+
+/obj/item/mod/module/anomaly_locked/teslawall/on_suit_activation()
+ . = ..()
+ if(!core)
+ return FALSE
+ mod.AddComponent(/datum/component/shielded, max_charges = max_charges, recharge_start_delay = recharge_start_delay, charge_increment_delay = charge_increment_delay, \
+ charge_recovery = charge_recovery, lose_multiple_charges = lose_multiple_charges, show_charge_as_alpha = lose_multiple_charges, recharge_path = recharge_path, starting_charges = charges, shield_icon_file = shield_icon_file, shield_icon = shield_icon)
+ RegisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS, PROC_REF(shield_reaction))
+ ADD_TRAIT(mod.wearer, TRAIT_SHOCKIMMUNE, UNIQUE_TRAIT_SOURCE(src))
+
+/obj/item/mod/module/anomaly_locked/teslawall/on_suit_deactivation(deleting = FALSE)
+ . = ..()
+ if(!core)
+ return FALSE
+ var/datum/component/shielded/shield = mod.GetComponent(/datum/component/shielded)
+ charges = shield.current_charges
+ qdel(shield)
+ UnregisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS)
+ REMOVE_TRAIT(mod.wearer, TRAIT_SHOCKIMMUNE, UNIQUE_TRAIT_SOURCE(src))
+
+/obj/item/mod/module/anomaly_locked/teslawall/proc/shield_reaction(mob/living/carbon/human/owner,
+ atom/movable/hitby,
+ attack_text = "the attack",
+ final_block_chance = 0,
+ damage = 0,
+ attack_type = MELEE_ATTACK,
+ damage_type = BRUTE
+)
+ SIGNAL_HANDLER
+
+ if(SEND_SIGNAL(mod, COMSIG_ITEM_HIT_REACT, owner, hitby, damage, attack_type) & COMPONENT_BLOCK_SUCCESSFUL)
+ drain_power(use_power_cost)
+ arc_flash(owner, hitby, damage, attack_type)
+ return SHIELD_BLOCK
+ return NONE
+
+/obj/item/mod/module/anomaly_locked/teslawall/proc/arc_flash(mob/owner, atom/movable/hitby, damage, attack_type)
+ if((attack_type == PROJECTILE_ATTACK || attack_type == THROWN_PROJECTILE_ATTACK) && prob(33))
+ tesla_zap(owner, zap_range, power, zap_flags)
+ return
+ if(isitem(hitby))
+ if(isliving(hitby.loc))
+ var/mob/living/M = hitby.loc
+ M.electrocute_act(shock_damage, owner, flags = SHOCK_NOGLOVES)
+ M.KnockDown(3 SECONDS)
+ else if(isliving(hitby))
+ var/mob/living/M = hitby
+ M.electrocute_act(shock_damage, owner, flags = SHOCK_NOGLOVES)
+ M.KnockDown(3 SECONDS)
+
+/obj/item/mod/module/anomaly_locked/teslawall/prebuilt
+ prebuilt = TRUE
+ removable = FALSE // No switching it into another suit / no free anomaly core
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
index bf118f3edad4..f87ae33c3a57 100644
--- a/code/modules/mod/modules/modules_engineering.dm
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -145,7 +145,7 @@
if(firer && isliving(firer))
var/mob/living/L = firer
L.apply_status_effect(STATUS_EFFECT_IMPACT_IMMUNE)
- L.throw_at(target, 15, 1, L, FALSE, FALSE, callback = CALLBACK(L, TYPE_PROC_REF(/mob/living, remove_status_effect), STATUS_EFFECT_IMPACT_IMMUNE))
+ L.throw_at(target, 15, 1, L, FALSE, FALSE, callback = CALLBACK(L, TYPE_PROC_REF(/mob/living, remove_status_effect), STATUS_EFFECT_IMPACT_IMMUNE), block_movement = FALSE)
/obj/item/projectile/tether/Destroy()
QDEL_NULL(chain)
@@ -174,7 +174,6 @@
item_state = "nozzleatmos"
safety = 0
max_water = 500
- power = 8
precision = 1
cooling_power = 5
w_class = WEIGHT_CLASS_HUGE
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 0e97863a5324..aca7ce0cb29f 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -303,7 +303,7 @@
incompatible_modules = list(/obj/item/mod/module/dispenser)
cooldown_time = 5 SECONDS
/// Path we dispense.
- var/dispense_type = /obj/item/reagent_containers/food/snacks/burger/cheese
+ var/dispense_type = /obj/item/food/snacks/burger/cheese
/// Time it takes for us to dispense.
var/dispense_time = 0 SECONDS
diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm
index 84d421147f98..6927df61279a 100644
--- a/code/modules/mod/modules/modules_security.dm
+++ b/code/modules/mod/modules/modules_security.dm
@@ -166,3 +166,126 @@
/// Remove the image from the modsuit wearer's screen
/obj/effect/temp_visual/sonar_ping/proc/remove_mind(mob/living/looker)
looker?.client?.images -= modsuit_image
+
+///Firewall. Deployable dropwall that lights projectiles on fire.
+/obj/item/mod/module/anomaly_locked/firewall
+ name = "MOD firewall module"
+ desc = "A module that uses a pyroclastic core to make immolating dropwalls."
+ icon_state = "firewall"
+ overlay_state_inactive = "module_mirage_grenade"
+ module_type = MODULE_ACTIVE
+ complexity = 3
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 5
+ cooldown_time = 20 SECONDS
+ accepted_anomalies = list(/obj/item/assembly/signaler/anomaly/pyro)
+ /// Path we dispense.
+ var/dispense_type = /obj/item/grenade/barrier/dropwall/firewall
+
+/obj/item/mod/module/anomaly_locked/firewall/on_use()
+ . = ..()
+ if(!.)
+ return
+ var/obj/item/dispensed = new dispense_type(mod.wearer.loc)
+ mod.wearer.put_in_hands(dispensed)
+ playsound(src, 'sound/machines/click.ogg', 100, TRUE)
+ drain_power(use_power_cost)
+ var/obj/item/grenade/grenade = dispensed
+ grenade.attack_self(mod.wearer)
+ return grenade
+
+/obj/item/mod/module/anomaly_locked/firewall/prebuilt
+ prebuilt = TRUE
+ removable = FALSE // No switching it into another suit / no free anomaly core
+
+/// Vortex arm mounted shotgun. Fucks up reality in front of it, very power draining. Compeating with the vortex arm and stealth armor after all
+/obj/item/mod/module/anomaly_locked/vortex_shotgun
+ name = "MOD vortex shotgun module"
+ desc = "A module that uses a vortex core to rend the fabric of space time in front of it."
+ icon_state = "vortex"
+ module_type = MODULE_ACTIVE
+ complexity = 3
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 750
+ device = /obj/item/gun/energy/vortex_shotgun
+ accepted_anomalies = list(/obj/item/assembly/signaler/anomaly/vortex)
+
+/obj/item/mod/module/anomaly_locked/vortex_shotgun/Initialize(mapload)
+ . = ..()
+ RegisterSignal(device, COMSIG_GUN_FIRED, PROC_REF(on_gun_fire))
+
+/obj/item/mod/module/anomaly_locked/vortex_shotgun/proc/on_gun_fire()
+ SIGNAL_HANDLER
+ if(!drain_power(use_power_cost)) //Drain the rest dry
+ drain_power(mod.core.check_charge())
+
+/obj/item/mod/module/anomaly_locked/vortex_shotgun/prebuilt
+ prebuilt = TRUE
+ removable = FALSE // No switching it into another suit / no free anomaly core
+
+///Cryogrenade. Freezes foes in place, cools them
+/obj/item/mod/module/anomaly_locked/cryogrenade
+ name = "MOD Cryogrenade module"
+ desc = "A module that uses a cryogenic core to make freezing grenades."
+ icon_state = "cryogrenade"
+ overlay_state_inactive = "module_mirage_grenade"
+ module_type = MODULE_ACTIVE
+ complexity = 3
+ use_power_cost = DEFAULT_CHARGE_DRAIN * 5
+ cooldown_time = 20 SECONDS
+ accepted_anomalies = list(/obj/item/assembly/signaler/anomaly/cryo)
+ /// Path we dispense.
+ var/dispense_type = /obj/item/grenade/cryogrenade_mod
+
+/obj/item/mod/module/anomaly_locked/cryogrenade/on_use()
+ . = ..()
+ if(!.)
+ return
+ var/obj/item/dispensed = new dispense_type(mod.wearer.loc)
+ mod.wearer.put_in_hands(dispensed)
+ playsound(src, 'sound/machines/click.ogg', 100, TRUE)
+ drain_power(use_power_cost)
+ var/obj/item/grenade/grenade = dispensed
+ grenade.attack_self(mod.wearer)
+ return grenade
+
+/obj/item/mod/module/anomaly_locked/cryogrenade/prebuilt
+ prebuilt = TRUE
+ removable = FALSE // No switching it into another suit / no free anomaly core
+
+/obj/item/grenade/cryogrenade_mod
+ name = "cryogenic grenade"
+ desc = "A very cold grenade."
+ icon = 'icons/obj/grenade.dmi'
+ icon_state = "gluon"
+ item_state = "grenade"
+ var/freeze_range = 4
+ var/stamina_damage = 60
+ var/body_adjustment = -230
+ var/reagent_volume = 15
+ /// Mob that threw the grenade.
+ var/mob/living/thrower
+
+
+/obj/item/grenade/cryogrenade_mod/Destroy()
+ thrower = null
+ return ..()
+
+/obj/item/grenade/cryogrenade_mod/attack_self(mob/user)
+ . = ..()
+ thrower = user
+
+/obj/item/grenade/cryogrenade_mod/prime()
+ update_mob()
+ playsound(loc, 'sound/effects/empulse.ogg', 50, TRUE)
+ for(var/turf/simulated/floor/T in view(freeze_range, loc))
+ T.MakeSlippery(TURF_WET_ICE)
+ for(var/mob/living/carbon/C in T)
+ if(C == thrower)
+ continue
+ C.adjustStaminaLoss(stamina_damage)
+ C.adjust_bodytemperature(body_adjustment)
+ C.apply_status_effect(/datum/status_effect/freon)
+ if(C.reagents)
+ C.reagents.add_reagent("frostoil", reagent_volume)
+ C.reagents.add_reagent("ice", reagent_volume)
+ qdel(src)
+
diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm
index 0fc0a4b566ee..6388ad1bb844 100644
--- a/code/modules/newscaster/obj/newscaster.dm
+++ b/code/modules/newscaster/obj/newscaster.dm
@@ -191,12 +191,15 @@
return
ui_interact(user)
-/obj/machinery/newscaster/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/newscaster/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/newscaster/ui_interact(mob/user, datum/tgui/ui = null)
if(can_scan(user))
scanned_user = get_scanned_user(user)["name"]
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "Newscaster", name, 800, 600)
+ ui = new(user, src, "Newscaster", name)
ui.open()
ui.set_autoupdate(FALSE)
diff --git a/code/modules/newscaster/obj/newspaper.dm b/code/modules/newscaster/obj/newspaper.dm
index e896a3e4c7d4..1a833285ea93 100644
--- a/code/modules/newscaster/obj/newspaper.dm
+++ b/code/modules/newscaster/obj/newspaper.dm
@@ -163,8 +163,7 @@
if(scribble_page == curr_page)
to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?")
else
- var/s = strip_html(input(user, "Write something", "Newspaper", ""))
- s = sanitize(copytext(s, 1, MAX_MESSAGE_LEN))
+ var/s = tgui_input_text(user, "Write something", "Newspaper")
if(!s || !Adjacent(user))
return
scribble_page = curr_page
diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm
index c589dea44301..a9744ad47a0e 100644
--- a/code/modules/ninja/suit/suit_initialisation.dm
+++ b/code/modules/ninja/suit/suit_initialisation.dm
@@ -13,7 +13,7 @@
suitBusy = 1
- if(suitActive && (alert("Confirm suit systems shutdown? This cannot be halted once it has started.", "Confirm Shutdown", "Yes", "No") == "Yes"))
+ if(suitActive && (tgui_alert(usr, "Confirm suit systems shutdown? This cannot be halted once it has started.", "Confirm Shutdown", list("Yes", "No")) == "Yes"))
to_chat(usr, "Now de-initializing...")
sleep(15)
diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm
index 6084d14e97f6..9a78635dc529 100644
--- a/code/modules/paperwork/carbonpaper.dm
+++ b/code/modules/paperwork/carbonpaper.dm
@@ -28,7 +28,6 @@
/obj/item/paper/carbon/verb/removecopy()
set name = "Remove carbon-copy"
set category = "Object"
- set src in usr
if(copied == 0)
var/obj/item/paper/carbon/c = src
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 7763f922d5f2..2de58c9f39ab 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -107,6 +107,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
emagged = TRUE
req_one_access = list()
to_chat(user, "The transmitters realign to an unknown source!")
+ return TRUE
else
to_chat(user, "You swipe the card through [src], but nothing happens.")
@@ -117,10 +118,13 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
return TRUE
return FALSE
-/obj/machinery/photocopier/faxmachine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/photocopier/faxmachine/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/photocopier/faxmachine/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "FaxMachine", name, 540, 300, master_ui, state)
+ ui = new(user, src, "FaxMachine", name)
ui.open()
/obj/machinery/photocopier/faxmachine/ui_data(mob/user)
@@ -197,8 +201,10 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
. = FALSE
if("rename") // rename the item that is currently in the fax machine
if(copyitem)
- var/n_name = sanitize(copytext_char(input(usr, "What would you like to label the fax?", "Fax Labelling", copyitem.name) as text, 1, MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext
- if((copyitem && copyitem.loc == src && usr.stat == 0))
+ var/n_name = tgui_input_text(usr, "What would you like to label the fax?", "Fax Labelling", copyitem.name)
+ if(!n_name)
+ return
+ if(copyitem && copyitem.loc == src && usr.stat == 0)
if(istype(copyitem, /obj/item/paper))
copyitem.name = "[(n_name ? "[n_name]" : initial(copyitem.name))]"
copyitem.desc = "This is a paper titled '" + copyitem.name + "'."
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index db62ec6b9fdf..630d3140b111 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -83,10 +83,13 @@
return
to_chat(user, "You find nothing in [src].")
-/obj/structure/filingcabinet/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/structure/filingcabinet/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/structure/filingcabinet/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "FilingCabinet", name, 400, 300, master_ui, state)
+ ui = new(user, src, "FilingCabinet", name)
ui.open()
/obj/structure/filingcabinet/ui_data(mob/user)
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index e85bc133506a..11726195d055 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -40,7 +40,7 @@
if(mode)
to_chat(user, "You turn on \the [src].")
//Now let them chose the text.
- var/str = copytext(reject_bad_text(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
+ var/str = reject_bad_text(tgui_input_text(user,"Label text?", "Set label"))
if(!str || !length(str))
to_chat(user, "Invalid text.")
return
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index bb2290f27734..8ab84ad5ca32 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -83,7 +83,7 @@
data = "[header]
[infolinks ? info_links : info]
[footer][stamps]"
if(view)
var/datum/browser/popup = new(user, "Paper[UID()]", , paper_width, paper_height)
- popup.stylesheets = list()
+ popup.include_default_stylesheet = FALSE
popup.set_content(data)
if(!stars)
popup.add_script("marked.js", 'html/browser/marked.js')
@@ -373,7 +373,7 @@
topic_href_write(id, input_element)
if(href_list["write"])
var/id = href_list["write"]
- var/input_element = input("Enter what you want to write:", "Write", null, null) as message
+ var/input_element = input("Enter what you want to write:", "Write") as message
topic_href_write(id, input_element)
/obj/item/paper/attackby(obj/item/P, mob/living/user, params)
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 1977326bcee4..145123149fe3 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -201,10 +201,10 @@
. = ..()
/obj/item/paper_bundle/proc/rename(mob/user)
- var/n_name = sanitize(copytext_char(input(user, "What would you like to label the bundle?", "Bundle Labelling", name) as text, 1, MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext
- if((loc == user && !user.stat))
- name = "[(n_name ? "[n_name]" : "paper bundle")]"
-
+ var/n_name = tgui_input_text(user, "What would you like to label the bundle?", "Bundle Labelling", name)
+ if(!Adjacent(user) || !n_name || user.stat)
+ return
+ name = "[(n_name ? "[n_name]" : "paper bundle")]"
add_fingerprint(user)
/obj/item/paper_bundle/AltShiftClick(mob/user)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 83def2f64a9a..9ce82fb89937 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -130,10 +130,7 @@
transfered = reagents.trans_to(M, transfer_amount)
to_chat(user, "You sneakily stab [M] with the pen.")
add_attack_logs(user, M, "Stabbed with (sleepy) [src]. [transfered]u of reagents transfered from pen containing [english_list(contained)].")
- for(var/datum/reagent/R as anything in reagents.reagent_list)
- if(initial(R.id) == "????") // Yes this is a specific case that we don't really want
- continue
- reagents.reaction(M, REAGENT_INGEST, 0.1)
+ reagents.reaction(M, REAGENT_INGEST, 0.1)
return TRUE
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 85e7ecc51402..01fd87c905b4 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -46,7 +46,7 @@
return attack_hand(user)
/obj/machinery/photocopier/attack_ghost(mob/user)
- return attack_hand(user)
+ ui_interact(user)
/obj/machinery/photocopier/attack_hand(mob/user)
if(..())
@@ -365,10 +365,13 @@
copy(document, scancopy = TRUE)
-/obj/machinery/photocopier/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/photocopier/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/photocopier/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "Photocopier", name, 402, 368, master_ui, state)
+ ui = new(user, src, "Photocopier", name)
ui.open()
/obj/machinery/photocopier/ui_data(mob/user)
@@ -432,7 +435,7 @@
return
if(stat & (BROKEN|NOPOWER))
return
- var/text = input("Enter what you want to write:", "Write", null, null) as message
+ var/text = tgui_input_text(user, "Enter what you want to write:", "Write", multiline = TRUE, encode = FALSE)
if(!text)
return
if(toner < 1 || !user)
@@ -567,6 +570,7 @@
if(!emagged)
emagged = TRUE
to_chat(user, "You overload [src]'s laser printing mechanism.")
+ return TRUE
else
to_chat(user, "[src]'s laser printing mechanism is already overloaded!")
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 4c4476b84812..010bd5d0dbf4 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -41,7 +41,9 @@
/obj/item/photo/attackby(obj/item/P as obj, mob/user as mob, params)
if(is_pen(P) || istype(P, /obj/item/toy/crayon))
- var/txt = sanitize(input(user, "What would you like to write on the back?", "Photo Writing", null) as text)
+ var/txt = tgui_input_text(user, "What would you like to write on the back?", "Photo Writing")
+ if(!txt)
+ return
txt = copytext(txt, 1, 128)
if(loc == user && user.stat == 0)
scribble = txt
@@ -106,9 +108,11 @@
onclose(usr, "Photo[UID()]")
/obj/item/photo/proc/rename(mob/user)
- var/n_name = sanitize(copytext_char(input(user, "What would you like to label the photo?", "Photo Labelling", name) as text, 1, MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext
+ var/n_name = tgui_input_text(user, "What would you like to label the photo?", "Photo Labelling", name)
+ if(!n_name)
+ return
//loc.loc check is for making possible renaming photos in clipboards
- if(( (loc == user || (loc.loc && loc.loc == user)) && !user.stat))
+ if(((loc == user || (loc.loc && loc.loc == user)) && !user.stat))
name = "[(n_name ? "[n_name]" : "photo")]"
add_fingerprint(user)
@@ -418,7 +422,7 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
var/datum/picture/P = new()
if(istype(src,/obj/item/camera/digital))
- P.fields["name"] = input(user,"Name photo:","photo")
+ P.fields["name"] = tgui_input_text(user, "Name photo:", "Photo", encode = FALSE)
if(!P.fields["name"])
P.fields["name"] = "Photo [current_photo_num]"
current_photo_num++
diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm
index 7f2d6106a409..5539477190a4 100644
--- a/code/modules/paperwork/silicon_photography.dm
+++ b/code/modules/paperwork/silicon_photography.dm
@@ -59,10 +59,11 @@
if(!selection)
return
- var/obj/item/photo/P = new/obj/item/photo()
+ var/obj/item/photo/P = new /obj/item/photo()
P.construct(selection)
P.show(usr)
- to_chat(usr, P.desc)
+ if(P.desc)
+ to_chat(usr, P.desc, MESSAGE_TYPE_INFO)
// TG uses a special garbage collector.. qdel(P)
qdel(P) //so 10 thousand pictures items are not left in memory should an AI take them and then view them all.
@@ -105,7 +106,6 @@
set category = "AI Commands"
set name = "Take Image"
set desc = "Takes an image"
- set src in usr
toggle_camera_mode()
@@ -113,7 +113,6 @@
set category = "AI Commands"
set name = "View Images"
set desc = "View images"
- set src in usr
viewpictures()
@@ -121,7 +120,6 @@
set category = "AI Commands"
set name = "Delete Image"
set desc = "Delete image"
- set src in usr
deletepicture(src)
@@ -129,7 +127,6 @@
set category ="Robot Commands"
set name = "Take Image"
set desc = "Takes an image"
- set src in usr
toggle_camera_mode()
@@ -137,7 +134,6 @@
set category ="Robot Commands"
set name = "View Images"
set desc = "View images"
- set src in usr
viewpictures()
@@ -145,7 +141,6 @@
set category = "Robot Commands"
set name = "Delete Image"
set desc = "Delete a local image"
- set src in usr
// Explicitly only allow deletion from the local camera
deletepicture(src)
diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm
index 5b231a817017..fda0e642d11d 100644
--- a/code/modules/paperwork/ticketmachine.dm
+++ b/code/modules/paperwork/ticketmachine.dm
@@ -43,6 +43,7 @@
qdel(ticket)
tickets.Cut()
update_icon()
+ return TRUE
/obj/machinery/ticket_machine/Initialize(mapload)
. = ..()
diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index 2e309298cad6..aaa3c6aeabdb 100644
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -381,11 +381,13 @@ GLOBAL_LIST_EMPTY(PDAs)
O.show_message(text("[bicon(src)] *[ttone]*"))
/obj/item/pda/proc/set_ringtone(mob/user)
- var/new_tone = input("Please enter new ringtone", name, ttone) as text
+ var/new_tone = tgui_input_text(user, "Please enter new ringtone", name, ttone, max_length = 20, encode = FALSE)
new_tone = trim(new_tone)
+
if(!in_range(src, user) || loc != user)
close(user)
return FALSE
+
if(!new_tone)
return FALSE
@@ -393,7 +395,8 @@ GLOBAL_LIST_EMPTY(PDAs)
to_chat(user, "The PDA softly beeps.")
close(user)
return TRUE
- ttone = sanitize(copytext_char(new_tone, 1, 20)) // SS220 EDIT - ORIGINAL: copytext
+
+ ttone = new_tone
return TRUE
/obj/item/pda/process()
diff --git a/code/modules/pda/ai_pda.dm b/code/modules/pda/ai_pda.dm
index ec8cdea837a5..d23a9b1e7c5a 100644
--- a/code/modules/pda/ai_pda.dm
+++ b/code/modules/pda/ai_pda.dm
@@ -16,7 +16,6 @@
/obj/item/pda/silicon/verb/cmd_send_pdamesg()
set category = "AI IM"
set name = "Send PDA Message"
- set src in usr
if(!can_use())
return
@@ -34,7 +33,6 @@
/obj/item/pda/silicon/verb/cmd_show_message_log()
set category = "AI IM"
set name = "Show Message Log"
- set src in usr
if(!can_use())
return
@@ -53,7 +51,6 @@
/obj/item/pda/silicon/verb/cmd_toggle_pda_receiver()
set category = "AI IM"
set name = "Toggle Sender/Receiver"
- set src in usr
if(!can_use())
return
@@ -65,7 +62,6 @@
/obj/item/pda/silicon/verb/cmd_toggle_pda_silent()
set category = "AI IM"
set name = "Toggle Ringer"
- set src in usr
if(!can_use())
return
@@ -77,7 +73,6 @@
if((honkamt > 0) && (prob(60)))//For clown virus.
honkamt--
playsound(loc, 'sound/items/bikehorn.ogg', 30, 1)
- return
/obj/item/pda/silicon/ai/can_use()
var/mob/living/silicon/ai/AI = usr
diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm
index dd1a5ef030cf..9ca068dd81f5 100644
--- a/code/modules/pda/cart.dm
+++ b/code/modules/pda/cart.dm
@@ -341,3 +341,4 @@
my_game.hacked = TRUE
to_chat(user, "TR4P_M45T3R.mod successfully initialized. ToS violated. User Agreement nullified. Gotta pwn them all.")
to_chat(user, "You can now create trapped versions of any mob in your collection that will damage hunters who attempt to capture it.")
+ return TRUE
diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm
index 6e2da7c5af51..5779b0944f10 100644
--- a/code/modules/pda/cart_apps.dm
+++ b/code/modules/pda/cart_apps.dm
@@ -25,9 +25,13 @@
if(params["msgnum"])
switch(text2num(params["msgnum"]))
if(1)
- message1 = clean_input("Line 1", "Enter Message Text", message1)
+ message1 = tgui_input_text(usr, "Line 1", "Enter Message Text", message1, encode = FALSE)
+ if(!message1)
+ return
if(2)
- message2 = clean_input("Line 2", "Enter Message Text", message2)
+ message2 = tgui_input_text(usr, "Line 2", "Enter Message Text", message2, encode = FALSE)
+ if(!message2)
+ return
if("Status")
switch(text2num(params["statdisp"]))
diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm
index 63d8edb71355..b2b2be66a0fb 100644
--- a/code/modules/pda/core_apps.dm
+++ b/code/modules/pda/core_apps.dm
@@ -73,12 +73,12 @@
switch(action)
if("Edit")
- var/n = input("Please enter message", name, note) as message
+ var/n = tgui_input_text(usr, "Please enter message", name, note, multiline = TRUE, encode = FALSE)
+ if(!n)
+ return
+
if(pda.loc == usr)
- // TGUI will auto-reject supplied HTML
- // However, the admin var-edit window will not
- // SANITISATION IS IMPORTANT. DO NOT NEGLECT.
- note = adminscrub(n)
+ note = n
else
pda.close(usr)
diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm
index 18550c2745f8..2d1ca09cb980 100644
--- a/code/modules/pda/messenger.dm
+++ b/code/modules/pda/messenger.dm
@@ -121,10 +121,9 @@
/datum/data/pda/app/messenger/proc/create_message(mob/living/U, obj/item/pda/P)
- var/t = input(U, "Please enter message", name, null) as text|null
+ var/t = tgui_input_text(U, "Please enter your message", name)
if(!t)
return
- t = sanitize(copytext_char(t, 1, MAX_MESSAGE_LEN)) // SS220 EDIT - ORIGINAL: copytext
if(!t || !istype(P))
return
if(!in_range(pda, U) && pda.loc != U)
diff --git a/code/modules/pda/messenger_plugins.dm b/code/modules/pda/messenger_plugins.dm
index 5c075dcdbace..74b1aabdb577 100644
--- a/code/modules/pda/messenger_plugins.dm
+++ b/code/modules/pda/messenger_plugins.dm
@@ -42,32 +42,17 @@
name = "*Detonate*"
icon = "exclamation-circle"
-/datum/data/pda/messenger_plugin/virus/detonate/user_act(mob/user as mob, obj/item/pda/P)
- . = ..(user, P)
+/datum/data/pda/messenger_plugin/virus/detonate/user_act(mob/user, obj/item/pda/pda_to_detonate)
+ . = ..()
if(.)
- var/difficulty = 0
-
- if(pda.cartridge)
- difficulty += pda.cartridge.programs.len / 2
- else
- difficulty += 2
-
- if(!P.detonate || P.hidden_uplink)
+ if(!pda_to_detonate.detonate || pda_to_detonate.hidden_uplink)
user.show_message("The target PDA does not seem to respond to the detonation command.", 1)
pda.cartridge.charges++
- else if(prob(difficulty * 12))
- user.show_message("An error flashes on your [pda].", 1)
- else if(prob(difficulty * 3))
- user.show_message("Energy feeds back into your [pda]!", 1)
- pda.close(user)
- pda.explode()
- log_admin("[key_name(user)] just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up")
- message_admins("[key_name_admin(user)] just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up", 1)
else
user.show_message("Success!", 1)
- log_admin("[key_name(user)] just attempted to blow up [P] with the Detomatix cartridge and succeeded")
- message_admins("[key_name_admin(user)] just attempted to blow up [P] with the Detomatix cartridge and succeeded", 1)
- P.explode()
+ log_admin("[key_name(user)] just blew up [pda_to_detonate] with the Detomatix cartridge")
+ message_admins("[key_name_admin(user)] just blew up [pda_to_detonate] with the Detomatix cartridge", 1)
+ pda_to_detonate.explode()
/datum/data/pda/messenger_plugin/virus/frame
icon = "exclamation-circle"
diff --git a/code/modules/pda/mob_hunt_game_app.dm b/code/modules/pda/mob_hunt_game_app.dm
index ef778723c799..7ac6efca355f 100644
--- a/code/modules/pda/mob_hunt_game_app.dm
+++ b/code/modules/pda/mob_hunt_game_app.dm
@@ -127,12 +127,12 @@
var/old_name = mob_info.mob_name
if(mob_info.nickname)
old_name = mob_info.nickname
- mob_info.nickname = input("Give a nickname to [old_name]?", "Nickname", old_name)
+ mob_info.nickname = tgui_input_text(usr, "Give a nickname to [old_name]?", "Nickname", old_name)
/datum/data/pda/app/mob_hunter_game/proc/release()
if(!my_collection.len)
return
- if(alert("Are you sure you want to release this mob back into the wild?", "Confirm Release", "Yes", "No") == "Yes")
+ if(tgui_alert(usr, "Are you sure you want to release this mob back into the wild?", "Confirm Release", list("Yes", "No")) == "Yes")
remove_mob()
/datum/data/pda/app/mob_hunter_game/proc/print_card()
diff --git a/code/modules/pda/nanobank.dm b/code/modules/pda/nanobank.dm
index 5da6baaebe60..e068359c4152 100644
--- a/code/modules/pda/nanobank.dm
+++ b/code/modules/pda/nanobank.dm
@@ -241,7 +241,7 @@
error_message(user, "Incorrect Credentials")
/datum/data/pda/app/nanobank/proc/input_account_pin(mob/user)
- var/attempt_pin = input("Enter pin code", "NanoBank Account Auth") as num
+ var/attempt_pin = tgui_input_number(user, "Enter pin code", "NanoBank Account Auth")
if(!user_account || !attempt_pin)
return
return attempt_pin
diff --git a/code/modules/pda/pda_tgui.dm b/code/modules/pda/pda_tgui.dm
index 535d47616b4d..27310410d31e 100644
--- a/code/modules/pda/pda_tgui.dm
+++ b/code/modules/pda/pda_tgui.dm
@@ -1,9 +1,12 @@
// All the TGUI interactions are in their own file to keep things simpler
-/obj/item/pda/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/pda/ui_state(mob/user)
+ return GLOB.inventory_state
+
+/obj/item/pda/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "PDA", name, 600, 650, master_ui, state)
+ ui = new(user, src, "PDA", name)
ui.open()
@@ -57,6 +60,11 @@
return data
+/obj/item/pda/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/simple/mob_hunt)
+ )
+
// Yes the stupid amount of args here is important, see L102
/obj/item/pda/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm
index 925a1a294b9d..8642d0782df8 100644
--- a/code/modules/pda/utilities.dm
+++ b/code/modules/pda/utilities.dm
@@ -58,60 +58,69 @@
icon = "link"
/datum/data/pda/utility/scanmode/dna/scan_mob(mob/living/C as mob, mob/living/user as mob)
+ var/list/messages = list()
if(ishuman(C))
var/mob/living/carbon/human/H = C
if(!istype(H.dna, /datum/dna))
- to_chat(user, "No fingerprints found on [H]")
+ messages.Add("No fingerprints found on [H]")
else
- to_chat(user, "[H]'s Fingerprints: [md5(H.dna.uni_identity)]")
+ messages.Add("[H]'s Fingerprints: [md5(H.dna.uni_identity)]")
+ if(length(messages))
+ to_chat(user, chat_box_regular(messages.Join(" ")))
scan_blood(C, user)
/datum/data/pda/utility/scanmode/dna/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob)
scan_blood(A, user)
/datum/data/pda/utility/scanmode/dna/proc/scan_blood(atom/A, mob/user)
+ var/list/messages = list()
if(!A.blood_DNA)
- to_chat(user, "No blood found on [A]")
+ messages.Add("No blood found on [A]")
if(A.blood_DNA)
qdel(A.blood_DNA)
else
- to_chat(user, "Blood found on [A]. Analysing...")
+ messages.Add("Blood found on [A]. Analysing...")
spawn(15)
- for(var/blood in A.blood_DNA)
- to_chat(user, "Blood type: [A.blood_DNA[blood]]\nDNA: [blood]")
+ for(var/blood in A.blood_DNA)
+ messages.Add("Blood type: [A.blood_DNA[blood]]\nDNA: [blood]")
+ to_chat(user, chat_box_regular(messages.Join(" ")))
/datum/data/pda/utility/scanmode/halogen
base_name = "Halogen Counter"
icon = "exclamation-circle"
/datum/data/pda/utility/scanmode/halogen/scan_mob(mob/living/C as mob, mob/living/user as mob)
+ var/list/messages = list()
C.visible_message("[user] has analyzed [C]'s radiation levels!")
- user.show_message("Analyzing Results for [C]:")
+ messages.Add("Analyzing Results for [C]:")
if(C.radiation)
- user.show_message("Radiation Level: [C.radiation > 0 ? "[C.radiation]" : "0"]")
+ messages.Add("Radiation Level: [C.radiation > 0 ? "[C.radiation]" : "0"]")
else
- user.show_message("No radiation detected.")
+ messages.Add("No radiation detected.")
+ to_chat(user, chat_box_regular(messages.Join(" ")))
/datum/data/pda/utility/scanmode/reagent
base_name = "Reagent Scanner"
icon = "flask"
/datum/data/pda/utility/scanmode/reagent/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob)
+ var/list/messages = list()
if(!isnull(A.reagents))
if(A.reagents.reagent_list.len > 0)
var/reagents_length = A.reagents.reagent_list.len
- to_chat(user, "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.")
+ messages.Add("[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.")
for(var/datum/reagent/R in A.reagents.reagent_list)
if(R.id != "blood")
- to_chat(user, "\t [R]")
+ messages.Add("\t [R]")
else
var/blood_type = R.data["blood_type"]
- to_chat(user, "\t [R] [blood_type]")
+ messages.Add("\t [R] [blood_type]")
else
- to_chat(user, "No active chemical agents found in [A].")
+ messages.Add("No active chemical agents found in [A].")
else
- to_chat(user, "No significant chemical agents found in [A].")
+ messages.Add("No significant chemical agents found in [A].")
+ to_chat(user, chat_box_regular(messages.Join(" ")))
/datum/data/pda/utility/scanmode/gas
base_name = "Gas Scanner"
diff --git a/code/modules/point/point.dm b/code/modules/point/point.dm
index c25dc7936105..a79a6baebef5 100644
--- a/code/modules/point/point.dm
+++ b/code/modules/point/point.dm
@@ -22,7 +22,7 @@
var/turf/our_tile = get_turf(src)
var/obj/visual = new /obj/effect/temp_visual/point(our_tile, invisibility)
- animate(visual, pixel_x = (tile.x - our_tile.x) * world.icon_size + pointed_atom.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + pointed_atom.pixel_y, time = 1.7, easing = EASE_OUT)
+ animate(visual, pixel_x = (tile.x - our_tile.x) * world.icon_size + pointed_atom.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + pointed_atom.pixel_y, time = 3, easing = EASE_OUT) // SS220 EDIT - "time = 3"
/// Create a bubble pointing at a particular icon and icon state.
/// See args for create_point_bubble_from_atom.
diff --git a/code/modules/power/apc/apc.dm b/code/modules/power/apc/apc.dm
index f27668e5af46..bd6ed8a952e9 100644
--- a/code/modules/power/apc/apc.dm
+++ b/code/modules/power/apc/apc.dm
@@ -346,7 +346,7 @@
else if(istype(W, /obj/item/mounted/frame/apc_frame) && opened)
if(!(stat & BROKEN || opened == APC_COVER_OFF || obj_integrity < max_integrity)) // There is nothing to repair
- to_chat(user, "You found no reason for repairing this APC")
+ to_chat(user, "You found no reason for repairing this APC.")
return
if(!(stat & BROKEN) && opened == APC_COVER_OFF) // Cover is the only thing broken, we do not need to remove elctronicks to replace cover
user.visible_message("[user.name] replaces missing APC's cover.",\
@@ -422,10 +422,13 @@
return ui_interact(user)
-/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/power/apc/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/power/apc/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "APC", name, 510, 460, master_ui, state)
+ ui = new(user, src, "APC", name)
ui.open()
/obj/machinery/power/apc/ui_data(mob/user)
@@ -1023,6 +1026,7 @@
locked = FALSE
to_chat(user, "You emag the APC interface.")
update_icon()
+ return TRUE
/obj/machinery/power/apc/proc/apc_short()
// if it has internal wires, cut the power wires
@@ -1064,22 +1068,6 @@
req_access = list(ACCESS_SYNDICATE)
report_power_alarm = FALSE
-/obj/machinery/power/apc/syndicate/north
- name = "north bump"
- pixel_y = 24
-
-/obj/machinery/power/apc/syndicate/south
- name = "south bump"
- pixel_y = -24
-
-/obj/machinery/power/apc/syndicate/east
- name = "east bump"
- pixel_x = 24
-
-/obj/machinery/power/apc/syndicate/west
- name = "west bump"
- pixel_x = -24
-
/obj/machinery/power/apc/syndicate/off
name = "APC off"
environment_channel = 0
@@ -1091,6 +1079,22 @@
. = ..()
cell.charge = 0
+/obj/machinery/power/apc/important
+ cell_type = 10000
+
+/obj/machinery/power/apc/critical
+ cell_type = 25000
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc, 24, 24)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate, 24, 24)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate/off, 24, 24)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/important, 24, 24)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/critical, 24, 24)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/off_station, 24, 24)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/off_station/empty_charge, 24, 24)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/worn_out, 24, 24)
+
+
/obj/item/apc_electronics
name = "APC electronics"
desc = "Heavy-duty switching circuits for power control."
diff --git a/code/modules/power/cables/cable_coil.dm b/code/modules/power/cables/cable_coil.dm
index 8b340f1b0ff5..8dde8d42c558 100644
--- a/code/modules/power/cables/cable_coil.dm
+++ b/code/modules/power/cables/cable_coil.dm
@@ -40,6 +40,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain
recipes = GLOB.cable_coil_recipes
update_wclass()
+/obj/item/stack/cable_coil/random/change_stack(mob/user, amount)
+ var/obj/item/stack/cable_coil/new_stack = ..()
+ new_stack.color = color
+ return new_stack
+
/obj/item/stack/cable_coil/update_name()
. = ..()
if(amount > 2)
diff --git a/code/modules/power/engines/singularity/emitter.dm b/code/modules/power/engines/singularity/emitter.dm
index f5c28eba29c4..1f0b631f71ea 100644
--- a/code/modules/power/engines/singularity/emitter.dm
+++ b/code/modules/power/engines/singularity/emitter.dm
@@ -102,6 +102,7 @@
if(user)
user.visible_message("[user] shorts out the lock on [src].",
"You short out the lock on [src].")
+ return TRUE
/obj/machinery/power/emitter/attack_hand(mob/user)
add_fingerprint(user)
diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm
index ceadcbea3e50..63a890cf6570 100644
--- a/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm
@@ -213,10 +213,13 @@
part.update_icon()
return 1
-/obj/machinery/particle_accelerator/control_box/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/particle_accelerator/control_box/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/particle_accelerator/control_box/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ParticleAccelerator", name, 350, 160, master_ui, state)
+ ui = new(user, src, "ParticleAccelerator", name)
ui.open()
/obj/machinery/particle_accelerator/control_box/ui_data(mob/user)
diff --git a/code/modules/power/engines/supermatter/supermatter.dm b/code/modules/power/engines/supermatter/supermatter.dm
index 2f38058bba91..678b6c49dd10 100644
--- a/code/modules/power/engines/supermatter/supermatter.dm
+++ b/code/modules/power/engines/supermatter/supermatter.dm
@@ -25,6 +25,7 @@
#define POWERLOSS_INHIBITION_MOLE_THRESHOLD 20 //Higher == More moles of the gas are needed before the charge inertia chain reaction effect starts. //Scales powerloss inhibition down until this amount of moles is reached
#define POWERLOSS_INHIBITION_MOLE_BOOST_THRESHOLD 500 //bonus powerloss inhibition boost if this amount of moles is reached
+#define MOLE_CRUNCH_THRESHOLD 1700 //Above this value we can get lord singulo and
#define MOLE_PENALTY_THRESHOLD 1800 //Above this value we can get lord singulo and independent mol damage, below it we can heal damage
#define MOLE_HEAT_PENALTY 350 //Heat damage scales around this. Too hot setups with this amount of moles do regular damage, anything above and below is scaled
//Along with damage_penalty_point, makes flux anomalies.
@@ -58,7 +59,7 @@
#define GRAVITATIONAL_ANOMALY "gravitational_anomaly"
#define FLUX_ANOMALY "flux_anomaly"
-#define CRYO_ANOMALY "cryo_anomaly"
+#define BLUESPACE_ANOMALY "bluespace_anomaly"
//If integrity percent remaining is less than these values, the monitor sets off the relevant alarm.
#define SUPERMATTER_DELAM_PERCENT 5
@@ -377,11 +378,11 @@
SEND_SOUND(M, super_matter_charge_sound)
if(atoms_share_level(M, src))
- to_chat(M, "You feel reality distort for a moment...")
+ to_chat(M, "You feel reality distort for a moment...")
else
- to_chat(M, "You hold onto \the [M.loc] as hard as you can, as reality distorts around you. You feel safe.")
+ to_chat(M, "You hold onto \the [M.loc] as hard as you can, as reality distorts around you. You feel safe.")
- if(combined_gas > MOLE_PENALTY_THRESHOLD)
+ if(combined_gas > MOLE_CRUNCH_THRESHOLD)
investigate_log("has collapsed into a singularity.", "supermatter")
if(T)
var/obj/singularity/S = new(T)
@@ -548,8 +549,10 @@
power = max((removed.temperature * temp_factor / T0C) * gasmix_power_ratio + power, 0)
if(prob(50))
-
- radiation_pulse(src, power * max(0, (1 + (power_transmission_bonus / 10))))
+ var/mole_crunch_bonus = 0
+ if(combined_gas > MOLE_CRUNCH_THRESHOLD)
+ mole_crunch_bonus = 7000 //This adds 7000 EER worth of power to the SM. This should make mole crunch potentially worthy as a SM setup, if not risky. More stable than the anomalies, but very easy to push over the edge. Don't forget, a high EER setup can harvest power through zaps
+ radiation_pulse(src, power * max(0, (1 + (power_transmission_bonus / 10))) + mole_crunch_bonus)
//Power * 0.55 * a value between 1 and 0.8
var/device_energy = power * REACTION_POWER_MODIFIER
@@ -635,7 +638,7 @@
if(power > SEVERE_POWER_PENALTY_THRESHOLD && prob(5) || prob(1))
supermatter_anomaly_gen(src, GRAVITATIONAL_ANOMALY, rand(5, 10))
if((power > SEVERE_POWER_PENALTY_THRESHOLD && prob(2)) || (prob(0.3) && power > POWER_PENALTY_THRESHOLD))
- supermatter_anomaly_gen(src, CRYO_ANOMALY, rand(5, 10))
+ supermatter_anomaly_gen(src, BLUESPACE_ANOMALY, rand(5, 10))
if(prob(15))
supermatter_pull(loc, min(power / 850, 3)) //850, 1700, 2550
@@ -668,7 +671,7 @@
if(powerloss_inhibitor < 0.5)
radio.autosay("DANGER: CHARGE INERTIA CHAIN REACTION IN PROGRESS.", name, "Engineering", list(z))
- if(combined_gas > MOLE_PENALTY_THRESHOLD)
+ if(combined_gas > MOLE_CRUNCH_THRESHOLD)
radio.autosay("Warning: Critical coolant mass reached.", name, "Engineering", list(z))
//Boom (Mind blown)
if(damage > explosion_point)
@@ -699,7 +702,7 @@
for(var/M in GLOB.player_list)
if(atoms_share_level(M, src))
SEND_SOUND(M, supermatter_sound) //everyone goan know bout this
- to_chat(M, "A horrible screeching fills your ears, and a wave of dread washes over you...")
+ to_chat(M, "A horrible screeching fills your ears, and a wave of dread washes over you...")
qdel(src)
return gain
@@ -905,7 +908,7 @@
else
remove_filter("icon")
- if(combined_gas > MOLE_PENALTY_THRESHOLD)
+ if(combined_gas > MOLE_CRUNCH_THRESHOLD)
ray_filter_helper(1, power ? clamp((damage/100) * power, 50, 125) : 1, SUPERMATTER_SINGULARITY_RAYS_COLOUR, clamp(damage / 300, 1, 30), clamp(damage / 5, 12, 300))
add_filter(name = "outline", priority = 2, params = list(
@@ -958,13 +961,13 @@
l_power = 3,
l_color = SUPERMATTER_TESLA_COLOUR,
)
- if(combined_gas > MOLE_PENALTY_THRESHOLD && get_integrity() > SUPERMATTER_DANGER_PERCENT)
+ if(combined_gas > MOLE_CRUNCH_THRESHOLD && get_integrity() > SUPERMATTER_DANGER_PERCENT)
set_light(
l_range = 4 + clamp((450 - damage) / 10, 1, 50),
l_power = 3,
l_color = SUPERMATTER_SINGULARITY_LIGHT_COLOUR,
)
- if(!combined_gas > MOLE_PENALTY_THRESHOLD || !get_integrity() < SUPERMATTER_DANGER_PERCENT)
+ if(combined_gas <= MOLE_CRUNCH_THRESHOLD || get_integrity() >= SUPERMATTER_DANGER_PERCENT)
for(var/obj/D in darkness_effects)
qdel(D)
return
@@ -975,7 +978,7 @@
l_range = 4 + darkness_aoe,
l_power = -1 - darkness_strength,
l_color = "#ddd6cf")
- if(!length(darkness_effects) && moveable) //Don't do this on movable sms oh god. Ideally don't do this at all, but hey, that's lightning for you
+ if(!length(darkness_effects) && !moveable) //Don't do this on movable sms oh god. Ideally don't do this at all, but hey, that's lightning for you
darkness_effects += new /obj/effect/abstract(locate(x-3,y+3,z))
darkness_effects += new /obj/effect/abstract(locate(x+3,y+3,z))
darkness_effects += new /obj/effect/abstract(locate(x-3,y-3,z))
@@ -1056,12 +1059,12 @@
if(L)
switch(type)
if(FLUX_ANOMALY)
- var/obj/effect/anomaly/flux/A = new(L, 300, FALSE)
+ var/obj/effect/anomaly/flux/A = new(L, 30 SECONDS, FALSE)
A.explosive = FALSE
if(GRAVITATIONAL_ANOMALY)
- new /obj/effect/anomaly/grav(L, 250, FALSE, FALSE)
- if(CRYO_ANOMALY)
- new /obj/effect/anomaly/cryo(L, 200, FALSE)
+ new /obj/effect/anomaly/grav(L, 25 SECONDS, FALSE, FALSE)
+ if(BLUESPACE_ANOMALY)
+ new /obj/effect/anomaly/bluespace(L, 24 SECONDS, FALSE, FALSE, TRUE)
/obj/machinery/atmospherics/supermatter_crystal/proc/supermatter_zap(atom/zapstart = src, range = 5, zap_str = 4000, zap_flags = ZAP_SUPERMATTER_FLAGS, list/targets_hit = list())
if(QDELETED(zapstart))
@@ -1151,6 +1154,7 @@
if(prob(80))
zap_flags &= ~ZAP_MACHINE_EXPLOSIVE
if(target_type == COIL)
+ zap_flags += ZAP_GENERATES_POWER
//In the best situation we can expect this to grow up to 2120kw before a delam/IT'S GONE TOO FAR FRED SHUT IT DOWN
//The formula for power gen is zap_str * zap_mod / 2 * capacitor rating, between 1 and 4
var/multi = 10
@@ -1161,6 +1165,7 @@
multi = 40
target.zap_act(zap_str * multi, zap_flags)
zap_str /= 3 //Coils should take a lot out of the power of the zap
+ zap_flags &= ~ZAP_GENERATES_POWER
else if(isliving(target))//If we got a fleshbag on our hands
var/mob/living/creature = target
@@ -1210,7 +1215,7 @@
next_event_time = fake_time + world.time
/obj/machinery/atmospherics/supermatter_crystal/proc/try_events()
- if(has_been_powered == FALSE)
+ if(!has_been_powered)
return
if(!next_event_time) // for when the SM starts
make_next_event_time()
@@ -1226,7 +1231,7 @@
/datum/supermatter_event/sierra_tier = 1)
var/datum/supermatter_event/event = pick(subtypesof(pickweight(events)))
- if(istype(event, /datum/supermatter_event/sierra_tier) && has_run_sclass)
+ if(ispath(event, /datum/supermatter_event/sierra_tier) && has_run_sclass)
make_next_event_time()
return // We're only gonna have one s-class per round, take a break engineers
run_event(event)
@@ -1249,7 +1254,7 @@
#undef HALLUCINATION_RANGE
#undef GRAVITATIONAL_ANOMALY
#undef FLUX_ANOMALY
-#undef CRYO_ANOMALY
+#undef BLUESPACE_ANOMALY
#undef COIL
#undef ROD
#undef LIVING
diff --git a/code/modules/power/engines/tesla/coil.dm b/code/modules/power/engines/tesla/coil.dm
index 2204e543f33f..d200ddc904dc 100644
--- a/code/modules/power/engines/tesla/coil.dm
+++ b/code/modules/power/engines/tesla/coil.dm
@@ -99,7 +99,6 @@
var/power_produced = powernet ? power * input_power_multiplier : power
produce_direct_power(power_produced)
flick("coilhit", src)
- playsound(loc, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
return power - power_produced //You get back the amount we didn't use
else
. = ..()
diff --git a/code/modules/power/generators/portable generators/pacman.dm b/code/modules/power/generators/portable generators/pacman.dm
index 295704ee273e..6b309a04d0a5 100644
--- a/code/modules/power/generators/portable generators/pacman.dm
+++ b/code/modules/power/generators/portable generators/pacman.dm
@@ -245,10 +245,13 @@
/obj/machinery/power/port_gen/pacman/attack_ghost(mob/user)
return attack_hand(user)
-/obj/machinery/power/port_gen/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/power/port_gen/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/power/port_gen/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "Pacman", name, 500, 260)
+ ui = new(user, src, "Pacman", name)
ui.open()
/obj/machinery/power/port_gen/pacman/ui_data(mob/user)
diff --git a/code/modules/power/generators/solar.dm b/code/modules/power/generators/solar.dm
index d01c01dcef6b..87c2bf4e4607 100644
--- a/code/modules/power/generators/solar.dm
+++ b/code/modules/power/generators/solar.dm
@@ -373,10 +373,13 @@
return
ui_interact(user)
-/obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/power/solar_control/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/power/solar_control/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "SolarControl", name, 490, 300)
+ ui = new(user, src, "SolarControl", name)
ui.open()
/obj/machinery/power/solar_control/ui_data(mob/user)
diff --git a/code/modules/power/generators/thermo_electric_generator.dm b/code/modules/power/generators/thermo_electric_generator.dm
index 4f0a5a811a28..7c4217a2dd2f 100644
--- a/code/modules/power/generators/thermo_electric_generator.dm
+++ b/code/modules/power/generators/thermo_electric_generator.dm
@@ -198,10 +198,13 @@
else
connect()
-/obj/machinery/power/teg/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/power/teg/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/power/teg/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "TEG", name, 500, 400, master_ui, state)
+ ui = new(user, src, "TEG", name)
ui.open()
/obj/machinery/power/teg/ui_data(mob/user)
diff --git a/code/modules/power/generators/turbine.dm b/code/modules/power/generators/turbine.dm
index 9aca6b6e0a1d..4cfb15ef7a58 100644
--- a/code/modules/power/generators/turbine.dm
+++ b/code/modules/power/generators/turbine.dm
@@ -358,10 +358,13 @@
. = ..()
ui_interact(user)
-/obj/machinery/power/turbine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/power/turbine/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/power/turbine/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "TurbineComputer", name, 400, 150, master_ui, state)
+ ui = new(user, src, "TurbineComputer", name)
ui.open()
/obj/machinery/power/turbine/ui_data(mob/user)
@@ -421,10 +424,13 @@
compressor = M.buffer
to_chat(user, "You link [src] to the turbine compressor in [I]'s buffer.")
-/obj/machinery/computer/turbine_computer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/turbine_computer/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/computer/turbine_computer/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "TurbineComputer", name, 400, 200, master_ui, state)
+ ui = new(user, src, "TurbineComputer", name)
ui.open()
/obj/machinery/computer/turbine_computer/ui_data(mob/user)
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 255636917e8d..9ca42781ddcd 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -212,10 +212,13 @@ GLOBAL_LIST_EMPTY(gravity_generators)
return ui_interact(user)
// tgui\packages\tgui\interfaces\GravityGen.js
-/obj/machinery/gravity_generator/main/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/gravity_generator/main/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/gravity_generator/main/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui && !(stat & BROKEN))
- ui = new(user, src, ui_key, "GravityGen", name, 350, 250, master_ui, state)
+ ui = new(user, src, "GravityGen", name)
ui.open()
/obj/machinery/gravity_generator/main/ui_data(mob/user)
@@ -285,7 +288,7 @@ GLOBAL_LIST_EMPTY(gravity_generators)
change_power_mode(on ? ACTIVE_POWER_USE : IDLE_POWER_USE)
if(gravity) // If we turned on
- if(generators_in_level() == FALSE) // And there's no gravity
+ if(generators_in_level() == 0) // And there's no other gravity generators on this z level
alert = TRUE
investigate_log("was brought online and is now producing gravity for this level.", "gravity")
message_admins("The gravity generator was brought online. ([src_area.name])")
@@ -294,7 +297,7 @@ GLOBAL_LIST_EMPTY(gravity_generators)
continue
A.gravitychange(TRUE, A)
- else if(generators_in_level() == TRUE) // Turned off, and there is gravity
+ else if(generators_in_level() == 1) // Turned off, and there is only one gravity generator on the Z level
alert = TRUE
investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
message_admins("The gravity generator was brought offline with no backup generator. ([src_area.name])")
diff --git a/code/modules/power/lights.dm b/code/modules/power/lights.dm
index 99168174b2f8..21cdd3dd0224 100644
--- a/code/modules/power/lights.dm
+++ b/code/modules/power/lights.dm
@@ -470,6 +470,24 @@
LR.ReplaceLight(src, user)
return
+ // Attack with Spray Can! Coloring time.
+ if(istype(W, /obj/item/toy/crayon/spraycan))
+ var/obj/item/toy/crayon/spraycan/spraycan = W
+
+ // quick check to disable capped spraypainting, aesthetic reasons
+ if(spraycan.capped)
+ to_chat(user, "You can't spraypaint [src] with the cap still on!")
+ return
+ var/list/hsl = rgb2hsl(hex2num(copytext(spraycan.colour, 2, 4)), hex2num(copytext(spraycan.colour, 4, 6)), hex2num(copytext(spraycan.colour, 6, 8)))
+ hsl[3] = max(hsl[3], 0.4)
+ var/list/rgb = hsl2rgb(arglist(hsl))
+ var/new_color = "#[num2hex(rgb[1], 2)][num2hex(rgb[2], 2)][num2hex(rgb[3], 2)]"
+ color = new_color
+ to_chat(user, "You change [src]'s light bulb color.")
+ brightness_color = new_color
+ update(TRUE, TRUE, FALSE)
+ return
+
// attempt to insert light
if(istype(W, /obj/item/light))
if(status != LIGHT_EMPTY)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index be68b3cb4ea3..21e6773fd44f 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -339,12 +339,15 @@
add_fingerprint(user)
ui_interact(user)
-/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/power/smes/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/power/smes/ui_interact(mob/user, datum/tgui/ui = null)
if(stat & BROKEN)
return
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "Smes", name, 340, 350, master_ui, state)
+ ui = new(user, src, "Smes", name)
ui.open()
/obj/machinery/power/smes/ui_data(mob/user)
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 5a0fb114b453..cdcd660d0ef0 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -83,7 +83,9 @@
return
var/tmp_label = ""
- var/label_text = sanitize(input(user, "Inscribe some text into \the [initial(BB.name)]", "Inscription", tmp_label))
+ var/label_text = tgui_input_text(user, "Inscribe some text into \the [initial(BB.name)]", "Inscription", tmp_label)
+ if(!label_text)
+ return
if(length(label_text) > 20)
to_chat(user, "The inscription can be at most 20 characters long.")
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index 4c29c02f3d40..50d5cbb6700d 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -165,32 +165,6 @@
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
-
-/obj/item/ammo_casing/shotgun/improvised
- name = "improvised shell"
- desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
- icon_state = "improvshell"
- projectile_type = /obj/item/projectile/bullet/pellet/weak
- materials = list(MAT_METAL=250)
- pellets = 10
- variance = 35
- muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
- muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
-
-
-/obj/item/ammo_casing/shotgun/improvised/overload
- name = "overloaded improvised shell"
- desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards. This one has been packed with even more \
- propellant. It's like playing russian roulette, with a shotgun."
- icon_state = "improvshell"
- projectile_type = /obj/item/projectile/bullet/pellet/overload
- materials = list(MAT_METAL=250)
- pellets = 4
- variance = 40
- muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
- muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG
-
-
/obj/item/ammo_casing/shotgun/stunslug
name = "taser slug"
desc = "A stunning taser slug."
diff --git a/code/modules/projectiles/ammunition/energy_lens.dm b/code/modules/projectiles/ammunition/energy_lens.dm
index 6c600d25977f..5935376b9bb2 100644
--- a/code/modules/projectiles/ammunition/energy_lens.dm
+++ b/code/modules/projectiles/ammunition/energy_lens.dm
@@ -286,7 +286,7 @@
select_name = "clown"
/obj/item/ammo_casing/energy/emitter
- projectile_type = /obj/item/projectile/beam/emitter/hitscan
+ projectile_type = /obj/item/projectile/beam/emitter
muzzle_flash_color = LIGHT_COLOR_GREEN
fire_sound = 'sound/weapons/emitter.ogg'
e_cost = 100
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index b72a12e61b92..54fc6475c145 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -123,7 +123,7 @@
/obj/item/ammo_box/magazine/internal/shot/improvised
name = "improvised shotgun internal magazine"
- ammo_type = /obj/item/ammo_casing/shotgun/improvised
+ ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
max_ammo = 1
/obj/item/ammo_box/magazine/internal/shot/improvised/cane
diff --git a/code/modules/projectiles/ammunition/special_ammo.dm b/code/modules/projectiles/ammunition/special_ammo.dm
index ef905f9c2817..2885ff9f15b9 100644
--- a/code/modules/projectiles/ammunition/special_ammo.dm
+++ b/code/modules/projectiles/ammunition/special_ammo.dm
@@ -30,15 +30,11 @@
projectile_type = /obj/item/projectile/magic/fireball
/obj/item/ammo_casing/magic/chaos
- projectile_type = /obj/item/projectile/magic
+ projectile_type = /obj/item/projectile/magic/chaos
/obj/item/ammo_casing/magic/slipping
projectile_type = /obj/item/projectile/magic/slipping
-/obj/item/ammo_casing/magic/chaos/newshot()
- projectile_type = pick(typesof(/obj/item/projectile/magic))
- ..()
-
/obj/item/ammo_casing/magic/arcane_barrage
projectile_type = /obj/item/projectile/magic/arcane_barrage
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index d735eb143599..d7d347aafcde 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -117,6 +117,7 @@
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
/obj/item/gun/proc/shoot_live_shot(mob/living/user, atom/target, pointblank = FALSE, message = TRUE)
+
if(recoil)
shake_camera(user, recoil + 1, recoil)
@@ -224,7 +225,7 @@
if(semicd)
return
-
+ SEND_SIGNAL(src, COMSIG_GUN_FIRED, user, target)
var/sprd = 0
var/randomized_gun_spread = 0
if(spread)
diff --git a/code/modules/projectiles/guns/chaos_bolt.dm b/code/modules/projectiles/guns/chaos_bolt.dm
new file mode 100644
index 000000000000..6fed4ce7b48c
--- /dev/null
+++ b/code/modules/projectiles/guns/chaos_bolt.dm
@@ -0,0 +1,377 @@
+#define CHAOS_STAFF_DAMAGE 30 //Damaging effects will use this number, multiplied or divided depending on effect
+#define CHAOS_STAFF_LETHAL_CHANCE 5 //These should add up to 100
+#define CHAOS_STAFF_NEGATIVE_CHANCE 45
+#define CHAOS_STAFF_MISC_CHANCE 30
+#define CHAOS_STAFF_GIFT_CHANCE 15
+#define CHAOS_STAFF_GREAT_GIFT_CHANCE 5
+
+/obj/item/projectile/magic/chaos
+ name = "chaos bolt"
+ icon_state = "ice_1"
+ impact_effect_type = /obj/effect/temp_visual/impact_effect/chaos
+ /// Set by random effet to be summoned in target mob's backpack, on the floor under mob, or around mob if explosion_amount is set.
+ var/obj/item/item_to_summon
+ /// If left at 0, item goes in backpack or floor, if set, throw that many items around the target.
+ var/explosion_amount = 0
+ /// Name of random effect to be applied on target mob.
+ var/chaos_effect
+
+/obj/item/projectile/magic/chaos/on_hit(atom/target, blocked = 0)
+ . = ..()
+
+ if(iswallturf(target) || isobj(target))
+ target.color = pick(GLOB.random_color_list)
+ return
+
+ if(target && isliving(target))
+ var/mob/living/L = target
+ if(L.stat == DEAD)
+ L.visible_message("[target] glows faintly, but nothing else happens.")
+ return
+ chaos_chaos(L)
+
+/obj/item/projectile/magic/chaos/Initialize(mapload)
+ . = ..()
+ icon_state = pick("bluespace", "pulse1", "magicm", "declone", "fireball", "blood_bolt", "arcane_barrage", "laser", "u_laser")
+
+
+ /**
+ * Picks and call a subproc to apply a random effect on mob/living/target.
+ *
+ * First pick a category of random effect,
+ * then calls a sub-proc to pick and apply an effect in that category,
+ * then summons any item_to_summon set by effects.
+ * Arguments:
+ * * target - mob/living that will have effect applied on them
+ */
+/obj/item/projectile/magic/chaos/proc/chaos_chaos(mob/living/target)
+ var/category = pick(prob(CHAOS_STAFF_LETHAL_CHANCE);"lethal", prob(CHAOS_STAFF_NEGATIVE_CHANCE);"negative", prob(CHAOS_STAFF_MISC_CHANCE);"misc",\
+ prob(CHAOS_STAFF_GIFT_CHANCE);"gift", prob(CHAOS_STAFF_GREAT_GIFT_CHANCE);"great gift")
+ switch(category)
+ if("lethal") //Target is either dead on the spot or might as well be
+ apply_lethal_effect(target)
+ if("negative") //Target is damaged, crippled or otherwise negatively affected. Effect can be lethal in some circumstances.
+ apply_negative_effect(target)
+ if("misc") //Miscellaneous effect, can be positive, negative, or just humorous
+ apply_misc_effect(target)
+ if("gift") //Grants a gift or positive effect to the target. Usually a gag or mildly useful item... if you weren't being killed by a wizard
+ apply_gift_effect(target)
+ if("great gift") //Grants a gift or positive effect to the target. Usually a weapon or useful item.
+ apply_great_gift_effect(target)
+ if(!item_to_summon)
+ return
+ if(!target.mind) //no abusing mindless mobs for free stuff
+ target.visible_message("[target] glows faintly, but nothing else happens.")
+ return
+ if(explosion_amount)
+ target.visible_message("A bunch of [item_to_summon.name] scatter around [target]!", \
+ "A bunch of [item_to_summon.name] scatter around you!")
+ for(var/i in 1 to explosion_amount)
+ var/obj/item/I = new item_to_summon(get_turf(target))
+ throwforce = 0
+ INVOKE_ASYNC(I, TYPE_PROC_REF(/atom/movable, throw_at), pick(oview(7, get_turf(src))), 10, 1)
+ throwforce = initial(throwforce)
+ return
+ if(!ishuman(target))
+ var/obj/item/I = new item_to_summon(get_turf(target))
+ target.visible_message("\A [I] drops next to [target]!", "\A [I] drops on the floor!")
+ return
+ var/mob/living/carbon/human/H = target
+ var/obj/item/I = new item_to_summon(src)
+ if(H.back && isstorage(H.back))
+ var/obj/item/storage/S = H.back
+ S.handle_item_insertion(I, TRUE) //We don't check if it can be inserted because it's magic, GET IN THERE!
+ H.visible_message("[H]'s [S.name] glows bright!", "\A [I] suddenly appears in your glowing [S.name]!")
+ return
+ if(H.back && ismodcontrol(H.back))
+ var/obj/item/mod/control/C = H.back
+ if(C.bag)
+ C.handle_item_insertion(I, TRUE)
+ H.visible_message("[H]'s [C] glows bright!", "\A [I] suddenly appears in your glowing [C.name]!")
+ return
+ I.forceMove(get_turf(H))
+ H.visible_message("\A [I] drops next to [H]!", "\A [I] drops on the floor!")
+
+/**
+ * Picks and apply a lethal effect on mob/living/target. Some are more instantaneous than others.
+ */
+/obj/item/projectile/magic/chaos/proc/apply_lethal_effect(mob/living/target)
+ if(!ishuman(target))
+ target.visible_message("[target] suddenly dies!", "Game over!")
+ target.death(FALSE)
+ return
+ chaos_effect = pick("ded", "heart deleted", "gibbed", "cluwned", "spaced", "decapitated", "banned", \
+ "exploded", "cheese morphed", "supermattered", "borged", "animal morphed", "trick revolver", "prions")
+ var/mob/living/carbon/human/H = target
+ switch(chaos_effect)
+ if("ded")
+ H.visible_message("[H] drops dead!", "Game over!")
+ H.death()
+ if("heart deleted")
+ H.visible_message("[H] looks like they're about to die!", "HEARTUS DELETUS!")
+ var/obj/item/organ/internal/heart/target_heart = H.get_int_organ(/obj/item/organ/internal/heart)
+ if(target_heart)
+ target_heart.remove(H)
+ qdel(target_heart)
+ if("gibbed")
+ H.visible_message("[H] falls into gibs!", "Oof!")
+ H.gib()
+ if("cluwned")
+ H.visible_message("[H] turns into a cluwne!", "Oh no.")
+ H.makeCluwne()
+ if("spaced")
+ for(var/obj/item/I in H)
+ H.unEquip(I, TRUE)
+ var/turf/T = safepick(get_area_turfs(/area/space/nearstation)) //Send in space next to the station
+ if(!T) //Shouldn't happen but just in case
+ T = safepick(get_area_turfs(/area/space))
+ if(!T) //What do you mean there's no space? Okay well just die then
+ H.visible_message("[H] drops dead!", "Game over!")
+ H.death(FALSE)
+ else
+ H.visible_message("[H] disappears!", "COLD! CAN'T BREATHE!")
+ do_teleport(H, T)
+ if("decapitated")
+ H.visible_message("[H]'s head goes flying!'", \
+ "You watch the floor fly to your face as you rapidly lose consciousness...")
+ var/obj/item/organ/external/affected = target.get_organ("head")
+ var/atom/movable/A = affected.droplimb(1, DROPLIMB_SHARP)
+ INVOKE_ASYNC(A, TYPE_PROC_REF(/atom/movable, throw_at), pick(oview(7, get_turf(src))), 10, 1)
+ if("banned")
+ H.visible_message("[H] gets BWOINKED out of existence!", \
+ "You get BWOINKED out of existence!")
+ playsound(H, 'sound/effects/adminhelp.ogg', 100, FALSE)
+ qdel(H)
+ if("exploded")
+ H.visible_message("[H] explodes!", "Boom!")
+ explosion(get_turf(H), 1, 1, 1, cause = "staff of chaos lethal explosion effect")
+ if("cheese morphed")
+ H.visible_message("[H] transforms into cheese!", "You've been transformed into cheese!")
+ new /obj/item/food/snacks/cheesewedge(get_turf(H))
+ qdel(H)
+ if("supermattered")
+ var/obj/machinery/atmospherics/supermatter_crystal/supercrystal = GLOB.main_supermatter_engine
+ if(!supercrystal)
+ H.visible_message("[H] drops dead!", "Game over!")
+ H.death()
+ else
+ H.visible_message("[H] disappears!", "All you see is yellow before you fall to dust...")
+ do_teleport(H, supercrystal, 1)
+ H.throw_at(supercrystal, 10, 2)
+ if(H && H.stat == CONSCIOUS)
+ to_chat(H, "... not? You're alive? Huh. Neat.")
+ if("borged")
+ H.visible_message("[H] turns into a cyborg!", "Beep boop!")
+ wabbajack(H, force_borg = TRUE)
+ if("animal morphed")
+ H.visible_message("[H] turns into an animal!", "Welcome to the jungle!")
+ wabbajack(H, force_animal = TRUE)
+ if("trick revolver")
+ item_to_summon = /obj/item/gun/projectile/revolver/fake
+ if("prions")
+ H.visible_message("[H] laughs uncontrollably!", "You feel like you're going to die of laughter!")
+ H.reagents.add_reagent("prions", 5)
+
+/**
+ * Picks and apply a negative effect on mob/living/target. Usually causes damage and/or incapacitating effect.
+ */
+/obj/item/projectile/magic/chaos/proc/apply_negative_effect(mob/living/target)
+ if(!ishuman(target))
+ if(prob(50))
+ target.apply_damage(CHAOS_STAFF_DAMAGE, BRUTE)
+ target.visible_message("[target] gets slashed by [src]!", "You get slashed by [src]!")
+ else
+ target.apply_damage(CHAOS_STAFF_DAMAGE, BURN)
+ target.visible_message("[target] gets burned by [src]!", "You get burned by [src]!")
+ return
+ chaos_effect = pick("fireballed", "ice spiked", "rathend", "stabbed", "slashed", "burned", "poisoned", \
+ "plasma", "teleport", "teleport roulette", "electrocuted")
+ var/mob/living/carbon/human/H = target
+ switch(chaos_effect)
+ if("fireballed")
+ H.visible_message("[H] is hit by a fireball! ", "You get hit by a fireball!")
+ H.apply_damage(CHAOS_STAFF_DAMAGE / 3, BRUTE)
+ explosion(get_turf(H), -1, 0, 2, 3, flame_range = 2, cause = "staff of chaos fireball effect")
+ if("ice spiked")
+ H.visible_message("[H]'s chest get pierced by an ice spike!", "An ice spike pierces your chest!")
+ H.apply_damage(CHAOS_STAFF_DAMAGE, BRUTE, "chest")
+ H.bodytemperature = 250
+ if("rathend")
+ var/obj/item/organ/internal/appendix/A = H.get_int_organ(/obj/item/organ/internal/appendix)
+ if(!A)
+ H.apply_damage(CHAOS_STAFF_DAMAGE / 3, BRUTE, "chest")
+ new/obj/effect/decal/cleanable/blood/gibs(get_turf(H))
+ to_chat(H, "Blood flows out of your body!")
+ H.KnockDown(6 SECONDS)
+ return
+ A.remove(H)
+ A.forceMove(get_turf(H))
+ A.throw_at(get_edge_target_turf(H, pick(GLOB.alldirs)), rand(1, 10), 5)
+ H.visible_message("[H]'s [A.name] flies out of their body in a magical explosion!",\
+ "Your [A.name] flies out of your body in a magical explosion!")
+ H.KnockDown(4 SECONDS)
+ if("stabbed")
+ H.visible_message("[H] gets stabbed by a magical knife!", "You get stabbed by a magical knife!")
+ H.apply_damage(CHAOS_STAFF_DAMAGE, BRUTE, "chest")
+ if("slashed")
+ H.visible_message("[H] gets slashed by a magical knife!", "You get slashed by a magical knife!")
+ H.apply_damage(CHAOS_STAFF_DAMAGE, BRUTE, pick("l_arm", "r_arm"))
+ if("burned")
+ H.visible_message("[H] gets set on fire!", "You're on fire! Literally!")
+ H.apply_damage(CHAOS_STAFF_DAMAGE / 2, BURN)
+ H.adjust_fire_stacks(14)
+ H.IgniteMob()
+ H.emote("scream")
+ if("poisoned")
+ H.visible_message("[H] looks ill!", "You feel sick...")
+ var/random_reagent = pick("carpotoxin", "cyanide", "amanitin", "sarin", "venom")
+ H.reagents.add_reagent(random_reagent, CHAOS_STAFF_DAMAGE / 3)
+ if("plasma")
+ H.visible_message("A cloud of plasma surrounds [H]!", "You're covered in plasma gas!")
+ H.atmos_spawn_air(LINDA_SPAWN_TOXINS | LINDA_SPAWN_20C, 200)
+ if("teleport")
+ var/turf/T
+ T = find_safe_turf() //Get a safe station turf
+ if(T)
+ H.visible_message("[H] disappears!", "You've been teleported!")
+ do_teleport(H, T)
+ if("teleport roulette")
+ H.apply_status_effect(STATUS_EFFECT_TELEPORT_ROULETTE)
+ var/turf/T
+ T = find_safe_turf() //Get a safe station turf
+ if(T)
+ H.visible_message("[H] disappears!", "You feel sick as you're teleported around the station!")
+ do_teleport(H, T)
+ if("electrocuted")
+ H.visible_message("[H] gets electrocuted!", "You get electrocuted!")
+ H.electrocute_act(CHAOS_STAFF_DAMAGE, src)
+
+/datum/status_effect/teleport_roulette
+ duration = 16 SECONDS
+ status_type = STATUS_EFFECT_REPLACE
+ tick_interval = 2 SECONDS
+ alert_type = null
+
+/datum/status_effect/teleport_roulette/tick()
+ var/turf/T
+ T = find_safe_turf() //Get a safe station turf
+ if(T && prob(80))
+ do_teleport(owner, T)
+
+/**
+ * Picks and apply a random miscellaneous effect on mob/living/target. Can be negative or mildly positive.
+ */
+/obj/item/projectile/magic/chaos/proc/apply_misc_effect(mob/living/target)
+ if(!ishuman(target))
+ chaos_effect = pick("recolor", "bark", "confetti", "smoke", "wand of nothing", "bike horn")
+ else
+ chaos_effect = pick("bark", "smoke", "spin", "flip", "confetti", "slip", "wand of nothing", \
+ "help maint", "fake callout", "bike horn")
+ switch(chaos_effect)
+ if("recolor") //non-humans only because recoloring humans is kinda meh
+ target.color = pick(GLOB.random_color_list)
+ if("bark")
+ target.visible_message("[target] barks!", "Bark!")
+ playsound(target, 'sound/creatures/dog_bark1.ogg', 100, FALSE)
+ if("smoke")
+ var/datum/effect_system/smoke_spread/smoke = new
+ smoke.set_up(4, FALSE, target)
+ INVOKE_ASYNC(smoke, TYPE_PROC_REF(/datum/effect_system, start))
+ if("spin")
+ target.emote("spin")
+ if("flip")
+ target.emote("flip")
+ if("confetti")
+ confettisize(get_turf(target), 20, 4)
+ if("slip")
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ H.slip("your own foot", 6 SECONDS, 0, 0, 1, "trip")
+ if("wand of nothing")
+ item_to_summon = /obj/item/gun/magic/wand
+ explosion_amount = rand(2, 5)
+ if("help maint")
+ target.say(";HELP MAINT")
+ target.Silence(10 SECONDS)
+ if("fake callout")
+ var/message = ";WIZ "
+ message += pick("SCIENCE", "MED", "BRIG", "BRIDGE", "ARRIVALS", "ARRIVALS MAINT", "CHAPEL", "SCIENCE MAINT", "CARGO", "MINING MAINT", "TURBINE", "ENGI", "ATMOS")
+ target.say(message)
+ target.Silence(10 SECONDS)
+ if("bike horn")
+ item_to_summon = /obj/item/bikehorn
+ explosion_amount = rand(2, 3)
+
+/**
+ * Picks a random gift to be given to mob/living/target. Should be mildly useful and/or funny.
+ */
+/obj/item/projectile/magic/chaos/proc/apply_gift_effect(mob/living/target)
+ chaos_effect = pick("toy sword", "toy revolver", "cheese", "food", "medkit", \
+ "insulated gloves", "wand of doors", "golden bike horn", "ban hammer", "banana")
+ switch(chaos_effect)
+ if("toy sword")
+ item_to_summon = /obj/item/toy/sword/chaosprank
+ if("toy revolver")
+ item_to_summon = /obj/item/gun/projectile/revolver/capgun/chaosprank
+ if("cheese")
+ item_to_summon = /obj/item/food/snacks/cheesewedge
+ explosion_amount = rand(5, 10)
+ if("food")
+ target.visible_message("Food scatters around [target]!", "A bunch of food scatters around you!")
+ var/limit = rand(5, 10)
+ for(var/i in 1 to limit)
+ var/type = pick(typesof(/obj/item/food/snacks))
+ var/obj/item/I = new type(get_turf(target))
+ INVOKE_ASYNC(I, TYPE_PROC_REF(/atom/movable, throw_at), pick(oview(7, get_turf(src))), 10, 1)
+
+ if("medkit")
+ item_to_summon = pick(/obj/item/storage/firstaid/brute, /obj/item/storage/firstaid/fire, /obj/item/storage/firstaid/adv)
+ if("insulated gloves")
+ item_to_summon = /obj/item/clothing/gloves/color/yellow
+ explosion_amount = rand(2, 5)
+ if("wand of doors")
+ item_to_summon = /obj/item/gun/magic/wand/door
+ if("golden bike horn")
+ item_to_summon = /obj/item/bikehorn/golden
+ explosion_amount = rand(2, 3)
+ if("ban hammer")
+ item_to_summon = /obj/item/banhammer
+ explosion_amount = rand(2, 5)
+ if("banana")
+ item_to_summon = /obj/item/food/snacks/grown/banana
+
+/**
+ * Picks a random gift to be given to mob/living/target. Should be valuable and/or threatening to the wizard.
+ */
+/obj/item/projectile/magic/chaos/proc/apply_great_gift_effect(mob/living/target)
+ chaos_effect = pick("esword", "emag", "chaos wand", "revolver", "aeg", \
+ "bluespace banana", "banana grenade", "disco ball", "syndicate minibomb", "crystal ball")
+ switch(chaos_effect)
+ if("esword")
+ item_to_summon = /obj/item/melee/energy/sword/saber/blue
+ if("emag")
+ item_to_summon = /obj/item/card/emag
+ if("chaos wand")
+ item_to_summon = /obj/item/gun/magic/wand/chaos
+ if("revolver")
+ item_to_summon = /obj/item/gun/projectile/revolver
+ if("aeg")
+ item_to_summon = /obj/item/gun/energy/gun/nuclear
+ if("bluespace banana")
+ item_to_summon = /obj/item/food/snacks/grown/banana/bluespace
+ if("banana grenade")
+ item_to_summon = /obj/item/grenade/clown_grenade
+ if("disco ball")
+ new /obj/machinery/disco/chaos_staff(get_turf(target))
+ target.visible_message("DANCE TILL YOU'RE DEAD!")
+ if("syndicate minibomb")
+ item_to_summon = /obj/item/grenade/syndieminibomb
+ if("crystal ball")
+ item_to_summon = /obj/item/scrying
+
+#undef CHAOS_STAFF_DAMAGE
+#undef CHAOS_STAFF_LETHAL_CHANCE
+#undef CHAOS_STAFF_NEGATIVE_CHANCE
+#undef CHAOS_STAFF_MISC_CHANCE
+#undef CHAOS_STAFF_GIFT_CHANCE
+#undef CHAOS_STAFF_GREAT_GIFT_CHANCE
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index d16842684b4c..fc5735047f2e 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -43,6 +43,7 @@
item_state = null
can_holster = TRUE
cell_type = /obj/item/stock_parts/cell/pulse/pistol
+ can_charge = FALSE
/obj/item/gun/energy/pulse/destroyer
name = "pulse destroyer"
diff --git a/code/modules/projectiles/guns/energy/special_eguns.dm b/code/modules/projectiles/guns/energy/special_eguns.dm
index 44c34958eae0..f76483b01c4f 100644
--- a/code/modules/projectiles/guns/energy/special_eguns.dm
+++ b/code/modules/projectiles/guns/energy/special_eguns.dm
@@ -577,10 +577,13 @@
add_fingerprint(user)
ui_interact(user)
-/obj/item/gun/energy/temperature/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.deep_inventory_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/gun/energy/temperature/ui_state(mob/user)
+ return GLOB.deep_inventory_state
+
+/obj/item/gun/energy/temperature/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "TempGun", name, 250, 130, master_ui, state)
+ ui = new(user, src, "TempGun", name)
ui.open()
/obj/item/gun/energy/temperature/ui_data(mob/user)
@@ -605,6 +608,7 @@
desc += " Its temperature cap has been removed."
max_temp = 1000
temperature_multiplier *= 5 //so emagged temp guns adjust their temperature much more quickly
+ return TRUE
/obj/item/gun/energy/temperature/process()
..()
@@ -745,11 +749,11 @@
return
var/tracking_target = locateUID(tracking_target_UID)
if(tracking_target)
- if(alert("Do you want to clear the tracker?", "Tracker reset", "Yes", "No") == "Yes")
+ if(tgui_alert(user, "Do you want to clear the tracker?", "Tracker reset", list("Yes", "No")) == "Yes")
to_chat(user, "[src] stops tracking [tracking_target]")
stop_pointing()
if(linked_pinpointer_UID)
- if(alert("Do you want to clear the linked pinpointer?", "Pinpointer reset", "Yes", "No") == "Yes")
+ if(tgui_alert(user, "Do you want to clear the linked pinpointer?", "Pinpointer reset", list("Yes", "No")) == "Yes")
to_chat(user, "[src] is ready to be linked to a new pinpointer.")
unlink()
@@ -884,3 +888,73 @@
#undef PLASMA_CHARGE_USE_PER_SECOND
#undef PLASMA_DISCHARGE_LIMIT
+
+/obj/item/gun/energy/vortex_shotgun
+ name = "reality vortex wrist mounted shotgun"
+ desc = "This weapon uses the power of the vortex core to rip apart the fabric of reality in front of it."
+ icon_state = "flayer" //Sorta wrist mounted? Sorta? Not really but we work with what we got.
+ flags = NODROP
+ ammo_type = list(/obj/item/ammo_casing/energy/vortex_blast)
+ fire_sound = 'sound/weapons/bladeslice.ogg'
+ cell_type = /obj/item/stock_parts/cell/infinite
+
+/obj/item/ammo_casing/energy/vortex_blast
+ projectile_type = /obj/item/projectile/energy/vortex_blast
+ muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/vortex_blast
+ variance = 70
+ pellets = 8
+ e_cost = 100
+ delay = 1.2 SECONDS //and delay has to be stored here on energy guns
+ select_name = "vortex blast"
+ fire_sound = 'sound/weapons/wave.ogg'
+
+/obj/item/projectile/energy/vortex_blast
+ name = "vortex blast"
+ hitscan = TRUE
+ damage = 2
+ range = 5
+ icon_state = "magspear"
+ hitsound = 'sound/weapons/sear.ogg' //Gets a bit spamy, suppressed is needed to suffer less
+ hitsound_wall = null
+ suppressed = TRUE
+
+/obj/item/projectile/energy/vortex_blast/prehit(atom/target)
+ . = ..()
+ if(ishuman(target))
+ return
+ if(isliving(target))
+ damage *= 4 //Up damage if not a human as we are not doing shenanigins
+ return
+ damage *= 6 //objects tend to fall apart as atoms are ripped up
+
+/obj/item/projectile/energy/vortex_blast/on_hit(atom/target, blocked = 0)
+ if(blocked >= 100)
+ return ..()
+ if(ishuman(target))
+ var/mob/living/carbon/human/L = target
+ var/obj/item/organ/external/affecting = L.get_organ(ran_zone(def_zone))
+ L.apply_damage(2, BRUTE, affecting, L.run_armor_check(affecting, ENERGY))
+ L.apply_damage(2, TOX, affecting, L.run_armor_check(affecting, ENERGY))
+ L.apply_damage(2, CLONE, affecting, L.run_armor_check(affecting, ENERGY))
+ L.adjustBrainLoss(3)
+ ..()
+
+/obj/effect/temp_visual/target_angled/muzzle_flash/vortex_blast
+ invisibility = 100 // visual is from effect
+
+/obj/effect/temp_visual/target_angled/muzzle_flash/vortex_blast/Initialize(mapload, atom/target, duration_override)
+ . = ..()
+ if(target)
+ new /obj/effect/warp_effect/vortex_blast(loc, target)
+
+/obj/effect/warp_effect/vortex_blast
+ icon = 'icons/effects/64x64.dmi'
+ icon_state = "vortex_shotgun"
+
+/obj/effect/warp_effect/vortex_blast/Initialize(mapload, target)
+ . = ..()
+ var/matrix/M = matrix() * 0.5
+ M.Turn(get_angle(src, target) - 45)
+ transform = M
+ animate(src, transform = M * 10, time = 0.3 SECONDS, alpha = 0)
+ QDEL_IN(src, 0.3 SECONDS)
diff --git a/code/modules/projectiles/guns/energy/telegun.dm b/code/modules/projectiles/guns/energy/telegun.dm
index 19228ba5fcd1..e2a43b7a30f9 100644
--- a/code/modules/projectiles/guns/energy/telegun.dm
+++ b/code/modules/projectiles/guns/energy/telegun.dm
@@ -14,7 +14,7 @@
teleport_target = null
return ..()
-/obj/item/gun/energy/telegun/attack_self(mob/living/user as mob)
+/obj/item/gun/energy/telegun/attack_self(mob/living/user)
var/list/L = list()
var/list/areaindex = list()
@@ -34,7 +34,9 @@
areaindex[tmpname] = 1
L[tmpname] = R
- var/desc = input("Please select a location to lock in.", "Telegun Target Interface") in L
+ var/desc = tgui_input_list(user, "Please select a location to lock in.", "Telegun Target Selection", L)
+ if(!desc)
+ return
teleport_target = L[desc]
to_chat(user, "The [src] is now set to [desc].")
//Process the shot without draining the cell
diff --git a/code/modules/projectiles/guns/magic/magic_staff.dm b/code/modules/projectiles/guns/magic/magic_staff.dm
index 0eaf7bf88d0b..44353ba05282 100644
--- a/code/modules/projectiles/guns/magic/magic_staff.dm
+++ b/code/modules/projectiles/guns/magic/magic_staff.dm
@@ -35,13 +35,13 @@
/obj/item/gun/magic/staff/chaos
name = "staff of chaos"
- desc = "An artefact that spits bolts of chaotic magic that can potentially do anything."
+ desc = "Random bullshit go!"
ammo_type = /obj/item/ammo_casing/magic/chaos
icon_state = "staffofchaos"
item_state = "staffofchaos"
max_charges = 10
recharge_rate = 2
- no_den_usage = 1
+ no_den_usage = TRUE
fire_sound = 'sound/magic/staff_chaos.ogg'
/obj/item/gun/magic/staff/door
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index c8458bafe916..d2819aeba821 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -10,7 +10,7 @@
w_class = WEIGHT_CLASS_SMALL
can_charge = FALSE
max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths)
- var/variable_charges = 1
+ var/variable_charges = TRUE
execution_speed = 3 SECONDS
/obj/item/gun/magic/wand/Initialize(mapload)
@@ -201,3 +201,29 @@
to_chat(user, "You feel rather silly!.")
charges--
..()
+
+/////////////////////////////////////
+//WAND OF CHAOS - Only spawned by the Staff of Chaos as a rare random effect
+/////////////////////////////////////
+/obj/item/gun/magic/wand/chaos
+ name = "wand of chaos"
+ desc = "Payback time!"
+ fire_sound = 'sound/magic/staff_chaos.ogg'
+ ammo_type = /obj/item/ammo_casing/magic/chaos
+ icon_state = "chaoswand"
+ max_charges = 20
+ variable_charges = FALSE
+ no_den_usage = TRUE
+
+/obj/item/gun/magic/wand/chaos/zap_self(mob/living/user)
+ if(!ishuman(user))
+ return
+ to_chat(user, "[pick("Chaos chaos!", "You can do anything!", "You hear a mariachi band playing in the distance.", \
+ "Would you like a glass of water?", "What fun is there in making sense?", "Maybe you ought to go back home and crawl under your bed.", \
+ "Time to dual wield chaos wands!", "Sixty percent of the time, it works every time.", "Cheese for everyone!", "You hear a deep voice cackling.", \
+ "Xom bursts into laughter!", "Xom thinks this is hilarious!")]")
+ var/obj/item/projectile/magic/chaos/proj = new /obj/item/projectile/magic/chaos(src)
+ proj.chaos_chaos(user)
+ qdel(proj)
+ charges--
+ ..()
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 2436845b1eb1..37c26c4569fe 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -310,6 +310,14 @@
origin_tech = null
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/cap
+/obj/item/gun/projectile/revolver/capgun/chaosprank
+ name = "\improper .357 revolver"
+
+/obj/item/gun/projectile/revolver/capgun/chaosprank/shoot_with_empty_chamber(mob/living/user)
+ to_chat(user, "[src] vanishes in a puff of smoke!")
+ playsound(src, 'sound/items/bikehorn.ogg')
+ qdel(src)
+
/////////////////////////////
// DOUBLE BARRELED SHOTGUN //
/////////////////////////////
@@ -333,6 +341,7 @@
sawn_desc = "Omar's coming!"
can_holster = FALSE
unique_reskin = TRUE
+ var/can_sawoff = TRUE
/obj/item/gun/projectile/revolver/doublebarrel/Initialize(mapload)
. = ..()
@@ -346,6 +355,8 @@
/obj/item/gun/projectile/revolver/doublebarrel/attackby(obj/item/A, mob/user, params)
if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
chamber_round()
+ if(!can_sawoff)
+ return ..()
if(istype(A, /obj/item/melee/energy))
var/obj/item/melee/energy/W = A
if(W.active)
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm
index 7c59fe6a63a9..5d69bbdedec8 100644
--- a/code/modules/projectiles/guns/projectile/saw.dm
+++ b/code/modules/projectiles/guns/projectile/saw.dm
@@ -86,6 +86,7 @@
/obj/item/projectile/bullet/saw/incen
damage = 7
armour_penetration_flat = 0
+ immolate = 3
/obj/item/projectile/bullet/saw/incen/Move()
..()
@@ -94,13 +95,6 @@
new /obj/effect/hotspot(location)
location.hotspot_expose(700, 50, 1)
-/obj/item/projectile/bullet/saw/incen/on_hit(atom/target, blocked = 0)
- . = ..()
- if(iscarbon(target))
- var/mob/living/carbon/M = target
- M.adjust_fire_stacks(3)
- M.IgniteMob()
-
//magazines//
/obj/item/ammo_box/magazine/mm556x45
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 849fa39f3bc9..70e9a7f903be 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -320,7 +320,7 @@
item_state = "shotgun_combat"
origin_tech = "combat=6"
mag_type = /obj/item/ammo_box/magazine/internal/shot/com
- w_class = WEIGHT_CLASS_HUGE
+ w_class = WEIGHT_CLASS_BULKY
execution_speed = 5 SECONDS
//Dual Feed Shotgun
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index 45b30ddf7b32..39a292da9582 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -68,6 +68,9 @@
/obj/item/gun/syringe/attackby(obj/item/A, mob/user, params, show_msg = TRUE)
if(istype(A, /obj/item/reagent_containers/syringe))
+ if(istype(A, /obj/item/reagent_containers/syringe/lethal))
+ to_chat(user, "[A] is too big to fit into [src].")
+ return
var/in_clip = length(syringes) + (chambered.BB ? 1 : 0)
if(in_clip < max_syringes)
if(!user.unEquip(A))
diff --git a/code/modules/projectiles/guns/throw/crossbow.dm b/code/modules/projectiles/guns/throw/crossbow.dm
index b4a49a9f18b8..77dc3dbd5ea2 100644
--- a/code/modules/projectiles/guns/throw/crossbow.dm
+++ b/code/modules/projectiles/guns/throw/crossbow.dm
@@ -133,7 +133,7 @@
/obj/item/gun/throw/crossbow/AltClick(mob/user)
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
return
- var/choice = input("Select tension to draw to:", "[src]", XBOW_TENSION_FULL) as null|anything in possible_tensions
+ var/choice = tgui_input_list(user, "Select tension to draw to:", "[src]", possible_tensions)
if(!choice)
return
@@ -157,7 +157,7 @@
/obj/item/gun/throw/crossbow/french
name = "french powered crossbow"
icon_state = "fcrossbow"
- valid_projectile_type = /obj/item/reagent_containers/food/snacks/baguette
+ valid_projectile_type = /obj/item/food/snacks/baguette
/obj/item/gun/throw/crossbow/french/modify_projectile(obj/item/I, on_chamber = 0)
return
diff --git a/code/modules/projectiles/guns/throw/pielauncher.dm b/code/modules/projectiles/guns/throw/pielauncher.dm
index a69cf6d03125..7f70d9990986 100644
--- a/code/modules/projectiles/guns/throw/pielauncher.dm
+++ b/code/modules/projectiles/guns/throw/pielauncher.dm
@@ -8,7 +8,7 @@
force = 5
clumsy_check = FALSE
- valid_projectile_type = /obj/item/reagent_containers/food/snacks/pie
+ valid_projectile_type = /obj/item/food/snacks/pie
max_capacity = 5
projectile_speed = 2
projectile_range = 30
@@ -17,7 +17,7 @@
/obj/item/gun/throw/piecannon/Initialize(mapload)
. = ..()
for(var/i in 1 to max_capacity)
- var/obj/item/reagent_containers/food/snacks/pie/P = new /obj/item/reagent_containers/food/snacks/pie(src)
+ var/obj/item/food/snacks/pie/P = new (src)
loaded_projectiles += P
process_chamber()
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 86464da459a7..3d6211b949d1 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -178,7 +178,7 @@
var/mob/living/carbon/human/M = target
if(istype(M.wear_suit))
if(M.wear_suit.type in suit_types)
- M.adjustStaminaLoss(34)
+ M.apply_damage(34, STAMINA)
return 1
/obj/item/projectile/beam/lasertag/omni
@@ -198,6 +198,7 @@
/obj/item/projectile/beam/immolator
name = "immolation beam"
+ immolate = 1
/obj/item/projectile/beam/immolator/strong
name = "heavy immolation beam"
@@ -226,13 +227,6 @@
impact_light_range = 2.5
impact_light_color_override = LIGHT_COLOR_FIRE
-/obj/item/projectile/beam/immolator/on_hit(atom/target, blocked = 0)
- . = ..()
- if(isliving(target))
- var/mob/living/M = target
- M.adjust_fire_stacks(1)
- M.IgniteMob()
-
/obj/item/projectile/beam/instakill
name = "instagib laser"
icon_state = "purple_laser"
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index b81b6a5690ec..56935aae546e 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -59,13 +59,7 @@
damage_type = TOX
/obj/item/projectile/bullet/incendiary
-
-/obj/item/projectile/bullet/incendiary/on_hit(atom/target, blocked = 0)
- . = ..()
- if(iscarbon(target))
- var/mob/living/carbon/M = target
- M.adjust_fire_stacks(4)
- M.IgniteMob()
+ immolate = 1
/obj/item/projectile/bullet/incendiary/firebullet
damage = 10
@@ -101,25 +95,6 @@
if(H.getStaminaLoss() >= 60)
H.KnockDown(8 SECONDS)
-/obj/item/projectile/bullet/pellet/weak
- tile_dropoff = 0.55 //Come on it does 6 damage don't be like that.
- damage = 6
-
-/obj/item/projectile/bullet/pellet/weak/New()
- range = rand(1, 8)
- ..()
-
-/obj/item/projectile/bullet/pellet/weak/on_range()
- do_sparks(1, 1, src)
- ..()
-
-/obj/item/projectile/bullet/pellet/overload
- damage = 3
-
-/obj/item/projectile/bullet/pellet/overload/New()
- range = rand(1, 10)
- ..()
-
/obj/item/projectile/bullet/pellet/assassination
damage = 12
tile_dropoff = 1 // slightly less damage and greater damage falloff compared to normal buckshot
@@ -129,15 +104,6 @@
var/mob/living/M = target
M.AdjustSilence(4 SECONDS) // HELP MIME KILLING ME IN MAINT
-/obj/item/projectile/bullet/pellet/overload/on_hit(atom/target, blocked = 0)
- ..()
- explosion(target, 0, 0, 2)
-
-/obj/item/projectile/bullet/pellet/overload/on_range()
- explosion(src, 0, 0, 2)
- do_sparks(3, 3, src)
- ..()
-
/obj/item/projectile/bullet/midbullet
damage = 20
stamina = 45 // Three rounds from the c20r knocks unarmoured people down, four for people with bulletproof
@@ -160,11 +126,8 @@
damage = 27
armour_penetration_flat = 40
-/obj/item/projectile/bullet/midbullet3/fire/on_hit(atom/target, blocked = 0)
- if(..(target, blocked))
- var/mob/living/M = target
- M.adjust_fire_stacks(1)
- M.IgniteMob()
+/obj/item/projectile/bullet/midbullet3/fire
+ immolate = 1
/obj/item/projectile/bullet/midbullet3/overgrown
icon = 'icons/obj/ammo.dmi'
@@ -265,10 +228,7 @@
if(M.can_inject(null, FALSE, hit_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
..()
- for(var/datum/reagent/R as anything in reagents.reagent_list)
- if(initial(R.id) == "????") // Yes this is a specific case that we don't really want
- continue
- reagents.reaction(M, REAGENT_INGEST, 0.1)
+ reagents.reaction(M, REAGENT_INGEST, 0.1)
reagents.trans_to(M, reagents.total_volume)
return TRUE
else
@@ -315,8 +275,21 @@
if(isalien(target))
knockdown = 0
nodamage = TRUE
+ if(isrobot(target))
+ stun = 10 SECONDS
. = ..() // Execute the rest of the code.
+/obj/item/projectile/bullet/anti_alien_toxin
+ name = "neurotoxin spit"
+ icon_state = "neurotoxin"
+ damage = 15 // FRENDLY FIRE FRENDLY FIRE
+ damage_type = BURN
+
+/obj/item/projectile/bullet/anti_alien_toxin/on_hit(atom/target, blocked = 0)
+ if(isalien(target))
+ stun = 10 SECONDS
+ . = ..()
+
/obj/item/projectile/bullet/cap
name = "cap"
damage = 0
diff --git a/code/modules/projectiles/projectile/energy_projectiles.dm b/code/modules/projectiles/projectile/energy_projectiles.dm
index a25675bdf68f..15fb2bbbd8df 100644
--- a/code/modules/projectiles/projectile/energy_projectiles.dm
+++ b/code/modules/projectiles/projectile/energy_projectiles.dm
@@ -108,6 +108,9 @@
M.KnockDown(4 SECONDS)
else
to_chat(M, "You see a flash of briliant blue light as [src] explodes, burning you!")
+ if(immolate)
+ M.adjust_fire_stacks(immolate)
+ M.IgniteMob()
else
to_chat(M, "You feel the heat of the explosion of [src], but the blast mostly misses you.")
add_attack_logs(src, M, "Hit lightly by [src]")
@@ -144,7 +147,7 @@
A.duration += 10 SECONDS
qdel(src)
return
- new /obj/effect/abstract/arc_revolver(target, charge_number)
+ new /obj/effect/abstract/arc_revolver(target, charge_number, immolate)
qdel(src)
@@ -156,12 +159,14 @@
var/list/chains = list()
var/successfulshocks = 0
var/wait_for_three = 0
+ var/our_immolate = 0
-/obj/effect/abstract/arc_revolver/Initialize(mapload, charge_number)
+/obj/effect/abstract/arc_revolver/Initialize(mapload, charge_number, immolate)
. = ..()
charge_numbers += charge_number
START_PROCESSING(SSfastprocess, src)
GLOB.arc_emitters += src
+ our_immolate = immolate / 5
build_chains()
/obj/effect/abstract/arc_revolver/proc/build_chains()
@@ -232,6 +237,9 @@
)
var/damage = (2 - isliving(B.origin) + 2 - isliving(B.target)) //Damage is upped depending if the origin is a mob or not. Wall to wall hurts more than mob to wall, or mob to mob
L.adjustFireLoss(damage) //time to die
+ if(our_immolate)
+ L.adjust_fire_stacks(our_immolate)
+ L.IgniteMob()
. = 1
/obj/effect/abstract/arc_revolver/proc/removechains()
diff --git a/code/modules/projectiles/projectile/magic_projectiles.dm b/code/modules/projectiles/projectile/magic_projectiles.dm
index ae210e6a0147..42e6fc6bdcd1 100644
--- a/code/modules/projectiles/projectile/magic_projectiles.dm
+++ b/code/modules/projectiles/projectile/magic_projectiles.dm
@@ -180,7 +180,7 @@
. = ..()
wabbajack(change)
-/proc/wabbajack(mob/living/M)
+/proc/wabbajack(mob/living/M, force_borg = FALSE, force_animal = FALSE)
if(istype(M) && M.stat != DEAD && !M.notransform)
M.notransform = TRUE
M.icon = null
@@ -206,6 +206,10 @@
var/mob/living/new_mob
var/randomize = pick("robot", "slime", "xeno", "human", "animal")
+ if(force_borg)
+ randomize = "robot"
+ if(force_animal)
+ randomize = "animal"
switch(randomize)
if("robot")
var/path
@@ -311,7 +315,6 @@
damage_type = BURN
/obj/item/projectile/magic/animate/Bump(atom/change)
- ..()
if(isitem(change) || isstructure(change) && !is_type_in_list(change, GLOB.protected_objects))
if(istype(change, /obj/structure/closet/statue))
for(var/mob/living/carbon/human/H in change.contents)
@@ -336,6 +339,7 @@
// Change our allegiance!
var/mob/living/simple_animal/hostile/mimic/copy/C = change
C.ChangeOwner(firer)
+ return ..()
/obj/item/projectile/magic/slipping
name = "magical banana"
diff --git a/code/modules/projectiles/projectile/special_projectiles.dm b/code/modules/projectiles/projectile/special_projectiles.dm
index fe9be67164cf..d6ef8c8a422e 100644
--- a/code/modules/projectiles/projectile/special_projectiles.dm
+++ b/code/modules/projectiles/projectile/special_projectiles.dm
@@ -16,7 +16,7 @@
return TRUE
/obj/item/projectile/ion/weak
- strong_emp = 0
+ strong_emp = -1
weak_emp = 0
/obj/item/projectile/bullet/gyro
diff --git a/code/modules/projectiles/projectile_base.dm b/code/modules/projectiles/projectile_base.dm
index ddbe7edc5ef9..178f037096d0 100644
--- a/code/modules/projectiles/projectile_base.dm
+++ b/code/modules/projectiles/projectile_base.dm
@@ -62,6 +62,8 @@
var/jitter = 0
/// Number of times an object can pass through an object. -1 is infinite
var/forcedodge = 0
+ /// Does the projectile increase fire stacks / immolate mobs on hit? Applies fire stacks equal to the number on hit.
+ var/immolate = 0
var/dismemberment = 0 //The higher the number, the greater the bonus to dismembering. 0 will not dismember at all.
var/impact_effect_type //what type of impact effect to show when hitting something
var/ricochets = 0
@@ -198,6 +200,9 @@
playsound(loc, hitsound, volume, 1, -1)
L.visible_message("[L] is hit by \a [src][organ_hit_text]!", \
"[L] is hit by \a [src][organ_hit_text]!") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
+ if(immolate)
+ L.adjust_fire_stacks(immolate)
+ L.IgniteMob()
var/additional_log_text
if(blocked)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 916dbb84c56d..d8de619c306d 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -142,11 +142,14 @@
if(A == beaker)
beaker = null
-/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/chem_dispenser/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/chem_dispenser/ui_interact(mob/user, datum/tgui/ui = null)
// update the ui if it exists, returns null if no ui is passed/found
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ChemDispenser", ui_title, 390, 655)
+ ui = new(user, src, "ChemDispenser", ui_title)
ui.open()
/obj/machinery/chem_dispenser/ui_data(mob/user)
@@ -237,7 +240,7 @@
//if(isrobot(user)) // SS220 EDIT
// return
- if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks)) && user.a_intent != INTENT_HARM)
+ if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks)) && user.a_intent != INTENT_HARM)
if(panel_open)
to_chat(user, "Close the maintenance panel first.")
return
@@ -332,7 +335,7 @@
ui_title = "Soda Dispens-o-matic"
dispensable_reagents = list("water", "ice", "milk", "soymilk", "coffee", "tea", "hot_coco", "cola", "spacemountainwind", "dr_gibb", "space_up",
"tonic", "sodawater", "lemon_lime", "grapejuice", "sugar", "orangejuice", "lemonjuice", "limejuice", "tomatojuice", "banana",
- "watermelonjuice", "carrotjuice", "potato", "berryjuice")
+ "watermelonjuice", "pineapplejuice", "cream", "berryjuice")
upgrade_reagents = list("bananahonk", "milkshake", "cafe_latte", "cafe_mocha", "triple_citrus", "icecoffe","icetea")
hacked_reagents = list("thirteenloko")
hack_message = "You change the mode from 'McNano' to 'Pizza King'."
@@ -463,10 +466,13 @@
to_chat(user, "[src] lacks a power cell!")
-/obj/item/handheld_chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/handheld_chem_dispenser/ui_state(mob/user)
+ return GLOB.inventory_state
+
+/obj/item/handheld_chem_dispenser/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "HandheldChemDispenser", name, 390, 500)
+ ui = new(user, src, "HandheldChemDispenser", name)
ui.open()
/obj/item/handheld_chem_dispenser/ui_data(mob/user)
@@ -594,7 +600,7 @@
is_drink = TRUE
dispensable_reagents = list("water", "ice", "milk", "soymilk", "coffee", "tea", "hot_coco", "cola", "spacemountainwind", "dr_gibb", "space_up",
"tonic", "sodawater", "lemon_lime", "grapejuice", "sugar", "orangejuice", "lemonjuice", "limejuice", "tomatojuice", "banana",
- "watermelonjuice", "carrotjuice", "potato", "berryjuice")
+ "watermelonjuice", "pineapplejuice", "cream", "berryjuice")
/obj/item/handheld_chem_dispenser/botanical
name = "handheld botanical chemical dispenser"
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index f4b27a23d4ea..2437d22e3509 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -129,13 +129,16 @@
return FALSE
add_fingerprint(usr)
-/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/chem_heater/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/chem_heater/ui_interact(mob/user, datum/tgui/ui = null)
if(user.stat || user.restrained())
return
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ChemHeater", "Chemical Heater", 350, 270, master_ui, state)
+ ui = new(user, src, "ChemHeater", "Chemical Heater")
ui.open()
/obj/machinery/chem_heater/ui_data(mob/user)
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 46b868a7b482..e8c208d6d892 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -122,7 +122,7 @@
to_chat(user, "You can't use [src] while it's panel is opened!")
return TRUE
- if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks/drinkingglass)) && user.a_intent != INTENT_HARM)
+ if((istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks/drinkingglass)) && user.a_intent != INTENT_HARM)
if(!user.drop_item())
to_chat(user, "[I] is stuck to you!")
return
@@ -327,7 +327,7 @@
if("create_condi_bottle")
if(!condi || !reagents.total_volume)
return
- var/obj/item/reagent_containers/food/condiment/P = new(loc)
+ var/obj/item/reagent_containers/condiment/P = new(loc)
reagents.trans_to(P, 50)
if("create_pills")
var/medicine_name = pillname
@@ -413,15 +413,20 @@
return TRUE
ui_interact(user)
-/obj/machinery/chem_master/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- var/datum/asset/chem_master/assets = get_asset_datum(/datum/asset/chem_master)
- assets.send(user)
+/obj/machinery/chem_master/ui_state(mob/user)
+ return GLOB.default_state
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/chem_master/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ChemMaster", name, 575, 600)
+ ui = new(user, src, "ChemMaster", name)
ui.open()
+/obj/machinery/chem_master/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/spritesheet/chem_master)
+ )
+
/obj/machinery/chem_master/ui_data(mob/user)
var/data[0]
@@ -486,7 +491,7 @@
for(var/i in 1 to MAX_PILL_SPRITE)
pill_styles += list(list(
"id" = i,
- "sprite" = "pill[i].png",
+ "sprite" = "pill[i]",
))
data["pillstyles"] = pill_styles
@@ -496,7 +501,7 @@
bottle_style_indexer++
bottle_styles_with_sprite += list(list(
"id" = bottle_style_indexer,
- "sprite" = "[style].png",
+ "sprite" = "[style]",
))
data["bottlestyles"] = bottle_styles_with_sprite
@@ -572,7 +577,7 @@
return
if(!length(answer))
answer = reagents.get_master_reagent_name()
- var/obj/item/reagent_containers/food/condiment/pack/P = new(loc)
+ var/obj/item/reagent_containers/condiment/pack/P = new(loc)
P.originalname = answer
P.name = "[answer] pack"
P.desc = "A small condiment pack. The label says it contains [answer]."
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 616e9953058c..4a783fb1d843 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -114,7 +114,7 @@
D = new type(0, null)
if(!D)
return
- var/name = stripped_input(usr,"Name:","Name the culture",D.name,MAX_NAME_LEN)
+ var/name = tgui_input_text(usr, "Name:", "Name the culture", D.name, MAX_NAME_LEN)
if(name == null || wait)
return
var/obj/item/reagent_containers/glass/bottle/B = new/obj/item/reagent_containers/glass/bottle(loc)
@@ -145,7 +145,7 @@
updateUsrDialog()
return
else if(href_list["name_disease"])
- var/new_name = stripped_input(usr, "Name the Disease", "New Name", "", MAX_NAME_LEN)
+ var/new_name = tgui_input_text(usr, "Name the Disease", "New Name", max_length = MAX_NAME_LEN)
if(!new_name)
return
if(..())
@@ -179,7 +179,7 @@
/obj/machinery/computer/pandemic/proc/print_form(datum/disease/advance/D, mob/living/user)
D = GLOB.archive_diseases[D.GetDiseaseID()]
if(!(printing) && D)
- var/reason = input(user,"Enter a reason for the release", "Write", null) as message
+ var/reason = tgui_input_text(user,"Enter a reason for the release", "Write", multiline = TRUE)
reason += ""
var/english_symptoms = list()
for(var/I in D.symptoms)
@@ -189,7 +189,7 @@
var/signature
- if(alert(user,"Would you like to add your signature?",,"Yes","No") == "Yes")
+ if(tgui_alert(user, "Would you like to add your signature?", "Signature", list("Yes","No")) == "Yes")
signature = "[user ? user.real_name : "Anonymous"]"
else
signature = ""
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index bac5f3c2ef10..89e6149bd0ec 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -10,13 +10,12 @@
resistance_flags = ACID_PROOF
var/operating = FALSE
var/obj/item/reagent_containers/beaker = new /obj/item/reagent_containers/glass/beaker/large
- var/limit = null
- var/efficiency = null
+ var/limit
+ var/efficiency
- //IMPORTANT NOTE! A negative number is a multiplier, a positive number is a flat amount to add. 0 means equal to the amount of the original reagent
+ // IMPORTANT NOTE! A negative number is a multiplier, a positive number is a flat amount to add. 0 means equal to the amount of the original reagent
var/list/blend_items = list (
-
- //Sheets
+ // Sheets
/obj/item/stack/sheet/mineral/plasma = list("plasma_dust" = 20),
/obj/item/stack/sheet/metal = list("iron" = 20),
/obj/item/stack/rods = list("iron" = 10),
@@ -34,60 +33,58 @@
/obj/item/grown/nettle/death = list("facid" = 0, "sacid" = 0),
/obj/item/grown/novaflower = list("capsaicin" = 0, "condensedcapsaicin" = 0),
- //Blender Stuff
- /obj/item/reagent_containers/food/snacks/grown/tomato = list("ketchup" = 0),
- /obj/item/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
- /obj/item/reagent_containers/food/snacks/grown/oat = list("flour" = -5),
- /obj/item/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
- /obj/item/reagent_containers/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
- /obj/item/reagent_containers/food/snacks/egg = list("egg" = -5),
- /obj/item/reagent_containers/food/snacks/grown/rice = list("rice" = -5),
- /obj/item/reagent_containers/food/snacks/grown/olive = list("olivepaste" = 0, "sodiumchloride" = 0),
- /obj/item/reagent_containers/food/snacks/grown/peanuts = list("peanutbutter" = 0),
-
- //Grinder stuff, but only if dry
- /obj/item/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
- /obj/item/reagent_containers/food/snacks/grown/coffee = list("coffeepowder" = 0),
- /obj/item/reagent_containers/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
- /obj/item/reagent_containers/food/snacks/grown/tea = list("teapowder" = 0),
-
- //All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
+ // Blender Stuff
+ /obj/item/food/snacks/grown/tomato = list("ketchup" = 0),
+ /obj/item/food/snacks/grown/wheat = list("flour" = -5),
+ /obj/item/food/snacks/grown/oat = list("flour" = -5),
+ /obj/item/food/snacks/grown/cherries = list("cherryjelly" = 0),
+ /obj/item/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
+ /obj/item/food/snacks/egg = list("egg" = -5),
+ /obj/item/food/snacks/grown/rice = list("rice" = -5),
+ /obj/item/food/snacks/grown/olive = list("olivepaste" = 0, "sodiumchloride" = 0),
+ /obj/item/food/snacks/grown/peanuts = list("peanutbutter" = 0),
+
+ // Grinder stuff, but only if dry
+ /obj/item/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
+ /obj/item/food/snacks/grown/coffee = list("coffeepowder" = 0),
+ /obj/item/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
+ /obj/item/food/snacks/grown/tea = list("teapowder" = 0),
+
+ // All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
/obj/item/slime_extract = list(),
- /obj/item/reagent_containers/food = list(),
+ /obj/item/food = list(),
/obj/item/reagent_containers/pill = list(),
/obj/item/reagent_containers/patch = list()
)
var/list/juice_items = list (
-
- //Juicer Stuff
- /obj/item/reagent_containers/food/snacks/grown/soybeans = list("soymilk" = 0),
- /obj/item/reagent_containers/food/snacks/grown/corn = list("corn_starch" = 0),
- /obj/item/reagent_containers/food/snacks/grown/tomato = list("tomatojuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/carrot = list("carrotjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/berries = list("berryjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/banana = list("banana" = 0),
- /obj/item/reagent_containers/food/snacks/grown/potato = list("potato" = 0),
- /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = list("lemonjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/citrus/orange = list("orangejuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/citrus/lime = list("limejuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/watermelon = list("watermelonjuice" = 0),
- /obj/item/reagent_containers/food/snacks/watermelonslice = list("watermelonjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/berries/poison = list("poisonberryjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), //order is important here as blumpkin is a subtype of pumpkin, if switched blumpkins will produce pumpkin juice
- /obj/item/reagent_containers/food/snacks/grown/pumpkin = list("pumpkinjuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/apple = list("applejuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/grapes = list("grapejuice" = 0),
- /obj/item/reagent_containers/food/snacks/grown/pineapple = list("pineapplejuice" = 0)
+ // Juicer Stuff
+ /obj/item/food/snacks/grown/soybeans = list("soymilk" = 0),
+ /obj/item/food/snacks/grown/corn = list("corn_starch" = 0),
+ /obj/item/food/snacks/grown/tomato = list("tomatojuice" = 0),
+ /obj/item/food/snacks/grown/carrot = list("carrotjuice" = 0),
+ /obj/item/food/snacks/grown/berries = list("berryjuice" = 0),
+ /obj/item/food/snacks/grown/banana = list("banana" = 0),
+ /obj/item/food/snacks/grown/potato = list("potato" = 0),
+ /obj/item/food/snacks/grown/citrus/lemon = list("lemonjuice" = 0),
+ /obj/item/food/snacks/grown/citrus/orange = list("orangejuice" = 0),
+ /obj/item/food/snacks/grown/citrus/lime = list("limejuice" = 0),
+ /obj/item/food/snacks/grown/watermelon = list("watermelonjuice" = 0),
+ /obj/item/food/snacks/watermelonslice = list("watermelonjuice" = 0),
+ /obj/item/food/snacks/grown/berries/poison = list("poisonberryjuice" = 0),
+ /obj/item/food/snacks/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), // Order is important here as blumpkin is a subtype of pumpkin, if switched blumpkins will produce pumpkin juice
+ /obj/item/food/snacks/grown/pumpkin = list("pumpkinjuice" = 0),
+ /obj/item/food/snacks/grown/apple = list("applejuice" = 0),
+ /obj/item/food/snacks/grown/grapes = list("grapejuice" = 0),
+ /obj/item/food/snacks/grown/pineapple = list("pineapplejuice" = 0)
)
var/list/dried_items = list(
-
- //Grinder stuff, but only if dry,
- /obj/item/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
- /obj/item/reagent_containers/food/snacks/grown/coffee = list("coffeepowder" = 0),
- /obj/item/reagent_containers/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
- /obj/item/reagent_containers/food/snacks/grown/tea = list("teapowder" = 0)
+ // Grinder stuff, but only if dry,
+ /obj/item/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
+ /obj/item/food/snacks/grown/coffee = list("coffeepowder" = 0),
+ /obj/item/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
+ /obj/item/food/snacks/grown/tea = list("teapowder" = 0)
)
var/list/holdingitems = list()
@@ -112,8 +109,8 @@
H += M.rating
for(var/obj/item/stock_parts/manipulator/M in component_parts)
T += M.rating
- limit = 10*H
- efficiency = 0.8+T*0.1
+ limit = 10 * H
+ efficiency = 0.8 + T * 0.1
/obj/machinery/reagentgrinder/Destroy()
QDEL_NULL(beaker)
@@ -160,7 +157,6 @@
default_unfasten_wrench(user, I)
/obj/machinery/reagentgrinder/attackby(obj/item/I, mob/user, params)
-
if(exchange_parts(user, I))
SStgui.update_uis(src)
return
@@ -177,40 +173,40 @@
beaker.loc = src
update_icon(UPDATE_ICON_STATE)
SStgui.update_uis(src)
- return TRUE //no afterattack
+ return TRUE // No afterattack
if(is_type_in_list(I, dried_items))
- if(istype(I, /obj/item/reagent_containers/food/snacks/grown))
- var/obj/item/reagent_containers/food/snacks/grown/G = I
+ if(istype(I, /obj/item/food/snacks/grown))
+ var/obj/item/food/snacks/grown/G = I
if(!G.dry)
to_chat(user, "You must dry that first!")
return FALSE
- if(holdingitems && holdingitems.len >= limit)
+ if(length(holdingitems) >= limit)
to_chat(usr, "The machine cannot hold anymore items.")
return FALSE
- //Fill machine with a bag!
+ // Fill machine with a bag!
if(istype(I, /obj/item/storage/bag))
var/obj/item/storage/bag/B = I
- if(!B.contents.len)
+ if(!length(B.contents))
to_chat(user, "[B] is empty.")
return FALSE
- var/original_contents_len = B.contents.len
+ var/original_contents_len = length(B.contents)
for(var/obj/item/G in B.contents)
if(is_type_in_list(G, blend_items) || is_type_in_list(G, juice_items))
B.remove_from_storage(G, src)
holdingitems += G
- if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill
+ if(length(holdingitems) >= limit) // Sanity checking so the blender doesn't overfill
to_chat(user, "You fill the All-In-One grinder to the brim.")
break
- if(B.contents.len == original_contents_len)
+ if(length(B.contents) == original_contents_len)
to_chat(user, "Nothing in [B] can be put into the All-In-One grinder.")
return FALSE
- else if(!B.contents.len)
+ else if(!length(B.contents))
to_chat(user, "You empty all of [B]'s contents into the All-In-One grinder.")
else
to_chat(user, "You empty some of [B]'s contents into the All-In-One grinder.")
@@ -231,18 +227,22 @@
SStgui.update_uis(src)
return FALSE
-
-
/obj/machinery/reagentgrinder/attack_ai(mob/user)
return FALSE
/obj/machinery/reagentgrinder/attack_hand(mob/user)
ui_interact(user)
-/obj/machinery/reagentgrinder/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/reagentgrinder/attack_ghost(mob/user)
+ ui_interact(user)
+
+/obj/machinery/reagentgrinder/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/reagentgrinder/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ReagentGrinder", name, 400, 500, master_ui, state)
+ ui = new(user, src, "ReagentGrinder", name)
ui.open()
/obj/machinery/reagentgrinder/ui_data(mob/user)
@@ -257,10 +257,9 @@
var/list/beakerContents = list()
if(beaker)
for(var/datum/reagent/R in beaker.reagents.reagent_list)
- beakerContents.Add(list(list("name" = R.name, "volume" = R.volume))) // list in a list because Byond merges the first list...
+ beakerContents.Add(list(list("name" = R.name, "volume" = R.volume))) // List in a list because Byond merges the first list...
data["beaker_contents"] = beakerContents
-
var/list/items_counts = list()
var/list/name_overrides = list()
for(var/obj/O in holdingitems)
@@ -274,13 +273,13 @@
else
name_overrides[display_name] = display_name
if(S.amount > 1)
- name_overrides[display_name] = "[name_overrides[display_name]]s" //name_overrides[display_name] Will be set on the first time as the singular form
+ name_overrides[display_name] = "[name_overrides[display_name]]s" // name_overrides[display_name] Will be set on the first time as the singular form
items_counts[display_name] += S.amount
continue
- else if(istype(O, /obj/item/reagent_containers/food))
- var/obj/item/reagent_containers/food/food = O
+ else if(isfood(O))
+ var/obj/item/food/food = O
if(!items_counts[display_name])
if(food.ingredient_name)
name_overrides[display_name] = food.ingredient_name
@@ -290,7 +289,7 @@
if(food.ingredient_name_plural)
name_overrides[display_name] = food.ingredient_name_plural
else if(items_counts[display_name] == 1) // Must only add "s" once or you get stuff like "eggsssss"
- name_overrides[display_name] = "[name_overrides[display_name]]s" //name_overrides[display_name] Will be set on the first time as the singular form
+ name_overrides[display_name] = "[name_overrides[display_name]]s" // name_overrides[display_name] Will be set on the first time as the singular form
items_counts[display_name]++
@@ -340,7 +339,7 @@
/obj/machinery/reagentgrinder/proc/eject(mob/user)
if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
return
- if(holdingitems && holdingitems.len == 0)
+ if(!length(holdingitems))
return
for(var/obj/item/O in holdingitems)
@@ -349,23 +348,12 @@
holdingitems = list()
SStgui.update_uis(src)
-/obj/machinery/reagentgrinder/proc/is_allowed(obj/item/reagent_containers/O)
- for(var/i in blend_items)
- if(istype(O, i))
- return TRUE
- return FALSE
-
-/obj/machinery/reagentgrinder/proc/get_allowed_by_id(obj/item/O)
+/obj/machinery/reagentgrinder/proc/get_special_blend(obj/item/O)
for(var/i in blend_items)
if(istype(O, i))
return blend_items[i]
-/obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(obj/item/reagent_containers/food/snacks/O)
- for(var/i in blend_items)
- if(istype(O, i))
- return blend_items[i]
-
-/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(obj/item/reagent_containers/food/snacks/O)
+/obj/machinery/reagentgrinder/proc/get_special_juice(obj/item/food/snacks/O)
for(var/i in juice_items)
if(istype(O, i))
return juice_items[i]
@@ -378,13 +366,13 @@
else
return round(O.seed.potency)
-/obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/reagent_containers/food/snacks/grown/O)
+/obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/food/snacks/grown/O)
if(!istype(O) || !O.seed)
return 5
else if(O.seed.potency == -1)
return 5
else
- return round(5*sqrt(O.seed.potency))
+ return round(5 * sqrt(O.seed.potency))
/obj/machinery/reagentgrinder/proc/remove_object(obj/item/O)
holdingitems -= O
@@ -394,152 +382,149 @@
power_change()
if(stat & (NOPOWER|BROKEN))
return
- if(!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
+ if(!beaker || beaker.reagents.holder_full())
return
+
playsound(src.loc, 'sound/machines/juicer.ogg', 20, 1)
var/offset = prob(50) ? -2 : 2
- animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking
+ animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) // Start shaking
operating = TRUE
SStgui.update_uis(src)
- spawn(50)
- pixel_x = initial(pixel_x) //return to its spot after shaking
+ spawn(5 SECONDS)
+ pixel_x = initial(pixel_x) // Return to its spot after shaking
operating = FALSE
SStgui.update_uis(src)
- //Snacks
- for(var/obj/item/reagent_containers/food/snacks/O in holdingitems)
- if(beaker.reagents.holder_full())
- break
-
- var/allowed = get_allowed_juice_by_id(O)
- if(isnull(allowed))
- break
-
- for(var/r_id in allowed)
+ // Snacks
+ for(var/obj/item/food/snacks/O in holdingitems)
+ var/list/special_juice = get_special_juice(O)
+ if(!length(special_juice))
+ continue // Ignore food that doesn't juice into anything
+ for(var/r_id in special_juice)
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
- var/amount = get_juice_amount(O)
- beaker.reagents.add_reagent(r_id, min(amount * efficiency, space))
+ beaker.reagents.add_reagent(r_id, min(get_juice_amount(O) * efficiency, space))
- if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+ if(beaker.reagents.holder_full())
break
remove_object(O)
+ if(beaker.reagents.holder_full())
+ return
/obj/machinery/reagentgrinder/proc/grind()
-
power_change()
if(stat & (NOPOWER|BROKEN))
return
- if(!beaker || (beaker && beaker.reagents.holder_full()))
+ if(!beaker || beaker.reagents.holder_full())
return
- playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
- var/offset = prob(50) ? -2 : 2
- animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking
+
+ playsound(loc, 'sound/machines/blender.ogg', 50, 1)
+ animate(src, pixel_x = pick(-3, -2, 2, 3), pixel_y = pick(-3, -2, 2, 3), time = 1 DECISECONDS, loop = 20, easing = JUMP_EASING)
+ animate(pixel_x = 0, pixel_y = 0, time = 1 DECISECONDS, easing = JUMP_EASING)
operating = TRUE
SStgui.update_uis(src)
- spawn(60)
- pixel_x = initial(pixel_x) //return to its spot after shaking
+ spawn(6 SECONDS)
+ pixel_x = initial(pixel_x) // Return to its spot after shaking
operating = FALSE
SStgui.update_uis(src)
- //Snacks and Plants
- for(var/obj/item/reagent_containers/food/snacks/O in holdingitems)
- if(beaker.reagents.holder_full())
- break
-
- var/allowed = get_allowed_snack_by_id(O)
- if(isnull(allowed))
- break
-
- for(var/r_id in allowed)
-
+ // Snacks and Plants
+ for(var/obj/item/food/snacks/O in holdingitems)
+ var/list/special_blend = get_special_blend(O)
+ for(var/r_id in special_blend)
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
- var/amount = allowed[r_id]
+ var/amount = special_blend[r_id]
+
if(amount <= 0)
if(amount == 0)
- if(O.reagents != null && O.reagents.has_reagent("nutriment"))
+ if(O.reagents.has_reagent("nutriment"))
beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("nutriment") * efficiency, space))
O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space))
- if(O.reagents != null && O.reagents.has_reagent("plantmatter"))
+ if(O.reagents.has_reagent("plantmatter"))
beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("plantmatter") * efficiency, space))
O.reagents.remove_reagent("plantmatter", min(O.reagents.get_reagent_amount("plantmatter"), space))
else
- if(O.reagents != null && O.reagents.has_reagent("nutriment"))
+ if(O.reagents.has_reagent("nutriment"))
beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("nutriment") * abs(amount) * efficiency), space))
O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space))
- if(O.reagents != null && O.reagents.has_reagent("plantmatter"))
+ if(O.reagents.has_reagent("plantmatter"))
beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("plantmatter") * abs(amount) * efficiency), space))
O.reagents.remove_reagent("plantmatter", min(O.reagents.get_reagent_amount("plantmatter"), space))
-
-
else
O.reagents.trans_id_to(beaker, r_id, min(amount, space))
if(beaker.reagents.holder_full())
break
- if(O.reagents.reagent_list.len == 0)
- remove_object(O)
+ O.reagents.trans_to(beaker, O.reagents.total_volume)
- //Sheets and rods(!)
- for(var/obj/item/stack/O in holdingitems)
+ if(!O.reagents.total_volume)
+ remove_object(O)
if(beaker.reagents.holder_full())
- break
+ return
- var/allowed = get_allowed_by_id(O)
- if(isnull(allowed))
- break
+ // Sheets and rods(!)
+ for(var/obj/item/stack/O in holdingitems)
+ var/list/special_blend = get_special_blend(O)
+ if(!length(special_blend))
+ continue // Ignore stackables that don't grind into anything
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
- while(O.amount) //Grind until there's no more reagents
- if(!space) //if no free space - exit
- break
- O.amount -= 1 //remove one from stack
- for(var/r_id in allowed)
- var/spaceused = min(allowed[r_id] * efficiency, space)
+ while(O.amount)
+ O.amount--
+
+ for(var/r_id in special_blend)
+ var/spaceused = min(special_blend[r_id] * efficiency, space)
space -= spaceused
beaker.reagents.add_reagent(r_id, spaceused)
- if(O.amount < 1) //if leftover small - destroy
+
+ if(O.amount < 1) // If leftover small - destroy
remove_object(O)
break
+ if(beaker.reagents.holder_full())
+ return
- //Plants
+ // Plants
for(var/obj/item/grown/O in holdingitems)
- if(beaker.reagents.holder_full())
- break
- var/allowed = get_allowed_by_id(O)
- for(var/r_id in allowed)
+ var/list/special_blend = get_special_blend(O)
+ for(var/r_id in special_blend)
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
- var/amount = allowed[r_id]
+ var/amount = special_blend[r_id]
+
if(amount == 0)
- if(O.reagents != null && O.reagents.has_reagent(r_id))
- beaker.reagents.add_reagent(r_id,min(O.reagents.get_reagent_amount(r_id) * efficiency, space))
+ if(O.reagents.has_reagent(r_id))
+ beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount(r_id) * efficiency, space))
else
- beaker.reagents.add_reagent(r_id,min(amount * efficiency, space))
+ beaker.reagents.add_reagent(r_id, min(amount * efficiency, space))
if(beaker.reagents.holder_full())
break
+
remove_object(O)
+ if(beaker.reagents.holder_full())
+ return
- //Slime Extractis
+ // Slime Extracts
for(var/obj/item/slime_extract/O in holdingitems)
- if(beaker.reagents.holder_full())
- break
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
- if(O.reagents != null)
+
+ if(O.reagents)
var/amount = O.reagents.total_volume
O.reagents.trans_to(beaker, min(amount, space))
if(O.Uses > 0)
- beaker.reagents.add_reagent("slimejelly",min(20 * efficiency, space))
+ beaker.reagents.add_reagent("slimejelly", min(20 * efficiency, space))
+
remove_object(O)
+ if(beaker.reagents.holder_full())
+ return
- //Everything else - Transfers reagents from it into beaker
+ // Everything else - Transfers reagents from it into beaker
for(var/obj/item/reagent_containers/O in holdingitems)
- if(beaker.reagents.holder_full())
- break
- var/amount = O.reagents.total_volume
- O.reagents.trans_to(beaker, amount)
+ O.reagents.trans_to(beaker, O.reagents.total_volume)
+
if(!O.reagents.total_volume)
remove_object(O)
+ if(beaker.reagents.holder_full())
+ return
diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm
index 7314ed61bdbd..ac51cdc9cadc 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol.dm
@@ -1567,13 +1567,12 @@
drink_name = "Ahdomai's Eclipse"
drink_desc = "Blizzard in a glass. Tajaran signature drink!"
taste_description = "ice"
+ var/min_achievable_temp = 250
/datum/reagent/consumable/ethanol/ahdomai_eclipse/on_mob_life(mob/living/M)
- if(!istajaran(M))
- return ..()
- if(M.bodytemperature > 250)
- M.bodytemperature = max(250, M.bodytemperature - (50 * TEMPERATURE_DAMAGE_COEFFICIENT))
-
+ . = ..()
+ if(istajaran(M) && M.bodytemperature > min_achievable_temp)
+ M.bodytemperature = max(min_achievable_temp, M.bodytemperature - (50 * TEMPERATURE_DAMAGE_COEFFICIENT))
/datum/reagent/consumable/ethanol/beach_feast
name = "Feast by the Beach"
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index 4fc3ce1c13e3..0387905fe2c7 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -24,7 +24,7 @@
if(method == REAGENT_TOUCH)
volume = ..()
M.apply_damage(0.6*volume, BRUTE)
- M.adjustStaminaLoss(volume)
+ M.apply_damage(volume, STAMINA)
if(iscarbon(M))
M.emote("scream")
@@ -104,7 +104,7 @@
if(method == REAGENT_TOUCH)
volume = ..()
M.apply_damage(0.4*volume, BURN)
- M.adjustStaminaLoss(volume)
+ M.apply_damage(volume, STAMINA)
if(M.reagents)
M.reagents.add_reagent("frostoil", 0.4*volume)
diff --git a/code/modules/reagents/chemistry/reagents/disease.dm b/code/modules/reagents/chemistry/reagents/disease.dm
index c5941b342456..335af8f37b19 100644
--- a/code/modules/reagents/chemistry/reagents/disease.dm
+++ b/code/modules/reagents/chemistry/reagents/disease.dm
@@ -124,6 +124,7 @@
if(volume > 4.5)
if(ishuman(M))
var/mob/living/carbon/human/H = M
+ // im not going to make this an organ datum, so that slime people dont get their brain instantly deleted
var/obj/item/organ/internal/heart/ate_heart = H.get_int_organ(/obj/item/organ/internal/heart)
if(ate_heart)
ate_heart.remove(H)
diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
index 27d2d5977ce4..86e51200e801 100644
--- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
@@ -271,6 +271,7 @@
/datum/reagent/consumable/drink/hot_coco/on_mob_life(mob/living/M)
if(M.bodytemperature < 310) // 310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
+ return ..()
/datum/reagent/consumable/drink/coffee
name = "Coffee"
diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm
index eab7d288c5b5..51f8ec28f334 100644
--- a/code/modules/reagents/chemistry/reagents/drugs.dm
+++ b/code/modules/reagents/chemistry/reagents/drugs.dm
@@ -741,8 +741,7 @@
return ..() | update_flags
/datum/reagent/fliptonium/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
- if(method == REAGENT_INGEST || method == REAGENT_TOUCH)
- M.SpinAnimation(speed = 12, loops = -1, parallel = FALSE)
+ M.SpinAnimation(speed = 12, loops = -1, parallel = FALSE)
..()
/datum/reagent/fliptonium/on_mob_delete(mob/living/M)
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 2a541a575d84..496cbf3fdd49 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -597,10 +597,11 @@
/datum/reagent/consumable/chocolate/on_mob_life(mob/living/M)
M.reagents.add_reagent("sugar", 0.8)
+ return ..()
/datum/reagent/consumable/chocolate/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
- new /obj/item/reagent_containers/food/snacks/choc_pile(T)
+ new /obj/item/food/snacks/choc_pile(T)
/datum/reagent/consumable/mugwort
name = "Mugwort"
@@ -668,7 +669,7 @@
/datum/reagent/consumable/cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
- new /obj/item/reagent_containers/food/snacks/cheesewedge(T)
+ new /obj/item/food/snacks/cheesewedge(T)
/datum/reagent/consumable/fake_cheese
name = "Cheese substitute"
@@ -710,7 +711,7 @@
/datum/reagent/consumable/weird_cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
- new /obj/item/reagent_containers/food/snacks/weirdcheesewedge(T)
+ new /obj/item/food/snacks/weirdcheesewedge(T)
/datum/reagent/consumable/beans
name = "Refried beans"
@@ -843,8 +844,9 @@
/datum/reagent/questionmark/reaction_mob(mob/living/carbon/human/H, method = REAGENT_TOUCH, volume)
if(istype(H) && method == REAGENT_INGEST)
if(H.dna.species.taste_sensitivity < TASTE_SENSITIVITY_NO_TASTE) // If you can taste it, then you know how awful it is.
- H.Weaken(4 SECONDS)
to_chat(H, "Ugh! Eating that was a terrible idea!")
+ if(!H.HasDisease(/datum/disease/food_poisoning))
+ H.fakevomit(no_text = TRUE)
if(HAS_TRAIT(H, TRAIT_NOHUNGER)) //If you don't eat, then you can't get food poisoning
return
H.ForceContractDisease(new /datum/disease/food_poisoning(0))
@@ -934,11 +936,11 @@
/datum/reagent/ectoplasm/reaction_turf(turf/T, volume)
if(volume >= 10 && !isspaceturf(T))
- new /obj/item/reagent_containers/food/snacks/ectoplasm(T)
+ new /obj/item/food/snacks/ectoplasm(T)
/datum/reagent/consumable/bread/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
- new /obj/item/reagent_containers/food/snacks/breadslice(T)
+ new /obj/item/food/snacks/breadslice(T)
/datum/reagent/soap
name = "Soap"
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index dd1ef9b10c07..3cd551e24f94 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -211,61 +211,6 @@
M.germ_level = max(M.germ_level - 20, 0) // Reduces the mobs germ level, too
return ..()
-/datum/reagent/medicine/silver_sulfadiazine
- name = "Silver Sulfadiazine"
- id = "silver_sulfadiazine"
- description = "This antibacterial compound is used to treat burn victims."
- reagent_state = LIQUID
- color = "#F0DC00"
- metabolization_rate = 3
- harmless = FALSE //toxic if ingested, and I am NOT going to account for the difference
- taste_description = "burn cream"
-
-/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/M)
- var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
- return ..() | update_flags
-
-/datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume, show_message = 1)
- if(iscarbon(M))
- if(method == REAGENT_TOUCH)
- M.adjustFireLoss(-volume)
- if(show_message)
- to_chat(M, "The silver sulfadiazine soothes your burns.")
- if(method == REAGENT_INGEST)
- M.adjustToxLoss(0.5*volume)
- if(show_message)
- to_chat(M, "You feel sick...")
- ..()
-
-/datum/reagent/medicine/styptic_powder
- name = "Styptic Powder"
- id = "styptic_powder"
- description = "Styptic (aluminum sulfate) powder helps control bleeding and heal physical wounds."
- reagent_state = LIQUID
- color = "#FF9696"
- metabolization_rate = 3
- harmless = FALSE
- taste_description = "wound cream"
-
-/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/M)
- var/update_flags = STATUS_UPDATE_NONE
- update_flags |= M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
- return ..() | update_flags
-
-/datum/reagent/medicine/styptic_powder/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume, show_message = 1)
- if(iscarbon(M))
- if(method == REAGENT_TOUCH)
- M.adjustBruteLoss(-volume)
- if(show_message)
- to_chat(M, "The styptic powder stings like hell as it closes some of your wounds!")
- M.emote("scream")
- if(method == REAGENT_INGEST)
- M.adjustToxLoss(0.5*volume)
- if(show_message)
- to_chat(M, "You feel gross!")
- ..()
-
/datum/reagent/medicine/salglu_solution
name = "Saline-Glucose Solution"
id = "salglu_solution"
@@ -288,7 +233,49 @@
H.blood_volume += 1
return ..() | update_flags
-/datum/reagent/medicine/synthflesh
+/datum/reagent/medicine/heal_on_apply
+
+/datum/reagent/medicine/heal_on_apply/proc/heal_external_limb(obj/item/organ/external/organ, volume)
+ return
+
+/datum/reagent/medicine/heal_on_apply/proc/heal_overall_damage(mob/living/M, volume)
+ return
+
+/datum/reagent/medicine/heal_on_apply/proc/splash_human(mob/living/carbon/human/H, volume)
+ var/turf_volume = max(0, (volume - 100) / 3)
+ volume = volume - turf_volume
+
+ var/volume_per_bodypart = volume / length(H.bodyparts)
+
+ for(var/obj/item/organ/external/organ in H.bodyparts)
+ if(!get_location_accessible(H, organ.limb_name))
+ turf_volume += volume_per_bodypart
+ continue
+
+ heal_external_limb(organ, volume_per_bodypart)
+
+ H.updatehealth(reason = "[id] splashed")
+ H.UpdateDamageIcon()
+
+ if(turf_volume > 0)
+ reaction_turf(get_turf(H), turf_volume)
+
+ return volume
+
+/datum/reagent/medicine/heal_on_apply/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume, show_message = 1)
+ if(!iscarbon(M))
+ return ..()
+
+ if(ishuman(M) && volume >= 20 && method == REAGENT_TOUCH)
+ var/applied_volume = splash_human(M, volume)
+ return ..(M, method, applied_volume, show_message)
+
+ if(method == REAGENT_TOUCH)
+ heal_overall_damage(M, volume)
+
+ return ..()
+
+/datum/reagent/medicine/heal_on_apply/synthflesh
name = "Synthflesh"
id = "synthflesh"
description = "A resorbable microfibrillar collagen and protein mixture that can rapidly heal injuries when applied topically."
@@ -297,26 +284,95 @@
penetrates_skin = TRUE
taste_description = "blood"
-/datum/reagent/medicine/synthflesh/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume, show_message = 1)
- if(iscarbon(M))
- if(method == REAGENT_TOUCH)
- M.adjustBruteLoss(-1.5 * volume)
- M.adjustFireLoss(-1.5 * volume)
- if(show_message)
- to_chat(M, "The synthetic flesh integrates itself into your wounds, healing you.")
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(HAS_TRAIT_FROM(H, TRAIT_HUSK, BURN) && H.getFireLoss() <= UNHUSK_DAMAGE_THRESHOLD && (H.reagents.get_reagent_amount("synthflesh") + volume >= SYNTHFLESH_UNHUSK_AMOUNT))
- H.cure_husk(BURN)
- // Could be a skeleton or a golem or sth, avoid phrases like "burnt flesh" and "burnt skin"
- H.visible_message("The squishy liquid coats [H]'s burns. [H] looks a lot healthier!")
- ..()
+/datum/reagent/medicine/heal_on_apply/synthflesh/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume, show_message = 1)
+ var/mob/living/carbon/human/H = M
+ if(ishuman(H) && HAS_TRAIT_FROM(H, TRAIT_HUSK, BURN) && H.getFireLoss() <= UNHUSK_DAMAGE_THRESHOLD && H.reagents.get_reagent_amount("synthflesh") + volume >= SYNTHFLESH_UNHUSK_AMOUNT)
+ H.cure_husk(BURN)
+ // Could be a skeleton or a golem or sth, avoid phrases like "burnt flesh" and "burnt skin"
+ H.visible_message("The squishy liquid coats [H]'s burns. [H] looks a lot healthier!")
+
+ if(show_message)
+ to_chat(M, "The synthetic flesh integrates itself into your wounds, healing you.")
+
+ return ..()
-/datum/reagent/medicine/synthflesh/reaction_turf(turf/T, volume) //let's make a mess!
+/datum/reagent/medicine/heal_on_apply/synthflesh/heal_external_limb(obj/item/organ/external/organ, volume)
+ organ.heal_damage(1.5 * volume, 1.5 * volume, updating_health = FALSE)
+
+/datum/reagent/medicine/heal_on_apply/synthflesh/heal_overall_damage(mob/living/M, volume)
+ M.adjustBruteLoss(-1.5 * volume)
+ M.adjustFireLoss(-1.5 * volume)
+
+/datum/reagent/medicine/heal_on_apply/synthflesh/reaction_turf(turf/T, volume) //let's make a mess!
if(volume >= 5 && !isspaceturf(T))
new /obj/effect/decal/cleanable/blood/gibs/cleangibs(T)
playsound(T, 'sound/effects/splat.ogg', 50, 1, -3)
+/datum/reagent/medicine/heal_on_apply/styptic_powder
+ name = "Styptic Powder"
+ id = "styptic_powder"
+ description = "Styptic (aluminum sulfate) powder helps control bleeding and heal physical wounds."
+ reagent_state = LIQUID
+ color = "#FF9696"
+ metabolization_rate = 3
+ harmless = FALSE
+ taste_description = "wound cream"
+
+/datum/reagent/medicine/heal_on_apply/styptic_powder/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustBruteLoss(-2 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
+
+/datum/reagent/medicine/heal_on_apply/styptic_powder/heal_external_limb(obj/item/organ/external/organ, volume)
+ organ.heal_damage(volume, 0, updating_health = FALSE)
+
+/datum/reagent/medicine/heal_on_apply/styptic_powder/heal_overall_damage(mob/living/M, volume)
+ M.adjustBruteLoss(-volume)
+
+/datum/reagent/medicine/heal_on_apply/styptic_powder/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume, show_message = 1)
+ if(show_message)
+ to_chat(M, "The styptic powder stings like hell as it closes some of your wounds!")
+ M.emote("scream")
+
+ if(method == REAGENT_INGEST)
+ M.adjustToxLoss(0.5 * volume)
+ if(show_message)
+ to_chat(M, "You feel gross!")
+
+ return ..()
+
+/datum/reagent/medicine/heal_on_apply/silver_sulfadiazine
+ name = "Silver Sulfadiazine"
+ id = "silver_sulfadiazine"
+ description = "This antibacterial compound is used to treat burn victims."
+ reagent_state = LIQUID
+ color = "#F0DC00"
+ metabolization_rate = 3
+ harmless = FALSE //toxic if ingested, and I am NOT going to account for the difference
+ taste_description = "burn cream"
+
+/datum/reagent/medicine/heal_on_apply/silver_sulfadiazine/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustFireLoss(-2 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
+
+/datum/reagent/medicine/heal_on_apply/silver_sulfadiazine/heal_external_limb(obj/item/organ/external/organ, volume)
+ organ.heal_damage(0, volume, updating_health = FALSE)
+
+/datum/reagent/medicine/heal_on_apply/silver_sulfadiazine/heal_overall_damage(mob/living/M, volume)
+ M.adjustFireLoss(-volume)
+
+/datum/reagent/medicine/heal_on_apply/silver_sulfadiazine/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume, show_message = 1)
+ if(show_message)
+ to_chat(M, "The silver sulfadiazine soothes your burns.")
+
+ if(method == REAGENT_INGEST)
+ M.adjustToxLoss(0.5 * volume)
+ if(show_message)
+ to_chat(M, "You feel sick...")
+
+ return ..()
+
/datum/reagent/medicine/charcoal
name = "Charcoal"
id = "charcoal"
@@ -1017,10 +1073,12 @@
M.AdjustDrowsy(-20 SECONDS)
M.SetConfused(0)
M.SetSleeping(0)
- var/status = CANSTUN | CANWEAKEN | CANPARALYSE
- M.status_flags &= ~status
+ M.add_stun_absorption("stimulants", INFINITY, 5)
+ M.status_flags &= ~CANPARALYSE
else
- M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE
+ M.status_flags |= CANPARALYSE
+ if(islist(M.stun_absorption) && M.stun_absorption["stimulants"])
+ M.remove_stun_absorption("stimulants")
update_flags |= M.adjustToxLoss(2, FALSE)
update_flags |= M.adjustBruteLoss(1, FALSE)
if(prob(10))
@@ -1031,7 +1089,9 @@
return ..() | update_flags
/datum/reagent/medicine/stimulants/on_mob_delete(mob/living/M)
- M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE
+ M.status_flags |= CANPARALYSE
+ if(islist(M.stun_absorption) && M.stun_absorption["stimulants"])
+ M.remove_stun_absorption("stimulants")
..()
//the highest end antistun chem, removes stun and stamina rapidly.
@@ -1425,7 +1485,7 @@
M.reagents.remove_reagent(R.id, 0.5) //We will be generous (for nukies really) and purge out the chemicals during this phase, so they don't fucking die during the next phase. Of course, if they try to use adrenals in the next phase, well...
if(20 to 43)
//If they have stimulants or stimulant drugs then just apply toxin damage instead.
- if(has_stimulant == TRUE)
+ if(has_stimulant)
update_flags |= M.adjustToxLoss(10, FALSE)
else //apply debilitating effects
if(prob(75))
@@ -1436,7 +1496,7 @@
to_chat(M, "Your body goes rigid, you cannot move at all!")
M.AdjustWeakened(15 SECONDS)
if(45 to INFINITY) // Start fixing bones | If they have stimulants or stimulant drugs in their system then the nanites won't work.
- if(has_stimulant == TRUE)
+ if(has_stimulant)
return ..()
else
for(var/obj/item/organ/external/E in M.bodyparts)
diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm
index 095a7319d80a..e99879f3b28d 100644
--- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm
@@ -465,12 +465,13 @@
else if(C.mind.assigned_role == "Mime")
to_chat(C, "You feel nauseous.")
C.AdjustDizzy(volume STATUS_EFFECT_CONSTANT)
+ ADD_TRAIT(C, TRAIT_COMIC_SANS, id)
+ C.AddElement(/datum/element/waddling)
else
to_chat(C, "Something doesn't feel right...")
C.AdjustDizzy(volume STATUS_EFFECT_CONSTANT)
- if(C.mind.assigned_role != "Clown")
- ADD_TRAIT(C, TRAIT_COMIC_SANS, id)
- C.AddElement(/datum/element/waddling)
+ ADD_TRAIT(C, TRAIT_COMIC_SANS, id)
+ C.AddElement(/datum/element/waddling)
C.AddComponent(/datum/component/squeak, null, null, null, null, null, TRUE, falloff_exponent = 20)
/datum/reagent/jestosterone/on_mob_life(mob/living/carbon/M)
@@ -505,7 +506,7 @@
/datum/reagent/jestosterone/on_mob_delete(mob/living/M)
..()
- if(M.mind.assigned_role != "Clown")
+ if(M.mind?.assigned_role != "Clown")
REMOVE_TRAIT(M, TRAIT_COMIC_SANS, id)
M.RemoveElement(/datum/element/waddling)
qdel(M.GetComponent(/datum/component/squeak))
diff --git a/code/modules/reagents/chemistry/reagents/paradise_pop.dm b/code/modules/reagents/chemistry/reagents/paradise_pop.dm
index 754941135999..8dfc39353607 100644
--- a/code/modules/reagents/chemistry/reagents/paradise_pop.dm
+++ b/code/modules/reagents/chemistry/reagents/paradise_pop.dm
@@ -81,7 +81,7 @@
/datum/reagent/consumable/drink/berry_banned2/on_mob_death(mob/living/M)
SEND_SOUND(M, sound('sound/effects/adminhelp.ogg', 0, 1, 0, 25))
- to_chat(M, chat_box_red("PM from-Administrator: BWOINK!"))
+ to_chat(M, chat_box_red("PM from-Administrator: BWOINK!"), MESSAGE_TYPE_ADMINPM, confidential = TRUE)
..()
//Blackeye Brew: Chance to make the drinker say greytider-themed things like "I thought clown was valid!"
@@ -101,7 +101,7 @@
"SECRET TECHNIQUE: TABLE AND DISPOSAL!",
// Borers got removed but the below reference stays because its hilarious
"[pick("MY BROTHER", " MY DOG", "MY BEST FRIEND", "THE BORER", "GEORGE MELONS", "BADMINS")] DID IT!",
- ";s WHATS SPACE LAW?!",
+ "; WHATS SPACE LAW?!",
"I BOUGHT THESE GLOVES, NOT STEAL THEM",
"THIS DOOR WAS SHOCKED WHEN I GOT HERE",
"ANIMALS ARE NOT CREW")
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
index a1e6795070bc..fdfd4e3b9c98 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
@@ -251,9 +251,8 @@
fireflash_sm(T, radius, 4500 + volume * 500, 350)
/datum/reagent/clf3/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume)
- if(method == REAGENT_TOUCH || method == REAGENT_INGEST)
- M.adjust_fire_stacks(10)
- M.IgniteMob()
+ M.adjust_fire_stacks(10)
+ M.IgniteMob()
if(method == REAGENT_INGEST)
M.adjustFireLoss(min(max(15, volume * 2.5), 90))
to_chat(M, "It burns!")
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 4fa070dcb13c..c104e21bd9e9 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -284,33 +284,37 @@
return ..() | update_flags
/datum/reagent/acid/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume)
- if(ishuman(M) && !isgrey(M))
- var/mob/living/carbon/human/H = M
- if(method == REAGENT_TOUCH)
- if(volume > 25)
- if(H.wear_mask)
- to_chat(H, "Your [H.wear_mask] protects you from the acid!")
- return
-
- if(H.head)
- to_chat(H, "Your [H.wear_mask] protects you from the acid!")
- return
-
- if(prob(75))
- H.take_organ_damage(5, 10)
- H.emote("scream")
- var/obj/item/organ/external/affecting = H.get_organ("head")
- if(istype(affecting))
- affecting.disfigure()
- else
- H.take_organ_damage(5, 10)
- else
- H.take_organ_damage(5, 10)
+ if(!ishuman(M) || isgrey(M))
+ return
+
+ var/mob/living/carbon/human/H = M
+ if(method != REAGENT_TOUCH)
+ to_chat(H, "The greenish acidic substance stings[volume < 10 ? " you, but isn't concentrated enough to harm you" : null]!")
+ if(volume >= 10)
+ H.adjustFireLoss(clamp((volume * 2), 4, 20))
+ H.emote("scream")
+ return
+
+ if(volume < 25) // Need at least 10 units to do a little bit of damage
+ if(volume > 10)
+ H.take_organ_damage(5, 10)
else
- to_chat(H, "The greenish acidic substance stings[volume < 10 ? " you, but isn't concentrated enough to harm you" : null]!")
- if(volume >= 10)
- H.adjustFireLoss(min(max(4, (volume - 10) * 2), 20))
- H.emote("scream")
+ H.adjustFireLoss(clamp(volume, 1, 5))
+ return
+
+ if(H.wear_mask)
+ to_chat(H, "Your [H.wear_mask] protects you from the acid!")
+ return
+ if(H.head)
+ to_chat(H, "Your [H.head] protects you from the acid!")
+ return
+
+ H.take_organ_damage(10, 15)
+ H.emote("scream")
+ if(prob(75))
+ var/obj/item/organ/external/affecting = H.get_organ("head")
+ if(istype(affecting))
+ affecting.disfigure()
/datum/reagent/acid/reaction_obj(obj/O, volume)
if(ismob(O.loc)) //handled in human acid_act()
@@ -337,42 +341,44 @@
return ..() | update_flags
/datum/reagent/acid/facid/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume)
- if(ishuman(M) && !isgrey(M))
- var/mob/living/carbon/human/H = M
- if(method == REAGENT_TOUCH)
- if(volume > 9)
- if(!H.wear_mask && !H.head)
- var/obj/item/organ/external/affecting = H.get_organ("head")
- if(istype(affecting))
- affecting.disfigure()
- H.adjustFireLoss(min(max(8, (volume - 5) * 3), 75))
- H.emote("scream")
- return
- else
- var/melted_something = FALSE
- if(H.wear_mask && !(H.wear_mask.resistance_flags & ACID_PROOF))
- to_chat(H, "Your [H.wear_mask.name] melts away!")
- qdel(H.wear_mask)
- melted_something = TRUE
-
- if(H.head && !(H.head.resistance_flags & ACID_PROOF))
- melted_something = TRUE
- if(istype(H.head, /obj/item/clothing/head/mod) && ismodcontrol(H.back))
- var/obj/item/mod/control/C = H.back
- var/name = H.head.name
- C.seal_part(H.head, FALSE)
- C.retract(null, H.head)
- to_chat(H, "Your [name] melts away as your [C.name] performs emergency cleaning on the helmet, deactivating the suit!")
- else
- to_chat(H, "Your [H.head.name] melts away!")
- qdel(H.head)
- if(melted_something)
- return
-
- if(volume >= 5)
- H.emote("scream")
- H.adjustFireLoss(min(max(8, (volume - 5) * 3), 75))
- to_chat(H, "The blueish acidic substance stings[volume < 5 ? " you, but isn't concentrated enough to harm you" : null]!")
+ if(!ishuman(M) || isgrey(M))
+ return
+
+ var/mob/living/carbon/human/H = M
+ if(method == REAGENT_TOUCH && volume > 9)
+ if(!H.wear_mask && !H.head)
+ var/obj/item/organ/external/affecting = H.get_organ("head")
+ if(istype(affecting))
+ affecting.disfigure()
+ H.emote("scream")
+ H.adjustFireLoss(clamp((volume - 5) * 3, 8, 75))
+ return
+
+ var/has_melted_something = FALSE
+ if(H.wear_mask && !(H.wear_mask.resistance_flags & ACID_PROOF))
+ to_chat(H, "Your [H.wear_mask.name] melts away!")
+ qdel(H.wear_mask)
+ has_melted_something = TRUE
+
+ if(H.head && !(H.head.resistance_flags & ACID_PROOF))
+ if(istype(H.head, /obj/item/clothing/head/mod) && ismodcontrol(H.back))
+ var/obj/item/mod/control/C = H.back
+ var/name = H.head.name
+ C.seal_part(H.head, FALSE)
+ C.retract(null, H.head)
+ to_chat(H, "Your [name] melts away as your [C.name] performs emergency cleaning on the helmet, deactivating the suit!")
+ else
+ to_chat(H, "Your [H.head.name] melts away!")
+ qdel(H.head)
+ has_melted_something = TRUE
+
+ if(has_melted_something)
+ return
+
+ if(volume >= 5)
+ H.emote("scream")
+ H.adjustFireLoss(clamp((volume - 5) * 3, 4, 75))
+ to_chat(H, "The blueish acidic substance stings[volume < 5 ? " you, but isn't concentrated enough to harm you" : null]!")
/datum/reagent/acetic_acid
name = "Acetic acid"
@@ -382,27 +388,26 @@
reagent_state = LIQUID
taste_description = "vinegar"
-/datum/reagent/acetic_acid/reaction_mob(mob/M, method = REAGENT_TOUCH, volume)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(method == REAGENT_TOUCH)
- if(H.wear_mask || H.head)
- return
- if(volume >= 50 && prob(75))
- var/obj/item/organ/external/affecting = H.get_organ("head")
- if(istype(affecting))
- affecting.disfigure()
- H.adjustBruteLoss(5)
- H.adjustFireLoss(15)
- H.emote("scream")
- else
- H.adjustBruteLoss(min(5, volume * 0.25))
- else
- to_chat(H, "The transparent acidic substance stings[volume < 25 ? " you, but isn't concentrated enough to harm you" : null]!")
- if(volume >= 25)
- H.adjustBruteLoss(2)
- H.emote("scream")
+/datum/reagent/acetic_acid/reaction_mob(mob/living/carbon/human/H, method = REAGENT_TOUCH, volume)
+ if(method != REAGENT_TOUCH)
+ to_chat(H, "The transparent acidic substance stings[volume < 25 ? " you, but isn't concentrated enough to harm you" : null]!")
+ if(volume >= 25)
+ H.adjustBruteLoss(2)
+ H.emote("scream")
+ return
+ if(H.wear_mask || H.head)
+ return
+
+ if(volume >= 50 && prob(75))
+ var/obj/item/organ/external/affecting = H.get_organ("head")
+ if(istype(affecting))
+ affecting.disfigure()
+ H.adjustBruteLoss(5)
+ H.adjustFireLoss(15)
+ H.emote("scream")
+ else
+ H.adjustBruteLoss(min(5, volume * 0.25))
/datum/reagent/carpotoxin
name = "Carpotoxin"
@@ -1228,10 +1233,9 @@
/datum/reagent/ants/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) //NOT THE ANTS
if(iscarbon(M))
- if(method == REAGENT_TOUCH || method==REAGENT_INGEST)
- to_chat(M, "OH SHIT ANTS!!!!")
- M.emote("scream")
- M.adjustBruteLoss(4)
+ to_chat(M, "OH SHIT ANTS!!!!")
+ M.emote("scream")
+ M.adjustBruteLoss(4)
/datum/reagent/teslium //Teslium. Causes periodic shocks, and makes shocks against the target much more effective.
name = "Teslium"
diff --git a/code/modules/reagents/chemistry/reagents_holder.dm b/code/modules/reagents/chemistry/reagents_holder.dm
index 53d12d76eef5..9be2cdc7df8a 100644
--- a/code/modules/reagents/chemistry/reagents_holder.dm
+++ b/code/modules/reagents/chemistry/reagents_holder.dm
@@ -716,7 +716,12 @@
cached_reagents += R
R.holder = src
R.volume = amount
- R.on_new(data)
+ if(ishuman(my_atom))
+ if(can_metabolize(my_atom, R))
+ R.on_new(data)
+ else
+ R.on_new(data)
+
if(data)
R.data = data
diff --git a/code/modules/reagents/chemistry/recipes/food_reactions.dm b/code/modules/reagents/chemistry/recipes/food_reactions.dm
index 76609ad8dd90..b91a8a25bccb 100644
--- a/code/modules/reagents/chemistry/recipes/food_reactions.dm
+++ b/code/modules/reagents/chemistry/recipes/food_reactions.dm
@@ -10,7 +10,7 @@
/datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
- new /obj/item/reagent_containers/food/snacks/tofu(location)
+ new /obj/item/food/snacks/tofu(location)
/datum/chemical_reaction/chocolate_bar
name = "Chocolate Bar"
@@ -22,7 +22,7 @@
/datum/chemical_reaction/chocolate_bar/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
- new /obj/item/reagent_containers/food/snacks/chocolatebar(location)
+ new /obj/item/food/snacks/chocolatebar(location)
/datum/chemical_reaction/chocolate_bar2
name = "Chocolate Bar"
@@ -34,7 +34,7 @@
/datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
- new /obj/item/reagent_containers/food/snacks/chocolatebar(location)
+ new /obj/item/food/snacks/chocolatebar(location)
/datum/chemical_reaction/soysauce
name = "Soy Sauce"
@@ -75,7 +75,7 @@
/datum/chemical_reaction/cheesewheel/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
- new /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel(location)
+ new /obj/item/food/snacks/sliceable/cheesewheel(location)
/datum/chemical_reaction/syntiflesh
name = "Syntiflesh"
@@ -87,7 +87,7 @@
/datum/chemical_reaction/syntiflesh/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
- new /obj/item/reagent_containers/food/snacks/meat/syntiflesh(location)
+ new /obj/item/food/snacks/meat/syntiflesh(location)
/datum/chemical_reaction/hot_ramen
name = "Hot Ramen"
@@ -114,7 +114,7 @@
/datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
- new /obj/item/reagent_containers/food/snacks/dough(location)
+ new /obj/item/food/snacks/dough(location)
///Cookies by Ume
@@ -129,7 +129,7 @@
/datum/chemical_reaction/cookiedough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
- new /obj/item/reagent_containers/food/snacks/cookiedough(location)
+ new /obj/item/food/snacks/cookiedough(location)
/datum/chemical_reaction/corn_syrup
@@ -183,7 +183,7 @@
/datum/chemical_reaction/weird_cheese/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i in 1 to created_volume)
- new /obj/item/reagent_containers/food/snacks/weirdcheesewedge(location)
+ new /obj/item/food/snacks/weirdcheesewedge(location)
/datum/chemical_reaction/hydrogenated_soybeanoil
name = "Partially hydrogenated space-soybean oil"
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index d0da4adc4c2c..8409f4b15e4c 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -263,7 +263,7 @@
/datum/chemical_reaction/meatification/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
- new /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct(location)
+ new /obj/item/food/snacks/meat/slab/meatproduct(location)
/datum/chemical_reaction/lye
name = "lye"
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index a25bbe0a7140..10c8a080317f 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -38,7 +38,7 @@
/datum/chemical_reaction/slimemonkey/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
for(var/i = 1, i <= 3, i++)
- var/obj/item/reagent_containers/food/snacks/monkeycube/M = new /obj/item/reagent_containers/food/snacks/monkeycube
+ var/obj/item/food/snacks/monkeycube/M = new /obj/item/food/snacks/monkeycube
M.forceMove(get_turf(holder.my_atom))
//Green
@@ -147,37 +147,39 @@
/datum/chemical_reaction/slimebork/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
- var/list/blocked = list(/obj/item/reagent_containers/food/snacks,
- /obj/item/reagent_containers/food/snacks/breadslice,
- /obj/item/reagent_containers/food/snacks/sliceable,
- /obj/item/reagent_containers/food/snacks/sliceable/pizza,
- /obj/item/reagent_containers/food/snacks/margheritapizzaslice,
- /obj/item/reagent_containers/food/snacks/meatpizzaslice,
- /obj/item/reagent_containers/food/snacks/mushroompizzaslice,
- /obj/item/reagent_containers/food/snacks/vegetablepizzaslice,
- /obj/item/reagent_containers/food/snacks/cheesepizzaslice,
- /obj/item/reagent_containers/food/snacks/garlicpizzaslice,
- /obj/item/reagent_containers/food/snacks/donkpocketpizzaslice,
- /obj/item/reagent_containers/food/snacks/dankpizzaslice,
- /obj/item/reagent_containers/food/snacks/macpizzaslice,
- /obj/item/reagent_containers/food/snacks/firecrackerpizzaslice,
- /obj/item/reagent_containers/food/snacks/pestopizzaslice,
- /obj/item/reagent_containers/food/snacks/pepperonipizzaslice,
- /obj/item/reagent_containers/food/snacks/meat,
- /obj/item/reagent_containers/food/snacks/meat/slab,
- /obj/item/reagent_containers/food/snacks/grown,
- /obj/item/reagent_containers/food/snacks/grown/shell,
- /obj/item/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/reagent_containers/food/snacks/deepfryholder,
- /obj/item/reagent_containers/food/snacks/chinese,
- /obj/item/reagent_containers/food/snacks/human,
- /obj/item/reagent_containers/food/snacks/monstermeat,
- /obj/item/reagent_containers/food/snacks/meatsteak/stimulating,
- /obj/item/reagent_containers/food/snacks/egg/watcher
+
+ var/list/blocked = list(
+ /obj/item/food/snacks,
+ /obj/item/food/snacks/breadslice,
+ /obj/item/food/snacks/sliceable,
+ /obj/item/food/snacks/sliceable/pizza,
+ /obj/item/food/snacks/margheritapizzaslice,
+ /obj/item/food/snacks/meatpizzaslice,
+ /obj/item/food/snacks/mushroompizzaslice,
+ /obj/item/food/snacks/vegetablepizzaslice,
+ /obj/item/food/snacks/cheesepizzaslice,
+ /obj/item/food/snacks/garlicpizzaslice,
+ /obj/item/food/snacks/donkpocketpizzaslice,
+ /obj/item/food/snacks/dankpizzaslice,
+ /obj/item/food/snacks/macpizzaslice,
+ /obj/item/food/snacks/firecrackerpizzaslice,
+ /obj/item/food/snacks/pestopizzaslice,
+ /obj/item/food/snacks/pepperonipizzaslice,
+ /obj/item/food/snacks/meat,
+ /obj/item/food/snacks/meat/slab,
+ /obj/item/food/snacks/grown,
+ /obj/item/food/snacks/grown/shell,
+ /obj/item/food/snacks/grown/mushroom,
+ /obj/item/food/snacks/deepfryholder,
+ /obj/item/food/snacks/chinese,
+ /obj/item/food/snacks/human,
+ /obj/item/food/snacks/monstermeat,
+ /obj/item/food/snacks/meatsteak/stimulating,
+ /obj/item/food/snacks/egg/watcher
)
- blocked |= typesof(/obj/item/reagent_containers/food/snacks/customizable)
+ blocked |= typesof(/obj/item/food/snacks/customizable)
- var/list/borks = typesof(/obj/item/reagent_containers/food/snacks) - blocked
+ var/list/borks = typesof(/obj/item/food/snacks) - blocked
// BORK BORK BORK
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
@@ -207,24 +209,24 @@
/datum/chemical_reaction/slimebork2/on_reaction(datum/reagents/holder)
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
- var/list/borks = subtypesof(/obj/item/reagent_containers/food/drinks)
- var/list/blocked = list(/obj/item/reagent_containers/food/drinks/cans/adminbooze,
- /obj/item/reagent_containers/food/drinks/cans/madminmalt,
- /obj/item/reagent_containers/food/drinks/shaker,
- /obj/item/reagent_containers/food/drinks/britcup,
- /obj/item/reagent_containers/food/drinks/sillycup,
- /obj/item/reagent_containers/food/drinks/cans,
- /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
- /obj/item/reagent_containers/food/drinks/drinkingglass,
- /obj/item/reagent_containers/food/drinks/bottle,
- /obj/item/reagent_containers/food/drinks/everfull,
- /obj/item/reagent_containers/food/drinks/bottle/dragonsbreath,
- /obj/item/reagent_containers/food/drinks/bottle/immortality,
- /obj/item/reagent_containers/food/drinks/mushroom_bowl
+ var/list/borks = subtypesof(/obj/item/reagent_containers/drinks)
+ var/list/blocked = list(/obj/item/reagent_containers/drinks/cans/adminbooze,
+ /obj/item/reagent_containers/drinks/cans/madminmalt,
+ /obj/item/reagent_containers/drinks/shaker,
+ /obj/item/reagent_containers/drinks/britcup,
+ /obj/item/reagent_containers/drinks/sillycup,
+ /obj/item/reagent_containers/drinks/cans,
+ /obj/item/reagent_containers/drinks/drinkingglass/shotglass,
+ /obj/item/reagent_containers/drinks/drinkingglass,
+ /obj/item/reagent_containers/drinks/bottle,
+ /obj/item/reagent_containers/drinks/everfull,
+ /obj/item/reagent_containers/drinks/bottle/dragonsbreath,
+ /obj/item/reagent_containers/drinks/bottle/immortality,
+ /obj/item/reagent_containers/drinks/mushroom_bowl
)
- blocked += typesof(/obj/item/reagent_containers/food/drinks/flask)
- blocked += typesof(/obj/item/reagent_containers/food/drinks/trophy)
- blocked += typesof(/obj/item/reagent_containers/food/drinks/cans/bottler)
+ blocked += typesof(/obj/item/reagent_containers/drinks/flask)
+ blocked += typesof(/obj/item/reagent_containers/drinks/trophy)
+ blocked += typesof(/obj/item/reagent_containers/drinks/cans/bottler)
borks -= blocked
// BORK BORK BORK
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 4f155bf54bfa..44bb7655de24 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -19,10 +19,7 @@
if(!Adjacent(user) || !length(possible_transfer_amounts) || !ishuman(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
return
- var/default = null
- if(amount_per_transfer_from_this in possible_transfer_amounts)
- default = amount_per_transfer_from_this
- var/new_transfer_rate = input("Amount per transfer from this:", "[src]", default) as null|anything in possible_transfer_amounts
+ var/new_transfer_rate = tgui_input_list(user, "Amount per transfer from this:", "[src]", possible_transfer_amounts, "[amount_per_transfer_from_this]")
if(!new_transfer_rate)
return
@@ -57,7 +54,6 @@
if(!QDELETED(src))
..()
-
/obj/item/reagent_containers/proc/add_lid()
if(has_lid)
container_type ^= REFILLABLE | DRAINABLE
diff --git a/code/modules/reagents/reagent_containers/applicator.dm b/code/modules/reagents/reagent_containers/applicator.dm
index a44d50fbf069..57bc2d39221a 100644
--- a/code/modules/reagents/reagent_containers/applicator.dm
+++ b/code/modules/reagents/reagent_containers/applicator.dm
@@ -26,6 +26,7 @@
emagged = TRUE
ignore_flags = TRUE
to_chat(user, "You short out the safeties on [src].")
+ return TRUE
/obj/item/reagent_containers/applicator/on_reagent_change()
if(!emagged)
@@ -124,7 +125,7 @@
/obj/item/reagent_containers/applicator/AltClick(mob/user)
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
return
- if(alert(user, "Are you sure you want to empty [src]?", "Empty Applicator:", "Yes", "No") != "Yes")
+ if(tgui_alert(user, "Are you sure you want to empty [src]?", "Empty Applicator", list("Yes", "No")) != "Yes")
return
if(!user.incapacitated() && isturf(user.loc) && loc == user)
to_chat(user, "You empty [src] onto the floor.")
diff --git a/code/modules/reagents/reagent_containers/chemical_bottle.dm b/code/modules/reagents/reagent_containers/chemical_bottle.dm
index 4e8f9a1224e1..b48d4fe33794 100644
--- a/code/modules/reagents/reagent_containers/chemical_bottle.dm
+++ b/code/modules/reagents/reagent_containers/chemical_bottle.dm
@@ -1,4 +1,4 @@
-//Not to be confused with /obj/item/reagent_containers/food/drinks/bottle
+//Not to be confused with /obj/item/reagent_containers/drinks/bottle
/obj/item/reagent_containers/glass/bottle
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 553a468b9557..c8a02d8f7975 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -72,7 +72,7 @@
return
if(reagents.total_volume)
- if(!target.is_open_container() && !(istype(target, /obj/item/reagent_containers/food) && !ispill(target)) && !istype(target, /obj/item/clothing/mask/cigarette))
+ if(!target.is_open_container() && !(isfood(target) && !ispill(target)) && !istype(target, /obj/item/clothing/mask/cigarette))
to_chat(user, "You cannot directly fill this object.")
return
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index 7e4f46626940..44cc8cae37d8 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -165,7 +165,7 @@
if(!is_open_container())
. += "lid_[initial(icon_state)]"
- if(blocks_emissive == FALSE)
+ if(!blocks_emissive)
. += emissive_blocker(icon, "lid_[initial(icon_state)]")
if(assembly)
. += "assembly"
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 32ac08eaf6d3..ccffe1dcab95 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -51,10 +51,7 @@
var/contained = english_list(injected)
add_attack_logs(user, M, "Injected with [src] containing ([contained])", reagents.harmless_helper() ? ATKLOG_ALMOSTALL : null)
- for(var/datum/reagent/R as anything in reagents.reagent_list)
- if(initial(R.id) == "????") // Yes this is a specific case that we don't really want
- continue
- reagents.reaction(M, REAGENT_INGEST, 0.1)
+ reagents.reaction(M, REAGENT_INGEST, 0.1)
return TRUE
/obj/item/reagent_containers/hypospray/attack(mob/living/M, mob/user)
@@ -81,6 +78,7 @@
emagged = TRUE
ignore_flags = TRUE
to_chat(user, "You short out the safeties on [src].")
+ return TRUE
/obj/item/reagent_containers/hypospray/safety
name = "medical hypospray"
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index a87cec73c93a..518e1f9a4a42 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -79,7 +79,9 @@
D.icon += mix_color_from_reagents(D.reagents.reagent_list)
for(var/i in 1 to spray_currentrange)
- step_towards(D, A)
+ if(!step_towards(D, A) && i != 1)
+ qdel(D)
+ return
D.reagents.reaction(get_turf(D))
for(var/atom/T in get_turf(D))
D.reagents.reaction(T)
@@ -104,13 +106,20 @@
/obj/item/reagent_containers/spray/AltClick(mob/user)
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
return
- if(alert(user, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes")
+ if(tgui_alert(user, "Are you sure you want to empty that?", "Empty Bottle", list("Yes", "No")) != "Yes")
return
if(isturf(user.loc) && loc == user)
to_chat(user, "You empty [src] onto the floor.")
reagents.reaction(user.loc)
reagents.clear_reagents()
+/obj/item/reagent_containers/spray/empty
+ lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
+ spray_maxrange = 2
+ spray_currentrange = 2
+ amount_per_transfer_from_this = 10
+
//space cleaner
/obj/item/reagent_containers/spray/cleaner
name = "space cleaner"
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 47796f6e1a28..8ee8351283b8 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -136,7 +136,7 @@
add_attack_logs(user, L, "Injected with [name] containing [contained], transfered [amount_per_transfer_from_this] units", reagents.harmless_helper() ? ATKLOG_ALMOSTALL : null)
- if(istype(target, /obj/item/reagent_containers/food))
+ if(isfood(target))
var/list/chemicals = list()
for(var/datum/reagent/chem in reagents.reagent_list)
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 1f770bfa3bf9..7216ee0177f7 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -256,7 +256,7 @@
to_chat(user, "There aren't any cups left!")
return
user.visible_message("[user] takes a cup from [src].", "You take a paper cup from [src].")
- var/obj/item/reagent_containers/food/drinks/sillycup/S = new(get_turf(src))
+ var/obj/item/reagent_containers/drinks/sillycup/S = new(get_turf(src))
user.put_in_hands(S)
paper_cups--
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 601f25a09f0a..56221bed2e5b 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -369,10 +369,13 @@ GLOBAL_LIST_EMPTY(conveyor_switches)
return
ui_interact(user)
-/obj/machinery/conveyor_switch/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/conveyor_switch/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/conveyor_switch/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ConveyorSwitch", name, 350, 150, master_ui, state)
+ ui = new(user, src, "ConveyorSwitch", name)
ui.open()
/obj/machinery/conveyor_switch/ui_data(mob/user)
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 6dc15c8126f6..50bc20252eb8 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -221,6 +221,7 @@
add_attack_logs(user, target, "Disposal'ed", !!target.ckey ? null : ATKLOG_ALL)
else
return
+ QDEL_LIST_CONTENTS(target.grabbed_by)
target.forceMove(src)
for(var/mob/C in viewers(src))
@@ -271,10 +272,13 @@
update()
return
-/obj/machinery/disposal/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/disposal/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/disposal/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "DisposalBin", name, 300, 250, master_ui, state)
+ ui = new(user, src, "DisposalBin", name)
ui.open()
@@ -1443,9 +1447,9 @@
/obj/structure/disposaloutlet/screwdriver_act(mob/living/user, obj/item/I)
add_fingerprint(user)
- if(mode == FALSE)
+ if(!mode)
to_chat(user, "You remove the screws around the power connection.")
- else if(mode == TRUE)
+ else if(mode)
to_chat(user, "You attach the screws around the power connection.")
I.play_tool_sound(src)
mode = !mode
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index ce03f7589b60..a1258bf72d90 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -256,7 +256,10 @@
add_fingerprint(user)
ui_interact(user)
-/obj/item/destTagger/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/item/destTagger/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/item/destTagger/ui_interact(mob/user, datum/tgui/ui = null)
destination_tagger.ui_interact(user)
/obj/machinery/disposal/deliveryChute
@@ -374,7 +377,7 @@
/obj/item/shippingPackage/attackby(obj/item/O, mob/user, params)
if(sealed)
if(is_pen(O))
- var/str = copytext(sanitize(input(user, "Intended recipient?", "Address", "")), 1, MAX_NAME_LEN)
+ var/str = tgui_input_text(user, "Intended recipient?", "Address", max_length = MAX_NAME_LEN)
if(!str || !length(str))
to_chat(user, "Invalid text.")
return
@@ -407,7 +410,7 @@
wrapped = null
qdel(src)
else if(wrapped)
- switch(alert("Select an action:",, "Remove Object", "Seal Package", "Cancel"))
+ switch(tgui_alert(user, "Select an action:", "Shipping", list("Remove Object", "Seal Package", "Cancel")))
if("Remove Object")
to_chat(user, "You shake out [src]'s contents onto the floor.")
wrapped.forceMove(get_turf(user))
@@ -418,7 +421,7 @@
sealed = 1
update_desc()
else
- if(alert("Do you want to tear up the package?",, "Yes", "No") == "Yes")
+ if(tgui_alert(user, "Do you want to tear up the package?", "Shipping", list("Yes", "No")) == "Yes")
to_chat(user, "You shred [src].")
playsound(loc, 'sound/items/poster_ripped.ogg', 50, 1)
user.unEquip(src)
diff --git a/code/modules/redis/callbacks/server_messages_callback.dm b/code/modules/redis/callbacks/server_messages_callback.dm
index 2f4206fb8334..ea263a223f00 100644
--- a/code/modules/redis/callbacks/server_messages_callback.dm
+++ b/code/modules/redis/callbacks/server_messages_callback.dm
@@ -2,7 +2,9 @@
channel = SERVER_MESSAGES_REDIS_CHANNEL
/datum/redis_callback/server_messages/on_message(message)
+ #ifdef MULTIINSTANCE
// Decode
var/list/data = json_decode(message)
// And fire
SSinstancing.execute_command(data["src"], data["cmd"], data["args"])
+ #endif
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 10c43eaf23db..f9aa0bea58c7 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -276,7 +276,7 @@
id = "drinking_glass"
build_type = AUTOLATHE
materials = list(MAT_GLASS = 100)
- build_path = /obj/item/reagent_containers/food/drinks/drinkingglass
+ build_path = /obj/item/reagent_containers/drinks/drinkingglass
category = list("initial","Dinnerware")
/datum/design/shot_glass
@@ -284,7 +284,7 @@
id = "shot_glass"
build_type = AUTOLATHE
materials = list(MAT_GLASS = 50)
- build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass
+ build_path = /obj/item/reagent_containers/drinks/drinkingglass/shotglass
category = list("initial","Dinnerware")
/datum/design/shaker
@@ -292,7 +292,7 @@
id = "shaker"
build_type = AUTOLATHE
materials = list(MAT_METAL = 1500)
- build_path = /obj/item/reagent_containers/food/drinks/shaker
+ build_path = /obj/item/reagent_containers/drinks/shaker
category = list("initial","Dinnerware")
/datum/design/cultivator
@@ -949,3 +949,19 @@
materials = list(MAT_METAL = 1500, MAT_GLASS = 500)
build_path = /obj/item/mail_scanner
category = list("initial", "Miscellaneous")
+
+/datum/design/spraybottle
+ name = "Spray Bottle"
+ id = "spraybottle"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 2000, MAT_GLASS = 5000)
+ build_path = /obj/item/reagent_containers/spray/empty
+ category = list("initial", "Miscellaneous")
+
+/datum/design/knuckleduster
+ name = "Knuckleduster"
+ id = "knuckleduster"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 500)
+ build_path = /obj/item/melee/knuckleduster
+ category = list("hacked", "Security")
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index 10a73792f2f0..e3d556355a9d 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -23,7 +23,7 @@
id = "milk_carton"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 100)
- build_path = /obj/item/reagent_containers/food/condiment/milk
+ build_path = /obj/item/reagent_containers/condiment/milk
category = list("initial","Food")
/datum/design/cream_carton
@@ -31,7 +31,7 @@
id = "cream_carton"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 300)
- build_path = /obj/item/reagent_containers/food/drinks/bottle/cream
+ build_path = /obj/item/reagent_containers/drinks/bottle/cream
category = list("initial","Food")
/datum/design/black_pepper
@@ -47,7 +47,7 @@
id = "pepper_mill"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 50)
- build_path = /obj/item/reagent_containers/food/condiment/peppermill
+ build_path = /obj/item/reagent_containers/condiment/peppermill
make_reagents = list()
category = list("initial","Food")
@@ -56,7 +56,7 @@
id = "mcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
- build_path = /obj/item/reagent_containers/food/snacks/monkeycube
+ build_path = /obj/item/food/snacks/monkeycube
category = list("initial", "Food")
/datum/design/farwa_cube
@@ -64,7 +64,7 @@
id = "fcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
- build_path = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
+ build_path = /obj/item/food/snacks/monkeycube/farwacube
category = list("initial", "Food")
/datum/design/wolpin_cube
@@ -72,7 +72,7 @@
id = "wcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
- build_path = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
+ build_path = /obj/item/food/snacks/monkeycube/wolpincube
category = list("initial", "Food")
/datum/design/stok_cube
@@ -80,7 +80,7 @@
id = "scube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
- build_path = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube
+ build_path = /obj/item/food/snacks/monkeycube/stokcube
category = list("initial", "Food")
/datum/design/neaera_cube
@@ -88,7 +88,7 @@
id = "ncube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
- build_path = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
+ build_path = /obj/item/food/snacks/monkeycube/neaeracube
category = list("initial", "Food")
/datum/design/ez_nut
diff --git a/code/modules/research/designs/bluespace_designs.dm b/code/modules/research/designs/bluespace_designs.dm
index 8c94a2492ea7..3ba6b9b610db 100644
--- a/code/modules/research/designs/bluespace_designs.dm
+++ b/code/modules/research/designs/bluespace_designs.dm
@@ -98,5 +98,5 @@
id = "bluespaceshotglass"
build_type = PROTOLATHE
materials = list(MAT_METAL = 1000, MAT_BLUESPACE = 500)
- build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/bluespace
+ build_path = /obj/item/reagent_containers/drinks/drinkingglass/shotglass/bluespace
category = list("Bluespace")
diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm
index ed79318dbfa3..63f1eb4ca927 100644
--- a/code/modules/research/designs/equipment_designs.dm
+++ b/code/modules/research/designs/equipment_designs.dm
@@ -21,16 +21,6 @@
build_path = /obj/item/clothing/glasses/hud/health
category = list("Equipment")
-/datum/design/health_hud_night
- name = "Night Vision Health Scanner HUD"
- desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
- id = "health_hud_night"
- req_tech = list("biotech" = 4, "magnets" = 5, "plasmatech" = 4, "engineering" = 6)
- build_type = PROTOLATHE
- materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_URANIUM = 1000, MAT_SILVER = 350)
- build_path = /obj/item/clothing/glasses/hud/health/night
- category = list("Equipment")
-
/datum/design/magboots
name = "Magnetic Boots"
desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
@@ -61,16 +51,6 @@
build_path = /obj/item/clothing/glasses/hud/security
category = list("Equipment")
-/datum/design/security_hud_night
- name = "Night Vision Security HUD"
- desc = "A heads-up display which provides id data and vision in complete darkness."
- id = "security_hud_night"
- req_tech = list("combat" = 4, "magnets" = 5, "plasmatech" = 4, "engineering" = 6)
- build_type = PROTOLATHE
- materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_URANIUM = 1000, MAT_GOLD = 350)
- build_path = /obj/item/clothing/glasses/hud/security/night
- category = list("Equipment")
-
/datum/design/skills_hud
name = "Skills HUD"
desc = "A heads-up display that scans the humans in view and shows a summary of their NT employment history."
@@ -91,16 +71,6 @@
build_path = /obj/item/clothing/glasses/hud/janitor
category = list("Equipment", "Janitorial")
-/datum/design/jani_night_vision_goggles
- name = "Night Vision Janitor HUD"
- desc = "A janitorial filth scanner fitted with a light amplifier."
- id = "night_vision_jani"
- req_tech = list("biotech" = 4, "magnets" = 5, "plasmatech" = 4, "engineering" = 6)
- build_type = PROTOLATHE
- materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_PLASMA = 350, MAT_URANIUM = 1000)
- build_path = /obj/item/clothing/glasses/hud/janitor/night
- category = list("Equipment", "Janitorial")
-
/datum/design/mesons
name = "Optical Meson Scanners"
desc = "Used for seeing walls, floors, and stuff through anything."
@@ -192,16 +162,6 @@
build_path = /obj/item/clothing/glasses/science
category = list("Equipment")
-/datum/design/nv_sci_goggles
- name = "Night Vision Science Goggles"
- desc = "Like Science Goggles, but works in darkness."
- id = "nvscigoggles"
- req_tech = list("magnets" = 5, "plasmatech" = 4, "engineering" = 6)
- build_type = PROTOLATHE
- materials = list(MAT_METAL = 250, MAT_GLASS = 300, MAT_PLASMA = 250, MAT_URANIUM = 1000)
- build_path = /obj/item/clothing/glasses/science/night
- category = list("Equipment")
-
/datum/design/diagnostic_hud
name = "Diagnostic HUD"
desc = "A HUD used to analyze and determine faults within robotic machinery."
@@ -212,16 +172,6 @@
build_path = /obj/item/clothing/glasses/hud/diagnostic
category = list("Equipment")
-/datum/design/diagnostic_hud_night
- name = "Night Vision Diagnostic HUD"
- desc = "Upgraded version of the diagnostic HUD designed to function during a power failure."
- id = "dianostic_hud_night"
- req_tech = list("magnets" = 5, "plasmatech" = 4, "engineering" = 6, "powerstorage" = 4)
- build_type = PROTOLATHE
- materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_URANIUM = 1000, MAT_PLASMA = 300)
- build_path = /obj/item/clothing/glasses/hud/diagnostic/night
- category = list("Equipment")
-
/datum/design/hydroponic_hud
name = "Hydroponic HUD"
desc = "A HUD used to analyze the health and status of plants growing in hydro trays and soil."
@@ -232,16 +182,6 @@
build_path = /obj/item/clothing/glasses/hud/hydroponic
category = list("Equipment")
-/datum/design/hydroponic_hud_night
- name = "Night Vision Hydroponic HUD"
- desc = "A HUD used to analyze the health and status of plants growing in low-light environments."
- id = "hydroponic_hud_night"
- req_tech = list("biotech" = 4, "magnets" = 5, "plasmatech" = 4, "engineering" = 6)
- build_type = PROTOLATHE
- materials = list(MAT_METAL = 600, MAT_GLASS = 600, MAT_URANIUM = 1000, MAT_PLASMA = 200)
- build_path = /obj/item/clothing/glasses/hud/hydroponic/night
- category = list("Equipment")
-
/datum/design/handdrill
name = "Hand Drill"
desc = "A small electric hand drill with an interchangable screwdriver and bolt bit"
@@ -350,3 +290,13 @@
materials = list(MAT_SILVER = 4000, MAT_TITANIUM = 6000, MAT_URANIUM = 4000, MAT_PLASMA = 4000)
build_path = /obj/item/clothing/shoes/magboots/gravity
category = list("Equipment")
+
+/datum/design/bolterwrench
+ name = "Door Bolt Wrench"
+ desc = "A large wrench designed to interlock with an airlock's bolting mechanisms, allowing it to lift the bolts regardless of power."
+ id = "bolter_wrench"
+ req_tech = list("materials" = 6, "engineering" = 5)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 5000, MAT_TITANIUM = 3000)
+ build_path = /obj/item/wrench/bolter
+ category = list("Equipment")
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 874e39ddc2b0..3c93fb8ce410 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -8,7 +8,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/robot_suit
materials = list(MAT_METAL=15000)
- construction_time = 500
+ construction_time = 50 SECONDS
category = list("Cyborg")
/datum/design/borg_chest
@@ -17,7 +17,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/chest
materials = list(MAT_METAL=40000)
- construction_time = 350
+ construction_time = 35 SECONDS
category = list("Cyborg")
/datum/design/borg_head
@@ -26,7 +26,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/head
materials = list(MAT_METAL=5000)
- construction_time = 350
+ construction_time = 35 SECONDS
category = list("Cyborg")
/datum/design/borg_l_arm
@@ -35,7 +35,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/l_arm
materials = list(MAT_METAL=10000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Cyborg")
/datum/design/borg_r_arm
@@ -44,7 +44,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/r_arm
materials = list(MAT_METAL=10000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Cyborg")
/datum/design/borg_l_leg
@@ -53,7 +53,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/l_leg
materials = list(MAT_METAL=10000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Cyborg")
/datum/design/borg_r_leg
@@ -62,7 +62,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/r_leg
materials = list(MAT_METAL=10000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Cyborg")
//Robot repair
@@ -72,7 +72,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/robot_component/binary_communication_device
materials = list(MAT_METAL=2500, MAT_GLASS=1000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Cyborg Repair")
/datum/design/borg_radio
@@ -81,7 +81,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/robot_component/radio
materials = list(MAT_METAL=2500, MAT_GLASS=1000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Cyborg Repair")
/datum/design/borg_actuator
@@ -90,7 +90,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/robot_component/actuator
materials = list(MAT_METAL=3500)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Cyborg Repair")
/datum/design/borg_diagnosis_unit
@@ -99,7 +99,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/robot_component/diagnosis_unit
materials = list(MAT_METAL=3500)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Cyborg Repair")
/datum/design/borg_camera
@@ -108,7 +108,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/robot_component/camera
materials = list(MAT_METAL=2500, MAT_GLASS=1000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Cyborg Repair")
/datum/design/borg_armor
@@ -117,7 +117,7 @@
build_type = MECHFAB
build_path = /obj/item/robot_parts/robot_component/armour
materials = list(MAT_METAL=5000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Cyborg Repair")
//Ripley
@@ -127,7 +127,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/ripley
materials = list(MAT_METAL=20000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Ripley")
//Firefighter subtype
@@ -137,7 +137,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/firefighter
materials = list(MAT_METAL=20000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Firefighter")
/datum/design/ripley_torso
@@ -146,7 +146,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/ripley_torso
materials = list(MAT_METAL=20000, MAT_GLASS=7500)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Ripley","Firefighter")
/datum/design/ripley_left_arm
@@ -155,7 +155,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/ripley_left_arm
materials = list(MAT_METAL=15000)
- construction_time = 150
+ construction_time = 15 SECONDS
category = list("Ripley","Firefighter")
/datum/design/ripley_right_arm
@@ -164,7 +164,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/ripley_right_arm
materials = list(MAT_METAL=15000)
- construction_time = 150
+ construction_time = 15 SECONDS
category = list("Ripley","Firefighter")
/datum/design/ripley_left_leg
@@ -173,7 +173,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/ripley_left_leg
materials = list(MAT_METAL=15000)
- construction_time = 150
+ construction_time = 15 SECONDS
category = list("Ripley","Firefighter")
/datum/design/ripley_right_leg
@@ -182,7 +182,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/ripley_right_leg
materials = list(MAT_METAL=15000)
- construction_time = 150
+ construction_time = 15 SECONDS
category = list("Ripley","Firefighter")
//Odysseus
@@ -192,7 +192,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/odysseus
materials = list(MAT_METAL=20000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Odysseus")
/datum/design/odysseus_torso
@@ -201,7 +201,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/odysseus_torso
materials = list(MAT_METAL=12000)
- construction_time = 180
+ construction_time = 18 SECONDS
category = list("Odysseus")
/datum/design/odysseus_head
@@ -210,7 +210,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/odysseus_head
materials = list(MAT_METAL=6000,MAT_GLASS=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Odysseus")
/datum/design/odysseus_left_arm
@@ -219,7 +219,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/odysseus_left_arm
materials = list(MAT_METAL=6000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Odysseus")
/datum/design/odysseus_right_arm
@@ -228,7 +228,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/odysseus_right_arm
materials = list(MAT_METAL=6000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Odysseus")
/datum/design/odysseus_left_leg
@@ -237,7 +237,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/odysseus_left_leg
materials = list(MAT_METAL=7000)
- construction_time = 130
+ construction_time = 13 SECONDS
category = list("Odysseus")
/datum/design/odysseus_right_leg
@@ -246,7 +246,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/odysseus_right_leg
materials = list(MAT_METAL=7000)
- construction_time = 130
+ construction_time = 13 SECONDS
category = list("Odysseus")
//Gygax
@@ -256,7 +256,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/gygax
materials = list(MAT_METAL=20000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Gygax")
/datum/design/gygax_torso
@@ -265,7 +265,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/gygax_torso
materials = list(MAT_METAL=20000,MAT_GLASS=10000,MAT_DIAMOND=2000)
- construction_time = 300
+ construction_time = 30 SECONDS
category = list("Gygax")
/datum/design/gygax_head
@@ -274,7 +274,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/gygax_head
materials = list(MAT_METAL=10000,MAT_GLASS=5000, MAT_DIAMOND=2000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Gygax")
/datum/design/gygax_left_arm
@@ -283,7 +283,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/gygax_left_arm
materials = list(MAT_METAL=15000, MAT_DIAMOND=1000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Gygax")
/datum/design/gygax_right_arm
@@ -292,7 +292,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/gygax_right_arm
materials = list(MAT_METAL=15000, MAT_DIAMOND=1000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Gygax")
/datum/design/gygax_left_leg
@@ -301,7 +301,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/gygax_left_leg
materials = list(MAT_METAL=15000, MAT_DIAMOND=2000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Gygax")
/datum/design/gygax_right_leg
@@ -310,7 +310,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/gygax_right_leg
materials = list(MAT_METAL=15000, MAT_DIAMOND=2000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Gygax")
/datum/design/gygax_armor
@@ -319,7 +319,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/gygax_armour
materials = list(MAT_METAL=15000,MAT_DIAMOND=10000,MAT_TITANIUM=10000)
- construction_time = 600
+ construction_time = 60 SECONDS
category = list("Gygax")
//Durand
@@ -329,7 +329,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/durand
materials = list(MAT_METAL=25000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Durand")
/datum/design/durand_torso
@@ -338,7 +338,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/durand_torso
materials = list(MAT_METAL=25000,MAT_GLASS=10000,MAT_SILVER=10000)
- construction_time = 300
+ construction_time = 30 SECONDS
category = list("Durand")
/datum/design/durand_head
@@ -347,7 +347,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/durand_head
materials = list(MAT_METAL=10000,MAT_GLASS=15000,MAT_SILVER=2000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Durand")
/datum/design/durand_left_arm
@@ -356,7 +356,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/durand_left_arm
materials = list(MAT_METAL=10000,MAT_SILVER=4000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Durand")
/datum/design/durand_right_arm
@@ -365,7 +365,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/durand_right_arm
materials = list(MAT_METAL=10000,MAT_SILVER=4000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Durand")
/datum/design/durand_left_leg
@@ -374,7 +374,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/durand_left_leg
materials = list(MAT_METAL=15000,MAT_SILVER=4000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Durand")
/datum/design/durand_right_leg
@@ -383,7 +383,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/durand_right_leg
materials = list(MAT_METAL=15000,MAT_SILVER=4000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Durand")
/datum/design/durand_armor
@@ -392,7 +392,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/durand_armor
materials = list(MAT_METAL=30000,MAT_URANIUM=25000,MAT_TITANIUM=20000)
- construction_time = 600
+ construction_time = 60 SECONDS
category = list("Durand")
//H.O.N.K
@@ -402,7 +402,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/honker
materials = list(MAT_METAL=20000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("H.O.N.K")
/datum/design/honk_torso
@@ -411,7 +411,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/honker_torso
materials = list(MAT_METAL=20000,MAT_GLASS=10000,MAT_BANANIUM=10000)
- construction_time = 300
+ construction_time = 30 SECONDS
category = list("H.O.N.K")
/datum/design/honk_head
@@ -420,7 +420,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/honker_head
materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_BANANIUM=5000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("H.O.N.K")
/datum/design/honk_left_arm
@@ -429,7 +429,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/honker_left_arm
materials = list(MAT_METAL=15000,MAT_BANANIUM=5000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("H.O.N.K")
/datum/design/honk_right_arm
@@ -438,7 +438,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/honker_right_arm
materials = list(MAT_METAL=15000,MAT_BANANIUM=5000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("H.O.N.K")
/datum/design/honk_left_leg
@@ -447,7 +447,7 @@
build_type = MECHFAB
build_path =/obj/item/mecha_parts/part/honker_left_leg
materials = list(MAT_METAL=20000,MAT_BANANIUM=5000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("H.O.N.K")
/datum/design/honk_right_leg
@@ -456,7 +456,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/honker_right_leg
materials = list(MAT_METAL=20000,MAT_BANANIUM=5000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("H.O.N.K")
//Reticence
@@ -466,7 +466,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/reticence
materials = list(MAT_METAL=20000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Reticence")
/datum/design/reticence_torso
@@ -475,7 +475,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/reticence_torso
materials = list(MAT_METAL=20000,MAT_GLASS=10000,MAT_TRANQUILLITE=10000)
- construction_time = 300
+ construction_time = 30 SECONDS
category = list("Reticence")
/datum/design/reticence_head
@@ -484,7 +484,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/reticence_head
materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_TRANQUILLITE=5000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Reticence")
/datum/design/reticence_left_arm
@@ -493,7 +493,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/reticence_left_arm
materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Reticence")
/datum/design/reticence_right_arm
@@ -502,7 +502,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/reticence_right_arm
materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Reticence")
/datum/design/reticence_left_leg
@@ -511,7 +511,7 @@
build_type = MECHFAB
build_path =/obj/item/mecha_parts/part/reticence_left_leg
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Reticence")
/datum/design/reticence_right_leg
@@ -520,7 +520,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/reticence_right_leg
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Reticence")
//Phazon
@@ -530,7 +530,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/phazon
materials = list(MAT_METAL=20000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Phazon")
/datum/design/phazon_torso
@@ -539,7 +539,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/phazon_torso
materials = list(MAT_METAL=35000,MAT_GLASS=10000,MAT_PLASMA=20000)
- construction_time = 300
+ construction_time = 30 SECONDS
category = list("Phazon")
/datum/design/phazon_head
@@ -548,7 +548,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/phazon_head
materials = list(MAT_METAL=15000,MAT_GLASS=5000,MAT_PLASMA=10000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Phazon")
/datum/design/phazon_left_arm
@@ -557,7 +557,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/phazon_left_arm
materials = list(MAT_METAL=20000,MAT_PLASMA=10000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Phazon")
/datum/design/phazon_right_arm
@@ -566,7 +566,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/phazon_right_arm
materials = list(MAT_METAL=20000,MAT_PLASMA=10000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Phazon")
/datum/design/phazon_left_leg
@@ -575,7 +575,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/phazon_left_leg
materials = list(MAT_METAL=20000,MAT_PLASMA=10000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Phazon")
/datum/design/phazon_right_leg
@@ -584,7 +584,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/phazon_right_leg
materials = list(MAT_METAL=20000,MAT_PLASMA=10000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Phazon")
/datum/design/phazon_armor
@@ -593,7 +593,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/phazon_armor
materials = list(MAT_METAL=25000,MAT_PLASMA=20000,MAT_TITANIUM=20000)
- construction_time = 300
+ construction_time = 30 SECONDS
category = list("Phazon")
//Exosuit Equipment
@@ -603,7 +603,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/cable_layer
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_drill
@@ -612,7 +612,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/drill
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_extinguisher
@@ -621,7 +621,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/extinguisher
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_hydraulic_clamp
@@ -630,7 +630,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_sleeper
@@ -640,7 +640,7 @@
req_tech = list("biotech" = 3, "engineering" = 3, "plasmatech" = 2)
build_path = /obj/item/mecha_parts/mecha_equipment/medical/sleeper
materials = list(MAT_METAL=5000,MAT_GLASS=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_syringe_gun
@@ -650,7 +650,7 @@
req_tech = list("magnets" = 4,"biotech" = 4, "combat" = 3, "materials" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun
materials = list(MAT_METAL=3000,MAT_GLASS=2000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Exosuit Equipment")
/datum/design/medical_jaw
@@ -660,7 +660,7 @@
build_path = /obj/item/mecha_parts/mecha_equipment/medical/rescue_jaw
req_tech = list("materials" = 4, "engineering" = 6, "magnets" = 6) //now same as jaws of life
materials = list(MAT_METAL=5000,MAT_SILVER=2000,MAT_TITANIUM=1500)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_generator
@@ -669,7 +669,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/generator
materials = list(MAT_METAL=10000,MAT_GLASS=1000,MAT_SILVER=2000,MAT_PLASMA=5000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_disabler
@@ -679,7 +679,7 @@
req_tech = list("combat" = 3)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/disabler
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_lmg
@@ -689,7 +689,7 @@
req_tech = list("combat" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_banana_mortar
@@ -698,7 +698,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar
materials = list(MAT_METAL=20000,MAT_BANANIUM=5000)
- construction_time = 300
+ construction_time = 30 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_honker
@@ -707,7 +707,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/honker
materials = list(MAT_METAL=20000,MAT_BANANIUM=10000)
- construction_time = 500
+ construction_time = 50 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_mousetrap_mortar
@@ -716,7 +716,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar
materials = list(MAT_METAL=20000,MAT_BANANIUM=5000)
- construction_time = 300
+ construction_time = 30 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_silentgun
@@ -725,7 +725,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=10000)
- construction_time = 500
+ construction_time = 50 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_mimercd
@@ -735,7 +735,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/mimercd
materials = list(MAT_METAL=30000,MAT_TRANQUILLITE=10000)
- construction_time = 700
+ construction_time = 70 SECONDS
category = list("Exosuit Equipment")
// Exosuit Modules
@@ -747,7 +747,7 @@
req_tech = list("materials" = 5, "engineering" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
materials = list(MAT_METAL=10000,MAT_DIAMOND=6500)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_mining_scanner
@@ -756,7 +756,7 @@
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/mining_scanner
materials = list(MAT_METAL=5000,MAT_GLASS=2500)
- construction_time = 50
+ construction_time = 5 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_generator_nuclear
@@ -767,7 +767,7 @@
req_tech = list("powerstorage"= 5, "engineering" = 4, "materials" = 3)
build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear
materials = list(MAT_METAL=10000,MAT_GLASS=1000,MAT_SILVER=500)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_gravcatapult
@@ -778,7 +778,7 @@
req_tech = list("bluespace" = 4, "magnets" = 3, "engineering" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/gravcatapult
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_rcd
@@ -789,7 +789,7 @@
req_tech = list("materials" = 5, "bluespace" = 3, "magnets" = 4, "powerstorage"=4, "engineering" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/rcd
materials = list(MAT_METAL=30000,MAT_GOLD=20000,MAT_PLASMA=25000,MAT_SILVER=20000)
- construction_time = 1200
+ construction_time = 120 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_ccw_armor
@@ -800,7 +800,7 @@
req_tech = list("materials" = 5, "combat" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster
materials = list(MAT_METAL=20000,MAT_SILVER=5000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_proj_armor
@@ -811,7 +811,7 @@
req_tech = list("materials" = 5, "combat" = 5, "engineering"=3)
build_path = /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
materials = list(MAT_METAL=20000,MAT_GOLD=5000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_repair_droid
@@ -822,7 +822,7 @@
req_tech = list("magnets" = 3, "programming" = 3, "engineering" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid
materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_GOLD=1000,MAT_SILVER=2000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/clusterbang_launcher
@@ -833,7 +833,7 @@
req_tech = list("combat"= 5, "materials" = 5, "syndicate" = 3)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang
materials = list(MAT_METAL=20000,MAT_GOLD=10000,MAT_URANIUM=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_bola
@@ -844,7 +844,7 @@
req_tech = list("combat" = 3)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bola
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_teleporter
@@ -855,7 +855,7 @@
req_tech = list("bluespace" = 8, "magnets" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/teleporter
materials = list(MAT_METAL=10000,MAT_DIAMOND=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_energy_relay
@@ -866,7 +866,7 @@
req_tech = list("magnets" = 4, "powerstorage" = 5, "engineering" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
materials = list(MAT_METAL=10000,MAT_GLASS=2000,MAT_GOLD=2000,MAT_SILVER=3000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
// Exosuit Weapons
@@ -878,7 +878,7 @@
req_tech = list("combat" = 4, "magnets" = 4, "engineering" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_laser
@@ -889,7 +889,7 @@
req_tech = list("combat" = 3, "magnets" = 3, "engineering" = 3)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_carbine
@@ -900,7 +900,7 @@
req_tech = list("combat" = 5, "materials" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_scattershot
@@ -911,7 +911,7 @@
req_tech = list("combat" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
materials = list(MAT_METAL=10000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_ion
@@ -922,7 +922,7 @@
req_tech = list("combat" = 6, "magnets" = 5, "materials" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
materials = list(MAT_METAL=20000,MAT_SILVER=6000,MAT_URANIUM=2000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_grenade_launcher
@@ -933,7 +933,7 @@
req_tech = list("combat" = 4, "engineering" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang
materials = list(MAT_METAL=22000,MAT_GOLD=6000,MAT_SILVER=8000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_missile_rack
@@ -944,7 +944,7 @@
req_tech = list("combat" = 6, "materials" = 5, "engineering" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
materials = list(MAT_METAL=22000,MAT_GOLD=6000,MAT_SILVER=8000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_plasma_cutter
@@ -955,7 +955,7 @@
req_tech = list("engineering" = 4, "materials" = 5, "plasmatech" = 4)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma
materials = list(MAT_METAL = 10000, MAT_GLASS = 2000, MAT_PLASMA = 6000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_tesla
@@ -966,7 +966,7 @@
req_tech = list("combat" = 6, "magnets" = 5, "materials" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla
materials = list(MAT_METAL=20000,MAT_SILVER=8000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mech_immolator
@@ -977,7 +977,7 @@
req_tech = list("combat" = 6, "magnets" = 5, "materials" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/immolator
materials = list(MAT_METAL = 10000, MAT_SILVER = 8000, MAT_PLASMA = 8000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
/datum/design/mecha_thruster
@@ -988,7 +988,7 @@
req_tech = list("engineering" = 6, "magnets" = 5, "materials" = 5)
build_path = /obj/item/mecha_parts/mecha_equipment/thrusters
materials = list(MAT_METAL = 15000, MAT_PLASMA = 3000)
- construction_time = 100
+ construction_time = 10 SECONDS
category = list("Exosuit Equipment")
//Cyborg Upgrade Modules
@@ -999,7 +999,7 @@
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/reset
materials = list(MAT_METAL=10000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_rename
@@ -1008,7 +1008,7 @@
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/rename
materials = list(MAT_METAL=35000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_restart
@@ -1017,7 +1017,7 @@
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/restart
materials = list(MAT_METAL=60000 , MAT_GLASS=5000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_vtec
@@ -1027,7 +1027,7 @@
build_path = /obj/item/borg/upgrade/vtec
req_tech = list("engineering" = 4, "materials" = 5, "programming" = 4)
materials = list(MAT_METAL=80000 , MAT_GLASS=6000 , MAT_URANIUM= 5000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_thrusters
@@ -1037,7 +1037,7 @@
build_path = /obj/item/borg/upgrade/thrusters
req_tech = list("engineering" = 4, "powerstorage" = 4)
materials = list(MAT_METAL=10000, MAT_PLASMA=5000, MAT_URANIUM = 6000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_diamonddrill
@@ -1047,7 +1047,7 @@
build_path = /obj/item/borg/upgrade/ddrill
req_tech = list("engineering" = 5, "materials" = 6)
materials = list(MAT_METAL=10000, MAT_DIAMOND=2000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_holding
@@ -1057,7 +1057,7 @@
build_path = /obj/item/borg/upgrade/soh
req_tech = list("engineering" = 4, "materials" = 4, "bluespace" = 4)
materials = list(MAT_METAL = 10000, MAT_GOLD = 250, MAT_URANIUM = 500)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_abductor_engi
@@ -1067,7 +1067,7 @@
build_path = /obj/item/borg/upgrade/abductor_engi
req_tech = list("engineering" = 7, "materials" = 7, "abductor" = 4)
materials = list(MAT_METAL = 25000, MAT_SILVER = 12500, MAT_PLASMA = 5000, MAT_TITANIUM = 10000, MAT_DIAMOND = 10000) //Base abductor engineering tools * 4
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_abductor_medi
@@ -1077,7 +1077,7 @@
build_path = /obj/item/borg/upgrade/abductor_medi
req_tech = list("biotech" = 7, "materials" = 7, "abductor" = 3)
materials = list(MAT_METAL = 18000, MAT_GLASS = 1500, MAT_SILVER = 13000, MAT_GOLD = 1000, MAT_PLASMA = 4000, MAT_TITANIUM = 12000, MAT_DIAMOND = 1000) //Base abductor engineering tools *8 + IMS cost
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_lavaproof
@@ -1086,7 +1086,7 @@
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/lavaproof
materials = list(MAT_METAL = 10000, MAT_PLASMA = 4000, MAT_TITANIUM = 5000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_syndicate_module
@@ -1096,7 +1096,7 @@
req_tech = list("combat" = 7, "programming" = 7, "syndicate" = 4)
build_path = /obj/item/borg/upgrade/syndicate
materials = list(MAT_METAL=10000,MAT_GLASS=15000,MAT_DIAMOND = 10000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_selfrepair
@@ -1106,7 +1106,7 @@
build_path = /obj/item/borg/upgrade/selfrepair
req_tech = list("materials" = 4, "engineering" = 4)
materials = list(MAT_METAL=15000, MAT_GLASS=15000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_bluespace_trash_bag
@@ -1116,7 +1116,7 @@
build_path = /obj/item/borg/upgrade/bluespace_trash_bag
req_tech = list("materials" = 5, "bluespace" = 4, "engineering" = 4, "plasmatech" = 3)
materials = list(MAT_GOLD = 1500, MAT_URANIUM = 250, MAT_PLASMA = 1500)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_floorbuffer
@@ -1126,7 +1126,7 @@
build_path = /obj/item/borg/upgrade/floorbuffer
req_tech = list("materials" = 4, "engineering" = 4)
materials = list(MAT_METAL=15000, MAT_GLASS=15000)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_syndie_soap
@@ -1136,17 +1136,27 @@
build_path = /obj/item/borg/upgrade/syndie_soap
req_tech = list("syndicate" = 2)
materials = list(MAT_GOLD = 1250, MAT_PLASMA = 2500, MAT_SILVER = 1250)
- construction_time = 120
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
-
+
/datum/design/borg_upgrade_rcd
name = "Cyborg Upgrade (Rapid Construction Device)"
id = "borg_upgrade_RCD"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/rcd
req_tech = list("materials" = 6, "engineering" = 5, "powerstorage" = 5)
- materials = list(MAT_METAL=30000, MAT_GLASS=15000,)
- construction_time = 120
+ materials = list(MAT_METAL = 30000, MAT_GLASS = 15000)
+ construction_time = 12 SECONDS
+ category = list("Cyborg Upgrade Modules")
+
+/datum/design/borg_upgrade_rped
+ name = "Cyborg Upgrade (Rapid Part Exchange Device)"
+ id = "borg_upgrade_RPED"
+ build_type = MECHFAB
+ build_path = /obj/item/borg/upgrade/rped
+ req_tech = list("materials" = 3, "engineering" = 4)
+ materials = list(MAT_METAL = 40000, MAT_GLASS = 15000)
+ construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
//Misc
@@ -1156,7 +1166,7 @@
build_type = MECHFAB
build_path =/obj/item/mecha_parts/mecha_tracking
materials = list(MAT_METAL=500)
- construction_time = 50
+ construction_time = 5 SECONDS
category = list("Misc")
/datum/design/mecha_tracking_ai_control
@@ -1166,7 +1176,7 @@
build_path = /obj/item/mecha_parts/mecha_tracking/ai_control
materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_SILVER = 200)
req_tech = list("programming" = 3, "magnets" = 2, "engineering" = 2)
- construction_time = 50
+ construction_time = 5 SECONDS
category = list("Misc")
/datum/design/ipc_head
@@ -1175,7 +1185,7 @@
build_type = MECHFAB
build_path = /obj/item/organ/external/head/ipc
materials = list(MAT_METAL=15000, MAT_GLASS=5000)
- construction_time = 350
+ construction_time = 35 SECONDS
category = list("Misc")
/datum/design/integrated_robotic_chassis
@@ -1184,7 +1194,7 @@
build_type = MECHFAB
build_path = /mob/living/carbon/human/machine/created
materials = list(MAT_METAL = 40000, MAT_TITANIUM = 7000) //for something made from lego, they sure need a lot of metal
- construction_time = 400
+ construction_time = 40 SECONDS
category = list("Misc")
/datum/design/ipc_cell
@@ -1193,7 +1203,7 @@
build_type = MECHFAB
build_path = /obj/item/organ/internal/cell
materials = list(MAT_METAL=2000, MAT_GLASS=750)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Misc")
/datum/design/ipc_charger
@@ -1202,7 +1212,7 @@
build_type = MECHFAB
build_path = /obj/item/organ/internal/cyberimp/arm/power_cord
materials = list(MAT_METAL=2000, MAT_GLASS=1000)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Misc")
/datum/design/ipc_optics
@@ -1211,7 +1221,7 @@
build_type = MECHFAB
build_path = /obj/item/organ/internal/eyes/optical_sensor
materials = list(MAT_METAL=1000, MAT_GLASS=2500)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Misc")
/datum/design/ipc_microphone
@@ -1220,7 +1230,7 @@
build_type = MECHFAB
build_path = /obj/item/organ/internal/ears/microphone
materials = list(MAT_METAL = 1000, MAT_GLASS = 2500)
- construction_time = 200
+ construction_time = 20 SECONDS
category = list("Misc")
/datum/design/synthetic_flash
@@ -1230,7 +1240,7 @@
req_tech = list("magnets" = 3, "combat" = 2)
build_type = MECHFAB
materials = list(MAT_METAL = 750, MAT_GLASS = 750)
- construction_time = 100
+ construction_time = 10 SECONDS
build_path = /obj/item/flash/synthetic
category = list("Misc")
@@ -1240,7 +1250,7 @@
id = "voice_standard"
build_type = MECHFAB
materials = list(MAT_METAL = 500)
- construction_time = 50
+ construction_time = 5 SECONDS
build_path = /obj/item/mecha_modkit/voice
category = list("Misc")
@@ -1250,7 +1260,7 @@
id = "voice_nanotrasen"
build_type = MECHFAB
materials = list(MAT_METAL = 500)
- construction_time = 50
+ construction_time = 5 SECONDS
build_path = /obj/item/mecha_modkit/voice/nanotrasen
category = list("Misc")
@@ -1260,7 +1270,7 @@
id = "voice_silent"
build_type = MECHFAB
materials = list(MAT_METAL = 500)
- construction_time = 50
+ construction_time = 5 SECONDS
build_path = /obj/item/mecha_modkit/voice/silent
category = list("Misc")
@@ -1270,7 +1280,7 @@
id = "voice_honk"
build_type = MECHFAB
materials = list(MAT_METAL = 400, MAT_BANANIUM = 100)
- construction_time = 50
+ construction_time = 5 SECONDS
build_path = /obj/item/mecha_modkit/voice/honk
category = list("Misc")
@@ -1281,6 +1291,6 @@
build_type = MECHFAB
materials = list(MAT_METAL = 400, MAT_TITANIUM = 100)
req_tech = list("syndicate" = 2)
- construction_time = 50
+ construction_time = 5 SECONDS
build_path = /obj/item/mecha_modkit/voice/syndicate
category = list("Misc")
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 0c5a86e82d61..7e981736a9d7 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -375,6 +375,30 @@
build_path = /obj/item/organ/internal/cyberimp/arm/botanical
category = list("Medical")
+/datum/design/cyberimp_shell_launcher
+ name = "Shell Launch System Implant"
+ desc = "A mounted, single-shot housing for a shell launch cannon; capable of firing twelve-gauge shotgun shells."
+ id = "ci-shell_launcher"
+ req_tech = list("materials" = 7, "engineering" = 5, "combat" = 5)
+ build_type = PROTOLATHE | MECHFAB
+ materials = list(MAT_METAL = 2500, MAT_GLASS = 1500, MAT_SILVER = 1500)
+ construction_time = 20 SECONDS
+ build_path = /obj/item/organ/internal/cyberimp/arm/shell_launcher
+ category = list("Medical")
+
+/datum/design/cyberimp_razorwire_spool
+ name = "Razorwire Spool Arm Implant"
+ desc = "A long length of monomolecular filament, built into the back of your hand. \
+ Impossibly thin and flawlessly sharp, it should slice through organic materials with no trouble; \
+ even from a few steps away. However, results against anything more durable will heavily vary."
+ id = "ci-razorwire-spool"
+ req_tech = list("combat" = 6, "biotech" = 6, "syndicate" = 3)
+ build_type = PROTOLATHE | MECHFAB
+ materials = list(MAT_METAL = 5000, MAT_SILVER = 2000, MAT_DIAMOND = 2000, MAT_BLUESPACE = 2000)
+ construction_time = 10 SECONDS
+ build_path = /obj/item/organ/internal/cyberimp/arm/razorwire
+ category = list("Medical")
+
/datum/design/cyberimp_toolset_abductor
name = "Abductor Toolset Implant"
desc = "An alien toolset, designed to be installed on subject's arm."
diff --git a/code/modules/research/designs/modsuit_designs.dm b/code/modules/research/designs/modsuit_designs.dm
index e45d66c6f997..5eb37656612c 100644
--- a/code/modules/research/designs/modsuit_designs.dm
+++ b/code/modules/research/designs/modsuit_designs.dm
@@ -365,3 +365,31 @@
req_tech = list("combat" = 5, "engineering" = 5, "bluespace" = 7, "plasmatech" = 6)
materials = list(MAT_METAL = 12000, MAT_GLASS = 2000, MAT_SILVER = 4000, MAT_PLASMA = 4000, MAT_TITANIUM = 4000, MAT_BLUESPACE = 6000) //Requires Gravitational anomaly core to function.
build_path = /obj/item/mod/module/anomaly_locked/kinesis
+
+/datum/design/module/mod_firewall
+ name = "Firewall Module"
+ id = "mod_firewall"
+ req_tech = list("combat" = 5, "engineering" = 5, "bluespace" = 7, "plasmatech" = 6)
+ materials = list(MAT_METAL = 12000, MAT_GLASS = 2000, MAT_SILVER = 4000, MAT_PLASMA = 4000, MAT_TITANIUM = 4000, MAT_BLUESPACE = 6000) //Requires Pyroclastic anomaly core to function.
+ build_path = /obj/item/mod/module/anomaly_locked/firewall
+
+/datum/design/module/mod_arcshield
+ name = "Arc-Shield Module"
+ id = "mod_arcshield"
+ req_tech = list("combat" = 5, "engineering" = 5, "bluespace" = 7, "plasmatech" = 6)
+ materials = list(MAT_METAL = 12000, MAT_GLASS = 2000, MAT_SILVER = 4000, MAT_PLASMA = 4000, MAT_TITANIUM = 4000, MAT_BLUESPACE = 6000) //Requires Flux anomaly core to function.
+ build_path = /obj/item/mod/module/anomaly_locked/teslawall
+
+/datum/design/module/mod_vortex
+ name = "Vortex Shotgun Module"
+ id = "mod_vortex"
+ req_tech = list("combat" = 5, "engineering" = 5, "bluespace" = 7, "plasmatech" = 6)
+ materials = list(MAT_METAL = 12000, MAT_GLASS = 2000, MAT_SILVER = 4000, MAT_PLASMA = 4000, MAT_TITANIUM = 4000, MAT_BLUESPACE = 6000) //Requires Vortex anomaly core to function.
+ build_path = /obj/item/mod/module/anomaly_locked/vortex_shotgun
+
+/datum/design/module/mod_cryogrenade
+ name = "Cryogrenade Module"
+ id = "mod_cryo"
+ req_tech = list("combat" = 5, "engineering" = 5, "bluespace" = 7, "plasmatech" = 6)
+ materials = list(MAT_METAL = 12000, MAT_GLASS = 2000, MAT_SILVER = 4000, MAT_PLASMA = 4000, MAT_TITANIUM = 4000, MAT_BLUESPACE = 6000) //Requires Cryonic anomaly core to function.
+ build_path = /obj/item/mod/module/anomaly_locked/cryogrenade
diff --git a/code/modules/research/designs/smelting_designs.dm b/code/modules/research/designs/smelting_designs.dm
index b2c85390d955..9ff0f991f8f7 100644
--- a/code/modules/research/designs/smelting_designs.dm
+++ b/code/modules/research/designs/smelting_designs.dm
@@ -1,51 +1,49 @@
///////SMELTABLE ALLOYS///////
-/datum/design/plasteel_alloy
+/datum/design/smelter
+ build_type = SMELTER
+
+/datum/design/smelter/plasteel_alloy
name = "Plasteel"
desc = "Plasma + Iron"
id = "plasteel"
- build_type = SMELTER
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/plasteel
category = list("initial")
-/datum/design/plastitanium_alloy
+/datum/design/smelter/plastitanium_alloy
name = "Plastitanium"
desc = "Plasma + Titanium"
id = "plastitanium"
- build_type = SMELTER
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/mineral/plastitanium
category = list("initial")
-/datum/design/plaglass_alloy
+/datum/design/smelter/plaglass_alloy
name = "Plasma Glass"
desc = "Plasma + Glass"
id = "plasmaglass"
- build_type = SMELTER
materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/plasmaglass
category = list("initial")
-/datum/design/titaniumglass_alloy
+/datum/design/smelter/titaniumglass_alloy
name = "Titanium Glass"
desc = "Titanium + Glass"
id = "titaniumglass"
- build_type = SMELTER
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/titaniumglass
category = list("initial")
-/datum/design/plastitaniumglass_alloy
+/datum/design/smelter/plastitaniumglass_alloy
name = "Plastitanium Glass"
desc = "Plasma + Titanium + Glass"
id = "plastitaniumglass"
- build_type = SMELTER
materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/plastitaniumglass
category = list("initial")
-/datum/design/alienalloy
+/datum/design/smelter/alienalloy
name = "Alien Alloy"
desc = "A sheet of reverse-engineered alien alloy."
id = "alienalloy"
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index de1b4b0880b6..6f039a583dc1 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -30,8 +30,8 @@
var/list/item_reactions = list()
var/list/valid_items = list() //valid items for special reactions like transforming
var/list/critical_items = list() //items that can cause critical reactions
- var/list/blocked_items = list(/obj/item/reagent_containers/food/drinks/bottle/dragonsbreath,
- /obj/item/reagent_containers/food/drinks/bottle/immortality)
+ var/list/blocked_items = list(/obj/item/reagent_containers/drinks/bottle/dragonsbreath,
+ /obj/item/reagent_containers/drinks/bottle/immortality)
/// Used for linking with rnd consoles
var/range = 5
@@ -55,7 +55,7 @@
valid_items += I
probWeight++
- if(ispath(I,/obj/item/reagent_containers/food))
+ if(ispath(I,/obj/item/food))
var/obj/item/tempCheck = I
if(I in blocked_items)
continue
@@ -340,7 +340,7 @@
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("[src]'s emergency coolant system gives off a small ding!")
playsound(loc, 'sound/machines/ding.ogg', 50, 1)
- var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
+ var/obj/item/reagent_containers/drinks/coffee/C = new /obj/item/reagent_containers/drinks/coffee(get_turf(pick(oview(1,src))))
chosenchem = pick("plasma","capsaicin","ethanol")
C.reagents.remove_any(25)
C.reagents.add_reagent(chosenchem , 50)
@@ -391,7 +391,7 @@
visible_message("[src] lowers [exp_on]'s temperature.")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("[src]'s emergency coolant system gives off a small ding!")
- var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
+ var/obj/item/reagent_containers/drinks/coffee/C = new /obj/item/reagent_containers/drinks/coffee(get_turf(pick(oview(1,src))))
playsound(loc, 'sound/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready!
chosenchem = pick("uranium","frostoil","ephedrine")
C.reagents.remove_any(25)
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index de285e9e76d0..8858b8258c54 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -92,24 +92,13 @@ GLOBAL_LIST_EMPTY(message_servers)
for(var/C in GLOB.allRequestConsoles)
var/obj/machinery/requests_console/RC = C
if(ckey(RC.department) == ckey(recipient))
- if(RC.inoperable())
- RC.message_log.Add(list(list("Message lost due to console failure. Please contact [station_name()]'s system administrator or AI for technical assistance.")))
- continue
- if(RC.newmessagepriority < priority)
- RC.newmessagepriority = priority
- RC.update_icon(UPDATE_OVERLAYS)
+ var/title
switch(priority)
if(2)
- if(!RC.silent)
- playsound(RC.loc, 'sound/machines/twobeep.ogg', 50, 1)
- RC.atom_say("PRIORITY Alert in [sender]")
- RC.message_log.Add(list(list("High Priority message from [sender]:", "[authmsg]")))
+ title = "PRIORITY Alert in [sender]"
else
- if(!RC.silent)
- playsound(RC.loc, 'sound/machines/twobeep.ogg', 50, 1)
- RC.atom_say("Message from [sender]")
- RC.message_log.Add(list(list("Message [sender]:", "[authmsg]")))
- RC.set_light(2)
+ title = "Message from [sender]"
+ RC.createMessage(sender, title, authmsg, priority)
/obj/machinery/message_server/attack_hand(user as mob)
to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]")
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 90a399617a54..b0d3fd769960 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -95,40 +95,21 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(initial(tt.id) == ID)
return initial(tt.name)
-/proc/CallMaterialName(ID)
- if(copytext(ID, 1, 2) == "$")
- var/return_name = copytext(ID, 2)
- switch(return_name)
- if("metal")
- return_name = "Metal"
- if("glass")
- return_name = "Glass"
- if("gold")
- return_name = "Gold"
- if("silver")
- return_name = "Silver"
- if("plasma")
- return_name = "Solid Plasma"
- if("uranium")
- return_name = "Uranium"
- if("diamond")
- return_name = "Diamond"
- if("clown")
- return_name = "Bananium"
- if("mime")
- return_name = "Tranquillite"
- if("titanium")
- return_name = "Titanium"
- if("bluespace")
- return_name = "Bluespace Mesh"
- if("plastic")
- return_name = "Plastic"
- return return_name
- else
- for(var/R in subtypesof(/datum/reagent))
- var/datum/reagent/rt = R
- if(initial(rt.id) == ID)
- return initial(rt.name)
+/proc/CallMaterialName(return_name)
+ switch(return_name)
+ if("plasma")
+ return_name = "Solid Plasma"
+ if("clown")
+ return_name = "Bananium"
+ if("mime")
+ return_name = "Tranquillite"
+ if("bluespace")
+ return_name = "Bluespace Mesh"
+ else
+ var/datum/reagent/our_reagent = GLOB.chemical_reagents_list[return_name]
+ if(our_reagent && initial(our_reagent.id) == return_name)
+ return_name = initial(our_reagent.name)
+ return capitalize(return_name)
/obj/machinery/computer/rdconsole/proc/SyncRDevices() //Makes sure it is properly sync'ed up with the devices attached to it (if any).
for(var/obj/machinery/r_n_d/D in range(range, src))
@@ -222,6 +203,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
req_access = list()
emagged = TRUE
to_chat(user, "You disable the security protocols")
+ return TRUE
/obj/machinery/computer/rdconsole/proc/valid_nav(next_menu, next_submenu)
switch(next_menu)
@@ -319,7 +301,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
break
if(!pointless)
- var/choice = input("This item does not raise tech levels. Proceed destroying loaded item anyway?") in list("Proceed", "Cancel")
+ var/choice = alert(user, "This item does not raise tech levels. Proceed destroying loaded item anyway?", "Are you sure you want to destroy this item?", "Proceed", "Cancel")
if(choice == "Cancel" || !linked_destroy)
return
@@ -597,7 +579,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if("maxresearch")
if(!check_rights(R_ADMIN))
return
- if(alert("Are you sure you want to maximize research levels?","Confirmation","Yes","No")=="No")
+ if(tgui_alert(usr, "Are you sure you want to maximize research levels?", "Confirmation", list("Yes", "No")) != "Yes")
return
log_admin("[key_name(usr)] has maximized the research levels.")
message_admins("[key_name_admin(usr)] has maximized the research levels.")
@@ -666,7 +648,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if("reset") //Reset the R&D console's database.
griefProtection()
- var/choice = alert("Are you sure you want to reset the R&D console's database? Data lost cannot be recovered.", "R&D Console Database Reset", "Continue", "Cancel")
+ var/choice = tgui_alert(usr, "Are you sure you want to reset the R&D console's database? Data lost cannot be recovered.", "R&D Console Database Reset", list("Continue", "Cancel"))
if(choice == "Continue")
add_wait_message("Resetting Database...", RESET_RESEARCH_DELAY)
addtimer(CALLBACK(src, PROC_REF(reset_research)), RESET_RESEARCH_DELAY)
@@ -706,10 +688,13 @@ won't update every console in existence) but it's more of a hassle to do. Also,
return TRUE
ui_interact(user)
-/obj/machinery/computer/rdconsole/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/rdconsole/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/computer/rdconsole/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "RndConsole", name, 800, 550, master_ui, state)
+ ui = new(user, src, "RndConsole", name)
ui.open()
/obj/machinery/computer/rdconsole/proc/ui_machine_data(obj/machinery/r_n_d/machine, list/data)
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 0f813c354311..1c37c725c46f 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -249,7 +249,7 @@
temp_server.id_with_download += num
else if(href_list["reset_tech"])
- var/choice = alert("Technology Data Reset", "Are you sure you want to reset this technology to its default data? Data lost cannot be recovered.", "Continue", "Cancel")
+ var/choice = tgui_alert(usr, "Technology Data Reset", "Are you sure you want to reset this technology to its default data? Data lost cannot be recovered.", list("Continue", "Cancel"))
if(choice == "Continue")
for(var/I in temp_server.files.known_tech)
var/datum/tech/T = temp_server.files.known_tech[I]
@@ -259,7 +259,7 @@
temp_server.files.RefreshResearch()
else if(href_list["reset_design"])
- var/choice = alert("Design Data Deletion", "Are you sure you want to blacklist this design? Ensure you sync servers after this decision.", "Continue", "Cancel")
+ var/choice = tgui_alert(usr, "Design Data Deletion", "Are you sure you want to blacklist this design? Ensure you sync servers after this decision.", list("Continue", "Cancel"))
if(choice == "Continue")
for(var/I in temp_server.files.known_designs)
var/datum/design/D = temp_server.files.known_designs[I]
@@ -272,7 +272,7 @@
temp_server.files.RefreshResearch()
else if(href_list["restore_design"])
- var/choice = alert("Design Data Restoration", "Are you sure you want to restore this design? Ensure you sync servers after this decision.", "Continue", "Cancel")
+ var/choice = tgui_alert(usr, "Design Data Restoration", "Are you sure you want to restore this design? Ensure you sync servers after this decision.", list("Continue", "Cancel"))
if(choice == "Continue")
temp_server.files.blacklisted_designs -= href_list["restore_design"]
temp_server.files.unblacklisted_designs += href_list["restore_design"]
@@ -349,15 +349,16 @@
for(var/obj/machinery/r_n_d/server/S in servers)
dat += "[S.name] (Transfer) "
dat += "Main Menu"
- user << browse("R&D Server Control[dat]", "window=server_control;size=575x400")
+ user << browse("R&D Server Control[dat]", "window=server_control;size=575x400") // SS220 ADDITION -
onclose(user, "server_control")
return
/obj/machinery/computer/rdservercontrol/emag_act(user as mob)
if(!emagged)
- playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
+ playsound(loc, 'sound/effects/sparks4.ogg', 75, TRUE)
emagged = TRUE
to_chat(user, "You you disable the security protocols")
+ return TRUE
src.updateUsrDialog()
/obj/machinery/r_n_d/server/core
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 531dc9237800..4225b79bc0eb 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -177,7 +177,7 @@
return ..()
/obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
+ if(istype(O, /obj/item/food/snacks/monkeycube))
if(user.drop_item())
monkeys++
to_chat(user, "You feed [O] to [src]. It now has [monkeys] monkey cubes stored.")
@@ -192,7 +192,7 @@
else if(istype(O, /obj/item/storage/bag) || istype(O, /obj/item/storage/box))
var/obj/item/storage/P = O
var/loaded = 0
- for(var/obj/item/reagent_containers/food/snacks/monkeycube/MC in P.contents)
+ for(var/obj/item/food/snacks/monkeycube/MC in P.contents)
loaded = 1
monkeys++
P.remove_from_storage(MC)
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 2c8123aa4548..e2f0acd79923 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -173,8 +173,7 @@
to_chat(M, "You absorb the potion and feel your intense desire to feed melt away.")
to_chat(user, "You feed the slime the potion, removing its hunger and calming it.")
being_used = TRUE
- var/newname = sanitize(copytext_char(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN)) // SS220 EDIT - ORIGINAL: copytext
-
+ var/newname = tgui_input_text(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime", MAX_NAME_LEN, 1)
if(!newname)
newname = "pet slime"
M.name = newname
@@ -228,7 +227,9 @@
explosion(T, -1, -1, 2, 3)
qdel(src)
return
- var/reason_text = input(user, "Enter reason for giving sentience", "Reason for sentience potion", "") as null|text
+ var/reason_text = tgui_input_text(user, "Enter reason for giving sentience", "Reason for sentience potion")
+ if(!reason_text)
+ return
to_chat(user, "You offer [src] sentience potion to [SM]...")
being_used = TRUE
@@ -304,7 +305,7 @@
return
prompted = TRUE
- if(alert("This will permanently transfer your consciousness to [SM]. Are you sure you want to do this?",,"Yes","No")=="No")
+ if(tgui_alert(user, "This will permanently transfer your consciousness to [SM]. Are you sure you want to do this?", "Consciousness Transfer", list("Yes", "No")) != "Yes")
prompted = FALSE
return
diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm
index c3e7c3de8c45..6a8479383641 100644
--- a/code/modules/response_team/ert_outfits.dm
+++ b/code/modules/response_team/ert_outfits.dm
@@ -234,7 +234,8 @@
/obj/item/stack/sheet/glass/fifty = 1,
/obj/item/stack/sheet/metal/fifty = 1,
/obj/item/flashlight = 1,
- /obj/item/rpd = 1
+ /obj/item/rpd = 1,
+ /obj/item/storage/bag/construction = 1
)
cybernetic_implants = list(
@@ -261,7 +262,8 @@
/obj/item/rcd/preloaded = 1,
/obj/item/rcd_ammo = 3,
/obj/item/gun/energy/gun = 1,
- /obj/item/rpd/bluespace = 1
+ /obj/item/rpd/bluespace = 1,
+ /obj/item/storage/bag/construction = 1
)
cybernetic_implants = list(
@@ -289,7 +291,8 @@
/obj/item/rcd/combat = 1,
/obj/item/rcd_ammo/large = 3,
/obj/item/gun/energy/gun/blueshield/pdw9 = 1,
- /obj/item/rpd/bluespace = 1
+ /obj/item/rpd/bluespace = 1,
+ /obj/item/storage/bag/construction = 1
)
cybernetic_implants = list(
diff --git a/code/modules/ruins/ghost_bar.dm b/code/modules/ruins/ghost_bar.dm
index 879580a8a26e..bfe72c4cf3b0 100644
--- a/code/modules/ruins/ghost_bar.dm
+++ b/code/modules/ruins/ghost_bar.dm
@@ -12,12 +12,14 @@
/obj/effect/mob_spawn/human/alive/ghost_bar/create(ckey, flavour = TRUE, name, mob/user = usr) // So divorced from the normal proc it's just being overriden
var/datum/character_save/save_to_load
- if(alert(user, "Would you like to use one of your saved characters in your character creator?",, "Yes", "No") == "Yes")
+ if(tgui_alert(user, "Would you like to use one of your saved characters in your character creator?", "Ghost Bar", list("Yes", "No")) == "Yes")
var/list/our_characters_names = list()
var/list/our_character_saves = list()
- for(var/datum/character_save/saves in user.client.prefs.character_saves)
- our_characters_names += saves.real_name
- our_character_saves += list(saves.real_name = saves)
+ for(var/index in 1 to length(user.client.prefs.character_saves))
+ var/datum/character_save/saves = user.client.prefs.character_saves[index]
+ var/slot_name = "[saves.real_name] (Slot #[index])"
+ our_characters_names += slot_name
+ our_character_saves += list("[slot_name]" = saves)
var/character_name = tgui_input_list(user, "Select a character", "Character selection", our_characters_names)
if(!character_name)
@@ -97,12 +99,16 @@
if(!istype(mob_to_delete) || !istype(user) || !Adjacent(user))
return
if(mob_to_delete.client)
- if(alert(mob_to_delete , "Would you like to return to the realm of spirits? (This will delete your current character, but you can rejoin later)",, "Yes", "No") == "No")
+ if(tgui_alert(mob_to_delete, "Would you like to return to the realm of spirits? (This will delete your current character, but you can rejoin later)", "Ghost Bar", list("Yes", "No")) != "Yes")
return
mob_to_delete.visible_message("[mob_to_delete.name] climbs into [src]...")
playsound(src, 'sound/machines/wooden_closet_close.ogg', 50)
qdel(mob_to_delete)
/proc/dust_if_respawnable(mob/M)
+ if(isdrone(M))
+ var/mob/living/silicon/robot/drone/drone = M
+ drone.shut_down(TRUE)
+ return
if(HAS_TRAIT_FROM(M, TRAIT_RESPAWNABLE, GHOST_ROLE))
M.dust()
diff --git a/code/modules/ruins/lavalandruin_code/puzzle.dm b/code/modules/ruins/lavalandruin_code/puzzle.dm
index 5320a16f12b2..8a66c4471926 100644
--- a/code/modules/ruins/lavalandruin_code/puzzle.dm
+++ b/code/modules/ruins/lavalandruin_code/puzzle.dm
@@ -7,7 +7,7 @@
var/list/elements
var/floor_type = /turf/simulated/floor/vault/lavaland_air
var/finished = FALSE
- var/reward_type = /obj/item/reagent_containers/food/snacks/cookie
+ var/reward_type = /obj/item/food/snacks/cookie
var/element_type = /obj/structure/puzzle_element
var/auto_setup = TRUE
var/empty_tile_id
diff --git a/code/modules/ruins/lavalandruin_code/seed_vault.dm b/code/modules/ruins/lavalandruin_code/seed_vault.dm
index 7c70935c9f3b..54b7f64c2f54 100644
--- a/code/modules/ruins/lavalandruin_code/seed_vault.dm
+++ b/code/modules/ruins/lavalandruin_code/seed_vault.dm
@@ -2,7 +2,7 @@
name = "seed vault seeds"
lootcount = 1
- loot = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap = 10,
+ loot = list(/obj/item/food/snacks/grown/mushroom/glowshroom/glowcap = 10,
/obj/item/seeds/cherry/bomb = 10,
/obj/item/seeds/berry/glow = 10,
/obj/item/seeds/sunflower/moonflower = 8
diff --git a/code/modules/ruins/lavalandruin_code/sin_ruins.dm b/code/modules/ruins/lavalandruin_code/sin_ruins.dm
index 59350857e219..38fc3e466bdb 100644
--- a/code/modules/ruins/lavalandruin_code/sin_ruins.dm
+++ b/code/modules/ruins/lavalandruin_code/sin_ruins.dm
@@ -203,7 +203,7 @@
user.real_name = H.dna.real_name
H.dna.transfer_identity(user)
user.visible_message("[user]'s appearance shifts into [H]'s!", \
- "[H.p_they(TRUE)] think[H.p_s()] [H.p_theyre()] sooo much better than you. Not anymore, [H.p_they()] won't.")
+ "[H.p_they(TRUE)] think[H.p_s()] [H.p_theyre()] sooo much better than you. Not anymore, [H.p_they()] won't.")
// Sloth
/obj/item/paper/fluff/stations/lavaland/sloth/note
diff --git a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
index 8d816718085b..8f8f483db0c5 100644
--- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
+++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
@@ -82,7 +82,7 @@
/obj/structure/necropolis_gate/attack_hand(mob/user)
. = ..()
if(locked)
- to_chat(user, "It's [open ? "stuck open":"locked"].")
+ to_chat(user, "It's [open ? "stuck open" : "locked"].")
return
if(GLOB.necropolis_gate == src) //funny override for knock knock gate
@@ -154,10 +154,10 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/necropolis_gate/legion_gate/attack_hand(mob/user)
if(!open && !changing_openness)
- var/safety = alert(user, "You think this might be a bad idea...", "Knock on the door?", "Proceed", "Abort")
- if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated())
+ var/safety = tgui_alert(user, "You think this might be a bad idea...", "Knock on the door?", list("Proceed", "Abort"))
+ if(!safety || safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated())
return
- user.visible_message("[user] knocks on [src]...", "You tentatively knock on [src]...")
+ user.visible_message("[user] knocks on [src]...", "You tentatively knock on [src]...")
playsound(user.loc, 'sound/effects/shieldbash.ogg', 100, 1)
return ..()
diff --git a/code/modules/ruins/syndicate_space_base.dm b/code/modules/ruins/syndicate_space_base.dm
index b3e6044c21ea..67d9fcc50dfb 100644
--- a/code/modules/ruins/syndicate_space_base.dm
+++ b/code/modules/ruins/syndicate_space_base.dm
@@ -16,7 +16,7 @@
/obj/item/grenade/chem_grenade/pyro = 5,
/obj/item/grenade/chem_grenade/cryo = 5,
/obj/item/grenade/chem_grenade/adv_release = 5,
- /obj/item/reagent_containers/food/drinks/bottle/holywater = 1)
+ /obj/item/reagent_containers/drinks/bottle/holywater = 1)
slogan_list = list("It's not pyromania if you're getting paid!","You smell that? Plasma, son. Nothing else in the world smells like that.","I love the smell of Plasma in the morning.")
resistance_flags = FIRE_PROOF
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index f29494fdac5d..441b31198b22 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -86,10 +86,13 @@
return TRUE
ui_interact(user)
-/obj/machinery/keycard_auth/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/keycard_auth/ui_state(mob/user)
+ return GLOB.physical_state
+
+/obj/machinery/keycard_auth/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "KeycardAuth", name, 540, 300, master_ui, state)
+ ui = new(user, src, "KeycardAuth", name)
ui.open()
@@ -117,7 +120,7 @@
. = TRUE
switch(action)
if("ert")
- ert_reason = input(usr, "Reason for ERT Call:", "", "") // we strip this later in ERT_Announce
+ ert_reason = tgui_input_text(usr, "Reason for ERT Call:", "Call ERT", encode = FALSE) // we strip this later in ERT_Announce
if("reset")
reset()
if("triggerevent")
diff --git a/code/modules/security_levels/security_level_datums.dm b/code/modules/security_levels/security_level_datums.dm
index 12273e95f263..9cba1e40f4c1 100644
--- a/code/modules/security_levels/security_level_datums.dm
+++ b/code/modules/security_levels/security_level_datums.dm
@@ -101,8 +101,8 @@
status_display_mode = STATUS_DISPLAY_ALERT
status_display_data = "gammaalert"
lowering_to_announcement_title = "Attention! Gamma security level activated!"
- lowering_to_announcement_text = "Central Command has ordered the Gamma security level on the station. Security is to have weapons equipped at all times, and all civilians are to immediately seek their nearest head for transportation to a secure location."
- elevating_to_announcement_text = "Central Command has ordered the Gamma security level on the station. Security is to have weapons equipped at all times, and all civilians are to immediately seek their nearest head for transportation to a secure location."
+ lowering_to_announcement_text = "Central Command has ordered the Gamma security level on the station. Security is to have weapons equipped at all times, and all civilians are to immediately seek out command staff for instructions."
+ elevating_to_announcement_text = "Central Command has ordered the Gamma security level on the station. Security is to have weapons equipped at all times, and all civilians are to immediately seek out command staff for instructions."
elevating_to_announcement_title = "Attention! Gamma security level activated!"
/**
diff --git a/code/modules/server_commands/commands/newroundannounce.dm b/code/modules/server_commands/commands/newroundannounce.dm
index 9339a06cef00..b1b645d649a3 100644
--- a/code/modules/server_commands/commands/newroundannounce.dm
+++ b/code/modules/server_commands/commands/newroundannounce.dm
@@ -8,7 +8,7 @@
var/startup_msg = "The server [server_name] ([source]) is now starting up. The map is [map_fluff] ([map_name]). You can connect with the Switch Server verb."
- to_chat(world, "
Attention
[startup_msg]")
+ to_chat(world, "
Attention
[startup_msg]")
SEND_SOUND(world, sound('sound/misc/notice2.ogg')) // Same as captains priority announce
/datum/server_command/new_round_announce/custom_dispatch(sname, mname, mfluff)
diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm
index 21251143302e..68336212acd9 100644
--- a/code/modules/shuttle/assault_pod.dm
+++ b/code/modules/shuttle/assault_pod.dm
@@ -33,7 +33,9 @@
/obj/item/assault_pod/attack_self(mob/living/user)
var/target_area
- target_area = input("Area to land", "Select a Landing Zone", target_area) in SSmapping.teleportlocs
+ target_area = tgui_input_list(user, "Area to land", "Select a Landing Zone", SSmapping.teleportlocs)
+ if(!target_area)
+ return
var/area/picked_area = SSmapping.teleportlocs[target_area]
if(!src || QDELETED(src))
return
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 2522c6b93e61..d6841715bf2a 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -62,7 +62,7 @@
to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
return 0
- var/choice = alert(user, "Would you like to (un)authorize a shortened launch time? [auth_need - length(authorized)] authorization\s are still needed. Use abort to cancel all authorizations.", "Shuttle Launch", "Authorize", "Repeal", "Abort")
+ var/choice = tgui_alert(user, "Would you like to (un)authorize a shortened launch time? [auth_need - length(authorized)] authorization\s are still needed. Use abort to cancel all authorizations.", "Shuttle Launch", list("Authorize", "Repeal", "Abort"))
if(SSshuttle.emergency.mode != SHUTTLE_DOCKED || user.get_active_hand() != W)
return 0
@@ -101,6 +101,7 @@
GLOB.minor_announcement.Announce("The emergency shuttle will launch in 10 seconds", "SYSTEM ERROR:")
SSshuttle.emergency.setTimer(100)
emagged = TRUE
+ return TRUE
/obj/machinery/computer/emergency_shuttle/proc/increase_hijack_stage()
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index c8f55f6647cb..6c87d6ca3f78 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -68,10 +68,3 @@
if(!S1.lock_shuttle_doors && id_tag == "s_docking_airlock")
INVOKE_ASYNC(src, PROC_REF(unlock))
-/obj/structure/ladder/onShuttleMove()
- if(resistance_flags & INDESTRUCTIBLE)
- // simply don't be moved
- return FALSE
- disconnect()
- LateInitialize() // who the fuck did this
- return ..()
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index dcfd3716229b..89f10db5d23b 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -806,10 +806,13 @@
add_fingerprint(user)
ui_interact(user)
-/obj/machinery/computer/shuttle/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/shuttle/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/computer/shuttle/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ShuttleConsole", name, 350, 150, master_ui, state)
+ ui = new(user, src, "ShuttleConsole", name)
ui.open()
/obj/machinery/computer/shuttle/ui_data(mob/user)
@@ -843,7 +846,7 @@
if(action == "move")
var/destination = params["move"]
if(!options.Find(destination))//figure out if this translation works
- message_admins("EXPLOIT: [ADMIN_LOOKUPFLW(usr)] attempted to move [src] to an invalid location! [ADMIN_COORDJMP(src)]")
+ message_admins("EXPLOIT: [ADMIN_LOOKUPFLW(usr)] attempted to move [src] to an invalid location! [ADMIN_COORDJMP(src)]")
return
switch(SSshuttle.moveShuttle(shuttleId, destination, TRUE, usr))
if(0)
@@ -866,6 +869,7 @@
src.req_access = list()
emagged = TRUE
to_chat(user, "You fried the consoles ID checking system.")
+ return TRUE
//for restricting when the computer can be used, needed for some console subtypes.
/obj/machinery/computer/shuttle/proc/can_call_shuttle(mob/user, action)
diff --git a/code/modules/shuttle/shuttle_manipulator.dm b/code/modules/shuttle/shuttle_manipulator.dm
index 09f2b8f3be69..dc889330287d 100644
--- a/code/modules/shuttle/shuttle_manipulator.dm
+++ b/code/modules/shuttle/shuttle_manipulator.dm
@@ -68,10 +68,13 @@
return FALSE // Extremely important that this doesn't get varedited by mistake, otherwise horrible, horrible things can happen to the server.
return ..()
-/obj/machinery/shuttle_manipulator/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/shuttle_manipulator/ui_state(mob/user)
+ return GLOB.admin_state
+
+/obj/machinery/shuttle_manipulator/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ShuttleManipulator", name, 650, 700, master_ui, state)
+ ui = new(user, src, "ShuttleManipulator", name)
ui.open()
/obj/machinery/shuttle_manipulator/ui_data(mob/user)
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 6e081554cae5..a211c2e69f0a 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -206,6 +206,10 @@
msg += "[S.rarity]: New species discovered: \"[capitalize(S.species)]\". Excellent work. "
service_credits += S.rarity / 2 // That's right, no bonus for potency. Send a crappy sample first to "show improvement" later
credits_to_deposit += S.rarity / 2
+
+ if(istype(thing, /obj/item/organ/internal/alien))
+ var/obj/item/organ/internal/alien/organ = thing
+ credits_to_deposit += organ.cargo_profit
qdel(MA)
SSeconomy.sold_atoms += "."
diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm
index a4887697fca5..a87db6da4c15 100644
--- a/code/modules/station_goals/bluespace_tap.dm
+++ b/code/modules/station_goals/bluespace_tap.dm
@@ -24,7 +24,7 @@
var/highscore = 0
for(var/obj/machinery/power/bluespace_tap/T in GLOB.machines)
highscore = max(highscore, T.total_points)
- to_chat(world, "Bluespace Harvester Highscore: [highscore >= goal ? "": ""][highscore]")
+ to_chat(world, "Bluespace Harvester Highscore: [highscore >= goal ? "": ""][highscore]")
if(highscore >= goal)
return TRUE
return FALSE
@@ -149,25 +149,25 @@
name = "fancy food"
lootcount = 3
loot = list(
- /obj/item/reagent_containers/food/snacks/wingfangchu,
- /obj/item/reagent_containers/food/snacks/hotdog,
- /obj/item/reagent_containers/food/snacks/sliceable/turkey,
- /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit,
- /obj/item/reagent_containers/food/snacks/appletart,
- /obj/item/reagent_containers/food/snacks/sliceable/cheesecake,
- /obj/item/reagent_containers/food/snacks/sliceable/bananacake,
- /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake,
- /obj/item/reagent_containers/food/snacks/soup/meatballsoup,
- /obj/item/reagent_containers/food/snacks/soup/mysterysoup,
- /obj/item/reagent_containers/food/snacks/soup/stew,
- /obj/item/reagent_containers/food/snacks/soup/hotchili,
- /obj/item/reagent_containers/food/snacks/burrito,
- /obj/item/reagent_containers/food/snacks/fishburger,
- /obj/item/reagent_containers/food/snacks/cubancarp,
- /obj/item/reagent_containers/food/snacks/fishandchips,
- /obj/item/reagent_containers/food/snacks/meatpie,
+ /obj/item/food/snacks/wingfangchu,
+ /obj/item/food/snacks/hotdog,
+ /obj/item/food/snacks/sliceable/turkey,
+ /obj/item/food/snacks/plumphelmetbiscuit,
+ /obj/item/food/snacks/appletart,
+ /obj/item/food/snacks/sliceable/cheesecake,
+ /obj/item/food/snacks/sliceable/bananacake,
+ /obj/item/food/snacks/sliceable/chocolatecake,
+ /obj/item/food/snacks/soup/meatballsoup,
+ /obj/item/food/snacks/soup/mysterysoup,
+ /obj/item/food/snacks/soup/stew,
+ /obj/item/food/snacks/soup/hotchili,
+ /obj/item/food/snacks/burrito,
+ /obj/item/food/snacks/fishburger,
+ /obj/item/food/snacks/cubancarp,
+ /obj/item/food/snacks/fishandchips,
+ /obj/item/food/snacks/meatpie,
/obj/item/pizzabox/hawaiian, //it ONLY gives hawaiian. MUHAHAHA
- /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread //maybe add some dangerous/special food here, ie robobuger?
+ /obj/item/food/snacks/sliceable/xenomeatbread //maybe add some dangerous/special food here, ie robobuger?
)
#define kW *1000
@@ -316,12 +316,14 @@
/obj/machinery/power/bluespace_tap/connect_to_network()
- ..()
- update_icon()
+ . = ..()
+ if(.)
+ update_icon()
/obj/machinery/power/bluespace_tap/disconnect_from_network()
- ..()
- update_icon()
+ . = ..()
+ if(.)
+ update_icon()
/obj/machinery/power/bluespace_tap/Destroy()
QDEL_LIST_CONTENTS(fillers)
@@ -492,10 +494,13 @@
var/key = text2num(params["target"])
produce(key)
-/obj/machinery/power/bluespace_tap/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/power/bluespace_tap/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/power/bluespace_tap/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "BluespaceTap", name, 650, 400, master_ui, state)
+ ui = new(user, src, "BluespaceTap", name)
ui.open()
//emaging provides slightly more points but at much greater risk
@@ -506,6 +511,7 @@
do_sparks(5, FALSE, src)
if(user)
user.visible_message("[user] overrides the safety protocols of [src].", "You override the safety protocols.")
+ return TRUE
/obj/structure/spawner/nether/bluespace_tap
spawn_time = 30 SECONDS
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index 0b4bcd811144..d368a88f0ef1 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -327,10 +327,13 @@
return 1
ui_interact(user)
-/obj/machinery/computer/bsa_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/bsa_control/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/computer/bsa_control/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "BlueSpaceArtilleryControl", name, 400, 155, master_ui, state)
+ ui = new(user, src, "BlueSpaceArtilleryControl", name)
ui.open()
/obj/machinery/computer/bsa_control/ui_data(mob/user)
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 7c84ecfc22c2..794b0f1fadc0 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -215,11 +215,14 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m
return TRUE
ui_interact(user)
-/obj/machinery/dna_vault/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/dna_vault/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/dna_vault/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
roll_powers(user)
- ui = new(user, src, ui_key, "DnaVault", name, 350, 400, master_ui, state)
+ ui = new(user, src, "DnaVault", name)
ui.open()
/obj/machinery/dna_vault/proc/roll_powers(mob/user)
@@ -302,7 +305,7 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m
switch(upgrade_type)
if(VAULT_TOXIN)
to_chat(H, "You feel resistant to airborne toxins.")
- var/obj/item/organ/internal/lungs/L = H.get_int_organ(/obj/item/organ/internal/lungs)
+ var/datum/organ/lungs/L = H.get_int_organ_datum(ORGAN_DATUM_LUNGS)
if(L)
L.tox_breath_dam_min = 0
L.tox_breath_dam_max = 0
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 729fef7a1b6c..254ef1d2dfc7 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -52,10 +52,13 @@
return 1
ui_interact(user)
-/obj/machinery/computer/sat_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/machinery/computer/sat_control/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/computer/sat_control/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "SatelliteControl", name, 475, 400)
+ ui = new(user, src, "SatelliteControl", name)
ui.open()
/obj/machinery/computer/sat_control/ui_data(mob/user)
@@ -170,7 +173,7 @@
if(!emagged && space_los(M))
Beam(get_turf(M), icon_state = "sat_beam", time = 5, maxdistance = kill_range)
if(istype(M, /obj/effect/space_dust/meaty))
- new /obj/item/reagent_containers/food/snacks/meatsteak(get_turf(M))
+ new /obj/item/food/snacks/meatsteak(get_turf(M))
qdel(M)
/obj/machinery/satellite/meteor_shield/toggle(user)
@@ -199,3 +202,4 @@
emagged = TRUE
if(active)
change_meteor_chance(2)
+ return TRUE
diff --git a/code/modules/station_goals/station_goal.dm b/code/modules/station_goals/station_goal.dm
index 0a9c82227118..683c1bdc35d0 100644
--- a/code/modules/station_goals/station_goal.dm
+++ b/code/modules/station_goals/station_goal.dm
@@ -30,7 +30,7 @@
if(check_completion())
to_chat(world, "Station Goal: [name]: Completed!")
else
- to_chat(world, "Station Goal: [name]: Failed!")
+ to_chat(world, "Station Goal: [name]: Failed!")
/datum/station_goal/Destroy()
SSticker.mode.station_goals -= src
diff --git a/code/modules/supply/supply_console.dm b/code/modules/supply/supply_console.dm
index 9912dd4d3e2d..74fbced39ca4 100644
--- a/code/modules/supply/supply_console.dm
+++ b/code/modules/supply/supply_console.dm
@@ -182,12 +182,15 @@
orders += list(order_data)
return orders
-/obj/machinery/computer/supplycomp/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/obj/machinery/computer/supplycomp/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/machinery/computer/supplycomp/ui_interact(mob/user, datum/tgui/ui = null)
if(!cargo_account || !account_database)
reconnect_database()
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "CargoConsole", name, 900, 800, master_ui, state)
+ ui = new(user, src, "CargoConsole", name)
ui.open()
/obj/machinery/computer/supplycomp/ui_data(mob/user)
@@ -252,8 +255,8 @@
visible_message("[src]'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
return
var/amount = 1
- if(params["multiple"] == "1") // 1 is a string here. DO NOT MAKE THIS A BOOLEAN YOU DORK
- var/num_input = input(user, "Amount", "How many crates? ([MULTIPLE_CRATE_MAX] Max)") as null|num
+ if(params["multiple"])
+ var/num_input = tgui_input_number(user, "Amount", "How many crates?", max_value = MULTIPLE_CRATE_MAX)
if(!num_input || (!is_public && !is_authorized(user)) || ..()) // Make sure they dont walk away
return
amount = clamp(round(num_input), 1, MULTIPLE_CRATE_MAX)
@@ -261,7 +264,7 @@
if(!istype(P))
return
var/timeout = world.time + (60 SECONDS) // If you dont type the reason within a minute, theres bigger problems here
- var/reason = input(user, "Reason", "Why do you require this item?","") as null|text
+ var/reason = tgui_input_text(user, "Reason", "Why do you require this item?", encode = FALSE)
if(world.time > timeout || !reason || (!is_public && !is_authorized(user)) || ..())
// Cancel if they take too long, they dont give a reason, they aint authed, or if they walked away
return
@@ -428,8 +431,8 @@
var/attempt_pin = pin
if(customer_account.security_level != ACCOUNT_SECURITY_ID && !attempt_pin)
//if pin is not given, we'll prompt them here
- attempt_pin = input("Enter pin code", "Vendor transaction") as num
- if(!Adjacent(user))
+ attempt_pin = tgui_input_number(user, "Enter pin code", "Vendor transaction")
+ if(!Adjacent(user) || !attempt_pin)
return FALSE
var/is_admin = is_admin(user)
if(!account_database.try_authenticate_login(customer_account, attempt_pin, TRUE, FALSE, is_admin))
@@ -478,6 +481,7 @@
if(!hacked)
to_chat(user, "Special supplies unlocked.")
hacked = TRUE
+ return TRUE
/obj/machinery/computer/supplycomp/public
name = "Supply Ordering Console"
diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm
index dd906cfc71c0..113ab3cbfa7c 100644
--- a/code/modules/supply/supply_packs/pack_miscellaneous.dm
+++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm
@@ -48,8 +48,8 @@
/datum/supply_packs/misc/religious_supplies
name = "Religious Supplies Crate"
- contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater,
- /obj/item/reagent_containers/food/drinks/bottle/holywater,
+ contains = list(/obj/item/reagent_containers/drinks/bottle/holywater,
+ /obj/item/reagent_containers/drinks/bottle/holywater,
/obj/item/storage/bible/booze,
/obj/item/storage/bible/booze,
/obj/item/clothing/suit/hooded/chaplain_hoodie,
@@ -240,8 +240,8 @@
/obj/item/clothing/mask/gas/mime,
/obj/item/clothing/head/beret,
/obj/item/clothing/suit/suspenders,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
- /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana
+ /obj/item/reagent_containers/drinks/bottle/bottleofnothing,
+ /obj/item/reagent_containers/drinks/bottle/bottleofbanana
)
cost = 250
containertype = /obj/structure/closet/crate/secure
diff --git a/code/modules/supply/supply_packs/pack_organic.dm b/code/modules/supply/supply_packs/pack_organic.dm
index e5812958dee0..2f6158d207bf 100644
--- a/code/modules/supply/supply_packs/pack_organic.dm
+++ b/code/modules/supply/supply_packs/pack_organic.dm
@@ -7,22 +7,22 @@
/datum/supply_packs/organic/food
name = "Food Crate"
- contains = list(/obj/item/reagent_containers/food/condiment/flour,
- /obj/item/reagent_containers/food/condiment/rice,
- /obj/item/reagent_containers/food/condiment/milk,
- /obj/item/reagent_containers/food/condiment/soymilk,
- /obj/item/reagent_containers/food/condiment/saltshaker,
- /obj/item/reagent_containers/food/condiment/peppermill,
+ contains = list(/obj/item/reagent_containers/condiment/flour,
+ /obj/item/reagent_containers/condiment/rice,
+ /obj/item/reagent_containers/condiment/milk,
+ /obj/item/reagent_containers/condiment/soymilk,
+ /obj/item/reagent_containers/condiment/saltshaker,
+ /obj/item/reagent_containers/condiment/peppermill,
/obj/item/kitchen/rollingpin,
/obj/item/storage/fancy/egg_box,
/obj/item/mixing_bowl,
/obj/item/mixing_bowl,
- /obj/item/reagent_containers/food/condiment/enzyme,
- /obj/item/reagent_containers/food/condiment/sugar,
- /obj/item/reagent_containers/food/snacks/meat/monkey,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/banana)
+ /obj/item/reagent_containers/condiment/enzyme,
+ /obj/item/reagent_containers/condiment/sugar,
+ /obj/item/food/snacks/meat/monkey,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/banana)
cost = 250
containername = "food crate"
announce_beacons = list("Kitchen" = list("Kitchen"))
@@ -39,18 +39,18 @@
/datum/supply_packs/misc/randomised/ingredients // its a bit hacky...
num_contained = 25
- contains = list(/obj/item/reagent_containers/food/snacks/grown/wheat,
- /obj/item/reagent_containers/food/snacks/grown/tomato,
- /obj/item/reagent_containers/food/snacks/grown/potato,
- /obj/item/reagent_containers/food/snacks/grown/carrot,
- /obj/item/reagent_containers/food/snacks/grown/pumpkin,
- /obj/item/reagent_containers/food/snacks/grown/chili,
- /obj/item/reagent_containers/food/snacks/grown/cocoapod,
- /obj/item/reagent_containers/food/snacks/grown/corn,
- /obj/item/reagent_containers/food/snacks/grown/eggplant,
- /obj/item/reagent_containers/food/snacks/grown/apple,
- /obj/item/reagent_containers/food/snacks/grown/banana,
- /obj/item/reagent_containers/food/snacks/grown/cherries)
+ contains = list(/obj/item/food/snacks/grown/wheat,
+ /obj/item/food/snacks/grown/tomato,
+ /obj/item/food/snacks/grown/potato,
+ /obj/item/food/snacks/grown/carrot,
+ /obj/item/food/snacks/grown/pumpkin,
+ /obj/item/food/snacks/grown/chili,
+ /obj/item/food/snacks/grown/cocoapod,
+ /obj/item/food/snacks/grown/corn,
+ /obj/item/food/snacks/grown/eggplant,
+ /obj/item/food/snacks/grown/apple,
+ /obj/item/food/snacks/grown/banana,
+ /obj/item/food/snacks/grown/cherries)
name = "Ingredient Crate"
cost = 300
containername = "ingredient crate"
@@ -60,18 +60,18 @@
/datum/supply_packs/organic/condiments
name = "Condiment Crate"
- contains = list(/obj/item/reagent_containers/food/condiment/ketchup,
- /obj/item/reagent_containers/food/condiment/bbqsauce,
- /obj/item/reagent_containers/food/condiment/soysauce,
- /obj/item/reagent_containers/food/condiment/mayonnaise,
- /obj/item/reagent_containers/food/condiment/cherryjelly,
- /obj/item/reagent_containers/food/condiment/peanutbutter,
- /obj/item/reagent_containers/food/condiment/honey,
- /obj/item/reagent_containers/food/condiment/oliveoil,
- /obj/item/reagent_containers/food/condiment/frostoil,
- /obj/item/reagent_containers/food/condiment/capsaicin,
- /obj/item/reagent_containers/food/condiment/wasabi,
- /obj/item/reagent_containers/food/condiment/vinegar)
+ contains = list(/obj/item/reagent_containers/condiment/ketchup,
+ /obj/item/reagent_containers/condiment/bbqsauce,
+ /obj/item/reagent_containers/condiment/soysauce,
+ /obj/item/reagent_containers/condiment/mayonnaise,
+ /obj/item/reagent_containers/condiment/cherryjelly,
+ /obj/item/reagent_containers/condiment/peanutbutter,
+ /obj/item/reagent_containers/condiment/honey,
+ /obj/item/reagent_containers/condiment/oliveoil,
+ /obj/item/reagent_containers/condiment/frostoil,
+ /obj/item/reagent_containers/condiment/capsaicin,
+ /obj/item/reagent_containers/condiment/wasabi,
+ /obj/item/reagent_containers/condiment/vinegar)
cost = 300
containername = "condiment crate"
@@ -115,15 +115,15 @@
/datum/supply_packs/organic/party
name = "Party Equipment Crate"
contains = list(/obj/item/storage/box/drinkingglasses,
- /obj/item/reagent_containers/food/drinks/shaker,
- /obj/item/reagent_containers/food/drinks/bottle/patron,
- /obj/item/reagent_containers/food/drinks/bottle/goldschlager,
- /obj/item/reagent_containers/food/drinks/cans/ale,
- /obj/item/reagent_containers/food/drinks/cans/ale,
- /obj/item/reagent_containers/food/drinks/cans/beer,
- /obj/item/reagent_containers/food/drinks/cans/beer,
- /obj/item/reagent_containers/food/drinks/cans/beer,
- /obj/item/reagent_containers/food/drinks/cans/beer,
+ /obj/item/reagent_containers/drinks/shaker,
+ /obj/item/reagent_containers/drinks/bottle/patron,
+ /obj/item/reagent_containers/drinks/bottle/goldschlager,
+ /obj/item/reagent_containers/drinks/cans/ale,
+ /obj/item/reagent_containers/drinks/cans/ale,
+ /obj/item/reagent_containers/drinks/cans/beer,
+ /obj/item/reagent_containers/drinks/cans/beer,
+ /obj/item/reagent_containers/drinks/cans/beer,
+ /obj/item/reagent_containers/drinks/cans/beer,
/obj/item/grenade/confetti,
/obj/item/grenade/confetti)
cost = 250
diff --git a/code/modules/supply/supply_packs/pack_science.dm b/code/modules/supply/supply_packs/pack_science.dm
index d70a663c7bf0..51bc785d0406 100644
--- a/code/modules/supply/supply_packs/pack_science.dm
+++ b/code/modules/supply/supply_packs/pack_science.dm
@@ -107,7 +107,7 @@
/datum/supply_packs/science/oil
name = "Oil Tank Crate"
contains = list(/obj/structure/reagent_dispensers/oil,
- /obj/item/reagent_containers/food/drinks/oilcan)
+ /obj/item/reagent_containers/drinks/oilcan)
cost = 150
containertype = /obj/structure/largecrate
containername = "oil tank crate"
diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm
index 93eeeed91e9e..8a1bed115b7d 100644
--- a/code/modules/surgery/dental_implant.dm
+++ b/code/modules/surgery/dental_implant.dm
@@ -36,9 +36,7 @@
user.drop_item()
tool.forceMove(target)
- var/datum/action/item_action/hands_free/activate_pill/P = new
- P.button_icon_state = tool.icon_state
- P.target = tool
+ var/datum/action/item_action/hands_free/activate_pill/P = new(tool, tool.icon, tool.icon_state)
P.name = "Activate Pill ([tool.name])"
P.Grant(target)
@@ -48,8 +46,8 @@
/datum/action/item_action/hands_free/activate_pill
name = "Activate Pill"
-/datum/action/item_action/hands_free/activate_pill/Trigger(left_click)
- if(!..())
+/datum/action/item_action/hands_free/activate_pill/Trigger(left_click = TRUE)
+ if(!..(left_click, FALSE))
return
to_chat(owner, "You grit your teeth and burst the implanted [target]!")
add_attack_logs(owner, owner, "Swallowed implanted [target]")
@@ -59,3 +57,4 @@
Remove(owner)
qdel(target)
return TRUE
+
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 4231ecd31dbc..215ce2db5e24 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -83,6 +83,8 @@
/obj/item/organ/internal/cyberimp/arm/proc/Retract()
if(!holder || (holder in src) || check_cuffs())
return
+ if(status & ORGAN_DEAD)
+ return
owner.visible_message("[owner] retracts [holder] back into [owner.p_their()] [parent_organ == "r_arm" ? "right" : "left"] arm.",
"[holder] snaps back into your [parent_organ == "r_arm" ? "right" : "left"] arm.",
@@ -100,6 +102,8 @@
/obj/item/organ/internal/cyberimp/arm/proc/Extend(obj/item/item)
if(!(item in src) || check_cuffs())
return
+ if(status & ORGAN_DEAD)
+ return
holder = item
@@ -139,6 +143,7 @@
"You extend [holder] from your [parent_organ == "r_arm" ? "right" : "left"] arm.",
"You hear a short mechanical noise.")
playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
+ return TRUE
/obj/item/organ/internal/cyberimp/arm/ui_action_click()
if(crit_fail || (!holder && !contents.len))
@@ -284,6 +289,7 @@
desc = "A powerful cybernetic implant that contains combat modules built into the user's arm"
contents = newlist(/obj/item/melee/energy/blade/hardlight, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/flash/armimplant)
origin_tech = "materials=5;combat=7;biotech=5;powerstorage=5;syndicate=6;programming=5"
+ stealth_level = 4 //Only surgery or a body scanner with the highest tier of stock parts can detect this.
/obj/item/organ/internal/cyberimp/arm/combat/New()
..()
@@ -449,6 +455,152 @@
action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/janitor.dmi')
action_icon_state = list(/datum/action/item_action/organ_action/toggle = "advmop")
+// Razorwire implant, long reach whip made of extremely thin wire, ouch!
+
+/obj/item/melee/razorwire
+ name = "implanted razorwire"
+ desc = "A long length of monomolecular filament, built into the back of your hand. \
+ Impossibly thin and flawlessly sharp, it should slice through organic materials with no trouble; \
+ even from a few steps away. However, results against anything more durable will heavily vary."
+ icon = 'icons/obj/energy_melee.dmi'
+ righthand_file = 'icons/mob/inhands/implants_righthand.dmi'
+ lefthand_file = 'icons/mob/inhands/implants_lefthand.dmi'
+ icon_state = "razorwire_weapon"
+ item_state = "razorwire"
+ w_class = WEIGHT_CLASS_BULKY
+ sharp = TRUE
+ force = 18
+ armour_penetration_percentage = -100 //This means that armor twice as effective against it
+ reach = 2
+ hitsound = 'sound/weapons/whip.ogg'
+ attack_verb = list("slashes", "whips", "lashes", "lacerates")
+
+/obj/item/melee/razorwire/examine_more(mob/user)
+ . = ..()
+ . += "A byproduct of Cybersun Incorporated's mistakes turned concept, the Razorwire Spool is a remarkable accident in itself. \
+ It consists of a fine, thread-like laser capable of being manipulated and swung like a whip. Designed for ease of deployment, the wire originates from the wrist, \
+ allowing users with the implant to perform wide swings and precise cuts against soft targets. It's the same energy found in other common energy weapons, such as swords and daggers."
+ . += "Cybersun's investment into energy weapon development inadvertently led to the Razorwire Spool. Initially attempting to create an Energy Sword, \
+ they ended up with a material that, while superheated and correctly composed, failed to maintain a solid blade shape. Curious about this error, \
+ Cybersun repeated the process, producing an energy as thin as a wire. After several prototypes, they achieved a long, energy-like thread. \
+ Further innovation allowed them to conceal this in a forearm-sized container, \
+ with a hand and wrist replacement made of the same durable material used to contain energy weapons. They would call it, the Razorwire."
+ . += "Favored by assassins for their stealth and efficiency, Cybersun exercises discretion in its distribution, favoring clients in their good graces. \
+ It falls behind other energy weapons due to its thinner and more loose pressure, however it is praised more as a side-arm for unarmored soft targets."
+
+/obj/item/organ/internal/cyberimp/arm/razorwire
+ name = "razorwire spool implant"
+ desc = "An integrated spool of razorwire, capable of being used as a weapon when whipped at your foes. \
+ Built into the back of your hand, try your best to not get it tangled."
+ contents = newlist(/obj/item/melee/razorwire)
+ icon_state = "razorwire"
+ action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/surgery.dmi')
+ action_icon_state = list(/datum/action/item_action/organ_action/toggle = "razorwire")
+ origin_tech = "combat=5;biotech=5;syndicate=2"
+ stealth_level = 1 // Hidden from health analyzers
+
+/obj/item/organ/internal/cyberimp/arm/razorwire/examine_more(mob/user)
+ . = ..()
+ for(var/obj/I in contents)
+ return I.examine_more()
+
+// Shell launch system, an arm mounted single-shot shotgun that comes out of your arm
+
+/obj/item/gun/projectile/revolver/doublebarrel/shell_launcher
+ name = "shell launch system"
+ desc = "A mounted cannon seated comfortably in a forearm compartment. This humanitarian device is capable of firing essentially any shotgun shell."
+ icon_state = "shell_cannon_weapon"
+ righthand_file = 'icons/mob/inhands/implants_righthand.dmi'
+ lefthand_file = 'icons/mob/inhands/implants_lefthand.dmi'
+ inhand_x_dimension = 32
+ inhand_y_dimension = 32
+ item_state = "shell_cannon"
+ w_class = WEIGHT_CLASS_BULKY
+ weapon_weight = WEAPON_LIGHT
+ force = 10
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/shell_cannon
+ unique_reskin = FALSE
+ can_sawoff = FALSE
+
+/obj/item/gun/projectile/revolver/doublebarrel/shell_launcher/proc/missfire(mob/living/carbon/human/H, our_organ)
+ to_chat(H, "Your [name] misfires!")
+ process_fire(H, H, 1, zone_override = our_organ)
+
+/obj/item/gun/projectile/revolver/doublebarrel/shell_launcher/examine_more(mob/user)
+ . = ..()
+ . += "A Shellguard Munitions classic, the Shellguard Launch System (SLS) was originally a MODsuit heavy weapons accessory, \
+ later being developed into a forearm-mounted tactical shotgun implant. Though its compact design precludes the use of large ammunition like rockets or burning plasma, \
+ it excels in firing a variety of smaller shells, both energy and kinetic, thanks to its advanced plasma alloy barrel."
+ . += "Adapting an accessory intended for a mechanical suit's gauntlet posed significant hurdles, \
+ primarily in miniaturizing the barrel and components without sacrificing performance. The limitations initially damaged its perception of the market. \
+ However, executives would later pivot their niche to concealed carry and versatile shell ammunition, \
+ focusing on deployability and concealment through neural activation. \
+ The shift in approach would lead to the SLS being advertised as a powerful and compact holdout weapon, easily concealable and reliably lethal."
+ . += "Despite its initial issues, the SLS today holds a strong following in the implant market, being highly sought after among assassins, \
+ mercenaries, and firearm enthusiasts. Its appeal lies not just in its stealth but also in its compatibility with Shellguard's range of modular products, \
+ and the potential beyond its advertised capabilities."
+
+/obj/item/ammo_box/magazine/internal/shot/shell_cannon
+ name = "shell launch system internal magazine"
+ ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
+ max_ammo = 1
+ multiload = FALSE
+
+/obj/item/organ/internal/cyberimp/arm/shell_launcher
+ name = "shell launch system implant"
+ desc = "A mounted, single-shot housing for a shell launch cannon; capable of firing twelve-gauge shotgun shells."
+ contents = newlist(/obj/item/gun/projectile/revolver/doublebarrel/shell_launcher)
+ icon_state = "shell_cannon"
+ action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/surgery.dmi')
+ action_icon_state = list(/datum/action/item_action/organ_action/toggle = "shell_cannon")
+
+/obj/item/organ/internal/cyberimp/arm/shell_launcher/emp_act(severity)
+ if(!owner)
+ return
+ if(emp_proof)
+ return
+ Retract()
+ for(var/obj/item/gun/projectile/revolver/doublebarrel/shell_launcher/SL in contents)
+ if(SL.chambered)
+ if(!SL.chambered.BB)//found a spent ammo
+ return
+
+ if(istype(SL.chambered, /obj/item/ammo_casing/shotgun/ion))
+ emp_proof = TRUE //This kills the server without it. Do not remove this.
+ SL.missfire(owner, parent_organ)
+ emp_proof = FALSE
+ to_chat(owner, "The misfired [SL.chambered] causes your [name] to break!")
+ necrotize()
+ return
+ if(istype(SL.chambered, /obj/item/ammo_casing/shotgun/frag12))
+ SL.missfire(owner, parent_organ)
+ var/obj/item/organ/external/probable_organ = owner.get_limb_by_name(parent_organ)
+ if(probable_organ) //In case it gets popped off by the damage
+ probable_organ.droplimb(FALSE, DROPLIMB_BLUNT)
+ return
+ if(istype(SL.chambered, /obj/item/ammo_casing/shotgun/pulseslug))
+ SL.missfire(owner, parent_organ)
+ var/obj/item/organ/external/probable_organ = owner.get_limb_by_name(parent_organ)
+ if(probable_organ) //In case it gets popped off by the damage
+ probable_organ.droplimb(FALSE, DROPLIMB_BURN)
+ return
+ SL.chambered.BB.damage *= 2 //Stronger since it is inside you
+ SL.missfire(owner, parent_organ)
+
+/obj/item/organ/internal/cyberimp/arm/shell_launcher/examine_more(mob/user)
+ . = ..()
+ . += "A Shellguard Munitions classic, the Shellguard Launch System (SLS) was originally a MODsuit heavy weapons accessory, \
+ later being developed into a forearm-mounted tactical shotgun implant. Though its compact design precludes the use of large ammunition like rockets or burning plasma, \
+ it excels in firing a variety of smaller shells, both energy and kinetic, thanks to its advanced plasma alloy barrel."
+ . += "Adapting an accessory intended for a mechanical suit's gauntlet posed significant hurdles, \
+ primarily in miniaturizing the barrel and components without sacrificing performance. The limitations initially damaged its perception of the market. \
+ However, executives would later pivot their niche to concealed carry and versatile shell ammunition, \
+ focusing on deployability and concealment through neural activation. \
+ The shift in approach would lead to the SLS being advertised as a powerful and compact holdout weapon, easily concealable and reliably lethal."
+ . += "Despite its initial issues, the SLS today holds a strong following in the implant market, being highly sought after among assassins, \
+ mercenaries, and firearm enthusiasts. Its appeal lies not just in its stealth but also in its compatibility with Shellguard's range of modular products, \
+ and the potential beyond its advertised capabilities."
+
/obj/item/organ/internal/cyberimp/arm/v1_arm
name = "vortex feedback arm implant"
desc = "An implant, that when deployed surrounds the users arm in armor and circuitry, allowing them to redirect nearby projectiles with feedback from the vortex anomaly core."
@@ -571,7 +723,7 @@
/obj/item/v1_arm_shell
name = "vortex feedback arm implant frame"
- desc = "An implant awaiting installation of a vortex anomaly core"
+ desc = "An implant awaiting installation of a vortex anomaly core."
icon_state = "v1_arm"
/obj/item/v1_arm_shell/attackby(obj/item/I, mob/user, params)
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index 5d7fb4d2bb57..d1d53dbb77a7 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -1,6 +1,6 @@
/obj/item/organ/internal/cyberimp/eyes
name = "cybernetic eyes"
- desc = "artificial photoreceptors with specialized functionality"
+ desc = "artificial photoreceptors with specialized functionality."
icon_state = "eye_implant"
implant_overlay = "eye_implant_overlay"
slot = "eye_sight"
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index c5fa8032c335..54a1b0203168 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -1,6 +1,6 @@
/obj/item/organ/internal/cyberimp
name = "cybernetic implant"
- desc = "a state-of-the-art implant that improves a baseline's functionality"
+ desc = "a state-of-the-art implant that improves a baseline's functionality."
status = ORGAN_ROBOT
var/implant_color = "#FFFFFF"
var/implant_overlay
@@ -21,7 +21,7 @@
/obj/item/organ/internal/cyberimp/brain
name = "cybernetic brain implant"
- desc = "injectors of extra sub-routines for the brain"
+ desc = "injectors of extra sub-routines for the brain."
icon_state = "brain_implant"
implant_overlay = "brain_implant_overlay"
parent_organ = "head"
@@ -132,27 +132,44 @@
implant_color = "#FFFF00"
slot = "brain_antistun"
origin_tech = "materials=5;programming=4;biotech=5"
- var/last_stamina_damage = 0
- var/max_stamina_increment = 40
+ /// How much we multiply the owners stamina regen block modifier by.
+ var/stamina_crit_time_multiplier = 0.4
+ /// Are we currently modifying somoeones stamina regen block modifier? If so, we will want to undo it on removal.
+ var/currently_modifying_stamina = FALSE
+ COOLDOWN_DECLARE(implant_cooldown)
-/obj/item/organ/internal/cyberimp/brain/anti_stam/on_life()
+/obj/item/organ/internal/cyberimp/brain/anti_stam/insert(mob/living/carbon/M, special = FALSE)
..()
- if(crit_fail)
+ RegisterSignal(M, COMSIG_CARBON_ENTER_STAMINACRIT, PROC_REF(on_enter))
+ RegisterSignal(M, COMSIG_CARBON_EXIT_STAMINACRIT, PROC_REF(on_exit))
+ RegisterSignal(M, COMSIG_CARBON_STAMINA_REGENERATED, PROC_REF(on_regen))
+
+/obj/item/organ/internal/cyberimp/brain/anti_stam/remove(mob/living/carbon/M, special = FALSE)
+ UnregisterSignal(M, list(COMSIG_CARBON_ENTER_STAMINACRIT, COMSIG_CARBON_EXIT_STAMINACRIT, COMSIG_CARBON_STAMINA_REGENERATED))
+ on_exit()
+ return ..()
+
+/obj/item/organ/internal/cyberimp/brain/anti_stam/proc/on_enter()
+ SIGNAL_HANDLER // COMSIG_CARBON_ENTER_STAMINACRIT
+ if(currently_modifying_stamina || !COOLDOWN_FINISHED(src, implant_cooldown))
return
- if(last_stamina_damage + max_stamina_increment < owner.getStaminaLoss())
- owner.setStaminaLoss(last_stamina_damage + max_stamina_increment)
- last_stamina_damage = owner.getStaminaLoss()
+ owner.stamina_regen_block_modifier *= stamina_crit_time_multiplier
+ currently_modifying_stamina = TRUE
+/obj/item/organ/internal/cyberimp/brain/anti_stam/proc/on_exit()
+ SIGNAL_HANDLER // COMSIG_CARBON_EXIT_STAMINACRIT
+ if(!currently_modifying_stamina)
+ return
+ owner.stamina_regen_block_modifier /= stamina_crit_time_multiplier
+ currently_modifying_stamina = FALSE
+
+/obj/item/organ/internal/cyberimp/brain/anti_stam/proc/on_regen()
+ SIGNAL_HANDLER // COMSIG_CARBON_STAMINA_REGENERATED
+ owner.update_stamina() //This is here so they actually get unstaminacrit when it triggers, vs 2-4 seconds later
/obj/item/organ/internal/cyberimp/brain/anti_stam/emp_act(severity)
..()
- if(crit_fail || emp_proof)
- return
- crit_fail = TRUE
- addtimer(CALLBACK(src, PROC_REF(reboot)), 90 / severity)
-
-/obj/item/organ/internal/cyberimp/brain/anti_stam/proc/reboot()
- crit_fail = FALSE
+ COOLDOWN_START(src, implant_cooldown, 1 MINUTES / severity)
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened
name = "Hardened CNS Rebooter implant"
@@ -172,7 +189,7 @@
..()
if(crit_fail)
return
- if(owner.stat == UNCONSCIOUS && cooldown == FALSE)
+ if(owner.stat == UNCONSCIOUS && !cooldown)
owner.AdjustSleeping(-200 SECONDS)
owner.AdjustParalysis(-200 SECONDS)
to_chat(owner, "You feel a rush of energy course through your body!")
@@ -204,7 +221,7 @@
/obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened/compatible
name = "Hardened Neural Jumpstarter implant"
- desc = "A military-grade version of the standard implant, for NT's more elite forces. This one is compatible with the CNS Rebooter implant"
+ desc = "A military-grade version of the standard implant, for NT's more elite forces. This one is compatible with the CNS Rebooter implant."
slot = "brain_antisleep"
emp_proof = TRUE
@@ -286,6 +303,128 @@
origin_tech = "materials=6;programming=6;biotech=6"
emp_proof = TRUE
+/obj/item/organ/internal/cyberimp/brain/hackerman_deck
+ name = "\improper Binyat wireless hacking system"
+ desc = "A rare-to-find neural chip that allows its user to interface with nearby machinery from a distance \
+ and affect it in (usually) beneficial ways. Due to the wireless connection, fine manipulation \
+ isn't possible, however the deck will drop a payload into the target's systems that will attempt \
+ hacking for you."
+ icon_state = "hackerman"
+ implant_overlay = null
+ implant_color = null
+ slot = "brain_antistun"
+ w_class = WEIGHT_CLASS_SMALL
+ origin_tech = "materials=4;combat=6;biotech=6;powerstorage=2;syndicate=3"
+ stealth_level = 4 //Only surgery or a body scanner with the highest tier of stock parts can detect this.
+
+/obj/item/organ/internal/cyberimp/brain/hackerman_deck/examine_more(mob/user)
+ . = ..()
+ . += "Considered Cybersun Incorporated's most recent and developed implant system focused on hacking from a range while being undetectable from normal means. \
+ The Binyat Wireless Hacking System (BWHS) is a stealth-built implant that gives its user a rudimentary electronic interface on whatever can be perceived. \
+ It uses a micro jammer to hide its existence from even the most advanced scanning systems."
+ . += "Originally designed as a hand-held device for long-range testing of Cybersun's electronic security systems, \
+ the easy integration of the components into a neural implant led to a revaluation of the device's potential. \
+ Development would commence to create the first sets of prototypes, focusing on tricking scanners with no false positives, \
+ and being able to hack from afar. The System does have a major flaw, however, as Cybersun R&D was never able to miniaturize its cooling systems to a practical level. \
+ Repeated use will lead to skin irritation, internal burns, and even severe nerve damage in extreme cases."
+ . += "As of modern times, the BWHS is heavily vetted under Cybersun Inc. due to its dangerous nature and rather difficult detection. \
+ However, this hasn't stopped the flow of these implants from reaching the black market, whether by inside or outside influences."
+
+/obj/item/organ/internal/cyberimp/brain/hackerman_deck/insert(mob/living/carbon/M, special = 0)
+ . = ..()
+ add_spell()
+ RegisterSignal(M, COMSIG_BODY_TRANSFER_TO, PROC_REF(on_body_transfer))
+
+/obj/item/organ/internal/cyberimp/brain/hackerman_deck/remove(mob/living/carbon/M, special = 0)
+ . = ..()
+ if(M.mind)
+ M.mind.RemoveSpell(/obj/effect/proc_holder/spell/hackerman_deck)
+ UnregisterSignal(M, COMSIG_BODY_TRANSFER_TO)
+
+/obj/item/organ/internal/cyberimp/brain/hackerman_deck/proc/on_body_transfer()
+ SIGNAL_HANDLER
+ for(var/datum/action/A in owner.actions)
+ if(A.name == "Activate Ranged Hacking") //Bit snowflake, but the action doesn't remove right otherwise
+ A.Remove(owner)
+ addtimer(CALLBACK(src, PROC_REF(add_spell)), 1 SECONDS) //Give the mind a moment to settle in
+ add_spell()
+
+/obj/item/organ/internal/cyberimp/brain/hackerman_deck/proc/add_spell()
+ if(owner.mind)
+ owner.mind.RemoveSpell(/obj/effect/proc_holder/spell/hackerman_deck) //Just to be sure.
+ owner.mind.AddSpell(new /obj/effect/proc_holder/spell/hackerman_deck(null))
+
+/obj/item/organ/internal/cyberimp/brain/hackerman_deck/emp_act(severity)
+ owner.adjustStaminaLoss(40 / severity)
+ owner.adjust_bodytemperature(400 / severity)
+ to_chat(owner, "Your [name] heats up drastically!")
+ return TRUE
+
+/obj/effect/proc_holder/spell/hackerman_deck
+ name = "Activate Ranged Hacking"
+ desc = "Click on any machine to hack them. Has a short range of only three tiles."
+ base_cooldown = 10 SECONDS
+ clothes_req = FALSE
+ invocation = "none"
+ invocation_type = "none"
+ selection_activated_message = "You warm up your Binyat deck, there's an idle buzzing at the back of your mind as it awaits a target."
+ selection_deactivated_message = "Your hacking deck makes an almost disappointed sounding buzz at the back of your mind as it powers down."
+ action_icon_state = "hackerman"
+ action_background_icon_state = "bg_pulsedemon"
+ /// How many times have we successfully hacked in the last minute? Increases burn damage by 3 for each value above 0.
+ var/recent_hacking = 0
+
+/obj/effect/proc_holder/spell/hackerman_deck/create_new_targeting()
+ var/datum/spell_targeting/clicked_atom/C = new()
+ C.range = 3
+ C.try_auto_target = FALSE
+ return C
+
+/obj/effect/proc_holder/spell/hackerman_deck/on_mind_transfer(mob/living/L)
+ if(!ishuman(L))
+ return FALSE
+ var/mob/living/carbon/human/H = L
+ var/obj/item/organ/internal/cyberimp/brain/hackerman_deck/our_deck = H.get_int_organ(/obj/item/organ/internal/cyberimp/brain/hackerman_deck)
+ if(!our_deck)
+ return FALSE
+ return TRUE
+
+/obj/effect/proc_holder/spell/hackerman_deck/cast(list/targets, mob/user)
+ var/atom/target = targets[1]
+ if(get_dist(user, target) > 3) //fucking cameras holy shit
+ to_chat(user, "Your implant is not robust enough to hack at that distance!")
+ cooldown_handler.start_recharge(cooldown_handler.recharge_duration * 0.3)
+ return
+ if(istype(user.loc, /obj/machinery/atmospherics)) //Come now, no emaging all the doors on station from a pipe
+ to_chat(user, "Your implant is unable to get a lock on anything in the pipes!")
+ return
+
+ var/beam = user.Beam(target, icon_state = "sm_arc_supercharged", time = 3 SECONDS)
+
+ user.visible_message("[user] makes an unusual buzzing sound as the air between them and [target] crackles.", \
+ "The air between you and [target] begins to crackle audibly as the Binyat gets to work and heats up in your head!")
+
+ if(!do_after(user, 3 SECONDS, target))
+ qdel(beam)
+ cooldown_handler.start_recharge(cooldown_handler.recharge_duration * 0.3)
+ return
+
+ if(!target.emag_act(user))
+ to_chat(user, "You are unable to hack this!")
+ cooldown_handler.start_recharge(cooldown_handler.recharge_duration * 0.3)
+ return
+
+ target.add_hiddenprint(user)
+
+ playsound(target, 'sound/machines/terminal_processing.ogg', 15, TRUE)
+
+ var/mob/living/carbon/human/human_owner = user
+ human_owner.adjustFireLoss(5 + (recent_hacking * 3))
+ recent_hacking++
+ addtimer(CALLBACK(src, PROC_REF(lower_recent_hacking)), 1 MINUTES)
+
+/obj/effect/proc_holder/spell/hackerman_deck/proc/lower_recent_hacking()
+ recent_hacking--
//[[[[MOUTH]]]]
/obj/item/organ/internal/cyberimp/mouth
@@ -309,7 +448,7 @@
//[[[[CHEST]]]]
/obj/item/organ/internal/cyberimp/chest
name = "cybernetic torso implant"
- desc = "implants for the organs in your torso"
+ desc = "implants for the organs in your torso."
icon_state = "chest_implant"
implant_overlay = "chest_implant_overlay"
parent_organ = "chest"
diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm
index e676ed727f57..f64f973273bd 100644
--- a/code/modules/surgery/organs/autosurgeon.dm
+++ b/code/modules/surgery/organs/autosurgeon.dm
@@ -93,6 +93,34 @@
uses = 1
starting_organ = /obj/item/organ/internal/eyes/cybernetic/meson
+/obj/item/autosurgeon/organ/syndicate/razorwire
+ desc = "A single use autosurgeon that contains a Razorwire arm implant. A screwdriver can be used to remove it, but implants can't be placed back in."
+ uses = 1
+ starting_organ = /obj/item/organ/internal/cyberimp/arm/razorwire
+
+/obj/item/autosurgeon/organ/syndicate/razorwire/examine_more(mob/user)
+ . = ..()
+ if(storedorgan)
+ return storedorgan.examine_more()
+
+/obj/item/autosurgeon/organ/syndicate/hackerman_deck
+ desc = "A single use autosurgeon that contains a Binyat wireless hacking system. A screwdriver can be used to remove it, but implants can't be placed back in."
+ uses = 1
+ starting_organ = /obj/item/organ/internal/cyberimp/brain/hackerman_deck
+
+/obj/item/autosurgeon/organ/syndicate/hackerman_deck/examine_more(mob/user)
+ . = ..()
+ . += "Considered Cybersun Incorporated's most recent and developed implant system focused on hacking from a range while being undetectable from normal means. \
+ The Binyat Wireless Hacking System (BWHS) is a stealth-built implant that gives its user a rudimentary electronic interface on whatever can be perceived. \
+ It uses a micro jammer to hide its existence from even the most advanced scanning systems."
+ . += "Originally designed as a hand-held device for long-range testing of Cybersun's electronic security systems, \
+ the easy integration of the components into a neural implant led to a revaluation of the device's potential. \
+ Development would commence to create the first sets of prototypes, focusing on tricking scanners with no false positives, \
+ and being able to hack from afar. The System does have a major flaw, however, as Cybersun R&D was never able to miniaturize its cooling systems to a practical level. \
+ Repeated use will lead to skin irritation, internal burns, and even severe nerve damage in extreme cases."
+ . += "As of modern times, the BWHS is heavily vetted under Cybersun Inc. due to its dangerous nature and rather difficult detection. \
+ However, this hasn't stopped the flow of these implants from reaching the black market, whether by inside or outside influences."
+
/obj/item/autosurgeon/organ/syndicate/thermal_eyes
starting_organ = /obj/item/organ/internal/eyes/cybernetic/thermals/hardened
diff --git a/code/modules/surgery/organs/brain.dm b/code/modules/surgery/organs/brain.dm
index 3e55578c4a4c..762fc793df64 100644
--- a/code/modules/surgery/organs/brain.dm
+++ b/code/modules/surgery/organs/brain.dm
@@ -38,16 +38,20 @@
if(isnull(dna)) // someone didn't set this right...
stack_trace("[src] at [loc] did not contain a dna datum at time of removal.")
dna = H.dna.Clone()
- name = "\the [dna.real_name]'s [initial(src.name)]"
+ if(dna.real_name)
+ name = "\the [dna.real_name]'s [initial(name)]"
+ brainmob.name = dna.real_name
+ brainmob.real_name = dna.real_name
+ else
+ name = "\the [H.real_name]'s [initial(name)]"
+ brainmob.name = H.real_name
+ brainmob.real_name = H.real_name
brainmob.dna = dna.Clone() // Silly baycode, what you do
-// brainmob.dna = H.dna.Clone() Putting in and taking out a brain doesn't make it a carbon copy of the original brain of the body you put it in
- brainmob.name = dna.real_name
- brainmob.real_name = dna.real_name
brainmob.timeofhostdeath = H.timeofdeath
if(H.mind)
H.mind.transfer_to(brainmob)
- to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a [initial(src.name)].")
+ to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a [initial(name)].")
/obj/item/organ/internal/brain/examine(mob/user) // -- TLE
. = ..()
@@ -59,7 +63,7 @@
for(var/mob/dead/observer/G in GLOB.player_list)
if(G.mind == brainmob.mind)
foundghost = TRUE
- if(G.can_reenter_corpse == FALSE)
+ if(!G.can_reenter_corpse)
foundghost = FALSE
break
if(foundghost)
@@ -73,6 +77,9 @@
name = "[dna.real_name]'s [initial(name)]"
if(!owner) return ..() // Probably a redundant removal; just bail
+
+ if(is_species(owner, /datum/species/monkey))
+ name = "[owner.name]'s [initial(name)]"
var/obj/item/organ/internal/brain/B = src
if(!special)
@@ -126,7 +133,7 @@
owner.setBrainLoss(120)
/obj/item/organ/internal/brain/on_life()
- if(decoy_brain || damage < 10)
+ if(decoy_brain || damage < 10)
return
switch(damage)
if(10 to 30)
@@ -187,13 +194,14 @@
/obj/item/organ/internal/brain/prepare_eat()
return // Too important to eat.
+// Hello I am from the ministry of rubber forehead aliens how are you
/obj/item/organ/internal/brain/slime
name = "slime core"
desc = "A complex, organic knot of jelly and crystalline particles."
icon = 'icons/mob/slimes.dmi'
icon_state = "green slime extract"
mmi_icon_state = "slime_mmi"
-// parent_organ = "chest" Hello I am from the ministry of rubber forehead aliens how are you
+ organ_datums = list(/datum/organ/heart, /datum/organ/lungs)
/obj/item/organ/internal/brain/golem
name = "Runic mind"
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index aec0dcb6c1e1..700232bf3fe4 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -213,7 +213,7 @@
/obj/item/organ/internal/eyes/cybernetic/eyesofgod //no occuline allowed
name = "\improper Eyes of the Gods"
- desc = "Two eyes said to belong to the gods. But such vision comes at a price"
+ desc = "Two eyes said to belong to the gods. But such vision comes at a price."
icon_state = "eyesofgod"
eye_color = "#58a5ec"
see_in_dark = 8
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index f20903ee0252..208e0f878124 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -5,74 +5,35 @@
parent_organ = "chest"
slot = "heart"
origin_tech = "biotech=5"
- var/beating = TRUE
dead_icon = "heart-off"
- var/icon_base = "heart"
+ base_icon_state = "heart"
+ organ_datums = list(/datum/organ/heart)
/obj/item/organ/internal/heart/update_icon_state()
- if(beating)
- icon_state = "[icon_base]-on"
+ var/datum/organ/heart/heart = organ_datums["heart"]
+ if(heart.beating)
+ icon_state = "[base_icon_state]-on"
else
- icon_state = "[icon_base]-off"
-
-/obj/item/organ/internal/heart/remove(mob/living/carbon/M, special = 0)
- . = ..()
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.stat == DEAD)
- Stop()
- return
-
- if(!special)
- addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 120)
-
-/obj/item/organ/internal/heart/emp_act(intensity)
- if(!is_robotic() || emp_proof)
- return
- Stop()
-
-/obj/item/organ/internal/heart/necrotize()
- ..()
- Stop()
+ icon_state = "[base_icon_state]-off"
/obj/item/organ/internal/heart/attack_self(mob/user)
..()
if(status & ORGAN_DEAD)
to_chat(user, "You can't restart a dead heart.")
return
- if(!beating)
- Restart()
- addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 80)
+ var/datum/organ/heart/heart = organ_datums["heart"]
+ heart.try_restart(8 SECONDS)
/obj/item/organ/internal/heart/safe_replace(mob/living/carbon/human/target)
- Restart()
+ var/datum/organ/heart/heart = organ_datums["heart"]
+ heart.change_beating(TRUE)
..()
-/obj/item/organ/internal/heart/proc/stop_if_unowned()
- if(!owner)
- Stop()
-
-/obj/item/organ/internal/heart/proc/Stop()
- beating = FALSE
- update_icon(UPDATE_ICON_STATE)
- return TRUE
-
-/obj/item/organ/internal/heart/proc/Restart()
- beating = TRUE
- update_icon(UPDATE_ICON_STATE)
- return TRUE
-
-/obj/item/organ/internal/heart/prepare_eat()
- var/obj/S = ..()
- if(S)
- S.icon_state = dead_icon
- return S
-
/obj/item/organ/internal/heart/cursed
name = "cursed heart"
desc = "it needs to be pumped..."
icon_state = "cursedheart-off"
- icon_base = "cursedheart"
+ base_icon_state = "cursedheart"
origin_tech = "biotech=6"
actions_types = list(/datum/action/item_action/organ_action/cursed_heart)
var/last_pump = 0
@@ -123,6 +84,8 @@
to_chat(owner, "Your heart has been replaced with a cursed one, you have to pump this one manually otherwise you'll die!")
RegisterSignal(owner, COMSIG_LIVING_PRE_DEFIB, PROC_REF(just_before_revive))
RegisterSignal(owner, COMSIG_LIVING_DEFIBBED, PROC_REF(on_defib_revive))
+ in_grace_period = TRUE
+ addtimer(VARSET_CALLBACK(src, in_grace_period, FALSE), revival_grace_period)
/obj/item/organ/internal/heart/cursed/remove(mob/living/carbon/M, special)
if(owner?.client?.prefs.colourblind_mode == COLOURBLIND_MODE_NONE)
@@ -211,11 +174,19 @@
H.adjustFireLoss(-cursed_heart.heal_burn)
H.adjustOxyLoss(-cursed_heart.heal_oxy)
+/datum/action/item_action/organ_action/cursed_heart/Grant(mob/M)
+ ..()
+ INVOKE_ASYNC(src, PROC_REF(poll_keybinds))
+
+/datum/action/item_action/organ_action/cursed_heart/proc/poll_keybinds()
+ if(alert(owner, "You've been given a cursed heart! Do you want to bind its action to a keybind?", "Cursed Heart", "Yes", "No") == "Yes")
+ button.set_to_keybind(owner)
+
/obj/item/organ/internal/heart/cybernetic
name = "cybernetic heart"
desc = "An electronic device designed to mimic the functions of an organic human heart. Offers no benefit over an organic heart other than being easy to make."
icon_state = "heart-c-on"
- icon_base = "heart-c"
+ base_icon_state = "heart-c"
dead_icon = "heart-c-off"
status = ORGAN_ROBOT
@@ -223,7 +194,7 @@
name = "upgraded cybernetic heart"
desc = "A more advanced version of a cybernetic heart. Grants the user additional stamina and heart stability, but the electronics are vulnerable to shock."
icon_state = "heart-c-u-on"
- icon_base = "heart-c-u"
+ base_icon_state = "heart-c-u"
dead_icon = "heart-c-u-off"
var/attempted_restart = FALSE
@@ -242,27 +213,42 @@
if(!ishuman(owner))
return
- if(!(status & ORGAN_DEAD) && !attempted_restart && !beating)
+ if(status & ORGAN_DEAD)
+ return
+
+ var/boost = emagged ? 2 : 1
+ owner.AdjustParalysis(-2 SECONDS * boost)
+ owner.AdjustStunned(-2 SECONDS * boost)
+ owner.AdjustWeakened(-2 SECONDS * boost)
+ owner.AdjustKnockDown(-2 SECONDS * boost)
+ owner.adjustStaminaLoss(-10 * boost)
+
+ if(attempted_restart)
+ return
+
+ var/datum/organ/heart/heart_datum = organ_datums["heart"]
+
+ if(!heart_datum.beating)
to_chat(owner, "Your [name] detects a cardiac event and attempts to return to its normal rhythm!")
if(prob(20) && emagged)
attempted_restart = TRUE
- Restart()
- addtimer(CALLBACK(src, PROC_REF(message_to_owner), owner, "Your [name] returns to its normal rhythm!"), 30)
- addtimer(CALLBACK(src, PROC_REF(recharge)), 200)
+ heart_datum.change_beating(TRUE) // Mötley Crüe - Kickstart My Heart
+ addtimer(CALLBACK(src, PROC_REF(message_to_owner), owner, "Your [name] returns to its normal rhythm!"), 3 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(recharge)), 20 SECONDS)
else if(prob(10))
attempted_restart = TRUE
- Restart()
- addtimer(CALLBACK(src, PROC_REF(message_to_owner), owner, "Your [name] returns to its normal rhythm!"), 30)
- addtimer(CALLBACK(src, PROC_REF(recharge)), 300)
+ heart_datum.change_beating(TRUE)
+ addtimer(CALLBACK(src, PROC_REF(message_to_owner), owner, "Your [name] returns to its normal rhythm!"), 3 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(recharge)), 30 SECONDS)
else
attempted_restart = TRUE
if(emagged)
- addtimer(CALLBACK(src, PROC_REF(recharge)), 200)
+ addtimer(CALLBACK(src, PROC_REF(recharge)), 20 SECONDS)
else
- addtimer(CALLBACK(src, PROC_REF(recharge)), 300)
- addtimer(CALLBACK(src, PROC_REF(message_to_owner), owner, "Your [name] fails to return to its normal rhythm!"), 30)
+ addtimer(CALLBACK(src, PROC_REF(recharge)), 30 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(message_to_owner), owner, "Your [name] fails to return to its normal rhythm!"), 3 SECONDS)
- if(!(status & ORGAN_DEAD) && !attempted_restart && owner.HasDisease(new /datum/disease/critical/heart_failure(0)))
+ if(owner.HasDisease(/datum/disease/critical/heart_failure))
to_chat(owner, "Your [name] detects a cardiac event and attempts to return to its normal rhythm!")
if(prob(40) && emagged)
attempted_restart = TRUE
@@ -284,14 +270,6 @@
addtimer(CALLBACK(src, PROC_REF(recharge)), 300)
addtimer(CALLBACK(src, PROC_REF(message_to_owner), owner, "Your [name] fails to return to its normal rhythm!"), 30)
- if(!(status & ORGAN_DEAD))
- var/boost = emagged ? 2 : 1
- owner.AdjustParalysis(-2 SECONDS * boost)
- owner.AdjustStunned(-2 SECONDS * boost)
- owner.AdjustWeakened(-2 SECONDS * boost)
- owner.AdjustKnockDown(-2 SECONDS * boost)
- owner.adjustStaminaLoss(-10 * boost)
-
/obj/item/organ/internal/heart/cybernetic/upgraded/proc/message_to_owner(mob/M, message)
to_chat(M, message)
@@ -305,6 +283,7 @@
if(!emagged)
to_chat(user, "You disable the safeties on [src]")
emagged = TRUE
+ return TRUE
else
to_chat(user, "You re-enable the safeties on [src]")
emagged = FALSE
@@ -333,7 +312,8 @@
owner.ForceContractDisease(new /datum/disease/critical/heart_failure(0))
if(prob(numMid))
to_chat(owner, "Your [name] stops beating!")
- Stop()
+ var/datum/organ/heart/heart_datum = organ_datums["heart"]
+ heart_datum.change_beating(FALSE) // Rambunctious Crew - Stop My Fucking Heart
if(prob(numLow))
to_chat(owner, "Your [name] shuts down!")
necrotize()
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 858c448ad82b..4aed3d4d5c31 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -7,306 +7,7 @@
gender = PLURAL
w_class = WEIGHT_CLASS_NORMAL
- //Breath damage
-
- var/safe_oxygen_min = 16 // Minimum safe partial pressure of O2, in kPa
- var/safe_oxygen_max = 0
- var/safe_nitro_min = 0
- var/safe_nitro_max = 0
- var/safe_co2_min = 0
- var/safe_co2_max = 10 // Yes it's an arbitrary value who cares?
- var/safe_toxins_min = 0
- var/safe_toxins_max = 0.05
- var/SA_para_min = 1 //Sleeping agent
- var/SA_sleep_min = 5 //Sleeping agent
-
-
- var/oxy_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
- var/oxy_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
- var/oxy_damage_type = OXY
- var/nitro_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
- var/nitro_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
- var/nitro_damage_type = OXY
- var/co2_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
- var/co2_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
- var/co2_damage_type = OXY
- var/tox_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
- var/tox_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
- var/tox_damage_type = TOX
-
- var/cold_message = "your face freezing and an icicle forming"
- var/cold_level_1_threshold = 260
- var/cold_level_2_threshold = 200
- var/cold_level_3_threshold = 120
- var/cold_level_1_damage = COLD_GAS_DAMAGE_LEVEL_1 //Keep in mind with gas damage levels, you can set these to be negative, if you want someone to heal, instead.
- var/cold_level_2_damage = COLD_GAS_DAMAGE_LEVEL_2
- var/cold_level_3_damage = COLD_GAS_DAMAGE_LEVEL_3
- var/cold_damage_types = list(BURN = 1)
-
- var/hot_message = "your face burning and a searing heat"
- var/heat_level_1_threshold = 360
- var/heat_level_2_threshold = 400
- var/heat_level_3_threshold = 1000
- var/heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_1
- var/heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_2
- var/heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3
- var/heat_damage_types = list(BURN = 1)
-
-/obj/item/organ/internal/lungs/emp_act()
- if(!is_robotic() || emp_proof)
- return
- if(owner)
- owner.LoseBreath(40 SECONDS)
-
-/obj/item/organ/internal/lungs/insert(mob/living/carbon/M, special = 0, dont_remove_slot = 0)
- ..()
- for(var/thing in list("oxy", "tox", "co2", "nitro"))
- M.clear_alert("not_enough_[thing]")
- M.clear_alert("too_much_[thing]")
-
-/obj/item/organ/internal/lungs/remove(mob/living/carbon/M, special = 0)
- for(var/thing in list("oxy", "tox", "co2", "nitro"))
- M.clear_alert("not_enough_[thing]")
- M.clear_alert("too_much_[thing]")
- return ..()
-
-/obj/item/organ/internal/lungs/on_life()
- if(germ_level > INFECTION_LEVEL_ONE)
- if(prob(5))
- owner.emote("cough") //respitory tract infection
-
- if(is_bruised())
- if(prob(2) && !(NO_BLOOD in owner.dna.species.species_traits))
- owner.custom_emote(EMOTE_VISIBLE, "coughs up blood!")
- owner.bleed(1)
- if(prob(4))
- owner.custom_emote(EMOTE_VISIBLE, "gasps for air!")
- owner.AdjustLoseBreath(10 SECONDS)
-
-/obj/item/organ/internal/lungs/proc/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
- if((H.status_flags & GODMODE))
- return
-
- if(HAS_TRAIT(H, TRAIT_NOBREATH))
- return
-
- if(!breath || (breath.total_moles() == 0))
- if(isspaceturf(H.loc))
- H.adjustOxyLoss(10)
- else
- H.adjustOxyLoss(5)
-
- if(safe_oxygen_min)
- H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
- else if(safe_toxins_min)
- H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
- else if(safe_co2_min)
- H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
- else if(safe_nitro_min)
- H.throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
- return FALSE
-
-
- if(H.health < HEALTH_THRESHOLD_CRIT)
- return FALSE
-
- var/gas_breathed = 0
-
- //Partial pressures in our breath
- var/O2_pp = breath.get_breath_partial_pressure(breath.oxygen)
- var/N2_pp = breath.get_breath_partial_pressure(breath.nitrogen)
- var/Toxins_pp = breath.get_breath_partial_pressure(breath.toxins)
- var/CO2_pp = breath.get_breath_partial_pressure(breath.carbon_dioxide)
- var/SA_pp = breath.get_breath_partial_pressure(breath.sleeping_agent)
-
-
- //-- OXY --//
-
- //Too much oxygen! //Yes, some species may not like it.
- if(safe_oxygen_max)
- if(O2_pp > safe_oxygen_max)
- var/ratio = (breath.oxygen / safe_oxygen_max / safe_oxygen_max) * 10
- H.apply_damage_type(clamp(ratio, oxy_breath_dam_min, oxy_breath_dam_max), oxy_damage_type)
- H.throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy)
- else
- H.clear_alert("too_much_oxy")
-
- //Too little oxygen!
- if(safe_oxygen_min)
- if(O2_pp < safe_oxygen_min)
- gas_breathed = handle_too_little_breath(H, O2_pp, safe_oxygen_min, breath.oxygen)
- H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
- else
- H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS)
- gas_breathed = breath.oxygen
- H.clear_alert("not_enough_oxy")
-
- //Exhale
- breath.oxygen -= gas_breathed
- breath.carbon_dioxide += gas_breathed
- gas_breathed = 0
-
- //-- Nitrogen --//
-
- //Too much nitrogen!
- if(safe_nitro_max)
- if(N2_pp > safe_nitro_max)
- var/ratio = (breath.nitrogen / safe_nitro_max) * 10
- H.apply_damage_type(clamp(ratio, nitro_breath_dam_min, nitro_breath_dam_max), nitro_damage_type)
- H.throw_alert("too_much_nitro", /obj/screen/alert/too_much_nitro)
- else
- H.clear_alert("too_much_nitro")
-
- //Too little nitrogen!
- if(safe_nitro_min)
- if(N2_pp < safe_nitro_min)
- gas_breathed = handle_too_little_breath(H, N2_pp, safe_nitro_min, breath.nitrogen)
- H.throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
- else
- H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS)
- gas_breathed = breath.nitrogen
- H.clear_alert("not_enough_nitro")
-
- //Exhale
- breath.nitrogen -= gas_breathed
- breath.carbon_dioxide += gas_breathed
- gas_breathed = 0
-
- //-- CO2 --//
-
- //CO2 does not affect failed_last_breath. So if there was enough oxygen in the air but too much co2, this will hurt you, but only once per 4 ticks, instead of once per tick.
- if(safe_co2_max)
- if(CO2_pp > safe_co2_max)
- if(!H.co2overloadtime) // If it's the first breath with too much CO2 in it, lets start a counter, then have them pass out after 12s or so.
- H.co2overloadtime = world.time
- else if(world.time - H.co2overloadtime > 120)
- H.Paralyse(6 SECONDS)
- H.apply_damage_type(HUMAN_MAX_OXYLOSS, co2_damage_type) // Lets hurt em a little, let them know we mean business
- if(world.time - H.co2overloadtime > 300) // They've been in here 30s now, lets start to kill them for their own good!
- H.apply_damage_type(15, co2_damage_type)
- H.throw_alert("too_much_co2", /obj/screen/alert/too_much_co2)
- if(prob(20)) // Lets give them some chance to know somethings not right though I guess.
- H.emote("cough")
-
- else
- H.co2overloadtime = 0
- H.clear_alert("too_much_co2")
-
- //Too little CO2!
- if(safe_co2_min)
- if(CO2_pp < safe_co2_min)
- gas_breathed = handle_too_little_breath(H, CO2_pp, safe_co2_min, breath.carbon_dioxide)
- H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
- else
- H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS)
- gas_breathed = breath.carbon_dioxide
- H.clear_alert("not_enough_co2")
-
- //Exhale
- breath.carbon_dioxide -= gas_breathed
- breath.oxygen += gas_breathed
- gas_breathed = 0
-
-
- //-- TOX --//
-
- //Too much toxins!
- if(safe_toxins_max)
- if(Toxins_pp > safe_toxins_max)
- var/ratio = (breath.toxins / safe_toxins_max) * 10
- H.apply_damage_type(clamp(ratio, tox_breath_dam_min, tox_breath_dam_max), tox_damage_type)
- H.throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
- else
- H.clear_alert("too_much_tox")
-
-
- //Too little toxins!
- if(safe_toxins_min)
- if(Toxins_pp < safe_toxins_min)
- gas_breathed = handle_too_little_breath(H, Toxins_pp, safe_toxins_min, breath.toxins)
- H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
- else
- H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS)
- gas_breathed = breath.toxins
- H.clear_alert("not_enough_tox")
-
- //Exhale
- breath.toxins -= gas_breathed
- breath.carbon_dioxide += gas_breathed
- gas_breathed = 0
-
-
- //-- TRACES --//
-
- if(breath.sleeping_agent) // If there's some other shit in the air lets deal with it here.
- if(SA_pp > SA_para_min)
- H.Paralyse(6 SECONDS) // 6 seconds gives them one second to wake up and run away a bit!
- if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
- H.AdjustSleeping(16 SECONDS, bound_lower = 0, bound_upper = 20 SECONDS)
- else if(SA_pp > 0.01) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
- if(prob(20))
- H.emote(pick("giggle", "laugh"))
-
- handle_breath_temperature(breath, H)
-
- return TRUE
-
-
-/obj/item/organ/internal/lungs/proc/handle_too_little_breath(mob/living/carbon/human/H = null, breath_pp = 0, safe_breath_min = 0, true_pp = 0)
- . = 0
- if(!H || !safe_breath_min) //the other args are either: Ok being 0 or Specifically handled.
- return FALSE
-
- if(prob(20))
- H.emote("gasp")
- if(breath_pp > 0)
- var/ratio = safe_breath_min/breath_pp
- H.adjustOxyLoss(min(5*ratio, HUMAN_MAX_OXYLOSS)) // Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!
- . = true_pp*ratio/6
- else
- H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
-
-
-/obj/item/organ/internal/lungs/proc/handle_breath_temperature(datum/gas_mixture/breath, mob/living/carbon/human/H) // called by human/life, handles temperatures
- var/breath_temperature = breath.temperature
-
- if(!HAS_TRAIT(H, TRAIT_RESISTCOLD)) // COLD DAMAGE
- var/CM = abs(H.dna.species.coldmod)
- var/TC = 0
- if(breath_temperature < cold_level_3_threshold)
- TC = cold_level_3_damage
- if(breath_temperature > cold_level_3_threshold && breath_temperature < cold_level_2_threshold)
- TC = cold_level_2_damage
- if(breath_temperature > cold_level_2_threshold && breath_temperature < cold_level_1_threshold)
- TC = cold_level_1_damage
- if(TC)
- for(var/D in cold_damage_types)
- H.apply_damage_type(TC * CM * cold_damage_types[D], D)
- if(breath_temperature < cold_level_1_threshold)
- if(prob(20))
- to_chat(H, "You feel [cold_message] in your [name]!")
-
- if(!HAS_TRAIT(H, TRAIT_RESISTHEAT)) // HEAT DAMAGE
- var/HM = abs(H.dna.species.heatmod)
- var/TH = 0
- if(breath_temperature > heat_level_1_threshold && breath_temperature < heat_level_2_threshold)
- TH = heat_level_1_damage
- if(breath_temperature > heat_level_2_threshold && breath_temperature < heat_level_3_threshold)
- TH = heat_level_2_damage
- if(breath_temperature > heat_level_3_threshold)
- TH = heat_level_3_damage
- if(TH)
- for(var/D in heat_damage_types)
- H.apply_damage_type(TH * HM * heat_damage_types[D], D)
- if(breath_temperature > heat_level_1_threshold)
- if(prob(20))
- to_chat(H, "You feel [hot_message] in your [name]!")
-
-/obj/item/organ/internal/lungs/prepare_eat()
- var/obj/S = ..()
- if(S)
- S.reagents.add_reagent("salbutamol", 5)
- return S
+ organ_datums = list(/datum/organ/lungs)
/obj/item/organ/internal/lungs/plasmaman
name = "plasma filter"
@@ -314,9 +15,7 @@
icon = 'icons/obj/species_organs/plasmaman.dmi'
icon_state = "lungs"
- safe_oxygen_min = 0 //We don't breath this
- safe_toxins_min = 16 //We breathe THIS!
- safe_toxins_max = 0
+ organ_datums = list(/datum/organ/lungs/plasmamen)
/obj/item/organ/internal/lungs/vox
name = "vox lungs"
@@ -325,20 +24,12 @@
icon_state = "lungs"
sterile = TRUE
- safe_oxygen_min = 0 //We don't breathe this
- safe_oxygen_max = 0.05 //This is toxic to us
- safe_nitro_min = 16 //We breathe THIS!
- oxy_damage_type = TOX //And it poisons us
+ organ_datums = list(/datum/organ/lungs/vox)
/obj/item/organ/internal/lungs/drask
icon = 'icons/obj/species_organs/drask.dmi'
- cold_message = "an invigorating coldness"
- cold_level_3_threshold = 60
- cold_level_1_damage = -COLD_GAS_DAMAGE_LEVEL_1 //They heal when the air is cold
- cold_level_2_damage = -COLD_GAS_DAMAGE_LEVEL_2
- cold_level_3_damage = -COLD_GAS_DAMAGE_LEVEL_3
- cold_damage_types = list(BRUTE = 0.5, BURN = 0.25)
+ organ_datums = list(/datum/organ/lungs/drask)
/obj/item/organ/internal/lungs/cybernetic
name = "cybernetic lungs"
@@ -346,7 +37,7 @@
icon_state = "lungs-c"
origin_tech = "biotech=4"
status = ORGAN_ROBOT
- var/species_state = "human"
+ var/species_state = "default"
/obj/item/organ/internal/lungs/cybernetic/examine(mob/user)
. = ..()
@@ -356,28 +47,20 @@
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
- switch(species_state)
- if("human") // from human to vox
- safe_oxygen_min = 0
- safe_oxygen_max = safe_toxins_max
- safe_nitro_min = 16
- oxy_damage_type = TOX
- to_chat(user, "You configure [src] to replace vox lungs.")
- species_state = "vox"
- if("vox") // from vox to plasmamen
- safe_oxygen_max = initial(safe_oxygen_max)
- safe_toxins_min = 16
- safe_toxins_max = 0
- safe_nitro_min = initial(safe_nitro_min)
- oxy_damage_type = OXY
- to_chat(user, "You configure [src] to replace plasmamen lungs.")
- species_state = "plasmamen"
- if("plasmamen") // from plasmamen to human
- safe_oxygen_min = initial(safe_oxygen_min)
- safe_toxins_min = initial(safe_toxins_min)
- safe_toxins_max = initial(safe_toxins_max)
- to_chat(user, "You configure [src] back to default settings.")
- species_state = "human"
+
+ var/possible = list("default" = /datum/organ/lungs, "vox" = /datum/organ/lungs/vox, "plasmamen" = /datum/organ/lungs/plasmamen)
+ var/chosen = input(user, "Select lung type", "What kind of lung settings?") as null|anything in possible
+ if(isnull(chosen) || chosen == species_state || !Adjacent(user) || !I.use_tool(src, user, 0, volume = I.tool_volume))
+ return
+ species_state = chosen
+ to_chat(user, "You configure [src] to [chosen] settings.")
+
+ var/typepath = possible[chosen]
+ var/datum/organ/lungs/lungs = new typepath(src)
+ qdel(organ_datums[lungs.organ_tag])
+ organ_datums[lungs.organ_tag] = lungs
+ if(owner) // this should never happen, but in case it somehow does...
+ owner.internal_organ_datums[lungs.organ_tag] = lungs
/obj/item/organ/internal/lungs/cybernetic/upgraded
name = "upgraded cybernetic lungs"
@@ -385,9 +68,9 @@
icon_state = "lungs-c-u"
origin_tech = "biotech=5"
- safe_toxins_max = 20
- safe_co2_max = 20
+ organ_datums = list(/datum/organ/lungs/advanced_cyber)
- cold_level_1_threshold = 200
- cold_level_2_threshold = 140
- cold_level_3_threshold = 100
+/obj/item/organ/internal/lungs/cybernetic/upgraded/multitool_act(mob/user, obj/item/I)
+ . = ..()
+ var/datum/organ/lungs/lungs = organ_datums["lungs"]
+ lungs.make_advanced()
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index 2b000ee96042..80cc843d18cc 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -40,6 +40,8 @@
var/last_pain_message
/// When can we get the next pain message?
var/next_pain_time
+ /// What level of upgrades are needed to detect this. Level 0 is default. 1 is hidden from health analysers. 2 is hidden from cyborg analysers, and the body scanner at level 1. 4 is the highest level the body scanner can reach.
+ var/stealth_level = 0
/obj/item/organ/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -217,6 +219,7 @@
if(tough)
return
damage = clamp(damage + amount, 0, max_damage)
+ damage = round_health(damage)
//only show this if the organ is not robotic
if(owner && parent_organ && amount > 0)
diff --git a/code/modules/surgery/organs/organ_datums/heart_datum.dm b/code/modules/surgery/organs/organ_datums/heart_datum.dm
new file mode 100644
index 000000000000..1c18c21bed53
--- /dev/null
+++ b/code/modules/surgery/organs/organ_datums/heart_datum.dm
@@ -0,0 +1,47 @@
+/datum/organ/heart
+ organ_tag = ORGAN_DATUM_HEART
+ var/beating = TRUE
+ var/always_beating = FALSE
+
+/datum/organ/heart/on_remove(mob/living/carbon/removed_from, special = FALSE)
+ . = ..()
+ if(ishuman(removed_from))
+ var/mob/living/carbon/human/H = removed_from
+ if(H.stat == DEAD)
+ change_beating(FALSE)
+ return
+
+ if(!special)
+ addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 12 SECONDS)
+
+/datum/organ/heart/proc/change_beating(change_to = FALSE)
+ if(always_beating)
+ beating = TRUE
+ return
+ beating = change_to
+ linked_organ.update_icon()
+
+/datum/organ/heart/on_successful_emp()
+ change_beating(FALSE)
+ return TRUE
+
+/datum/organ/heart/on_necrotize()
+ change_beating(FALSE)
+ return TRUE
+
+/datum/organ/heart/proc/try_restart(duration = 8 SECONDS)
+ if(beating)
+ return
+ change_beating(TRUE)
+ addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), duration)
+
+/datum/organ/heart/proc/stop_if_unowned()
+ if(!linked_organ.owner)
+ change_beating(FALSE)
+
+/datum/organ/heart/on_prepare_eat(obj/item/food/snacks/organ/snorgan)
+ snorgan.icon_state = linked_organ.dead_icon
+
+/// A subtype that is always beating. Abductor glands and demon hearts use this.
+/datum/organ/heart/always_beating
+ always_beating = TRUE
diff --git a/code/modules/surgery/organs/organ_datums/lung_datum.dm b/code/modules/surgery/organs/organ_datums/lung_datum.dm
new file mode 100644
index 000000000000..c939bbab6511
--- /dev/null
+++ b/code/modules/surgery/organs/organ_datums/lung_datum.dm
@@ -0,0 +1,345 @@
+/datum/organ/lungs
+ organ_tag = ORGAN_DATUM_LUNGS
+
+ //Breath damage
+
+ var/safe_oxygen_min = 16 // Minimum safe partial pressure of O2, in kPa
+ var/safe_oxygen_max = 0
+ var/safe_nitro_min = 0
+ var/safe_nitro_max = 0
+ var/safe_co2_min = 0
+ var/safe_co2_max = 10 // Yes it's an arbitrary value who cares?
+ var/safe_toxins_min = 0
+ var/safe_toxins_max = 0.05
+ var/SA_para_min = 1 //Sleeping agent
+ var/SA_sleep_min = 5 //Sleeping agent
+
+
+ var/oxy_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/oxy_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+ var/oxy_damage_type = OXY
+ var/nitro_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/nitro_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+ var/nitro_damage_type = OXY
+ var/co2_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/co2_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+ var/co2_damage_type = OXY
+ var/tox_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/tox_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+ var/tox_damage_type = TOX
+
+ var/cold_message = "your face freezing and an icicle forming"
+ var/cold_level_1_threshold = 260
+ var/cold_level_2_threshold = 200
+ var/cold_level_3_threshold = 120
+ var/cold_level_1_damage = COLD_GAS_DAMAGE_LEVEL_1 //Keep in mind with gas damage levels, you can set these to be negative, if you want someone to heal, instead.
+ var/cold_level_2_damage = COLD_GAS_DAMAGE_LEVEL_2
+ var/cold_level_3_damage = COLD_GAS_DAMAGE_LEVEL_3
+ var/cold_damage_types = list(BURN = 1)
+
+ var/hot_message = "your face burning and a searing heat"
+ var/heat_level_1_threshold = 360
+ var/heat_level_2_threshold = 400
+ var/heat_level_3_threshold = 1000
+ var/heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_1
+ var/heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_2
+ var/heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3
+ var/heat_damage_types = list(BURN = 1)
+
+
+/**
+ * LUNG ATMOS CODE, VENTURE FURTHER IF YOU DARE!!!
+ */
+
+/datum/organ/lungs/proc/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
+ if(H.status_flags & GODMODE)
+ return
+
+ if(HAS_TRAIT(H, TRAIT_NOBREATH))
+ return
+
+ if(!breath || (breath.total_moles() == 0))
+ if(isspaceturf(H.loc))
+ H.adjustOxyLoss(10)
+ else
+ H.adjustOxyLoss(5)
+
+ if(safe_oxygen_min)
+ H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ else if(safe_toxins_min)
+ H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
+ else if(safe_co2_min)
+ H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
+ else if(safe_nitro_min)
+ H.throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
+ return FALSE
+
+
+ if(H.health < HEALTH_THRESHOLD_CRIT)
+ return FALSE
+
+ var/gas_breathed = 0
+
+ //Partial pressures in our breath
+ var/O2_pp = breath.get_breath_partial_pressure(breath.oxygen)
+ var/N2_pp = breath.get_breath_partial_pressure(breath.nitrogen)
+ var/Toxins_pp = breath.get_breath_partial_pressure(breath.toxins)
+ var/CO2_pp = breath.get_breath_partial_pressure(breath.carbon_dioxide)
+ var/SA_pp = breath.get_breath_partial_pressure(breath.sleeping_agent)
+
+
+ //-- OXY --//
+
+ //Too much oxygen! //Yes, some species may not like it.
+ if(safe_oxygen_max)
+ if(O2_pp > safe_oxygen_max)
+ var/ratio = (breath.oxygen / safe_oxygen_max / safe_oxygen_max) * 10
+ H.apply_damage_type(clamp(ratio, oxy_breath_dam_min, oxy_breath_dam_max), oxy_damage_type)
+ H.throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy)
+ else
+ H.clear_alert("too_much_oxy")
+
+ //Too little oxygen!
+ if(safe_oxygen_min)
+ if(O2_pp < safe_oxygen_min)
+ gas_breathed = handle_too_little_breath(H, O2_pp, safe_oxygen_min, breath.oxygen)
+ H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ else
+ H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS)
+ gas_breathed = breath.oxygen
+ H.clear_alert("not_enough_oxy")
+
+ //Exhale
+ breath.oxygen -= gas_breathed
+ breath.carbon_dioxide += gas_breathed
+ gas_breathed = 0
+
+ //-- Nitrogen --//
+
+ //Too much nitrogen!
+ if(safe_nitro_max)
+ if(N2_pp > safe_nitro_max)
+ var/ratio = (breath.nitrogen / safe_nitro_max) * 10
+ H.apply_damage_type(clamp(ratio, nitro_breath_dam_min, nitro_breath_dam_max), nitro_damage_type)
+ H.throw_alert("too_much_nitro", /obj/screen/alert/too_much_nitro)
+ else
+ H.clear_alert("too_much_nitro")
+
+ //Too little nitrogen!
+ if(safe_nitro_min)
+ if(N2_pp < safe_nitro_min)
+ gas_breathed = handle_too_little_breath(H, N2_pp, safe_nitro_min, breath.nitrogen)
+ H.throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
+ else
+ H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS)
+ gas_breathed = breath.nitrogen
+ H.clear_alert("not_enough_nitro")
+
+ //Exhale
+ breath.nitrogen -= gas_breathed
+ breath.carbon_dioxide += gas_breathed
+ gas_breathed = 0
+
+ //-- CO2 --//
+
+ //CO2 does not affect failed_last_breath. So if there was enough oxygen in the air but too much co2, this will hurt you, but only once per 4 ticks, instead of once per tick.
+ if(safe_co2_max)
+ if(CO2_pp > safe_co2_max)
+ if(!H.co2overloadtime) // If it's the first breath with too much CO2 in it, lets start a counter, then have them pass out after 12s or so.
+ H.co2overloadtime = world.time
+ else if(world.time - H.co2overloadtime > 120)
+ H.Paralyse(6 SECONDS)
+ H.apply_damage_type(HUMAN_MAX_OXYLOSS, co2_damage_type) // Lets hurt em a little, let them know we mean business
+ if(world.time - H.co2overloadtime > 300) // They've been in here 30s now, lets start to kill them for their own good!
+ H.apply_damage_type(15, co2_damage_type)
+ H.throw_alert("too_much_co2", /obj/screen/alert/too_much_co2)
+ if(prob(20)) // Lets give them some chance to know somethings not right though I guess.
+ H.emote("cough")
+
+ else
+ H.co2overloadtime = 0
+ H.clear_alert("too_much_co2")
+
+ //Too little CO2!
+ if(safe_co2_min)
+ if(CO2_pp < safe_co2_min)
+ gas_breathed = handle_too_little_breath(H, CO2_pp, safe_co2_min, breath.carbon_dioxide)
+ H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
+ else
+ H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS)
+ gas_breathed = breath.carbon_dioxide
+ H.clear_alert("not_enough_co2")
+
+ //Exhale
+ breath.carbon_dioxide -= gas_breathed
+ breath.oxygen += gas_breathed
+ gas_breathed = 0
+
+
+ //-- TOX --//
+
+ //Too much toxins!
+ if(safe_toxins_max)
+ if(Toxins_pp > safe_toxins_max)
+ var/ratio = (breath.toxins / safe_toxins_max) * 10
+ H.apply_damage_type(clamp(ratio, tox_breath_dam_min, tox_breath_dam_max), tox_damage_type)
+ H.throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
+ else
+ H.clear_alert("too_much_tox")
+
+
+ //Too little toxins!
+ if(safe_toxins_min)
+ if(Toxins_pp < safe_toxins_min)
+ gas_breathed = handle_too_little_breath(H, Toxins_pp, safe_toxins_min, breath.toxins)
+ H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
+ else
+ H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS)
+ gas_breathed = breath.toxins
+ H.clear_alert("not_enough_tox")
+
+ //Exhale
+ breath.toxins -= gas_breathed
+ breath.carbon_dioxide += gas_breathed
+ gas_breathed = 0
+
+
+ //-- TRACES --//
+
+ if(breath.sleeping_agent) // If there's some other shit in the air lets deal with it here.
+ if(SA_pp > SA_para_min)
+ H.Paralyse(6 SECONDS) // 6 seconds gives them one second to wake up and run away a bit!
+ if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
+ H.AdjustSleeping(16 SECONDS, bound_lower = 0, bound_upper = 20 SECONDS)
+ else if(SA_pp > 0.01) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
+ if(prob(20))
+ H.emote(pick("giggle", "laugh"))
+
+ handle_breath_temperature(breath, H)
+
+ return TRUE
+
+
+/datum/organ/lungs/proc/handle_too_little_breath(mob/living/carbon/human/H = null, breath_pp = 0, safe_breath_min = 0, true_pp = 0)
+ . = 0
+ if(!H || !safe_breath_min) //the other args are either: Ok being 0 or Specifically handled.
+ return FALSE
+
+ if(prob(20))
+ H.emote("gasp")
+ if(breath_pp > 0)
+ var/ratio = safe_breath_min/breath_pp
+ H.adjustOxyLoss(min(5*ratio, HUMAN_MAX_OXYLOSS)) // Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!
+ . = true_pp*ratio/6
+ else
+ H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
+
+
+/datum/organ/lungs/proc/handle_breath_temperature(datum/gas_mixture/breath, mob/living/carbon/human/H) // called by human/life, handles temperatures
+ var/breath_temperature = breath.temperature
+
+ if(!HAS_TRAIT(H, TRAIT_RESISTCOLD)) // COLD DAMAGE
+ var/CM = abs(H.dna.species.coldmod)
+ var/TC = 0
+ if(breath_temperature < cold_level_3_threshold)
+ TC = cold_level_3_damage
+ if(breath_temperature > cold_level_3_threshold && breath_temperature < cold_level_2_threshold)
+ TC = cold_level_2_damage
+ if(breath_temperature > cold_level_2_threshold && breath_temperature < cold_level_1_threshold)
+ TC = cold_level_1_damage
+ if(TC)
+ for(var/D in cold_damage_types)
+ H.apply_damage_type(TC * CM * cold_damage_types[D], D)
+ if(breath_temperature < cold_level_1_threshold)
+ if(prob(20))
+ to_chat(H, "You feel [cold_message] in your [linked_organ.name]!")
+
+ if(!HAS_TRAIT(H, TRAIT_RESISTHEAT)) // HEAT DAMAGE
+ var/HM = abs(H.dna.species.heatmod)
+ var/TH = 0
+ if(breath_temperature > heat_level_1_threshold && breath_temperature < heat_level_2_threshold)
+ TH = heat_level_1_damage
+ if(breath_temperature > heat_level_2_threshold && breath_temperature < heat_level_3_threshold)
+ TH = heat_level_2_damage
+ if(breath_temperature > heat_level_3_threshold)
+ TH = heat_level_3_damage
+ if(TH)
+ for(var/D in heat_damage_types)
+ H.apply_damage_type(TH * HM * heat_damage_types[D], D)
+ if(breath_temperature > heat_level_1_threshold)
+ if(prob(20))
+ to_chat(H, "You feel [hot_message] in your [linked_organ.name]!")
+
+
+/**
+ * Lung atmos code ends here. Thank god...
+ */
+
+/datum/organ/lungs/on_successful_emp()
+ linked_organ.owner?.LoseBreath(40 SECONDS)
+
+/datum/organ/lungs/on_insert(mob/living/carbon/given_to)
+ clear_alerts(given_to)
+
+/datum/organ/lungs/on_replace(mob/living/carbon/human/organ_owner)
+ clear_alerts(organ_owner)
+
+/datum/organ/lungs/on_remove(mob/living/carbon/removed_from, special = FALSE)
+ clear_alerts(removed_from)
+
+/datum/organ/lungs/proc/clear_alerts(mob/living/carbon/alert_owner)
+ for(var/thing in list("oxy", "tox", "co2", "nitro"))
+ alert_owner.clear_alert("not_enough_[thing]")
+ alert_owner.clear_alert("too_much_[thing]")
+
+/datum/organ/lungs/on_life()
+ if(linked_organ.germ_level > INFECTION_LEVEL_ONE)
+ if(prob(5))
+ linked_organ.owner.emote("cough") //respitory tract infection
+
+ if(linked_organ.is_bruised())
+ if(prob(2) && !(NO_BLOOD in linked_organ.owner.dna.species.species_traits))
+ linked_organ.owner.custom_emote(EMOTE_VISIBLE, "coughs up blood!")
+ linked_organ.owner.bleed(1)
+ if(prob(4))
+ linked_organ.owner.custom_emote(EMOTE_VISIBLE, "gasps for air!")
+ linked_organ.owner.AdjustLoseBreath(10 SECONDS)
+
+
+/datum/organ/lungs/on_prepare_eat(obj/item/food/snacks/organ/snorgan)
+ snorgan.reagents.add_reagent("salbutamol", 5)
+
+
+/datum/organ/lungs/vox
+ safe_oxygen_min = 0 //We don't breathe this
+ safe_oxygen_max = 0.05 //This is toxic to us
+ safe_nitro_min = 16 //We breathe THIS!
+ oxy_damage_type = TOX //And it poisons us
+
+/datum/organ/lungs/plasmamen
+ safe_oxygen_min = 0 //We don't breath this
+ safe_toxins_min = 16 //We breathe THIS!
+ safe_toxins_max = 0
+
+/datum/organ/lungs/drask
+ cold_message = "an invigorating coldness"
+ cold_level_3_threshold = 60
+ cold_level_1_damage = -COLD_GAS_DAMAGE_LEVEL_1 //They heal when the air is cold
+ cold_level_2_damage = -COLD_GAS_DAMAGE_LEVEL_2
+ cold_level_3_damage = -COLD_GAS_DAMAGE_LEVEL_3
+ cold_damage_types = list(BRUTE = 0.5, BURN = 0.25)
+
+/datum/organ/lungs/ashwalker
+ safe_oxygen_min = 4 // 4x as efficient as regular Unathi, can comfortably breathe on lavaland
+
+/datum/organ/lungs/advanced_cyber/New(obj/item/organ/internal/link_em)
+ . = ..()
+ make_advanced()
+
+/datum/organ/lungs/proc/make_advanced()
+ safe_toxins_max = 20
+ safe_co2_max = 20
+
+ cold_level_1_threshold = 200
+ cold_level_2_threshold = 140
+ cold_level_3_threshold = 100
diff --git a/code/modules/surgery/organs/organ_datums/organ_datum.dm b/code/modules/surgery/organs/organ_datums/organ_datum.dm
new file mode 100644
index 000000000000..7872b984af11
--- /dev/null
+++ b/code/modules/surgery/organs/organ_datums/organ_datum.dm
@@ -0,0 +1,36 @@
+/datum/organ
+ var/organ_tag // heart, brain, lungs, etc
+ var/obj/item/organ/internal/linked_organ
+
+/datum/organ/New(obj/item/organ/internal/link_em)
+ ..()
+ linked_organ = link_em
+
+/datum/organ/Destroy(force, ...)
+ linked_organ = null
+ return ..()
+
+/// Called when the linked organ is inserted.
+/datum/organ/proc/on_insert(mob/living/carbon/human/given_to)
+ return
+
+/// Called when another organ is removed, and this organ datum takes its place in the organ_owner.
+/datum/organ/proc/on_replace(mob/living/carbon/human/organ_owner)
+ return
+
+/// Called when the linked organ is removed.
+/datum/organ/proc/on_remove(mob/living/carbon/removed_from, special = FALSE)
+ return
+
+/datum/organ/proc/on_life()
+ return
+
+/// Only called when the organ is robotic AND is not emp proof. Return true to override default functions
+/datum/organ/proc/on_successful_emp()
+ return FALSE
+
+/datum/organ/proc/on_necrotize()
+ return FALSE
+
+/datum/organ/proc/on_prepare_eat(obj/item/food/snacks/organ/snorgan)
+ return FALSE
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 682dd5469202..4468194ed880 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -220,7 +220,9 @@
****************************************************/
/obj/item/organ/external/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE, updating_health = TRUE)
- var/max_limb_damage = max_damage - (HAS_TRAIT(owner, TRAIT_IPC_JOINTS_MAG) ? max_damage * 0.25 : 0)
+ var/max_limb_damage = max_damage
+ if(owner)
+ max_limb_damage -= (HAS_TRAIT(owner, TRAIT_IPC_JOINTS_MAG) ? max_damage * 0.25 : 0)
if(tough && !ignore_resists)
brute = max(0, brute - 5)
burn = max(0, burn - 4)
@@ -321,6 +323,8 @@
if(owner_old)
owner_old.updatehealth("limb receive damage")
+ brute_dam = round_health(brute_dam)
+ burn_dam = round_health(burn_dam)
return update_state()
#undef LIMB_SHARP_THRESH_INT_DMG
@@ -341,6 +345,8 @@
if(updating_health)
owner.updatehealth("limb heal damage")
+ brute_dam = round_health(brute_dam)
+ burn_dam = round_health(burn_dam)
return update_state()
/obj/item/organ/external/emp_act(severity)
@@ -357,11 +363,11 @@
else if(emp_resistant) // IPC limbs
switch(severity)
if(1)
- // 5.28 (9 * 0.66 burn_mod) burn damage, 65.34 damage with 11 limbs.
- receive_damage(0, 9)
+ // 5.9 burn damage, 64.9 damage with 11 limbs.
+ receive_damage(0, 5.9)
if(2)
- // 3.63 (5 * 0.66 burn_mod) burn damage, 39.93 damage with 11 limbs.
- receive_damage(0, 5.5)
+ // 3.63 burn damage, 39.93 damage with 11 limbs.
+ receive_damage(0, 3.63)
else // Basic prosthetic limbs
switch(severity)
if(1)
@@ -650,8 +656,6 @@ Note that amputating the affected organ does in fact remove the infection from t
if(disembowel("groin"))
return TRUE
-
-
/obj/item/organ/external/attackby(obj/item/I, mob/user, params)
if(I.sharp)
add_fingerprint(user)
diff --git a/code/modules/surgery/organs/organ_helpers.dm b/code/modules/surgery/organs/organ_helpers.dm
index a7fec193dcdc..13c68ed9c4e7 100644
--- a/code/modules/surgery/organs/organ_helpers.dm
+++ b/code/modules/surgery/organs/organ_helpers.dm
@@ -16,6 +16,10 @@
/mob/living/carbon/get_int_organ(typepath)
return (locate(typepath) in internal_organs)
+/mob/living/carbon/proc/get_int_organ_datum(tag_to_check)
+ RETURN_TYPE(/datum/organ)
+ return internal_organ_datums[tag_to_check]
+
/mob/living/carbon/get_organs_zone(zone, subzones = 0)
var/list/returnorg = list()
@@ -103,4 +107,9 @@
.++
if(affecting.body_part == LEG_LEFT)
.++
-
+///Returns true if all the mob's vital organs are functional, otherwise returns false
+/mob/living/carbon/human/proc/check_vital_organs()
+ for(var/obj/item/organ/internal/organ in internal_organs)
+ if(organ.vital && (organ.damage >= organ.max_damage))
+ return FALSE
+ return TRUE
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 3cb1233bfeae..2087f6208e45 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -7,12 +7,33 @@
// DO NOT add slots with matching names to different zones - it will break internal_organs_slot list!
var/non_primary = 0
var/unremovable = FALSE //Whether it shows up as an option to remove during surgery.
+ /// An associated list of organ datums that this organ has.
+ var/list/datum/organ/organ_datums
/obj/item/organ/internal/New(mob/living/carbon/holder)
..()
if(istype(holder))
insert(holder)
+/obj/item/organ/internal/Initialize(mapload)
+ . = ..()
+ if(!organ_datums)
+ return
+ var/list/temp_list = organ_datums.Copy()
+ organ_datums = list()
+ for(var/path in temp_list)
+ var/datum/organ/organ_datum = new path(src)
+ if(!organ_datum.organ_tag)
+ stack_trace("There was an organ datum [organ_datum] ([organ_datum.type]), that had no organ tag.")
+ continue
+ organ_datums[organ_datum.organ_tag] = organ_datum
+
+/obj/item/organ/internal/Destroy()
+ if(owner) // we have to remove BEFORE organ_datums are qdel'd, or we can just live even if our heart organ got deleted
+ remove(owner, TRUE)
+ QDEL_LIST_ASSOC_VAL(organ_datums) // The removal from internal_organ_datums should be handled when the organ is removed
+ . = ..()
+
/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0, dont_remove_slot = 0)
if(!iscarbon(M) || owner == M)
return
@@ -28,6 +49,12 @@
M.internal_organs |= src
M.internal_organs_slot[slot] = src
+
+ for(var/organ_tag in organ_datums)
+ var/datum/organ/new_organ = organ_datums[organ_tag]
+ M.internal_organ_datums[new_organ.organ_tag] = new_organ
+ new_organ.on_insert(M)
+
var/obj/item/organ/external/parent
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -56,6 +83,23 @@
M.internal_organs -= src
if(M.internal_organs_slot[slot] == src)
M.internal_organs_slot.Remove(slot)
+
+
+ for(var/removal_tag in organ_datums)
+ if(M.internal_organ_datums[removal_tag] == organ_datums[removal_tag])
+ M.internal_organ_datums -= removal_tag
+ var/datum/organ/removed = organ_datums[removal_tag]
+ removed.on_remove(M)
+
+ // Lets see if we have any backup organ datums from other internal organs.
+ for(var/obj/item/organ/internal/backup_organ in M.internal_organs)
+ for(var/replacement_tag in backup_organ.organ_datums)
+ if(M.internal_organ_datums[replacement_tag]) // some other organ is already covering it
+ continue
+ var/datum/organ/replacement_organ = backup_organ.organ_datums[replacement_tag]
+ M.internal_organ_datums[replacement_organ.organ_tag] = replacement_organ
+ replacement_organ.on_replace(M)
+
if(vital && !special)
if(M.stat != DEAD)//safety check!
M.death()
@@ -90,6 +134,12 @@
/obj/item/organ/internal/replaced(mob/living/carbon/human/target)
insert(target)
+/obj/item/organ/internal/necrotize(update_sprite)
+ for(var/organ_tag in organ_datums) // let the organ datums handle first
+ var/datum/organ/dead_organ = organ_datums[organ_tag]
+ dead_organ.on_necrotize()
+ return ..()
+
/obj/item/organ/internal/item_action_slot_check(slot, mob/user)
return
@@ -106,7 +156,7 @@
/obj/item/organ/internal/proc/prepare_eat()
if(is_robotic())
return //no eating cybernetic implants!
- var/obj/item/reagent_containers/food/snacks/organ/S = new
+ var/obj/item/food/snacks/organ/S = new
S.name = name
S.desc = desc
S.icon = icon
@@ -114,6 +164,10 @@
S.origin_tech = origin_tech
S.w_class = w_class
+ for(var/organ_tag in organ_datums)
+ var/datum/organ/delicious = organ_datums[organ_tag]
+ delicious.on_prepare_eat(S)
+
return S
/obj/item/organ/internal/attempt_become_organ(obj/item/organ/external/parent,mob/living/carbon/human/H)
@@ -126,19 +180,19 @@
/obj/item/organ/internal/proc/render()
return
-/obj/item/reagent_containers/food/snacks/organ
+/obj/item/food/snacks/organ
name = "appendix"
icon_state = "appendix"
icon = 'icons/obj/surgery.dmi'
-/obj/item/reagent_containers/food/snacks/organ/Initialize(mapload)
+/obj/item/food/snacks/organ/Initialize(mapload)
. = ..()
reagents.add_reagent("nutriment", 5)
/obj/item/organ/internal/attack(mob/living/carbon/M, mob/user)
if(M == user && ishuman(user))
var/mob/living/carbon/human/H = user
- var/obj/item/reagent_containers/food/snacks/S = prepare_eat()
+ var/obj/item/food/snacks/S = prepare_eat()
if(S)
H.drop_item()
H.put_in_active_hand(S)
@@ -160,7 +214,7 @@
if(slot == "heart" && ("[slot]-c-on" in states) && ("[slot]-c-off" in states)) //Give the robotic heart its robotic heart icons if they exist.
var/obj/item/organ/internal/heart/H = src
H.icon = icon('icons/obj/surgery.dmi')
- H.icon_base = "[slot]-c"
+ H.base_icon_state = "[slot]-c"
H.dead_icon = "[slot]-c-off"
H.update_icon()
else if("[slot]-c" in states) //Give the robotic organ its robotic organ icons if they exist.
@@ -318,6 +372,17 @@
/obj/item/organ/internal/emp_act(severity)
if(!is_robotic() || emp_proof)
return
+
+ var/we_done = FALSE
+ for(var/organ_tag in organ_datums)
+ var/datum/organ/borgan = organ_datums[organ_tag]
+ if(borgan.on_successful_emp())
+ we_done = TRUE
+
+ if(we_done)
+ return
+
+ // No EMP handling was done, lets just give em damage
switch(severity)
if(1)
receive_damage(20, 1)
diff --git a/code/modules/surgery/organs/robolimbs.dm b/code/modules/surgery/organs/robolimbs.dm
index 8f53727e6971..d8037ad8066d 100644
--- a/code/modules/surgery/organs/robolimbs.dm
+++ b/code/modules/surgery/organs/robolimbs.dm
@@ -123,7 +123,7 @@ GLOBAL_DATUM(basic_robolimb, /datum/robolimb)
/datum/robolimb/shellguard
company = "Shellguard Munitions Standard Series"
- desc = "This limb features exposed robust steel and paint to match Shellguards motifs"
+ desc = "This limb features exposed robust steel and paint to match Shellguards motifs."
icon = 'icons/mob/human_races/cyberlimbs/shellguard/shellguard_main.dmi'
has_subtypes = 1
diff --git a/code/modules/surgery/organs/skeleton_organs.dm b/code/modules/surgery/organs/skeleton_organs.dm
index 7ccbb2c69f26..b1a6329b013f 100644
--- a/code/modules/surgery/organs/skeleton_organs.dm
+++ b/code/modules/surgery/organs/skeleton_organs.dm
@@ -36,15 +36,15 @@
/obj/item/skeleton/r_leg
name = "skeleton right leg"
- desc = "a skeleton right leg"
+ desc = "a skeleton right leg."
icon_state = "r_leg"
/obj/item/skeleton/l_foot
name = "skeleton left foot"
- desc = "a skeleton left foot"
+ desc = "a skeleton left foot."
icon_state = "l_foot"
/obj/item/skeleton/l_leg
name = "skeleton left leg"
- desc = "a skeleton left leg"
+ desc = "a skeleton left leg."
icon_state = "l_leg"
diff --git a/code/modules/surgery/organs/subtypes/drask_organs.dm b/code/modules/surgery/organs/subtypes/drask_organs.dm
index 201c05b83e30..4d94b9e84d83 100644
--- a/code/modules/surgery/organs/subtypes/drask_organs.dm
+++ b/code/modules/surgery/organs/subtypes/drask_organs.dm
@@ -25,5 +25,5 @@
/obj/item/organ/internal/eyes/drask
name = "drask eyeballs"
icon = 'icons/obj/species_organs/drask.dmi'
- desc = "Drask eyes. They look even stranger disembodied"
+ desc = "Drask eyes. They look even stranger disembodied."
see_in_dark = 5
diff --git a/code/modules/surgery/organs/subtypes/grey_organs.dm b/code/modules/surgery/organs/subtypes/grey_organs.dm
index 3dfe9f77c688..132a79faae0c 100644
--- a/code/modules/surgery/organs/subtypes/grey_organs.dm
+++ b/code/modules/surgery/organs/subtypes/grey_organs.dm
@@ -1,11 +1,11 @@
/obj/item/organ/internal/liver/grey
name = "grey liver"
- desc = "A small, odd looking liver"
+ desc = "A small, odd looking liver."
icon = 'icons/obj/species_organs/grey.dmi'
alcohol_intensity = 1.6
/obj/item/organ/internal/brain/grey
- desc = "A large brain"
+ desc = "A large brain."
icon = 'icons/obj/species_organs/grey.dmi'
icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/grey.dmi'
@@ -21,7 +21,7 @@
/obj/item/organ/internal/eyes/grey
name = "grey eyeballs"
- desc = "They still look creepy and emotionless"
+ desc = "They still look creepy and emotionless."
icon = 'icons/obj/species_organs/grey.dmi'
see_in_dark = 5
diff --git a/code/modules/surgery/organs/subtypes/skrell_organs.dm b/code/modules/surgery/organs/subtypes/skrell_organs.dm
index 09dd526c9b56..de58d05a866f 100644
--- a/code/modules/surgery/organs/subtypes/skrell_organs.dm
+++ b/code/modules/surgery/organs/subtypes/skrell_organs.dm
@@ -87,7 +87,7 @@
/obj/item/organ/internal/heart/skrell
name = "skrell heart"
- desc = "A stream lined heart"
+ desc = "A stream lined heart."
icon = 'icons/obj/species_organs/skrell.dmi'
/obj/item/organ/internal/brain/skrell
diff --git a/code/modules/surgery/organs/subtypes/slime_organs.dm b/code/modules/surgery/organs/subtypes/slime_organs.dm
deleted file mode 100644
index d5f1cb8aef50..000000000000
--- a/code/modules/surgery/organs/subtypes/slime_organs.dm
+++ /dev/null
@@ -1,15 +0,0 @@
-/obj/item/organ/internal/heart/slime
- icon = 'icons/obj/species_organs/slime.dmi'
- name = "slime heart"
- icon_state = "heart"
- desc = "This is a slime's osmotic pressure regulator, it appears to be some kind of biological pump that uses osmotic pressure to regulate water flow. It seems to work similar to a heart."
- dead_icon = null
-
-/obj/item/organ/internal/heart/slime/update_icon_state()
- return
-
-/obj/item/organ/internal/lungs/slime
- icon = 'icons/obj/species_organs/slime.dmi'
- name = "slime lungs"
- icon_state = "lungs"
- desc = "This is a slime's gas exchange membrane, this membrane used for oxygen intake and gas exchange. These seem to work similar to lungs."
diff --git a/code/modules/surgery/organs/subtypes/standard_organs.dm b/code/modules/surgery/organs/subtypes/standard_organs.dm
index 15cf687de62d..7e7d8d2bfe98 100644
--- a/code/modules/surgery/organs/subtypes/standard_organs.dm
+++ b/code/modules/surgery/organs/subtypes/standard_organs.dm
@@ -23,9 +23,9 @@
return
switch(severity)
if(1)
- owner?.adjustStaminaLoss(20)
+ owner?.apply_damage(20, STAMINA)
if(2)
- owner?.adjustStaminaLoss(10)
+ owner?.apply_damage(10, STAMINA)
to_chat(owner, "Your [name] malfunctions, causing fatigue!")
/obj/item/organ/external/groin
@@ -264,6 +264,8 @@
if(!istype(dna))
dna = owner.dna.Clone()
name = "[dna.real_name]'s head"
+ if(is_species(owner, /datum/species/monkey))
+ name = "[owner.name]'s head"
if(owner.glasses)
owner.unEquip(owner.glasses, force = TRUE)
if(owner.head)
diff --git a/code/modules/surgery/organs/subtypes/unathi_organs.dm b/code/modules/surgery/organs/subtypes/unathi_organs.dm
index f31935f49946..c0887844d784 100644
--- a/code/modules/surgery/organs/subtypes/unathi_organs.dm
+++ b/code/modules/surgery/organs/subtypes/unathi_organs.dm
@@ -1,7 +1,7 @@
/obj/item/organ/internal/liver/unathi
name = "unathi liver"
icon = 'icons/obj/species_organs/unathi.dmi'
- desc = "A large looking liver"
+ desc = "A large looking liver."
alcohol_intensity = 0.8
/obj/item/organ/internal/eyes/unathi
@@ -11,7 +11,7 @@
/obj/item/organ/internal/heart/unathi
name = "unathi heart"
- desc = "A large looking heart"
+ desc = "A large looking heart."
icon = 'icons/obj/species_organs/unathi.dmi'
/obj/item/organ/internal/brain/unathi
@@ -30,4 +30,4 @@
icon = 'icons/obj/species_organs/unathi.dmi'
/obj/item/organ/internal/lungs/unathi/ash_walker
- safe_oxygen_min = 4 // 4x as efficient as regular Unathi, can comfortably breathe on lavaland
+ organ_datums = list(/datum/organ/lungs/ashwalker)
diff --git a/code/modules/surgery/organs/subtypes/xenos.dm b/code/modules/surgery/organs/subtypes/xenos.dm
index d69ef938b7eb..98960fdd4b55 100644
--- a/code/modules/surgery/organs/subtypes/xenos.dm
+++ b/code/modules/surgery/organs/subtypes/xenos.dm
@@ -2,20 +2,51 @@
origin_tech = "biotech=5"
icon_state = "xgibmid2"
var/list/alien_powers = list()
+ var/list/human_powers = list()
tough = TRUE
sterile = TRUE
+ /// Amount of credits that will be received by selling this in the cargo shuttle
+ var/cargo_profit = 250
+ /// Has this organ been hijacked? Can hijack via a hemostat
+ var/hijacked = FALSE
/// This adds and removes alien spells upon addition, if a noncarbon tries to do this well... I blame adminbus
/obj/item/organ/internal/alien/insert(mob/living/carbon/M, special = 0)
..()
- for(var/powers_to_add in alien_powers)
- M.AddSpell(new powers_to_add)
+ if(!hijacked)
+ for(var/powers_to_add in alien_powers)
+ M.AddSpell(new powers_to_add)
+ else
+ for(var/powers_to_add in human_powers)
+ M.AddSpell(new powers_to_add)
/obj/item/organ/internal/alien/remove(mob/living/carbon/M, special = 0)
- for(var/powers_to_remove in alien_powers)
- M.RemoveSpell(new powers_to_remove)
+ if(!hijacked)
+ for(var/powers_to_remove in alien_powers)
+ M.RemoveSpell(new powers_to_remove)
+ else
+ for(var/powers_to_add in human_powers)
+ M.AddSpell(new powers_to_add)
. = ..()
+/obj/item/organ/internal/alien/examine(mob/user)
+ . = ..()
+ . += "Can be sold on the cargo shuttle for [cargo_profit] credits."
+ if(hijacked)
+ . += "This organ is hijacked, use a Hemostat on it to revert it to it's original function."
+ else
+ . += "You can hijack the latent functions of this organ by using a Hemostat on it."
+
+/obj/item/organ/internal/alien/attackby(obj/item/hemostat/item, mob/user, params)
+ if(istype(item))
+ if(!hijacked)
+ to_chat(user, "You slice off the control node of this organ. This organ will now be effective against aliens.")
+ else
+ to_chat(user, "You reattach the control node of this organ. This organ will now be effective against those who attack the hive.")
+ hijacked = !hijacked
+ return
+ return ..()
+
/obj/item/organ/internal/alien/prepare_eat()
var/obj/S = ..()
S.reagents.add_reagent("sacid", 10)
@@ -28,18 +59,18 @@
icon_state = "plasma"
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "biotech=5;plasmatech=4"
- parent_organ = "chest"
slot = "plasmavessel"
- alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/plant_weeds, /obj/effect/proc_holder/spell/touch/alien_spell/transfer_plasma)
+ alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/plant_weeds, /obj/effect/proc_holder/spell/alien_spell/transfer_plasma)
+ human_powers = list(/obj/effect/proc_holder/spell/alien_spell/syphon_plasma)
- var/stored_plasma = 0
- var/max_plasma = 500
+ var/stored_plasma = 100
+ var/max_plasma = 300
var/heal_rate = 5
var/plasma_rate = 10
/obj/item/organ/internal/alien/plasmavessel/prepare_eat()
var/obj/S = ..()
- S.reagents.add_reagent("plasma", stored_plasma/10)
+ S.reagents.add_reagent("plasma", stored_plasma / 10)
return S
/obj/item/organ/internal/alien/plasmavessel/queen
@@ -47,14 +78,12 @@
icon_state = "plasma_large"
origin_tech = "biotech=6;plasmatech=4"
stored_plasma = 200
- max_plasma = 500
plasma_rate = 25
/obj/item/organ/internal/alien/plasmavessel/drone
name = "large xeno plasma vessel"
icon_state = "plasma_large"
stored_plasma = 200
- max_plasma = 500
/obj/item/organ/internal/alien/plasmavessel/sentinel
stored_plasma = 100
@@ -63,16 +92,15 @@
/obj/item/organ/internal/alien/plasmavessel/hunter
name = "small xeno plasma vessel"
icon_state = "plasma_tiny"
- stored_plasma = 100
- max_plasma = 150
- alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/plant_weeds)
+ stored_plasma = 50
+ max_plasma = 100
/obj/item/organ/internal/alien/plasmavessel/larva
name = "tiny xeno plasma vessel"
icon_state = "plasma_tiny"
- max_plasma = 100
- alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/plant_weeds)
-
+ stored_plasma = 25
+ max_plasma = 50
+ cargo_profit = 150
/obj/item/organ/internal/alien/plasmavessel/on_life()
//If there are alien weeds on the ground then heal if needed or give some plasma
@@ -83,7 +111,7 @@
var/heal_amt = heal_rate
if(!isalien(owner))
heal_amt *= 0.2
- owner.add_plasma((plasma_rate*0.5))
+ owner.add_plasma((plasma_rate / 2))
owner.adjustBruteLoss(-heal_amt)
owner.adjustFireLoss(-heal_amt)
owner.adjustOxyLoss(-heal_amt)
@@ -97,20 +125,17 @@
. =..()
M.update_plasma_display(M)
-
/obj/item/organ/internal/alien/acidgland
name = "xeno acid gland"
icon_state = "acid"
- parent_organ = "head"
slot = "acid"
origin_tech = "biotech=5;materials=2;combat=2"
alien_powers = list(/obj/effect/proc_holder/spell/touch/alien_spell/corrosive_acid)
-
+ human_powers = list(/obj/effect/proc_holder/spell/touch/alien_spell/burning_touch)
/obj/item/organ/internal/alien/hivenode
name = "xeno hive node"
icon_state = "hivenode"
- parent_organ = "head"
slot = "hivenode"
origin_tech = "biotech=5;magnets=4;bluespace=3"
w_class = WEIGHT_CLASS_TINY
@@ -133,24 +158,25 @@
/obj/item/organ/internal/alien/neurotoxin
name = "xeno neurotoxin gland"
icon_state = "neurotox"
- parent_organ = "head"
slot = "neurotox"
origin_tech = "biotech=5;combat=5"
alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/neurotoxin)
+ human_powers = list(/obj/effect/proc_holder/spell/alien_spell/neurotoxin/death_to_xenos)
/obj/item/organ/internal/alien/resinspinner
- name = "xeno resin organ"//...there tiger....
- parent_organ = "mouth"
+ name = "xeno resin organ"
icon_state = "liver-x"
slot = "spinner"
origin_tech = "biotech=5;materials=4"
alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/build_resin)
+ human_powers = list(/obj/effect/proc_holder/spell/touch/alien_spell/consume_resin)
/obj/item/organ/internal/alien/eggsac
name = "xeno egg sac"
icon_state = "eggsac"
- parent_organ = "groin"
slot = "eggsac"
w_class = WEIGHT_CLASS_BULKY
origin_tech = "biotech=6"
alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/plant_weeds/eggs)
+ human_powers = list(/obj/effect/proc_holder/spell/alien_spell/combust_facehuggers)
+ cargo_profit = 1000
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index a809ec7ed82b..f07d89797b99 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -67,7 +67,7 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
/datum/action/item_action/organ_action/use/adamantine_vocal_cords/Trigger(left_click)
if(!IsAvailable())
return
- var/message = input(owner, "Resonate a message to all nearby golems.", "Resonate")
+ var/message = tgui_input_text(owner, "Resonate a message to all nearby golems.", "Resonate")
if(QDELETED(src) || QDELETED(owner) || !message)
return
owner.say(".~[message]")
@@ -123,7 +123,7 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
if(world.time < cords.next_command)
to_chat(owner, "You must wait [(cords.next_command - world.time)/10] seconds before Speaking again.")
return
- var/command = input(owner, "Speak with the Voice of God", "Command")
+ var/command = tgui_input_text(owner, "Speak with the Voice of God", "Command")
if(!command)
return
owner.say(".~[command]")
@@ -491,7 +491,7 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
log_game("[key_name(owner)] has said '[log_message]' with a Voice of God, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
/obj/item/organ/internal/vocal_cords/colossus/wizard
- desc = "They carry the voice of an ancient god. This one is enchanted to implant it into yourself when used in hand"
+ desc = "They carry the voice of an ancient god. This one is enchanted to implant it into yourself when used in hand."
/obj/item/organ/internal/vocal_cords/colossus/wizard/attack_self(mob/living/user)
user.drop_item()
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index a0e8fc686dc8..f2055557441d 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -377,11 +377,11 @@
name = "implant an organ"
allowed_tools = list(
/obj/item/organ/internal = 100,
- /obj/item/reagent_containers/food/snacks/organ = 0 // there for the flavor text
+ /obj/item/food/snacks/organ = 0 // there for the flavor text
)
/datum/surgery_step/internal/manipulate_organs/implant/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(istype(tool, /obj/item/reagent_containers/food/snacks/organ))
+ if(istype(tool, /obj/item/food/snacks/organ))
to_chat(user, "[tool] was bitten by someone! It's too damaged to use!")
return SURGERY_BEGINSTEP_SKIP
@@ -469,8 +469,8 @@
/obj/item/reagent_containers/dropper = 100,
/obj/item/reagent_containers/syringe = 100,
/obj/item/reagent_containers/glass/bottle = 90,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 85,
- /obj/item/reagent_containers/food/drinks/bottle = 80,
+ /obj/item/reagent_containers/drinks/drinkingglass = 85,
+ /obj/item/reagent_containers/drinks/bottle = 80,
/obj/item/reagent_containers/glass/beaker = 75,
/obj/item/reagent_containers/spray = 60,
/obj/item/reagent_containers/glass/bucket = 50
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index e3fdcf4667e3..ecf8f7d3424c 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -220,8 +220,8 @@
allowed_tools = list(
/obj/item/reagent_containers/dropper = 100,
/obj/item/reagent_containers/glass/bottle = 90,
- /obj/item/reagent_containers/food/drinks/drinkingglass = 85,
- /obj/item/reagent_containers/food/drinks/bottle = 80,
+ /obj/item/reagent_containers/drinks/drinkingglass = 85,
+ /obj/item/reagent_containers/drinks/bottle = 80,
/obj/item/reagent_containers/glass/beaker = 75,
/obj/item/reagent_containers/spray = 60,
/obj/item/reagent_containers/glass/bucket = 50
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index f1eb83d8f2ac..17971bb633e3 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -693,7 +693,7 @@
/datum/surgery_step/robotics/edit_serial/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
- var/new_name = copytext(reject_bad_text(input(user, "Choose a name for this machine.", "Set Name", "[target.real_name]") as null|text), 1, MAX_NAME_LEN)
+ var/new_name = reject_bad_text(tgui_input_text(user, "Choose a name for this machine.", "Set Name", "[target.real_name]", MAX_NAME_LEN, 1))
if(!new_name)
to_chat(user, "Invalid name! Please try again.")
return SURGERY_STEP_INCOMPLETE
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index b17b20d3e215..ccdebf321031 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -62,7 +62,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
addtimer(CALLBACK(src, PROC_REF(reboot)), EMP_DISABLE_TIME)
/obj/item/gps/AltClick(mob/user)
- if(ui_status(user, GLOB.inventory_state) != STATUS_INTERACTIVE)
+ if(ui_status(user, GLOB.inventory_state) != UI_INTERACTIVE)
return //user not valid to use gps
if(emped)
to_chat(user, "It's busted!")
@@ -120,10 +120,13 @@ GLOBAL_LIST_EMPTY(GPS_list)
/obj/item/gps/attack_self(mob/user)
ui_interact(user)
-/obj/item/gps/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/gps/ui_state(mob/user)
+ return GLOB.inventory_state
+
+/obj/item/gps/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "GPS", "GPS", 450, 700)
+ ui = new(user, src, "GPS", "GPS")
ui.open()
/obj/item/gps/ui_act(action, list/params)
diff --git a/code/modules/telesci/rcs.dm b/code/modules/telesci/rcs.dm
index 25825bb8d013..bf2b0c9e7bd7 100644
--- a/code/modules/telesci/rcs.dm
+++ b/code/modules/telesci/rcs.dm
@@ -102,7 +102,7 @@
emagged = TRUE
do_sparks(3, TRUE, src)
to_chat(user, "Warning: Safeties disabled.")
- return
+ return TRUE
/obj/item/rcs/proc/try_send_container(mob/user, obj/structure/closet/C)
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index a312399914ae..bf70e0ee7635 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -76,6 +76,7 @@
if(!emagged)
to_chat(user, "You scramble the Telescience authentication key to an unknown signal. You should be able to teleport to more places now!")
emagged = TRUE
+ return TRUE
else
to_chat(user, "The machine seems unaffected by the card swipe...")
diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm
index 94fec60a4eb5..a1c03c154a43 100644
--- a/code/modules/tgui/external.dm
+++ b/code/modules/tgui/external.dm
@@ -1,7 +1,8 @@
/**
- * tgui external
+ * External tgui definitions, such as src_object APIs.
*
- * Contains all external tgui declarations.
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
*/
/**
@@ -10,14 +11,10 @@
* Used to open and update UIs.
* If this proc is not implemented properly, the UI will not update correctly.
*
- * * mob/user - The mob who opened/is using the UI. (REQUIRED)
- * * ui_key - The ui_key of the UI. (OPTIONAL)
- * * datum/tgui/ui - The UI to be updated, if it exists. (OPTIONAL)
- * * force_open - If the UI should be re-opened instead of updated. (OPTIONAL)
- * * datum/tgui/master_ui - The parent UI. (OPTIONAL)
- * * datum/ui_state/state - The state used to determine status. (OPTIONAL)
+ * required user mob The mob who opened/is using the UI.
+ * optional ui datum/tgui The UI to be updated, if it exists.
*/
-/datum/proc/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/datum/proc/ui_interact(mob/user, datum/tgui/ui)
return FALSE // Not implemented.
/**
@@ -26,10 +23,11 @@
* Data to be sent to the UI.
* This must be implemented for a UI to work.
*
- * * mob/user - The mob interacting with the UI.
+ * required user mob The mob interacting with the UI.
+ *
+ * return list Data to be sent to the UI.
*/
/datum/proc/ui_data(mob/user)
- // Two good reasons why it shouldn't:
// 1) this is polled several times a second, so sleeping means more running threads, needlessly tanking performance
// 2) if you try to sleep, you get fun bugs ranging from BSOD to uninteractable white windows, to windows straight up vanishing.
// Just don't.
@@ -40,12 +38,15 @@
* public
*
* Static Data to be sent to the UI.
- * Static data differs from normal data in that it's large data that should be sent infrequently
- * This is implemented optionally for heavy uis that would be sending a lot of redundant data
- * frequently.
- * Gets squished into one object on the frontend side, but the static part is cached.
*
- * * mob/user - The mob interacting with the UI.
+ * Static data differs from normal data in that it's large data that should be
+ * sent infrequently. This is implemented optionally for heavy uis that would
+ * be sending a lot of redundant data frequently. Gets squished into one
+ * object on the frontend side, but the static part is cached.
+ *
+ * required user mob The mob interacting with the UI.
+ *
+ * return list Statuic Data to be sent to the UI.
*/
/datum/proc/ui_static_data(mob/user)
SHOULD_NOT_SLEEP(TRUE)
@@ -54,49 +55,44 @@
/**
* public
*
- * Forces an update on static data. Should be done manually whenever something happens to change static data.
+ * Forces an update on static data. Should be done manually whenever something
+ * happens to change static data.
*
- * * mob/user - The mob currently interacting with the UI. (REQUIRED)
- * * datum/tgui/ui - UI to be updated (OPTIONAL)
- * * ui_key - Key of the UI to be updated. (OPTIONAL)
+ * required user the mob currently interacting with the ui
+ * optional ui ui to be updated
*/
-/datum/proc/update_static_data(mob/user, datum/tgui/ui, ui_key = "main")
- ui = SStgui.try_update_ui(user, src, ui_key, ui)
- // If there was no ui to update, there's no static data to update either.
+/datum/proc/update_static_data(mob/user, datum/tgui/ui)
if(!ui)
- return
- ui.push_data(null, ui_static_data(user), TRUE)
+ ui = SStgui.get_open_ui(user, src)
+ if(ui)
+ ui.send_full_update()
/**
* public
*
* Called on a UI when the UI receieves a href.
* Think of this as Topic().
- * Returns TRUE if the UI should be updated, and FALSE if not.
*
- * * action - The action/button that has been invoked by the user.
- * * list/params - A list of parameters attached to the button.
+ * required action string The action/button that has been invoked by the user.
+ * required params list A list of parameters attached to the button.
+ *
+ * return bool If the UI should be updated or not.
*/
/datum/proc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
// If UI is not interactive or usr calling Topic is not the UI user, bail.
- if(!ui || ui.status != STATUS_INTERACTIVE)
+ if(!ui || ui.status != UI_INTERACTIVE)
return TRUE
/**
* public
*
* Called on an object when a tgui object is being created, allowing you to
- * customise the html
- * For example: inserting a custom stylesheet that you need in the head
- *
- * For this purpose, some tags are available in the html, to be parsed out
- ^ with replacetext
- * (customheadhtml) - Additions to the head tag
+ * push various assets to tgui, for examples spritesheets.
*
- * * html - The html base text.
+ * return list List of asset datums or file paths.
*/
-/datum/proc/ui_base_html(html)
- return html
+/datum/proc/ui_assets(mob/user)
+ return list()
/**
* private
@@ -108,13 +104,43 @@
/datum/proc/ui_host(mob/user)
return src // Default src.
+/**
+ * private
+ *
+ * The UI's state controller to be used for created uis
+ * This is a proc over a var for memory reasons
+ */
+/datum/proc/ui_state(mob/user)
+ return GLOB.default_state
+
/**
* global
*
* Associative list of JSON-encoded shared states that were set by
* tgui clients.
*/
-/datum/var/list/tgui_shared_states
+/* check_grep:ignore */ /datum/var/list/tgui_shared_states
+
+/**
+ * global
+ *
+ * Tracks open UIs for a user.
+ */
+/* check_grep:ignore */ /mob/var/list/tgui_open_uis = list()
+
+/**
+ * global
+ *
+ * Tracks open windows for a user.
+ */
+/* check_grep:ignore */ /client/var/list/tgui_windows = list()
+
+/**
+ * global
+ *
+ * TRUE if cache was reloaded by tgui dev server at least once.
+ */
+/* check_grep:ignore */ /client/var/tgui_cache_reloaded = FALSE
/**
* public
@@ -130,19 +156,63 @@
* Called by UIs when they are closed.
* Must be a verb so winset() can call it.
*
- * * uid - The UI that was closed.
+ * required uiref ref The UI that was closed.
*/
-/client/verb/uiclose(uid as text)
+/client/verb/uiclose(window_id as text)
// Name the verb, and hide it from the user panel.
set name = "uiclose"
set hidden = TRUE
+ var/mob/user = src && src.mob
+ if(!user)
+ return
+ // Close all tgui datums based on window_id.
+ SStgui.force_close_window(user, window_id)
- // Get the UI based on the UID.
- var/datum/tgui/ui = locateUID(uid)
+/**
+ * Middleware for /client/Topic.
+ *
+ * return bool If TRUE, prevents propagation of the topic call.
+ */
+/proc/tgui_Topic(href_list)
+ // Skip non-tgui topics
+ if(!href_list["tgui"])
+ return FALSE
+ var/type = href_list["type"]
+ // Unconditionally collect tgui logs
+ if(type == "log")
+ log_tgui(usr, href_list["message"])
+ // Reload all tgui windows
+ if(type == "cacheReloaded")
+ if(!check_rights(R_ADMIN) || usr.client.tgui_cache_reloaded)
+ return TRUE
+ // Mark as reloaded
+ usr.client.tgui_cache_reloaded = TRUE
+ // Notify windows
+ var/list/windows = usr.client.tgui_windows
+ for(var/window_id in windows)
+ var/datum/tgui_window/window = windows[window_id]
+ if(window.status == TGUI_WINDOW_READY)
+ window.on_message(type, null, href_list)
+ return TRUE
+ // Locate window
+ var/window_id = href_list["window_id"]
+ var/datum/tgui_window/window
+ if(window_id)
+ window = usr.client.tgui_windows[window_id]
+ if(!window)
+ log_tgui(usr, "Error: Couldn't find the window datum, force closing.")
+ SStgui.force_close_window(usr, window_id)
+ return TRUE
+ // Decode payload
+ var/payload
+ if(href_list["payload"])
+ var/payload_text = href_list["payload"]
+ if(!rustg_json_is_valid(payload_text))
+ log_tgui(usr, "Error: Invalid JSON")
+ return TRUE
- // If we found the UI, close it.
- if(istype(ui))
- ui.close()
- // Unset machine just to be sure.
- if(src && src.mob)
- src.mob.unset_machine()
+ payload = json_decode(payload_text)
+ // Pass message to window
+ if(window)
+ window.on_message(type, payload, href_list)
+ return TRUE
diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm
index 91d34bc8df56..49791db04e82 100644
--- a/code/modules/tgui/modules/appearance_changer.dm
+++ b/code/modules/tgui/modules/appearance_changer.dm
@@ -199,10 +199,13 @@
cut_and_generate_data()
-/datum/ui_module/appearance_changer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/appearance_changer/ui_state(mob/user)
+ return GLOB.default_state
+
+/datum/ui_module/appearance_changer/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "AppearanceChanger", name, 800, 450, master_ui, state)
+ ui = new(user, src, "AppearanceChanger", name)
ui.open()
/datum/ui_module/appearance_changer/ui_data(mob/user)
diff --git a/code/modules/tgui/modules/atmos_control.dm b/code/modules/tgui/modules/atmos_control.dm
index 21ee30238636..623390e27d58 100644
--- a/code/modules/tgui/modules/atmos_control.dm
+++ b/code/modules/tgui/modules/atmos_control.dm
@@ -9,19 +9,24 @@
if("open_alarm")
var/obj/machinery/alarm/alarm = locate(params["aref"]) in GLOB.air_alarms
if(alarm)
- alarm.ui_interact(usr, master_ui = ui, state = GLOB.always_state) // ALWAYS is intentional here, as the master_ui pass will prevent fuckery
+ alarm.ui_interact(usr)
-/datum/ui_module/atmos_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "AtmosControl", name, 800, 600, master_ui, state)
-
- // Send nanomaps
- var/datum/asset/nanomaps = get_asset_datum(/datum/asset/simple/nanomaps)
- nanomaps.send(user)
+/datum/ui_module/atmos_control/ui_state(mob/user)
+ if(isliving(usr))
+ return GLOB.human_adjacent_state
+ return GLOB.default_state
+/datum/ui_module/atmos_control/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "AtmosControl", name)
ui.open()
+/datum/ui_module/atmos_control/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/simple/nanomaps)
+ )
+
/datum/ui_module/atmos_control/ui_data(mob/user)
var/list/data = list()
data["alarms"] = GLOB.air_alarm_repository.air_alarm_data(GLOB.air_alarms, target_z=level_name_to_num(MAIN_STATION))
diff --git a/code/modules/tgui/modules/colour_matrix_tester.dm b/code/modules/tgui/modules/colour_matrix_tester.dm
index bfa7b243781b..d195c3a61831 100644
--- a/code/modules/tgui/modules/colour_matrix_tester.dm
+++ b/code/modules/tgui/modules/colour_matrix_tester.dm
@@ -19,10 +19,13 @@
target_datum = target
-/datum/ui_module/colour_matrix_tester/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/colour_matrix_tester/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/ui_module/colour_matrix_tester/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ColourMatrixTester", name, 350, 170, master_ui, state)
+ ui = new(user, src, "ColourMatrixTester", name)
ui.autoupdate = TRUE
ui.open()
diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm
index 9574f789e5da..e0552ebd2f04 100644
--- a/code/modules/tgui/modules/crew_monitor.dm
+++ b/code/modules/tgui/modules/crew_monitor.dm
@@ -27,19 +27,19 @@
return
viewing_current_z_level = text2num(params["new_level"])
+/datum/ui_module/crew_monitor/ui_state(mob/user)
+ return GLOB.default_state
-
-/datum/ui_module/crew_monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/crew_monitor/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "CrewMonitor", name, 800, 600, master_ui, state)
-
- // Send nanomaps
- var/datum/asset/nanomaps = get_asset_datum(/datum/asset/simple/nanomaps)
- nanomaps.send(user)
-
+ ui = new(user, src, "CrewMonitor", name)
ui.open()
+/datum/ui_module/crew_monitor/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/simple/nanomaps)
+ )
/datum/ui_module/crew_monitor/ui_data(mob/user)
var/list/data = list()
diff --git a/code/modules/tgui/modules/destination_tagger.dm b/code/modules/tgui/modules/destination_tagger.dm
index cdd2487681c6..78cf1d1c7701 100644
--- a/code/modules/tgui/modules/destination_tagger.dm
+++ b/code/modules/tgui/modules/destination_tagger.dm
@@ -2,10 +2,13 @@
name = "Destination Tagger"
var/my_tag = 1
-/datum/ui_module/destination_tagger/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/destination_tagger/ui_state(mob/user)
+ return GLOB.default_state
+
+/datum/ui_module/destination_tagger/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "DestinationTagger", name, 400, 350, master_ui, state)
+ ui = new(user, src, "DestinationTagger", name)
ui.open()
ui.set_autoupdate(FALSE)
diff --git a/code/modules/tgui/modules/ert_manager.dm b/code/modules/tgui/modules/ert_manager.dm
index 2bee0c86eb8c..d68f42cd5202 100644
--- a/code/modules/tgui/modules/ert_manager.dm
+++ b/code/modules/tgui/modules/ert_manager.dm
@@ -11,10 +11,13 @@
/// The below is a toggle for if sec cyborgs are enabled or not
var/cyborg_security = FALSE
-/datum/ui_module/ert_manager/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/ert_manager/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/ui_module/ert_manager/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ERTManager", name, 350, 540, master_ui, state)
+ ui = new(user, src, "ERTManager", name)
ui.autoupdate = TRUE
ui.open()
@@ -96,7 +99,7 @@
if(cyborg_slots > 0)
slots_list += "cyborg: [cyborg_slots]"
- var/silenced = text2bool(params["silent"])
+ var/silenced = (params["silent"])
D.silent = silenced
var/slot_text = english_list(slots_list)
diff --git a/code/modules/tgui/modules/generic_crew_manifest.dm b/code/modules/tgui/modules/generic_crew_manifest.dm
index 47826d883216..5c3200449b36 100644
--- a/code/modules/tgui/modules/generic_crew_manifest.dm
+++ b/code/modules/tgui/modules/generic_crew_manifest.dm
@@ -3,10 +3,18 @@ GLOBAL_DATUM_INIT(generic_crew_manifest, /datum/ui_module/generic_crew_manifest,
/datum/ui_module/generic_crew_manifest
name = "Crew Manifest"
-/datum/ui_module/generic_crew_manifest/ui_interact(user, ui_key = "GenericCrewManifest", datum/tgui/ui = null, datum/tgui/master_ui = null, state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui)
+/datum/ui_module/generic_crew_manifest/ui_state(mob/user)
+ if(isnewplayer(user))
+ return GLOB.always_state
+ if(isobserver(user))
+ return GLOB.observer_state
+ if(issilicon(user))
+ return GLOB.not_incapacitated_state
+
+/datum/ui_module/generic_crew_manifest/ui_interact(user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "GenericCrewManifest", name, 588, 510, master_ui, state)
+ ui = new(user, src, "GenericCrewManifest", name)
ui.set_autoupdate(FALSE)
ui.open()
diff --git a/code/modules/tgui/modules/ghost_hud_panel.dm b/code/modules/tgui/modules/ghost_hud_panel.dm
index 344948764459..cff690613947 100644
--- a/code/modules/tgui/modules/ghost_hud_panel.dm
+++ b/code/modules/tgui/modules/ghost_hud_panel.dm
@@ -16,10 +16,13 @@ GLOBAL_DATUM_INIT(ghost_hud_panel, /datum/ui_module/ghost_hud_panel, new)
"diagnostic" = DATA_HUD_DIAGNOSTIC_ADVANCED
)
-/datum/ui_module/ghost_hud_panel/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.observer_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui)
+/datum/ui_module/ghost_hud_panel/ui_state(mob/user)
+ return GLOB.observer_state
+
+/datum/ui_module/ghost_hud_panel/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "GhostHudPanel", name, 250, 207, master_ui, state)
+ ui = new(user, src, "GhostHudPanel", name)
ui.set_autoupdate(FALSE)
ui.open()
@@ -63,8 +66,8 @@ GLOBAL_DATUM_INIT(ghost_hud_panel, /datum/ui_module/ghost_hud_panel, new)
return FALSE
// Check if this is the first time they're turning on Antag HUD.
if(!check_rights(R_ADMIN | R_MOD, FALSE) && !ghost.is_roundstart_observer() && GLOB.configuration.general.restrict_antag_hud_rejoin && !ghost.has_ahudded())
- var/response = alert(ghost, "If you turn this on, you will not be able to take any part in the round.", "Are you sure you want to enable antag HUD?", "Yes", "No")
- if(response == "No")
+ var/response = tgui_alert(ghost, "If you turn this on, you will not be able to take any part in the round.", "Are you sure you want to enable antag HUD?", list("Yes", "No"))
+ if(response != "Yes")
return FALSE
ghost.can_reenter_corpse = FALSE
diff --git a/code/modules/tgui/modules/law_manager.dm b/code/modules/tgui/modules/law_manager.dm
index 667c0a57b109..4ede83d4aef2 100644
--- a/code/modules/tgui/modules/law_manager.dm
+++ b/code/modules/tgui/modules/law_manager.dm
@@ -69,29 +69,29 @@
owner.add_supplied_law(supplied_law_position, supplied_law)
if("change_zeroth_law")
- var/new_law = sanitize(input("Enter new law Zero. Leaving the field blank will cancel the edit.", "Edit Law", zeroth_law))
+ var/new_law = tgui_input_text(src, "Enter new law Zero. Leaving the field blank will cancel the edit.", "Edit Law", zeroth_law)
if(new_law && new_law != zeroth_law && (!..()))
zeroth_law = new_law
if("change_ion_law")
- var/new_law = sanitize(input("Enter new ion law. Leaving the field blank will cancel the edit.", "Edit Law", ion_law))
+ var/new_law = tgui_input_text(src, "Enter new ion law. Leaving the field blank will cancel the edit.", "Edit Law", ion_law)
if(new_law && new_law != ion_law && (!..()))
ion_law = new_law
if("change_inherent_law")
- var/new_law = sanitize(input("Enter new inherent law. Leaving the field blank will cancel the edit.", "Edit Law", inherent_law))
+ var/new_law = tgui_input_text(src, "Enter new inherent law. Leaving the field blank will cancel the edit.", "Edit Law", inherent_law)
if(new_law && new_law != inherent_law && (!..()))
inherent_law = new_law
if("change_supplied_law")
- var/new_law = sanitize(input("Enter new supplied law. Leaving the field blank will cancel the edit.", "Edit Law", supplied_law))
+ var/new_law = tgui_input_text(src, "Enter new supplied law. Leaving the field blank will cancel the edit.", "Edit Law", supplied_law)
if(new_law && new_law != supplied_law && (!..()))
supplied_law = new_law
if("change_supplied_law_position")
- var/new_position = input(usr, "Enter new supplied law position between 1 and [MAX_SUPPLIED_LAW_NUMBER], inclusive. Inherent laws at the same index as a supplied law will not be stated.", "Law Position", supplied_law_position) as num|null
+ var/new_position = tgui_input_number(usr, "Enter new supplied law position between 1 and [MAX_SUPPLIED_LAW_NUMBER], inclusive. Inherent laws at the same index as a supplied law will not be stated.", "Law Position", supplied_law_position, MAX_SUPPLIED_LAW_NUMBER, 1)
if(isnum(new_position) && (!..()))
- supplied_law_position = clamp(new_position, 1, MAX_SUPPLIED_LAW_NUMBER)
+ supplied_law_position = new_position
if("edit_law")
if(is_malf(usr))
@@ -101,7 +101,7 @@
to_chat(usr, "You can't edit that law.")
return
if(AL)
- var/new_law = sanitize(input(usr, "Enter new law. Leaving the field blank will cancel the edit.", "Edit Law", AL.law))
+ var/new_law = tgui_input_text(usr, "Enter new law. Leaving the field blank will cancel the edit.", "Edit Law", AL.law)
if(new_law && new_law != AL.law && is_malf(usr) && (!..()))
log_and_message_admins("has changed a law of [owner] from '[AL.law]' to '[new_law]'")
AL.law = new_law
@@ -149,10 +149,17 @@
to_chat(usr, "Laws displayed.")
-/datum/ui_module/law_manager/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/law_manager/ui_state(mob/user)
+ if(check_rights(R_ADMIN, FALSE))
+ return GLOB.admin_state
+ if(issilicon(user))
+ return GLOB.conscious_state
+ return GLOB.default_state
+
+/datum/ui_module/law_manager/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "LawManager", sanitize("[src] - [owner.name]"), 800, is_malf(user) ? 600 : 400, master_ui, state)
+ ui = new(user, src, "LawManager", sanitize("[src] - [owner.name]"))
ui.open()
/datum/ui_module/law_manager/ui_data(mob/user)
diff --git a/code/modules/tgui/modules/power_monitor.dm b/code/modules/tgui/modules/power_monitor.dm
index 5453cdee4803..b7f39a54d741 100644
--- a/code/modules/tgui/modules/power_monitor.dm
+++ b/code/modules/tgui/modules/power_monitor.dm
@@ -11,10 +11,13 @@
if(!select_monitor)
powermonitor = ui_host()
-/datum/ui_module/power_monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/power_monitor/ui_state(mob/user)
+ return GLOB.default_state
+
+/datum/ui_module/power_monitor/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "PowerMonitor", name, 600, 650, master_ui, state)
+ ui = new(user, src, "PowerMonitor", name)
ui.open()
/datum/ui_module/power_monitor/ui_data(mob/user)
diff --git a/code/modules/tgui/modules/robot_self_diagnosis.dm b/code/modules/tgui/modules/robot_self_diagnosis.dm
index 3d06eaf067fc..a98f0dcb86a1 100644
--- a/code/modules/tgui/modules/robot_self_diagnosis.dm
+++ b/code/modules/tgui/modules/robot_self_diagnosis.dm
@@ -7,10 +7,13 @@
CRASH("A [S.type] was passed to /datum/ui_module/robot_self_diagnosis/New().")
owner = S
-/datum/ui_module/robot_self_diagnosis/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/robot_self_diagnosis/ui_state(mob/user)
+ return GLOB.always_state
+
+/datum/ui_module/robot_self_diagnosis/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "RobotSelfDiagnosis", "Component Self Diagnosis", 280, 480, master_ui, state)
+ ui = new(user, src, "RobotSelfDiagnosis", "Component Self Diagnosis")
ui.set_autoupdate(FALSE)
ui.open()
diff --git a/code/modules/tgui/modules/tgui_input_list.dm b/code/modules/tgui/modules/tgui_input_list.dm
deleted file mode 100644
index b9b34fffc9b4..000000000000
--- a/code/modules/tgui/modules/tgui_input_list.dm
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * Creates a TGUI input list window and returns the user's response.
- *
- * This proc should be used to create alerts that the caller will wait for a response from.
- * Arguments:
- * * user - The user to show the input box to.
- * * message - The content of the input box, shown in the body of the TGUI window.
- * * title - The title of the input box, shown on the top of the TGUI window.
- * * buttons - The options that can be chosen by the user, each string is assigned a button on the UI.
- * * timeout - The timeout of the input box, after which the input box will close and qdel itself. Set to zero for no timeout.
- */
-/proc/tgui_input_list(mob/user, message, title, list/buttons, timeout = 0)
- if(!user)
- user = usr
- if(!length(buttons))
- return
- if(!istype(user))
- if(!isclient(user))
- return
- var/client/client = user
- user = client.mob
-
- /// Client does NOT have tgui_input on: Returns regular input
- if(user.client?.prefs?.toggles2 & PREFTOGGLE_2_DISABLE_TGUI_LISTS)
- return input(user, message, title) as null|anything in buttons
-
- var/datum/tgui_list_input/input = new(user, message, title, buttons, timeout)
- input.ui_interact(user)
- input.wait()
- if(input)
- . = input.choice
- qdel(input)
-
-/**
- * Creates an asynchronous TGUI input list window with an associated callback.
- *
- * This proc should be used to create inputs that invoke a callback with the user's chosen option.
- * Arguments:
- * * user - The user to show the input box to.
- * * message - The content of the input box, shown in the body of the TGUI window.
- * * title - The title of the input box, shown on the top of the TGUI window.
- * * buttons - The options that can be chosen by the user, each string is assigned a button on the UI.
- * * callback - The callback to be invoked when a choice is made.
- * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout.
- */
-/proc/tgui_input_list_async(mob/user, message, title, list/buttons, datum/callback/callback, timeout = 60 SECONDS)
- if(!user)
- user = usr
- if(!length(buttons))
- return
- if(!istype(user))
- if(!isclient(user))
- return
- var/client/client = user
- user = client.mob
- var/datum/tgui_list_input/async/input = new(user, message, title, buttons, timeout, callback)
- input.ui_interact(user)
-
-/**
- * # tgui_list_input
- *
- * Datum used for instantiating and using a TGUI-controlled list input that prompts the user with
- * a message and shows a list of selectable options
- */
-/datum/tgui_list_input
- /// The title of the TGUI window
- var/title
- /// The textual body of the TGUI window
- var/message
- /// The list of buttons (responses) provided on the TGUI window
- var/list/buttons
- /// Buttons (strings specifically) mapped to the actual value (e.g. a mob or a verb)
- var/list/buttons_map
- /// The button that the user has pressed, null if no selection has been made
- var/choice
- /// The time at which the tgui_list_input was created, for displaying timeout progress.
- var/start_time
- /// The lifespan of the tgui_list_input, after which the window will close and delete itself.
- var/timeout
- /// Boolean field describing if the tgui_list_input was closed by the user.
- var/closed
-
-/datum/tgui_list_input/New(mob/user, message, title, list/buttons, timeout)
- src.title = title
- src.message = message
- src.buttons = list()
- src.buttons_map = list()
-
- // Gets rid of illegal characters
- var/static/regex/whitelistedWords = regex(@{"([^\u0020-\u8000]+)"})
-
- for(var/i in buttons)
- var/string_key = whitelistedWords.Replace("[i]", "")
-
- src.buttons += string_key
- src.buttons_map[string_key] = i
-
-
- if(timeout)
- src.timeout = timeout
- start_time = world.time
- QDEL_IN(src, timeout)
-
-/datum/tgui_list_input/Destroy(force, ...)
- SStgui.close_uis(src)
- QDEL_NULL(buttons)
- . = ..()
-
-/**
- * Waits for a user's response to the tgui_list_input's prompt before returning. Returns early if
- * the window was closed by the user.
- */
-/datum/tgui_list_input/proc/wait()
- while(!choice && !closed)
- stoplag(1)
-
-/datum/tgui_list_input/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "ListInput", title, 325, 355, master_ui, state)
- ui.set_autoupdate(FALSE)
- ui.open()
-
-/datum/tgui_list_input/ui_close(mob/user)
- . = ..()
- closed = TRUE
-
-/datum/tgui_list_input/ui_static_data(mob/user)
- var/list/data = list()
- data["title"] = title
- data["message"] = message
- data["buttons"] = buttons
- return data
-
-/datum/tgui_list_input/ui_data(mob/user)
- var/list/data = list()
- if(timeout)
- data["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1)
-
-/datum/tgui_list_input/ui_act(action, list/params)
- if(..())
- return
-
- . = TRUE
-
- switch(action)
- if("choose")
- if(!(params["choice"] in buttons))
- return
- choice = buttons_map[params["choice"]]
- SStgui.close_uis(src)
- if("cancel")
- SStgui.close_uis(src)
- closed = TRUE
-
-/**
- * # async tgui_list_input
- *
- * An asynchronous version of tgui_list_input to be used with callbacks instead of waiting on user responses.
- */
-/datum/tgui_list_input/async
- /// The callback to be invoked by the tgui_list_input upon having a choice made.
- var/datum/callback/callback
-
-/datum/tgui_list_input/async/New(mob/user, message, title, list/buttons, timeout, callback)
- ..()
- src.callback = callback
-
-/datum/tgui_list_input/async/Destroy(force, ...)
- QDEL_NULL(callback)
- . = ..()
-
-/datum/tgui_list_input/async/ui_close(mob/user)
- . = ..()
- qdel(src)
-
-/datum/tgui_list_input/async/ui_act(action, list/params)
- . = ..()
- if(!. || choice == null)
- return
- callback.InvokeAsync(choice)
- qdel(src)
-
-/datum/tgui_list_input/async/wait()
- return
diff --git a/code/modules/tgui/modules/volume_mixer.dm b/code/modules/tgui/modules/volume_mixer.dm
index 2b458652bc3a..5bba2507e99a 100644
--- a/code/modules/tgui/modules/volume_mixer.dm
+++ b/code/modules/tgui/modules/volume_mixer.dm
@@ -1,10 +1,13 @@
/datum/ui_module/volume_mixer
name = "Volume Mixer"
-/datum/ui_module/volume_mixer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/ui_module/volume_mixer/ui_state(mob/user)
+ return GLOB.always_state
+
+/datum/ui_module/volume_mixer/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "VolumeMixer", name, 400, clamp(80 + 50 * length(user.client.prefs.volume_mixer), 300, 600), master_ui, state)
+ ui = new(user, src, "VolumeMixer", name)
ui.set_autoupdate(FALSE)
ui.open()
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index da756d58dfbe..8b801d5e2a24 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -1,10 +1,11 @@
/**
- * tgui states
+ * Base state and helpers for states. Just does some sanity checks,
+ * implement a proper state for in-depth checks.
*
- * Base state and helpers for states. Just does some sanity checks, implement a state for in-depth checks.
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
*/
-
/**
* public
*
@@ -17,19 +18,20 @@
*/
/datum/proc/ui_status(mob/user, datum/ui_state/state)
var/src_object = ui_host(user)
- . = STATUS_CLOSE
+ . = UI_CLOSE
if(!state)
return
if(isobserver(user))
// If they turn on ghost AI control, admins can always interact.
- if(user.client.advanced_admin_interaction)
- . = max(., STATUS_INTERACTIVE)
+ if(user.can_admin_interact())
+ . = max(., UI_INTERACTIVE)
// Regular ghosts can always at least view if in range.
- var/clientviewlist = getviewsize(user.client.view)
- if(get_dist(src_object, user) < max(clientviewlist[1],clientviewlist[2]))
- . = max(., STATUS_UPDATE)
+ if(user.client)
+ var/clientviewlist = getviewsize(user.client.view)
+ if(get_dist(src_object, user) < max(clientviewlist[1], clientviewlist[2]))
+ . = max(., UI_UPDATE)
// Check if the state allows interaction
var/result = state.can_use_topic(src_object, user)
@@ -47,7 +49,8 @@
* return UI_state The state of the UI.
*/
/datum/ui_state/proc/can_use_topic(src_object, mob/user)
- return STATUS_CLOSE // Don't allow interaction by default.
+ // Don't allow interaction by default.
+ return UI_CLOSE
/**
* public
@@ -57,22 +60,27 @@
* return UI_state The state of the UI.
*/
/mob/proc/shared_ui_interaction(src_object)
- if(!client) // Close UIs if mindless.
- return STATUS_CLOSE
- else if(stat) // Disable UIs if unconcious.
- return STATUS_DISABLED
- else if(incapacitated()) // Update UIs if incapicitated but concious.
- return STATUS_UPDATE
- return STATUS_INTERACTIVE
+ // Close UIs if mindless.
+ if(!client)
+ return UI_CLOSE
+ // Disable UIs if unconcious.
+ else if(stat)
+ return UI_DISABLED
+ // Update UIs if incapicitated but concious.
+ else if(incapacitated())
+ return UI_UPDATE
+ return UI_INTERACTIVE
/mob/living/silicon/ai/shared_ui_interaction(src_object)
- if(lacks_power() && !apc_override) // Disable UIs if the AI is unpowered.
- return STATUS_DISABLED
+ // Disable UIs if the AI is unpowered.
+ if(lacks_power() && !apc_override)
+ return UI_DISABLED
return ..()
/mob/living/silicon/robot/shared_ui_interaction(src_object)
- if(!cell || cell.charge <= 0 || lockcharge) // Disable UIs if the Borg is unpowered or locked.
- return STATUS_DISABLED
+ // Disable UIs if the Borg is unpowered or locked.
+ if(!cell || cell.charge <= 0 || lockcharge)
+ return UI_DISABLED
return ..()
/**
@@ -88,7 +96,8 @@
* return UI_state The state of the UI.
*/
/atom/proc/contents_ui_distance(src_object, mob/living/user)
- return user.shared_living_ui_distance(src_object) // Just call this mob's check.
+ // Just call this mob's check.
+ return user.shared_living_ui_distance(src_object)
/**
* public
@@ -100,19 +109,23 @@
* return UI_state The state of the UI.
*/
/mob/living/proc/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE)
- if(viewcheck && !(src_object in view(src))) // If the object is obscured, close it.
- return STATUS_CLOSE
-
+ // If the object is obscured, close it.
+ if(viewcheck && !(src_object in view(src)))
+ return UI_CLOSE
var/dist = get_dist(src_object, src)
- if(dist <= 1) // Open and interact if 1-0 tiles away.
- return STATUS_INTERACTIVE
- else if(dist <= 2) // View only if 2-3 tiles away.
- return STATUS_UPDATE
- else if(dist <= 5) // Disable if 5 tiles away.
- return STATUS_DISABLED
- return STATUS_CLOSE // Otherwise, we got nothing.
+ // Open and interact if 1-0 tiles away.
+ if(dist <= 1)
+ return UI_INTERACTIVE
+ // View only if 2-3 tiles away.
+ else if(dist <= 2)
+ return UI_UPDATE
+ // Disable if 5 tiles away.
+ else if(dist <= 5)
+ return UI_DISABLED
+ // Otherwise, we got nothing.
+ return UI_CLOSE
-/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object)
+/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object, viewcheck)
if(HAS_TRAIT(src, TRAIT_TELEKINESIS) && (get_dist(src, src_object) <= 2))
- return STATUS_INTERACTIVE
+ return UI_INTERACTIVE
return ..()
diff --git a/code/modules/tgui/states/admin_state.dm b/code/modules/tgui/states/admin_state.dm
index 3f32f47adde4..61fc37311884 100644
--- a/code/modules/tgui/states/admin_state.dm
+++ b/code/modules/tgui/states/admin_state.dm
@@ -8,5 +8,5 @@ GLOBAL_DATUM_INIT(admin_state, /datum/ui_state/admin_state, new)
/datum/ui_state/admin_state/can_use_topic(src_object, mob/user)
if(check_rights_for(user.client, R_ADMIN))
- return STATUS_INTERACTIVE
- return STATUS_CLOSE
+ return UI_INTERACTIVE
+ return UI_CLOSE
diff --git a/code/modules/tgui/states/always.dm b/code/modules/tgui/states/always.dm
index 56b887a16996..2406dbb2b9b9 100644
--- a/code/modules/tgui/states/always.dm
+++ b/code/modules/tgui/states/always.dm
@@ -1,10 +1,15 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
/**
* tgui state: always_state
*
- * Always grants the user STATUS_INTERACTIVE. Period.
+ * Always grants the user UI_INTERACTIVE. Period.
*/
GLOBAL_DATUM_INIT(always_state, /datum/ui_state/always_state, new)
/datum/ui_state/always_state/can_use_topic(src_object, mob/user)
- return STATUS_INTERACTIVE
+ return UI_INTERACTIVE
diff --git a/code/modules/tgui/states/conscious.dm b/code/modules/tgui/states/conscious.dm
index 272ae9de68e1..8e35a97da320 100644
--- a/code/modules/tgui/states/conscious.dm
+++ b/code/modules/tgui/states/conscious.dm
@@ -1,3 +1,8 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
/**
* tgui state: conscious_state
*
@@ -8,5 +13,5 @@ GLOBAL_DATUM_INIT(conscious_state, /datum/ui_state/conscious_state, new)
/datum/ui_state/conscious_state/can_use_topic(src_object, mob/user)
if(user.stat == CONSCIOUS)
- return STATUS_INTERACTIVE
- return STATUS_CLOSE
+ return UI_INTERACTIVE
+ return UI_CLOSE
diff --git a/code/modules/tgui/states/contained.dm b/code/modules/tgui/states/contained.dm
index bee64b759e2d..0805ca0114ab 100644
--- a/code/modules/tgui/states/contained.dm
+++ b/code/modules/tgui/states/contained.dm
@@ -1,3 +1,8 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
/**
* tgui state: contained_state
*
@@ -9,6 +14,6 @@ GLOBAL_DATUM_INIT(contained_state, /datum/ui_state/contained_state, new)
/datum/ui_state/contained_state/can_use_topic(atom/src_object, mob/user)
if(!src_object.contains(user))
- return STATUS_CLOSE
+ return UI_CLOSE
return user.shared_ui_interaction(src_object)
*/
diff --git a/code/modules/tgui/states/deep_inventory.dm b/code/modules/tgui/states/deep_inventory.dm
index be2ea4c1bfdc..a7351a0d2d90 100644
--- a/code/modules/tgui/states/deep_inventory.dm
+++ b/code/modules/tgui/states/deep_inventory.dm
@@ -1,12 +1,18 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
/**
* tgui state: deep_inventory_state
*
- * Checks that the src_object is in the user's deep (backpack, box, toolbox, etc) inventory.
+ * Checks that the src_object is in the user's deep
+ * (backpack, box, toolbox, etc) inventory.
*/
GLOBAL_DATUM_INIT(deep_inventory_state, /datum/ui_state/deep_inventory_state, new)
/datum/ui_state/deep_inventory_state/can_use_topic(src_object, mob/user)
if(!user.contains(src_object))
- return STATUS_CLOSE
+ return UI_CLOSE
return user.shared_ui_interaction(src_object)
diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm
index 63ea0d96740d..9a3f1457e8fc 100644
--- a/code/modules/tgui/states/default.dm
+++ b/code/modules/tgui/states/default.dm
@@ -1,7 +1,11 @@
/**
* tgui state: default_state
*
- * Checks a number of things -- mostly physical distance for humans and view for robots.
+ * Checks a number of things -- mostly physical distance for humans
+ * and view for robots.
+ *
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
*/
GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new)
@@ -10,67 +14,67 @@ GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new)
return user.default_can_use_topic(src_object) // Call the individual mob-overridden procs.
/mob/proc/default_can_use_topic(src_object)
- return STATUS_CLOSE // Don't allow interaction by default.
+ return UI_CLOSE // Don't allow interaction by default.
/mob/living/default_can_use_topic(src_object)
. = shared_ui_interaction(src_object)
- if(. > STATUS_CLOSE && loc)
+ if(. > UI_CLOSE && loc) //must not be in nullspace.
. = min(., loc.contents_ui_distance(src_object, src)) // Check the distance...
- if(. == STATUS_INTERACTIVE) // Non-human living mobs can only look, not touch.
- return STATUS_UPDATE
+ if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED) && . == UI_INTERACTIVE) // Non-human living mobs and mobs with blocked hands can only look, not touch.
+ return UI_UPDATE
/mob/living/carbon/human/default_can_use_topic(src_object)
. = shared_ui_interaction(src_object)
- if(. > STATUS_CLOSE)
+ if(. > UI_CLOSE)
. = min(., shared_living_ui_distance(src_object)) // Check the distance...
/mob/living/silicon/robot/default_can_use_topic(src_object)
. = shared_ui_interaction(src_object)
- if(. <= STATUS_DISABLED)
+ if(. <= UI_DISABLED)
return
// Robots can interact with anything they can see.
var/list/clientviewlist = getviewsize(client.view)
- if((src_object in view(src)) && (get_dist(src, src_object) <= max(clientviewlist[1], clientviewlist[2])))
- return STATUS_INTERACTIVE
- return STATUS_DISABLED // Otherwise they can keep the UI open.
+ if((src_object in view(src)) && get_dist(src, src_object) <= max(clientviewlist[1], clientviewlist[2]))
+ return UI_INTERACTIVE
+ return UI_DISABLED // Otherwise they can keep the UI open.
/mob/living/silicon/ai/default_can_use_topic(src_object)
. = shared_ui_interaction(src_object)
- if(. < STATUS_INTERACTIVE)
+ if(. < UI_INTERACTIVE)
return
// The AI can interact with anything it can see nearby, or with cameras while wireless control is enabled.
if(!control_disabled && can_see(src_object))
- return STATUS_INTERACTIVE
- return STATUS_CLOSE
+ return UI_INTERACTIVE
+ return UI_CLOSE
/mob/living/simple_animal/revenant/default_can_use_topic(src_object)
- return STATUS_UPDATE
+ return UI_UPDATE
/mob/living/simple_animal/demon/pulse_demon/default_can_use_topic(src_object)
. = shared_ui_interaction(src_object)
- if(. < STATUS_INTERACTIVE)
+ if(. < UI_INTERACTIVE)
return
// anything in its APC's area
if(get_area(src_object) == controlling_area)
- return STATUS_INTERACTIVE
- return STATUS_CLOSE
+ return UI_INTERACTIVE
+ return UI_CLOSE
/mob/living/simple_animal/default_can_use_topic(src_object)
. = shared_ui_interaction(src_object)
- if(. > STATUS_CLOSE)
+ if(. > UI_CLOSE)
. = min(., shared_living_ui_distance(src_object)) //simple animals can only use things they're near.
/mob/living/silicon/pai/default_can_use_topic(src_object)
// pAIs can only use themselves and the owner's radio.
if((src_object == src || src_object == radio) && !stat)
- return STATUS_INTERACTIVE
+ return UI_INTERACTIVE
else
return ..()
-/mob/dead/observer/default_can_use_topic()
+/mob/dead/observer/default_can_use_topic(src_object)
if(can_admin_interact())
- return STATUS_INTERACTIVE // Admins are more equal
- return STATUS_UPDATE // Ghosts can view updates
+ return UI_INTERACTIVE // Admins are more equal
+ return UI_UPDATE // Ghosts can view updates
diff --git a/code/modules/tgui/states/hands.dm b/code/modules/tgui/states/hands.dm
index fa3692a2ff76..209cb5288c56 100644
--- a/code/modules/tgui/states/hands.dm
+++ b/code/modules/tgui/states/hands.dm
@@ -1,3 +1,8 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
/**
* tgui state: hands_state
*
@@ -8,21 +13,21 @@ GLOBAL_DATUM_INIT(hands_state, /datum/ui_state/hands_state, new)
/datum/ui_state/hands_state/can_use_topic(src_object, mob/user)
. = user.shared_ui_interaction(src_object)
- if(. > STATUS_CLOSE)
+ if(. > UI_CLOSE)
return min(., user.hands_can_use_topic(src_object))
/mob/proc/hands_can_use_topic(src_object)
- return STATUS_CLOSE
+ return UI_CLOSE
/mob/living/hands_can_use_topic(src_object)
- if(is_in_active_hand(src_object) || is_in_inactive_hand(src_object))
- return STATUS_INTERACTIVE
- return STATUS_CLOSE
-
-/mob/living/simple_animal/revenant/hands_can_use_topic(src_object)
- return STATUS_UPDATE
+ if(is_holding(src_object))
+ return UI_INTERACTIVE
+ return UI_CLOSE
/mob/living/silicon/robot/hands_can_use_topic(src_object)
if(activated(src_object))
- return STATUS_INTERACTIVE
- return STATUS_CLOSE
+ return UI_INTERACTIVE
+ return UI_CLOSE
+
+/mob/living/simple_animal/revenant/hands_can_use_topic(src_object)
+ return UI_UPDATE
diff --git a/code/modules/tgui/states/human_adjacent.dm b/code/modules/tgui/states/human_adjacent.dm
index 8b489ab13090..b9208f96cd63 100644
--- a/code/modules/tgui/states/human_adjacent.dm
+++ b/code/modules/tgui/states/human_adjacent.dm
@@ -1,3 +1,8 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
/**
* tgui state: human_adjacent_state
*
@@ -13,4 +18,4 @@ GLOBAL_DATUM_INIT(human_adjacent_state, /datum/ui_state/human_adjacent_state, ne
var/dist = get_dist(src_object, user)
if((dist > 1) || (!ishuman(user)))
// Can't be used unless adjacent and human, even with TK
- . = min(., STATUS_UPDATE)
+ . = min(., UI_UPDATE)
diff --git a/code/modules/tgui/states/inventory_state.dm b/code/modules/tgui/states/inventory_state.dm
index 4f516e58462a..7c4002b6c7d8 100644
--- a/code/modules/tgui/states/inventory_state.dm
+++ b/code/modules/tgui/states/inventory_state.dm
@@ -12,5 +12,5 @@ GLOBAL_DATUM_INIT(inventory_state, /datum/ui_state/inventory_state, new)
var/mob/living/silicon/robot/R = user
if(src_object in R.module_active) // Magnetic grippers
return user.shared_ui_interaction(src_object)
- return STATUS_CLOSE
+ return UI_CLOSE
return user.shared_ui_interaction(src_object)
diff --git a/code/modules/tgui/states/not_incapacitated.dm b/code/modules/tgui/states/not_incapacitated.dm
index d6bdc4bac93b..f7278c86de47 100644
--- a/code/modules/tgui/states/not_incapacitated.dm
+++ b/code/modules/tgui/states/not_incapacitated.dm
@@ -1,3 +1,8 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
/**
* tgui state: not_incapacitated_state
*
@@ -22,8 +27,8 @@ GLOBAL_DATUM_INIT(not_incapacitated_turf_state, /datum/ui_state/not_incapacitate
turf_check = no_turfs
/datum/ui_state/not_incapacitated_state/can_use_topic(src_object, mob/user)
- if(user.stat)
- return STATUS_CLOSE
- if(user.incapacitated() || (turf_check && !isturf(user.loc)))
- return STATUS_DISABLED
- return STATUS_INTERACTIVE
+ if(user.stat != CONSCIOUS)
+ return UI_CLOSE
+ if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated() || (turf_check && !isturf(user.loc)))
+ return UI_DISABLED
+ return UI_INTERACTIVE
diff --git a/code/modules/tgui/states/notcontained.dm b/code/modules/tgui/states/notcontained.dm
index fd604cc78716..5fd79a68848d 100644
--- a/code/modules/tgui/states/notcontained.dm
+++ b/code/modules/tgui/states/notcontained.dm
@@ -1,25 +1,33 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
/**
* tgui state: notcontained_state
*
- * Checks that the user is not inside src_object, and then makes the default checks.
+ * Checks that the user is not inside src_object, and then makes the
+ * default checks.
*/
-/*
+
GLOBAL_DATUM_INIT(notcontained_state, /datum/ui_state/notcontained_state, new)
/datum/ui_state/notcontained_state/can_use_topic(atom/src_object, mob/user)
. = user.shared_ui_interaction(src_object)
- if(. > STATUS_CLOSE)
+ if(. > UI_CLOSE)
return min(., user.notcontained_can_use_topic(src_object))
/mob/proc/notcontained_can_use_topic(src_object)
- return STATUS_CLOSE
+ return UI_CLOSE
/mob/living/notcontained_can_use_topic(atom/src_object)
if(src_object.contains(src))
- return STATUS_CLOSE // Close if we're inside it.
+ return UI_CLOSE // Close if we're inside it.
return default_can_use_topic(src_object)
/mob/living/silicon/notcontained_can_use_topic(src_object)
- return default_can_use_topic(src_object) // Silicons use default bevhavior.
-*/
+ return default_can_use_topic(src_object) // Silicons use default behavior.
+
+/mob/living/simple_animal/drone/notcontained_can_use_topic(src_object)
+ return default_can_use_topic(src_object) // Drones use default behavior.
diff --git a/code/modules/tgui/states/observer_state.dm b/code/modules/tgui/states/observer_state.dm
index af772ab7d617..5028834c9e13 100644
--- a/code/modules/tgui/states/observer_state.dm
+++ b/code/modules/tgui/states/observer_state.dm
@@ -8,8 +8,8 @@ GLOBAL_DATUM_INIT(observer_state, /datum/ui_state/observer_state, new)
/datum/ui_state/observer_state/can_use_topic(src_object, mob/user)
if(isobserver(user))
- return STATUS_INTERACTIVE
+ return UI_INTERACTIVE
if(check_rights(R_ADMIN, 0, src))
- return STATUS_INTERACTIVE
- return STATUS_CLOSE
+ return UI_INTERACTIVE
+ return UI_CLOSE
diff --git a/code/modules/tgui/states/physical.dm b/code/modules/tgui/states/physical.dm
index 71ea1a418aca..362e4ecd0008 100644
--- a/code/modules/tgui/states/physical.dm
+++ b/code/modules/tgui/states/physical.dm
@@ -1,3 +1,8 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
/**
* tgui state: physical_state
*
@@ -8,23 +13,49 @@ GLOBAL_DATUM_INIT(physical_state, /datum/ui_state/physical, new)
/datum/ui_state/physical/can_use_topic(src_object, mob/user)
. = user.shared_ui_interaction(src_object)
- if(. > STATUS_CLOSE)
+ if(. > UI_CLOSE)
return min(., user.physical_can_use_topic(src_object))
/mob/proc/physical_can_use_topic(src_object)
- return STATUS_CLOSE
-
-/mob/living/simple_animal/revenant/physical_can_use_topic(src_object)
- return STATUS_UPDATE
+ return UI_CLOSE
/mob/living/simple_animal/demon/pulse_demon/physical_can_use_topic(src_object)
- return STATUS_UPDATE
+ return UI_UPDATE
/mob/living/physical_can_use_topic(src_object)
return shared_living_ui_distance(src_object)
/mob/living/silicon/physical_can_use_topic(src_object)
- return max(STATUS_UPDATE, shared_living_ui_distance(src_object)) // Silicons can always see.
+ return max(UI_UPDATE, shared_living_ui_distance(src_object)) // Silicons can always see.
/mob/living/silicon/ai/physical_can_use_topic(src_object)
- return STATUS_UPDATE // AIs are not physical.
+ return UI_UPDATE // AIs are not physical.
+
+/mob/living/simple_animal/revenant/physical_can_use_topic(src_object)
+ return UI_UPDATE
+
+/**
+ * tgui state: physical_obscured_state
+ *
+ * Short-circuits the default state to only check physical distance, being in view doesn't matter
+ */
+
+GLOBAL_DATUM_INIT(physical_obscured_state, /datum/ui_state/physical_obscured_state, new)
+
+/datum/ui_state/physical_obscured_state/can_use_topic(src_object, mob/user)
+ . = user.shared_ui_interaction(src_object)
+ if(. > UI_CLOSE)
+ return min(., user.physical_obscured_can_use_topic(src_object))
+
+/mob/proc/physical_obscured_can_use_topic(src_object)
+ return UI_CLOSE
+
+/mob/living/physical_obscured_can_use_topic(src_object)
+ return shared_living_ui_distance(src_object, viewcheck = FALSE)
+
+/mob/living/silicon/physical_obscured_can_use_topic(src_object)
+ return max(UI_UPDATE, shared_living_ui_distance(src_object, viewcheck = FALSE)) // Silicons can always see.
+
+/mob/living/silicon/ai/physical_obscured_can_use_topic(src_object)
+ return UI_UPDATE // AIs are not physical.
+
diff --git a/code/modules/tgui/states/self.dm b/code/modules/tgui/states/self.dm
index d8b119f31ffd..f7cef3f6005b 100644
--- a/code/modules/tgui/states/self.dm
+++ b/code/modules/tgui/states/self.dm
@@ -1,3 +1,8 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
/**
* tgui state: self_state
*
@@ -8,5 +13,5 @@ GLOBAL_DATUM_INIT(self_state, /datum/ui_state/self_state, new)
/datum/ui_state/self_state/can_use_topic(src_object, mob/user)
if(src_object != user)
- return STATUS_CLOSE
+ return UI_CLOSE
return user.shared_ui_interaction(src_object)
diff --git a/code/modules/tgui/states/viewer_state.dm b/code/modules/tgui/states/viewer_state.dm
index 1bc577517014..154f8a2e356c 100644
--- a/code/modules/tgui/states/viewer_state.dm
+++ b/code/modules/tgui/states/viewer_state.dm
@@ -7,4 +7,4 @@
GLOBAL_DATUM_INIT(viewer_state, /datum/ui_state/viewer_state, new)
/datum/ui_state/viewer_state/can_use_topic(src_object, mob/user)
- return STATUS_UPDATE
+ return UI_UPDATE
diff --git a/code/modules/tgui/states/zlevel_state.dm b/code/modules/tgui/states/zlevel_state.dm
deleted file mode 100644
index 1f4ca3b37cf4..000000000000
--- a/code/modules/tgui/states/zlevel_state.dm
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * tgui state: z_state
- *
- * Only checks that the Z-level of the user and src_object are the same.
- */
-
-/*
-GLOBAL_DATUM_INIT(z_state, /datum/ui_state/z_state, new)
-
-/datum/ui_state/z_state/can_use_topic(src_object, mob/user)
- var/turf/turf_obj = get_turf(src_object)
- var/turf/turf_usr = get_turf(user)
- if(turf_obj && turf_usr && turf_obj.z == turf_usr.z)
- return STATUS_INTERACTIVE
- return STATUS_CLOSE
-*/
diff --git a/code/modules/tgui/tgui_datum.dm b/code/modules/tgui/tgui_datum.dm
index 3d5ba33166e8..1efece27cad9 100644
--- a/code/modules/tgui/tgui_datum.dm
+++ b/code/modules/tgui/tgui_datum.dm
@@ -1,7 +1,6 @@
/**
- * tgui
- *
- * /tg/station user interface library
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
*/
/**
@@ -14,34 +13,32 @@
var/datum/src_object
/// The title of te UI.
var/title
- /// The ui_key of the UI. This allows multiple UIs for one src_object.
- var/ui_key
/// The window_id for browse() and onclose().
- var/window_id
- /// The window width.
- var/width = 0
- /// The window height
- var/height = 0
+ var/datum/tgui_window/window
+ /// Key that is used for remembering the window geometry.
+ var/window_key
+ /// Deprecated: Window size.
+ var/window_size
/// The interface (template) to be used for this UI.
var/interface
/// Update the UI every MC tick.
var/autoupdate = TRUE
/// If the UI has been initialized yet.
var/initialized = FALSE
- /// The data (and datastructure) used to initialize the UI.
- var/list/initial_data
- /// The static data used to initialize the UI.
- var/list/initial_static_data
- /// Holder for the json string, that is sent during the initial update
- var/_initial_update
+ /// Time of opening the window.
+ var/opened_at
+ /// Stops further updates when close() was called.
+ var/closing = FALSE
/// The status/visibility of the UI.
- var/status = STATUS_INTERACTIVE
+ var/status = UI_INTERACTIVE
+ /// Timed refreshing state
+ var/refreshing = FALSE
/// Topic state used to determine status/interactability.
var/datum/ui_state/state = null
- /// The parent UI.
- var/datum/tgui/master_ui
- /// Children of this UI.
- var/list/datum/tgui/children = list()
+ /// Asset data to be sent with every update
+ var/list/asset_data
+ /// Rate limit client refreshes to prevent DoS.
+ COOLDOWN_DECLARE(refresh_cooldown)
/**
* public
@@ -50,46 +47,25 @@
*
* required user mob The mob who opened/is using the UI.
* required src_object datum The object or datum which owns the UI.
- * required ui_key string The ui_key of the UI.
* required interface string The interface used to render the UI.
* optional title string The title of the UI.
- * optional width int The window width.
- * optional height int The window height.
- * optional master_ui datum/tgui The parent UI.
- * optional state datum/ui_state The state used to determine status.
+ * optional ui_x int Deprecated: Window width.
+ * optional ui_y int Deprecated: Window height.
*
* return datum/tgui The requested UI.
*/
-/datum/tgui/New(mob/user, datum/src_object, ui_key, interface, title, width = 0, height = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+/datum/tgui/New(mob/user, datum/src_object, interface, title, ui_x, ui_y)
+ log_tgui(user, "new [interface]")
src.user = user
src.src_object = src_object
- src.ui_key = ui_key
- src.window_id = "[src_object.UID()]-[ui_key]"
+ src.window_key = "[src_object.UID()]-main"
src.interface = interface
-
if(title)
-
- // SS220 EDIT - START
- if(findtext_char(title, regex(@"[А-Яа-я]")))
- src.title = capitalize(sanitize(title, list("\proper"="", "\improper"="")))
- else
- src.title = sanitize(title)
- // SS220 EDIT -END
-
- if(width)
- src.width = width
- if(height)
- src.height = height
-
- src.master_ui = master_ui
- if(master_ui)
- master_ui.children += src
- src.state = state
-
- var/datum/asset/tgui_assets = get_asset_datum(/datum/asset/simple/tgui)
- var/datum/asset/fa = get_asset_datum(/datum/asset/simple/fontawesome)
- tgui_assets.send(user)
- fa.send(user)
+ src.title = title
+ src.state = src_object.ui_state(user)
+ // Deprecated
+ if(ui_x && ui_y)
+ src.window_size = list(ui_x, ui_y)
/**
* public
@@ -98,267 +74,252 @@
*/
/datum/tgui/proc/open()
if(!user.client)
- return // Bail if there is no client.
-
- update_status(push = FALSE) // Update the window status.
- if(status < STATUS_UPDATE)
- return // Bail if we're not supposed to open.
-
-
-
- // Build window options
- var/window_options = "can_minimize=0;auto_format=0;"
- // If we have a width and height, use them.
- if(width && height)
- window_options += "size=[width]x[height];"
-
- // Remove titlebar and resize handles for a fancy window
- if(user.client.prefs.toggles2 & PREFTOGGLE_2_FANCYUI)
- window_options += "titlebar=0;can_resize=0;"
+ return null
+ if(window)
+ return null
+ process_status()
+ if(status < UI_UPDATE)
+ return null
+ window = SStgui.request_pooled_window(user)
+ if(!window)
+ return null
+ opened_at = world.time
+ window.acquire_lock(src)
+ if(!window.is_ready())
+ window.initialize(
+ strict_mode = TRUE,
+ fancy = (user.client.prefs.toggles2 & PREFTOGGLE_2_FANCYUI),
+ assets = list(
+ get_asset_datum(/datum/asset/simple/tgui),
+ ))
else
- window_options += "titlebar=1;can_resize=1;"
-
- // Generate page html
- var/html
- html = SStgui.basehtml
- // Allow the src object to override the html if needed
- html = src_object.ui_base_html(html)
- // Replace template tokens with important UI data
- html = replacetextEx(html, "\[tgui:ref]", "[src.UID()]")
+ window.send_message("ping")
+ send_assets()
+ window.send_message("update", get_payload(
+ with_data = TRUE,
+ with_static_data = TRUE))
+ SStgui.on_open(src)
- // Open the window.
- user << browse(html, "window=[window_id];[window_options]")
+/datum/tgui/proc/send_assets()
+ var/flushqueue = window.send_asset(get_asset_datum(
+ /datum/asset/simple/namespaced/fontawesome))
+ for(var/datum/asset/asset in src_object.ui_assets(user))
+ flushqueue |= window.send_asset(asset)
+ if(flushqueue)
+ user.client.browse_queue_flush()
- // Instruct the client to signal UI when the window is closed.
- winset(user, window_id, "on-close=\"uiclose [src.UID()]\"")
+/**
+ * public
+ *
+ * Close the UI.
+ *
+ * optional can_be_suspended bool
+ */
+/datum/tgui/proc/close(can_be_suspended = TRUE)
+ if(closing)
+ return
+ closing = TRUE
+ // If we don't have window_id, open proc did not have the opportunity
+ // to finish, therefore it's safe to skip this whole block.
+ if(window)
+ // Windows you want to keep are usually blue screens of death
+ // and we want to keep them around, to allow user to read
+ // the error message properly.
+ window.release_lock()
+ window.close(can_be_suspended)
+ src_object.ui_close(user)
+ SStgui.on_close(src)
+ state = null
+ qdel(src)
- // Pre-fetch initial state while browser is still loading in
- // another thread
- if(!initial_data)
- initial_data = src_object.ui_data(user)
- if(!initial_static_data)
- initial_static_data = src_object.ui_static_data(user)
- _initial_update = url_encode(get_json(initial_data, initial_static_data))
+/**
+ * public
+ *
+ * Enable/disable auto-updating of the UI.
+ *
+ * required value bool Enable/disable auto-updating.
+ */
+/datum/tgui/proc/set_autoupdate(autoupdate)
+ src.autoupdate = autoupdate
- SStgui.on_open(src)
+/**
+ * public
+ *
+ * Replace current ui.state with a new one.
+ *
+ * required state datum/ui_state/state Next state
+ */
+/datum/tgui/proc/set_state(datum/ui_state/state)
+ src.state = state
/**
* public
*
- * Reinitialize the UI.
- * (Possibly with a new interface and/or data).
+ * Makes an asset available to use in tgui.
*
- * optional template string The name of the new interface.
- * optional data list The new initial data.
+ * required asset datum/asset
*/
-/datum/tgui/proc/reinitialize(interface, list/data, list/static_data)
- if(interface)
- src.interface = interface
- if(data)
- initial_data = data
- if(static_data)
- initial_static_data = static_data
- open()
+/datum/tgui/proc/send_asset(datum/asset/asset)
+ if(!window)
+ CRASH("send_asset() can only be called after open().")
+ return window.send_asset(asset)
/**
* public
*
- * Close the UI, and all its children.
+ * Send a full update to the client (includes static data).
+ *
+ * optional custom_data list Custom data to send instead of ui_data.
+ * optional force bool Send an update even if UI is not interactive.
*/
-/datum/tgui/proc/close()
- user << browse(null, "window=[window_id]") // Close the window.
- src_object.ui_close(user)
- SStgui.on_close(src)
- for(var/datum/tgui/child in children) // Loop through and close all children.
- child.close()
- children.Cut()
- state = null
- master_ui = null
- qdel(src)
+/datum/tgui/proc/send_full_update(custom_data, force)
+ if(!user.client || !initialized || closing)
+ return
+ if(!COOLDOWN_FINISHED(src, refresh_cooldown))
+ refreshing = TRUE
+ addtimer(CALLBACK(src, PROC_REF(send_full_update)), TGUI_REFRESH_FULL_UPDATE_COOLDOWN, TIMER_UNIQUE)
+ return
+ refreshing = FALSE
+ var/should_update_data = force || status >= UI_UPDATE
+ window.send_message("update", get_payload(
+ custom_data,
+ with_data = should_update_data,
+ with_static_data = TRUE))
+ COOLDOWN_START(src, refresh_cooldown, TGUI_REFRESH_FULL_UPDATE_COOLDOWN)
/**
* public
*
- * Enable/disable auto-updating of the UI.
+ * Send a partial update to the client (excludes static data).
*
- * required state bool Enable/disable auto-updating.
+ * optional custom_data list Custom data to send instead of ui_data.
+ * optional force bool Send an update even if UI is not interactive.
*/
-/datum/tgui/proc/set_autoupdate(state = TRUE)
- autoupdate = state
+/datum/tgui/proc/send_update(custom_data, force)
+ if(!user.client || !initialized || closing)
+ return
+ var/should_update_data = force || status >= UI_UPDATE
+ window.send_message("update", get_payload(
+ custom_data,
+ with_data = should_update_data))
/**
* private
*
* Package the data to send to the UI, as JSON.
- * This includes the UI data and config_data.
*
- * return string The packaged JSON.
+ * return list
*/
-/datum/tgui/proc/get_json(list/data, list/static_data)
+/datum/tgui/proc/get_payload(custom_data, with_data, with_static_data)
var/list/json_data = list()
-
json_data["config"] = list(
"title" = title,
"status" = status,
"interface" = interface,
- "fancy" = user.client.prefs.toggles2 & PREFTOGGLE_2_FANCYUI,
- "observer" = isobserver(user),
- "window" = window_id,
+ "refreshing" = refreshing,
+ "window" = list(
+ "key" = window_key,
+ "size" = window_size,
+ "fancy" = (user.client?.prefs?.toggles2 & PREFTOGGLE_2_FANCYUI),
+ "locked" = FALSE,
+ ),
+ "client" = list(
+ "ckey" = user.client.ckey,
+ "address" = user.client.address,
+ "computer_id" = user.client.computer_id,
+ ),
+ "user" = list(
+ "name" = "[user]",
+ "observer" = isobserver(user),
+ ),
"map" = SSmapping.map_datum.technical_name,
"ref" = "[src.UID()]"
)
-
- if(!isnull(data))
+ var/data = custom_data || with_data && src_object.ui_data(user)
+ if(data)
json_data["data"] = data
- if(!isnull(static_data))
+ var/static_data = with_static_data && src_object.ui_static_data(user)
+ if(static_data)
json_data["static_data"] = static_data
-
- // Send shared states
if(src_object.tgui_shared_states)
json_data["shared"] = src_object.tgui_shared_states
-
- // Generate the JSON.
- var/json = json_encode(json_data)
- // Strip #255/improper.
- json = replacetext(json, "\proper", "")
- json = replacetext(json, "\improper", "")
- return json
-
-/**
- * private
- *
- * Handle clicks from the UI.
- * Call the src_object's ui_act() if status is UI_INTERACTIVE.
- * If the src_object's ui_act() returns 1, update all UIs attacked to it.
- */
-/datum/tgui/Topic(href, href_list)
- if(user != usr)
- return // Something is not right here.
-
- var/action = href_list["action"]
- var/params = href_list; params -= "action"
-
- switch(action)
- if("tgui:initialize")
- user << output(_initial_update, "[window_id].browser:update")
- initialized = TRUE
- if("tgui:setSharedState")
- // Update the window state.
- update_status(push = FALSE)
- // Bail if UI is not interactive or usr calling Topic
- // is not the UI user.
- if(status != STATUS_INTERACTIVE)
- return
- var/key = params["key"]
- var/value = params["value"]
- if(!src_object.tgui_shared_states)
- src_object.tgui_shared_states = list()
- src_object.tgui_shared_states[key] = value
- SStgui.update_uis(src_object)
- if("tgui:setFancy")
- user.client.prefs.toggles2 ^= PREFTOGGLE_2_FANCYUI
- if("tgui:log")
- // Force window to show frills on fatal errors
- if(params["fatal"])
- winset(user, window_id, "titlebar=1;can-resize=1;size=600x600")
- log_message(params["log"])
- if("tgui:link")
- user << link(params["url"])
- else
- // Update the window state.
- update_status(push = FALSE)
- // Call ui_act() on the src_object.
- if(src_object.ui_act(action, params, src, state))
- // Update if the object requested it.
- SStgui.update_uis(src_object)
+ return json_data
/**
* private
*
- * Update the UI.
- * Only updates the data if update is true, otherwise only updates the status.
- *
- * optional force bool If the UI should be forced to update.
+ * Run an update cycle for this UI. Called internally by SStgui
+ * every second or so.
*/
/datum/tgui/process(force = FALSE)
+ if(closing)
+ return
var/datum/host = src_object.ui_host(user)
- if(!src_object || !host || !user) // If the object or user died (or something else), abort.
- close()
+ // If the object or user died (or something else), abort.
+ if(!src_object || !host || !user || !window)
+ close(can_be_suspended = FALSE)
return
-
- if(status && (force || autoupdate))
- update() // Update the UI if the status and update settings allow it.
- else
- update_status(push = TRUE) // Otherwise only update status.
-
-/**
- * private
- *
- * Push data to an already open UI.
- *
- * required data list The data to send.
- * optional force bool If the update should be sent regardless of state.
- */
-/datum/tgui/proc/push_data(data, static_data, force = FALSE)
- // Update the window state.
- update_status(push = FALSE)
- // Cannot update UI if it is not set up yet.
- if(!initialized)
+ // Validate ping
+ if(!initialized && world.time - opened_at > TGUI_PING_TIMEOUT)
+ log_tgui(user, \
+ "Error: Zombie window detected, killing it with fire.\n" \
+ + "window_id: [window.id]\n" \
+ + "opened_at: [opened_at]\n" \
+ + "world.time: [world.time]")
+ close(can_be_suspended = FALSE)
return
- // Cannot update UI, we have no visibility.
- if(status <= STATUS_DISABLED && !force)
+ // Update through a normal call to ui_interact
+ if(status != UI_DISABLED && (autoupdate || force))
+ src_object.ui_interact(user, src)
return
- // Send the new JSON to the update() Javascript function.
- user << output(
- url_encode(get_json(data, static_data)),
- "[window_id].browser:update")
-
-/**
- * private
- *
- * Updates the UI by interacting with the src_object again, which will hopefully
- * call try_ui_update on it.
- *
- * optional force_open bool If force_open should be passed to ui_interact.
- */
-/datum/tgui/proc/update(force_open = FALSE)
- src_object.ui_interact(user, ui_key, src, force_open, master_ui, state)
+ // Update status only
+ var/needs_update = process_status()
+ if(status <= UI_CLOSE)
+ close()
+ return
+ if(needs_update)
+ window.send_message("update", get_payload())
/**
* private
*
- * Update the status/visibility of the UI for its user.
- *
- * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
+ * Updates the status, and returns TRUE if status has changed.
*/
-/datum/tgui/proc/update_status(push = FALSE)
- var/status = src_object.ui_status(user, state)
- if(master_ui)
- status = min(status, master_ui.status)
- set_status(status, push)
- if(status == STATUS_CLOSE)
- close()
+/datum/tgui/proc/process_status()
+ var/prev_status = status
+ status = src_object.ui_status(user, state)
+ return prev_status != status
/**
* private
*
- * Set the status/visibility of the UI.
- *
- * required status int The status to set (UI_CLOSE/UI_DISABLED/UI_UPDATE/UI_INTERACTIVE).
- * optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
+ * Callback for handling incoming tgui messages.
*/
-/datum/tgui/proc/set_status(status, push = FALSE)
- // Only update if status has changed.
- if(src.status != status)
- if(src.status == STATUS_DISABLED)
- src.status = status
- if(push)
- update()
- else
- src.status = status
- // Update if the UI just because disabled, or a push is requested.
- if(status == STATUS_DISABLED || push)
- push_data(null, force = TRUE)
-
-/datum/tgui/proc/log_message(message)
- log_tgui("[user] ([user.ckey]) using \"[title]\":\n[message]")
+/datum/tgui/proc/on_message(type, list/payload, list/href_list)
+ // Pass act type messages to ui_act
+ if(type && copytext(type, 1, 5) == "act/")
+ process_status()
+ if(src_object.ui_act(copytext(type, 5), payload, src, state))
+ SStgui.update_uis(src_object)
+ return FALSE
+ switch(type)
+ if("ready")
+ // Send a full update when the user manually refreshes the UI
+ if(initialized)
+ send_full_update()
+ initialized = TRUE
+ if("ping/reply")
+ initialized = TRUE
+ if("suspend")
+ close(can_be_suspended = TRUE)
+ if("close")
+ close(can_be_suspended = FALSE)
+ if("log")
+ if(href_list["fatal"])
+ close(can_be_suspended = FALSE)
+ if("setSharedState")
+ if(status != UI_INTERACTIVE)
+ return
+ LAZYINITLIST(src_object.tgui_shared_states)
+ src_object.tgui_shared_states[href_list["key"]] = href_list["value"]
+ SStgui.update_uis(src_object)
diff --git a/code/modules/tgui/tgui_input/alert_input.dm b/code/modules/tgui/tgui_input/alert_input.dm
new file mode 100644
index 000000000000..5f9abd1de10f
--- /dev/null
+++ b/code/modules/tgui/tgui_input/alert_input.dm
@@ -0,0 +1,145 @@
+/**
+ * Creates a TGUI alert window and returns the user's response.
+ *
+ * This proc should be used to create alerts that the caller will wait for a response from.
+ * Arguments:
+ * * user - The user to show the alert to.
+ * * message - The content of the alert, shown in the body of the TGUI window.
+ * * title - The of the alert modal, shown on the top of the TGUI window.
+ * * buttons - The options that can be chosen by the user, each string is assigned a button on the UI.
+ * * timeout - The timeout of the alert, after which the modal will close and qdel itself. Set to zero for no timeout.
+ * * autofocus - The bool that controls if this alert should grab window focus.
+ */
+/proc/tgui_alert(mob/user, message = "", title = "Alert", list/buttons = list("Ok"), timeout = 0, autofocus = TRUE, ui_state = GLOB.always_state)
+ if(!user)
+ user = usr
+
+ if(!istype(user))
+ if(!isclient(user))
+ CRASH("We passed something that wasn't a user/client in a TGUI Alert! The passed user was [user]!")
+ var/client/client = user
+ user = client.mob
+
+ if(isnull(user.client))
+ return
+
+ // A gentle nudge - you should not be using TGUI alert for anything other than a simple message.
+ if(length(buttons) > 3)
+ log_tgui(user, "Error: TGUI Alert initiated with too many buttons. Use a list.", "TguiAlert")
+ return tgui_input_list(user, message, title, buttons, timeout)
+
+ // Client does NOT have tgui_input on: Returns regular input
+ if(user.client?.prefs?.toggles2 & PREFTOGGLE_2_DISABLE_TGUI_INPUT)
+ if(length(buttons) == 2)
+ return alert(user, message, title, buttons[1], buttons[2])
+ if(length(buttons) == 3)
+ return alert(user, message, title, buttons[1], buttons[2], buttons[3])
+
+ var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus, ui_state)
+
+ alert.ui_interact(user)
+ alert.wait()
+ if(alert)
+ . = alert.choice
+ qdel(alert)
+
+/**
+ * # tgui_alert
+ *
+ * Datum used for instantiating and using a TGUI-controlled modal that prompts the user with
+ * a message and has buttons for responses.
+ */
+/datum/tgui_alert
+ /// The title of the TGUI window
+ var/title
+ /// The textual body of the TGUI window
+ var/message
+ /// The list of buttons (responses) provided on the TGUI window
+ var/list/buttons
+ /// The button that the user has pressed, null if no selection has been made
+ var/choice
+ /// The time at which the tgui_alert was created, for displaying timeout progress.
+ var/start_time
+ /// The lifespan of the tgui_alert, after which the window will close and delete itself.
+ var/timeout
+ /// The bool that controls if this modal should grab window focus
+ var/autofocus
+ /// Boolean field describing if the tgui_alert was closed by the user.
+ var/closed
+ /// The TGUI UI state that will be returned in ui_state(). Default: always_state
+ var/datum/ui_state/state
+
+/datum/tgui_alert/New(mob/user, message, title, list/buttons, timeout, autofocus, ui_state)
+ src.autofocus = autofocus
+ src.buttons = buttons.Copy()
+ src.message = message
+ src.title = title
+ src.state = ui_state
+
+ if(timeout)
+ src.timeout = timeout
+ start_time = world.time
+ QDEL_IN(src, timeout)
+
+/datum/tgui_alert/Destroy(force)
+ SStgui.close_uis(src)
+ state = null
+ QDEL_NULL(buttons)
+ return ..()
+
+/**
+ * Waits for a user's response to the tgui_alert's prompt before returning. Returns early if
+ * the window was closed by the user.
+ */
+/datum/tgui_alert/proc/wait()
+ while(!choice && !closed && !QDELETED(src))
+ stoplag(1)
+
+/datum/tgui_alert/ui_state(mob/user)
+ return state
+
+/datum/tgui_alert/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "AlertModal")
+ ui.open()
+
+/datum/tgui_alert/ui_close(mob/user)
+ closed = TRUE
+
+/datum/tgui_alert/ui_static_data(mob/user)
+ var/list/data = list()
+ data["autofocus"] = autofocus
+ data["buttons"] = buttons
+ data["message"] = message
+ data["large_buttons"] = user.client?.prefs?.toggles2 & PREFTOGGLE_2_LARGE_INPUT_BUTTONS
+ data["swapped_buttons"] = user.client?.prefs?.toggles2 & PREFTOGGLE_2_SWAP_INPUT_BUTTONS
+ data["title"] = title
+ return data
+
+/datum/tgui_alert/ui_data(mob/user)
+ var/list/data = list()
+ if(timeout)
+ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
+ return data
+
+/datum/tgui_alert/ui_act(action, list/params)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("choose")
+ if(!(params["choice"] in buttons))
+ CRASH("[usr] entered a non-existent button choice: [params["choice"]]")
+ set_choice(params["choice"])
+ closed = TRUE
+ SStgui.close_uis(src)
+ return TRUE
+ if("cancel")
+ closed = TRUE
+ SStgui.close_uis(src)
+ return TRUE
+
+/datum/tgui_alert/proc/set_choice(choice)
+ src.choice = choice
diff --git a/code/modules/tgui/tgui_input/list_input.dm b/code/modules/tgui/tgui_input/list_input.dm
new file mode 100644
index 000000000000..f5bee6cb551f
--- /dev/null
+++ b/code/modules/tgui/tgui_input/list_input.dm
@@ -0,0 +1,165 @@
+/**
+ * Creates a TGUI input list window and returns the user's response.
+ *
+ * This proc should be used to create alerts that the caller will wait for a response from.
+ * Arguments:
+ * * user - The user to show the input box to.
+ * * message - The content of the input box, shown in the body of the TGUI window.
+ * * title - The title of the input box, shown on the top of the TGUI window.
+ * * items - The options that can be chosen by the user, each string is assigned a button on the UI.
+ * * default - If an option is already preselected on the UI. Current values, etc.
+ * * timeout - The timeout of the input box, after which the menu will close and qdel itself. Set to zero for no timeout.
+ */
+/proc/tgui_input_list(mob/user, message, title = "Select", list/items, default, timeout = 0, ui_state = GLOB.always_state)
+ if(!user)
+ user = usr
+
+ if(!length(items))
+ CRASH("[user] tried to open an empty TGUI Input List. Contents are: [items]")
+
+ if(!istype(user))
+ if(!isclient(user))
+ CRASH("We passed something that wasn't a user/client in a TGUI Input List! The passed user was [user]!")
+ var/client/client = user
+ user = client.mob
+
+ if(isnull(user.client))
+ return
+
+ /// Client does NOT have tgui_input on: Returns regular input
+ if(user.client?.prefs?.toggles2 & PREFTOGGLE_2_DISABLE_TGUI_INPUT)
+ return input(user, message, title, default) as null|anything in items
+
+ var/datum/tgui_list_input/input = new(user, message, title, items, default, timeout, ui_state)
+
+ if(input.invalid)
+ qdel(input)
+ return
+
+ input.ui_interact(user)
+ input.wait()
+ if(input)
+ . = input.choice
+ qdel(input)
+
+/**
+ * # tgui_list_input
+ *
+ * Datum used for instantiating and using a TGUI-controlled list input that prompts the user with
+ * a message and shows a list of selectable options
+ */
+/datum/tgui_list_input
+ /// The title of the TGUI window
+ var/title
+ /// The textual body of the TGUI window
+ var/message
+ /// The list of items (responses) provided on the TGUI window
+ var/list/items
+ /// Buttons (strings specifically) mapped to the actual value (e.g. a mob or a verb)
+ var/list/items_map
+ /// The button that the user has pressed, null if no selection has been made
+ var/choice
+ /// The default button to be selected
+ var/default
+ /// The time at which the tgui_list_input was created, for displaying timeout progress.
+ var/start_time
+ /// The lifespan of the tgui_list_input, after which the window will close and delete itself.
+ var/timeout
+ /// Boolean field describing if the tgui_list_input was closed by the user.
+ var/closed
+ /// The TGUI UI state that will be returned in ui_state(). Default: always_state
+ var/datum/ui_state/state
+ /// Whether the tgui list input is invalid or not (i.e. due to all list entries being null)
+ var/invalid = FALSE
+
+/datum/tgui_list_input/New(mob/user, message, title, list/items, default, timeout, ui_state)
+ src.title = title
+ src.message = message
+ src.items = list()
+ src.items_map = list()
+ src.default = default
+ src.state = ui_state
+ var/list/repeat_items = list()
+
+ // Gets rid of illegal characters
+ var/static/regex/whitelistedWords = regex(@{"([^\u0020-\u8000]+)"})
+
+ for(var/i in items)
+ var/string_key = whitelistedWords.Replace("[i]", "")
+
+ // Avoids duplicated keys E.g: when areas have the same name
+ string_key = avoid_assoc_duplicate_keys(string_key, repeat_items)
+ src.items += string_key
+ src.items_map[string_key] = i
+
+ if(length(src.items) == 0)
+ invalid = TRUE
+
+ if(timeout)
+ src.timeout = timeout
+ start_time = world.time
+ QDEL_IN(src, timeout)
+
+/datum/tgui_list_input/Destroy(force)
+ SStgui.close_uis(src)
+ state = null
+ QDEL_NULL(items)
+ return ..()
+
+/**
+ * Waits for a user's response to the tgui_list_input's prompt before returning. Returns early if
+ * the window was closed by the user.
+ */
+/datum/tgui_list_input/proc/wait()
+ while(!choice && !closed)
+ stoplag(1)
+
+/datum/tgui_list_input/ui_state(mob/user)
+ return state
+
+/datum/tgui_list_input/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "ListInputModal")
+ ui.set_autoupdate(FALSE)
+ ui.open()
+
+/datum/tgui_list_input/ui_close(mob/user)
+ closed = TRUE
+
+/datum/tgui_list_input/ui_static_data(mob/user)
+ var/list/data = list()
+ data["init_value"] = default || items[1]
+ data["items"] = items
+ data["message"] = message
+ data["large_buttons"] = user.client?.prefs?.toggles2 & PREFTOGGLE_2_LARGE_INPUT_BUTTONS
+ data["swapped_buttons"] = user.client?.prefs?.toggles2 & PREFTOGGLE_2_SWAP_INPUT_BUTTONS
+ data["title"] = title
+ return data
+
+/datum/tgui_list_input/ui_data(mob/user)
+ var/list/data = list()
+ if(timeout)
+ data["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1)
+ return data
+
+/datum/tgui_list_input/ui_act(action, list/params)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("submit")
+ if(!(params["entry"] in items))
+ return
+ set_choice(items_map[params["entry"]])
+ closed = TRUE
+ SStgui.close_uis(src)
+ return TRUE
+ if("cancel")
+ closed = TRUE
+ SStgui.close_uis(src)
+ return TRUE
+
+/datum/tgui_list_input/proc/set_choice(choice)
+ src.choice = choice
diff --git a/code/modules/tgui/tgui_input/number_input.dm b/code/modules/tgui/tgui_input/number_input.dm
new file mode 100644
index 000000000000..7e4a49832a38
--- /dev/null
+++ b/code/modules/tgui/tgui_input/number_input.dm
@@ -0,0 +1,168 @@
+/**
+ * Creates a TGUI window with a number input. Returns the user's response as num | null.
+ *
+ * This proc should be used to create windows for number entry that the caller will wait for a response from.
+ * If tgui fancy chat is turned off: Will return a normal input. If a max or min value is specified, will
+ * validate the input inside the UI and ui_act.
+ *
+ * Arguments:
+ * * user - The user to show the number input to.
+ * * message - The content of the number input, shown in the body of the TGUI window.
+ * * title - The title of the number input modal, shown on the top of the TGUI window.
+ * * default - The default (or current) value, shown as a placeholder. Users can press refresh with this.
+ * * max_value - Specifies a maximum value. If none is set, any number can be entered. Pressing "max" defaults to 1000.
+ * * min_value - Specifies a minimum value. Often 0.
+ * * timeout - The timeout of the number input, after which the modal will close and qdel itself. Set to zero for no timeout.
+ * * round_value - whether the inputted number is rounded down into an integer.
+ */
+/proc/tgui_input_number(mob/user, message, title = "Number Input", default = 0, max_value = 10000, min_value = 0, timeout = 0, round_value = TRUE, ui_state = GLOB.always_state)
+ if(!user)
+ user = usr
+
+ if(!istype(user))
+ if(!isclient(user))
+ CRASH("We passed something that wasn't a user/client in a TGUI Input Number! The passed user was [user]!")
+ var/client/client = user
+ user = client.mob
+
+ if(isnull(user.client))
+ return
+
+ // Client does NOT have tgui_input on: Returns regular input
+ if(user.client?.prefs?.toggles2 & PREFTOGGLE_2_DISABLE_TGUI_INPUT)
+ var/input_number = input(user, message, title, default) as null|num
+ return clamp(round_value ? round(input_number) : input_number, min_value, max_value)
+
+ var/datum/tgui_input_number/number_input = new(user, message, title, default, max_value, min_value, timeout, round_value, ui_state)
+
+ number_input.ui_interact(user)
+ number_input.wait()
+ if(number_input)
+ . = number_input.entry
+ qdel(number_input)
+
+/**
+ * # tgui_input_number
+ *
+ * Datum used for instantiating and using a TGUI-controlled number input that prompts the user with
+ * a message and has an input for number entry.
+ */
+/datum/tgui_input_number
+ /// Boolean field describing if the tgui_input_number was closed by the user.
+ var/closed
+ /// The default (or current) value, shown as a default. Users can press reset with this.
+ var/default
+ /// The entry that the user has return_typed in.
+ var/entry
+ /// The maximum value that can be entered.
+ var/max_value
+ /// The prompt's body, if any, of the TGUI window.
+ var/message
+ /// The minimum value that can be entered.
+ var/min_value
+ /// Whether the submitted number is rounded down into an integer.
+ var/round_value
+ /// The time at which the number input was created, for displaying timeout progress.
+ var/start_time
+ /// The lifespan of the number input, after which the window will close and delete itself.
+ var/timeout
+ /// The title of the TGUI window
+ var/title
+ /// The TGUI UI state that will be returned in ui_state(). Default: always_state
+ var/datum/ui_state/state
+
+/datum/tgui_input_number/New(mob/user, message, title, default, max_value, min_value, timeout, round_value, ui_state)
+ src.default = default
+ src.max_value = max_value
+ src.message = message
+ src.min_value = min_value
+ src.title = title
+ src.round_value = round_value
+ src.state = ui_state
+
+ if(timeout)
+ src.timeout = timeout
+ start_time = world.time
+ QDEL_IN(src, timeout)
+
+ /// Checks for empty numbers - bank accounts, etc.
+ if(max_value == 0)
+ src.min_value = 0
+ if(default)
+ src.default = 0
+
+ /// Sanity check
+ if(default < min_value)
+ src.default = min_value
+
+ if(default > max_value)
+ CRASH("Default value is greater than max value.")
+
+/datum/tgui_input_number/Destroy(force)
+ SStgui.close_uis(src)
+ state = null
+ return ..()
+
+/**
+ * Waits for a user's response to the tgui_input_number's prompt before returning. Returns early if
+ * the window was closed by the user.
+ */
+/datum/tgui_input_number/proc/wait()
+ while(!entry && !closed && !QDELETED(src))
+ stoplag(1)
+
+/datum/tgui_input_number/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "NumberInputModal")
+ ui.open()
+
+/datum/tgui_input_number/ui_close(mob/user)
+ closed = TRUE
+
+/datum/tgui_input_number/ui_state(mob/user)
+ return state
+
+/datum/tgui_input_number/ui_static_data(mob/user)
+ var/list/data = list()
+ data["init_value"] = default // Default is a reserved keyword
+ data["min_value"] = min_value
+ data["max_value"] = max_value
+ data["round_value"] = round_value
+ data["message"] = message
+ data["large_buttons"] = user.client?.prefs?.toggles2 & PREFTOGGLE_2_LARGE_INPUT_BUTTONS
+ data["swapped_buttons"] = user.client?.prefs?.toggles2 & PREFTOGGLE_2_SWAP_INPUT_BUTTONS
+ data["title"] = title
+ return data
+
+/datum/tgui_input_number/ui_data(mob/user)
+ var/list/data = list()
+ if(timeout)
+ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
+ return data
+
+/datum/tgui_input_number/ui_act(action, list/params)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("submit")
+ if(!isnum(params["entry"]))
+ CRASH("A non number was input into TGUI Input Number by [usr]")
+ var/choice = round_value ? round(params["entry"]) : params["entry"]
+ if(choice > max_value)
+ CRASH("A number greater than the max value was input into TGUI Input Number by [usr]")
+ if(choice < min_value)
+ CRASH("A number less than the min value was input into TGUI Input Number by [usr]")
+ set_entry(choice)
+ closed = TRUE
+ SStgui.close_uis(src)
+ return TRUE
+ if("cancel")
+ closed = TRUE
+ SStgui.close_uis(src)
+ return TRUE
+
+/datum/tgui_input_number/proc/set_entry(entry)
+ src.entry = entry
diff --git a/code/modules/tgui/tgui_input/text_input.dm b/code/modules/tgui/tgui_input/text_input.dm
new file mode 100644
index 000000000000..9e00d25414a9
--- /dev/null
+++ b/code/modules/tgui/tgui_input/text_input.dm
@@ -0,0 +1,171 @@
+/**
+ * Creates a TGUI window with a text input. Returns the user's response.
+ *
+ * This proc should be used to create windows for text entry that the caller will wait for a response from.
+ * If tgui fancy chat is turned off: Will return a normal input. If max_length is specified, will return
+ * stripped_multiline_input.
+ *
+ * Arguments:
+ * * user - The user to show the text input to.
+ * * message - The content of the text input, shown in the body of the TGUI window.
+ * * title - The title of the text input modal, shown on the top of the TGUI window.
+ * * default - The default (or current) value, shown as a placeholder.
+ * * max_length - Specifies a max length for input. MAX_MESSAGE_LEN is default (1024)
+ * * multiline - Bool that determines if the input box is much larger. Good for large messages, laws, etc.
+ * * encode - Toggling this determines if input is filtered via html_encode. Setting this to FALSE gives raw input.
+ * * timeout - The timeout of the textbox, after which the modal will close and qdel itself. Set to zero for no timeout.
+ */
+/proc/tgui_input_text(mob/user, message = "", title = "Text Input", default, max_length = MAX_MESSAGE_LEN, multiline = FALSE, encode = TRUE, timeout = 0, ui_state = GLOB.always_state)
+ if(!user)
+ user = usr
+
+ if(!istype(user))
+ if(!isclient(user))
+ CRASH("We passed something that wasn't a user/client in a TGUI Input Text! The passed user was [user]!")
+ var/client/client = user
+ user = client.mob
+
+ if(isnull(user.client))
+ return
+
+ // Client does NOT have tgui_input on: Returns regular input
+ if(user.client?.prefs?.toggles2 & PREFTOGGLE_2_DISABLE_TGUI_INPUT)
+ if(encode)
+ if(multiline)
+ return stripped_multiline_input(user, message, title, default, max_length)
+ else
+ return stripped_input(user, message, title, default, max_length)
+ else
+ if(multiline)
+ return input(user, message, title, default) as message|null
+ else
+ return input(user, message, title, default) as text|null
+
+ var/datum/tgui_input_text/text_input = new(user, message, title, default, max_length, multiline, encode, timeout, ui_state)
+
+ text_input.ui_interact(user)
+ text_input.wait()
+ if(text_input)
+ . = text_input.entry
+ qdel(text_input)
+
+/**
+ * tgui_input_text
+ *
+ * Datum used for instantiating and using a TGUI-controlled text input that prompts the user with
+ * a message and has an input for text entry.
+ */
+/datum/tgui_input_text
+ /// Boolean field describing if the tgui_input_text was closed by the user.
+ var/closed
+ /// The default (or current) value, shown as a default.
+ var/default
+ /// Whether the input should be stripped using html_encode
+ var/encode
+ /// The entry that the user has return_typed in.
+ var/entry
+ /// The maximum length for text entry
+ var/max_length
+ /// The prompt's body, if any, of the TGUI window.
+ var/message
+ /// Multiline input for larger input boxes.
+ var/multiline
+ /// The time at which the text input was created, for displaying timeout progress.
+ var/start_time
+ /// The lifespan of the text input, after which the window will close and delete itself.
+ var/timeout
+ /// The title of the TGUI window
+ var/title
+ /// The TGUI UI state that will be returned in ui_state(). Default: always_state
+ var/datum/ui_state/state
+
+/datum/tgui_input_text/New(mob/user, message, title, default, max_length, multiline, encode, timeout, ui_state)
+ src.default = default
+ src.encode = encode
+ src.max_length = max_length
+ src.message = message
+ src.multiline = multiline
+ src.title = title
+ src.state = ui_state
+
+ if(timeout)
+ src.timeout = timeout
+ start_time = world.time
+ QDEL_IN(src, timeout)
+
+/datum/tgui_input_text/Destroy(force)
+ SStgui.close_uis(src)
+ state = null
+ return ..()
+
+/**
+ * Waits for a user's response to the tgui_input_text's prompt before returning. Returns early if
+ * the window was closed by the user.
+ */
+/datum/tgui_input_text/proc/wait()
+ while(!entry && !closed && !QDELETED(src))
+ stoplag(1)
+
+/datum/tgui_input_text/ui_state(mob/user)
+ return state
+
+/datum/tgui_input_text/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "TextInputModal")
+ ui.open()
+
+/datum/tgui_input_text/ui_close(mob/user)
+ closed = TRUE
+
+/datum/tgui_input_text/ui_static_data(mob/user)
+ var/list/data = list()
+ data["max_length"] = max_length
+ data["message"] = message
+ data["multiline"] = multiline
+ data["placeholder"] = html_decode(default) // Default is a reserved keyword
+ data["large_buttons"] = user.client?.prefs?.toggles2 & PREFTOGGLE_2_LARGE_INPUT_BUTTONS
+ data["swapped_buttons"] = user.client?.prefs?.toggles2 & PREFTOGGLE_2_SWAP_INPUT_BUTTONS
+ data["title"] = title
+ return data
+
+/datum/tgui_input_text/ui_data(mob/user)
+ var/list/data = list()
+ if(timeout)
+ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
+ return data
+
+/datum/tgui_input_text/ui_act(action, list/params)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("submit")
+ if(!max_length)
+ return
+ if(length_char(params["entry"]) > max_length)
+ CRASH("[usr] typed a text string longer than the max length")
+ if(encode && (length_char(html_encode(params["entry"])) > max_length))
+ to_chat(usr, "Your message was clipped due to special character usage.")
+ set_entry(params["entry"])
+ closed = TRUE
+ SStgui.close_uis(src)
+ return TRUE
+ if("cancel")
+ closed = TRUE
+ SStgui.close_uis(src)
+ return TRUE
+
+/**
+ * Sets the return value for the tgui text proc.
+ * If html encoding is enabled, the text will be encoded.
+ * This can sometimes result in a string that is longer than the max length.
+ * If the string is longer than the max length, it will be clipped.
+ */
+/datum/tgui_input_text/proc/set_entry(entry)
+ if(isnull(entry))
+ return
+
+ var/converted_entry = encode ? html_encode(entry) : entry
+ src.entry = trim(converted_entry, max_length)
diff --git a/code/modules/tgui/tgui_panel/README.md b/code/modules/tgui/tgui_panel/README.md
new file mode 100644
index 000000000000..95f28ae0e8cf
--- /dev/null
+++ b/code/modules/tgui/tgui_panel/README.md
@@ -0,0 +1,30 @@
+## /TG/ Chat
+
+/TG/ Chat, which will be referred to as TgChat from this point onwards, is a system in which we can send messages to clients in a controlled and semi-reliable manner. The standard way of sending messages to BYOND clients simply dumps whatever you output to them directly into their chat window, however BYOND allows us to load our own code on the client to change this behaviour in a way that allows us to do some pretty neat things.
+
+### Message Format
+
+TgChat handles sending messages from the server to the client through the use of JSON payloads, of which the format will change depending on the type of message and the intended client endpoint. An example of the payload for chat messages is as follows:
+```json
+{
+ "sequence": 0,
+ "content": {
+ "type": ". . .", // ?optional
+ "text": ". . .", // ?optional !atleast-one
+ "html": ". . .", // ?optional !atleast-one
+ "avoidHighlighting": 0 // ?optional
+ },
+}
+```
+
+### Reliability
+
+In the past there have been issues where BYOND will silently and without reason lose a message we sent to the client, to detect this and recover from it seamlessly TgChat also has a baked in reliability layer. This reliability layer is very primitive, and simply keeps track of recieved sequence numbers. Should the client recieve an unexpected sequence number TgChat asks the server to resend any missing packets.
+
+### Ping System
+
+TgChat supports a round trip time ping measurement, which is displayed to the client so they can know how long it takes for their commands and inputs to reach the server. This is done by sending the client a ping request, `ping/soft`, which tells the client to send a ping to the server. When the server recieves said ping it sends a reply, `ping/reply`, to the client with a payload containing the current DateTime which the client can reference against the initial ping request.
+
+### Chat Tabs, Local Storage, and Highlighting
+
+To make organizing and managing chat easier and more functional for both players and admins, TgChat has the ability to filter out messages based on their primary tag, such as individual departmental radios, to a dedicated chat tab for easier reading and comprehension. These tabs can also be configured to highlist messages based on a simple keyword search. You can set a multitude of different keywords to search for and they will be highlighting for instant alerting of the client. Said tabs, highlighting rules, and your chat history will persist thanks to use of local storage on the client. Using local storage TgChat can ensure that your preferences are saved and maintained between client restarts and switching between other /TG/ servers. Local Storage is also used to keep your chat history aswell, should you need to scroll through your chat logs.
diff --git a/code/modules/tgui/tgui_panel/audio.dm b/code/modules/tgui/tgui_panel/audio.dm
new file mode 100644
index 000000000000..1659f336683b
--- /dev/null
+++ b/code/modules/tgui/tgui_panel/audio.dm
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+/// Admin music volume, from 0 to 1.
+/* check_grep:ignore */ /client/var/admin_music_volume = 1
+
+/**
+ * public
+ *
+ * Sends music data to the browser.
+ *
+ * Optional settings:
+ * - pitch: the playback rate
+ * - start: the start time of the sound
+ * - end: when the musics stops playing
+ *
+ * required url string Must be an https URL.
+ * optional extra_data list Optional settings.
+ */
+/datum/tgui_panel/proc/play_music(url, extra_data)
+ if(!is_ready())
+ return
+ var/list/payload = list()
+ if(length(extra_data) > 0)
+ for(var/key in extra_data)
+ payload[key] = extra_data[key]
+ payload["url"] = url
+ window.send_message("audio/playMusic", payload)
+
+/**
+ * public
+ *
+ * Stops playing music through the browser.
+ */
+/datum/tgui_panel/proc/stop_music()
+ if(!is_ready())
+ return
+ window.send_message("audio/stopMusic")
diff --git a/code/modules/tgui/tgui_panel/telemetry.dm b/code/modules/tgui/tgui_panel/telemetry.dm
new file mode 100644
index 000000000000..e6b13091fe53
--- /dev/null
+++ b/code/modules/tgui/tgui_panel/telemetry.dm
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+/**
+ * Maximum number of connection records allowed to analyze.
+ * Should match the value set in the browser.
+ */
+#define TGUI_TELEMETRY_MAX_CONNECTIONS 5
+
+/**
+ * Maximum time allocated for sending a telemetry packet.
+ */
+#define TGUI_TELEMETRY_RESPONSE_WINDOW 30 SECONDS
+
+/// Time of telemetry request
+/* check_grep:ignore */ /datum/tgui_panel/var/telemetry_requested_at
+/// Time of telemetry analysis completion
+/* check_grep:ignore */ /datum/tgui_panel/var/telemetry_analyzed_at
+/// List of previous client connections
+/* check_grep:ignore */ /datum/tgui_panel/var/list/telemetry_connections
+
+/**
+ * private
+ *
+ * Requests some telemetry from the client.
+ */
+/datum/tgui_panel/proc/request_telemetry()
+ telemetry_requested_at = world.time
+ telemetry_analyzed_at = null
+ window.send_message("telemetry/request", list(
+ "limits" = list(
+ "connections" = TGUI_TELEMETRY_MAX_CONNECTIONS,
+ ),
+ ))
+
+/**
+ * private
+ *
+ * Analyzes a telemetry packet.
+ *
+ * Is currently only useful for detecting ban evasion attempts.
+ */
+/datum/tgui_panel/proc/analyze_telemetry(payload)
+ if(world.time > telemetry_requested_at + TGUI_TELEMETRY_RESPONSE_WINDOW)
+ message_admins("[key_name(client)] sent telemetry outside of the allocated time window.")
+ return
+ if(telemetry_analyzed_at)
+ message_admins("[key_name(client)] sent telemetry more than once.")
+ return
+ telemetry_analyzed_at = world.time
+ if(!payload)
+ return
+ telemetry_connections = payload["connections"]
+ var/len = length(telemetry_connections)
+ if(len == 0)
+ return
+ if(len > TGUI_TELEMETRY_MAX_CONNECTIONS)
+ message_admins("[key_name(client)] was kicked for sending a huge telemetry payload")
+ qdel(client)
+ return
+ var/list/found
+ for(var/i in 1 to len)
+ if(QDELETED(client))
+ // He got cleaned up before we were done
+ return
+ var/list/row = telemetry_connections[i]
+ // Check for a malformed history object
+ if(!row || row.len < 3 || (!row["ckey"] || !row["address"] || !row["computer_id"]))
+ return
+ if(world.IsBanned(row["ckey"], row["address"], row["computer_id"]))
+ found = row
+ break
+ CHECK_TICK
+ // This fucker has a history of playing on a banned account.
+ if(found)
+ var/msg = "[key_name(client)] has a banned account in connection history! (Matched: [found["ckey"]], [found["address"]], [found["computer_id"]])"
+ message_admins(msg)
+ log_admin(msg)
diff --git a/code/modules/tgui/tgui_panel/tgui_panel.dm b/code/modules/tgui/tgui_panel/tgui_panel.dm
new file mode 100644
index 000000000000..893d42b96612
--- /dev/null
+++ b/code/modules/tgui/tgui_panel/tgui_panel.dm
@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+/**
+ * tgui_panel datum
+ * Hosts tgchat and other nice features.
+ */
+/datum/tgui_panel
+ var/client/client
+ var/datum/tgui_window/window
+ var/broken = FALSE
+ var/initialized_at
+
+/datum/tgui_panel/New(client/client, id)
+ if(!id)
+ qdel(src)
+ CRASH("New TGUI panel created for [client] but no id supplied, deleting.")
+ src.client = client
+ window = new(client, id)
+ window.subscribe(src, PROC_REF(on_message))
+
+/datum/tgui_panel/Del()
+ window.unsubscribe(src)
+ window.close()
+ return ..()
+
+/datum/tgui_panel/can_vv_get(var_name)
+ var/static/list/protected_vars = list("telemetry_connections")
+ if(!check_rights(R_ADMIN, FALSE, src) && (var_name in protected_vars))
+ return FALSE
+ return TRUE
+
+/**
+ * public
+ *
+ * TRUE if panel is initialized and ready to receive messages.
+ */
+/datum/tgui_panel/proc/is_ready()
+ return !broken && window.is_ready()
+
+/**
+ * public
+ *
+ * Initializes tgui panel.
+ */
+/datum/tgui_panel/proc/initialize(force = FALSE)
+ set waitfor = FALSE
+ // Minimal sleep to defer initialization to after client constructor
+ sleep(1)
+ initialized_at = world.time
+ // Perform a clean initialization
+ window.initialize(
+ strict_mode = TRUE,
+ assets = list(
+ get_asset_datum(/datum/asset/simple/tgui_panel),
+ ))
+ window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/fontawesome))
+ request_telemetry()
+ addtimer(CALLBACK(src, PROC_REF(on_initialize_timed_out)), 5 SECONDS)
+
+/**
+ * private
+ *
+ * Called when initialization has timed out.
+ */
+/datum/tgui_panel/proc/on_initialize_timed_out()
+ // Currently does nothing but sending a message to old chat.
+ SEND_TEXT(client, "Failed to load fancy chat, click HERE to attempt to reload it.")
+
+/**
+ * private
+ *
+ * Callback for handling incoming tgui messages.
+ */
+/datum/tgui_panel/proc/on_message(type, payload)
+ if(type == "ready")
+ broken = FALSE
+ window.send_message("update", list(
+ "config" = list(
+ "client" = list(
+ "ckey" = client.ckey,
+ "address" = client.address,
+ "computer_id" = client.computer_id,
+ ),
+ "window" = list(
+ "fancy" = FALSE,
+ "locked" = FALSE,
+ ),
+ ),
+ ))
+ return TRUE
+ if(type == "audio/setAdminMusicVolume")
+ client.admin_music_volume = payload["volume"]
+ return TRUE
+ if(type == "telemetry")
+ analyze_telemetry(payload)
+ return TRUE
+
+/**
+ * public
+ *
+ * Sends a round restart notification.
+ */
+/datum/tgui_panel/proc/send_roundrestart()
+ window.send_message("roundrestart")
diff --git a/code/modules/tgui/tgui_panel/tgui_panel_external.dm b/code/modules/tgui/tgui_panel/tgui_panel_external.dm
new file mode 100644
index 000000000000..67cd6d612e23
--- /dev/null
+++ b/code/modules/tgui/tgui_panel/tgui_panel_external.dm
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+/* check_grep:ignore */ /client/var/datum/tgui_panel/tgui_panel
+
+/**
+ * tgui panel / chat troubleshooting verb
+ */
+/client/verb/fix_tgui_panel()
+ set name = "Fix chat"
+ set category = "Special Verbs"
+ var/action
+ log_tgui(src, "Started fixing.")
+
+ nuke_chat()
+
+ // Failed to fix
+ action = alert(src, "Did that work?", "", "Yes", "No, switch to old ui")
+ if(action == "No, switch to old ui")
+ winset(src, "output", "on-show=&is-disabled=0&is-visible=1")
+ winset(src, "browseroutput", "is-disabled=1;is-visible=0")
+ log_tgui(src, "Failed to fix.")
+
+/client/proc/nuke_chat()
+ // Catch all solution (kick the whole thing in the pants)
+ winset(src, "output", "on-show=&is-disabled=0&is-visible=1")
+ winset(src, "browseroutput", "is-disabled=1;is-visible=0")
+ if(!tgui_panel || !istype(tgui_panel))
+ log_tgui(src, "tgui_panel datum is missing")
+ tgui_panel = new(src)
+ tgui_panel.initialize(force = TRUE)
+ // Force show the panel to see if there are any errors
+ winset(src, "output", "is-disabled=1&is-visible=0")
+ winset(src, "browseroutput", "is-disabled=0;is-visible=1")
+
+/client/verb/refresh_tgui()
+ set name = "Refresh TGUI"
+ set category = "Special Verbs"
+
+ for(var/window_id in tgui_windows)
+ var/datum/tgui_window/window = tgui_windows[window_id]
+ window.reinitialize()
diff --git a/code/modules/tgui/tgui_panel/tgui_panel_message.dm b/code/modules/tgui/tgui_panel/tgui_panel_message.dm
new file mode 100644
index 000000000000..2e9bfe784ec4
--- /dev/null
+++ b/code/modules/tgui/tgui_panel/tgui_panel_message.dm
@@ -0,0 +1,17 @@
+/**
+ * Message-related procs
+ *
+ * Message format (/list):
+ * - type - Message type, must be one of defines in `code/__DEFINES/chat.dm`
+ * - text - Plain message text
+ * - html - HTML message text
+ * - Optional metadata, can be any key/value pair.
+ *
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+/proc/message_to_html(message)
+ // Here it is possible to add a switch statement
+ // to custom-handle various message types.
+ return message["html"] || message["text"]
diff --git a/code/modules/tgui/tgui_panel/to_chat.dm b/code/modules/tgui/tgui_panel/to_chat.dm
new file mode 100644
index 000000000000..beb0f70be6d0
--- /dev/null
+++ b/code/modules/tgui/tgui_panel/to_chat.dm
@@ -0,0 +1,77 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+/**
+ * Circumvents the message queue and sends the message to the recipient (target) as soon as possible.
+ * trailing_newline, confidential, and handle_whitespace currently have no effect, please fix this in the future or remove the arguments to lower cache!
+ */
+/proc/to_chat_immediate(target, html, type, text, avoid_highlighting = FALSE, handle_whitespace = TRUE, trailing_newline = TRUE, confidential = FALSE)
+ // Useful where the integer 0 is the entire message. Use case is enabling to_chat(target, some_boolean) while preventing to_chat(target, "")
+ html = "[html]"
+ text = "[text]"
+
+ if(!target)
+ return
+ if(!html && !text)
+ CRASH("Empty or null string in to_chat proc call.")
+ if(target == world)
+ target = GLOB.clients
+
+ // Build a message
+ var/message = list()
+ if(type)
+ message["type"] = type
+ if(text)
+ message["text"] = text
+ if(html)
+ message["html"] = html
+ if(avoid_highlighting)
+ message["avoidHighlighting"] = avoid_highlighting
+
+ // send it immediately
+ SSchat.send_immediate(target, message)
+
+/**
+ * Sends the message to the recipient (target).
+ *
+ * Recommended way to write to_chat calls:
+ * ```
+ * to_chat(client, "You have found [object]", MESSAGE_TYPE_INFO,
+ * ```
+ * Always remember to close spans!
+ * TARGET: Refers to the target of the to_chat message. Valid targets include clients, mobs, and the static world controller
+ * HTML: The Message to be sent to the TARGET. Converted to a string if not already one in this function
+ * TYPE: The chat tab that this message will be sent to, a list of all valid types can be found in chat.dm
+ * TEXT: Unused
+ * AVOID_HIGHLIGHTING: Unused
+ * trailing_newline, confidential, and handle_whitespace currently have no effect, please fix this in the future or remove the arguments to lower cache!
+ */
+/proc/to_chat(target, html, type, text, avoid_highlighting, handle_whitespace = TRUE, trailing_newline = TRUE, confidential = FALSE)
+ if(Master.current_runlevel == RUNLEVEL_INIT || !SSchat?.initialized)
+ to_chat_immediate(target, html, type, text)
+ return
+
+ // Useful where the integer 0 is the entire message. Use case is enabling to_chat(target, some_boolean) while preventing to_chat(target, "")
+ html = "[html]"
+ text = "[text]"
+
+ if(!target)
+ return
+ if(!html && !text)
+ CRASH("Empty or null string in to_chat proc call.")
+ if(target == world)
+ target = GLOB.clients
+
+ // Build a message
+ var/message = list()
+ if(type)
+ message["type"] = type
+ if(text)
+ message["text"] = text
+ if(html)
+ message["html"] = html
+ if(avoid_highlighting)
+ message["avoidHighlighting"] = avoid_highlighting
+ SSchat.queue(target, message)
diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm
new file mode 100644
index 000000000000..0bdbc3778d66
--- /dev/null
+++ b/code/modules/tgui/tgui_window.dm
@@ -0,0 +1,369 @@
+/**
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+/datum/tgui_window
+ var/id
+ var/client/client
+ var/pooled
+ var/pool_index
+ var/is_browser = FALSE
+ var/status = TGUI_WINDOW_CLOSED
+ var/locked = FALSE
+ var/datum/tgui/locked_by
+ var/datum/subscriber_object
+ var/subscriber_delegate
+ var/fatally_errored = FALSE
+ var/message_queue
+ var/sent_assets = list()
+ // Vars passed to initialize proc (and saved for later)
+ var/initial_strict_mode
+ var/initial_fancy
+ var/initial_assets
+ var/initial_inline_html
+ var/initial_inline_js
+ var/initial_inline_css
+
+/**
+ * public
+ *
+ * Create a new tgui window.
+ *
+ * required client /client
+ * required id string A unique window identifier.
+ */
+/datum/tgui_window/New(client/client, id, pooled = FALSE)
+ src.id = id
+ src.client = client
+ src.client.tgui_windows[id] = src
+ src.pooled = pooled
+ if(pooled)
+ src.pool_index = TGUI_WINDOW_INDEX(id)
+
+/**
+ * public
+ *
+ * Initializes the window with a fresh page. Puts window into the "loading"
+ * state. You can begin sending messages right after initializing. Messages
+ * will be put into the queue until the window finishes loading.
+ *
+ * optional strict_mode bool - Enables strict error handling and BSOD.
+ * optional fancy bool - If TRUE and if this is NOT a panel, will hide the window titlebar.
+ * optional assets list - List of assets to load during initialization.
+ * optional inline_html string - Custom HTML to inject.
+ * optional inline_js string - Custom JS to inject.
+ * optional inline_css string - Custom CSS to inject.
+ */
+/datum/tgui_window/proc/initialize(
+ strict_mode = FALSE,
+ fancy = FALSE,
+ assets = list(),
+ inline_html = "",
+ inline_js = "",
+ inline_css = "")
+ log_tgui(client, "[id]/initialize")
+ if(!client)
+ return
+ src.initial_fancy = fancy
+ src.initial_assets = assets
+ src.initial_inline_html = inline_html
+ src.initial_inline_js = inline_js
+ src.initial_inline_css = inline_css
+ status = TGUI_WINDOW_LOADING
+ fatally_errored = FALSE
+ // Build window options
+ var/options = "file=[id].html;can_minimize=0;auto_format=0;"
+ // Remove titlebar and resize handles for a fancy window
+ if(fancy)
+ options += "titlebar=0;can_resize=0;"
+ else
+ options += "titlebar=1;can_resize=1;"
+ // Generate page html
+ var/html = SStgui.basehtml
+ html = replacetextEx(html, "\[tgui:windowId]", id)
+ html = replacetextEx(html, "\[tgui:strictMode]", strict_mode)
+ // Inject assets
+ var/inline_assets_str = ""
+ for(var/datum/asset/asset in assets)
+ var/mappings = asset.get_url_mappings()
+ for(var/name in mappings)
+ var/url = mappings[name]
+ // Not encoding since asset strings are considered safe
+ if(copytext(name, -4) == ".css")
+ inline_assets_str += "Byond.loadCss('[url]', true);\n"
+ else if(copytext(name, -3) == ".js")
+ inline_assets_str += "Byond.loadJs('[url]', true);\n"
+ asset.send(client)
+ if(length(inline_assets_str))
+ inline_assets_str = "\n"
+ html = replacetextEx(html, "\n", inline_assets_str)
+ // Inject inline HTML
+ if(inline_html)
+ html = replacetextEx(html, "", isfile(inline_html) ? file2text(inline_html) : inline_html)
+ // Inject inline JS
+ if(inline_js)
+ inline_js = ""
+ html = replacetextEx(html, "", inline_js)
+ // Inject inline CSS
+ if(inline_css)
+ inline_css = ""
+ html = replacetextEx(html, "", inline_css)
+ // Open the window
+ client << browse(html, "window=[id];[options]")
+ // Detect whether the control is a browser
+ is_browser = winexists(client, id) == "BROWSER"
+ // Instruct the client to signal UI when the window is closed.
+ if(!is_browser)
+ winset(client, id, "on-close=\"uiclose [id]\"")
+
+/**
+ * public
+ *
+ * Reinitializes the panel with previous data used for initialization.
+ */
+/datum/tgui_window/proc/reinitialize()
+ initialize(
+ strict_mode = initial_strict_mode,
+ fancy = initial_fancy,
+ assets = initial_assets,
+ inline_html = initial_inline_html,
+ inline_js = initial_inline_js,
+ inline_css = initial_inline_css)
+ // Resend assets
+ for(var/datum/asset/asset in sent_assets)
+ send_asset(asset)
+
+/**
+ * public
+ *
+ * Checks if the window is ready to receive data.
+ *
+ * return bool
+ */
+/datum/tgui_window/proc/is_ready()
+ return status == TGUI_WINDOW_READY
+
+/**
+ * public
+ *
+ * Checks if the window can be sanely suspended.
+ *
+ * return bool
+ */
+/datum/tgui_window/proc/can_be_suspended()
+ return !fatally_errored \
+ && pooled \
+ && pool_index > 0 \
+ && pool_index <= TGUI_WINDOW_SOFT_LIMIT \
+ && status == TGUI_WINDOW_READY
+
+/**
+ * public
+ *
+ * Acquire the window lock. Pool will not be able to provide this window
+ * to other UIs for the duration of the lock.
+ *
+ * Can be given an optional tgui datum, which will be automatically
+ * subscribed to incoming messages via the on_message proc.
+ *
+ * optional ui /datum/tgui
+ */
+/datum/tgui_window/proc/acquire_lock(datum/tgui/ui)
+ locked = TRUE
+ locked_by = ui
+
+/**
+ * public
+ *
+ * Release the window lock.
+ */
+/datum/tgui_window/proc/release_lock()
+ // Clean up assets sent by tgui datum which requested the lock
+ if(locked)
+ sent_assets = list()
+ locked = FALSE
+ locked_by = null
+
+/**
+ * public
+ *
+ * Subscribes the datum to consume window messages on a specified proc.
+ *
+ * Note, that this supports only one subscriber, because code for that
+ * is simpler and therefore faster. If necessary, this can be rewritten
+ * to support multiple subscribers.
+ */
+/datum/tgui_window/proc/subscribe(datum/object, delegate)
+ subscriber_object = object
+ subscriber_delegate = delegate
+
+/**
+ * public
+ *
+ * Unsubscribes the datum. Do not forget to call this when cleaning up.
+ */
+/datum/tgui_window/proc/unsubscribe(datum/object)
+ subscriber_object = null
+ subscriber_delegate = null
+
+/**
+ * public
+ *
+ * Close the UI.
+ *
+ * optional can_be_suspended bool
+ */
+/datum/tgui_window/proc/close(can_be_suspended = TRUE)
+ if(!client)
+ return
+ if(can_be_suspended && can_be_suspended())
+ log_tgui(client, "[id]/close: suspending")
+ status = TGUI_WINDOW_READY
+ send_message("suspend")
+ return
+ log_tgui(client, "[id]/close")
+ release_lock()
+ status = TGUI_WINDOW_CLOSED
+ message_queue = null
+ // Do not close the window to give user some time
+ // to read the error message.
+ if(!fatally_errored)
+ client << browse(null, "window=[id]")
+
+/**
+ * public
+ *
+ * Sends a message to tgui window.
+ *
+ * required type string Message type
+ * required payload list Message payload
+ * optional force bool Send regardless of the ready status.
+ */
+/datum/tgui_window/proc/send_message(type, payload, force)
+ if(!client)
+ return
+ var/message = TGUI_CREATE_MESSAGE(type, payload)
+ // Place into queue if window is still loading
+ if(!force && status != TGUI_WINDOW_READY)
+ if(!message_queue)
+ message_queue = list()
+ message_queue += list(message)
+ return
+ client << output(message, is_browser \
+ ? "[id]:update" \
+ : "[id].browser:update")
+
+/**
+ * public
+ *
+ * Sends a raw payload to tgui window.
+ *
+ * required message string JSON+urlencoded blob to send.
+ * optional force bool Send regardless of the ready status.
+ */
+/datum/tgui_window/proc/send_raw_message(message, force)
+ if(!client)
+ return
+ // Place into queue if window is still loading
+ if(!force && status != TGUI_WINDOW_READY)
+ if(!message_queue)
+ message_queue = list()
+ message_queue += list(message)
+ return
+
+ client << output(message, is_browser \
+ ? "[id]:update" \
+ : "[id].browser:update")
+
+/**
+ * public
+ *
+ * Makes an asset available to use in tgui.
+ *
+ * required asset datum/asset
+ *
+ * return bool - TRUE if any assets had to be sent to the client
+ */
+/datum/tgui_window/proc/send_asset(datum/asset/asset)
+ if(!client || !asset)
+ return
+
+ sent_assets |= list(asset)
+ . = asset.send(client)
+ if(istype(asset, /datum/asset/spritesheet))
+ var/datum/asset/spritesheet/spritesheet = asset
+ send_message("asset/stylesheet", spritesheet.css_filename())
+ send_raw_message(asset.get_serialized_url_mappings())
+
+/**
+ * private
+ *
+ * Sends queued messages if the queue wasn't empty.
+ */
+/datum/tgui_window/proc/flush_message_queue()
+ if(!client || !message_queue)
+ return
+ for(var/message in message_queue)
+ client << output(message, is_browser \
+ ? "[id]:update" \
+ : "[id].browser:update")
+ message_queue = null
+
+/**
+ * public
+ *
+ * Replaces the inline HTML content.
+ *
+ * required inline_html string HTML to inject
+ */
+/datum/tgui_window/proc/replace_html(inline_html = "")
+ client << output(url_encode(inline_html), is_browser \
+ ? "[id]:replaceHtml" \
+ : "[id].browser:replaceHtml")
+
+/**
+ * private
+ *
+ * Callback for handling incoming tgui messages.
+ */
+/datum/tgui_window/proc/on_message(type, payload, href_list)
+ // Status can be READY if user has refreshed the window.
+ if(type == "ready" && status == TGUI_WINDOW_READY)
+ // Resend the assets
+ for(var/asset in sent_assets)
+ send_asset(asset)
+ // Mark this window as fatally errored which prevents it from
+ // being suspended.
+ if(type == "log" && href_list["fatal"])
+ fatally_errored = TRUE
+ // Mark window as ready since we received this message from somewhere
+ if(status != TGUI_WINDOW_READY)
+ status = TGUI_WINDOW_READY
+ flush_message_queue()
+ // Pass message to UI that requested the lock
+ if(locked && locked_by)
+ var/prevent_default = locked_by.on_message(type, payload, href_list)
+ if(prevent_default)
+ return
+ // Pass message to the subscriber
+ else if(subscriber_object)
+ var/prevent_default = call(
+ subscriber_object,
+ subscriber_delegate)(type, payload, href_list)
+ if(prevent_default)
+ return
+ // If not locked, handle these message types
+ switch(type)
+ if("ping")
+ send_message("ping/reply", payload)
+ if("suspend")
+ close(can_be_suspended = TRUE)
+ if("close")
+ close(can_be_suspended = FALSE)
+ if("openLink")
+ client << link(href_list["url"])
+ if("cacheReloaded")
+ reinitialize()
+ if("chat/resend")
+ SSchat.handle_resend(client, payload)
diff --git a/code/modules/tgui_input/say_modal/tgui_say_modal.dm b/code/modules/tgui_input/say_modal/tgui_say_modal.dm
new file mode 100644
index 000000000000..bf5c9621fbc1
--- /dev/null
+++ b/code/modules/tgui_input/say_modal/tgui_say_modal.dm
@@ -0,0 +1,123 @@
+/**
+ * Creates a JSON encoded message to open TGUI say modals properly.
+ *
+ * Arguments:
+ * channel - The channel to open the modal in.
+ * Returns:
+ * string - A JSON encoded message to open the modal.
+ */
+/client/proc/tgui_say_create_open_command(channel)
+ var/message = TGUI_CREATE_MESSAGE("open", list(
+ channel = channel,
+ ))
+ return "\".output tgui_say.browser:update [message]\""
+
+/**
+ * The tgui say modal. This initializes an input window which hides until
+ * the user presses one of the speech hotkeys. Once something is entered, it will
+ * delegate the speech to the proper channel.
+ */
+/datum/tgui_say
+ /// The user who opened the window
+ var/client/client
+ /// The modal window
+ var/datum/tgui_window/window
+ /// Boolean for whether the tgui_say was opened by the user.
+ var/window_open
+
+/** Creates the new input window to exist in the background. */
+/datum/tgui_say/New(client/client, id)
+ src.client = client
+ window = new(client, id)
+ winset(client, "tgui_say", "size=1,1;is-visible=0;")
+ window.subscribe(src, PROC_REF(on_message))
+ window.is_browser = TRUE
+
+/**
+ * After a brief period, injects the scripts into
+ * the window to listen for open commands.
+ */
+/datum/tgui_say/proc/initialize()
+ set waitfor = FALSE
+ // Sleep to defer initialization to after client constructor
+ sleep(3)
+ window.initialize(
+ strict_mode = TRUE,
+ fancy = TRUE,
+ inline_css = file("tgui/public/tgui-say.bundle.css"),
+ inline_js = file("tgui/public/tgui-say.bundle.js"),
+ );
+
+/**
+ * Ensures nothing funny is going on window load.
+ * Minimizes the window, sets max length, closes all
+ * typing and thinking indicators. This is triggered
+ * as soon as the window sends the "ready" message.
+ */
+/datum/tgui_say/proc/load()
+ window_open = FALSE
+ winset(client, "tgui_say", "pos=848,500;size=275,30;is-visible=0;")
+ window.send_message("props", list(
+ "lightMode" = (client.prefs.toggles2 & PREFTOGGLE_2_ENABLE_TGUI_SAY_LIGHT_MODE),
+ "maxLength" = MAX_MESSAGE_LEN,
+ ))
+ stop_thinking()
+ return TRUE
+
+/**
+ * Sets the window as "opened" server side, though it is already
+ * visible to the user. We do this to set local vars &
+ * start typing (if enabled and in an IC channel).
+ *
+ * Arguments:
+ * payload - A list containing the channel the window was opened in.
+ */
+/datum/tgui_say/proc/open(payload)
+ if(!payload?["channel"])
+ CRASH("No channel provided to an open TGUI-Say")
+ window_open = TRUE
+ switch(payload["channel"])
+ if(ME_CHANNEL, RADIO_CHANNEL, SAY_CHANNEL, WHISPER_CHANNEL)
+ start_thinking()
+ return TRUE
+
+/**
+ * Closes the window serverside. Closes any open chat bubbles
+ * regardless of preference.
+ */
+/datum/tgui_say/proc/close()
+ window_open = FALSE
+ stop_thinking()
+ stop_typing()
+
+/**
+ * The equivalent of ui_act, this waits on messages from the window
+ * and delegates actions.
+ */
+/datum/tgui_say/proc/on_message(type, payload)
+ switch(type)
+ if("ready")
+ load()
+ return TRUE
+ if("open")
+ open(payload)
+ return TRUE
+ if("close")
+ close()
+ return TRUE
+ if("thinking")
+ if(payload["visible"] == TRUE)
+ start_thinking()
+ return TRUE
+ if(payload["visible"] == FALSE)
+ stop_thinking()
+ return TRUE
+ return FALSE
+ if("typing")
+ start_typing(payload["isMeChannel"])
+ return TRUE
+ if("entry")
+ handle_entry(payload)
+ return TRUE
+
+ return FALSE
diff --git a/code/modules/tgui_input/say_modal/tgui_say_speech.dm b/code/modules/tgui_input/say_modal/tgui_say_speech.dm
new file mode 100644
index 000000000000..b7c9a48a065c
--- /dev/null
+++ b/code/modules/tgui_input/say_modal/tgui_say_speech.dm
@@ -0,0 +1,61 @@
+/**
+ * Delegates the speech to the proper channel.
+ *
+ * Arguments:
+ * entry - the text to broadcast
+ * channel - the channel to broadcast in
+ * Returns:
+ * boolean - on success or failure
+ */
+/datum/tgui_say/proc/delegate_speech(entry, channel)
+ switch(channel)
+ if(SAY_CHANNEL)
+ client.mob.say_verb(entry)
+ return TRUE
+ if(RADIO_CHANNEL)
+ client.mob.say_verb((isliving(client.mob) ? ";" : "") + entry)
+ return TRUE
+ if(WHISPER_CHANNEL)
+ client.mob.whisper(entry)
+ return TRUE
+ if(ME_CHANNEL)
+ client.mob.me_verb(entry)
+ return TRUE
+ if(OOC_CHANNEL)
+ client.ooc(entry)
+ return TRUE
+ if(LOOC_CHANNEL)
+ client.looc(entry)
+ return TRUE
+ if(ADMIN_CHANNEL)
+ client.cmd_admin_say(entry)
+ return TRUE
+ if(MENTOR_CHANNEL)
+ client.cmd_mentor_say(entry)
+ return TRUE
+ if(DSAY_CHANNEL)
+ client.dsay(entry)
+ return TRUE
+ return FALSE
+
+/**
+ * Handles text entry and forced speech.
+ *
+ * Arguments:
+ * payload - a string list containing entry & channel
+ * Returns:
+ * boolean - success or failure
+ */
+/datum/tgui_say/proc/handle_entry(payload)
+ if(!payload?["channel"] || !payload["entry"])
+ var/hacker_man_ckey = usr.client.ckey
+ qdel(usr.client)
+ message_admins("[hacker_man_ckey] was kicked for attemping to send a null message to TGUI-say.")
+ CRASH("[hacker_man_ckey] entered in a null payload to the chat window.")
+ if(length(payload["entry"]) > MAX_MESSAGE_LEN)
+ var/hacker_man_ckey = usr.client.ckey
+ qdel(usr.client)
+ message_admins("[hacker_man_ckey] was kicked for attemping to bypass TGUI-say character limits.")
+ CRASH("[hacker_man_ckey] has entered more characters than allowed into a TGUI-Say.")
+ delegate_speech(payload["entry"], payload["channel"])
+ return TRUE
diff --git a/code/modules/tgui_input/say_modal/tgui_say_typing.dm b/code/modules/tgui_input/say_modal/tgui_say_typing.dm
new file mode 100644
index 000000000000..9c137ec5ad9c
--- /dev/null
+++ b/code/modules/tgui_input/say_modal/tgui_say_typing.dm
@@ -0,0 +1,41 @@
+/** Sets the mob as "thinking" - with indicator */
+/datum/tgui_say/proc/start_thinking()
+ if(!client?.mob || !window_open)
+ return FALSE
+ /// Special exemptions
+ if(isabductor(client.mob))
+ return FALSE
+ client.mob.set_thinking_indicator(TRUE)
+ addtimer(CALLBACK(src, PROC_REF(stop_thinking)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE)
+
+/** Removes typing/thinking indicators and flags the mob as not thinking */
+/datum/tgui_say/proc/stop_thinking()
+ if(!client?.mob)
+ return FALSE
+ client.mob.set_thinking_indicator(FALSE)
+
+/**
+ * Handles the user typing. After a brief period of inactivity,
+ * signals the client mob to revert to the "thinking" icon.
+ */
+/datum/tgui_say/proc/start_typing(me = FALSE)
+ if(!client?.mob)
+ return FALSE
+ client.mob.set_typing_indicator(FALSE)
+ client.mob.set_thinking_indicator(FALSE)
+ if(!window_open)
+ return FALSE
+ client.mob.set_typing_indicator(TRUE, me)
+ addtimer(CALLBACK(src, PROC_REF(stop_typing)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE)
+
+/**
+ * Callback to remove the typing indicator after a brief period of inactivity.
+ * If the user was typing IC, the thinking indicator is shown.
+ */
+/datum/tgui_say/proc/stop_typing()
+ if(!client?.mob)
+ return FALSE
+ client.mob.set_typing_indicator(FALSE)
+ if(!window_open)
+ return FALSE
+ client.mob.set_thinking_indicator(TRUE)
diff --git a/code/modules/tooltip/tooltip.html b/code/modules/tooltip/tooltip.html
index d2c6016b1a94..31c1350ab65f 100644
--- a/code/modules/tooltip/tooltip.html
+++ b/code/modules/tooltip/tooltip.html
@@ -77,6 +77,19 @@
.operative .wrap {border-color: #1E0101;}
.operative .content {color: #FFFFFF; border-color: #750000; background-color: #350000;}
+ /* SS220 ADDITION - START */
+ .clockwork .wrap {border-color: #170800;}
+ .clockwork .content {color: #B18B25; border-color: #000000; background-color: #5F380E;}
+
+ .vaporwave .wrap {border-color: #0c122c;}
+ .vaporwave .content {color: #bc3ce3; border-color: #170c2c; background-color: #1d1a22;}
+
+ .detective .wrap {border-color: #2c0F0c;}
+ .detective .content {color: #c7b08b; border-color: #2c0F0c; background-color: #221c1a;}
+
+ .trasenknox .wrap {border-color: #998e81;}
+ .trasenknox .content {color: #3ce375; border-color: #998e81; background-color: #1e1d21;}
+ /* SS220 ADDITION - END */
diff --git a/code/modules/vote/vote_datum.dm b/code/modules/vote/vote_datum.dm
index 903e961f5d84..1a9fb643aba6 100644
--- a/code/modules/vote/vote_datum.dm
+++ b/code/modules/vote/vote_datum.dm
@@ -117,9 +117,10 @@
/datum/vote/proc/announce(start_text)
- to_chat(world, {"[start_text]
- Click here or type Vote to place your vote.
- You have [GLOB.configuration.vote.vote_time / 10] seconds to vote."})
+ to_chat(world, chat_box_purple(
+ "[start_text]\
+ Click here or type Vote to place your vote.\
+ You have [GLOB.configuration.vote.vote_time / 10] seconds to vote."))
SEND_SOUND(world, sound('sound/ambience/alarm4.ogg'))
@@ -149,10 +150,13 @@
/*
UI STUFFS
*/
-/datum/vote/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/datum/vote/ui_state(mob/user)
+ return GLOB.always_state
+
+/datum/vote/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "VotePanel", "VotePanel", 400, 500, master_ui, state)
+ ui = new(user, src, "VotePanel", "Vote Panel")
ui.open()
/datum/vote/ui_data(mob/user)
@@ -195,5 +199,5 @@
if(params["target"] in choices)
voted[usr.ckey] = params["target"]
else
- message_admins("\[EXPLOIT] User [key_name_admin(usr)] spoofed a vote in the vote panel!")
+ message_admins("\[EXPLOIT] User [key_name_admin(usr)] spoofed a vote in the vote panel!")
diff --git a/code/modules/vote/vote_verb.dm b/code/modules/vote/vote_verb.dm
index 3f5b142e5b14..1e44179142d4 100644
--- a/code/modules/vote/vote_verb.dm
+++ b/code/modules/vote/vote_verb.dm
@@ -28,7 +28,7 @@
for(var/vtype in vote_types)
votemap["[vtype]"] = vtype
- var/choice = input(usr, "Select a vote type", "Vote") as null|anything in vote_types
+ var/choice = tgui_input_list(usr, "Select a vote type", "Vote", vote_types)
if(choice == null)
return
@@ -40,18 +40,18 @@
return
// Its custom, lets ask
- var/question = html_encode(input(usr, "What is the vote for?") as text|null)
+ var/question = tgui_input_text(usr, "What is the vote for?", "Create Vote", encode = FALSE)
if(!question)
return
var/list/choices = list()
for(var/i in 1 to 10)
- var/option = capitalize(html_encode(input(usr, "Please enter an option or hit cancel to finish") as text|null))
+ var/option = tgui_input_text(usr, "Please enter an option or hit cancel to finish", "Create Vote", encode = FALSE)
if(!option || !usr.client)
break
choices |= option
- var/c2 = alert(usr, "Show counts while vote is happening?", "Counts", "Yes", "No")
+ var/c2 = tgui_alert(usr, "Show counts while vote is happening?", "Counts", list("Yes", "No"))
var/c3 = input(usr, "Select a result calculation type", "Vote", VOTE_RESULT_TYPE_MAJORITY) as anything in list(VOTE_RESULT_TYPE_MAJORITY)
var/datum/vote/V = new /datum/vote(usr.ckey, question, choices, TRUE)
diff --git a/config/example/config.toml b/config/example/config.toml
index 6837fe3801ec..846855eb666f 100644
--- a/config/example/config.toml
+++ b/config/example/config.toml
@@ -31,6 +31,7 @@
# - system_configuration
# - url_configuration
# - voting_configuration
+# -
# SS220 CONFIGS
# - gateway_configuration
@@ -385,8 +386,6 @@ details_url = "https://iphub.info/?ip="
[job_configuration]
# This section contains information on job configuartion, as well as the jon amounts
-# Disable this if you are in a lowpop environment
-jobs_have_minimal_access = true
# Require account agre restrictions for job? Requires the database
restrict_jobs_on_account_age = false
# Allow admins to bypass all job age restrictions
@@ -715,6 +714,9 @@ active_lava_ruins = [
"_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm",
"_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm",
"_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm",
+ "_maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm",
+ "_maps/map_files220/RandomRuins/LavaRuins/ash_old.dmm",
+ "_maps/map_files220/RandomRuins/LavaRuins/old_outpost.dmm",
]
# Budget for lavaland ruins. A higher number means more will spawn
lavaland_ruin_budget = 100
@@ -849,6 +851,26 @@ map_vote_day_types = [
################################################################
+
+[asset_cache_configuration]
+# Browser assets are any file included in interfaces. css, images, javascript, etc.
+# This handles configuring how we get these to the player so interfaces can access them.
+
+# The normal way of getting assets to clients is to use the internal byond system. This can be slow and delay the opening of interface windows. It also doesn't allow the internal IE windows byond uses to cache anything.
+# You can instead have the server save them to a website via a folder within the game server that the web server can read. This could be a simple webserver or something backed by a CDN.
+# Valid values: simple, webroot. Simple is the default.
+asset_transport = "simple"
+# Uncomment this to have the server passively send all browser assets to each client in the background. (instead of waiting for them to be needed)
+# This should be uncommented in production and commented in development
+asset_simple_preload = true
+# Local folder to save assets to.
+# Assets will be saved in the format of asset.MD5HASH.EXT or in namespaces/hash/ as ASSET_FILE_NAME or asset.MD5HASH.EXT
+# asset_cdn_webroot = "data/asset-store/"
+# for best results the webserver powering this should return a long cache validity time, as all assets sent via this transport use hash based urls
+# if you want to test this locally, you simpily run the `localhost-asset-webroot-server.py` python3 script to host assets stored in `data/asset-store/` via http://localhost:58715/
+# asset_cdn_url = "http://localhost:58715/"
+
+
# Congratulations. You reached the end. heres a cookie.
# And some SS220 configs ratge.
@@ -898,6 +920,8 @@ ffmpeg_cpuaffinity = ""
# Force discord verification
force_discord_verification = false
+# Respawn delay in minutes before one may respawn as a crew member
+respawn_delay = 20
################################################################
diff --git a/fonts/REBUFFED.TTF b/fonts/REBUFFED.TTF
deleted file mode 100644
index 2fe5468ee0d2..000000000000
Binary files a/fonts/REBUFFED.TTF and /dev/null differ
diff --git a/fonts/binary.ttf b/fonts/binary.ttf
deleted file mode 100644
index 16c1059dd474..000000000000
Binary files a/fonts/binary.ttf and /dev/null differ
diff --git a/fonts/skrell.ttf b/fonts/skrell.ttf
deleted file mode 100644
index 7df455719e3f..000000000000
Binary files a/fonts/skrell.ttf and /dev/null differ
diff --git a/fonts/slime.ttf b/fonts/slime.ttf
deleted file mode 100644
index 2f8b9da9bbcf..000000000000
Binary files a/fonts/slime.ttf and /dev/null differ
diff --git a/goon/browserassets/html/browserOutput.html b/goon/browserassets/html/browserOutput.html
deleted file mode 100644
index 2d4deb2fb15c..000000000000
--- a/goon/browserassets/html/browserOutput.html
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
- Chat
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Loading...
- If this takes longer than 10 seconds, it will automatically reload, multiple times if necessary.
- If it still does not reload, do not open an adminhelp, you will be unable to see our responses.
- Please instead click the wiki button in the top right of your screen and type "Goonchat Troubleshooting"
- This will provide possible solutions, furthermore please seek help on our discord #helpchat if this
- issue cannot be resolved on your own.
-
diff --git a/html/create_object.html b/html/create_object.html
index 49af318f6f0e..bcc0f71a270b 100644
--- a/html/create_object.html
+++ b/html/create_object.html
@@ -65,4 +65,10 @@
populateList(filtered);
}
+
+ function quickSpawn() {
+ document.spawner.submit();
+ }
+
+ document.getElementById('object_list').ondblclick = quickSpawn;
diff --git a/html/font-awesome/css/all.min.css b/html/font-awesome/css/all.min.css
index e7cdfffe751e..12b385404d79 100644
--- a/html/font-awesome/css/all.min.css
+++ b/html/font-awesome/css/all.min.css
@@ -1,5 +1,5 @@
/*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
*/
-.fa,.fab,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{animation:fa-spin 2s infinite linear}.fa-pulse{animation:fa-spin 1s infinite steps(8)}@keyframes fa-spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scaleX(-1)}.fa-flip-vertical{transform:scaleY(-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{transform:scale(-1)}:root .fa-flip-both,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-acquisitions-incorporated:before{content:"\f6af"}.fa-ad:before{content:"\f641"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adobe:before{content:"\f778"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-air-freshener:before{content:"\f5d0"}.fa-airbnb:before{content:"\f834"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-alipay:before{content:"\f642"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angry:before{content:"\f556"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-ankh:before{content:"\f644"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-alt:before{content:"\f5d1"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-archway:before{content:"\f557"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-artstation:before{content:"\f77a"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-atlas:before{content:"\f558"}.fa-atlassian:before{content:"\f77b"}.fa-atom:before{content:"\f5d2"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-award:before{content:"\f559"}.fa-aws:before{content:"\f375"}.fa-baby:before{content:"\f77c"}.fa-baby-carriage:before{content:"\f77d"}.fa-backspace:before{content:"\f55a"}.fa-backward:before{content:"\f04a"}.fa-bacon:before{content:"\f7e5"}.fa-balance-scale:before{content:"\f24e"}.fa-balance-scale-left:before{content:"\f515"}.fa-balance-scale-right:before{content:"\f516"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-battle-net:before{content:"\f835"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bezier-curve:before{content:"\f55b"}.fa-bible:before{content:"\f647"}.fa-bicycle:before{content:"\f206"}.fa-biking:before{content:"\f84a"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-biohazard:before{content:"\f780"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blender-phone:before{content:"\f6b6"}.fa-blind:before{content:"\f29d"}.fa-blog:before{content:"\f781"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-bone:before{content:"\f5d7"}.fa-bong:before{content:"\f55c"}.fa-book:before{content:"\f02d"}.fa-book-dead:before{content:"\f6b7"}.fa-book-medical:before{content:"\f7e6"}.fa-book-open:before{content:"\f518"}.fa-book-reader:before{content:"\f5da"}.fa-bookmark:before{content:"\f02e"}.fa-bootstrap:before{content:"\f836"}.fa-border-all:before{content:"\f84c"}.fa-border-none:before{content:"\f850"}.fa-border-style:before{content:"\f853"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-brain:before{content:"\f5dc"}.fa-bread-slice:before{content:"\f7ec"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-brush:before{content:"\f55d"}.fa-btc:before{content:"\f15a"}.fa-buffer:before{content:"\f837"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-bus-alt:before{content:"\f55e"}.fa-business-time:before{content:"\f64a"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-day:before{content:"\f783"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-calendar-week:before{content:"\f784"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-campground:before{content:"\f6bb"}.fa-canadian-maple-leaf:before{content:"\f785"}.fa-candy-cane:before{content:"\f786"}.fa-cannabis:before{content:"\f55f"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-car-alt:before{content:"\f5de"}.fa-car-battery:before{content:"\f5df"}.fa-car-crash:before{content:"\f5e1"}.fa-car-side:before{content:"\f5e4"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-carrot:before{content:"\f787"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cash-register:before{content:"\f788"}.fa-cat:before{content:"\f6be"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-centos:before{content:"\f789"}.fa-certificate:before{content:"\f0a3"}.fa-chair:before{content:"\f6c0"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-charging-station:before{content:"\f5e7"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-double:before{content:"\f560"}.fa-check-square:before{content:"\f14a"}.fa-cheese:before{content:"\f7ef"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-chromecast:before{content:"\f838"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-city:before{content:"\f64f"}.fa-clinic-medical:before{content:"\f7f2"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-meatball:before{content:"\f73b"}.fa-cloud-moon:before{content:"\f6c3"}.fa-cloud-moon-rain:before{content:"\f73c"}.fa-cloud-rain:before{content:"\f73d"}.fa-cloud-showers-heavy:before{content:"\f740"}.fa-cloud-sun:before{content:"\f6c4"}.fa-cloud-sun-rain:before{content:"\f743"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-cocktail:before{content:"\f561"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dollar:before{content:"\f651"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-medical:before{content:"\f7f5"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-comments-dollar:before{content:"\f653"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-compress-arrows-alt:before{content:"\f78c"}.fa-concierge-bell:before{content:"\f562"}.fa-confluence:before{content:"\f78d"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-cookie:before{content:"\f563"}.fa-cookie-bite:before{content:"\f564"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-creative-commons-zero:before{content:"\f4f3"}.fa-credit-card:before{content:"\f09d"}.fa-critical-role:before{content:"\f6c9"}.fa-crop:before{content:"\f125"}.fa-crop-alt:before{content:"\f565"}.fa-cross:before{content:"\f654"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-crutch:before{content:"\f7f7"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-d-and-d-beyond:before{content:"\f6ca"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-delicious:before{content:"\f1a5"}.fa-democrat:before{content:"\f747"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-dev:before{content:"\f6cc"}.fa-deviantart:before{content:"\f1bd"}.fa-dharmachakra:before{content:"\f655"}.fa-dhl:before{content:"\f790"}.fa-diagnoses:before{content:"\f470"}.fa-diaspora:before{content:"\f791"}.fa-dice:before{content:"\f522"}.fa-dice-d20:before{content:"\f6cf"}.fa-dice-d6:before{content:"\f6d1"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-digital-tachograph:before{content:"\f566"}.fa-directions:before{content:"\f5eb"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-divide:before{content:"\f529"}.fa-dizzy:before{content:"\f567"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dog:before{content:"\f6d3"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-drafting-compass:before{content:"\f568"}.fa-dragon:before{content:"\f6d5"}.fa-draw-polygon:before{content:"\f5ee"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drum:before{content:"\f569"}.fa-drum-steelpan:before{content:"\f56a"}.fa-drumstick-bite:before{content:"\f6d7"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dumpster:before{content:"\f793"}.fa-dumpster-fire:before{content:"\f794"}.fa-dungeon:before{content:"\f6d9"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edit:before{content:"\f044"}.fa-egg:before{content:"\f7fb"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ello:before{content:"\f5f1"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-text:before{content:"\f658"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-ethernet:before{content:"\f796"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-evernote:before{content:"\f839"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fan:before{content:"\f863"}.fa-fantasy-flight-games:before{content:"\f6dc"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-feather-alt:before{content:"\f56b"}.fa-fedex:before{content:"\f797"}.fa-fedora:before{content:"\f798"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-figma:before{content:"\f799"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-contract:before{content:"\f56c"}.fa-file-csv:before{content:"\f6dd"}.fa-file-download:before{content:"\f56d"}.fa-file-excel:before{content:"\f1c3"}.fa-file-export:before{content:"\f56e"}.fa-file-image:before{content:"\f1c5"}.fa-file-import:before{content:"\f56f"}.fa-file-invoice:before{content:"\f570"}.fa-file-invoice-dollar:before{content:"\f571"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-prescription:before{content:"\f572"}.fa-file-signature:before{content:"\f573"}.fa-file-upload:before{content:"\f574"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-fill:before{content:"\f575"}.fa-fill-drip:before{content:"\f576"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fingerprint:before{content:"\f577"}.fa-fire:before{content:"\f06d"}.fa-fire-alt:before{content:"\f7e4"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-fish:before{content:"\f578"}.fa-fist-raised:before{content:"\f6de"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flag-usa:before{content:"\f74d"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-flushed:before{content:"\f579"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-minus:before{content:"\f65d"}.fa-folder-open:before{content:"\f07c"}.fa-folder-plus:before{content:"\f65e"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-frown-open:before{content:"\f57a"}.fa-fulcrum:before{content:"\f50b"}.fa-funnel-dollar:before{content:"\f662"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-ghost:before{content:"\f6e2"}.fa-gift:before{content:"\f06b"}.fa-gifts:before{content:"\f79c"}.fa-git:before{content:"\f1d3"}.fa-git-alt:before{content:"\f841"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-cheers:before{content:"\f79f"}.fa-glass-martini:before{content:"\f000"}.fa-glass-martini-alt:before{content:"\f57b"}.fa-glass-whiskey:before{content:"\f7a0"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-globe-africa:before{content:"\f57c"}.fa-globe-americas:before{content:"\f57d"}.fa-globe-asia:before{content:"\f57e"}.fa-globe-europe:before{content:"\f7a2"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-gopuram:before{content:"\f664"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-grimace:before{content:"\f57f"}.fa-grin:before{content:"\f580"}.fa-grin-alt:before{content:"\f581"}.fa-grin-beam:before{content:"\f582"}.fa-grin-beam-sweat:before{content:"\f583"}.fa-grin-hearts:before{content:"\f584"}.fa-grin-squint:before{content:"\f585"}.fa-grin-squint-tears:before{content:"\f586"}.fa-grin-stars:before{content:"\f587"}.fa-grin-tears:before{content:"\f588"}.fa-grin-tongue:before{content:"\f589"}.fa-grin-tongue-squint:before{content:"\f58a"}.fa-grin-tongue-wink:before{content:"\f58b"}.fa-grin-wink:before{content:"\f58c"}.fa-grip-horizontal:before{content:"\f58d"}.fa-grip-lines:before{content:"\f7a4"}.fa-grip-lines-vertical:before{content:"\f7a5"}.fa-grip-vertical:before{content:"\f58e"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-guitar:before{content:"\f7a6"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hackerrank:before{content:"\f5f7"}.fa-hamburger:before{content:"\f805"}.fa-hammer:before{content:"\f6e3"}.fa-hamsa:before{content:"\f665"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-middle-finger:before{content:"\f806"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-handshake:before{content:"\f2b5"}.fa-hanukiah:before{content:"\f6e6"}.fa-hard-hat:before{content:"\f807"}.fa-hashtag:before{content:"\f292"}.fa-hat-wizard:before{content:"\f6e8"}.fa-haykal:before{content:"\f666"}.fa-hdd:before{content:"\f0a0"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-headphones-alt:before{content:"\f58f"}.fa-headset:before{content:"\f590"}.fa-heart:before{content:"\f004"}.fa-heart-broken:before{content:"\f7a9"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-highlighter:before{content:"\f591"}.fa-hiking:before{content:"\f6ec"}.fa-hippo:before{content:"\f6ed"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hockey-puck:before{content:"\f453"}.fa-holly-berry:before{content:"\f7aa"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hornbill:before{content:"\f592"}.fa-horse:before{content:"\f6f0"}.fa-horse-head:before{content:"\f7ab"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hot-tub:before{content:"\f593"}.fa-hotdog:before{content:"\f80f"}.fa-hotel:before{content:"\f594"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-house-damage:before{content:"\f6f1"}.fa-houzz:before{content:"\f27c"}.fa-hryvnia:before{content:"\f6f2"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-ice-cream:before{content:"\f810"}.fa-icicles:before{content:"\f7ad"}.fa-icons:before{content:"\f86d"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-igloo:before{content:"\f7ae"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-instagram:before{content:"\f16d"}.fa-intercom:before{content:"\f7af"}.fa-internet-explorer:before{content:"\f26b"}.fa-invision:before{content:"\f7b0"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itch-io:before{content:"\f83a"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi:before{content:"\f669"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-jira:before{content:"\f7b1"}.fa-joget:before{content:"\f3b7"}.fa-joint:before{content:"\f595"}.fa-joomla:before{content:"\f1aa"}.fa-journal-whills:before{content:"\f66a"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-kaaba:before{content:"\f66b"}.fa-kaggle:before{content:"\f5fa"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-khanda:before{content:"\f66d"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiss:before{content:"\f596"}.fa-kiss-beam:before{content:"\f597"}.fa-kiss-wink-heart:before{content:"\f598"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-landmark:before{content:"\f66f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laptop-code:before{content:"\f5fc"}.fa-laptop-medical:before{content:"\f812"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-laugh:before{content:"\f599"}.fa-laugh-beam:before{content:"\f59a"}.fa-laugh-squint:before{content:"\f59b"}.fa-laugh-wink:before{content:"\f59c"}.fa-layer-group:before{content:"\f5fd"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-luggage-cart:before{content:"\f59d"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-mail-bulk:before{content:"\f674"}.fa-mailchimp:before{content:"\f59e"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marked:before{content:"\f59f"}.fa-map-marked-alt:before{content:"\f5a0"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-markdown:before{content:"\f60f"}.fa-marker:before{content:"\f5a1"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mask:before{content:"\f6fa"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-medal:before{content:"\f5a2"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-megaport:before{content:"\f5a3"}.fa-meh:before{content:"\f11a"}.fa-meh-blank:before{content:"\f5a4"}.fa-meh-rolling-eyes:before{content:"\f5a5"}.fa-memory:before{content:"\f538"}.fa-mendeley:before{content:"\f7b3"}.fa-menorah:before{content:"\f676"}.fa-mercury:before{content:"\f223"}.fa-meteor:before{content:"\f753"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microscope:before{content:"\f610"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mitten:before{content:"\f7b5"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-monument:before{content:"\f5a6"}.fa-moon:before{content:"\f186"}.fa-mortar-pestle:before{content:"\f5a7"}.fa-mosque:before{content:"\f678"}.fa-motorcycle:before{content:"\f21c"}.fa-mountain:before{content:"\f6fc"}.fa-mouse-pointer:before{content:"\f245"}.fa-mug-hot:before{content:"\f7b6"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neos:before{content:"\f612"}.fa-network-wired:before{content:"\f6ff"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nimblr:before{content:"\f5a8"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-oil-can:before{content:"\f613"}.fa-old-republic:before{content:"\f510"}.fa-om:before{content:"\f679"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-osi:before{content:"\f41a"}.fa-otter:before{content:"\f700"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-pager:before{content:"\f815"}.fa-paint-brush:before{content:"\f1fc"}.fa-paint-roller:before{content:"\f5aa"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-passport:before{content:"\f5ab"}.fa-pastafarianism:before{content:"\f67b"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-peace:before{content:"\f67c"}.fa-pen:before{content:"\f304"}.fa-pen-alt:before{content:"\f305"}.fa-pen-fancy:before{content:"\f5ac"}.fa-pen-nib:before{content:"\f5ad"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-pencil-ruler:before{content:"\f5ae"}.fa-penny-arcade:before{content:"\f704"}.fa-people-carry:before{content:"\f4ce"}.fa-pepper-hot:before{content:"\f816"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-person-booth:before{content:"\f756"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-alt:before{content:"\f879"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-square-alt:before{content:"\f87b"}.fa-phone-volume:before{content:"\f2a0"}.fa-photo-video:before{content:"\f87c"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-pizza-slice:before{content:"\f818"}.fa-place-of-worship:before{content:"\f67f"}.fa-plane:before{content:"\f072"}.fa-plane-arrival:before{content:"\f5af"}.fa-plane-departure:before{content:"\f5b0"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poll:before{content:"\f681"}.fa-poll-h:before{content:"\f682"}.fa-poo:before{content:"\f2fe"}.fa-poo-storm:before{content:"\f75a"}.fa-poop:before{content:"\f619"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-pray:before{content:"\f683"}.fa-praying-hands:before{content:"\f684"}.fa-prescription:before{content:"\f5b1"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-quran:before{content:"\f687"}.fa-r-project:before{content:"\f4f7"}.fa-radiation:before{content:"\f7b9"}.fa-radiation-alt:before{content:"\f7ba"}.fa-rainbow:before{content:"\f75b"}.fa-random:before{content:"\f074"}.fa-raspberry-pi:before{content:"\f7bb"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-reacteurope:before{content:"\f75d"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redhat:before{content:"\f7bc"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-remove-format:before{content:"\f87d"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-republican:before{content:"\f75e"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-restroom:before{content:"\f7bd"}.fa-retweet:before{content:"\f079"}.fa-rev:before{content:"\f5b2"}.fa-ribbon:before{content:"\f4d6"}.fa-ring:before{content:"\f70b"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-route:before{content:"\f4d7"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-running:before{content:"\f70c"}.fa-rupee-sign:before{content:"\f156"}.fa-sad-cry:before{content:"\f5b3"}.fa-sad-tear:before{content:"\f5b4"}.fa-safari:before{content:"\f267"}.fa-salesforce:before{content:"\f83b"}.fa-sass:before{content:"\f41e"}.fa-satellite:before{content:"\f7bf"}.fa-satellite-dish:before{content:"\f7c0"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-scroll:before{content:"\f70e"}.fa-sd-card:before{content:"\f7c2"}.fa-search:before{content:"\f002"}.fa-search-dollar:before{content:"\f688"}.fa-search-location:before{content:"\f689"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-shapes:before{content:"\f61f"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shopware:before{content:"\f5b5"}.fa-shower:before{content:"\f2cc"}.fa-shuttle-van:before{content:"\f5b6"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-signature:before{content:"\f5b7"}.fa-sim-card:before{content:"\f7c4"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skating:before{content:"\f7c5"}.fa-sketch:before{content:"\f7c6"}.fa-skiing:before{content:"\f7c9"}.fa-skiing-nordic:before{content:"\f7ca"}.fa-skull:before{content:"\f54c"}.fa-skull-crossbones:before{content:"\f714"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-slash:before{content:"\f715"}.fa-sleigh:before{content:"\f7cc"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smile-beam:before{content:"\f5b8"}.fa-smile-wink:before{content:"\f4da"}.fa-smog:before{content:"\f75f"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-sms:before{content:"\f7cd"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowboarding:before{content:"\f7ce"}.fa-snowflake:before{content:"\f2dc"}.fa-snowman:before{content:"\f7d0"}.fa-snowplow:before{content:"\f7d2"}.fa-socks:before{content:"\f696"}.fa-solar-panel:before{content:"\f5ba"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-down-alt:before{content:"\f881"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-alpha-up-alt:before{content:"\f882"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-down-alt:before{content:"\f884"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-amount-up-alt:before{content:"\f885"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-down-alt:before{content:"\f886"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-numeric-up-alt:before{content:"\f887"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-sourcetree:before{content:"\f7d3"}.fa-spa:before{content:"\f5bb"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-speaker-deck:before{content:"\f83c"}.fa-spell-check:before{content:"\f891"}.fa-spider:before{content:"\f717"}.fa-spinner:before{content:"\f110"}.fa-splotch:before{content:"\f5bc"}.fa-spotify:before{content:"\f1bc"}.fa-spray-can:before{content:"\f5bd"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-square-root-alt:before{content:"\f698"}.fa-squarespace:before{content:"\f5be"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-stackpath:before{content:"\f842"}.fa-stamp:before{content:"\f5bf"}.fa-star:before{content:"\f005"}.fa-star-and-crescent:before{content:"\f699"}.fa-star-half:before{content:"\f089"}.fa-star-half-alt:before{content:"\f5c0"}.fa-star-of-david:before{content:"\f69a"}.fa-star-of-life:before{content:"\f621"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-suitcase-rolling:before{content:"\f5c1"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-surprise:before{content:"\f5c2"}.fa-suse:before{content:"\f7d6"}.fa-swatchbook:before{content:"\f5c3"}.fa-swimmer:before{content:"\f5c4"}.fa-swimming-pool:before{content:"\f5c5"}.fa-symfony:before{content:"\f83d"}.fa-synagogue:before{content:"\f69b"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-teeth:before{content:"\f62e"}.fa-teeth-open:before{content:"\f62f"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-temperature-high:before{content:"\f769"}.fa-temperature-low:before{content:"\f76b"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-tenge:before{content:"\f7d7"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-the-red-yeti:before{content:"\f69d"}.fa-theater-masks:before{content:"\f630"}.fa-themeco:before{content:"\f5c6"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-think-peaks:before{content:"\f731"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-tint-slash:before{content:"\f5c7"}.fa-tired:before{content:"\f5c8"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toilet:before{content:"\f7d8"}.fa-toilet-paper:before{content:"\f71e"}.fa-toolbox:before{content:"\f552"}.fa-tools:before{content:"\f7d9"}.fa-tooth:before{content:"\f5c9"}.fa-torah:before{content:"\f6a0"}.fa-torii-gate:before{content:"\f6a1"}.fa-tractor:before{content:"\f722"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-traffic-light:before{content:"\f637"}.fa-train:before{content:"\f238"}.fa-tram:before{content:"\f7da"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-trash-restore:before{content:"\f829"}.fa-trash-restore-alt:before{content:"\f82a"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-tripadvisor:before{content:"\f262"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-monster:before{content:"\f63b"}.fa-truck-moving:before{content:"\f4df"}.fa-truck-pickup:before{content:"\f63c"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-ubuntu:before{content:"\f7df"}.fa-uikit:before{content:"\f403"}.fa-umbrella:before{content:"\f0e9"}.fa-umbrella-beach:before{content:"\f5ca"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-ups:before{content:"\f7e0"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-injured:before{content:"\f728"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-nurse:before{content:"\f82f"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-usps:before{content:"\f7e1"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-vector-square:before{content:"\f5cb"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vihara:before{content:"\f6a7"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-voicemail:before{content:"\f897"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-mute:before{content:"\f6a9"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vote-yea:before{content:"\f772"}.fa-vr-cardboard:before{content:"\f729"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-water:before{content:"\f773"}.fa-wave-square:before{content:"\f83e"}.fa-waze:before{content:"\f83f"}.fa-weebly:before{content:"\f5cc"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weight-hanging:before{content:"\f5cd"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-wind:before{content:"\f72e"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-bottle:before{content:"\f72f"}.fa-wine-glass:before{content:"\f4e3"}.fa-wine-glass-alt:before{content:"\f5ce"}.fa-wix:before{content:"\f5cf"}.fa-wizards-of-the-coast:before{content:"\f730"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wpressr:before{content:"\f3e4"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yammer:before{content:"\f840"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yarn:before{content:"\f7e3"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yin-yang:before{content:"\f6ad"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.fa-zhihu:before{content:"\f63f"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:400;font-display:auto;src:url(fa-regular-400.eot);src:url(fa-regular-400.eot?#iefix) format("embedded-opentype"),url(fa-regular-400.woff) format("woff")}.far{font-weight:400}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:900;font-display:auto;src:url(fa-solid-900.eot);src:url(fa-solid-900.eot?#iefix) format("embedded-opentype"),url(fa-solid-900.woff) format("woff")}.fa,.far,.fas{font-family:"Font Awesome 5 Free"}.fa,.fas{font-weight:900}
\ No newline at end of file
+.fa,.fab,.fad,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s linear infinite;animation:fa-spin 2s linear infinite}.fa-pulse{-webkit-animation:fa-spin 1s steps(8) infinite;animation:fa-spin 1s steps(8) infinite}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scaleX(-1);transform:scaleX(-1)}.fa-flip-vertical{-webkit-transform:scaleY(-1);transform:scaleY(-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{-webkit-transform:scale(-1);transform:scale(-1)}:root .fa-flip-both,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-acquisitions-incorporated:before{content:"\f6af"}.fa-ad:before{content:"\f641"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-air-freshener:before{content:"\f5d0"}.fa-airbnb:before{content:"\f834"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-alipay:before{content:"\f642"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angry:before{content:"\f556"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-ankh:before{content:"\f644"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-alt:before{content:"\f5d1"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-archway:before{content:"\f557"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-artstation:before{content:"\f77a"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-atlas:before{content:"\f558"}.fa-atlassian:before{content:"\f77b"}.fa-atom:before{content:"\f5d2"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-award:before{content:"\f559"}.fa-aws:before{content:"\f375"}.fa-baby:before{content:"\f77c"}.fa-baby-carriage:before{content:"\f77d"}.fa-backspace:before{content:"\f55a"}.fa-backward:before{content:"\f04a"}.fa-bacon:before{content:"\f7e5"}.fa-bacteria:before{content:"\e059"}.fa-bacterium:before{content:"\e05a"}.fa-bahai:before{content:"\f666"}.fa-balance-scale:before{content:"\f24e"}.fa-balance-scale-left:before{content:"\f515"}.fa-balance-scale-right:before{content:"\f516"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-battle-net:before{content:"\f835"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bezier-curve:before{content:"\f55b"}.fa-bible:before{content:"\f647"}.fa-bicycle:before{content:"\f206"}.fa-biking:before{content:"\f84a"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-biohazard:before{content:"\f780"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blender-phone:before{content:"\f6b6"}.fa-blind:before{content:"\f29d"}.fa-blog:before{content:"\f781"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-bone:before{content:"\f5d7"}.fa-bong:before{content:"\f55c"}.fa-book:before{content:"\f02d"}.fa-book-dead:before{content:"\f6b7"}.fa-book-medical:before{content:"\f7e6"}.fa-book-open:before{content:"\f518"}.fa-book-reader:before{content:"\f5da"}.fa-bookmark:before{content:"\f02e"}.fa-bootstrap:before{content:"\f836"}.fa-border-all:before{content:"\f84c"}.fa-border-none:before{content:"\f850"}.fa-border-style:before{content:"\f853"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-box-tissue:before{content:"\e05b"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-brain:before{content:"\f5dc"}.fa-bread-slice:before{content:"\f7ec"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-brush:before{content:"\f55d"}.fa-btc:before{content:"\f15a"}.fa-buffer:before{content:"\f837"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-bus-alt:before{content:"\f55e"}.fa-business-time:before{content:"\f64a"}.fa-buy-n-large:before{content:"\f8a6"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-day:before{content:"\f783"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-calendar-week:before{content:"\f784"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-campground:before{content:"\f6bb"}.fa-canadian-maple-leaf:before{content:"\f785"}.fa-candy-cane:before{content:"\f786"}.fa-cannabis:before{content:"\f55f"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-car-alt:before{content:"\f5de"}.fa-car-battery:before{content:"\f5df"}.fa-car-crash:before{content:"\f5e1"}.fa-car-side:before{content:"\f5e4"}.fa-caravan:before{content:"\f8ff"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-carrot:before{content:"\f787"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cash-register:before{content:"\f788"}.fa-cat:before{content:"\f6be"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-centos:before{content:"\f789"}.fa-certificate:before{content:"\f0a3"}.fa-chair:before{content:"\f6c0"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-charging-station:before{content:"\f5e7"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-double:before{content:"\f560"}.fa-check-square:before{content:"\f14a"}.fa-cheese:before{content:"\f7ef"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-chromecast:before{content:"\f838"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-city:before{content:"\f64f"}.fa-clinic-medical:before{content:"\f7f2"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-meatball:before{content:"\f73b"}.fa-cloud-moon:before{content:"\f6c3"}.fa-cloud-moon-rain:before{content:"\f73c"}.fa-cloud-rain:before{content:"\f73d"}.fa-cloud-showers-heavy:before{content:"\f740"}.fa-cloud-sun:before{content:"\f6c4"}.fa-cloud-sun-rain:before{content:"\f743"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudflare:before{content:"\e07d"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-cocktail:before{content:"\f561"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dollar:before{content:"\f651"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-medical:before{content:"\f7f5"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-comments-dollar:before{content:"\f653"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-compress-alt:before{content:"\f422"}.fa-compress-arrows-alt:before{content:"\f78c"}.fa-concierge-bell:before{content:"\f562"}.fa-confluence:before{content:"\f78d"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-cookie:before{content:"\f563"}.fa-cookie-bite:before{content:"\f564"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-cotton-bureau:before{content:"\f89e"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-creative-commons-zero:before{content:"\f4f3"}.fa-credit-card:before{content:"\f09d"}.fa-critical-role:before{content:"\f6c9"}.fa-crop:before{content:"\f125"}.fa-crop-alt:before{content:"\f565"}.fa-cross:before{content:"\f654"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-crutch:before{content:"\f7f7"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-d-and-d-beyond:before{content:"\f6ca"}.fa-dailymotion:before{content:"\e052"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-deezer:before{content:"\e077"}.fa-delicious:before{content:"\f1a5"}.fa-democrat:before{content:"\f747"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-dev:before{content:"\f6cc"}.fa-deviantart:before{content:"\f1bd"}.fa-dharmachakra:before{content:"\f655"}.fa-dhl:before{content:"\f790"}.fa-diagnoses:before{content:"\f470"}.fa-diaspora:before{content:"\f791"}.fa-dice:before{content:"\f522"}.fa-dice-d20:before{content:"\f6cf"}.fa-dice-d6:before{content:"\f6d1"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-digital-tachograph:before{content:"\f566"}.fa-directions:before{content:"\f5eb"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-disease:before{content:"\f7fa"}.fa-divide:before{content:"\f529"}.fa-dizzy:before{content:"\f567"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dog:before{content:"\f6d3"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-drafting-compass:before{content:"\f568"}.fa-dragon:before{content:"\f6d5"}.fa-draw-polygon:before{content:"\f5ee"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drum:before{content:"\f569"}.fa-drum-steelpan:before{content:"\f56a"}.fa-drumstick-bite:before{content:"\f6d7"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dumpster:before{content:"\f793"}.fa-dumpster-fire:before{content:"\f794"}.fa-dungeon:before{content:"\f6d9"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edge-legacy:before{content:"\e078"}.fa-edit:before{content:"\f044"}.fa-egg:before{content:"\f7fb"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ello:before{content:"\f5f1"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-text:before{content:"\f658"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-ethernet:before{content:"\f796"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-evernote:before{content:"\f839"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-alt:before{content:"\f424"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fan:before{content:"\f863"}.fa-fantasy-flight-games:before{content:"\f6dc"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-faucet:before{content:"\e005"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-feather-alt:before{content:"\f56b"}.fa-fedex:before{content:"\f797"}.fa-fedora:before{content:"\f798"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-figma:before{content:"\f799"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-contract:before{content:"\f56c"}.fa-file-csv:before{content:"\f6dd"}.fa-file-download:before{content:"\f56d"}.fa-file-excel:before{content:"\f1c3"}.fa-file-export:before{content:"\f56e"}.fa-file-image:before{content:"\f1c5"}.fa-file-import:before{content:"\f56f"}.fa-file-invoice:before{content:"\f570"}.fa-file-invoice-dollar:before{content:"\f571"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-prescription:before{content:"\f572"}.fa-file-signature:before{content:"\f573"}.fa-file-upload:before{content:"\f574"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-fill:before{content:"\f575"}.fa-fill-drip:before{content:"\f576"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fingerprint:before{content:"\f577"}.fa-fire:before{content:"\f06d"}.fa-fire-alt:before{content:"\f7e4"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-firefox-browser:before{content:"\e007"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-fish:before{content:"\f578"}.fa-fist-raised:before{content:"\f6de"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flag-usa:before{content:"\f74d"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-flushed:before{content:"\f579"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-minus:before{content:"\f65d"}.fa-folder-open:before{content:"\f07c"}.fa-folder-plus:before{content:"\f65e"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-frown-open:before{content:"\f57a"}.fa-fulcrum:before{content:"\f50b"}.fa-funnel-dollar:before{content:"\f662"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-ghost:before{content:"\f6e2"}.fa-gift:before{content:"\f06b"}.fa-gifts:before{content:"\f79c"}.fa-git:before{content:"\f1d3"}.fa-git-alt:before{content:"\f841"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-cheers:before{content:"\f79f"}.fa-glass-martini:before{content:"\f000"}.fa-glass-martini-alt:before{content:"\f57b"}.fa-glass-whiskey:before{content:"\f7a0"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-globe-africa:before{content:"\f57c"}.fa-globe-americas:before{content:"\f57d"}.fa-globe-asia:before{content:"\f57e"}.fa-globe-europe:before{content:"\f7a2"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-pay:before{content:"\e079"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-gopuram:before{content:"\f664"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-grimace:before{content:"\f57f"}.fa-grin:before{content:"\f580"}.fa-grin-alt:before{content:"\f581"}.fa-grin-beam:before{content:"\f582"}.fa-grin-beam-sweat:before{content:"\f583"}.fa-grin-hearts:before{content:"\f584"}.fa-grin-squint:before{content:"\f585"}.fa-grin-squint-tears:before{content:"\f586"}.fa-grin-stars:before{content:"\f587"}.fa-grin-tears:before{content:"\f588"}.fa-grin-tongue:before{content:"\f589"}.fa-grin-tongue-squint:before{content:"\f58a"}.fa-grin-tongue-wink:before{content:"\f58b"}.fa-grin-wink:before{content:"\f58c"}.fa-grip-horizontal:before{content:"\f58d"}.fa-grip-lines:before{content:"\f7a4"}.fa-grip-lines-vertical:before{content:"\f7a5"}.fa-grip-vertical:before{content:"\f58e"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-guilded:before{content:"\e07e"}.fa-guitar:before{content:"\f7a6"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hackerrank:before{content:"\f5f7"}.fa-hamburger:before{content:"\f805"}.fa-hammer:before{content:"\f6e3"}.fa-hamsa:before{content:"\f665"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-medical:before{content:"\e05c"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-holding-water:before{content:"\f4c1"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-middle-finger:before{content:"\f806"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-sparkles:before{content:"\e05d"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-hands-wash:before{content:"\e05e"}.fa-handshake:before{content:"\f2b5"}.fa-handshake-alt-slash:before{content:"\e05f"}.fa-handshake-slash:before{content:"\e060"}.fa-hanukiah:before{content:"\f6e6"}.fa-hard-hat:before{content:"\f807"}.fa-hashtag:before{content:"\f292"}.fa-hat-cowboy:before{content:"\f8c0"}.fa-hat-cowboy-side:before{content:"\f8c1"}.fa-hat-wizard:before{content:"\f6e8"}.fa-hdd:before{content:"\f0a0"}.fa-head-side-cough:before{content:"\e061"}.fa-head-side-cough-slash:before{content:"\e062"}.fa-head-side-mask:before{content:"\e063"}.fa-head-side-virus:before{content:"\e064"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-headphones-alt:before{content:"\f58f"}.fa-headset:before{content:"\f590"}.fa-heart:before{content:"\f004"}.fa-heart-broken:before{content:"\f7a9"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-highlighter:before{content:"\f591"}.fa-hiking:before{content:"\f6ec"}.fa-hippo:before{content:"\f6ed"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hive:before{content:"\e07f"}.fa-hockey-puck:before{content:"\f453"}.fa-holly-berry:before{content:"\f7aa"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hornbill:before{content:"\f592"}.fa-horse:before{content:"\f6f0"}.fa-horse-head:before{content:"\f7ab"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hospital-user:before{content:"\f80d"}.fa-hot-tub:before{content:"\f593"}.fa-hotdog:before{content:"\f80f"}.fa-hotel:before{content:"\f594"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-house-damage:before{content:"\f6f1"}.fa-house-user:before{content:"\e065"}.fa-houzz:before{content:"\f27c"}.fa-hryvnia:before{content:"\f6f2"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-ice-cream:before{content:"\f810"}.fa-icicles:before{content:"\f7ad"}.fa-icons:before{content:"\f86d"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-ideal:before{content:"\e013"}.fa-igloo:before{content:"\f7ae"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-innosoft:before{content:"\e080"}.fa-instagram:before{content:"\f16d"}.fa-instagram-square:before{content:"\e055"}.fa-instalod:before{content:"\e081"}.fa-intercom:before{content:"\f7af"}.fa-internet-explorer:before{content:"\f26b"}.fa-invision:before{content:"\f7b0"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itch-io:before{content:"\f83a"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi:before{content:"\f669"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-jira:before{content:"\f7b1"}.fa-joget:before{content:"\f3b7"}.fa-joint:before{content:"\f595"}.fa-joomla:before{content:"\f1aa"}.fa-journal-whills:before{content:"\f66a"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-kaaba:before{content:"\f66b"}.fa-kaggle:before{content:"\f5fa"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-khanda:before{content:"\f66d"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiss:before{content:"\f596"}.fa-kiss-beam:before{content:"\f597"}.fa-kiss-wink-heart:before{content:"\f598"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-landmark:before{content:"\f66f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laptop-code:before{content:"\f5fc"}.fa-laptop-house:before{content:"\e066"}.fa-laptop-medical:before{content:"\f812"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-laugh:before{content:"\f599"}.fa-laugh-beam:before{content:"\f59a"}.fa-laugh-squint:before{content:"\f59b"}.fa-laugh-wink:before{content:"\f59c"}.fa-layer-group:before{content:"\f5fd"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-luggage-cart:before{content:"\f59d"}.fa-lungs:before{content:"\f604"}.fa-lungs-virus:before{content:"\e067"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-mail-bulk:before{content:"\f674"}.fa-mailchimp:before{content:"\f59e"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marked:before{content:"\f59f"}.fa-map-marked-alt:before{content:"\f5a0"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-markdown:before{content:"\f60f"}.fa-marker:before{content:"\f5a1"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mask:before{content:"\f6fa"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-mdb:before{content:"\f8ca"}.fa-medal:before{content:"\f5a2"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-megaport:before{content:"\f5a3"}.fa-meh:before{content:"\f11a"}.fa-meh-blank:before{content:"\f5a4"}.fa-meh-rolling-eyes:before{content:"\f5a5"}.fa-memory:before{content:"\f538"}.fa-mendeley:before{content:"\f7b3"}.fa-menorah:before{content:"\f676"}.fa-mercury:before{content:"\f223"}.fa-meteor:before{content:"\f753"}.fa-microblog:before{content:"\e01a"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microscope:before{content:"\f610"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mitten:before{content:"\f7b5"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mixer:before{content:"\e056"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-monument:before{content:"\f5a6"}.fa-moon:before{content:"\f186"}.fa-mortar-pestle:before{content:"\f5a7"}.fa-mosque:before{content:"\f678"}.fa-motorcycle:before{content:"\f21c"}.fa-mountain:before{content:"\f6fc"}.fa-mouse:before{content:"\f8cc"}.fa-mouse-pointer:before{content:"\f245"}.fa-mug-hot:before{content:"\f7b6"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neos:before{content:"\f612"}.fa-network-wired:before{content:"\f6ff"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nimblr:before{content:"\f5a8"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-octopus-deploy:before{content:"\e082"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-oil-can:before{content:"\f613"}.fa-old-republic:before{content:"\f510"}.fa-om:before{content:"\f679"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-orcid:before{content:"\f8d2"}.fa-osi:before{content:"\f41a"}.fa-otter:before{content:"\f700"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-pager:before{content:"\f815"}.fa-paint-brush:before{content:"\f1fc"}.fa-paint-roller:before{content:"\f5aa"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-passport:before{content:"\f5ab"}.fa-pastafarianism:before{content:"\f67b"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-peace:before{content:"\f67c"}.fa-pen:before{content:"\f304"}.fa-pen-alt:before{content:"\f305"}.fa-pen-fancy:before{content:"\f5ac"}.fa-pen-nib:before{content:"\f5ad"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-pencil-ruler:before{content:"\f5ae"}.fa-penny-arcade:before{content:"\f704"}.fa-people-arrows:before{content:"\e068"}.fa-people-carry:before{content:"\f4ce"}.fa-pepper-hot:before{content:"\f816"}.fa-perbyte:before{content:"\e083"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-person-booth:before{content:"\f756"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-alt:before{content:"\f879"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-square-alt:before{content:"\f87b"}.fa-phone-volume:before{content:"\f2a0"}.fa-photo-video:before{content:"\f87c"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-square:before{content:"\e01e"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-pizza-slice:before{content:"\f818"}.fa-place-of-worship:before{content:"\f67f"}.fa-plane:before{content:"\f072"}.fa-plane-arrival:before{content:"\f5af"}.fa-plane-departure:before{content:"\f5b0"}.fa-plane-slash:before{content:"\e069"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poll:before{content:"\f681"}.fa-poll-h:before{content:"\f682"}.fa-poo:before{content:"\f2fe"}.fa-poo-storm:before{content:"\f75a"}.fa-poop:before{content:"\f619"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-pray:before{content:"\f683"}.fa-praying-hands:before{content:"\f684"}.fa-prescription:before{content:"\f5b1"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pump-medical:before{content:"\e06a"}.fa-pump-soap:before{content:"\e06b"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-quran:before{content:"\f687"}.fa-r-project:before{content:"\f4f7"}.fa-radiation:before{content:"\f7b9"}.fa-radiation-alt:before{content:"\f7ba"}.fa-rainbow:before{content:"\f75b"}.fa-random:before{content:"\f074"}.fa-raspberry-pi:before{content:"\f7bb"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-reacteurope:before{content:"\f75d"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-record-vinyl:before{content:"\f8d9"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redhat:before{content:"\f7bc"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-remove-format:before{content:"\f87d"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-republican:before{content:"\f75e"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-restroom:before{content:"\f7bd"}.fa-retweet:before{content:"\f079"}.fa-rev:before{content:"\f5b2"}.fa-ribbon:before{content:"\f4d6"}.fa-ring:before{content:"\f70b"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-route:before{content:"\f4d7"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-running:before{content:"\f70c"}.fa-rupee-sign:before{content:"\f156"}.fa-rust:before{content:"\e07a"}.fa-sad-cry:before{content:"\f5b3"}.fa-sad-tear:before{content:"\f5b4"}.fa-safari:before{content:"\f267"}.fa-salesforce:before{content:"\f83b"}.fa-sass:before{content:"\f41e"}.fa-satellite:before{content:"\f7bf"}.fa-satellite-dish:before{content:"\f7c0"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-scroll:before{content:"\f70e"}.fa-sd-card:before{content:"\f7c2"}.fa-search:before{content:"\f002"}.fa-search-dollar:before{content:"\f688"}.fa-search-location:before{content:"\f689"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-shapes:before{content:"\f61f"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-shield-virus:before{content:"\e06c"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopify:before{content:"\e057"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shopware:before{content:"\f5b5"}.fa-shower:before{content:"\f2cc"}.fa-shuttle-van:before{content:"\f5b6"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-signature:before{content:"\f5b7"}.fa-sim-card:before{content:"\f7c4"}.fa-simplybuilt:before{content:"\f215"}.fa-sink:before{content:"\e06d"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skating:before{content:"\f7c5"}.fa-sketch:before{content:"\f7c6"}.fa-skiing:before{content:"\f7c9"}.fa-skiing-nordic:before{content:"\f7ca"}.fa-skull:before{content:"\f54c"}.fa-skull-crossbones:before{content:"\f714"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-slash:before{content:"\f715"}.fa-sleigh:before{content:"\f7cc"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smile-beam:before{content:"\f5b8"}.fa-smile-wink:before{content:"\f4da"}.fa-smog:before{content:"\f75f"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-sms:before{content:"\f7cd"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowboarding:before{content:"\f7ce"}.fa-snowflake:before{content:"\f2dc"}.fa-snowman:before{content:"\f7d0"}.fa-snowplow:before{content:"\f7d2"}.fa-soap:before{content:"\e06e"}.fa-socks:before{content:"\f696"}.fa-solar-panel:before{content:"\f5ba"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-down-alt:before{content:"\f881"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-alpha-up-alt:before{content:"\f882"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-down-alt:before{content:"\f884"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-amount-up-alt:before{content:"\f885"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-down-alt:before{content:"\f886"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-numeric-up-alt:before{content:"\f887"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-sourcetree:before{content:"\f7d3"}.fa-spa:before{content:"\f5bb"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-speaker-deck:before{content:"\f83c"}.fa-spell-check:before{content:"\f891"}.fa-spider:before{content:"\f717"}.fa-spinner:before{content:"\f110"}.fa-splotch:before{content:"\f5bc"}.fa-spotify:before{content:"\f1bc"}.fa-spray-can:before{content:"\f5bd"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-square-root-alt:before{content:"\f698"}.fa-squarespace:before{content:"\f5be"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-stackpath:before{content:"\f842"}.fa-stamp:before{content:"\f5bf"}.fa-star:before{content:"\f005"}.fa-star-and-crescent:before{content:"\f699"}.fa-star-half:before{content:"\f089"}.fa-star-half-alt:before{content:"\f5c0"}.fa-star-of-david:before{content:"\f69a"}.fa-star-of-life:before{content:"\f621"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-stopwatch-20:before{content:"\e06f"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-store-alt-slash:before{content:"\e070"}.fa-store-slash:before{content:"\e071"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-suitcase-rolling:before{content:"\f5c1"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-surprise:before{content:"\f5c2"}.fa-suse:before{content:"\f7d6"}.fa-swatchbook:before{content:"\f5c3"}.fa-swift:before{content:"\f8e1"}.fa-swimmer:before{content:"\f5c4"}.fa-swimming-pool:before{content:"\f5c5"}.fa-symfony:before{content:"\f83d"}.fa-synagogue:before{content:"\f69b"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-teeth:before{content:"\f62e"}.fa-teeth-open:before{content:"\f62f"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-temperature-high:before{content:"\f769"}.fa-temperature-low:before{content:"\f76b"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-tenge:before{content:"\f7d7"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-the-red-yeti:before{content:"\f69d"}.fa-theater-masks:before{content:"\f630"}.fa-themeco:before{content:"\f5c6"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-think-peaks:before{content:"\f731"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-tiktok:before{content:"\e07b"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-tint-slash:before{content:"\f5c7"}.fa-tired:before{content:"\f5c8"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toilet:before{content:"\f7d8"}.fa-toilet-paper:before{content:"\f71e"}.fa-toilet-paper-slash:before{content:"\e072"}.fa-toolbox:before{content:"\f552"}.fa-tools:before{content:"\f7d9"}.fa-tooth:before{content:"\f5c9"}.fa-torah:before{content:"\f6a0"}.fa-torii-gate:before{content:"\f6a1"}.fa-tractor:before{content:"\f722"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-traffic-light:before{content:"\f637"}.fa-trailer:before{content:"\e041"}.fa-train:before{content:"\f238"}.fa-tram:before{content:"\f7da"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-trash-restore:before{content:"\f829"}.fa-trash-restore-alt:before{content:"\f82a"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-monster:before{content:"\f63b"}.fa-truck-moving:before{content:"\f4df"}.fa-truck-pickup:before{content:"\f63c"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-ubuntu:before{content:"\f7df"}.fa-uikit:before{content:"\f403"}.fa-umbraco:before{content:"\f8e8"}.fa-umbrella:before{content:"\f0e9"}.fa-umbrella-beach:before{content:"\f5ca"}.fa-uncharted:before{content:"\e084"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-unity:before{content:"\e049"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-unsplash:before{content:"\e07c"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-ups:before{content:"\f7e0"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-injured:before{content:"\f728"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-nurse:before{content:"\f82f"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-users-slash:before{content:"\e073"}.fa-usps:before{content:"\f7e1"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-vector-square:before{content:"\f5cb"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-vest:before{content:"\e085"}.fa-vest-patches:before{content:"\e086"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vihara:before{content:"\f6a7"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-virus:before{content:"\e074"}.fa-virus-slash:before{content:"\e075"}.fa-viruses:before{content:"\e076"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-voicemail:before{content:"\f897"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-mute:before{content:"\f6a9"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vote-yea:before{content:"\f772"}.fa-vr-cardboard:before{content:"\f729"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-watchman-monitoring:before{content:"\e087"}.fa-water:before{content:"\f773"}.fa-wave-square:before{content:"\f83e"}.fa-waze:before{content:"\f83f"}.fa-weebly:before{content:"\f5cc"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weight-hanging:before{content:"\f5cd"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-wind:before{content:"\f72e"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-bottle:before{content:"\f72f"}.fa-wine-glass:before{content:"\f4e3"}.fa-wine-glass-alt:before{content:"\f5ce"}.fa-wix:before{content:"\f5cf"}.fa-wizards-of-the-coast:before{content:"\f730"}.fa-wodu:before{content:"\e088"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wpressr:before{content:"\f3e4"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yammer:before{content:"\f840"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yarn:before{content:"\f7e3"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yin-yang:before{content:"\f6ad"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.fa-zhihu:before{content:"\f63f"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:"Font Awesome 5 Brands";font-style:normal;font-weight:400;font-display:block;src:url(fa-brands-400.eot);src:url(fa-brands-400.eot?#iefix) format("embedded-opentype"),url(fa-brands-400.woff2) format("woff2"),url(fa-brands-400.woff) format("woff"),url(fa-brands-400.ttf) format("truetype"),url(fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:"Font Awesome 5 Brands"}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:400;font-display:block;src:url(fa-regular-400.eot);src:url(fa-regular-400.eot?#iefix) format("embedded-opentype"),url(fa-regular-400.woff2) format("woff2"),url(fa-regular-400.woff) format("woff"),url(fa-regular-400.ttf) format("truetype"),url(fa-regular-400.svg#fontawesome) format("svg")}.fab,.far{font-weight:400}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:900;font-display:block;src:url(fa-solid-900.eot);src:url(fa-solid-900.eot?#iefix) format("embedded-opentype"),url(fa-solid-900.woff2) format("woff2"),url(fa-solid-900.woff) format("woff"),url(fa-solid-900.ttf) format("truetype"),url(fa-solid-900.svg#fontawesome) format("svg")}.fa,.far,.fas{font-family:"Font Awesome 5 Free"}.fa,.fas{font-weight:900}
diff --git a/html/font-awesome/css/v4-shims.min.css b/html/font-awesome/css/v4-shims.min.css
index 5f3fdc598c82..21a0708aafae 100644
--- a/html/font-awesome/css/v4-shims.min.css
+++ b/html/font-awesome/css/v4-shims.min.css
@@ -1,5 +1,5 @@
/*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
*/
-.fa.fa-glass:before{content:"\f000"}.fa.fa-meetup{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-star-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-o:before{content:"\f005"}.fa.fa-close:before,.fa.fa-remove:before{content:"\f00d"}.fa.fa-gear:before{content:"\f013"}.fa.fa-trash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-trash-o:before{content:"\f2ed"}.fa.fa-file-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-o:before{content:"\f15b"}.fa.fa-clock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-clock-o:before{content:"\f017"}.fa.fa-arrow-circle-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-down:before{content:"\f358"}.fa.fa-arrow-circle-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-up:before{content:"\f35b"}.fa.fa-play-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-play-circle-o:before{content:"\f144"}.fa.fa-repeat:before,.fa.fa-rotate-right:before{content:"\f01e"}.fa.fa-refresh:before{content:"\f021"}.fa.fa-list-alt{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dedent:before{content:"\f03b"}.fa.fa-video-camera:before{content:"\f03d"}.fa.fa-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-picture-o:before{content:"\f03e"}.fa.fa-photo{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-photo:before{content:"\f03e"}.fa.fa-image{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-image:before{content:"\f03e"}.fa.fa-pencil:before{content:"\f303"}.fa.fa-map-marker:before{content:"\f3c5"}.fa.fa-pencil-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pencil-square-o:before{content:"\f044"}.fa.fa-share-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-share-square-o:before{content:"\f14d"}.fa.fa-check-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-square-o:before{content:"\f14a"}.fa.fa-arrows:before{content:"\f0b2"}.fa.fa-times-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-circle-o:before{content:"\f057"}.fa.fa-check-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-circle-o:before{content:"\f058"}.fa.fa-mail-forward:before{content:"\f064"}.fa.fa-eye,.fa.fa-eye-slash{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-warning:before{content:"\f071"}.fa.fa-calendar:before{content:"\f073"}.fa.fa-arrows-v:before{content:"\f338"}.fa.fa-arrows-h:before{content:"\f337"}.fa.fa-bar-chart{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart:before{content:"\f080"}.fa.fa-bar-chart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart-o:before{content:"\f080"}.fa.fa-facebook-square,.fa.fa-twitter-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gears:before{content:"\f085"}.fa.fa-thumbs-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-up:before{content:"\f164"}.fa.fa-thumbs-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-down:before{content:"\f165"}.fa.fa-heart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-heart-o:before{content:"\f004"}.fa.fa-sign-out:before{content:"\f2f5"}.fa.fa-linkedin-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin-square:before{content:"\f08c"}.fa.fa-thumb-tack:before{content:"\f08d"}.fa.fa-external-link:before{content:"\f35d"}.fa.fa-sign-in:before{content:"\f2f6"}.fa.fa-github-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-lemon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lemon-o:before{content:"\f094"}.fa.fa-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-square-o:before{content:"\f0c8"}.fa.fa-bookmark-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bookmark-o:before{content:"\f02e"}.fa.fa-facebook,.fa.fa-twitter{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook:before{content:"\f39e"}.fa.fa-facebook-f{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-f:before{content:"\f39e"}.fa.fa-github{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-feed:before{content:"\f09e"}.fa.fa-hdd-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hdd-o:before{content:"\f0a0"}.fa.fa-hand-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-right:before{content:"\f0a4"}.fa.fa-hand-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-left:before{content:"\f0a5"}.fa.fa-hand-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-up:before{content:"\f0a6"}.fa.fa-hand-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-down:before{content:"\f0a7"}.fa.fa-arrows-alt:before{content:"\f31e"}.fa.fa-group:before{content:"\f0c0"}.fa.fa-chain:before{content:"\f0c1"}.fa.fa-scissors:before{content:"\f0c4"}.fa.fa-files-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-files-o:before{content:"\f0c5"}.fa.fa-floppy-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-floppy-o:before{content:"\f0c7"}.fa.fa-navicon:before,.fa.fa-reorder:before{content:"\f0c9"}.fa.fa-google-plus,.fa.fa-google-plus-square,.fa.fa-pinterest,.fa.fa-pinterest-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus:before{content:"\f0d5"}.fa.fa-money{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-money:before{content:"\f3d1"}.fa.fa-unsorted:before{content:"\f0dc"}.fa.fa-sort-desc:before{content:"\f0dd"}.fa.fa-sort-asc:before{content:"\f0de"}.fa.fa-linkedin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin:before{content:"\f0e1"}.fa.fa-rotate-left:before{content:"\f0e2"}.fa.fa-legal:before{content:"\f0e3"}.fa.fa-dashboard:before,.fa.fa-tachometer:before{content:"\f3fd"}.fa.fa-comment-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comment-o:before{content:"\f075"}.fa.fa-comments-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comments-o:before{content:"\f086"}.fa.fa-flash:before{content:"\f0e7"}.fa.fa-clipboard,.fa.fa-paste{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paste:before{content:"\f328"}.fa.fa-lightbulb-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lightbulb-o:before{content:"\f0eb"}.fa.fa-exchange:before{content:"\f362"}.fa.fa-cloud-download:before{content:"\f381"}.fa.fa-cloud-upload:before{content:"\f382"}.fa.fa-bell-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-o:before{content:"\f0f3"}.fa.fa-cutlery:before{content:"\f2e7"}.fa.fa-file-text-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-text-o:before{content:"\f15c"}.fa.fa-building-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-building-o:before{content:"\f1ad"}.fa.fa-hospital-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hospital-o:before{content:"\f0f8"}.fa.fa-tablet:before{content:"\f3fa"}.fa.fa-mobile-phone:before,.fa.fa-mobile:before{content:"\f3cd"}.fa.fa-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-o:before{content:"\f111"}.fa.fa-mail-reply:before{content:"\f3e5"}.fa.fa-github-alt{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-folder-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-o:before{content:"\f07b"}.fa.fa-folder-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-open-o:before{content:"\f07c"}.fa.fa-smile-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-smile-o:before{content:"\f118"}.fa.fa-frown-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-frown-o:before{content:"\f119"}.fa.fa-meh-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-meh-o:before{content:"\f11a"}.fa.fa-keyboard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-keyboard-o:before{content:"\f11c"}.fa.fa-flag-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-flag-o:before{content:"\f024"}.fa.fa-mail-reply-all:before{content:"\f122"}.fa.fa-star-half-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-o:before{content:"\f089"}.fa.fa-star-half-empty{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-empty:before{content:"\f089"}.fa.fa-star-half-full{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-full:before{content:"\f089"}.fa.fa-code-fork:before{content:"\f126"}.fa.fa-chain-broken:before{content:"\f127"}.fa.fa-shield:before{content:"\f3ed"}.fa.fa-calendar-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-o:before{content:"\f133"}.fa.fa-css3,.fa.fa-html5,.fa.fa-maxcdn{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ticket:before{content:"\f3ff"}.fa.fa-minus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-minus-square-o:before{content:"\f146"}.fa.fa-level-up:before{content:"\f3bf"}.fa.fa-level-down:before{content:"\f3be"}.fa.fa-pencil-square:before{content:"\f14b"}.fa.fa-external-link-square:before{content:"\f360"}.fa.fa-compass{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down:before{content:"\f150"}.fa.fa-toggle-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-down:before{content:"\f150"}.fa.fa-caret-square-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-up:before{content:"\f151"}.fa.fa-toggle-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-up:before{content:"\f151"}.fa.fa-caret-square-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-right:before{content:"\f152"}.fa.fa-toggle-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-right:before{content:"\f152"}.fa.fa-eur:before,.fa.fa-euro:before{content:"\f153"}.fa.fa-gbp:before{content:"\f154"}.fa.fa-dollar:before,.fa.fa-usd:before{content:"\f155"}.fa.fa-inr:before,.fa.fa-rupee:before{content:"\f156"}.fa.fa-cny:before,.fa.fa-jpy:before,.fa.fa-rmb:before,.fa.fa-yen:before{content:"\f157"}.fa.fa-rouble:before,.fa.fa-rub:before,.fa.fa-ruble:before{content:"\f158"}.fa.fa-krw:before,.fa.fa-won:before{content:"\f159"}.fa.fa-bitcoin,.fa.fa-btc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitcoin:before{content:"\f15a"}.fa.fa-file-text:before{content:"\f15c"}.fa.fa-sort-alpha-asc:before{content:"\f15d"}.fa.fa-sort-alpha-desc:before{content:"\f15e"}.fa.fa-sort-amount-asc:before{content:"\f160"}.fa.fa-sort-amount-desc:before{content:"\f161"}.fa.fa-sort-numeric-asc:before{content:"\f162"}.fa.fa-sort-numeric-desc:before{content:"\f163"}.fa.fa-xing,.fa.fa-xing-square,.fa.fa-youtube,.fa.fa-youtube-play,.fa.fa-youtube-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-youtube-play:before{content:"\f167"}.fa.fa-adn,.fa.fa-bitbucket,.fa.fa-bitbucket-square,.fa.fa-dropbox,.fa.fa-flickr,.fa.fa-instagram,.fa.fa-stack-overflow{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitbucket-square:before{content:"\f171"}.fa.fa-tumblr,.fa.fa-tumblr-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-long-arrow-down:before{content:"\f309"}.fa.fa-long-arrow-up:before{content:"\f30c"}.fa.fa-long-arrow-left:before{content:"\f30a"}.fa.fa-long-arrow-right:before{content:"\f30b"}.fa.fa-android,.fa.fa-apple,.fa.fa-dribbble,.fa.fa-foursquare,.fa.fa-gittip,.fa.fa-gratipay,.fa.fa-linux,.fa.fa-skype,.fa.fa-trello,.fa.fa-windows{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gittip:before{content:"\f184"}.fa.fa-sun-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sun-o:before{content:"\f185"}.fa.fa-moon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-moon-o:before{content:"\f186"}.fa.fa-pagelines,.fa.fa-renren,.fa.fa-stack-exchange,.fa.fa-vk,.fa.fa-weibo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-arrow-circle-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-right:before{content:"\f35a"}.fa.fa-arrow-circle-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-left:before{content:"\f359"}.fa.fa-caret-square-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-left:before{content:"\f191"}.fa.fa-toggle-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-left:before{content:"\f191"}.fa.fa-dot-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dot-circle-o:before{content:"\f192"}.fa.fa-vimeo-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-try:before,.fa.fa-turkish-lira:before{content:"\f195"}.fa.fa-plus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-plus-square-o:before{content:"\f0fe"}.fa.fa-openid,.fa.fa-slack,.fa.fa-wordpress{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bank:before,.fa.fa-institution:before{content:"\f19c"}.fa.fa-mortar-board:before{content:"\f19d"}.fa.fa-delicious,.fa.fa-digg,.fa.fa-drupal,.fa.fa-google,.fa.fa-joomla,.fa.fa-pied-piper-alt,.fa.fa-pied-piper-pp,.fa.fa-reddit,.fa.fa-reddit-square,.fa.fa-stumbleupon,.fa.fa-stumbleupon-circle,.fa.fa-yahoo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-spoon:before{content:"\f2e5"}.fa.fa-behance,.fa.fa-behance-square,.fa.fa-steam,.fa.fa-steam-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-automobile:before{content:"\f1b9"}.fa.fa-cab:before{content:"\f1ba"}.fa.fa-envelope-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-o:before{content:"\f0e0"}.fa.fa-deviantart,.fa.fa-soundcloud{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-file-pdf-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-pdf-o:before{content:"\f1c1"}.fa.fa-file-word-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-word-o:before{content:"\f1c2"}.fa.fa-file-excel-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-excel-o:before{content:"\f1c3"}.fa.fa-file-powerpoint-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-powerpoint-o:before{content:"\f1c4"}.fa.fa-file-image-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-image-o:before{content:"\f1c5"}.fa.fa-file-photo-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-photo-o:before{content:"\f1c5"}.fa.fa-file-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-picture-o:before{content:"\f1c5"}.fa.fa-file-archive-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-archive-o:before{content:"\f1c6"}.fa.fa-file-zip-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-zip-o:before{content:"\f1c6"}.fa.fa-file-audio-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-audio-o:before{content:"\f1c7"}.fa.fa-file-sound-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-sound-o:before{content:"\f1c7"}.fa.fa-file-video-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-video-o:before{content:"\f1c8"}.fa.fa-file-movie-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-movie-o:before{content:"\f1c8"}.fa.fa-file-code-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-code-o:before{content:"\f1c9"}.fa.fa-codepen,.fa.fa-jsfiddle,.fa.fa-vine{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-life-bouy,.fa.fa-life-ring{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-bouy:before{content:"\f1cd"}.fa.fa-life-buoy{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-buoy:before{content:"\f1cd"}.fa.fa-life-saver{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-saver:before{content:"\f1cd"}.fa.fa-support{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-support:before{content:"\f1cd"}.fa.fa-circle-o-notch:before{content:"\f1ce"}.fa.fa-ra,.fa.fa-rebel{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ra:before{content:"\f1d0"}.fa.fa-resistance{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-resistance:before{content:"\f1d0"}.fa.fa-empire,.fa.fa-ge{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ge:before{content:"\f1d1"}.fa.fa-git,.fa.fa-git-square,.fa.fa-hacker-news,.fa.fa-y-combinator-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-y-combinator-square:before{content:"\f1d4"}.fa.fa-yc-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc-square:before{content:"\f1d4"}.fa.fa-qq,.fa.fa-tencent-weibo,.fa.fa-wechat,.fa.fa-weixin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wechat:before{content:"\f1d7"}.fa.fa-send:before{content:"\f1d8"}.fa.fa-paper-plane-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paper-plane-o:before{content:"\f1d8"}.fa.fa-send-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-send-o:before{content:"\f1d8"}.fa.fa-circle-thin{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-thin:before{content:"\f111"}.fa.fa-header:before{content:"\f1dc"}.fa.fa-sliders:before{content:"\f1de"}.fa.fa-futbol-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-futbol-o:before{content:"\f1e3"}.fa.fa-soccer-ball-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-soccer-ball-o:before{content:"\f1e3"}.fa.fa-slideshare,.fa.fa-twitch,.fa.fa-yelp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-newspaper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-newspaper-o:before{content:"\f1ea"}.fa.fa-cc-amex,.fa.fa-cc-discover,.fa.fa-cc-mastercard,.fa.fa-cc-paypal,.fa.fa-cc-stripe,.fa.fa-cc-visa,.fa.fa-google-wallet,.fa.fa-paypal{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bell-slash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-slash-o:before{content:"\f1f6"}.fa.fa-trash:before{content:"\f2ed"}.fa.fa-copyright{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-eyedropper:before{content:"\f1fb"}.fa.fa-area-chart:before{content:"\f1fe"}.fa.fa-pie-chart:before{content:"\f200"}.fa.fa-line-chart:before{content:"\f201"}.fa.fa-angellist,.fa.fa-ioxhost,.fa.fa-lastfm,.fa.fa-lastfm-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-cc{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-cc:before{content:"\f20a"}.fa.fa-ils:before,.fa.fa-shekel:before,.fa.fa-sheqel:before{content:"\f20b"}.fa.fa-meanpath{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-meanpath:before{content:"\f2b4"}.fa.fa-buysellads,.fa.fa-connectdevelop,.fa.fa-dashcube,.fa.fa-forumbee,.fa.fa-leanpub,.fa.fa-sellsy,.fa.fa-shirtsinbulk,.fa.fa-simplybuilt,.fa.fa-skyatlas{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-diamond{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-diamond:before{content:"\f3a5"}.fa.fa-intersex:before{content:"\f224"}.fa.fa-facebook-official{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-official:before{content:"\f09a"}.fa.fa-pinterest-p,.fa.fa-whatsapp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-hotel:before{content:"\f236"}.fa.fa-medium,.fa.fa-viacoin,.fa.fa-y-combinator,.fa.fa-yc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc:before{content:"\f23b"}.fa.fa-expeditedssl,.fa.fa-opencart,.fa.fa-optin-monster{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-battery-4:before,.fa.fa-battery:before{content:"\f240"}.fa.fa-battery-3:before{content:"\f241"}.fa.fa-battery-2:before{content:"\f242"}.fa.fa-battery-1:before{content:"\f243"}.fa.fa-battery-0:before{content:"\f244"}.fa.fa-object-group,.fa.fa-object-ungroup,.fa.fa-sticky-note-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sticky-note-o:before{content:"\f249"}.fa.fa-cc-diners-club,.fa.fa-cc-jcb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-clone,.fa.fa-hourglass-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hourglass-o:before{content:"\f254"}.fa.fa-hourglass-1:before{content:"\f251"}.fa.fa-hourglass-2:before{content:"\f252"}.fa.fa-hourglass-3:before{content:"\f253"}.fa.fa-hand-rock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-rock-o:before{content:"\f255"}.fa.fa-hand-grab-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-grab-o:before{content:"\f255"}.fa.fa-hand-paper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-paper-o:before{content:"\f256"}.fa.fa-hand-stop-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-stop-o:before{content:"\f256"}.fa.fa-hand-scissors-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-scissors-o:before{content:"\f257"}.fa.fa-hand-lizard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-lizard-o:before{content:"\f258"}.fa.fa-hand-spock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-spock-o:before{content:"\f259"}.fa.fa-hand-pointer-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-pointer-o:before{content:"\f25a"}.fa.fa-hand-peace-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-peace-o:before{content:"\f25b"}.fa.fa-registered{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-chrome,.fa.fa-creative-commons,.fa.fa-firefox,.fa.fa-get-pocket,.fa.fa-gg,.fa.fa-gg-circle,.fa.fa-internet-explorer,.fa.fa-odnoklassniki,.fa.fa-odnoklassniki-square,.fa.fa-opera,.fa.fa-safari,.fa.fa-tripadvisor,.fa.fa-wikipedia-w{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-television:before{content:"\f26c"}.fa.fa-500px,.fa.fa-amazon,.fa.fa-contao{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-calendar-plus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-plus-o:before{content:"\f271"}.fa.fa-calendar-minus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-minus-o:before{content:"\f272"}.fa.fa-calendar-times-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-times-o:before{content:"\f273"}.fa.fa-calendar-check-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-check-o:before{content:"\f274"}.fa.fa-map-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-map-o:before{content:"\f279"}.fa.fa-commenting:before{content:"\f4ad"}.fa.fa-commenting-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-commenting-o:before{content:"\f4ad"}.fa.fa-houzz,.fa.fa-vimeo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-vimeo:before{content:"\f27d"}.fa.fa-black-tie,.fa.fa-edge,.fa.fa-fonticons,.fa.fa-reddit-alien{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card-alt:before{content:"\f09d"}.fa.fa-codiepie,.fa.fa-fort-awesome,.fa.fa-mixcloud,.fa.fa-modx,.fa.fa-product-hunt,.fa.fa-scribd,.fa.fa-usb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-pause-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pause-circle-o:before{content:"\f28b"}.fa.fa-stop-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-stop-circle-o:before{content:"\f28d"}.fa.fa-bluetooth,.fa.fa-bluetooth-b,.fa.fa-envira,.fa.fa-gitlab,.fa.fa-wheelchair-alt,.fa.fa-wpbeginner,.fa.fa-wpforms{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wheelchair-alt:before{content:"\f368"}.fa.fa-question-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-question-circle-o:before{content:"\f059"}.fa.fa-volume-control-phone:before{content:"\f2a0"}.fa.fa-asl-interpreting:before{content:"\f2a3"}.fa.fa-deafness:before,.fa.fa-hard-of-hearing:before{content:"\f2a4"}.fa.fa-glide,.fa.fa-glide-g{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-signing:before{content:"\f2a7"}.fa.fa-first-order,.fa.fa-google-plus-official,.fa.fa-pied-piper,.fa.fa-snapchat,.fa.fa-snapchat-ghost,.fa.fa-snapchat-square,.fa.fa-themeisle,.fa.fa-viadeo,.fa.fa-viadeo-square,.fa.fa-yoast{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-official:before{content:"\f2b3"}.fa.fa-google-plus-circle{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-circle:before{content:"\f2b3"}.fa.fa-fa,.fa.fa-font-awesome{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-fa:before{content:"\f2b4"}.fa.fa-handshake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-handshake-o:before{content:"\f2b5"}.fa.fa-envelope-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-open-o:before{content:"\f2b6"}.fa.fa-linode{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-address-book-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-book-o:before{content:"\f2b9"}.fa.fa-vcard:before{content:"\f2bb"}.fa.fa-address-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-card-o:before{content:"\f2bb"}.fa.fa-vcard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-vcard-o:before{content:"\f2bb"}.fa.fa-user-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-circle-o:before{content:"\f2bd"}.fa.fa-user-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-o:before{content:"\f007"}.fa.fa-id-badge{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license:before{content:"\f2c2"}.fa.fa-id-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-id-card-o:before{content:"\f2c2"}.fa.fa-drivers-license-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license-o:before{content:"\f2c2"}.fa.fa-free-code-camp,.fa.fa-quora,.fa.fa-telegram{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-thermometer-4:before,.fa.fa-thermometer:before{content:"\f2c7"}.fa.fa-thermometer-3:before{content:"\f2c8"}.fa.fa-thermometer-2:before{content:"\f2c9"}.fa.fa-thermometer-1:before{content:"\f2ca"}.fa.fa-thermometer-0:before{content:"\f2cb"}.fa.fa-bathtub:before,.fa.fa-s15:before{content:"\f2cd"}.fa.fa-window-maximize,.fa.fa-window-restore{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle:before{content:"\f410"}.fa.fa-window-close-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-window-close-o:before{content:"\f410"}.fa.fa-times-rectangle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle-o:before{content:"\f410"}.fa.fa-bandcamp,.fa.fa-eercast,.fa.fa-etsy,.fa.fa-grav,.fa.fa-imdb,.fa.fa-ravelry{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-eercast:before{content:"\f2da"}.fa.fa-snowflake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-snowflake-o:before{content:"\f2dc"}.fa.fa-spotify,.fa.fa-superpowers,.fa.fa-wpexplorer{font-family:"Font Awesome 5 Brands";font-weight:400}
\ No newline at end of file
+.fa.fa-glass:before{content:"\f000"}.fa.fa-meetup{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-star-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-o:before{content:"\f005"}.fa.fa-close:before,.fa.fa-remove:before{content:"\f00d"}.fa.fa-gear:before{content:"\f013"}.fa.fa-trash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-trash-o:before{content:"\f2ed"}.fa.fa-file-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-o:before{content:"\f15b"}.fa.fa-clock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-clock-o:before{content:"\f017"}.fa.fa-arrow-circle-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-down:before{content:"\f358"}.fa.fa-arrow-circle-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-up:before{content:"\f35b"}.fa.fa-play-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-play-circle-o:before{content:"\f144"}.fa.fa-repeat:before,.fa.fa-rotate-right:before{content:"\f01e"}.fa.fa-refresh:before{content:"\f021"}.fa.fa-list-alt{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dedent:before{content:"\f03b"}.fa.fa-video-camera:before{content:"\f03d"}.fa.fa-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-picture-o:before{content:"\f03e"}.fa.fa-photo{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-photo:before{content:"\f03e"}.fa.fa-image{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-image:before{content:"\f03e"}.fa.fa-pencil:before{content:"\f303"}.fa.fa-map-marker:before{content:"\f3c5"}.fa.fa-pencil-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pencil-square-o:before{content:"\f044"}.fa.fa-share-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-share-square-o:before{content:"\f14d"}.fa.fa-check-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-square-o:before{content:"\f14a"}.fa.fa-arrows:before{content:"\f0b2"}.fa.fa-times-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-circle-o:before{content:"\f057"}.fa.fa-check-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-circle-o:before{content:"\f058"}.fa.fa-mail-forward:before{content:"\f064"}.fa.fa-expand:before{content:"\f424"}.fa.fa-compress:before{content:"\f422"}.fa.fa-eye,.fa.fa-eye-slash{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-warning:before{content:"\f071"}.fa.fa-calendar:before{content:"\f073"}.fa.fa-arrows-v:before{content:"\f338"}.fa.fa-arrows-h:before{content:"\f337"}.fa.fa-bar-chart{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart:before{content:"\f080"}.fa.fa-bar-chart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart-o:before{content:"\f080"}.fa.fa-facebook-square,.fa.fa-twitter-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gears:before{content:"\f085"}.fa.fa-thumbs-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-up:before{content:"\f164"}.fa.fa-thumbs-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-down:before{content:"\f165"}.fa.fa-heart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-heart-o:before{content:"\f004"}.fa.fa-sign-out:before{content:"\f2f5"}.fa.fa-linkedin-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin-square:before{content:"\f08c"}.fa.fa-thumb-tack:before{content:"\f08d"}.fa.fa-external-link:before{content:"\f35d"}.fa.fa-sign-in:before{content:"\f2f6"}.fa.fa-github-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-lemon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lemon-o:before{content:"\f094"}.fa.fa-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-square-o:before{content:"\f0c8"}.fa.fa-bookmark-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bookmark-o:before{content:"\f02e"}.fa.fa-facebook,.fa.fa-twitter{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook:before{content:"\f39e"}.fa.fa-facebook-f{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-f:before{content:"\f39e"}.fa.fa-github{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-feed:before{content:"\f09e"}.fa.fa-hdd-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hdd-o:before{content:"\f0a0"}.fa.fa-hand-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-right:before{content:"\f0a4"}.fa.fa-hand-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-left:before{content:"\f0a5"}.fa.fa-hand-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-up:before{content:"\f0a6"}.fa.fa-hand-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-down:before{content:"\f0a7"}.fa.fa-arrows-alt:before{content:"\f31e"}.fa.fa-group:before{content:"\f0c0"}.fa.fa-chain:before{content:"\f0c1"}.fa.fa-scissors:before{content:"\f0c4"}.fa.fa-files-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-files-o:before{content:"\f0c5"}.fa.fa-floppy-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-floppy-o:before{content:"\f0c7"}.fa.fa-navicon:before,.fa.fa-reorder:before{content:"\f0c9"}.fa.fa-google-plus,.fa.fa-google-plus-square,.fa.fa-pinterest,.fa.fa-pinterest-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus:before{content:"\f0d5"}.fa.fa-money{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-money:before{content:"\f3d1"}.fa.fa-unsorted:before{content:"\f0dc"}.fa.fa-sort-desc:before{content:"\f0dd"}.fa.fa-sort-asc:before{content:"\f0de"}.fa.fa-linkedin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin:before{content:"\f0e1"}.fa.fa-rotate-left:before{content:"\f0e2"}.fa.fa-legal:before{content:"\f0e3"}.fa.fa-dashboard:before,.fa.fa-tachometer:before{content:"\f3fd"}.fa.fa-comment-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comment-o:before{content:"\f075"}.fa.fa-comments-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comments-o:before{content:"\f086"}.fa.fa-flash:before{content:"\f0e7"}.fa.fa-clipboard,.fa.fa-paste{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paste:before{content:"\f328"}.fa.fa-lightbulb-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lightbulb-o:before{content:"\f0eb"}.fa.fa-exchange:before{content:"\f362"}.fa.fa-cloud-download:before{content:"\f381"}.fa.fa-cloud-upload:before{content:"\f382"}.fa.fa-bell-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-o:before{content:"\f0f3"}.fa.fa-cutlery:before{content:"\f2e7"}.fa.fa-file-text-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-text-o:before{content:"\f15c"}.fa.fa-building-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-building-o:before{content:"\f1ad"}.fa.fa-hospital-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hospital-o:before{content:"\f0f8"}.fa.fa-tablet:before{content:"\f3fa"}.fa.fa-mobile-phone:before,.fa.fa-mobile:before{content:"\f3cd"}.fa.fa-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-o:before{content:"\f111"}.fa.fa-mail-reply:before{content:"\f3e5"}.fa.fa-github-alt{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-folder-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-o:before{content:"\f07b"}.fa.fa-folder-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-open-o:before{content:"\f07c"}.fa.fa-smile-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-smile-o:before{content:"\f118"}.fa.fa-frown-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-frown-o:before{content:"\f119"}.fa.fa-meh-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-meh-o:before{content:"\f11a"}.fa.fa-keyboard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-keyboard-o:before{content:"\f11c"}.fa.fa-flag-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-flag-o:before{content:"\f024"}.fa.fa-mail-reply-all:before{content:"\f122"}.fa.fa-star-half-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-o:before{content:"\f089"}.fa.fa-star-half-empty{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-empty:before{content:"\f089"}.fa.fa-star-half-full{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-full:before{content:"\f089"}.fa.fa-code-fork:before{content:"\f126"}.fa.fa-chain-broken:before{content:"\f127"}.fa.fa-shield:before{content:"\f3ed"}.fa.fa-calendar-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-o:before{content:"\f133"}.fa.fa-css3,.fa.fa-html5,.fa.fa-maxcdn{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ticket:before{content:"\f3ff"}.fa.fa-minus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-minus-square-o:before{content:"\f146"}.fa.fa-level-up:before{content:"\f3bf"}.fa.fa-level-down:before{content:"\f3be"}.fa.fa-pencil-square:before{content:"\f14b"}.fa.fa-external-link-square:before{content:"\f360"}.fa.fa-compass{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down:before{content:"\f150"}.fa.fa-toggle-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-down:before{content:"\f150"}.fa.fa-caret-square-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-up:before{content:"\f151"}.fa.fa-toggle-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-up:before{content:"\f151"}.fa.fa-caret-square-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-right:before{content:"\f152"}.fa.fa-toggle-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-right:before{content:"\f152"}.fa.fa-eur:before,.fa.fa-euro:before{content:"\f153"}.fa.fa-gbp:before{content:"\f154"}.fa.fa-dollar:before,.fa.fa-usd:before{content:"\f155"}.fa.fa-inr:before,.fa.fa-rupee:before{content:"\f156"}.fa.fa-cny:before,.fa.fa-jpy:before,.fa.fa-rmb:before,.fa.fa-yen:before{content:"\f157"}.fa.fa-rouble:before,.fa.fa-rub:before,.fa.fa-ruble:before{content:"\f158"}.fa.fa-krw:before,.fa.fa-won:before{content:"\f159"}.fa.fa-bitcoin,.fa.fa-btc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitcoin:before{content:"\f15a"}.fa.fa-file-text:before{content:"\f15c"}.fa.fa-sort-alpha-asc:before{content:"\f15d"}.fa.fa-sort-alpha-desc:before{content:"\f881"}.fa.fa-sort-amount-asc:before{content:"\f160"}.fa.fa-sort-amount-desc:before{content:"\f884"}.fa.fa-sort-numeric-asc:before{content:"\f162"}.fa.fa-sort-numeric-desc:before{content:"\f886"}.fa.fa-xing,.fa.fa-xing-square,.fa.fa-youtube,.fa.fa-youtube-play,.fa.fa-youtube-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-youtube-play:before{content:"\f167"}.fa.fa-adn,.fa.fa-bitbucket,.fa.fa-bitbucket-square,.fa.fa-dropbox,.fa.fa-flickr,.fa.fa-instagram,.fa.fa-stack-overflow{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitbucket-square:before{content:"\f171"}.fa.fa-tumblr,.fa.fa-tumblr-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-long-arrow-down:before{content:"\f309"}.fa.fa-long-arrow-up:before{content:"\f30c"}.fa.fa-long-arrow-left:before{content:"\f30a"}.fa.fa-long-arrow-right:before{content:"\f30b"}.fa.fa-android,.fa.fa-apple,.fa.fa-dribbble,.fa.fa-foursquare,.fa.fa-gittip,.fa.fa-gratipay,.fa.fa-linux,.fa.fa-skype,.fa.fa-trello,.fa.fa-windows{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gittip:before{content:"\f184"}.fa.fa-sun-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sun-o:before{content:"\f185"}.fa.fa-moon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-moon-o:before{content:"\f186"}.fa.fa-pagelines,.fa.fa-renren,.fa.fa-stack-exchange,.fa.fa-vk,.fa.fa-weibo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-arrow-circle-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-right:before{content:"\f35a"}.fa.fa-arrow-circle-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-left:before{content:"\f359"}.fa.fa-caret-square-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-left:before{content:"\f191"}.fa.fa-toggle-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-left:before{content:"\f191"}.fa.fa-dot-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dot-circle-o:before{content:"\f192"}.fa.fa-vimeo-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-try:before,.fa.fa-turkish-lira:before{content:"\f195"}.fa.fa-plus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-plus-square-o:before{content:"\f0fe"}.fa.fa-openid,.fa.fa-slack,.fa.fa-wordpress{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bank:before,.fa.fa-institution:before{content:"\f19c"}.fa.fa-mortar-board:before{content:"\f19d"}.fa.fa-delicious,.fa.fa-digg,.fa.fa-drupal,.fa.fa-google,.fa.fa-joomla,.fa.fa-pied-piper-alt,.fa.fa-pied-piper-pp,.fa.fa-reddit,.fa.fa-reddit-square,.fa.fa-stumbleupon,.fa.fa-stumbleupon-circle,.fa.fa-yahoo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-spoon:before{content:"\f2e5"}.fa.fa-behance,.fa.fa-behance-square,.fa.fa-steam,.fa.fa-steam-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-automobile:before{content:"\f1b9"}.fa.fa-envelope-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-o:before{content:"\f0e0"}.fa.fa-deviantart,.fa.fa-soundcloud,.fa.fa-spotify{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-file-pdf-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-pdf-o:before{content:"\f1c1"}.fa.fa-file-word-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-word-o:before{content:"\f1c2"}.fa.fa-file-excel-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-excel-o:before{content:"\f1c3"}.fa.fa-file-powerpoint-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-powerpoint-o:before{content:"\f1c4"}.fa.fa-file-image-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-image-o:before{content:"\f1c5"}.fa.fa-file-photo-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-photo-o:before{content:"\f1c5"}.fa.fa-file-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-picture-o:before{content:"\f1c5"}.fa.fa-file-archive-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-archive-o:before{content:"\f1c6"}.fa.fa-file-zip-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-zip-o:before{content:"\f1c6"}.fa.fa-file-audio-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-audio-o:before{content:"\f1c7"}.fa.fa-file-sound-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-sound-o:before{content:"\f1c7"}.fa.fa-file-video-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-video-o:before{content:"\f1c8"}.fa.fa-file-movie-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-movie-o:before{content:"\f1c8"}.fa.fa-file-code-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-code-o:before{content:"\f1c9"}.fa.fa-codepen,.fa.fa-jsfiddle,.fa.fa-vine{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-life-bouy,.fa.fa-life-ring{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-bouy:before{content:"\f1cd"}.fa.fa-life-buoy{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-buoy:before{content:"\f1cd"}.fa.fa-life-saver{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-saver:before{content:"\f1cd"}.fa.fa-support{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-support:before{content:"\f1cd"}.fa.fa-circle-o-notch:before{content:"\f1ce"}.fa.fa-ra,.fa.fa-rebel{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ra:before{content:"\f1d0"}.fa.fa-resistance{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-resistance:before{content:"\f1d0"}.fa.fa-empire,.fa.fa-ge{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ge:before{content:"\f1d1"}.fa.fa-git,.fa.fa-git-square,.fa.fa-hacker-news,.fa.fa-y-combinator-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-y-combinator-square:before{content:"\f1d4"}.fa.fa-yc-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc-square:before{content:"\f1d4"}.fa.fa-qq,.fa.fa-tencent-weibo,.fa.fa-wechat,.fa.fa-weixin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wechat:before{content:"\f1d7"}.fa.fa-send:before{content:"\f1d8"}.fa.fa-paper-plane-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paper-plane-o:before{content:"\f1d8"}.fa.fa-send-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-send-o:before{content:"\f1d8"}.fa.fa-circle-thin{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-thin:before{content:"\f111"}.fa.fa-header:before{content:"\f1dc"}.fa.fa-sliders:before{content:"\f1de"}.fa.fa-futbol-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-futbol-o:before{content:"\f1e3"}.fa.fa-soccer-ball-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-soccer-ball-o:before{content:"\f1e3"}.fa.fa-slideshare,.fa.fa-twitch,.fa.fa-yelp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-newspaper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-newspaper-o:before{content:"\f1ea"}.fa.fa-cc-amex,.fa.fa-cc-discover,.fa.fa-cc-mastercard,.fa.fa-cc-paypal,.fa.fa-cc-stripe,.fa.fa-cc-visa,.fa.fa-google-wallet,.fa.fa-paypal{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bell-slash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-slash-o:before{content:"\f1f6"}.fa.fa-trash:before{content:"\f2ed"}.fa.fa-copyright{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-eyedropper:before{content:"\f1fb"}.fa.fa-area-chart:before{content:"\f1fe"}.fa.fa-pie-chart:before{content:"\f200"}.fa.fa-line-chart:before{content:"\f201"}.fa.fa-angellist,.fa.fa-ioxhost,.fa.fa-lastfm,.fa.fa-lastfm-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-cc{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-cc:before{content:"\f20a"}.fa.fa-ils:before,.fa.fa-shekel:before,.fa.fa-sheqel:before{content:"\f20b"}.fa.fa-meanpath{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-meanpath:before{content:"\f2b4"}.fa.fa-buysellads,.fa.fa-connectdevelop,.fa.fa-dashcube,.fa.fa-forumbee,.fa.fa-leanpub,.fa.fa-sellsy,.fa.fa-shirtsinbulk,.fa.fa-simplybuilt,.fa.fa-skyatlas{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-diamond{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-diamond:before{content:"\f3a5"}.fa.fa-intersex:before{content:"\f224"}.fa.fa-facebook-official{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-official:before{content:"\f09a"}.fa.fa-pinterest-p,.fa.fa-whatsapp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-hotel:before{content:"\f236"}.fa.fa-medium,.fa.fa-viacoin,.fa.fa-y-combinator,.fa.fa-yc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc:before{content:"\f23b"}.fa.fa-expeditedssl,.fa.fa-opencart,.fa.fa-optin-monster{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-battery-4:before,.fa.fa-battery:before{content:"\f240"}.fa.fa-battery-3:before{content:"\f241"}.fa.fa-battery-2:before{content:"\f242"}.fa.fa-battery-1:before{content:"\f243"}.fa.fa-battery-0:before{content:"\f244"}.fa.fa-object-group,.fa.fa-object-ungroup,.fa.fa-sticky-note-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sticky-note-o:before{content:"\f249"}.fa.fa-cc-diners-club,.fa.fa-cc-jcb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-clone,.fa.fa-hourglass-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hourglass-o:before{content:"\f254"}.fa.fa-hourglass-1:before{content:"\f251"}.fa.fa-hourglass-2:before{content:"\f252"}.fa.fa-hourglass-3:before{content:"\f253"}.fa.fa-hand-rock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-rock-o:before{content:"\f255"}.fa.fa-hand-grab-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-grab-o:before{content:"\f255"}.fa.fa-hand-paper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-paper-o:before{content:"\f256"}.fa.fa-hand-stop-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-stop-o:before{content:"\f256"}.fa.fa-hand-scissors-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-scissors-o:before{content:"\f257"}.fa.fa-hand-lizard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-lizard-o:before{content:"\f258"}.fa.fa-hand-spock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-spock-o:before{content:"\f259"}.fa.fa-hand-pointer-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-pointer-o:before{content:"\f25a"}.fa.fa-hand-peace-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-peace-o:before{content:"\f25b"}.fa.fa-registered{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-chrome,.fa.fa-creative-commons,.fa.fa-firefox,.fa.fa-get-pocket,.fa.fa-gg,.fa.fa-gg-circle,.fa.fa-internet-explorer,.fa.fa-odnoklassniki,.fa.fa-odnoklassniki-square,.fa.fa-opera,.fa.fa-safari,.fa.fa-tripadvisor,.fa.fa-wikipedia-w{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-television:before{content:"\f26c"}.fa.fa-500px,.fa.fa-amazon,.fa.fa-contao{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-calendar-plus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-plus-o:before{content:"\f271"}.fa.fa-calendar-minus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-minus-o:before{content:"\f272"}.fa.fa-calendar-times-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-times-o:before{content:"\f273"}.fa.fa-calendar-check-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-check-o:before{content:"\f274"}.fa.fa-map-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-map-o:before{content:"\f279"}.fa.fa-commenting:before{content:"\f4ad"}.fa.fa-commenting-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-commenting-o:before{content:"\f4ad"}.fa.fa-houzz,.fa.fa-vimeo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-vimeo:before{content:"\f27d"}.fa.fa-black-tie,.fa.fa-edge,.fa.fa-fonticons,.fa.fa-reddit-alien{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card-alt:before{content:"\f09d"}.fa.fa-codiepie,.fa.fa-fort-awesome,.fa.fa-mixcloud,.fa.fa-modx,.fa.fa-product-hunt,.fa.fa-scribd,.fa.fa-usb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-pause-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pause-circle-o:before{content:"\f28b"}.fa.fa-stop-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-stop-circle-o:before{content:"\f28d"}.fa.fa-bluetooth,.fa.fa-bluetooth-b,.fa.fa-envira,.fa.fa-gitlab,.fa.fa-wheelchair-alt,.fa.fa-wpbeginner,.fa.fa-wpforms{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wheelchair-alt:before{content:"\f368"}.fa.fa-question-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-question-circle-o:before{content:"\f059"}.fa.fa-volume-control-phone:before{content:"\f2a0"}.fa.fa-asl-interpreting:before{content:"\f2a3"}.fa.fa-deafness:before,.fa.fa-hard-of-hearing:before{content:"\f2a4"}.fa.fa-glide,.fa.fa-glide-g{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-signing:before{content:"\f2a7"}.fa.fa-first-order,.fa.fa-google-plus-official,.fa.fa-pied-piper,.fa.fa-snapchat,.fa.fa-snapchat-ghost,.fa.fa-snapchat-square,.fa.fa-themeisle,.fa.fa-viadeo,.fa.fa-viadeo-square,.fa.fa-yoast{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-official:before{content:"\f2b3"}.fa.fa-google-plus-circle{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-circle:before{content:"\f2b3"}.fa.fa-fa,.fa.fa-font-awesome{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-fa:before{content:"\f2b4"}.fa.fa-handshake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-handshake-o:before{content:"\f2b5"}.fa.fa-envelope-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-open-o:before{content:"\f2b6"}.fa.fa-linode{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-address-book-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-book-o:before{content:"\f2b9"}.fa.fa-vcard:before{content:"\f2bb"}.fa.fa-address-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-card-o:before{content:"\f2bb"}.fa.fa-vcard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-vcard-o:before{content:"\f2bb"}.fa.fa-user-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-circle-o:before{content:"\f2bd"}.fa.fa-user-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-o:before{content:"\f007"}.fa.fa-id-badge{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license:before{content:"\f2c2"}.fa.fa-id-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-id-card-o:before{content:"\f2c2"}.fa.fa-drivers-license-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license-o:before{content:"\f2c2"}.fa.fa-free-code-camp,.fa.fa-quora,.fa.fa-telegram{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-thermometer-4:before,.fa.fa-thermometer:before{content:"\f2c7"}.fa.fa-thermometer-3:before{content:"\f2c8"}.fa.fa-thermometer-2:before{content:"\f2c9"}.fa.fa-thermometer-1:before{content:"\f2ca"}.fa.fa-thermometer-0:before{content:"\f2cb"}.fa.fa-bathtub:before,.fa.fa-s15:before{content:"\f2cd"}.fa.fa-window-maximize,.fa.fa-window-restore{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle:before{content:"\f410"}.fa.fa-window-close-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-window-close-o:before{content:"\f410"}.fa.fa-times-rectangle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle-o:before{content:"\f410"}.fa.fa-bandcamp,.fa.fa-eercast,.fa.fa-etsy,.fa.fa-grav,.fa.fa-imdb,.fa.fa-ravelry{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-eercast:before{content:"\f2da"}.fa.fa-snowflake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-snowflake-o:before{content:"\f2dc"}.fa.fa-superpowers,.fa.fa-wpexplorer{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-cab:before{content:"\f1ba"}
\ No newline at end of file
diff --git a/html/font-awesome/webfonts/fa-regular-400.eot b/html/font-awesome/webfonts/fa-regular-400.eot
index d62be2fad885..a4e598936b3e 100644
Binary files a/html/font-awesome/webfonts/fa-regular-400.eot and b/html/font-awesome/webfonts/fa-regular-400.eot differ
diff --git a/html/font-awesome/webfonts/fa-regular-400.woff b/html/font-awesome/webfonts/fa-regular-400.woff
index 43b1a9ae49db..ad077c6bec78 100644
Binary files a/html/font-awesome/webfonts/fa-regular-400.woff and b/html/font-awesome/webfonts/fa-regular-400.woff differ
diff --git a/html/font-awesome/webfonts/fa-solid-900.eot b/html/font-awesome/webfonts/fa-solid-900.eot
index c77baa8d46ab..e99417197e4b 100644
Binary files a/html/font-awesome/webfonts/fa-solid-900.eot and b/html/font-awesome/webfonts/fa-solid-900.eot differ
diff --git a/html/font-awesome/webfonts/fa-solid-900.woff b/html/font-awesome/webfonts/fa-solid-900.woff
index 77c1786227f5..23ee663443a7 100644
Binary files a/html/font-awesome/webfonts/fa-solid-900.woff and b/html/font-awesome/webfonts/fa-solid-900.woff differ
diff --git a/icons/_nanomaps/CereStation_nanomap_z1.png b/icons/_nanomaps/CereStation_nanomap_z1.png
index c7ea1cc10a09..d645c0f93689 100644
Binary files a/icons/_nanomaps/CereStation_nanomap_z1.png and b/icons/_nanomaps/CereStation_nanomap_z1.png differ
diff --git a/icons/_nanomaps/Cyberiad220_nanomap_z1.png b/icons/_nanomaps/Cyberiad220_nanomap_z1.png
index e23e1774d487..666a3f1b05a6 100644
Binary files a/icons/_nanomaps/Cyberiad220_nanomap_z1.png and b/icons/_nanomaps/Cyberiad220_nanomap_z1.png differ
diff --git a/icons/_nanomaps/Delta220_nanomap_z1.png b/icons/_nanomaps/Delta220_nanomap_z1.png
index d67c1ef2c307..61879c90963f 100644
Binary files a/icons/_nanomaps/Delta220_nanomap_z1.png and b/icons/_nanomaps/Delta220_nanomap_z1.png differ
diff --git a/icons/_nanomaps/Delta_nanomap_z1.png b/icons/_nanomaps/Delta_nanomap_z1.png
index 7f49a54c201a..20beac49d011 100644
Binary files a/icons/_nanomaps/Delta_nanomap_z1.png and b/icons/_nanomaps/Delta_nanomap_z1.png differ
diff --git a/icons/_nanomaps/MetaStation_nanomap_z1.png b/icons/_nanomaps/MetaStation_nanomap_z1.png
index 87cff412b31b..a32ec30d6ea3 100644
Binary files a/icons/_nanomaps/MetaStation_nanomap_z1.png and b/icons/_nanomaps/MetaStation_nanomap_z1.png differ
diff --git a/icons/atmos/heat.dmi b/icons/atmos/heat.dmi
index 6a5a2f9677fa..681a9458b6ad 100644
Binary files a/icons/atmos/heat.dmi and b/icons/atmos/heat.dmi differ
diff --git a/icons/effects/64x64.dmi b/icons/effects/64x64.dmi
index d5d0b8df0e65..132b2d0d2221 100644
Binary files a/icons/effects/64x64.dmi and b/icons/effects/64x64.dmi differ
diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi
index 812bda5b5ce5..7746a3d06d03 100644
Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ
diff --git a/icons/effects/beam.dmi b/icons/effects/beam.dmi
index a361ed51d90a..5eb15d4328be 100644
Binary files a/icons/effects/beam.dmi and b/icons/effects/beam.dmi differ
diff --git a/icons/effects/parallax.dmi b/icons/effects/parallax.dmi
index 6f333416a23b..e484c3395479 100644
Binary files a/icons/effects/parallax.dmi and b/icons/effects/parallax.dmi differ
diff --git a/icons/effects/species.dmi b/icons/effects/species.dmi
index b3a2753e6b98..94287eab8dc6 100644
Binary files a/icons/effects/species.dmi and b/icons/effects/species.dmi differ
diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mecha/mecha_equipment.dmi
index 939b1a868a1f..b6c7b3258d33 100644
Binary files a/icons/mecha/mecha_equipment.dmi and b/icons/mecha/mecha_equipment.dmi differ
diff --git a/icons/member_content.dmi b/icons/member_content.dmi
index bb5976462762..77443711198c 100644
Binary files a/icons/member_content.dmi and b/icons/member_content.dmi differ
diff --git a/icons/mob/actions/actions.dmi b/icons/mob/actions/actions.dmi
index 07e98e9ebc97..b94b9ef574e2 100644
Binary files a/icons/mob/actions/actions.dmi and b/icons/mob/actions/actions.dmi differ
diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi
index 15631f719dbc..aa921ea13437 100644
Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 78de6fd28b2a..72569afd028c 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index ddc2be552320..0a3c3cba2987 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index eb96e1da7703..83bd4efe7885 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/modsuit/species/vox_modsuits.dmi b/icons/mob/clothing/modsuit/species/vox_modsuits.dmi
index 026b15502577..1a164b1a1935 100644
Binary files a/icons/mob/clothing/modsuit/species/vox_modsuits.dmi and b/icons/mob/clothing/modsuit/species/vox_modsuits.dmi differ
diff --git a/icons/mob/clothing/species/drask/gloves.dmi b/icons/mob/clothing/species/drask/gloves.dmi
index 2b97e9bf3c24..688157e1e73d 100644
Binary files a/icons/mob/clothing/species/drask/gloves.dmi and b/icons/mob/clothing/species/drask/gloves.dmi differ
diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi
index baef8c01ccb1..c344b3195a88 100644
Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ
diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi
index 4f4792871054..2d60544fe02f 100644
Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/centcom.dmi b/icons/mob/clothing/species/drask/under/centcom.dmi
index b72065bc560c..af49649b5356 100644
Binary files a/icons/mob/clothing/species/drask/under/centcom.dmi and b/icons/mob/clothing/species/drask/under/centcom.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/civilian.dmi b/icons/mob/clothing/species/drask/under/civilian.dmi
index 34f04fdf40de..b7224cf02404 100644
Binary files a/icons/mob/clothing/species/drask/under/civilian.dmi and b/icons/mob/clothing/species/drask/under/civilian.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/procedure.dmi b/icons/mob/clothing/species/drask/under/procedure.dmi
index 7bfe17ce39b2..d589df04cd46 100644
Binary files a/icons/mob/clothing/species/drask/under/procedure.dmi and b/icons/mob/clothing/species/drask/under/procedure.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/security.dmi b/icons/mob/clothing/species/drask/under/security.dmi
index 53f8b8ff46ea..fd8479cd1492 100644
Binary files a/icons/mob/clothing/species/drask/under/security.dmi and b/icons/mob/clothing/species/drask/under/security.dmi differ
diff --git a/icons/mob/clothing/species/grey/eyes.dmi b/icons/mob/clothing/species/grey/eyes.dmi
index 7760cca8f608..21dbcff1b8f8 100644
Binary files a/icons/mob/clothing/species/grey/eyes.dmi and b/icons/mob/clothing/species/grey/eyes.dmi differ
diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi
index 155189889405..83416f9d242d 100644
Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ
diff --git a/icons/mob/clothing/species/grey/mask.dmi b/icons/mob/clothing/species/grey/mask.dmi
index 97ab44555d3e..85e16b4fa355 100644
Binary files a/icons/mob/clothing/species/grey/mask.dmi and b/icons/mob/clothing/species/grey/mask.dmi differ
diff --git a/icons/mob/clothing/species/unathi/mask.dmi b/icons/mob/clothing/species/unathi/mask.dmi
index e84f2d5c116d..d5f8f45e949d 100644
Binary files a/icons/mob/clothing/species/unathi/mask.dmi and b/icons/mob/clothing/species/unathi/mask.dmi differ
diff --git a/icons/mob/clothing/species/vox/back.dmi b/icons/mob/clothing/species/vox/back.dmi
index 95800a6c6f8f..1b1045f0ea3b 100644
Binary files a/icons/mob/clothing/species/vox/back.dmi and b/icons/mob/clothing/species/vox/back.dmi differ
diff --git a/icons/mob/clothing/species/vox/eyes.dmi b/icons/mob/clothing/species/vox/eyes.dmi
index ac19c03b436e..0d100e84bc44 100644
Binary files a/icons/mob/clothing/species/vox/eyes.dmi and b/icons/mob/clothing/species/vox/eyes.dmi differ
diff --git a/icons/mob/clothing/species/vox/gloves.dmi b/icons/mob/clothing/species/vox/gloves.dmi
index 71d8a5ab9297..cc2c8d1b306c 100644
Binary files a/icons/mob/clothing/species/vox/gloves.dmi and b/icons/mob/clothing/species/vox/gloves.dmi differ
diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi
index 846a0da40412..d9bb7cad94be 100644
Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ
diff --git a/icons/mob/clothing/species/vox/shoes.dmi b/icons/mob/clothing/species/vox/shoes.dmi
index 8b02def9d18b..e362943b6db5 100644
Binary files a/icons/mob/clothing/species/vox/shoes.dmi and b/icons/mob/clothing/species/vox/shoes.dmi differ
diff --git a/icons/mob/clothing/species/vox/under/pants.dmi b/icons/mob/clothing/species/vox/under/pants.dmi
index 5f486334d3c6..45e976955f6f 100644
Binary files a/icons/mob/clothing/species/vox/under/pants.dmi and b/icons/mob/clothing/species/vox/under/pants.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/mask.dmi b/icons/mob/clothing/species/vulpkanin/mask.dmi
index fb1556aa5a13..660da961616c 100644
Binary files a/icons/mob/clothing/species/vulpkanin/mask.dmi and b/icons/mob/clothing/species/vulpkanin/mask.dmi differ
diff --git a/icons/mob/human_races/r_slime.dmi b/icons/mob/human_races/r_slime.dmi
index a34890299d1d..942df5c8c47a 100644
Binary files a/icons/mob/human_races/r_slime.dmi and b/icons/mob/human_races/r_slime.dmi differ
diff --git a/icons/mob/human_races/vox/r_vox.dmi b/icons/mob/human_races/vox/r_vox.dmi
deleted file mode 100644
index 2286e060a9af..000000000000
Binary files a/icons/mob/human_races/vox/r_vox.dmi and /dev/null differ
diff --git a/icons/mob/human_races/vox/r_voxazu.dmi b/icons/mob/human_races/vox/r_voxazu.dmi
index 593b6b9b6d2e..dbaa8742e329 100644
Binary files a/icons/mob/human_races/vox/r_voxazu.dmi and b/icons/mob/human_races/vox/r_voxazu.dmi differ
diff --git a/icons/mob/human_races/vox/r_voxbrn.dmi b/icons/mob/human_races/vox/r_voxbrn.dmi
index 8a0e391a7499..6aab80130a24 100644
Binary files a/icons/mob/human_races/vox/r_voxbrn.dmi and b/icons/mob/human_races/vox/r_voxbrn.dmi differ
diff --git a/icons/mob/human_races/vox/r_voxcrim.dmi b/icons/mob/human_races/vox/r_voxcrim.dmi
index 56e99a28fb41..fb9eda98063d 100644
Binary files a/icons/mob/human_races/vox/r_voxcrim.dmi and b/icons/mob/human_races/vox/r_voxcrim.dmi differ
diff --git a/icons/mob/human_races/vox/r_voxdgrn.dmi b/icons/mob/human_races/vox/r_voxdgrn.dmi
deleted file mode 100644
index 6c3239a100da..000000000000
Binary files a/icons/mob/human_races/vox/r_voxdgrn.dmi and /dev/null differ
diff --git a/icons/mob/human_races/vox/r_voxemrl.dmi b/icons/mob/human_races/vox/r_voxemrl.dmi
index 0a5515192931..dd3b8b69bbe1 100644
Binary files a/icons/mob/human_races/vox/r_voxemrl.dmi and b/icons/mob/human_races/vox/r_voxemrl.dmi differ
diff --git a/icons/mob/human_races/vox/r_voxgry.dmi b/icons/mob/human_races/vox/r_voxgry.dmi
index df825cc399d6..d5ebde68237b 100644
Binary files a/icons/mob/human_races/vox/r_voxgry.dmi and b/icons/mob/human_races/vox/r_voxgry.dmi differ
diff --git a/icons/mob/human_races/vox/r_voxlime.dmi b/icons/mob/human_races/vox/r_voxlime.dmi
new file mode 100644
index 000000000000..2811fc27c6f0
Binary files /dev/null and b/icons/mob/human_races/vox/r_voxlime.dmi differ
diff --git a/icons/mob/human_races/vox/r_voxplum.dmi b/icons/mob/human_races/vox/r_voxplum.dmi
new file mode 100644
index 000000000000..a6d5ed943ecc
Binary files /dev/null and b/icons/mob/human_races/vox/r_voxplum.dmi differ
diff --git a/icons/mob/human_races/vox/r_voxpurp.dmi b/icons/mob/human_races/vox/r_voxpurp.dmi
index d6c18c755174..9ace8f9d48b2 100644
Binary files a/icons/mob/human_races/vox/r_voxpurp.dmi and b/icons/mob/human_races/vox/r_voxpurp.dmi differ
diff --git a/icons/mob/inhands/implants_lefthand.dmi b/icons/mob/inhands/implants_lefthand.dmi
new file mode 100644
index 000000000000..ceb1066064b8
Binary files /dev/null and b/icons/mob/inhands/implants_lefthand.dmi differ
diff --git a/icons/mob/inhands/implants_righthand.dmi b/icons/mob/inhands/implants_righthand.dmi
new file mode 100644
index 000000000000..1d546792b8cc
Binary files /dev/null and b/icons/mob/inhands/implants_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 144293a31c0c..33942e4a03c8 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 2d5bf273be55..01cee2e989d6 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index d4afcd099bc7..f890b05a742e 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index 272e47b89b4c..e7f44d0f575c 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/icons/mob/screen_full.dmi b/icons/mob/screen_full.dmi
index cfcf182c840f..2c58e9ef09a4 100644
Binary files a/icons/mob/screen_full.dmi and b/icons/mob/screen_full.dmi differ
diff --git a/icons/mob/screen_kinesis.dmi b/icons/mob/screen_kinesis.dmi
new file mode 100644
index 000000000000..616ca31f1add
Binary files /dev/null and b/icons/mob/screen_kinesis.dmi differ
diff --git a/icons/mob/screen_ninja.dmi b/icons/mob/screen_ninja.dmi
index df30d63fe769..cc89ea18ed0f 100644
Binary files a/icons/mob/screen_ninja.dmi and b/icons/mob/screen_ninja.dmi differ
diff --git a/icons/mob/simple_human.dmi b/icons/mob/simple_human.dmi
index e2bb19cff36e..8671c70bf659 100644
Binary files a/icons/mob/simple_human.dmi and b/icons/mob/simple_human.dmi differ
diff --git a/icons/mob/sprite_accessories/human/human_hair.dmi b/icons/mob/sprite_accessories/human/human_hair.dmi
index 7085dd1ff4e6..6dd0dcf77ca1 100644
Binary files a/icons/mob/sprite_accessories/human/human_hair.dmi and b/icons/mob/sprite_accessories/human/human_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/ipc/ipc_face.dmi b/icons/mob/sprite_accessories/ipc/ipc_face.dmi
index 1c685abeb9f4..4d795c7ba6eb 100644
Binary files a/icons/mob/sprite_accessories/ipc/ipc_face.dmi and b/icons/mob/sprite_accessories/ipc/ipc_face.dmi differ
diff --git a/icons/mob/sprite_accessories/vox/vox_tail_markings.dmi b/icons/mob/sprite_accessories/vox/vox_tail_markings.dmi
index ca435a12ee97..ef38c22fd344 100644
Binary files a/icons/mob/sprite_accessories/vox/vox_tail_markings.dmi and b/icons/mob/sprite_accessories/vox/vox_tail_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/vox/vox_tail_markings2.dmi b/icons/mob/sprite_accessories/vox/vox_tail_markings2.dmi
deleted file mode 100644
index 70ef0d08f7ed..000000000000
Binary files a/icons/mob/sprite_accessories/vox/vox_tail_markings2.dmi and /dev/null differ
diff --git a/icons/mob/talk.dmi b/icons/mob/talk.dmi
index 961cffec7f61..08c2c06f7c50 100644
Binary files a/icons/mob/talk.dmi and b/icons/mob/talk.dmi differ
diff --git a/icons/obj/atmospherics/red_pipe.dmi b/icons/obj/atmospherics/red_pipe.dmi
deleted file mode 100644
index 83803dfb1c99..000000000000
Binary files a/icons/obj/atmospherics/red_pipe.dmi and /dev/null differ
diff --git a/icons/obj/boxes.dmi b/icons/obj/boxes.dmi
index 03d0a7413b57..cd55ba5067c3 100644
Binary files a/icons/obj/boxes.dmi and b/icons/obj/boxes.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index 9030742c394f..dc35acf4a2da 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index c5c655fb781a..a50bfbca3f17 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_modules.dmi b/icons/obj/clothing/modsuit/mod_modules.dmi
index 382401bffcba..598c2b1bf269 100644
Binary files a/icons/obj/clothing/modsuit/mod_modules.dmi and b/icons/obj/clothing/modsuit/mod_modules.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 5bc42bd4471e..419d2260290f 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index f2030353f36d..4e500d259d2e 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 5ff5e5a5ebdf..882d60d35a1a 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/doors/airlocks/cult/unruned/reaper-overlays.dmi b/icons/obj/doors/airlocks/cult/unruned/reaper-overlays.dmi
index 7d2f84117448..8e57c8690e29 100644
Binary files a/icons/obj/doors/airlocks/cult/unruned/reaper-overlays.dmi and b/icons/obj/doors/airlocks/cult/unruned/reaper-overlays.dmi differ
diff --git a/icons/obj/energy_melee.dmi b/icons/obj/energy_melee.dmi
index 07f3290f21a2..03a18059b6ff 100644
Binary files a/icons/obj/energy_melee.dmi and b/icons/obj/energy_melee.dmi differ
diff --git a/icons/obj/fish_items.dmi b/icons/obj/fish_items.dmi
index 302e144ba24d..6d0a977ff636 100644
Binary files a/icons/obj/fish_items.dmi and b/icons/obj/fish_items.dmi differ
diff --git a/icons/obj/flora/plants.dmi b/icons/obj/flora/plants.dmi
index 45686d168bc4..cce96cbe040a 100644
Binary files a/icons/obj/flora/plants.dmi and b/icons/obj/flora/plants.dmi differ
diff --git a/icons/obj/flora/rocks.dmi b/icons/obj/flora/rocks.dmi
index eb777b6cbc21..7d7fb64dce73 100644
Binary files a/icons/obj/flora/rocks.dmi and b/icons/obj/flora/rocks.dmi differ
diff --git a/icons/obj/guns/magic.dmi b/icons/obj/guns/magic.dmi
index 88c124d82578..6f30d97098aa 100644
Binary files a/icons/obj/guns/magic.dmi and b/icons/obj/guns/magic.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 69de707c5f35..1564d17b53bc 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 13c552d4790b..97d59c05af7b 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/knuckleduster.dmi b/icons/obj/knuckleduster.dmi
new file mode 100644
index 000000000000..c84b99554225
Binary files /dev/null and b/icons/obj/knuckleduster.dmi differ
diff --git a/icons/obj/machines/drone_fab.dmi b/icons/obj/machines/drone_fab.dmi
index 9fe05f45f7ab..f77c9bbab4ee 100644
Binary files a/icons/obj/machines/drone_fab.dmi and b/icons/obj/machines/drone_fab.dmi differ
diff --git a/icons/obj/machines/heavy_lathe.dmi b/icons/obj/machines/heavy_lathe.dmi
index 68557159eb42..5ea437d48f60 100644
Binary files a/icons/obj/machines/heavy_lathe.dmi and b/icons/obj/machines/heavy_lathe.dmi differ
diff --git a/icons/obj/pipe-item.dmi b/icons/obj/pipe-item.dmi
index e414d80b0f3b..0623aa5f6ace 100644
Binary files a/icons/obj/pipe-item.dmi and b/icons/obj/pipe-item.dmi differ
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index 48f68f517e79..1e6ef49191c5 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/obj/power_cond/power_cond_cyan.dmi b/icons/obj/power_cond/power_cond_cyan.dmi
index 52c8727ccd82..ba3bbcff33af 100644
Binary files a/icons/obj/power_cond/power_cond_cyan.dmi and b/icons/obj/power_cond/power_cond_cyan.dmi differ
diff --git a/icons/obj/roulette.dmi b/icons/obj/roulette.dmi
new file mode 100644
index 000000000000..32fa465af6c6
Binary files /dev/null and b/icons/obj/roulette.dmi differ
diff --git a/icons/obj/species_organs/skrell.dmi b/icons/obj/species_organs/skrell.dmi
index 998370f73444..62ff768e0d53 100644
Binary files a/icons/obj/species_organs/skrell.dmi and b/icons/obj/species_organs/skrell.dmi differ
diff --git a/icons/obj/species_organs/slime.dmi b/icons/obj/species_organs/slime.dmi
index 58ec636ca7ec..dab38fcd51f3 100644
Binary files a/icons/obj/species_organs/slime.dmi and b/icons/obj/species_organs/slime.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 8758283d1532..3307ee287bfd 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index ee470a2a0dca..d378ffdded9f 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/supermatter.dmi b/icons/obj/supermatter.dmi
index 4cc94097dcba..a8f87bbcd2d2 100644
Binary files a/icons/obj/supermatter.dmi and b/icons/obj/supermatter.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 72f65a6b0f5a..7153ac1b94c0 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi
index 5e1f745da28b..07f61e68ea86 100644
Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index ed5a31bc613f..8184c25f6f1a 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/icons/ooc_tag_16x.png b/icons/ooc_tag_16x.png
index 2165a593220b..443873c97e30 100644
Binary files a/icons/ooc_tag_16x.png and b/icons/ooc_tag_16x.png differ
diff --git a/icons/paradise.png b/icons/paradise.png
index 888fcea62cc4..c3254623909a 100644
Binary files a/icons/paradise.png and b/icons/paradise.png differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index c411ddab8ad5..afddb44f48ad 100755
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index d798b5a39c4a..ef8890688b29 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/space.dmi b/icons/turf/space.dmi
index 60fdfce38619..a4c2409667fd 100644
Binary files a/icons/turf/space.dmi and b/icons/turf/space.dmi differ
diff --git a/icons/vehicles/CargoTrain.dmi b/icons/vehicles/CargoTrain.dmi
index 887bd7567b2e..ddc071bbc4ee 100644
Binary files a/icons/vehicles/CargoTrain.dmi and b/icons/vehicles/CargoTrain.dmi differ
diff --git a/interface/interface.dm b/interface/interface.dm
index 63c4bbe3c82f..bf489ae9734f 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -4,7 +4,7 @@
set desc = "Type what you want to know about. This will open the wiki in your web browser."
set hidden = 1
if(GLOB.configuration.url.wiki_url)
- var/query = stripped_input(src, "Enter Search:", "Wiki Search", "Homepage")
+ var/query = tgui_input_text(src, "Enter Search:", "Wiki Search", "Homepage")
if(query == "Homepage")
src << link(GLOB.configuration.url.wiki_url)
else if(query)
@@ -19,10 +19,11 @@
set desc = "Visit the forum."
set hidden = 1
if(GLOB.configuration.url.forum_url)
- if(alert("Open the forum in your browser?", null, "Yes", "No") == "Yes")
- if(GLOB.configuration.url.forum_link_url && prefs && !prefs.fuid)
- link_forum_account()
- src << link(GLOB.configuration.url.forum_url)
+ if(tgui_alert(src, "Open the forum in your browser?", "Forum", list("Yes", "No")) != "Yes")
+ return
+ if(GLOB.configuration.url.forum_link_url && prefs && !prefs.fuid)
+ link_forum_account()
+ src << link(GLOB.configuration.url.forum_url)
else
to_chat(src, "The forum URL is not set in the server configuration.")
@@ -31,7 +32,7 @@
set desc = "View the server rules."
set hidden = 1
if(GLOB.configuration.url.rules_url)
- if(alert("This will open the rules in your browser. Are you sure?", null, "Yes", "No") == "No")
+ if(tgui_alert(src, "This will open the rules in your browser. Are you sure?", "Rules", list("Yes", "No")) != "Yes")
return
src << link(GLOB.configuration.url.rules_url)
else
@@ -42,7 +43,7 @@
set desc = "Visit the GitHub page."
set hidden = 1
if(GLOB.configuration.url.github_url)
- if(alert("This will open our GitHub repository in your browser. Are you sure?", null, "Yes", "No") == "No")
+ if(tgui_alert(src, "This will open our GitHub repository in your browser. Are you sure?", "GitHub", list("Yes", "No")) != "Yes")
return
src << link(GLOB.configuration.url.github_url)
else
@@ -65,7 +66,7 @@
if(!durl)
to_chat(src, "The Discord URL is not set in the server configuration.")
return
- if(alert("This will invite you to our Discord server. Are you sure?", null, "Yes", "No") == "No")
+ if(tgui_alert(src, "This will invite you to our Discord server. Are you sure?", "Discord", list("Yes", "No")) != "Yes")
return
src << link(durl)
@@ -74,7 +75,7 @@
set desc = "Donate to help with hosting costs."
set hidden = 1
if(GLOB.configuration.url.donations_url)
- if(alert("This will open the donation page in your browser. Are you sure?", null, "Yes", "No") == "No")
+ if(tgui_alert(src, "This will open the donation page in your browser. Are you sure?", "Donate", list("Yes", "No")) != "Yes")
return
src << link(GLOB.configuration.url.donations_url)
else
diff --git a/interface/skin.dmf b/interface/skin.dmf
index a448deb6966d..fbfdb3fc9eab 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -121,7 +121,6 @@ menu "menu"
command = "adminhelp"
category = "&Помощь"
-
window "mainwindow"
elem "mainwindow"
type = MAIN
@@ -134,10 +133,6 @@ window "mainwindow"
icon = 'icons\\ss220.png'
macro = "default"
menu = "menu"
- elem "asset_cache_browser"
- type = BROWSER
- size = 200x200
- is-visible = false
elem "mainvsplit"
type = CHILD
size = 0x0
@@ -147,29 +142,40 @@ window "mainwindow"
left = "paramapwindow"
right = "rpane"
is-vert = true
+ elem "asset_cache_browser"
+ type = BROWSER
+ size = 200x200
+ is-visible = false
elem "tooltip"
type = BROWSER
+ pos = 0,0
size = 999x999
+ anchor1 = -1,-1
+ anchor2 = -1,-1
is-visible = false
window "paramapwindow"
elem "paramapwindow"
type = MAIN
+ pos = 281,0
size = 640x480
+ anchor1 = -1,-1
+ anchor2 = -1,-1
+ saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
on-status = ".winset \"status_bar.text=[[*]]\" "
elem "map"
type = MAP
+ pos = 0,0
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
font-family = "Arial"
font-size = 7
- text-color = none
is-default = true
saved-params = "icon-size;zoom-mode"
zoom-mode = "distort"
- style = ".center { text-align: center; } .maptext { font-family: 'MS Serif'; font-size: 7px; -dm-text-outline: 1px black; color: white; line-height: 1.1; } .small { font-family: 'Small Fonts'; font-size: 6px; } .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .clown { color: #FF69Bf;} .tajaran {color: #803B56;} .skrell {color: #00CED1;} .solcom {color: #22228B;} .com_srus {color: #7c4848;} .zombie\t{color: #ff0000;} .soghun {color: #228B22;} .vox {color: #AA00AA;} .diona {color: #804000; font-weight: bold;} .trinary {color: #727272;} .kidan {color: #664205;} .slime {color: #0077AA;} .drask {color: #a3d4eb;} .vulpkanin {color: #B97A57;} .abductor {color: #800080; font-style: italic;} .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; }" .italics { font-family: 'Small Fonts'; }"
+ style = ".center { text-align: center; } .maptext { font-family: 'MS Serif'; font-size: 7px; -dm-text-outline: 1px black; color: white; line-height: 1.1; } .small { font-family: 'Small Fonts'; font-size: 6px; } .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .clown { color: #FF69Bf;} .tajaran {color: #803B56;} .skrell {color: #00CED1;} .solcom {color: #22228B;} .com_srus {color: #7c4848;} .zombie\t{color: #ff0000;} .soghun {color: #228B22;} .vox {color: #AA00AA;} .diona {color: #804000; font-weight: bold;} .trinary {color: #727272;} .kidan {color: #664205;} .slime {color: #0077AA;} .drask {color: #a3d4eb;} .vulpkanin {color: #B97A57;} .abductor {color: #800080;} .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; }" .italics { font-family: 'Small Fonts'; }"
on-show = ".winset \"menu.statusbar.is-checked=true?paramapwindow.status_bar.is-visible=true:paramapwindow.status_bar.is-visible=false\""
elem "title_browser"
type = BROWSER
@@ -177,7 +183,6 @@ window "paramapwindow"
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
- background-color = none
is-visible = false
is-disabled = true
saved-params = ""
@@ -188,69 +193,25 @@ window "paramapwindow"
pos = 0,464
size = 280x16
anchor1 = 0,100
- anchor2 = -1,-1
text-color = #ffffff
background-color = #222222
border = line
text = ""
align = left
-window "outputwindow"
- elem "outputwindow"
- type = MAIN
- pos = 0,0
- size = 637x480
- anchor1 = 0,0
- anchor2 = 100,100
- is-pane = true
- elem "input"
- type = INPUT
- pos = 3,456
- size = 467x20
- anchor1 = 0,100
- anchor2 = 100,100
- background-color = #d3b5b5
- is-default = true
- border = line
- saved-params = "command"
- elem "saybutton"
- type = BUTTON
- pos = 474,456
- size = 80x20
- anchor1 = 100,100
- anchor2 = -1,-1
- text = "Чат"
- command = ".winset \"saybutton.is-checked=true?input.command=\"!say \\\"\" macrobutton.is-checked=false:input.command=\"\"saybutton.is-checked=true?mebutton.is-checked=false\""
- button-type = pushbox
- elem "mebutton"
- type = BUTTON
- pos = 553,456
- size = 80x20
- anchor1 = 100,100
- anchor2 = -1,-1
- text = "Действие"
- command = ".winset \"mebutton.is-checked=true ? input.command=\"!me \\\"\" : input.command=\"\"mebutton.is-checked=true ? saybutton.is-checked=false\"\"mebutton.is-checked=true ? oocbutton.is-checked=false\""
- button-type = pushbox
- elem "browseroutput"
- type = BROWSER
- pos = 0,0
- size = 633x452
- anchor1 = 0,0
- anchor2 = 100,100
- background-color = #ffffff
- is-disabled = true
-
window "rpane"
elem "rpane"
type = MAIN
- pos = 0,0
- size = 0x0
+ pos = 281,0
+ size = 640x480
+ anchor1 = -1,-1
+ anchor2 = -1,-1
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
elem "rpanewindow"
type = CHILD
- pos = 0,27
- size = 0x0
+ pos = 0,30
+ size = 640x445
anchor1 = 0,0
anchor2 = 100,100
saved-params = "splitter"
@@ -307,27 +268,108 @@ window "rpane"
font-style = "bold"
text-color = #ffffff
background-color = #ef642b
- text = "Бусти"
+ text = "Boosty"
command = "Donate"
elem "changelog"
type = BUTTON
- pos = 393,7
+ pos = 392,7
size = 70x16
- text = "Чейнджлог"
+ font-style = "bold"
+ text-color = #ffffff
+ text = "Changelog"
command = "Changelog"
elem "fullscreenb"
type = BUTTON
- pos = 469,7
+ pos = 467,7
size = 70x16
+ font-style = "bold"
+ text-color = #ffffff
+ background-color = #40628A
saved-params = "is-checked"
text = "Fullscreen"
command = "fullscreen"
+window "outputwindow"
+ elem "outputwindow"
+ type = MAIN
+ pos = 281,0
+ size = 640x480
+ anchor1 = -1,-1
+ anchor2 = -1,-1
+ background-color = none
+ saved-params = "pos;size;is-minimized;is-maximized"
+ is-pane = true
+ elem "input"
+ type = INPUT
+ pos = 2,460
+ size = 517x20
+ anchor1 = 0,100
+ anchor2 = 100,100
+ is-default = true
+ border = line
+ saved-params = "command"
+ elem "oocbutton"
+ type = BUTTON
+ pos = 599,460
+ size = 40x20
+ anchor1 = 100,100
+ anchor2 = -1,-1
+ border = line
+ saved-params = "is-checked"
+ text = "OOC"
+ command = ".winset \"oocbutton.is-checked=true ? input.command=\"!ooc \\\"\" : input.command=\"\"oocbutton.is-checked=true ? mebutton.is-checked=false\"\"oocbutton.is-checked=true ? saybutton.is-checked=false\""
+ is-flat = true
+ button-type = pushbox
+ elem "saybutton"
+ type = BUTTON
+ pos = 519,460
+ size = 40x20
+ anchor1 = 100,100
+ anchor2 = -1,-1
+ border = line
+ saved-params = "is-checked"
+ text = "Say"
+ command = ".winset \"saybutton.is-checked=true ? input.command=\"!say \\\"\" : input.command=\"\"saybutton.is-checked=true ? mebutton.is-checked=false\"\"saybutton.is-checked=true ? oocbutton.is-checked=false\""
+ is-flat = true
+ button-type = pushbox
+ elem "mebutton"
+ type = BUTTON
+ pos = 559,460
+ size = 40x20
+ anchor1 = 100,100
+ anchor2 = -1,-1
+ border = line
+ saved-params = "is-checked"
+ text = "Me"
+ command = ".winset \"mebutton.is-checked=true ? input.command=\"!me \\\"\" : input.command=\"\"mebutton.is-checked=true ? saybutton.is-checked=false\"\"mebutton.is-checked=true ? oocbutton.is-checked=false\""
+ is-flat = true
+ button-type = pushbox
+ elem "browseroutput"
+ type = BROWSER
+ pos = 0,0
+ size = 640x456
+ anchor1 = 0,0
+ anchor2 = 100,100
+ is-visible = false
+ is-disabled = true
+ saved-params = ""
+ elem "output"
+ type = OUTPUT
+ pos = 0,0
+ size = 640x456
+ anchor1 = 0,0
+ anchor2 = 100,100
+ is-default = true
+ saved-params = ""
+
window "infowindow"
elem "infowindow"
type = MAIN
- pos = 0,0
- size = 0x0
+ pos = 281,0
+ size = 640x480
+ anchor1 = -1,-1
+ anchor2 = -1,-1
+ saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
elem "info"
type = INFO
@@ -338,3 +380,22 @@ window "infowindow"
is-default = true
highlight-color = #00aa00
on-show = ".winset \"rpane.infob.is-checked=true?rpane.rpanewindow.top=infowindow:rpane.rpanewindow.top=\""
+
+window "tgui_say"
+ elem "tgui_say"
+ type = MAIN
+ pos = 848,500
+ size = 275x30
+ anchor1 = 50,50
+ anchor2 = 50,50
+ is-visible = false
+ saved-params = ""
+ statusbar = false
+ can-minimize = false
+ elem "browser"
+ type = BROWSER
+ pos = 0,0
+ size = 275x30
+ anchor1 = 0,0
+ anchor2 = 0,0
+ saved-params = ""
diff --git a/modular_ss220/_components/_components.dm b/modular_ss220/_components/_components.dm
new file mode 100644
index 000000000000..7de630500b91
--- /dev/null
+++ b/modular_ss220/_components/_components.dm
@@ -0,0 +1,4 @@
+/datum/modpack/comps
+ name = "Компоненты"
+ desc = "Различные полезные компоненты, которые обязательно(нет) кому то понадобятся"
+ author = "aylong"
diff --git a/modular_ss220/_components/_components.dme b/modular_ss220/_components/_components.dme
new file mode 100644
index 000000000000..1b701de2654f
--- /dev/null
+++ b/modular_ss220/_components/_components.dme
@@ -0,0 +1,3 @@
+#include "_components.dm"
+
+#include "code/connect_range.dm"
diff --git a/modular_ss220/_components/code/connect_range.dm b/modular_ss220/_components/code/connect_range.dm
new file mode 100644
index 000000000000..c87d203a2d66
--- /dev/null
+++ b/modular_ss220/_components/code/connect_range.dm
@@ -0,0 +1,107 @@
+/**
+ * This component behaves similar to connect_loc_behalf but for all turfs in range, hooking into a signal on each of them.
+ * Just like connect_loc_behalf, It can react to that signal on behalf of a seperate listener.
+ * Good for components, though it carries some overhead. Can't be an element as that may lead to bugs.
+ */
+/datum/component/connect_range
+ dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+
+ /// An assoc list of signal -> procpath to register to the loc this object is on.
+ var/list/connections
+ /**
+ * The atom the component is tracking. The component will delete itself if the tracked is deleted.
+ * Signals will also be updated whenever it moves (if it's a movable).
+ */
+ var/atom/tracked
+
+ /// The component will hook into signals only on turfs not farther from tracked than this.
+ var/range
+ /// Whether the component works when the movable isn't directly located on a turf.
+ var/works_in_containers
+
+/datum/component/connect_range/Initialize(atom/tracked, list/connections, range, works_in_containers = TRUE)
+ if(!isatom(tracked) || isarea(tracked) || range < 0)
+ return COMPONENT_INCOMPATIBLE
+ src.connections = connections
+ src.range = range
+ set_tracked(tracked)
+ src.works_in_containers = works_in_containers
+
+/datum/component/connect_range/Destroy()
+ set_tracked(null)
+ return ..()
+
+/datum/component/connect_range/InheritComponent(datum/component/component, original, atom/tracked, list/connections, range, works_in_containers)
+ // Not equivalent. Checks if they are not the same list via shallow comparison.
+ if(!compare_list(src.connections, connections))
+ stack_trace("connect_range component attached to [parent] tried to inherit another connect_range component with different connections")
+ return
+ if(src.tracked != tracked)
+ set_tracked(tracked)
+ if(src.range == range && src.works_in_containers == works_in_containers)
+ return
+ //Unregister the signals with the old settings.
+ unregister_signals(isturf(tracked) ? tracked : tracked.loc)
+ src.range = range
+ src.works_in_containers = works_in_containers
+ //Re-register the signals with the new settings.
+ update_signals(src.tracked)
+
+/datum/component/connect_range/proc/set_tracked(atom/new_tracked)
+ if(tracked) //Unregister the signals from the old tracked and its surroundings
+ unregister_signals(isturf(tracked) ? tracked : tracked.loc)
+ UnregisterSignal(tracked, list(
+ COMSIG_MOVABLE_MOVED,
+ COMSIG_PARENT_QDELETING,
+ ))
+ tracked = new_tracked
+ if(!tracked)
+ return
+ //Register signals on the new tracked atom and its surroundings.
+ RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
+ RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel))
+ update_signals(tracked)
+
+/datum/component/connect_range/proc/handle_tracked_qdel()
+ SIGNAL_HANDLER
+ qdel(src)
+
+/datum/component/connect_range/proc/update_signals(atom/target, atom/old_loc, forced = FALSE)
+ var/turf/current_turf = get_turf(target)
+ var/on_same_turf = current_turf == get_turf(old_loc) //Only register/unregister turf signals if it's moved to a new turf.
+ unregister_signals(old_loc, on_same_turf)
+
+ if(isnull(current_turf))
+ return
+
+ if(ismovable(target.loc))
+ if(!works_in_containers)
+ return
+ //Keep track of possible movement of all movables the target is in.
+ for(var/atom/movable/container as anything in get_nested_locs(target))
+ RegisterSignal(container, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
+
+ if(on_same_turf && !forced)
+ return
+ for(var/turf/target_turf in RANGE_TURFS(range, current_turf))
+ for(var/signal in connections)
+ parent.RegisterSignal(target_turf, signal, connections[signal])
+
+/datum/component/connect_range/proc/unregister_signals(atom/location, on_same_turf = FALSE)
+ //The location is null or is a container and the component shouldn't have register signals on it
+ if(isnull(location) || (!works_in_containers && !isturf(location)))
+ return
+
+ if(ismovable(location))
+ for(var/atom/movable/target as anything in (get_nested_locs(location) + location))
+ UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
+
+ if(on_same_turf)
+ return
+ var/turf/previous_turf = get_turf(location)
+ for(var/turf/target_turf in RANGE_TURFS(range, previous_turf))
+ parent.UnregisterSignal(target_turf, connections)
+
+/datum/component/connect_range/proc/on_moved(atom/movable/movable, atom/old_loc)
+ SIGNAL_HANDLER
+ update_signals(movable, old_loc)
diff --git a/modular_ss220/_defines220/_defines220.dme b/modular_ss220/_defines220/_defines220.dme
index a393d8dc67f5..16ffa8fffe03 100644
--- a/modular_ss220/_defines220/_defines220.dme
+++ b/modular_ss220/_defines220/_defines220.dme
@@ -14,5 +14,7 @@
#include "code/hud_ss220.dm"
#include "code/layers_ss220.dm"
#include "code/signals_atom.dm"
-#include "code/jobs_defines.dm"
+#include "code/job_defines.dm"
#include "code/donor.dm"
+#include "code/emote.dm"
+#include "code/lists_TG.dm"
diff --git a/modular_ss220/_defines220/code/donor.dm b/modular_ss220/_defines220/code/donor.dm
index 053c420212cf..2367a83e97b1 100644
--- a/modular_ss220/_defines220/code/donor.dm
+++ b/modular_ss220/_defines220/code/donor.dm
@@ -5,3 +5,7 @@
// What TTS level does it give access to?
#define BIG_WORKER_TTS_LEVEL 3
#define LITTLE_WORKER_TTS_LEVEL 1
+
+// General limitation
+#define BIG_WORKER_LEVEL 3
+#define LITTLE_WORKER_LEVEL 1
diff --git a/modular_ss220/_defines220/code/emote.dm b/modular_ss220/_defines220/code/emote.dm
new file mode 100644
index 000000000000..57a98f59285a
--- /dev/null
+++ b/modular_ss220/_defines220/code/emote.dm
@@ -0,0 +1,175 @@
+/// General Emotes
+#define EMOTE_FLIP "Сделать кувырок"
+#define EMOTE_SPIN "Покрутиться"
+#define EMOTE_BLUSH "Краснеть"
+#define EMOTE_BOW "Поклониться"
+#define EMOTE_BURP "Рыгнуть"
+#define EMOTE_CHOKE "Подавиться"
+#define EMOTE_COLLAPSE "Рухнуть"
+#define EMOTE_DANCE "Танцевать"
+#define EMOTE_JUMP "Прыгнуть"
+#define EMOTE_DEATHGASP "Предсмертный вздох"
+#define EMOTE_DROOL "Пускать слюни"
+#define EMOTE_QUIVER "Трепетать"
+#define EMOTE_FROWN "Смотреть в недоумении"
+#define EMOTE_GAG "Вырвать"
+#define EMOTE_GLARE "Смотреть с ненавистью"
+#define EMOTE_GRIN "Оскалиться в улыбке"
+#define EMOTE_GRIMACE "Скорчить рожицу"
+#define EMOTE_GROAN "Болезненный вздох"
+#define EMOTE_LOOK "Посмотреть"
+#define EMOTE_BSHAKE "Трястись"
+#define EMOTE_SHUDDER "Содрогаться"
+#define EMOTE_POINT "Показать пальцем"
+#define EMOTE_POUT "Надуть губы"
+#define EMOTE_SCREAM "Кричать"
+#define EMOTE_SHAKE "Мотать головой"
+#define EMOTE_SHIVER "Дрожать"
+#define EMOTE_SIGH "Вздыхать"
+#define EMOTE_SIGH_HAPPY "Удовлетворённо вздыхать"
+#define EMOTE_SIT "Сесть"
+#define EMOTE_SMILE "Улыбнуться"
+#define EMOTE_SMUG "Ухмыляться"
+#define EMOTE_SNIFF "Шмыгать носом"
+#define EMOTE_SNORE "Храпеть"
+#define EMOTE_NIGHTMARE "Ворочаться во сне"
+#define EMOTE_STARE "Пялиться"
+#define EMOTE_STRECH "Разминать руки"
+#define EMOTE_SULK "Обидеться"
+#define EMOTE_SWAY "Качаться на месте"
+#define EMOTE_SWEAR "Ругнуться"
+#define EMOTE_TILT "Наклонить голову"
+#define EMOTE_TREMBLE "Дрожать в ужасе"
+#define EMOTE_TWITCH "Сильно дёргаться"
+#define EMOTE_TWITCHS "Дёргаться"
+#define EMOTE_WHIMPER "Хныкать"
+#define EMOTE_WSMILE "Сдержанно улыбнуться"
+
+/// Human Emotes
+#define EMOTE_HUMAN_AIRGUITAR "Воображаемая гитара"
+#define EMOTE_HUMAN_CLAP "Хлопать"
+#define EMOTE_HUMAN_CRY "Плакать"
+#define EMOTE_HUMAN_DAP "Особое рукопожатие"
+#define EMOTE_HUMAN_EYEBROW "Приподнять бровь"
+#define EMOTE_HUMAN_FACEPALM "Хлопнуть по лбу"
+#define EMOTE_HUMAN_GRUMBLE "Ворчать"
+#define EMOTE_HUMAN_HUG "Обнимать"
+#define EMOTE_HUMAN_MUMBLE "Бормотать"
+#define EMOTE_HUMAN_NOD "Кивнуть"
+#define EMOTE_HUMAN_PALM "Протянуть руку"
+#define EMOTE_HUMAN_SCREAM "Кричать"
+#define EMOTE_HUMAN_GASP "Задыхаться"
+#define EMOTE_HUMAN_SHAKE "Мотать головой"
+#define EMOTE_HUMAN_PALE "Бледнеть"
+#define EMOTE_HUMAN_RAISE "Поднять руку"
+#define EMOTE_HUMAN_SALUTE "Салютовать"
+#define EMOTE_HUMAN_SIGNAL "Показать пальцы"
+#define EMOTE_HUMAN_SHRUG "Пожать плечами"
+#define EMOTE_HUMAN_SNIFF "Шмыгать носом"
+#define EMOTE_HUMAN_JOHNNY "Курить стильно"
+#define EMOTE_HUMAN_SNEEZE "Чихнуть"
+#define EMOTE_HUMAN_SLAP "Дать пощёчину"
+#define EMOTE_HUMAN_WINCE "Морщиться"
+#define EMOTE_HUMAN_SQUINT "Прищуриться"
+#define EMOTE_HUMAN_WINK "Подмигнуть"
+#define EMOTE_HUMAN_HIGHFIVE "Дать пять"
+#define EMOTE_HUMAN_HANDSHAKE "Пожать руку"
+#define EMOTE_HUMAN_SNAP "Щёлкнуть пальцами"
+#define EMOTE_HUMAN_CRACK "Хрустеть пальцами"
+#define EMOTE_HUMAN_FART "Пёрнуть"
+#define EMOTE_HUMAN_WAG "Махать хвостом"
+#define EMOTE_HUMAN_WAG_STOP "Перестать махать хвостом"
+#define EMOTE_HUMAN_FLAP "Махать крыльями"
+#define EMOTE_HUMAN_AFLAP "Махать крыльями агрессивно"
+#define EMOTE_HUMAN_FLUTTER "Трепетать крыльями"
+#define EMOTE_HUMAN_QUILL "Шуршать перьями"
+#define EMOTE_HUMAN_WARBLE "Трель"
+#define EMOTE_HUMAN_CLACK "Трещать"
+#define EMOTE_HUMAN_CLICK "Щёлкать"
+#define EMOTE_HUMAN_DRONE "Гудеть"
+#define EMOTE_HUMAN_HUM "Жужжать"
+#define EMOTE_HUMAN_HISS "Шипеть"
+#define EMOTE_HUMAN_CREAK "Скрипеть"
+#define EMOTE_HUMAN_SQUISH "Хлюпать"
+#define EMOTE_HUMAN_HOWL "Выть"
+#define EMOTE_HUMAN_GROWL "Рычать"
+#define EMOTE_HUMAN_RATTLE "Греметь"
+#define EMOTE_HUMAN_BUBBLE "Булькать"
+#define EMOTE_HUMAN_POP "Хлопать ртом"
+#define EMOTE_HUMAN_GNARL "Оскалиться"
+#define EMOTE_HUMAN_ROLL "Катиться"
+#define EMOTE_HUMAN_TAIL "Помахать хвостом"
+#define EMOTE_HUMAN_SCREECH "Визжать"
+#define EMOTE_HUMAN_HEM "Хмыкнуть"
+#define EMOTE_HUMAN_SCRATCH "Почесаться"
+#define EMOTE_HUMAN_WHISTLE "Свистеть"
+#define EMOTE_HUMAN_SNUFFLE "Нюхать"
+#define EMOTE_HUMAN_ROAR "Рычать"
+#define EMOTE_HUMAN_RUMBLE "Урчать"
+#define EMOTE_HUMAN_THREAT "Угрожать"
+#define EMOTE_HUMAN_PURR "Мурчать"
+#define EMOTE_HUMAN_PURRL "Мурчать дольше"
+#define EMOTE_HUMAN_WAVES_K "Взмахнуть усиками"
+#define EMOTE_HUMAN_WIGGLES "Шевелить усиками"
+#define EMOTE_HUMAN_WHIPS "Хлестать хвостом"
+#define EMOTE_HUMAN_WHIP "Ударить хвостом"
+
+/// Carbon Emotes
+#define EMOTE_CARBON_BLINK "Моргать"
+#define EMOTE_CARBON_BLINKR "Моргать быстро"
+#define EMOTE_CARBON_CROSS "Скрестить руки"
+#define EMOTE_CARBON_CHUCKLE "Усмехнуться"
+#define EMOTE_CARBON_COUGH "Кашлять"
+#define EMOTE_CARBON_MOAN "Стонать"
+#define EMOTE_CARBON_GIGGLE "Хихикать"
+#define EMOTE_CARBON_GURGLE "Побулькать"
+#define EMOTE_CARBON_INHALE "Вдохнуть"
+#define EMOTE_CARBON_INHALE_SHARP "Глубоко вдохнуть"
+#define EMOTE_CARBON_KISS "Поцеловать"
+#define EMOTE_CARBON_WAVE "Махать"
+#define EMOTE_CARBON_YAWN "Зевать"
+#define EMOTE_CARBON_EXHALE "Выдохнуть"
+#define EMOTE_CARBON_LAUGH "Смеяться"
+#define EMOTE_CARBON_SCOWL "Хмуриться"
+#define EMOTE_CARBON_TWIRL "Вертеть"
+#define EMOTE_CARBON_FAINT "Потерять сознание"
+#define EMOTE_CARBON_SIGN "Показать число"
+#define EMOTE_CARBON_CLAP "Хлопать"
+
+/// Silicon/IPC Emotes
+#define EMOTE_SILICON_SCREAM "Кричать"
+#define EMOTE_SILICON_PING "Звенеть"
+#define EMOTE_SILICON_BUZZ "Жужжать"
+#define EMOTE_SILICON_BUZZ2 "Жужжать раздражённо"
+#define EMOTE_SILICON_BEEP "Бипнуть"
+#define EMOTE_SILICON_BOOP "Бупнуть"
+#define EMOTE_SILICON_YES "Положительно"
+#define EMOTE_SILICON_NO "Отрицательно"
+#define EMOTE_SILICON_LAW "Удостоверяющий штрихкод"
+#define EMOTE_SILICON_HALT "Ни с места"
+
+/// Animal Emotes
+#define EMOTE_ANIMAL_CHIRP "Стрекотать"
+#define EMOTE_ANIMAL_OOGA "Уга буга"
+#define EMOTE_ANIMAL_BARK "Лаять"
+#define EMOTE_ANIMAL_YELP "Визжать"
+#define EMOTE_ANIMAL_GROWL "Рычать"
+#define EMOTE_ANIMAL_MEOW "Мяукать"
+#define EMOTE_ANIMAL_HISS "Шипеть"
+#define EMOTE_ANIMAL_PURR "Мурчать"
+#define EMOTE_ANIMAL_SIT "Сесть"
+#define EMOTE_ANIMAL_SQUEAK "Пищать"
+
+/// Emote Brain
+#define EMOTE_BRAIN_ALARM "Сигнал тревоги"
+#define EMOTE_BRAIN_ALERT "Страдальческий звук"
+#define EMOTE_BRAIN_NOTICE "Громкий звук"
+#define EMOTE_BRAIN_FLASH "Мигать лампочками"
+#define EMOTE_BRAIN_WHISTLE "Свистеть"
+#define EMOTE_BRAIN_BEEP "Бипнуть"
+#define EMOTE_BRAIN_BOOP "Бупнуть"
+
+/// Alien Emotes
+#define EMOTE_ALIEN_HISS "Шипеть"
+#define EMOTE_ALIEN_ROAR "Рычать"
+#define EMOTE_ALIEN_GNARL "Скалиться"
diff --git a/modular_ss220/_defines220/code/job_defines.dm b/modular_ss220/_defines220/code/job_defines.dm
new file mode 100644
index 000000000000..e93e785a5198
--- /dev/null
+++ b/modular_ss220/_defines220/code/job_defines.dm
@@ -0,0 +1,141 @@
+#define NOVICE_JOB_MINUTES 120
+#define NOVICE_CADET_JOB_MINUTES 300
+
+// Если ОФФы добавят новую должность в отдел, то потребуется смещение (╯°□°）╯︵ ┻━┻
+// Но так как они больше не планируют и выступают против добавления новых профессий, скорее всего ничего и не изменится.
+
+// JOBCAT_"отдел"_LAST - нужен для корректного вывода из БД, иначе чуда не будет.
+// Максимальный сдвиг (1<<22), Последний сдвиг (1<<23)
+// Он должен быть всегда как минимум на 1 больше последнего, по дефолту у ОФФов (1<<16)
+
+
+// ====================================
+// JOBCAT_ENGSEC
+// Начинаются с JOB_NANO (1<<14)
+#define JOB_TRAINEE (1<<15)
+#define JOB_CADET (1<<16)
+//#define JOB_PILOT (1<<17)
+
+#define JOB_REPRESENTATIVE_TSF (1<<17)
+#define JOB_REPRESENTATIVE_USSP (1<<18)
+#define JOB_DEALER (1<<19)
+#define JOB_VIP_GUEST (1<<20)
+#define JOB_BANKER (1<<21)
+#define JOB_SECURITY_CLOWN (1<<22)
+
+#define JOBCAT_LAST_ENGSEC (1<<23)
+
+
+// ====================================
+// JOBCAT_MEDSCI
+// Начинаются с JOB_CORONER (1<<10)
+#define JOB_INTERN (1<<11)
+#define JOB_STUDENT (1<<12)
+#define JOB_MECHANIC (1<<13)
+
+#define JOB_ADMINISTRATOR (1<<14)
+#define JOB_TOURIST_TSF (1<<15)
+#define JOB_TOURIST_USSP (1<<16)
+#define JOB_MANAGER_JANITOR (1<<17)
+#define JOB_ACTOR (1<<18)
+//#define JOB_APPRENTICE (1<<18)
+#define JOB_GUARD (1<<19)
+#define JOB_MIGRANT (1<<20)
+#define JOB_UNCERTAIN (1<<21)
+#define JOB_ADJUTANT (1<<22)
+//#define JOB_MAID (1<<23)
+//#define JOB_BUTLER (1<<24)
+
+#define JOBCAT_LAST_MEDSCI (1<<23)
+
+
+// ====================================
+// JOBCAT_SUPPORT
+// Начинаются с JOB_EXPLORER (1<<14)
+#define JOB_PRISON (1<<15)
+#define JOB_BARBER (1<<16)
+#define JOB_BATH (1<<17)
+#define JOB_CASINO (1<<18)
+#define JOB_WAITER (1<<19)
+#define JOB_ACOLYTE (1<<20)
+//#define JOB_DELIVERER (1<<21)
+#define JOB_BOXER (1<<21)
+#define JOB_MUSICIAN (1<<22)
+//#define JOB_PAINTER (1<<24)
+
+#define JOBCAT_LAST_SUPPORT (1<<23)
+
+
+
+
+
+
+
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// В ЭТОМ ФАЙЛЕ МЫ [B]ВРЕМЕННО[/B] ЗАСОВЫВАЕМ
+// НАШИ ДЕФАЙНЫ ПОД КАТЕГОРИИ РАЗНЫХ ОТДЕЛОВ!
+// ПРАВИЛЬНАЯ РАСФАСОВКА НИЖЕ
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+/*
+// ====================================
+// JOBCAT_ENGSEC
+// Начинаются с JOB_NANO (1<<14)
+#define JOB_TRAINEE (1<<15)
+#define JOB_CADET (1<<16)
+#define JOBCAT_LAST_ENGSEC (1<<17)
+
+
+// ====================================
+// JOBCAT_MEDSCI
+// Начинаются с JOB_CORONER (1<<10)
+#define JOB_INTERN (1<<11)
+#define JOB_STUDENT (1<<12)
+#define JOBCAT_LAST_MEDSCI (1<<16)
+
+
+// ====================================
+// JOBCAT_SUPPORT
+// Начинаются с JOB_EXPLORER (1<<14)
+// TIER 1
+#define JOB_PRISON (1<<15)
+
+// TIER 2
+#define JOB_BARBER (1<<16)
+#define JOB_BATH (1<<17)
+#define JOB_CASINO (1<<18)
+#define JOB_WAITER (1<<19)
+#define JOB_ACOLYTE (1<<20)
+#define JOB_DELIVERER (1<<21)
+#define JOB_BOXER (1<<22)
+#define JOB_PAINTER (1<<23)
+#define JOB_MUSICIAN (1<<24)
+#define JOB_DONOR (1<<24) // Свободная роль, можно переименовать
+#define JOB_ACTOR (1<<26)
+
+// TIER 3
+#define JOB_ADMINISTRATOR (1<<27)
+#define JOB_TOURIST_TSF (1<<28)
+#define JOB_TOURIST_USSP (1<<29)
+#define JOB_MANAGER_JANITOR (1<<30)
+#define JOB_APPRENTICE (1<<31)
+#define JOB_GUARD (1<<32)
+#define JOB_MIGRANT (1<<33)
+#define JOB_UNCERTAIN (1<<34)
+
+// TIER 4
+#define JOB_ADJUTANT (1<<35)
+#define JOB_BUTLER (1<<36)
+#define JOB_MAID (1<<37)
+#define JOB_REPRESENTATIVE_TSF (1<<38)
+#define JOB_REPRESENTATIVE_USSP (1<<39)
+#define JOB_DEALER (1<<40)
+
+// TIER 5
+#define JOB_VIP_GUEST (1<<41)
+#define JOB_BANKER (1<<42)
+#define JOB_SECURITY_CLOWN (1<<43)
+
+#define JOBCAT_LAST_SUPPORT (1<<44)
+
+*/
diff --git a/modular_ss220/_defines220/code/jobs_defines.dm b/modular_ss220/_defines220/code/jobs_defines.dm
deleted file mode 100644
index fed4ba8651fa..000000000000
--- a/modular_ss220/_defines220/code/jobs_defines.dm
+++ /dev/null
@@ -1,11 +0,0 @@
-#define NOVICE_JOB_MINUTES 120
-#define NOVICE_CADET_JOB_MINUTES 300
-
-// JOBCAT_ENGSEC
-#define JOB_TRAINEE (1<<15)
-#define JOB_CADET (1<<16)
-
-// JOBCAT_MEDSCI
-#define JOB_INTERN (1<<11)
-#define JOB_STUDENT (1<<12)
-// Если ОФФы добавят новую должность в отдел, то потребуется смещение
diff --git a/modular_ss220/_defines220/code/lists_TG.dm b/modular_ss220/_defines220/code/lists_TG.dm
new file mode 100644
index 000000000000..7e5d6e16df7f
--- /dev/null
+++ b/modular_ss220/_defines220/code/lists_TG.dm
@@ -0,0 +1,7 @@
+// Generic listoflist safe add and removal macros:
+///If value is a list, wrap it in a list so it can be used with list add/remove operations
+#define LIST_VALUE_WRAP_LISTS(value) (islist(value) ? list(value) : value)
+///Add an untyped item to a list, taking care to handle list items by wrapping them in a list to remove the footgun
+#define UNTYPED_LIST_ADD(list, item) (list += LIST_VALUE_WRAP_LISTS(item))
+///Remove an untyped item to a list, taking care to handle list items by wrapping them in a list to remove the footgun
+#define UNTYPED_LIST_REMOVE(list, item) (list -= LIST_VALUE_WRAP_LISTS(item))
diff --git a/modular_ss220/_misc/code/global_procs.dm b/modular_ss220/_misc/code/global_procs.dm
index e7163cc06d44..d6c790f5c99b 100644
--- a/modular_ss220/_misc/code/global_procs.dm
+++ b/modular_ss220/_misc/code/global_procs.dm
@@ -1,2 +1,13 @@
/proc/cmp_typepaths_asc(A, B)
return sorttext("[B]","[A]")
+
+///Returns a list of all locations (except the area) the movable is within.
+/proc/get_nested_locs(atom/movable/atom_on_location, include_turf = FALSE)
+ . = list()
+ var/atom/location = atom_on_location.loc
+ var/turf/our_turf = get_turf(atom_on_location)
+ while(location && location != our_turf)
+ . += location
+ location = location.loc
+ if(our_turf && include_turf) //At this point, only the turf is left, provided it exists.
+ . += our_turf
diff --git a/modular_ss220/_modpacks.dm b/modular_ss220/_modpacks.dm
index f7865a0ae2a6..a8a136849101 100644
--- a/modular_ss220/_modpacks.dm
+++ b/modular_ss220/_modpacks.dm
@@ -69,9 +69,12 @@ SUBSYSTEM_DEF(modpacks)
))
return modpacks
-/datum/controller/subsystem/modpacks/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state = GLOB.always_state)
+/datum/controller/subsystem/modpacks/ui_state(mob/user)
+ return GLOB.always_state
+
+/datum/controller/subsystem/modpacks/ui_interact(mob/user, datum/tgui/ui = null)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "ModpacksList", "Modpacks List", 500, 550, master_ui, state)
+ ui = new(user, src, "ModpacksList", name)
ui.open()
ui.set_autoupdate(FALSE)
diff --git a/modular_ss220/aesthetics/_aesthetics.dme b/modular_ss220/aesthetics/_aesthetics.dme
index 6ffb0d8abb86..16eec0a94895 100644
--- a/modular_ss220/aesthetics/_aesthetics.dme
+++ b/modular_ss220/aesthetics/_aesthetics.dme
@@ -27,6 +27,7 @@
#include "hydroponics\code\hydroponics.dm"
#include "intercom\code\intercom.dm"
#include "keycard\code\keycard.dm"
+#include "kitchen\code\kitchen.dm"
#include "labeler\code\labeler.dm"
#include "library\code\library.dm"
#include "light_switch\code\light_switch.dm"
@@ -42,7 +43,6 @@
#include "satellite\code\satellite.dm"
#include "sheets\code\sheets.dm"
#include "shutters\code\shutters.dm"
-#include "skin\code\darkmode.dm"
#include "soap\code\soap.dm"
#include "stamps\code\stamps.dm"
#include "surgery_table\code\surgery_table.dm"
diff --git a/modular_ss220/aesthetics/airlocks/icons/station/overlays.dmi b/modular_ss220/aesthetics/airlocks/icons/station/overlays.dmi
index 8f8801051180..6c3a6fca97f6 100644
Binary files a/modular_ss220/aesthetics/airlocks/icons/station/overlays.dmi and b/modular_ss220/aesthetics/airlocks/icons/station/overlays.dmi differ
diff --git a/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi b/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi
index 521ffa0df7b9..dd44a7926635 100644
Binary files a/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi and b/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi differ
diff --git a/modular_ss220/aesthetics/firealarm/icons/firealarm.dmi b/modular_ss220/aesthetics/firealarm/icons/firealarm.dmi
index 17f9897e3fbe..ae288310c251 100644
Binary files a/modular_ss220/aesthetics/firealarm/icons/firealarm.dmi and b/modular_ss220/aesthetics/firealarm/icons/firealarm.dmi differ
diff --git a/modular_ss220/aesthetics/floors/code/floors.dm b/modular_ss220/aesthetics/floors/code/floors.dm
index f6519bd50caa..875dd6cc1744 100644
--- a/modular_ss220/aesthetics/floors/code/floors.dm
+++ b/modular_ss220/aesthetics/floors/code/floors.dm
@@ -1,3 +1,12 @@
+/// Floor icon_states for floor painter
+/datum/painter/floor/New()
+ allowed_states |= list("darkneutralcorner", "darkneutral", "darkneutralfull", "navybluecorners", "navyblue", "navybluefull",
+ "navybluealt", "navybluealtstrip", "navybluecornersalt", "darkbluealt", "darkbluealtstrip", "darkbluecornersalt",
+ "darkredalt", "darkredaltstrip", "darkredcornersalt", "darkyellowalt", "darkyellowaltstrip", "darkyellowcornersalt",
+ "whitebrowncorner", "whitebrown"
+ )
+ . = ..()
+
/turf/simulated/floor
icon = 'modular_ss220/aesthetics/floors/icons/floors.dmi'
diff --git a/modular_ss220/aesthetics/kitchen/code/kitchen.dm b/modular_ss220/aesthetics/kitchen/code/kitchen.dm
new file mode 100644
index 000000000000..0c1bed7b07f7
--- /dev/null
+++ b/modular_ss220/aesthetics/kitchen/code/kitchen.dm
@@ -0,0 +1,14 @@
+/obj/machinery/kitchen_machine/grill
+ icon = 'modular_ss220/aesthetics/kitchen/icons/cooking_machines.dmi'
+
+/obj/machinery/kitchen_machine/oven
+ icon = 'modular_ss220/aesthetics/kitchen/icons/cooking_machines.dmi'
+
+/obj/machinery/kitchen_machine/candy_maker
+ icon = 'modular_ss220/aesthetics/kitchen/icons/cooking_machines.dmi'
+
+/obj/machinery/cooker/deepfryer
+ icon = 'modular_ss220/aesthetics/kitchen/icons/cooking_machines.dmi'
+
+/obj/machinery/kitchen_machine/microwave
+ icon = 'modular_ss220/aesthetics/kitchen/icons/cooking_machines.dmi'
diff --git a/modular_ss220/aesthetics/kitchen/icons/cooking_machines.dmi b/modular_ss220/aesthetics/kitchen/icons/cooking_machines.dmi
new file mode 100644
index 000000000000..2d68d9a965d3
Binary files /dev/null and b/modular_ss220/aesthetics/kitchen/icons/cooking_machines.dmi differ
diff --git a/modular_ss220/aesthetics/skin/code/darkmode.dm b/modular_ss220/aesthetics/skin/code/darkmode.dm
deleted file mode 100644
index 48e5f4c2ea9f..000000000000
--- a/modular_ss220/aesthetics/skin/code/darkmode.dm
+++ /dev/null
@@ -1,11 +0,0 @@
-/client/activate_darkmode()
- . = ..()
- winset(src, "rpane.fullscreenb", "background-color=#40628a;text-color=#ffffff")
-
-/client/deactivate_darkmode()
- . = ..()
- winset(src, "rpane.fullscreenb", "background-color=none;text-color=#000000")
-
-/datum/preferences/New(client/C, datum/db_query/Q)
- toggles |= PREFTOGGLE_UI_DARKMODE
- . = ..()
diff --git a/modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi b/modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi
index 33a1d999ec4a..6d788556420e 100644
Binary files a/modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi and b/modular_ss220/aesthetics/skin/icons/screen_clockwork.dmi differ
diff --git a/modular_ss220/aesthetics/skin/icons/screen_detective.dmi b/modular_ss220/aesthetics/skin/icons/screen_detective.dmi
index 304b91e93363..eda7ad91bd9a 100644
Binary files a/modular_ss220/aesthetics/skin/icons/screen_detective.dmi and b/modular_ss220/aesthetics/skin/icons/screen_detective.dmi differ
diff --git a/modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi b/modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi
index 9f8c6c60be46..b58fb49e4522 100644
Binary files a/modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi and b/modular_ss220/aesthetics/skin/icons/screen_trasenknox.dmi differ
diff --git a/modular_ss220/aesthetics/stamps/code/stamps.dm b/modular_ss220/aesthetics/stamps/code/stamps.dm
index 8b45a0705154..ccc668b75f67 100644
--- a/modular_ss220/aesthetics/stamps/code/stamps.dm
+++ b/modular_ss220/aesthetics/stamps/code/stamps.dm
@@ -69,14 +69,3 @@
icon_state = "stamp-ussp"
item_color = "redcoat"
stampoverlay_custom_icon = 'modular_ss220/aesthetics/stamps/icons/stamps.dmi'
-
-// Adding new stamps to the list
-/datum/asset/simple/paper/New()
- assets += list(
- "large_stamp-ward.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-ward.png',
- "large_stamp-ploho.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-ploho.png',
- "large_stamp-BIGdeny.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-BIGdeny.png',
- "large_stamp-navcom.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-navcom.png',
- "large_stamp-mime.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-mime.png',
- "large_stamp-ussp.png" = 'modular_ss220/aesthetics/stamps/icons/paper_icons/large_stamp-ussp.png'
- )
diff --git a/modular_ss220/aesthetics/windowtint/code/windowtint.dm b/modular_ss220/aesthetics/windowtint/code/windowtint.dm
index bf1a409571ab..0d919352a13e 100644
--- a/modular_ss220/aesthetics/windowtint/code/windowtint.dm
+++ b/modular_ss220/aesthetics/windowtint/code/windowtint.dm
@@ -3,20 +3,29 @@
icon_state = "polarizer-0"
layer = ABOVE_WINDOW_LAYER
-/obj/machinery/button/windowtint/attack_hand(mob/user)
+/obj/machinery/button/windowtint/try_attack_hand(mob/user)
+ if(..())
+ return TRUE
if(!allowed(user) && !user.can_advanced_admin_interact())
to_chat(user, span_warning("Access Denied."))
flick("polarizer-denied",src)
playsound(src, pick('modular_ss220/aesthetics/windowtint/sound/button.ogg', 'modular_ss220/aesthetics/windowtint/sound/button_alternate.ogg', 'modular_ss220/aesthetics/windowtint/sound/button_meloboom.ogg'), 20)
- return 1
+ return TRUE
+ return FALSE
- toggle_tint()
- icon_state= "polarizer-turning_on"
- addtimer(CALLBACK(src, PROC_REF(update_windowtint_icon)), 0.5 SECONDS)
+/obj/machinery/button/windowtint/toggle_tint()
+ ..()
+ if(range != TINT_CONTROL_RANGE_AREA)
+ animate_windowtint()
+ return
+ for(var/obj/machinery/button/windowtint/button in button_area)
+ if(button.range != TINT_CONTROL_RANGE_AREA || (button.id != id && button.id != TINT_CONTROL_GROUP_NONE))
+ continue
+ button.animate_windowtint()
- if(!active)
- icon_state= "polarizer-turning_off"
- addtimer(CALLBACK(src, PROC_REF(update_windowtint_icon)), 0.5 SECONDS)
+/obj/machinery/button/windowtint/proc/animate_windowtint()
+ icon_state = active ? "polarizer-turning_on" : "polarizer-turning_off"
+ addtimer(CALLBACK(src, PROC_REF(update_windowtint_icon)), 0.5 SECONDS)
/obj/machinery/button/windowtint/proc/update_windowtint_icon()
icon_state = "polarizer-[active]"
diff --git a/modular_ss220/aesthetics_sounds/sound/coin_accept.ogg b/modular_ss220/aesthetics_sounds/sound/coin_accept.ogg
new file mode 100644
index 000000000000..34b79ad1240a
Binary files /dev/null and b/modular_ss220/aesthetics_sounds/sound/coin_accept.ogg differ
diff --git a/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm b/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm
index 5931bcea6215..6f9a00563cc0 100644
--- a/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm
+++ b/modular_ss220/agent_id_tgui/code/agent_id_tgui.dm
@@ -116,10 +116,13 @@
data["appearances"] = card_images
return data
-/obj/item/card/id/syndicate/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+/obj/item/card/id/syndicate/ui_state(mob/user)
+ return GLOB.default_state
+
+/obj/item/card/id/syndicate/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, ui_key, "AgentCard", name, 425, 500, master_ui, state)
+ ui = new(user, src, "AgentCard", name)
ui.open()
/obj/item/card/id/syndicate/attack_self(mob/user)
diff --git a/modular_ss220/antagonists/code/antag_mix/scenarios/antag_scenario.dm b/modular_ss220/antagonists/code/antag_mix/scenarios/antag_scenario.dm
index a5fffbd4e512..8064fab91231 100644
--- a/modular_ss220/antagonists/code/antag_mix/scenarios/antag_scenario.dm
+++ b/modular_ss220/antagonists/code/antag_mix/scenarios/antag_scenario.dm
@@ -71,7 +71,7 @@
vars[param] = params[param]
if(GLOB.configuration.gamemode.prevent_mindshield_antags)
- restricted_roles |= protected_roles
+ restricted_roles |= protected_roles + GLOB.restricted_jobs_ss220
/**
diff --git a/modular_ss220/balance/_balance.dme b/modular_ss220/balance/_balance.dme
index 2d9559a712cb..f6734c169e84 100644
--- a/modular_ss220/balance/_balance.dme
+++ b/modular_ss220/balance/_balance.dme
@@ -1,7 +1,9 @@
#include "_balance.dm"
+#include "code/access/access.dm"
#include "code/items/projectiles.dm"
#include "code/items/weapons.dm"
+#include "code/items/storage/surgical_tray.dm"
#include "code/jobs/warden.dm"
#include "code/mobs/aliens/larva.dm"
#include "code/species/machine.dm"
diff --git a/modular_ss220/balance/code/access/access.dm b/modular_ss220/balance/code/access/access.dm
new file mode 100644
index 000000000000..bdf575cc8398
--- /dev/null
+++ b/modular_ss220/balance/code/access/access.dm
@@ -0,0 +1,19 @@
+/datum/job/cargo_tech/New()
+ . = ..()
+ access += list(ACCESS_MINING)
+
+/datum/job/mining/New()
+ . = ..()
+ access += list(ACCESS_CARGO, ACCESS_CARGO_BAY, ACCESS_MAILSORTING)
+
+/datum/job/bartender/New()
+ . = ..()
+ access += list(ACCESS_KITCHEN, ACCESS_HYDROPONICS)
+
+/datum/job/chef/New()
+ . = ..()
+ access += list(ACCESS_BAR, ACCESS_HYDROPONICS)
+
+/datum/job/hydro/New()
+ . = ..()
+ access += list(ACCESS_KITCHEN, ACCESS_BAR)
diff --git a/modular_ss220/balance/code/items/storage/surgical_tray.dm b/modular_ss220/balance/code/items/storage/surgical_tray.dm
new file mode 100644
index 000000000000..c3c65d4b0692
--- /dev/null
+++ b/modular_ss220/balance/code/items/storage/surgical_tray.dm
@@ -0,0 +1,14 @@
+/obj/item/storage/surgical_tray/Initialize(mapload)
+ . = ..()
+
+ QDEL_LIST_CONTENTS(contents)
+
+ new /obj/item/scalpel(src)
+ new /obj/item/cautery(src)
+ new /obj/item/hemostat(src)
+ new /obj/item/retractor(src)
+ new /obj/item/FixOVein(src)
+ new /obj/item/surgicaldrill(src)
+ new /obj/item/circular_saw(src)
+ new /obj/item/bonegel(src)
+ new /obj/item/bonesetter(src)
diff --git a/modular_ss220/balance/code/species/machine.dm b/modular_ss220/balance/code/species/machine.dm
index a33fb1f80e26..e2460ebe1d65 100644
--- a/modular_ss220/balance/code/species/machine.dm
+++ b/modular_ss220/balance/code/species/machine.dm
@@ -10,3 +10,9 @@
new /obj/item/weldingtool(src)
new /obj/item/stack/cable_coil/five(src)
new /obj/item/flashlight/flare/glowstick/emergency(src)
+
+/obj/machinery/recharger/attackby(obj/item/G, mob/user, params)
+ if(istype(G, /obj/item/melee/baton/electrostaff))
+ to_chat(user, "[G] не имеет внешних разъемов для подзарядки.")
+ return
+ . = ..()
diff --git a/modular_ss220/bureaucracy/code/forms.dm b/modular_ss220/bureaucracy/code/forms.dm
index 794fc068ea10..3f6d629231d9 100644
--- a/modular_ss220/bureaucracy/code/forms.dm
+++ b/modular_ss220/bureaucracy/code/forms.dm
@@ -1,6 +1,10 @@
GLOBAL_LIST_INIT(bureaucratic_forms, list())
/datum/bureaucratic_form
+ var/const/footer_signstampfax = "
Подписи глав являются доказательством их согласия. Данный документ является недействительным при отсутствии релевантной печати. Пожалуйста, отправьте обратно подписанную/проштампованную копию факсом.
"
+ var/const/footer_signstamp = "
Подписи глав являются доказательством их согласия. Данный документ является недействительным при отсутствии релевантной печати.
"
+ var/const/footer_confidential = "
Данный документ является недействительным при отсутствии печати. Отказ от ответственности: Данный факс является конфиденциальным и не может быть прочтен сотрудниками не имеющего доступа. Если вы получили данный факс по ошибке, просим вас сообщить отправителю и удалить его из вашего почтового ящика или любого другого носителя. И Nanotrasen, и любой её агент не несёт ответственность за любые сделанные заявления, они являются исключительно заявлениями отправителя, за исключением если отправителем является Nanotrasen или один из её агентов. Отмечаем, что ни Nanotrasen, ни один из агентов корпорации не несёт ответственности за наличие вирусов, который могут содержаться в данном факсе или его приложения, и это только ваша прерогатива просканировать факс и приложения на них. Никакие контракты не могут быть заключены посредством факсимильной связи.
"
+
/// Form name. Will be applied to a paper
var/name
/// Form id
@@ -26,9 +30,6 @@ GLOBAL_LIST_INIT(bureaucratic_forms, list())
var/notice = "Перед заполнением прочтите от начала до конца | Во всех PDA имеется ручка"
/// Is generated based on station name. Used in some forms
var/from
- var/const/footer_signstampfax = "
Подписи глав являются доказательством их согласия. Данный документ является недействительным при отсутствии релевантной печати. Пожалуйста, отправьте обратно подписанную/проштампованную копию факсом.
"
- var/const/footer_signstamp = "
Подписи глав являются доказательством их согласия. Данный документ является недействительным при отсутствии релевантной печати.
"
- var/const/footer_confidential = "
Данный документ является недействительным при отсутствии печати. Отказ от ответственности: Данный факс является конфиденциальным и не может быть прочтен сотрудниками не имеющего доступа. Если вы получили данный факс по ошибке, просим вас сообщить отправителю и удалить его из вашего почтового ящика или любого другого носителя. И Nanotrasen, и любой её агент не несёт ответственность за любые сделанные заявления, они являются исключительно заявлениями отправителя, за исключением если отправителем является Nanotrasen или один из её агентов. Отмечаем, что ни Nanotrasen, ни один из агентов корпорации не несёт ответственности за наличие вирусов, который могут содержаться в данном факсе или его приложения, и это только ваша прерогатива просканировать факс и приложения на них. Никакие контракты не могут быть заключены посредством факсимильной связи.
![](data:image/png;base64,[GLOB.bicon_cache["\ref[obj]"]])
"
+
+ // Either an atom or somebody fucked up and is gonna get a runtime, which I'm fine with.
+ var/atom/A = obj
+ var/key = "[istype(A.icon, /icon) ? "\ref[A.icon]" : A.icon]:[A.icon_state]"
+ if(!GLOB.bicon_cache[key]) // Doesn't exist, make it.
+ var/icon/I = icon(A.icon, A.icon_state, SOUTH, 1)
+ if(ishuman(obj)) // Shitty workaround for a BYOND issue.
+ var/icon/temp = I
+ I = icon()
+ I.Insert(temp, dir = SOUTH)
+ GLOB.bicon_cache[key] = icon2base64(I, key)
+ if(use_class)
+ class = "class='icon [A.icon_state]'"
+
+ return "
"
diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm
index c4f932574a6e..812f8369e237 100644
--- a/code/__HELPERS/lists.dm
+++ b/code/__HELPERS/lists.dm
@@ -410,13 +410,6 @@
var/middle = L.len / 2 + 1 // Copy is first,second-1
return mergeLists(sortList(L.Copy(0,middle)), sortList(L.Copy(middle))) //second parameter null = to end of list
-//Mergsorge: uses sortAssoc() but uses the var's name specifically. This should probably be using mergeAtom() instead
-/proc/sortNames(list/L)
- var/list/Q = new()
- for(var/atom/x in L)
- Q[x.name] = x
- return sortAssoc(Q)
-
/proc/mergeLists(list/L, list/R)
var/Li=1
var/Ri=1
@@ -865,3 +858,15 @@
// Pick something else from a list than we last picked
/proc/pick_excluding(list/l, exclude)
return pick(l - exclude)
+
+///takes an input_key, as text, and the list of keys already used, outputting a replacement key in the format of "[input_key] ([number_of_duplicates])" if it finds a duplicate
+///use this for lists of things that might have the same name, like mobs or objects, that you plan on giving to a player as input
+/proc/avoid_assoc_duplicate_keys(input_key, list/used_key_list)
+ if(!input_key || !istype(used_key_list))
+ return
+ if(used_key_list[input_key])
+ used_key_list[input_key]++
+ input_key = "[input_key] ([used_key_list[input_key]])"
+ else
+ used_key_list[input_key] = 1
+ return input_key
diff --git a/code/__HELPERS/mob_helpers.dm b/code/__HELPERS/mob_helpers.dm
index 5a6fc82dc98e..81d2bd0efbeb 100644
--- a/code/__HELPERS/mob_helpers.dm
+++ b/code/__HELPERS/mob_helpers.dm
@@ -218,12 +218,14 @@
else return "unknown"
else if(species == "Vox")
switch(tone)
- if(2) return "dark green"
+ if(2) return "plum"
if(3) return "brown"
if(4) return "gray"
if(5) return "emerald"
if(6) return "azure"
- else return "green"
+ if(7) return "crimson"
+ if(8) return "nebula"
+ else return "lime"
else
return "unknown"
@@ -582,7 +584,6 @@ GLOBAL_LIST_EMPTY(do_after_once_tracker)
to_chat(user, "
"
- dat += "