diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm
index 9702d51004ad..6844721cd7f0 100644
--- a/code/__DEFINES/admin.dm
+++ b/code/__DEFINES/admin.dm
@@ -71,3 +71,6 @@ var/global/list/note_categories = list("Admin", "Merit", "Commanding Officer", "
#define ANTIGRIEF_NEW_PLAYERS 1
/// Enables antigrief entirely: Nobody can activate explosives on the Almayer, unless the ship crashed.
#define ANTIGRIEF_ENABLED 2
+
+/// Proc has been blocked by IsAdminAdvancedProcCall()
+#define PROC_BLOCKED "PROCCALL BLOCKED"
diff --git a/code/__DEFINES/client_prefs.dm b/code/__DEFINES/client_prefs.dm
index ef5ff00e4ed6..b1e194354555 100644
--- a/code/__DEFINES/client_prefs.dm
+++ b/code/__DEFINES/client_prefs.dm
@@ -22,6 +22,7 @@
#define TOGGLE_VEND_ITEM_TO_HAND (1<<15) // This toggles whether items from vendors will be automatically put into your hand.
#define TOGGLE_START_JOIN_CURRENT_SLOT (1<<16) // Whether joining at roundstart ignores assigned character slot for the job and uses currently selected slot.
#define TOGGLE_LATE_JOIN_CURRENT_SLOT (1<<17) //Whether joining during the round ignores assigned character slot for the job and uses currently selected slot.
+#define TOGGLE_ABILITY_DEACTIVATION_OFF (1<<18) // This toggles whether selecting the same ability again can toggle it off
#define JOB_SLOT_RANDOMISED_SLOT -1
#define JOB_SLOT_CURRENT_SLOT 0
diff --git a/code/__DEFINES/conflict.dm b/code/__DEFINES/conflict.dm
index 141d69c69b11..fc8ca4e03a9f 100644
--- a/code/__DEFINES/conflict.dm
+++ b/code/__DEFINES/conflict.dm
@@ -200,6 +200,7 @@
// human armor
#define CLOTHING_ARMOR_NONE 0
+#define CLOTHING_ARMOR_VERYLOW 5
#define CLOTHING_ARMOR_LOW 10
#define CLOTHING_ARMOR_MEDIUMLOW 15
#define CLOTHING_ARMOR_MEDIUM 20
diff --git a/code/__DEFINES/sounds.dm b/code/__DEFINES/sounds.dm
index 51279e0ca0cd..f01ddfc86792 100644
--- a/code/__DEFINES/sounds.dm
+++ b/code/__DEFINES/sounds.dm
@@ -71,6 +71,7 @@
#define AMBIENCE_ALMAYER 'sound/ambience/almayerambience.ogg'
#define AMBIENCE_LV624 'sound/ambience/ambienceLV624.ogg'
#define AMBIENCE_BIGRED 'sound/ambience/desert.ogg'
+#define AMBIENCE_NV 'sound/ambience/ambienceNV.ogg'
#define AMBIENCE_PRISON 'sound/ambience/shipambience.ogg'
#define AMBIENCE_TRIJENT 'sound/ambience/desert.ogg'
diff --git a/code/__DEFINES/speech_channels.dm b/code/__DEFINES/speech_channels.dm
index 405506678407..3f6e4720bde9 100644
--- a/code/__DEFINES/speech_channels.dm
+++ b/code/__DEFINES/speech_channels.dm
@@ -4,6 +4,5 @@
#define ME_CHANNEL "Me"
#define OOC_CHANNEL "OOC"
#define LOOC_CHANNEL "LOOC"
-#define MOD_CHANNEL "MSAY"
#define ADMIN_CHANNEL "ASAY"
#define MENTOR_CHANNEL "Mentor"
diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm
index 89976c498422..22c3827022ff 100644
--- a/code/__DEFINES/tgs.dm
+++ b/code/__DEFINES/tgs.dm
@@ -1,6 +1,6 @@
// tgstation-server DMAPI
-#define TGS_DMAPI_VERSION "6.5.0"
+#define TGS_DMAPI_VERSION "6.5.2"
// All functions and datums outside this document are subject to change with any version and should not be relied on.
diff --git a/code/__DEFINES/weather.dm b/code/__DEFINES/weather.dm
index 16ee8154241f..c67575f80720 100644
--- a/code/__DEFINES/weather.dm
+++ b/code/__DEFINES/weather.dm
@@ -5,6 +5,7 @@
#define PROB_WEATHER_SOROKYNE 100 //Map specific defines go here.
#define PROB_WEATHER_BIG_RED 30
#define PROB_WEATHER_LV624 30
+#define PROB_WEATHER_NEW_VARADERO 100
#define WEATHER_TYPE_NO_WEATHER 0
#define WEATHER_TYPE_SNOW 1
diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm
index 4b45c660feab..ac783b6f426e 100644
--- a/code/__DEFINES/xeno.dm
+++ b/code/__DEFINES/xeno.dm
@@ -168,6 +168,8 @@
#define XENO_LEAVE_TIMER_LARVA 80 //80 seconds
/// The time against away_timer when an AFK xeno (not larva) can be replaced
#define XENO_LEAVE_TIMER 300 //300 seconds
+/// The time against away_timer when an AFK facehugger converts to a npc
+#define XENO_FACEHUGGER_LEAVE_TIMER 420 //420 seconds
/// The time against away_timer when an AFK xeno gets listed in the available list so ghosts can get ready
#define XENO_AVAILABLE_TIMER 60 //60 seconds
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 0132a31d0b50..cca3edda464e 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -241,8 +241,14 @@
else
return get_step(start, EAST)
-/// Get a list of observers that can be alien candidates, optionally sorted by larva_queue_time
-/proc/get_alien_candidates(sorted = TRUE)
+/**
+ * Get a list of observers that can be alien candidates.
+ *
+ * Arguments:
+ * * hive - The hive we're filling a slot for to check if the player is banished
+ * * sorted - Whether to sort by larva_queue_time (default TRUE) or leave unsorted
+ */
+/proc/get_alien_candidates(datum/hive_status/hive = null, sorted = TRUE)
var/list/candidates = list()
for(var/mob/dead/observer/cur_obs as anything in GLOB.observer_list)
@@ -273,6 +279,15 @@
if((cur_obs.client.admin_holder && (cur_obs.client.admin_holder.rights & R_MOD)) && !cur_obs.adminlarva)
continue
+ if(hive)
+ var/banished = FALSE
+ for(var/mob_name in hive.banished_ckeys)
+ if(hive.banished_ckeys[mob_name] == cur_obs.ckey)
+ banished = TRUE
+ break
+ if(banished)
+ continue
+
candidates += cur_obs
// Optionally sort by larva_queue_time
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 960f894d676f..4e4a1b3ff31c 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -226,7 +226,6 @@
if(rights & R_POSSESS) . += "[seperator]+POSSESS"
if(rights & R_PERMISSIONS) . += "[seperator]+PERMISSIONS"
if(rights & R_STEALTH) . += "[seperator]+STEALTH"
- if(rights & R_REJUVINATE) . += "[seperator]+REJUVINATE"
if(rights & R_COLOR) . += "[seperator]+COLOR"
if(rights & R_VAREDIT) . += "[seperator]+VAREDIT"
if(rights & R_SOUNDS) . += "[seperator]+SOUND"
diff --git a/code/__HELPERS/verb_helpers.dm b/code/__HELPERS/verb_helpers.dm
index d042929f1184..4bc3ae584cd6 100644
--- a/code/__HELPERS/verb_helpers.dm
+++ b/code/__HELPERS/verb_helpers.dm
@@ -10,7 +10,7 @@
if(!target)
CRASH("add_verb called without a target")
if(IsAdminAdvancedProcCall())
- return
+ return PROC_BLOCKED
var/mob/mob_target = null
if(ismob(target))
@@ -56,7 +56,7 @@
*/
/proc/remove_verb(client/target, verb_or_list_to_remove)
if(IsAdminAdvancedProcCall())
- return
+ return PROC_BLOCKED
var/mob/mob_target = null
if(ismob(target))
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index 121d1e305e43..09b55accf16d 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -25,7 +25,6 @@ DEFINE_BITFIELD(rights, list(
"POSSESS" = R_POSSESS,
"PERMISSIONS" = R_PERMISSIONS,
"STEALTH" = R_STEALTH,
- "REJUVENATE" = R_REJUVINATE,
"COLOR" = R_COLOR,
"VAREDIT" = R_VAREDIT,
"SOUNDS" = R_SOUNDS,
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index 86d5a11a668e..08de7b5c02ff 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -24,7 +24,8 @@
/datum/controller/configuration/proc/admin_reload()
if(IsAdminAdvancedProcCall())
- return
+ alert_proccall("configuration admin_reload")
+ return PROC_BLOCKED
log_admin("[key_name(usr)] has forcefully reloaded the configuration from disk.")
message_admins("[key_name_admin(usr)] has forcefully reloaded the configuration from disk.")
full_wipe()
@@ -33,7 +34,8 @@
/datum/controller/configuration/proc/Load(_directory)
if(IsAdminAdvancedProcCall()) //If admin proccall is detected down the line it will horribly break everything.
- return
+ alert_proccall("configuration Load")
+ return PROC_BLOCKED
if(_directory)
directory = _directory
if(entries)
@@ -117,7 +119,8 @@
/datum/controller/configuration/proc/full_wipe()
if(IsAdminAdvancedProcCall())
- return
+ alert_proccall("configuration full_wipe")
+ return PROC_BLOCKED
entries_by_type.Cut()
QDEL_LIST_ASSOC_VAL(entries)
entries = null
@@ -163,7 +166,8 @@
/datum/controller/configuration/proc/LoadEntries(filename, list/stack = list())
if(IsAdminAdvancedProcCall())
- return
+ alert_proccall("configuration LoadEntries")
+ return PROC_BLOCKED
var/filename_to_test = world.system_type == MS_WINDOWS ? lowertext(filename) : filename
if(filename_to_test in stack)
@@ -264,7 +268,7 @@
CRASH("Missing config entry for [entry_type]!")
if((E.protection & CONFIG_ENTRY_HIDDEN) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
log_admin_private("Config access of [entry_type] attempted by [key_name(usr)]")
- return
+ return PROC_BLOCKED
return E.config_entry_value
@@ -278,7 +282,7 @@
CRASH("Missing config entry for [entry_type]!")
if((E.protection & CONFIG_ENTRY_LOCKED) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Set" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
log_admin_private("Config rewrite of [entry_type] to [new_val] attempted by [key_name(usr)]")
- return
+ return PROC_BLOCKED
return E.ValidateAndSet("[new_val]")
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index fdf79db138f7..743f9be9fec0 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -122,3 +122,8 @@
/datum/config_entry/number/extra_larva_per_burst
config_entry_value = 1
integer = FALSE
+
+/datum/config_entry/number/embryo_burst_timer
+ min_val = 1
+ config_entry_value = 450
+ integer = TRUE
diff --git a/code/controllers/subsystem/x_evolution.dm b/code/controllers/subsystem/x_evolution.dm
index 9f84513e9e2d..be787b37de80 100644
--- a/code/controllers/subsystem/x_evolution.dm
+++ b/code/controllers/subsystem/x_evolution.dm
@@ -3,7 +3,7 @@
#define EVOLUTION_INCREMENT_TIME (30 MINUTES) // Evolution increases by 1 every 25 minutes.
SUBSYSTEM_DEF(xevolution)
- name = "Evilution"
+ name = "Evilution" //This is not a typo, do not change it.
wait = 1 MINUTES
priority = SS_PRIORITY_INACTIVITY
diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm
index 0d218ba94da4..ef77aaf471dc 100644
--- a/code/datums/components/footstep.dm
+++ b/code/datums/components/footstep.dm
@@ -13,8 +13,9 @@
var/falloff
///This can be a list OR a soundfile OR null. Determines whatever sound gets played.
var/footstep_sounds
+ var/drag_sounds
-/datum/component/footstep/Initialize(steps_ = 2, volume_ = 50, range_ = null, falloff_ = 1, footstep_sounds_ = "alien_footstep_large")
+/datum/component/footstep/Initialize(steps_ = 2, volume_ = 50, range_ = null, falloff_ = 1, footstep_sounds_ = "alien_footstep_large", drag_sounds_ = 'sound/effects/alien_dragsound_large.ogg')
if(!isliving(parent))
return COMPONENT_INCOMPATIBLE
steps = steps_
@@ -22,6 +23,7 @@
range = range_
falloff = falloff_
footstep_sounds = footstep_sounds_
+ drag_sounds = drag_sounds_
RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), PROC_REF(play_simplestep))
@@ -44,5 +46,8 @@
var/turf/open/T = prepare_step()
if(!T)
return
- if(isfile(footstep_sounds) || istext(footstep_sounds))
+ var/mob/living/parent_mob = parent
+ if(parent_mob.lying && (isfile(drag_sounds) || istext(drag_sounds)))
+ playsound(T, drag_sounds, volume, rand(20000, 25000), range, falloff = falloff)
+ else if(isfile(footstep_sounds) || istext(footstep_sounds))
playsound(T, footstep_sounds, volume, rand(20000, 25000), range, falloff = falloff)
diff --git a/code/datums/keybinding/communication.dm b/code/datums/keybinding/communication.dm
index 9a438fc6dabd..4164198d4818 100644
--- a/code/datums/keybinding/communication.dm
+++ b/code/datums/keybinding/communication.dm
@@ -42,13 +42,6 @@
full_name = "IC Comms (;)"
keybind_signal = COMSIG_KG_CLIENT_RADIO_DOWN
-/datum/keybinding/client/communication/mod_say
- hotkey_keys = list("Unbound")
- classic_keys = list("Unbound")
- name = MOD_CHANNEL
- full_name = "Mod Say"
- keybind_signal = COMSIG_KB_ADMIN_ASAY_DOWN
-
/datum/keybinding/client/communication/asay
hotkey_keys = list("F3")
classic_keys = list("F5")
diff --git a/code/datums/redis/callbacks/msay.dm b/code/datums/redis/callbacks/msay.dm
deleted file mode 100644
index 3c0db7638a3a..000000000000
--- a/code/datums/redis/callbacks/msay.dm
+++ /dev/null
@@ -1,16 +0,0 @@
-/datum/redis_callback/msay
- channel = "byond.msay"
-
-/datum/redis_callback/msay/on_message(message)
- var/list/data = json_decode(message)
-
- if(data["source"] == SSredis.instance_name)
- return
-
- var/msg = "[data["rank"]]: [data["author"]]@[data["source"]] : [strip_html(data["message"])] [replacetext(desc_lore, "\n", " ", name, name, "size=500x200")
+ show_browser(usr, "[replacetext(desc_lore, "\n", " ", name, name, "size=500x500")
onclose(usr, "[name]")
///This proc is called on atoms when they are loaded into a shuttle
@@ -580,7 +580,7 @@ Parameters are passed from New.
if(!ismovable(src))
var/turf/curturf = get_turf(src)
if(curturf)
- . += "Jump To "
+ . += "Jump To "
VV_DROPDOWN_OPTION(VV_HK_MODIFY_TRANSFORM, "Modify Transform")
VV_DROPDOWN_OPTION(VV_HK_ADD_REAGENT, "Add Reagent")
VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EMP, "EMP Pulse")
diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm
index 18b11dde030e..a42ff3f22e59 100644
--- a/code/game/gamemodes/cm_initialize.dm
+++ b/code/game/gamemodes/cm_initialize.dm
@@ -333,23 +333,28 @@ Additional game mode variables.
/datum/game_mode/proc/check_xeno_late_join(mob/xeno_candidate)
if(jobban_isbanned(xeno_candidate, JOB_XENOMORPH)) // User is jobbanned
to_chat(xeno_candidate, SPAN_WARNING("You are banned from playing aliens and cannot spawn as a xenomorph."))
- return
- return 1
+ return FALSE
+ return TRUE
-/datum/game_mode/proc/attempt_to_join_as_xeno(mob/xeno_candidate, instant_join = 0)
+/datum/game_mode/proc/attempt_to_join_as_xeno(mob/xeno_candidate, instant_join = FALSE)
var/list/available_xenos = list()
var/list/available_xenos_non_ssd = list()
- for(var/mob/living/carbon/xenomorph/X in GLOB.living_xeno_list)
- var/area/A = get_area(X)
- if(is_admin_level(X.z) && (!A || !(A.flags_area & AREA_ALLOW_XENO_JOIN)) || X.aghosted)
- continue //xenos on admin z level and aghosted ones don't count
- if(istype(X) && ((!islarva(X) && (XENO_LEAVE_TIMER - X.away_timer < XENO_AVAILABLE_TIMER)) || (islarva(X) && (XENO_LEAVE_TIMER_LARVA - X.away_timer < XENO_AVAILABLE_TIMER))))
- if(!X.client)
- available_xenos += X
- else
- available_xenos_non_ssd += X
-
+ for(var/mob/living/carbon/xenomorph/cur_xeno as anything in GLOB.living_xeno_list)
+ if(cur_xeno.aghosted)
+ continue //aghosted xenos don't count
+ var/area/area = get_area(cur_xeno)
+ if(is_admin_level(cur_xeno.z) && (!area || !(area.flags_area & AREA_ALLOW_XENO_JOIN)))
+ continue //xenos on admin z level don't count
+ if(!istype(cur_xeno))
+ continue
+ var/required_time = islarva(cur_xeno) ? XENO_LEAVE_TIMER_LARVA - cur_xeno.away_timer : XENO_LEAVE_TIMER - cur_xeno.away_timer
+ if(required_time > XENO_AVAILABLE_TIMER)
+ continue
+ if(!cur_xeno.client)
+ available_xenos += cur_xeno
+ else
+ available_xenos_non_ssd += cur_xeno
var/datum/hive_status/hive
for(var/hivenumber in GLOB.hive_datum)
@@ -379,6 +384,13 @@ Additional game mode variables.
// No cache, lets check now then
message_alien_candidates(get_alien_candidates(), dequeued = 0, cache_only = TRUE)
if(candidate_observer.larva_queue_cached_message)
+ var/datum/hive_status/cur_hive
+ for(var/hive_num in GLOB.hive_datum)
+ cur_hive = GLOB.hive_datum[hive_num]
+ for(var/mob_name in cur_hive.banished_ckeys)
+ if(cur_hive.banished_ckeys[mob_name] == xeno_candidate.ckey)
+ candidate_observer.larva_queue_cached_message += "\n" + SPAN_WARNING("NOTE: You are banished from the [cur_hive] and you may not rejoin unless the Queen re-admits you or dies. Your queue number won't update until there is a hive you aren't banished from.")
+ break
to_chat(xeno_candidate, candidate_observer.larva_queue_cached_message)
return FALSE
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index ed06c0117f33..9c0a227008c3 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -503,23 +503,25 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
add_fingerprint(usr)
-/obj/structure/machinery/cryopod/proc/go_in_cryopod(mob/M, silent = FALSE)
+/obj/structure/machinery/cryopod/proc/go_in_cryopod(mob/mob, silent = FALSE)
if(occupant)
return
- M.forceMove(src)
- occupant = M
+ mob.forceMove(src)
+ occupant = mob
icon_state = "body_scanner_closed"
SetLuminosity(2)
time_entered = world.time
start_processing()
if(!silent)
- if(M.client)
- to_chat(M, SPAN_NOTICE("You feel cool air surround you. You go numb as your senses turn inward."))
- to_chat(M, SPAN_BOLDNOTICE("If you log out or close your client now, your character will permanently removed from the round in 10 minutes. If you ghost, timer will be decreased to 2 minutes."))
+ if(mob.client)
+ to_chat(mob, SPAN_NOTICE("You feel cool air surround you. You go numb as your senses turn inward."))
+ to_chat(mob, SPAN_BOLDNOTICE("If you log out or close your client now, your character will permanently removed from the round in 10 minutes. If you ghost, timer will be decreased to 2 minutes."))
+ if(!is_admin_level(src.z)) // Set their queue time now because the client has to actually leave to despawn and at that point the client is lost
+ mob.client.player_details.larva_queue_time = max(mob.client.player_details.larva_queue_time, world.time)
var/area/location = get_area(src)
- if(M.job != GET_MAPPED_ROLE(JOB_SQUAD_MARINE))
- message_admins("[key_name_admin(M)], [M.job], has entered \a [src] at [location] after playing for [duration2text(world.time - M.life_time_start)].")
+ if(mob.job != GET_MAPPED_ROLE(JOB_SQUAD_MARINE))
+ message_admins("[key_name_admin(mob)], [mob.job], has entered \a [src] at [location] after playing for [duration2text(world.time - mob.life_time_start)].")
playsound(src, 'sound/machines/hydraulics_3.ogg', 30)
silent_exit = silent
diff --git a/code/game/machinery/storm_siren.dm b/code/game/machinery/storm_siren.dm
new file mode 100644
index 000000000000..e78414cb7e5b
--- /dev/null
+++ b/code/game/machinery/storm_siren.dm
@@ -0,0 +1,26 @@
+/obj/structure/machinery/storm_siren
+ name = "storm siren"
+ desc = "A siren used to announce storm warnings for the colony."
+ icon = 'icons/obj/structures/machinery/loudspeaker.dmi'
+ icon_state = "loudspeaker"
+ density = FALSE
+ anchored = TRUE
+ unacidable = 1
+ unslashable = 1
+ use_power = USE_POWER_NONE
+ health = 0
+
+/obj/structure/machinery/storm_siren/Initialize()
+ weather_notify_objects += src
+ return ..()
+
+/obj/structure/machinery/storm_siren/Destroy()
+ weather_notify_objects -= src
+ . = ..()
+
+/obj/structure/machinery/storm_siren/power_change()
+ return
+
+/obj/structure/machinery/storm_siren/proc/weather_warning()
+ playsound(loc, 'sound/effects/weather_warning_varadero.ogg', 60, 0)
+ visible_message(SPAN_DANGER("The storm siren blares: ATTENTION. ATTENTION. INCOMING TROPICAL STORM DETECTED. SEEK SHELTER IMMEDIATELY."))
diff --git a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm
index 5b0324edc2a2..103efeedde61 100644
--- a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm
+++ b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm
@@ -11,11 +11,21 @@
GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list(
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
+ list("Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
+ list("JACKET (CHOOSE 1)", 0, null, null, null),
+ list("Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),
+
+ list("HAT (CHOOSE 1)", 0, null, null, null),
+ list("Beret, Green", 0, /obj/item/clothing/head/beret/cm, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED),
+ list("Beret, Tan", 0, /obj/item/clothing/head/beret/cm/tan, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED),
+ list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED),
+
+
list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M4A3 Pistol", 0, /obj/item/storage/belt/gun/m4a3/commander, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm
index 838b21a00e6f..b8e3e55f1d89 100644
--- a/code/game/machinery/vending/vendor_types/requisitions.dm
+++ b/code/game/machinery/vending/vendor_types/requisitions.dm
@@ -92,6 +92,7 @@
list("POUCHES", -1, null, null),
list("Autoinjector Pouch", round(scale * 2), /obj/item/storage/pouch/autoinjector, VENDOR_ITEM_REGULAR),
+ list("Bayonet Pouch", round(scale * 2), /obj/item/storage/pouch/bayonet, VENDOR_ITEM_REGULAR),
list("Construction Pouch", round(scale * 2), /obj/item/storage/pouch/construction, VENDOR_ITEM_REGULAR),
list("Document Pouch", round(scale * 2), /obj/item/storage/pouch/document/small, VENDOR_ITEM_REGULAR),
list("Electronics Pouch", round(scale * 2), /obj/item/storage/pouch/electronics, VENDOR_ITEM_REGULAR),
diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm
index 64a5025794e3..1cbe10c497f6 100644
--- a/code/game/objects/effects/landmarks/landmarks.dm
+++ b/code/game/objects/effects/landmarks/landmarks.dm
@@ -216,23 +216,25 @@
/obj/effect/landmark/yautja_teleport
name = "yautja_teleport"
+ /// The index we registered as in mainship_yautja_desc or yautja_teleport_descs
+ var/desc_index
/obj/effect/landmark/yautja_teleport/Initialize(mapload, ...)
. = ..()
- var/turf/T = get_turf(src)
+ var/turf/turf = get_turf(src)
+ desc_index = turf.loc.name + turf.loc_to_string()
if(is_mainship_level(z))
GLOB.mainship_yautja_teleports += src
- GLOB.mainship_yautja_desc[T.loc.name + T.loc_to_string()] = src
+ GLOB.mainship_yautja_desc[desc_index] = src
else
GLOB.yautja_teleports += src
- GLOB.yautja_teleport_descs[T.loc.name + T.loc_to_string()] = src
+ GLOB.yautja_teleport_descs[desc_index] = src
/obj/effect/landmark/yautja_teleport/Destroy()
- var/turf/T = get_turf(src)
GLOB.mainship_yautja_teleports -= src
GLOB.yautja_teleports -= src
- GLOB.mainship_yautja_desc -= T.loc.name + T.loc_to_string()
- GLOB.yautja_teleport_descs -= T.loc.name + T.loc_to_string()
+ GLOB.mainship_yautja_desc -= desc_index
+ GLOB.yautja_teleport_descs -= desc_index
return ..()
diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm
index fbd04babdf20..bc24cb0d9d1f 100644
--- a/code/game/objects/effects/landmarks/survivor_spawner.dm
+++ b/code/game/objects/effects/landmarks/survivor_spawner.dm
@@ -67,7 +67,7 @@
/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc
equipment = /datum/equipment_preset/survivor/pmc
- synth_equipment = /datum/equipment_preset/pmc/synth
+ synth_equipment = /datum/equipment_preset/synth/survivor/pmc
intro_text = list("You are a survivor of a crash landing! ",\
"You are NOT aware of the xenomorph threat. ",\
"Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp. ")
@@ -78,9 +78,35 @@
spawn_priority = SPAWN_PRIORITY_HIGH
+/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic
+ equipment = /datum/equipment_preset/survivor/pmc/medic
+ synth_equipment = /datum/equipment_preset/pmc/synth
+ intro_text = list("You are a survivor of a crash landing! ",\
+ "You are NOT aware of the xenomorph threat.",\
+ "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.")
+ story_text = "You are a PMC medic from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconcious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani."
+ roundstart_damage_min = 3
+ roundstart_damage_max = 10
+ roundstart_damage_times = 2
+
+ spawn_priority = SPAWN_PRIORITY_VERY_HIGH
+
+/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer
+ equipment = /datum/equipment_preset/survivor/pmc/engineer
+ synth_equipment = /datum/equipment_preset/pmc/synth
+ intro_text = list("You are a survivor of a crash landing! ",\
+ "You are NOT aware of the xenomorph threat.",\
+ "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.")
+ story_text = "You are a PMC engineer from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconcious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani."
+ roundstart_damage_min = 3
+ roundstart_damage_max = 10
+ roundstart_damage_times = 2
+
+ spawn_priority = SPAWN_PRIORITY_VERY_HIGH
+
/obj/effect/landmark/survivor_spawner/bigred_crashed_cl
equipment = /datum/equipment_preset/survivor/wy/manager
- synth_equipment = /datum/equipment_preset/pmc/synth
+ synth_equipment = /datum/equipment_preset/synth/survivor/pmc
intro_text = list("You are a survivor of a crash landing! ",\
"You are NOT aware of the xenomorph threat. ",\
"Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp. ")
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index a3e587089997..07b56eedb7d2 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -430,7 +430,7 @@
/obj/item/device/flashlight/flare/on/starshell_ash
name = "burning star shell ash"
- desc = "Bright burning ash from a Star Shell 40mm. Don't touch, oh it'll burn ya'."
+ desc = "Bright burning ash from a Star Shell 40mm. Don't touch, or it'll burn ya'."
icon_state = "starshell_ash"
brightness_on = 7
anchored = TRUE//can't be picked up
diff --git a/code/game/objects/items/pamphlets.dm b/code/game/objects/items/pamphlets.dm
index 683fbb2540f4..dd96f275ef17 100644
--- a/code/game/objects/items/pamphlets.dm
+++ b/code/game/objects/items/pamphlets.dm
@@ -96,8 +96,8 @@
user.hud_set_squad()
var/obj/item/card/id/ID = user.wear_id
- ID.set_assignment((user.assigned_squad ? (user.assigned_squad.name + " ") : "") + "Squad Spotter")
- GLOB.data_core.manifest_modify(user.real_name, WEAKREF(user), "Squad Spotter")
+ ID.set_assignment((user.assigned_squad ? (user.assigned_squad.name + " ") : "") + "Spotter")
+ GLOB.data_core.manifest_modify(user.real_name, WEAKREF(user), "Spotter")
/obj/item/pamphlet/skill/machinegunner
name = "heavy machinegunner instructional pamphlet"
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index f0a235b2301f..c86003b251da 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -30,24 +30,28 @@
item_state = "trashbag"
w_class = SIZE_LARGE
- max_w_class = SIZE_SMALL
- storage_slots = 21
+ max_w_class = SIZE_MEDIUM
+ storage_slots = null
+ max_storage_space = 21 //equivalent to an IMP backpack
can_hold = list() // any
cant_hold = list(/obj/item/disk/nuclear, /obj/item/weapon/throwing_knife)
storage_flags = STORAGE_GATHER_SIMULTAENOUSLY|STORAGE_QUICK_GATHER|STORAGE_CLICK_GATHER
+ flags_equip_slot = NONE
/obj/item/storage/bag/trash/update_icon()
- if(contents.len == 0)
+ var/sum_storage_cost = 0
+ for(var/obj/item/item in contents)
+ sum_storage_cost += item.get_storage_cost()
+
+ if(!sum_storage_cost)
icon_state = "trashbag0"
- else if(contents.len < 12)
+ else if(sum_storage_cost < round(max_storage_space * 0.35))
icon_state = "trashbag1"
- else if(contents.len < 21)
+ else if(sum_storage_cost < round(max_storage_space * 0.7))
icon_state = "trashbag2"
- else icon_state = "trashbag3"
-
-/obj/item/storage/bag/trash/open(mob/user)
- return
+ else
+ icon_state = "trashbag3"
// -----------------------------
// Plastic Bag
@@ -183,7 +187,7 @@
//Turned numbered display on. Appears to work as intended, despite above comment -- Vanagandr.
/obj/item/storage/bag/sheetsnatcher/orient2hud()
- var/adjusted_contents = contents.len
+ var/adjusted_contents = length(contents)
//Numbered contents display
var/list/datum/numbered_display/numbered_contents
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 43624f913037..015d8a5eca60 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -106,6 +106,13 @@
new /obj/item/tool/wirecutters(src)
new /obj/item/device/t_scanner(src)
+/obj/item/storage/belt/utility/full/pred
+ name = "\improper Yautja toolbelt"
+ desc = "A modular belt with various clips. This version lacks any hunting functionality, and is commonly used by engineers to transport important tools."
+ icon = 'icons/obj/items/hunter/pred_gear.dmi'
+ icon_state = "utilitybelt_pred"
+ item_state = "utility"
+
/obj/item/storage/belt/medical
name = "\improper M276 pattern medical storage rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is a less common configuration, designed to transport medical supplies and pistol ammunition. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them."
diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
index 198e5b3b9960..02e4b3866271 100644
--- a/code/game/objects/items/storage/pouch.dm
+++ b/code/game/objects/items/storage/pouch.dm
@@ -612,13 +612,12 @@
name = "explosive pouch"
desc = "It can carry grenades, plastic explosives, mine boxes, and other explosives."
icon_state = "large_explosive"
- storage_slots = 3
+ storage_slots = 6
max_w_class = SIZE_MEDIUM
can_hold = list(
/obj/item/explosive/plastic,
/obj/item/explosive/mine,
/obj/item/explosive/grenade,
- /obj/item/storage/box/explosive_mines,
)
/obj/item/storage/pouch/explosive/attackby(obj/item/W, mob/user)
diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm
index dd8f10a51559..36f946efdfdc 100644
--- a/code/game/objects/items/storage/storage.dm
+++ b/code/game/objects/items/storage/storage.dm
@@ -799,9 +799,9 @@ W is always an item. stop_warning prevents messaging. user may be null.**/
storage_close(watcher)
/obj/item/storage/proc/dump_objectives()
- for(var/obj/item/I in src)
- if(I.is_objective)
- I.forceMove(loc)
+ for(var/obj/item/cur_item in src)
+ if(cur_item.is_objective)
+ remove_from_storage(cur_item, loc)
/obj/item/storage/Destroy()
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index cf0374c09ab4..8c8d6b6920a8 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -245,19 +245,22 @@
else if(istype(W, /obj/item/packageWrap) || istype(W, /obj/item/explosive/plastic))
return
else if(iswelder(W))
+ if(material != MATERIAL_METAL && material != MATERIAL_PLASTEEL)
+ to_chat(user, SPAN_WARNING("You cannot weld [material]!"))
+ return FALSE//Can't weld wood/plastic.
if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH))
to_chat(user, SPAN_WARNING("You need a stronger blowtorch!"))
- return
+ return FALSE
var/obj/item/tool/weldingtool/WT = W
if(!WT.isOn())
to_chat(user, SPAN_WARNING("\The [WT] needs to be on!"))
- return
+ return FALSE
if(!WT.remove_fuel(0, user))
to_chat(user, SPAN_NOTICE("You need more welding fuel to complete this task."))
- return
+ return FALSE
playsound(src, 'sound/items/Welder.ogg', 25, 1)
if(!do_after(user, 10 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
- return
+ return FALSE
welded = !welded
update_icon()
for(var/mob/M as anything in viewers(src))
@@ -266,9 +269,9 @@
if(isxeno(user))
var/mob/living/carbon/xenomorph/opener = user
src.attack_alien(opener)
- return
+ return FALSE
src.attack_hand(user)
- return
+ return TRUE
/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/user)
if(!opened)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 730263ad7a3e..db3ce98339a3 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -326,11 +326,13 @@
/// Checks whether a table is a straight line along a given axis
/obj/structure/surface/table/proc/straight_table_check(direction)
var/obj/structure/surface/table/table = src
- while(table)
+ var/obj/structure/surface/table/side_table
+ var/tables_count = 7 // Lazy extra safety against infinite loops. If table big, can't flip, i guess.
+ while(--tables_count)
// Check whether there are connected tables perpendicular to the axis
for(var/angle in list(-90, 90))
- table = locate() in get_step(loc, turn(direction, angle))
- if(table && !table.flipped)
+ side_table = locate() in get_step(table, turn(direction, angle))
+ if(side_table && !side_table.flipped)
return FALSE
table = locate() in get_step(table, direction)
if(!table || table.flipped)
@@ -339,6 +341,8 @@
var/obj/structure/surface/table/reinforced/reinforced_table = table
if(reinforced_table.status == RTABLE_NORMAL)
return FALSE
+ if(!tables_count)
+ return FALSE
return TRUE
/obj/structure/surface/table/verb/do_flip()
@@ -421,7 +425,7 @@
to_chat(usr, SPAN_WARNING("You have moved a table too recently."))
return FALSE
- if(!skip_straight_check && (!straight_table_check(turn(direction, 90)) || !straight_table_check(turn(direction, -90))))
+ if(!skip_straight_check && !(straight_table_check(turn(direction, 90)) && straight_table_check(turn(direction, -90))))
to_chat(usr, SPAN_WARNING("[src] is too wide to be flipped."))
return FALSE
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 54cfdf6e34ea..6e98f4d7c065 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -500,7 +500,7 @@
var/area/A = get_area(src)
switch(A.ceiling)
if(CEILING_GLASS)
- return "The ceiling above is glass. That's not going stop anything."
+ return "The ceiling above is glass. That's not going to stop anything."
if(CEILING_METAL)
return "The ceiling above is metal. You can't see through it with a camera from above, but that's not going to stop anything."
if(CEILING_UNDERGROUND_ALLOW_CAS)
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index bb0e53a012cb..8a249d297cbe 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -158,7 +158,7 @@
var/dat = ""
var/list/mappings
if(CONFIG_GET(flag/show_manager))
- LAZYSET(mappings, "Management ", R_HOST)
+ LAZYSET(mappings, "Management ", R_PERMISSIONS)
if(CONFIG_GET(flag/show_devs))
LAZYSET(mappings, "Maintainers ", R_PROFILER)
LAZYSET(mappings, "Admins ", R_ADMIN)
diff --git a/code/global.dm b/code/global.dm
index c5c6bdf84066..28a8926cade4 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -12,21 +12,21 @@
#define R_POSSESS (1<<5)
#define R_PERMISSIONS (1<<6)
#define R_STEALTH (1<<7)
-#define R_REJUVINATE (1<<8)
-#define R_COLOR (1<<9)
-#define R_VAREDIT (1<<10)
-#define R_SOUNDS (1<<11)
-#define R_SPAWN (1<<12)
-#define R_MOD (1<<13)
-#define R_MENTOR (1<<14)
-#define R_HOST (1<<15)
-#define R_PROFILER (1<<16)
-#define R_NOLOCK (1<<17)
-#define R_EVENT (1<<18)
-
-/// The sum of all other rank permissions.
-#define R_EVERYTHING ((1<<19)-1)
-
+#define R_COLOR (1<<8)
+#define R_VAREDIT (1<<9)
+#define R_SOUNDS (1<<10)
+#define R_SPAWN (1<<11)
+#define R_MOD (1<<12)
+#define R_MENTOR (1<<13)
+#define R_HOST (1<<14)
+#define R_PROFILER (1<<15)
+#define R_NOLOCK (1<<16)
+#define R_EVENT (1<<17)
+
+/// The sum of all other rank permissions, other than host or profiler.
+#define RL_EVERYTHING (R_BUILDMODE|R_ADMIN|R_BAN|R_SERVER|R_DEBUG|R_PERMISSIONS|R_POSSESS|R_STEALTH|R_COLOR|R_VAREDIT|R_EVENT|R_SOUNDS|R_NOLOCK|R_SPAWN|R_MOD|R_MENTOR)
+/// Truely everything
+#define RL_HOST (RL_EVERYTHING|R_HOST|R_PROFILER)
// 512.1430 increases maximum bit flags from 16 to 24, so the following flags should be available for future changes:
//=================================================
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index fab0c24622fe..b64b1e4682fd 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -226,6 +226,9 @@ var/savefile/Banlist
RemoveBan(A)
/client/proc/cmd_admin_do_ban(mob/M)
+ if(IsAdminAdvancedProcCall())
+ alert_proccall("cmd_admin_do_ban")
+ return PROC_BLOCKED
if(!check_rights(R_BAN|R_MOD)) return
if(!ismob(M)) return
diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm
index dd67a963047e..cbeb1169c807 100644
--- a/code/modules/admin/admin_ranks.dm
+++ b/code/modules/admin/admin_ranks.dm
@@ -34,17 +34,17 @@ var/list/admin_ranks = list() //list of all ranks with associated rights
if("permissions","rights") rights |= R_PERMISSIONS
if("possess") rights |= R_POSSESS
if("stealth") rights |= R_STEALTH
- if("rejuv","rejuvinate") rights |= R_REJUVINATE
if("color") rights |= R_COLOR
if("varedit") rights |= R_VAREDIT
if("event") rights |= R_EVENT
- if("everything","host","all") rights |= (R_HOST|R_BUILDMODE|R_ADMIN|R_BAN|R_SERVER|R_DEBUG|R_PERMISSIONS|R_POSSESS|R_STEALTH|R_REJUVINATE|R_COLOR|R_VAREDIT|R_EVENT|R_SOUNDS|R_NOLOCK|R_SPAWN|R_MOD|R_MENTOR)
if("sound","sounds") rights |= R_SOUNDS
if("nolock") rights |= R_NOLOCK
if("spawn","create") rights |= R_SPAWN
if("mod") rights |= R_MOD
if("mentor") rights |= R_MENTOR
if("profiler") rights |= R_PROFILER
+ if("host") rights |= RL_HOST
+ if("everything") rights |= RL_EVERYTHING
admin_ranks[rank] = rights
previous_rights = rights
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index ba5d52a23f97..6154bb4f8c32 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -27,7 +27,6 @@ var/list/admin_verbs_default = list(
/client/proc/invismin,
/client/proc/set_explosive_antigrief,
/client/proc/check_explosive_antigrief,
- /client/proc/cmd_mod_say,
/client/proc/dsay,
/client/proc/chem_panel, /*chem panel, allows viewing, editing and creation of reagent and chemical_reaction datums*/
/client/proc/player_panel_new, /*shows an interface for all players, with links to various panels*/
@@ -68,6 +67,8 @@ var/list/admin_verbs_default = list(
/datum/admins/proc/alertall,
/datum/admins/proc/imaginary_friend,
/client/proc/toggle_ares_ping,
+ /client/proc/cmd_admin_say, /*staff-only ooc chat*/
+ /client/proc/cmd_mod_say, /* alternate way of typing asay, no different than cmd_admin_say */
)
var/list/admin_verbs_admin = list(
@@ -80,7 +81,6 @@ var/list/admin_verbs_admin = list(
/client/proc/toggleprayers, /*toggles prayers on/off*/
/client/proc/toggle_hear_radio, /*toggles whether we hear the radio*/
/client/proc/event_panel,
- /client/proc/cmd_admin_say, /*admin-only ooc chat*/
/client/proc/free_slot, /*frees slot for chosen job*/
/client/proc/modify_slot,
/client/proc/cmd_admin_rejuvenate,
diff --git a/code/modules/admin/callproc.dm b/code/modules/admin/callproc.dm
index f84121785360..1af1f5aa9fa3 100644
--- a/code/modules/admin/callproc.dm
+++ b/code/modules/admin/callproc.dm
@@ -72,7 +72,8 @@ GLOBAL_PROTECT(LastAdminCalledProc)
*/
/proc/HandleUserlessProcCall(user, datum/target, procname, list/arguments)
if(IsAdminAdvancedProcCall())
- return
+ alert_proccall("HandleUserlessProcCall")
+ return PROC_BLOCKED
var/mob/proccall_handler/handler = GLOB.AdminProcCallHandler
handler.add_caller(user)
var/lastusr = usr
@@ -90,7 +91,8 @@ GLOBAL_PROTECT(LastAdminCalledProc)
*/
/proc/HandleUserlessSDQL(user, query_text)
if(IsAdminAdvancedProcCall())
- return
+ alert_proccall("HandleUserlessSDQL")
+ return PROC_BLOCKED
var/mob/proccall_handler/handler = GLOB.AdminProcCallHandler
handler.add_caller(user)
@@ -224,6 +226,10 @@ GLOBAL_PROTECT(LastAdminCalledProc)
/proc/IsAdminAdvancedProcCall()
return (GLOB.AdminProcCaller && GLOB.AdminProcCaller == usr?.client?.ckey) || (GLOB.AdminProcCallHandler && usr == GLOB.AdminProcCallHandler)
+/proc/alert_proccall(procname = "Unknown")
+ to_chat(usr, SPAN_BOLDWARNING("Warning: Force attempt has been logged."))
+ message_admins("[key_name(usr)] has attempted to execute a restricted proc. ([procname])")
+
/client/proc/callproc_datum(datum/called_datum as null|area|mob|obj|turf)
set category = "Debug"
set name = "Datum ProcCall"
diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index a119d4c0519f..e7559f3aa4fd 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -129,15 +129,18 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your
return 0
/client/proc/deadmin()
+ if(IsAdminAdvancedProcCall())
+ alert_proccall("deadmin")
+ return PROC_BLOCKED
if(admin_holder)
admin_holder.disassociate()
QDEL_NULL(admin_holder)
- return 1
+ return TRUE
/client/proc/readmin()
if(admin_datums[ckey])
admin_datums[ckey].associate(src)
- return 1
+ return TRUE
/datum/admins/proc/check_for_rights(rights_required)
if(rights_required && !(rights_required & rights))
diff --git a/code/modules/admin/tabs/admin_tab.dm b/code/modules/admin/tabs/admin_tab.dm
index c0ffeada9883..5a98faa6ddaa 100644
--- a/code/modules/admin/tabs/admin_tab.dm
+++ b/code/modules/admin/tabs/admin_tab.dm
@@ -218,30 +218,52 @@
message_admins("[key_name(usr)] used Toggle Wake In View.")
+/client/proc/cmd_mod_say(msg as text)
+ set name = "Msay" // This exists for ease of admins who were used to using msay instead of asay
+ set category = "Admin"
+ set hidden = TRUE
+
+ cmd_admin_say(msg)
+
/client/proc/cmd_admin_say(msg as text)
set name = "Asay" //Gave this shit a shorter name so you only have to time out "asay" rather than "admin say" to use it --NeoFite
set category = "Admin"
set hidden = TRUE
- if(!check_rights(R_ADMIN))
+ if(!check_rights(R_ADMIN|R_MOD))
return
msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
- if(!msg)
+
+ if (!msg)
return
- log_adminpm("ADMIN : [key_name(src)] : [msg]")
- REDIS_PUBLISH("byond.asay", "author" = src.key, "message" = strip_html(msg), "host" = ishost(src), "rank" = admin_holder.rank)
+ REDIS_PUBLISH("byond.asay", "author" = src.key, "message" = strip_html(msg), "admin" = CLIENT_HAS_RIGHTS(src, R_ADMIN), "rank" = admin_holder.rank)
+
+ if(findtext(msg, "@") || findtext(msg, "#"))
+ var/list/link_results = check_asay_links(msg)
+ if(length(link_results))
+ msg = link_results[ASAY_LINK_NEW_MESSAGE_INDEX]
+ link_results[ASAY_LINK_NEW_MESSAGE_INDEX] = null
+ var/list/pinged_admin_clients = link_results[ASAY_LINK_PINGED_ADMINS_INDEX]
+ for(var/iter_ckey in pinged_admin_clients)
+ var/client/iter_admin_client = pinged_admin_clients[iter_ckey]
+ if(!iter_admin_client?.admin_holder)
+ continue
+ window_flash(iter_admin_client)
+ SEND_SOUND(iter_admin_client.mob, sound('sound/misc/asay_ping.ogg'))
+
+ log_adminpm("ADMIN: [key_name(src)] : [msg]")
var/color = "adminsay"
if(ishost(usr))
color = "headminsay"
- if(check_rights(R_ADMIN,0))
- msg = "ADMIN: [key_name(usr, 1)] [ADMIN_JMP_USER(mob)]: [msg] [channel] [key_name(src,1)] [ADMIN_JMP_USER(mob)]: [msg] [channel] [key_name(src,1)] [ADMIN_JMP_USER(mob)]: [msg] [toggle_prefs & TOGGLE_HELP_INTENT_SAFETY ? "On" : "Off"] Toggle Middle Mouse Ability Activation: \
[toggle_prefs & TOGGLE_MIDDLE_MOUSE_CLICK ? "On" : "Off"] Toggle Ability Deactivation: \
+ [toggle_prefs & TOGGLE_ABILITY_DEACTIVATION_OFF ? "Off" : "On"] Toggle Directional Assist: \
[toggle_prefs & TOGGLE_DIRECTIONAL_ATTACK ? "On" : "Off"] Toggle Magazine Auto-Ejection: \
@@ -1229,7 +1231,7 @@ var/const/MAX_SAVE_SLOTS = 10
predator_gender = predator_gender == MALE ? FEMALE : MALE
if("pred_age")
var/new_predator_age = tgui_input_number(user, "Choose your Predator's age(175 to 3000):", "Character Preference", 1234, 3000, 175)
- if(new_predator_age)
+ if(new_predator_age)
predator_age = max(min( round(text2num(new_predator_age)), 3000),175)
if("pred_trans_type")
var/new_translator_type = tgui_input_list(user, "Choose your translator type.", "Translator Type", PRED_TRANSLATORS)
diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm
index 9e3d9eb33766..b81411a26440 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preferences_toggles.dm
@@ -205,7 +205,7 @@
set name = "Toggle SpecialRole Candidacy"
set category = "Preferences"
set desc = "Toggles which special roles you would like to be a candidate for, during events."
-
+
var/list/be_special_flags = list(
"Xenomorph after unrevivable death" = BE_ALIEN_AFTER_DEATH,
"Agent" = BE_AGENT,
@@ -274,6 +274,7 @@
"Toggle 'Unload Weapon' Ejecting Magazines to Your Hands Toggle Automatic Punctuation Toggle Middle Mouse Ability Activation Toggle Ability Deactivation Toggle Combat Click-Drag Override Toggle Alternate-Fire Dual Wielding Toggle Middle Mouse Swapping Hands