", "\[logo\]")
return text
-#define string2charlist(string) (splittext(string, regex("(\\x0A|.)")) - splittext(string, ""))
\ No newline at end of file
+#define string2charlist(string) (splittext(string, regex("(\\x0A|.)")) - splittext(string, ""))
diff --git a/code/_globalvars/lists/misc.dm b/code/_globalvars/lists/misc.dm
index 42e4441034c..e9c50b0f662 100644
--- a/code/_globalvars/lists/misc.dm
+++ b/code/_globalvars/lists/misc.dm
@@ -3,6 +3,21 @@ GLOBAL_LIST_INIT(alphabet_uppercase, list("A","B","C","D","E","F","G","H","I","J
GLOBAL_LIST_INIT(zero_character_only, list("0"))
GLOBAL_LIST_INIT(hex_characters, list("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"))
GLOBAL_LIST_INIT(binary, list("0","1"))
+GLOBAL_LIST_INIT(html_colors, list("Alice Blue","Antique White","Aqua","Aquamarine","Azure","Beige","Bisque","Black","Blanched Almond","Blue","Blue Violet",
+ "Brown","Burly Wood","Cadet Blue","Chartreuse","Chocolate","Coral","Cornflower Blue","Cornsilk","Crimson","Cyan",
+ "Dark Blue","Dark Cyan","Dark Golden Rod","Dark Gray","Dark Green","Dark Khaki","Dark Magenta","Dark Olive Green",
+ "Dark Orange","Dark Orchid","Dark Red","Dark Salmon","Dark Sea Green","Dark Slate Blue","Dark Slate Gray",
+ "Dark Turquoise","Dark Violet","Deep Pink","Deep Sky Blue","Dim Gray","Dodger Blue","Fire Brick","Floral White",
+ "Forest Green","Fuchsia","Gainsboro","Ghost White","Gold","Golden Rod","Gray","Grey","Green","Green Yellow","Honey Dew",
+ "Hot Pink","Indian Red","Indigo","Ivory","Khaki","Lavender","Lavender Blush","Lawn Green","Lemon Chiffon","Light Blue",
+ "Light Coral","Light Cyan","Light Golden Rod Yellow","Light Gray","Light Green","Light Pink","Light Salmon","Light Sea Green",
+ "Light Sky Blue","Light Slate Gray","Light Steel Blue","Light Yellow","Lime","Lime Green","Linen","Magenta","Maroon",
+ "Medium Aquamarine","Medium Blue","Medium Orchid","Medium Purple","Medium Seagreen","Medium Slate Blue","Medium Spring Green",
+ "Medium Turquoise","Medium Violet Red","Midnight Blue","Mint Cream","Misty Rose","Moccasin","Navajo White","Navy","Old Lace",
+ "Olive","Olive Drab","Orange","Orange Red","Orchid","Pale Golden Rod","Pale Green","Pale Turquoise","Pale Violet Red",
+ "Papaya Whip","Peach Puff","Peru","Pink","Plum","Powder Blue","Purple","Red","Rosy Brown","Royal Blue","Saddle Brown",
+ "Salmon","Sandy Brown","Sea Green","Sea Shell","Sienna","Silver","Sky Blue","Slate Blue","Slate Gray","Snow","Spring Green",
+ "Steel Blue","Tan","Teal","Thistle","Tomato","Turquoise","Violet","Wheat","White","White Smoke","Yellow","Yellow Green"))
GLOBAL_LIST_INIT(day_names, list("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"))
GLOBAL_LIST_INIT(month_names, list("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"))
diff --git a/code/_globalvars/lists/typecache.dm b/code/_globalvars/lists/typecache.dm
new file mode 100644
index 00000000000..2600e5c287f
--- /dev/null
+++ b/code/_globalvars/lists/typecache.dm
@@ -0,0 +1,12 @@
+//please store common type caches here.
+//type caches should only be stored here if used in mutiple places or likely to be used in mutiple places.
+
+//Note: typecache can only replace istype if you know for sure the thing is at least a datum.
+
+GLOBAL_LIST_INIT(typecache_mob, typecacheof(/mob))
+
+GLOBAL_LIST_INIT(typecache_living, typecacheof(/mob/living))
+
+GLOBAL_LIST_INIT(typecache_stack, typecacheof(/obj/item/stack))
+
+GLOBAL_LIST_INIT(typecache_machine_or_structure, typecacheof(list(/obj/machinery, /obj/structure)))
\ No newline at end of file
diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm
index 16cb8baa044..32a9d7cf46d 100644
--- a/code/_onclick/hud/action_button.dm
+++ b/code/_onclick/hud/action_button.dm
@@ -17,7 +17,7 @@
//Hide/Show Action Buttons ... Button
/obj/screen/movable/action_button/hide_toggle
name = "Hide Buttons"
- icon = 'icons/mob/actions.dmi'
+ icon = 'icons/mob/actions/actions.dmi'
icon_state = "bg_default"
var/hidden = 0
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index a187dfe3648..0ededa09c22 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -315,6 +315,18 @@ Recharging stations are available in robotics, the dormitory bathrooms, and the
desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite."
icon_state = "lowcell"
+//Diona Nymph
+/obj/screen/alert/nymph
+ name = "Gestalt merge"
+ desc = "You have merged with a diona gestalt and are now part of it's biomass. You can still wiggle yourself free though."
+
+/obj/screen/alert/nymph/Click()
+ if(!usr || !usr.client)
+ return
+ if(isnymph(usr))
+ var/mob/living/simple_animal/diona/D = usr
+ return D.resist()
+
//Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg
/obj/screen/alert/hacked
name = "Hacked"
@@ -358,12 +370,48 @@ so as to remain in compliance with the most up-to-date laws."
AI.eyeobj.setLoc(T)
//MECHS
-
/obj/screen/alert/low_mech_integrity
name = "Mech Damaged"
desc = "Mech integrity is low."
icon_state = "low_mech_integrity"
+/obj/screen/alert/mech_port_available
+ name = "Connect to Port"
+ desc = "Click here to connect to an air port and refill your oxygen!"
+ icon_state = "mech_port"
+ var/obj/machinery/atmospherics/unary/portables_connector/target = null
+
+/obj/screen/alert/mech_port_available/Destroy()
+ target = null
+ return ..()
+
+/obj/screen/alert/mech_port_available/Click()
+ if(!usr || !usr.client)
+ return
+ if(!istype(usr.loc, /obj/mecha) || !target)
+ return
+ var/obj/mecha/M = usr.loc
+ if(M.connect(target))
+ to_chat(usr, "[M] connects to the port.")
+ else
+ to_chat(usr, "[M] failed to connect to the port.")
+
+/obj/screen/alert/mech_port_disconnect
+ name = "Disconnect from Port"
+ desc = "Click here to disconnect from your air port."
+ icon_state = "mech_port_x"
+
+/obj/screen/alert/mech_port_disconnect/Click()
+ if(!usr || !usr.client)
+ return
+ if(!istype(usr.loc, /obj/mecha))
+ return
+ var/obj/mecha/M = usr.loc
+ if(M.disconnect())
+ to_chat(usr, "[M] disconnects from the port.")
+ else
+ to_chat(usr, "[M] is not connected to a port at the moment.")
+
//GUARDIANS
/obj/screen/alert/cancharge
name = "Charge Ready"
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
new file mode 100644
index 00000000000..cea30327af1
--- /dev/null
+++ b/code/_onclick/hud/radial.dm
@@ -0,0 +1,300 @@
+#define NEXT_PAGE_ID "__next__"
+#define DEFAULT_CHECK_DELAY 20
+#define ANIM_SPEED 1
+
+GLOBAL_LIST_EMPTY(radial_menus)
+
+/obj/screen/radial
+ icon = 'icons/mob/radial.dmi'
+ layer = ABOVE_HUD_LAYER
+ plane = ABOVE_HUD_PLANE
+ var/datum/radial_menu/parent
+
+/obj/screen/radial/slice
+ icon_state = "radial_slice"
+ var/choice
+ var/next_page = FALSE
+
+/obj/screen/radial/slice/MouseEntered(location, control, params)
+ . = ..()
+ icon_state = "radial_slice_focus"
+ openToolTip(usr, src, params, title = name)
+
+/obj/screen/radial/slice/MouseExited(location, control, params)
+ . = ..()
+ icon_state = "radial_slice"
+ closeToolTip(usr)
+
+/obj/screen/radial/slice/Click(location, control, params)
+ if(usr.client == parent.current_user)
+ if(next_page)
+ parent.next_page()
+ else
+ parent.element_chosen(choice,usr)
+
+/obj/screen/radial/center
+ name = "Close Menu"
+ icon_state = "radial_center"
+
+/obj/screen/radial/center/Click(location, control, params)
+ if(usr.client == parent.current_user)
+ parent.finished = TRUE
+
+/datum/radial_menu
+ var/list/choices = list() //List of choice id's
+ var/list/choices_icons = list() //choice_id -> icon
+ var/list/choices_values = list() //choice_id -> choice
+ var/list/page_data = list() //list of choices per page
+
+
+ var/selected_choice
+ var/list/obj/screen/elements = list()
+ var/obj/screen/radial/center/close_button
+ var/client/current_user
+ var/atom/anchor
+ var/image/menu_holder
+ var/finished = FALSE
+ var/datum/callback/custom_check_callback
+ var/next_check = 0
+ var/check_delay = DEFAULT_CHECK_DELAY
+
+ var/radius = 32
+ var/starting_angle = 0
+ var/ending_angle = 360
+ var/zone = 360
+ var/min_angle = 45 //Defaults are setup for this value, if you want to make the menu more dense these will need changes.
+ var/max_elements
+ var/pages = 1
+ var/current_page = 1
+
+ var/hudfix_method = TRUE //TRUE to change anchor to user, FALSE to shift by py_shift
+ var/py_shift = 0
+ var/entry_animation = TRUE
+
+//If we swap to vis_contens inventory these will need a redo
+/datum/radial_menu/proc/check_screen_border(mob/user)
+ var/atom/movable/AM = anchor
+ if(!istype(AM) || !AM.screen_loc)
+ return
+ if(AM in user.client.screen)
+ if(hudfix_method)
+ anchor = user
+ else
+ py_shift = 32
+ restrict_to_dir(NORTH) //I was going to parse screen loc here but that's more effort than it's worth.
+
+//Sets defaults
+//These assume 45 deg min_angle
+/datum/radial_menu/proc/restrict_to_dir(dir)
+ switch(dir)
+ if(NORTH)
+ starting_angle = 270
+ ending_angle = 135
+ if(SOUTH)
+ starting_angle = 90
+ ending_angle = 315
+ if(EAST)
+ starting_angle = 0
+ ending_angle = 225
+ if(WEST)
+ starting_angle = 180
+ ending_angle = 45
+
+/datum/radial_menu/proc/setup_menu()
+ if(ending_angle > starting_angle)
+ zone = ending_angle - starting_angle
+ else
+ zone = 360 - starting_angle + ending_angle
+
+ max_elements = round(zone / min_angle)
+ var/paged = max_elements < choices.len
+ if(elements.len < max_elements)
+ var/elements_to_add = max_elements - elements.len
+ for(var/i in 1 to elements_to_add) //Create all elements
+ var/obj/screen/radial/new_element = new /obj/screen/radial/slice
+ new_element.parent = src
+ elements += new_element
+
+ var/page = 1
+ page_data = list(null)
+ var/list/current = list()
+ var/list/choices_left = choices.Copy()
+ while(choices_left.len)
+ if(current.len == max_elements)
+ page_data[page] = current
+ page++
+ page_data.len++
+ current = list()
+ if(paged && current.len == max_elements - 1)
+ current += NEXT_PAGE_ID
+ continue
+ else
+ current += popleft(choices_left)
+ if(paged && current.len < max_elements)
+ current += NEXT_PAGE_ID
+
+ page_data[page] = current
+ pages = page
+ current_page = 1
+ update_screen_objects(anim = entry_animation)
+
+/datum/radial_menu/proc/update_screen_objects(anim = FALSE)
+ var/list/page_choices = page_data[current_page]
+ var/angle_per_element = round(zone / page_choices.len)
+ for(var/i in 1 to elements.len)
+ var/obj/screen/radial/E = elements[i]
+ var/angle = WRAP(starting_angle + (i - 1) * angle_per_element, 0, 360)
+ if(i > page_choices.len)
+ HideElement(E)
+ else
+ SetElement(E,page_choices[i], angle, anim = anim, anim_order = i)
+
+/datum/radial_menu/proc/HideElement(obj/screen/radial/slice/E)
+ E.cut_overlays()
+ E.alpha = 0
+ E.name = "None"
+ E.maptext = null
+ E.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ E.choice = null
+ E.next_page = FALSE
+
+/datum/radial_menu/proc/SetElement(obj/screen/radial/slice/E, choice_id, angle, anim, anim_order)
+ //Position
+ var/py = round(cos(angle) * radius) + py_shift
+ var/px = round(sin(angle) * radius)
+ if(anim)
+ var/timing = anim_order * ANIM_SPEED
+ var/matrix/starting = matrix()
+ starting.Scale(0.1, 0.1)
+ E.transform = starting
+ var/matrix/TM = matrix()
+ animate(E, pixel_x = px, pixel_y = py, transform = TM, time = timing)
+ else
+ E.pixel_y = py
+ E.pixel_x = px
+
+ //Visuals
+ E.alpha = 255
+ E.mouse_opacity = MOUSE_OPACITY_ICON
+ E.cut_overlays()
+ if(choice_id == NEXT_PAGE_ID)
+ E.name = "Next Page"
+ E.next_page = TRUE
+ E.add_overlay("radial_next")
+ else
+ if(istext(choices_values[choice_id]))
+ E.name = choices_values[choice_id]
+ else
+ var/atom/movable/AM = choices_values[choice_id] //Movables only
+ E.name = AM.name
+ E.choice = choice_id
+ E.maptext = null
+ E.next_page = FALSE
+ if(choices_icons[choice_id])
+ E.add_overlay(choices_icons[choice_id])
+
+/datum/radial_menu/New()
+ close_button = new
+ close_button.parent = src
+
+/datum/radial_menu/proc/Reset()
+ choices.Cut()
+ choices_icons.Cut()
+ choices_values.Cut()
+ current_page = 1
+ QDEL_NULL(custom_check_callback)
+
+/datum/radial_menu/proc/element_chosen(choice_id,mob/user)
+ selected_choice = choices_values[choice_id]
+
+/datum/radial_menu/proc/get_next_id()
+ return "c_[choices.len]"
+
+/datum/radial_menu/proc/set_choices(list/new_choices)
+ if(choices.len)
+ Reset()
+ for(var/E in new_choices)
+ var/id = get_next_id()
+ choices += id
+ choices_values[id] = E
+ if(new_choices[E])
+ var/I = extract_image(new_choices[E])
+ if(I)
+ choices_icons[id] = I
+ setup_menu()
+
+
+/datum/radial_menu/proc/extract_image(E)
+ var/mutable_appearance/MA = new /mutable_appearance(E)
+ if(MA)
+ MA.layer = ABOVE_HUD_LAYER
+ MA.appearance_flags |= RESET_TRANSFORM
+ return MA
+
+
+/datum/radial_menu/proc/next_page()
+ if(pages > 1)
+ current_page = WRAP(current_page + 1, 1, pages + 1)
+ update_screen_objects()
+
+/datum/radial_menu/proc/show_to(mob/M)
+ if(current_user)
+ hide()
+ if(!M.client || !anchor)
+ return
+ current_user = M.client
+ //Blank
+ menu_holder = image(icon = 'icons/effects/effects.dmi', loc = anchor,icon_state = "nothing", layer = ABOVE_HUD_LAYER)
+ menu_holder.appearance_flags |= KEEP_APART
+ menu_holder.vis_contents += elements + close_button
+ current_user.images += menu_holder
+
+/datum/radial_menu/proc/hide()
+ if(current_user)
+ current_user.images -= menu_holder
+
+/datum/radial_menu/proc/wait()
+ while (current_user && !finished && !selected_choice)
+ if(custom_check_callback && next_check < world.time)
+ if(!custom_check_callback.Invoke())
+ return
+ else
+ next_check = world.time + check_delay
+ stoplag(1)
+
+/datum/radial_menu/Destroy()
+ Reset()
+ hide()
+ . = ..()
+
+/*
+ Presents radial menu to user anchored to anchor (or user if the anchor is currently in users screen)
+ Choices should be a list where list keys are movables or text used for element names and return value
+ and list values are movables/icons/images used for element icons
+*/
+/proc/show_radial_menu(mob/user, atom/anchor, list/choices, uniqueid, radius, datum/callback/custom_check)
+ if(!user || !anchor || !length(choices))
+ return
+ if(!uniqueid)
+ uniqueid = "defmenu_[user.UID()]_[anchor.UID()]"
+
+ if(GLOB.radial_menus[uniqueid])
+ return
+
+ var/datum/radial_menu/menu = new
+ GLOB.radial_menus[uniqueid] = menu
+ if(radius)
+ menu.radius = radius
+ if(istype(custom_check))
+ menu.custom_check_callback = custom_check
+ menu.anchor = anchor
+ menu.check_screen_border(user) //Do what's needed to make it look good near borders or on hud
+ menu.set_choices(choices)
+ menu.show_to(user)
+ menu.wait()
+ var/answer = menu.selected_choice
+ qdel(menu)
+ GLOB.radial_menus -= uniqueid
+ return answer
+
+#undef ANIM_SPEED
\ No newline at end of file
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 78dde4e95f9..9e8b9b9c3a6 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -14,7 +14,9 @@
// No comment
/atom/proc/attackby(obj/item/W, mob/user, params)
- return SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, W, user, params)
+ if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, W, user, params) & COMPONENT_NO_AFTERATTACK)
+ return TRUE
+ return FALSE
/obj/attackby(obj/item/I, mob/living/user, params)
return ..() || (can_be_hit && I.attack_obj(src, user))
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 1919df19ae6..17f8fcd3865 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -22,6 +22,7 @@
var/log_hrefs = 0 // logs all links clicked in-game. Could be used for debugging and tracking down exploits
var/sql_enabled = 0 // for sql switching
var/allow_admin_ooccolor = 0 // Allows admins with relevant permissions to have their own ooc colour
+ var/pregame_timestart = 240 // Time it takes for the server to start the game
var/allow_vote_restart = 0 // allow votes to restart
var/allow_vote_mode = 0 // allow votes to change mode
var/vote_delay = 6000 // minimum time between voting sessions (deciseconds, 10 minute default)
@@ -333,6 +334,9 @@
if("allow_admin_ooccolor")
config.allow_admin_ooccolor = 1
+ if("pregame_timestart")
+ config.pregame_timestart = text2num(value)
+
if("allow_vote_restart")
config.allow_vote_restart = 1
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 457ea9513ab..9b802291d84 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -261,7 +261,7 @@ SUBSYSTEM_DEF(garbage)
if(isnull(D.gc_destroyed))
- if(SEND_SIGNAL(D, COMSIG_PARENT_QDELETED, force)) // Give the components a chance to prevent their parent from being deleted
+ if(SEND_SIGNAL(D, COMSIG_PARENT_PREQDELETED, force)) // Give the components a chance to prevent their parent from being deleted
return
D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED
var/start_time = world.time
diff --git a/code/datums/action.dm b/code/datums/action.dm
index e0634527104..a9c895f3482 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -11,10 +11,10 @@
var/check_flags = 0
var/processing = 0
var/obj/screen/movable/action_button/button = null
- var/button_icon = 'icons/mob/actions.dmi'
+ var/button_icon = 'icons/mob/actions/actions.dmi'
var/background_icon_state = "bg_default"
- var/icon_icon = 'icons/mob/actions.dmi'
+ var/icon_icon = 'icons/mob/actions/actions.dmi'
var/button_icon_state = "default"
var/mob/owner
diff --git a/code/datums/components/README.md b/code/datums/components/README.md
index 4eecdce18ca..9d06a255dd7 100644
--- a/code/datums/components/README.md
+++ b/code/datums/components/README.md
@@ -26,15 +26,18 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
### Defines
-1. `COMPONENT_INCOMPATIBLE` Return this from `/datum/component/Initialize` or `datum/component/OnTransfer` to have the component be deleted if it's applied to an incorrect type. `parent` must not be modified if this is to be returned.
-
+1. `COMPONENT_INCOMPATIBLE` Return this from `/datum/component/Initialize` or `datum/component/OnTransfer` to have the component be deleted if it's applied to an incorrect type. `parent` must not be modified if this is to be returned. This will be noted in the runtime logs
### Vars
1. `/datum/var/list/datum_components` (private)
* Lazy associated list of type -> component/list of components.
-1. `/datum/component/var/enabled` (protected, boolean)
- * If the component is enabled. If not, it will not react to signals
+1. `/datum/var/list/comp_lookup` (private)
+ * Lazy associated list of signal -> registree/list of registrees
+1. `/datum/var/list/signal_procs` (private)
+ * Associated lazy list of signals -> `/datum/callback`s that will be run when the parent datum receives that signal
+1. `/datum/var/signal_enabled` (protected, boolean)
+ * If the datum is signal enabled. If not, it will not react to signals
* `FALSE` by default, set to `TRUE` when a signal is registered
1. `/datum/component/var/dupe_mode` (protected, enum)
* How duplicate component types are handled when added to the datum.
@@ -46,11 +49,12 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
* Definition of a duplicate component type
* `null` means exact match on `type` (default)
* Any other type means that and all subtypes
-1. `/datum/component/var/list/signal_procs` (private)
- * Associated lazy list of signals -> `/datum/callback`s that will be run when the parent datum recieves that signal
1. `/datum/component/var/datum/parent` (protected, read-only)
* The datum this component belongs to
* Never `null` in child procs
+1. `report_signal_origin` (protected, boolean)
+ * If `TRUE`, will invoke the callback when signalled with the signal type as the first argument.
+ * `FALSE` by default.
### Procs
@@ -77,7 +81,7 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
1. `/datum/proc/LoadComponent(component_type(type), ...) -> datum/component` (public, final)
* Equivalent to calling `GetComponent(component_type)` where, if the result would be `null`, returns `AddComponent(component_type, ...)` instead
1. `/datum/proc/ComponentActivated(datum/component/C)` (abstract, async)
- * Called on a component's `parent` after a signal recieved causes it to activate. `src` is the parameter
+ * Called on a component's `parent` after a signal received causes it to activate. `src` is the parameter
* Will only be called if a component's callback returns `TRUE`
1. `/datum/proc/TakeComponent(datum/component/C)` (public, final)
* Properly transfers ownership of a component from one datum to another
@@ -86,13 +90,21 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
1. `/datum/proc/_SendSignal(signal, list/arguments)` (private, final)
* Handles most of the actual signaling procedure
* Will runtime if used on datums with an empty component list
+1. `/datum/proc/RegisterSignal(datum/target, signal(string/list of strings), proc_ref(type), override(boolean))` (protected, final)
+ * If signal is a list it will be as if RegisterSignal was called for each of the entries with the same following arguments
+ * Makes the datum listen for the specified `signal` on it's `parent` datum.
+ * When that signal is received `proc_ref` will be called on the component, along with associated arguments
+ * Example proc ref: `.proc/OnEvent`
+ * If a previous registration is overwritten by the call, a runtime occurs. Setting `override` to TRUE prevents this
+ * These callbacks run asyncronously
+ * Returning `TRUE` from these callbacks will trigger a `TRUE` return from the `SendSignal()` that initiated it
1. `/datum/component/New(datum/parent, ...)` (private, final)
* Runs internal setup for the component
* Extra arguments are passed to `Initialize()`
1. `/datum/component/Initialize(...)` (abstract, no-sleep)
* Called by `New()` with the same argments excluding `parent`
* Component does not exist in `parent`'s `datum_components` list yet, although `parent` is set and may be used
- * Signals will not be recieved while this function is running
+ * Signals will not be received while this function is running
* Component may be deleted after this function completes without being attached
* Do not call `qdel(src)` from this function
1. `/datum/component/Destroy(force(bool), silent(bool))` (virtual, no-sleep)
@@ -113,13 +125,11 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
* Clears `parent` and removes the component from it's component list
1. `/datum/component/proc/_JoinParent` (private, final)
* Tries to add the component to it's `parent`s `datum_components` list
-1. `/datum/component/proc/RegisterSignal(datum/target, signal(string/list of strings), proc_ref(type), override(boolean))` (protected, final)
- * If signal is a list it will be as if RegisterSignal was called for each of the entries with the same following arguments
- * Makes a component listen for the specified `signal` on it's `parent` datum.
- * When that signal is recieved `proc_ref` will be called on the component, along with associated arguments
- * Example proc ref: `.proc/OnEvent`
- * If a previous registration is overwritten by the call, a runtime occurs. Setting `override` to TRUE prevents this
- * These callbacks run asyncronously
- * Returning `TRUE` from these callbacks will trigger a `TRUE` return from the `_SendSignal()` that initiated it
+1. `/datum/component/proc/RegisterWithParent` (abstract, no-sleep)
+ * Used to register the signals that should be on the `parent` object
+ * Use this if you plan on the component transfering between parents
+1. `/datum/component/proc/UnregisterFromParent` (abstract, no-sleep)
+ * Counterpart to `RegisterWithParent()`
+ * Used to unregister the signals that should only be on the `parent` object
### See/Define signals and their arguments in __DEFINES\components.dm
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index 7621828d970..580d397c225 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -1,8 +1,6 @@
/datum/component
- var/enabled = FALSE
var/dupe_mode = COMPONENT_DUPE_HIGHLANDER
var/dupe_type
- var/list/signal_procs
var/datum/parent
/datum/component/New(datum/P, ...)
@@ -10,7 +8,7 @@
var/list/arguments = args.Copy(2)
if(Initialize(arglist(arguments)) == COMPONENT_INCOMPATIBLE)
qdel(src, TRUE, TRUE)
- CRASH("Incompatible [type] assigned to a [P]!")
+ CRASH("Incompatible [type] assigned to a [P.type]! args: [json_encode(arguments)]")
_JoinParent(P)
@@ -47,19 +45,21 @@
else //only component of this type, no list
dc[I] = src
+ RegisterWithParent()
+
+// If you want/expect to be moving the component around between parents, use this to register on the parent for signals
+/datum/component/proc/RegisterWithParent()
+ return
+
/datum/component/proc/Initialize(...)
return
/datum/component/Destroy(force=FALSE, silent=FALSE)
- enabled = FALSE
- var/datum/P = parent
- if(!force)
+ if(!force && parent)
_RemoveFromParent()
if(!silent)
- SEND_SIGNAL(P, COMSIG_COMPONENT_REMOVING, src)
+ SEND_SIGNAL(parent, COMSIG_COMPONENT_REMOVING, src)
parent = null
- for(var/target in signal_procs)
- UnregisterSignal(target, signal_procs[target])
return ..()
/datum/component/proc/_RemoveFromParent()
@@ -78,7 +78,12 @@
if(!dc.len)
P.datum_components = null
-/datum/component/proc/RegisterSignal(datum/target, sig_type_or_types, proc_or_callback, override = FALSE)
+ UnregisterFromParent()
+
+/datum/component/proc/UnregisterFromParent()
+ return
+
+/datum/proc/RegisterSignal(datum/target, sig_type_or_types, proc_or_callback, override = FALSE)
if(QDELETED(src) || QDELETED(target))
return
@@ -100,6 +105,7 @@
stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning")
procs[target][sig_type] = proc_or_callback
+
if(!lookup[sig_type]) // Nothing has registered here yet
lookup[sig_type] = src
else if(lookup[sig_type] == src) // We already registered here
@@ -110,8 +116,9 @@
else // Many other things have registered here
lookup[sig_type][src] = TRUE
- enabled = TRUE
-/datum/component/proc/UnregisterSignal(datum/target, sig_type_or_types)
+ signal_enabled = TRUE
+
+/datum/proc/UnregisterSignal(datum/target, sig_type_or_types)
var/list/lookup = target.comp_lookup
if(!signal_procs || !signal_procs[target] || !lookup)
return
@@ -137,24 +144,19 @@
lookup[sig] -= src
signal_procs[target] -= sig_type_or_types
- if(length(signal_procs[target]))
+ if(!signal_procs[target].len)
signal_procs -= target
/datum/component/proc/InheritComponent(datum/component/C, i_am_original)
return
-/datum/component/proc/OnTransfer(datum/new_parent)
+/datum/component/proc/PreTransfer()
+ return
+
+/datum/component/proc/PostTransfer()
return
/datum/component/proc/_GetInverseTypeList(our_type = type)
- #if DM_VERSION >= 513
- #warn 512 is definitely stable now, remove the old code
- #endif
-
- #if DM_VERSION < 512
- //remove this when we use 512 full time
- set invisibility = 101
- #endif
//we can do this one simple trick
var/current_type = parent_type
. = list(our_type, current_type)
@@ -166,15 +168,15 @@
/datum/proc/_SendSignal(sigtype, list/arguments)
var/target = comp_lookup[sigtype]
if(!length(target))
- var/datum/component/C = target
- if(!C.enabled)
+ var/datum/C = target
+ if(!C.signal_enabled)
return NONE
var/datum/callback/CB = C.signal_procs[src][sigtype]
return CB.InvokeAsync(arglist(arguments))
. = NONE
for(var/I in target)
- var/datum/component/C = I
- if(!C.enabled)
+ var/datum/C = I
+ if(!C.signal_enabled)
continue
var/datum/callback/CB = C.signal_procs[src][sigtype]
. |= CB.InvokeAsync(arglist(arguments))
@@ -218,12 +220,9 @@
if(ispath(nt))
if(nt == /datum/component)
CRASH("[nt] attempted instantiation!")
- if(!isnum(dm))
- CRASH("[nt]: Invalid dupe_mode ([dm])!")
- if(dt && !ispath(dt))
- CRASH("[nt]: Invalid dupe_type ([dt])!")
else
new_comp = nt
+ nt = new_comp.type
args[1] = src
@@ -267,21 +266,27 @@
if(!.)
return AddComponent(arglist(args))
-/datum/proc/TakeComponent(datum/component/C)
- if(!C)
+/datum/component/proc/RemoveComponent()
+ if(!parent)
return
- var/datum/helicopter = C.parent
- if(helicopter == src)
- //if we're taking to the same thing no need for anything
+ var/datum/old_parent = parent
+ PreTransfer()
+ _RemoveFromParent()
+ parent = null
+ SEND_SIGNAL(old_parent, COMSIG_COMPONENT_REMOVING, src)
+
+/datum/proc/TakeComponent(datum/component/target)
+ if(!target || target.parent == src)
return
- if(C.OnTransfer(src) == COMPONENT_INCOMPATIBLE)
- qdel(C)
- return
- C._RemoveFromParent()
- SEND_SIGNAL(helicopter, COMSIG_COMPONENT_REMOVING, C)
- C.parent = src
- if(C == AddComponent(C))
- C._JoinParent()
+ if(target.parent)
+ target.RemoveComponent()
+ target.parent = src
+ if(target.PostTransfer() == COMPONENT_INCOMPATIBLE)
+ var/c_type = target.type
+ qdel(target)
+ CRASH("Incompatible [c_type] transfer attempt to a [type]!")
+ if(target == AddComponent(target))
+ target._JoinParent()
/datum/proc/TransferComponents(datum/target)
var/list/dc = datum_components
@@ -295,4 +300,4 @@
target.TakeComponent(comps)
/datum/component/nano_host()
- return parent
+ return parent
\ No newline at end of file
diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index 4ae7d08f3ea..92c8c6b108d 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -15,18 +15,25 @@
var/sheet_type
var/list/materials
var/show_on_examine
+ var/disable_attackby
var/list/allowed_typecache
var/last_inserted_id
var/precise_insertion = FALSE
var/datum/callback/precondition
var/datum/callback/after_insert
-/datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition, datum/callback/_after_insert)
+/datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition, datum/callback/_after_insert, _disable_attackby)
materials = list()
max_amount = max(0, max_amt)
show_on_examine = _show_on_examine
+ disable_attackby = _disable_attackby
+
if(allowed_types)
- allowed_typecache = typecacheof(allowed_types)
+ if(ispath(allowed_types) && allowed_types == /obj/item/stack)
+ allowed_typecache = GLOB.typecache_stack
+ else
+ allowed_typecache = typecacheof(allowed_types)
+
precondition = _precondition
after_insert = _after_insert
@@ -43,16 +50,21 @@
materials[id] = new mat_path()
/datum/component/material_container/proc/OnExamine(datum/source, mob/user)
- for(var/I in materials)
- var/datum/material/M = materials[I]
- var/amt = amount(M.id)
- if(amt)
- to_chat(user, "It has [amt] units of [lowertext(M.name)] stored.")
+ if(show_on_examine)
+ for(var/I in materials)
+ var/datum/material/M = materials[I]
+ var/amt = amount(M.id)
+ if(amt)
+ to_chat(user, "It has [amt] units of [lowertext(M.name)] stored.")
/datum/component/material_container/proc/OnAttackBy(datum/source, obj/item/I, mob/living/user)
var/list/tc = allowed_typecache
+ if(disable_attackby)
+ return
if(user.a_intent != INTENT_HELP)
return
+ if(I.flags & ABSTRACT)
+ return
if((I.flags_2 & (HOLOGRAM_2 | NO_MAT_REDEMPTION_2)) || (tc && !is_type_in_typecache(I, tc)))
to_chat(user, "[parent] won't accept [I]!")
return
@@ -88,10 +100,9 @@
if(istype(I, /obj/item/stack))
var/obj/item/stack/S = I
to_chat(user, "You insert [inserted] [S.singular_name][inserted>1 ? "s" : ""] into [parent].")
- if(!QDELETED(I))
- if(!user.put_in_hands(I))
- stack_trace("Warning: User could not put object back in hand during material container insertion, line [__LINE__]! This can lead to issues.")
- I.forceMove(user.loc)
+ if(!QDELETED(I) && !user.put_in_hands(I))
+ stack_trace("Warning: User could not put object back in hand during material container insertion, line [__LINE__]! This can lead to issues.")
+ I.forceMove(user.drop_location())
else
to_chat(user, "You insert a material total of [inserted] into [parent].")
qdel(I)
@@ -235,24 +246,25 @@
//For spawning mineral sheets; internal use only
/datum/component/material_container/proc/retrieve(sheet_amt, datum/material/M, target = null)
if(!M.sheet_type)
- return FALSE
- if(sheet_amt > 0)
- if(M.amount < (sheet_amt * MINERAL_MATERIAL_AMOUNT))
- sheet_amt = round(M.amount / MINERAL_MATERIAL_AMOUNT)
- var/count = 0
- while(sheet_amt > MAX_STACK_SIZE)
- new M.sheet_type(get_turf(parent), MAX_STACK_SIZE)
- count += MAX_STACK_SIZE
- use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.id)
- sheet_amt -= MAX_STACK_SIZE
- if(round((sheet_amt * MINERAL_MATERIAL_AMOUNT) / MINERAL_MATERIAL_AMOUNT))
- var/obj/item/stack/sheet/s = new M.sheet_type(get_turf(parent), sheet_amt)
- if(target)
- s.forceMove(target)
- count += sheet_amt
- use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.id)
- return count
- return FALSE
+ return 0
+ if(sheet_amt <= 0)
+ return 0
+
+ if(!target)
+ target = get_turf(parent)
+ if(M.amount < (sheet_amt * MINERAL_MATERIAL_AMOUNT))
+ sheet_amt = round(M.amount / MINERAL_MATERIAL_AMOUNT)
+ var/count = 0
+ while(sheet_amt > MAX_STACK_SIZE)
+ new M.sheet_type(target, MAX_STACK_SIZE)
+ count += MAX_STACK_SIZE
+ use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.id)
+ sheet_amt -= MAX_STACK_SIZE
+ if(sheet_amt >= 1)
+ new M.sheet_type(target, sheet_amt)
+ count += sheet_amt
+ use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.id)
+ return count
/datum/component/material_container/proc/retrieve_sheets(sheet_amt, id, target = null)
if(materials[id])
@@ -386,4 +398,4 @@
/datum/material/plastic
name = "Plastic"
id = MAT_PLASTIC
- sheet_type = /obj/item/stack/sheet/plastic
+ sheet_type = /obj/item/stack/sheet/plastic
\ No newline at end of file
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index d489a559b38..39438f87e64 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -324,6 +324,7 @@ var/record_id_num = 1001
S.fields["notes"] = H.sec_record
else
S.fields["notes"] = "No notes."
+ LAZYINITLIST(S.fields["comments"])
security += S
//Locked Record
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index 2db8c0cad89..290f2eda770 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -3,6 +3,8 @@
var/list/active_timers //for SStimer
var/list/datum_components //for /datum/components
var/list/comp_lookup
+ var/list/signal_procs
+ var/signal_enabled = FALSE
var/var_edited = FALSE //Warranty void if seal is broken
var/tmp/unique_datum_id = null
@@ -26,6 +28,9 @@
continue
qdel(timer)
+ //BEGIN: ECS SHIT
+ signal_enabled = FALSE
+
var/list/dc = datum_components
if(dc)
var/all_components = dc[/datum/component]
@@ -51,6 +56,10 @@
comp.UnregisterSignal(src, sig)
comp_lookup = lookup = null
+ for(var/target in signal_procs)
+ UnregisterSignal(target, signal_procs[target])
+ //END: ECS SHIT
+
return QDEL_HINT_QUEUE
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 727f25b75f4..6f1fb59e8f8 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -471,7 +471,7 @@
var/objective_type_text = copytext(new_obj_type, 2)//Leave the rest of the text.
var/objective_type = "[objective_type_capital][objective_type_text]"//Add them together into a text string.
- var/list/possible_targets = list("Free objective")
+ var/list/possible_targets = list()
for(var/datum/mind/possible_target in ticker.minds)
if((possible_target != src) && istype(possible_target.current, /mob/living/carbon/human))
possible_targets += possible_target.current
@@ -480,6 +480,8 @@
var/objective_list[] = list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain)
if(objective&&(objective.type in objective_list) && objective:target)
def_target = objective:target.current
+ possible_targets = sortAtom(possible_targets)
+ possible_targets += "Free objective"
var/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
if(!new_target)
@@ -569,11 +571,12 @@
new_objective.target_amount = target_number
if("identity theft")
- var/list/possible_targets = list("Free objective")
+ var/list/possible_targets = list()
for(var/datum/mind/possible_target in ticker.minds)
if((possible_target != src) && ishuman(possible_target.current))
possible_targets += possible_target
-
+ possible_targets = sortAtom(possible_targets)
+ possible_targets += "Free objective"
var/new_target = input("Select target:", "Objective target") as null|anything in possible_targets
if(!new_target)
return
@@ -598,6 +601,7 @@
if(objective)
objectives -= objective
+ qdel(objective)
objectives.Insert(objective_pos, new_objective)
else
objectives += new_objective
@@ -613,6 +617,7 @@
log_admin("[key_name(usr)] has removed one of [key_name(current)]'s objectives: [objective]")
message_admins("[key_name_admin(usr)] has removed one of [key_name_admin(current)]'s objectives: [objective]")
+ qdel(objective)
else if(href_list["obj_completed"])
var/datum/objective/objective = locate(href_list["obj_completed"])
@@ -939,6 +944,7 @@
special_role = null
for(var/datum/objective/nuclear/O in objectives)
objectives-=O
+ qdel(O)
to_chat(current, "You have been brainwashed! You are no longer a syndicate operative!")
log_admin("[key_name(usr)] has de-nuke op'd [key_name(current)]")
message_admins("[key_name_admin(usr)] has de-nuke op'd [key_name_admin(current)]")
diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm
index ea94aa6407b..d8b893caaf9 100644
--- a/code/datums/mutable_appearance.dm
+++ b/code/datums/mutable_appearance.dm
@@ -10,4 +10,11 @@
MA.icon = icon
MA.icon_state = icon_state
MA.layer = layer
- return MA
\ No newline at end of file
+ return MA
+
+/mutable_appearance/clean
+/mutable_appearance/clean/New()
+ . = ..()
+ alpha = 255
+ opacity = 1
+ transform = null
\ No newline at end of file
diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm
index 792dc4ea462..50ad6f028b0 100644
--- a/code/datums/ruins/space.dm
+++ b/code/datums/ruins/space.dm
@@ -167,3 +167,11 @@
suffix = "way_home.dmm"
name = "Salvation"
description = "In the darkest times, we will find our way home."
+
+/datum/map_template/ruin/space/oldstation
+ id = "oldstation"
+ suffix = "oldstation.dmm"
+ name = "Ancient Space Station"
+ description = "The crew of a space station awaken one hundred years after a crisis. Awaking to a derelict space station on the verge of collapse, and a hostile force of invading \
+ hivebots. Can the surviving crew overcome the odds and survive and rebuild, or will the cold embrace of the stars become their new home?"
+ cost = 2
diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm
new file mode 100644
index 00000000000..09cf433daf5
--- /dev/null
+++ b/code/datums/spawners_menu.dm
@@ -0,0 +1,52 @@
+/datum/spawners_menu
+ var/mob/dead/observer/owner
+
+/datum/spawners_menu/New(mob/dead/observer/new_owner)
+ if(!istype(new_owner))
+ qdel(src)
+ owner = new_owner
+
+/datum/spawners_menu/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = FALSE, datum/nanoui/master_ui = null)
+ ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "spawners_menu.tmpl", "Spawners Menu", 700, 600, master_ui)
+ ui.open()
+
+/datum/spawners_menu/ui_data(mob/user)
+ var/list/data = list()
+ data["spawners"] = list()
+ for(var/spawner in GLOB.mob_spawners)
+ var/list/this = list()
+ this["name"] = spawner
+ this["desc"] = ""
+ this["uids"] = list()
+ for(var/spawner_obj in GLOB.mob_spawners[spawner])
+ this["uids"] += "\ref[spawner_obj]"
+ if(!this["desc"])
+ if(istype(spawner_obj, /obj/effect/mob_spawn))
+ var/obj/effect/mob_spawn/MS = spawner_obj
+ this["desc"] = MS.flavour_text
+ else
+ var/obj/O = spawner_obj
+ this["desc"] = O.desc
+ this["amount_left"] = LAZYLEN(GLOB.mob_spawners[spawner])
+ data["spawners"] += list(this)
+
+ return data
+
+/datum/spawners_menu/Topic(href, href_list)
+ if(..())
+ return 1
+ var/spawners = replacetext(href_list["uid"], ",", ";")
+ var/list/possible_spawners = params2list(spawners)
+ var/obj/effect/mob_spawn/MS = locate(pick(possible_spawners))
+ if(!MS || !istype(MS))
+ log_runtime(EXCEPTION("A ghost tried to interact with an invalid spawner, or the spawner didn't exist."))
+ return
+ switch(href_list["action"])
+ if("jump")
+ owner.forceMove(get_turf(MS))
+ . = TRUE
+ if("spawn")
+ MS.attack_ghost(owner)
+ . = TRUE
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index 653cc0020bc..dee057c5568 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -97,7 +97,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
var/centcom_cancast = 1 //Whether or not the spell should be allowed on z2
var/datum/action/spell_action/action = null
- var/action_icon = 'icons/mob/actions.dmi'
+ var/action_icon = 'icons/mob/actions/actions.dmi'
var/action_icon_state = "spell_default"
var/action_background_icon_state = "bg_spell"
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 2db64b30bdb..4d8bd9432f4 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -923,6 +923,14 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
containername = "machine prototype crate"
access = access_research
+/datum/supply_packs/science/oil
+ name = "Oil Tank Crate"
+ contains = list(/obj/structure/reagent_dispensers/oil,
+ /obj/item/reagent_containers/food/drinks/oilcan)
+ cost = 10
+ containertype = /obj/structure/largecrate
+ containername = "oil tank crate"
+
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Organic /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 7ea3ba03c79..fb22f8cfa25 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -992,6 +992,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/card/emag
cost = 6
+/datum/uplink_item/device_tools/access_tuner
+ name = "Access Tuner"
+ desc = "The access tuner is a small device that can interface with airlocks from range. It takes a few seconds to connect and can change the bolt state, open the door, or toggle emergency access."
+ reference = "HACK"
+ item = /obj/item/door_remote/omni/access_tuner
+ cost = 6
+
/datum/uplink_item/device_tools/toolbox
name = "Fully Loaded Toolbox"
desc = "The syndicate toolbox is a suspicious black and red. Aside from tools, it comes with insulated gloves and a multitool."
@@ -1013,12 +1020,12 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/storage/box/syndie_kit/bonerepair
cost = 6
-/datum/uplink_item/device_tools/military_belt
- name = "Military Belt"
- desc = "A robust seven-slot red belt made for carrying a broad variety of weapons, ammunition and explosives"
+/datum/uplink_item/device_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."
reference = "SBM"
- item = /obj/item/storage/belt/military
- cost = 3
+ item = /obj/item/storage/belt/military/traitor
+ cost = 2
excludefrom = list(/datum/game_mode/nuclear)
/datum/uplink_item/device_tools/medkit
@@ -1038,8 +1045,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/suits/space_suit
name = "Syndicate Space Suit"
desc = "This red and black syndicate space suit is less encumbering than Nanotrasen variants, \
- fits inside bags, and has a weapon slot. Nanotrasen crewmembers are trained to report red space suit \
- sightings, however."
+ fits inside bags, and has a weapon slot. Comes packaged with internals. Nanotrasen crewmembers are trained to report red space suit \
+ sightings, however. "
reference = "SS"
item = /obj/item/storage/box/syndie_kit/space
cost = 4
@@ -1049,7 +1056,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "The feared suit of a syndicate nuclear agent. Features armor and a combat mode \
for faster movement on station. Toggling the suit in and out of \
combat mode will allow you all the mobility of a loose fitting uniform without sacrificing armoring. \
- Additionally the suit is collapsible, making it small enough to fit within a backpack. \
+ Additionally the suit is collapsible, making it small enough to fit within a backpack. Comes packaged with internals. \
Nanotrasen crew who spot these suits are known to panic."
reference = "BRHS"
item = /obj/item/storage/box/syndie_kit/hardsuit
@@ -1394,6 +1401,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/storage/secure/briefcase/syndie
cost = 1
+/datum/uplink_item/badass/plasticbag
+ name = "Plastic Bag"
+ desc = "A simple, plastic bag. Keep out of reach of small children, do not apply to head."
+ reference = "PBAG"
+ item = /obj/item/storage/bag/plasticbag
+ cost = 1
+ excludefrom = list(/datum/game_mode/nuclear)
+
/datum/uplink_item/badass/balloon
name = "For showing that you are The Boss"
desc = "A useless red balloon with the syndicate logo on it, which can blow the deepest of covers."
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index cef139cc476..3e9f488bb29 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -55,9 +55,10 @@ var/const/AIRLOCK_WIRE_LIGHT = 512
/datum/wires/airlock/CanUse(mob/living/L)
var/obj/machinery/door/airlock/A = holder
if(iscarbon(L))
- if(A.isElectrified())
- if(A.shock(L, 100))
- return 0
+ if(A.Adjacent(L))
+ if(A.isElectrified())
+ if(A.shock(L, 100))
+ return 0
if(A.panel_open)
return 1
return 0
@@ -211,4 +212,4 @@ var/const/AIRLOCK_WIRE_LIGHT = 512
A.lights = !A.lights
A.update_icon()
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index db2fb3c64df..2c75d6f36e2 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -163,7 +163,7 @@
/mob/living/carbon/med_hud_set_status()
var/image/holder = hud_list[STATUS_HUD]
var/mob/living/simple_animal/borer/B = has_brain_worms()
- if(stat == DEAD)
+ if(stat == DEAD || (status_flags & FAKEDEATH))
holder.icon_state = "huddead"
else if(status_flags & XENO_HOST)
holder.icon_state = "hudxeno"
diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm
index 26b95eb77e1..bf9fbb5a9e5 100644
--- a/code/game/gamemodes/autotraitor/autotraitor.dm
+++ b/code/game/gamemodes/autotraitor/autotraitor.dm
@@ -78,22 +78,24 @@
for(var/mob/living/player in GLOB.mob_list)
if(player.client && player.stat != DEAD)
playercount += 1
- if(player.client && player.mind && player.mind.special_role && player.stat != DEAD)
- traitorcount += 1
- if(player.client && player.mind && !player.mind.special_role && player.stat != DEAD)
+ if(!player.mind)
+ continue
+ if(player.mind.special_role)
+ traitorcount += 1
+ continue
if(ishuman(player) || isrobot(player) || isAI(player))
- if(player.client && (ROLE_TRAITOR in player.client.prefs.be_special) && !jobban_isbanned(player, ROLE_TRAITOR) && !jobban_isbanned(player, "Syndicate"))
+ if((ROLE_TRAITOR in player.client.prefs.be_special) && !player.client.skip_antag && !jobban_isbanned(player, ROLE_TRAITOR) && !jobban_isbanned(player, "Syndicate"))
possible_traitors += player.mind
for(var/datum/mind/player in possible_traitors)
for(var/job in restricted_jobs)
if(player.assigned_role == job)
possible_traitors -= player
- if(player.current) // Remove mindshield-implanted mobs from the list
- if(ishuman(player.current))
- var/mob/living/carbon/human/H = player.current
- for(var/obj/item/implant/mindshield/I in H.contents)
- if(I && I.implanted)
- possible_traitors -= player
+ if(!player.current || !ishuman(player.current)) // Remove mindshield-implanted mobs from the list
+ continue
+ var/mob/living/carbon/human/H = player.current
+ for(var/obj/item/implant/mindshield/I in H.contents)
+ if(I && I.implanted)
+ possible_traitors -= player
//message_admins("Live Players: [playercount]")
//message_admins("Live Traitors: [traitorcount]")
@@ -159,7 +161,7 @@
if(SSshuttle.emergency.mode >= SHUTTLE_ESCAPE)
return
//message_admins("Late Join Check")
- if(character.client && (ROLE_TRAITOR in character.client.prefs.be_special) && !jobban_isbanned(character, ROLE_TRAITOR) && !jobban_isbanned(character, "Syndicate"))
+ if(character.client && (ROLE_TRAITOR in character.client.prefs.be_special) && !character.client.skip_antag && !jobban_isbanned(character, ROLE_TRAITOR) && !jobban_isbanned(character, "Syndicate"))
//message_admins("Late Joiner has Be Syndicate")
//message_admins("Checking number of players")
var/playercount = 0
@@ -167,8 +169,8 @@
for(var/mob/living/player in GLOB.mob_list)
if(player.client && player.stat != DEAD)
playercount += 1
- if(player.client && player.mind && player.mind.special_role && player.stat != DEAD)
- traitorcount += 1
+ if(player.mind && player.mind.special_role)
+ traitorcount += 1
//message_admins("Live Players: [playercount]")
//message_admins("Live Traitors: [traitorcount]")
diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm
index 2056c6c6260..42a42240ad5 100644
--- a/code/game/gamemodes/blob/blob.dm
+++ b/code/game/gamemodes/blob/blob.dm
@@ -55,7 +55,7 @@ var/list/blob_nodes = list()
/datum/game_mode/blob/proc/get_blob_candidates()
var/list/candidates = list()
for(var/mob/living/carbon/human/player in GLOB.player_list)
- if(!player.stat && player.mind && !player.mind.special_role && !jobban_isbanned(player, "Syndicate") && (ROLE_BLOB in player.client.prefs.be_special))
+ if(!player.stat && player.mind && !player.client.skip_antag && !player.mind.special_role && !jobban_isbanned(player, "Syndicate") && (ROLE_BLOB in player.client.prefs.be_special))
candidates += player
return candidates
diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm
index abd03c7efd7..a07670647c3 100644
--- a/code/game/gamemodes/changeling/powers/fakedeath.dm
+++ b/code/game/gamemodes/changeling/powers/fakedeath.dm
@@ -17,7 +17,10 @@
user.status_flags |= FAKEDEATH //play dead
user.update_stat("fakedeath sting")
user.update_canmove()
-
+ user.med_hud_set_health()
+ user.handle_hud_icons_health()
+ user.med_hud_set_status()
+
addtimer(CALLBACK(src, .proc/ready_to_regenerate, user), LING_FAKEDEATH_TIME)
feedback_add_details("changeling_powers","FD")
return 1
diff --git a/code/game/gamemodes/changeling/powers/headcrab.dm b/code/game/gamemodes/changeling/powers/headcrab.dm
index 96d4a784f45..a950ec7a9c9 100644
--- a/code/game/gamemodes/changeling/powers/headcrab.dm
+++ b/code/game/gamemodes/changeling/powers/headcrab.dm
@@ -30,9 +30,9 @@
for(var/mob/living/silicon/S in range(2,user))
to_chat(S, "Your sensors are disabled by a shower of blood!")
S.Weaken(3)
- var/turf = get_turf(user)
+ var/new_location = user.drop_location()
spawn(5) // So it's not killed in explosion
- var/mob/living/simple_animal/hostile/headcrab/crab = new(turf)
+ var/mob/living/simple_animal/hostile/headcrab/crab = new(new_location)
for(var/obj/item/organ/internal/I in organs)
I.loc = crab
crab.origin = M
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index b61096a8939..0c8d22b5a8b 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -277,6 +277,7 @@
return
C.visible_message("[src] impales [C] with [I]!", "[src] impales you with [I]!")
+ add_attack_logs(src, C, "[src] pulled [C] with a tentacle, attacking them with [I]") //Attack log is here so we can fetch the item they're stabbing with.
C.apply_damage(I.force, BRUTE, "chest")
do_item_attack_animation(C, used_item = I)
add_blood(C)
@@ -292,6 +293,7 @@
var/obj/item/I = target
if(!I.anchored)
to_chat(firer, "You pull [I] towards yourself.")
+ add_attack_logs(src, I, "[src] pulled [I] towards them with a tentacle")
H.throw_mode_on()
I.throw_at(H, 10, 2)
. = 1
@@ -304,6 +306,7 @@
switch(firer.a_intent)
if(INTENT_HELP)
C.visible_message("[L] is pulled by [H]'s tentacle!","A tentacle grabs you and pulls you towards [H]!")
+ add_attack_logs(H, L, "[H] pulled [L] towards them with a tentacle")
C.throw_at(get_step_towards(H,C), 8, 2)
return 1
@@ -312,10 +315,12 @@
if(I)
if(C.drop_item())
C.visible_message("[I] is yanked out of [C]'s hand by [src]!","A tentacle pulls [I] away from you!")
+ add_attack_logs(src, C, "[src] has grabbed [I] out of [C]'s hand with a tentacle")
on_hit(I) //grab the item as if you had hit it directly with the tentacle
return 1
else
to_chat(firer, "You can't seem to pry [I] out of [C]'s hands!")
+ add_attack_logs(src, C, "[src] tried to grab [I] out of [C]'s hand with a tentacle, but failed")
return 0
else
to_chat(firer, "[C] has nothing in hand to disarm!")
@@ -323,6 +328,7 @@
if(INTENT_GRAB)
C.visible_message("[L] is grabbed by [H]'s tentacle!","A tentacle grabs you and pulls you towards [H]!")
+ add_attack_logs(src, C, "[src] has grabbed [C] and pulled them towards [H] with a tentacle")
C.throw_at(get_step_towards(H,C), 8, 2, callback=CALLBACK(H, /mob/proc/tentacle_grab, C))
return 1
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index de10fa34c01..08ab2b54c5d 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -271,7 +271,7 @@
// Get a list of all the people who want to be the antagonist for this round, except those with incompatible species
for(var/mob/new_player/player in players)
- if(!player.skip_antag)
+ if(!player.client.skip_antag)
if((role in player.client.prefs.be_special) && !(player.client.prefs.species in protected_species))
player_draft_log += "[player.key] had [roletext] enabled, so we are drafting them."
candidates += player.mind
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 29996b30760..21abbc89415 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -29,7 +29,6 @@ var/round_start_time = 0
var/list/availablefactions = list() // list of factions with openings
var/pregame_timeleft = 0
-
var/delay_end = 0 //if set to nonzero, the round will not restart on it's own
var/triai = 0//Global holder for Triumvirate
@@ -48,7 +47,7 @@ var/round_start_time = 0
'sound/music/Title2.ogg',\
'sound/music/Title3.ogg',)
do
- pregame_timeleft = 180
+ pregame_timeleft = config.pregame_timestart
to_chat(world, "Welcome to the pre-game lobby!")
to_chat(world, "Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds")
while(current_state == GAME_STATE_PREGAME)
diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm
index 7cbb1634de2..5b00868dc3d 100644
--- a/code/game/gamemodes/shadowling/shadowling.dm
+++ b/code/game/gamemodes/shadowling/shadowling.dm
@@ -108,12 +108,12 @@ Made by Xhuis
/datum/game_mode/shadowling/post_setup()
for(var/datum/mind/shadow in shadows)
log_game("[key_name(shadow)] has been selected as a Shadowling.")
- sleep(10)
- to_chat(shadow.current, "You are ready (Cancel)
" - - var/list/antags = client.prefs.be_special - if(antags && antags.len) - if(!skip_antag) output += "Global Antag Candidacy" - else output += "
Global Antag Candidacy"
- output += "
You are [skip_antag ? "ineligible" : "eligible"] for all antag roles.
Global Antag Candidacy" + else output += "
Global Antag Candidacy"
+ output += "
You are [client.skip_antag ? "ineligible" : "eligible"] for all antag roles.