diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 1b9141ab01..a93a7cfc3b 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -433,7 +433,7 @@
var/mob/living/L = C.loc
var/turf/pos = get_turf(L)
- if(!pos || C != L.get_item_by_slot(SLOT_NECK))
+ if(!pos || C != L.get_item_by_slot(ITEM_SLOT_NECK))
continue
var/list/slave = list()
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 9d92d08385..b6948eadab 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -72,7 +72,7 @@ GLOBAL_PROTECT(admin_verbs_admin)
/client/proc/cmd_admin_man_up_global, //CIT CHANGE - ditto
/client/proc/cmd_admin_create_centcom_report,
/client/proc/cmd_change_command_name,
- /client/proc/cmd_player_playtimes, /* shows players by playtime */
+ /client/proc/cmd_admin_check_player_exp, /* shows players by playtime */
/client/proc/toggle_combo_hud, // toggle display of the combination pizza antag and taco sci/med/eng hud
/client/proc/toggle_AI_interact, /*toggle admin ability to interact with machines as an AI*/
/datum/admins/proc/open_shuttlepanel, /* Opens shuttle manipulator UI */
diff --git a/code/modules/admin/playtimes.dm b/code/modules/admin/playtimes.dm
index 7cf24d9746..c9c908629b 100644
--- a/code/modules/admin/playtimes.dm
+++ b/code/modules/admin/playtimes.dm
@@ -20,6 +20,7 @@
client["ckey"] = C.ckey
client["playtime"] = C.get_exp_living(TRUE)
client["playtime_hours"] = C.get_exp_living()
+ client["flags"] = check_flags(C)
var/mob/M = C.mob
client["observer"] = isobserver(M)
diff --git a/modular_sand/code/game/objects/items/lewd_items/leash.dm b/modular_sand/code/game/objects/items/lewd_items/leash.dm
index 8aa8864b2b..6e788a5593 100644
--- a/modular_sand/code/game/objects/items/lewd_items/leash.dm
+++ b/modular_sand/code/game/objects/items/lewd_items/leash.dm
@@ -92,7 +92,7 @@ Icons, maybe?
if(C.has_status_effect(/datum/status_effect/leash_pet)) //If the pet is already leashed, do not leash them. For the love of god.
to_chat(user, "[C] has already been leashed.")
return
- if(istype(C.get_item_by_slot(SLOT_NECK), /obj/item/clothing/neck/petcollar) || istype(C.get_item_by_slot(SLOT_NECK), /obj/item/electropack/shockcollar))
+ if(istype(C.get_item_by_slot(ITEM_SLOT_NECK), /obj/item/clothing/neck/petcollar) || istype(C.get_item_by_slot(ITEM_SLOT_NECK), /obj/item/electropack/shockcollar))
var/leashtime = 50
if(C.handcuffed)
leashtime = 5
@@ -124,7 +124,7 @@ Icons, maybe?
sleep(2) //Check every other tick
if(leash_pet == "null") //No pet, break loop
return
- if(!(leash_pet.get_item_by_slot(SLOT_NECK))) //The pet has slipped their collar and is not the pet anymore.
+ if(!(leash_pet.get_item_by_slot(ITEM_SLOT_NECK))) //The pet has slipped their collar and is not the pet anymore.
for(var/mob/viewing in viewers(user, null))
viewing.show_message("[leash_pet] has slipped out of their collar!!", 1)
to_chat(leash_pet, "You have slipped out of your collar!")
@@ -388,7 +388,7 @@ Icons, maybe?
addtimer(CALLBACK(src, .proc/drop_effects, user, silent), 1)
/obj/item/leash/proc/drop_effects(mob/user, silent)
- if(leash_master.is_holding_item_of_type(/obj/item/leash) || istype(leash_master.get_item_by_slot(SLOT_BELT), /obj/item/leash))
+ if(leash_master.is_holding_item_of_type(/obj/item/leash) || istype(leash_master.get_item_by_slot(ITEM_SLOT_BELT), /obj/item/leash))
return //Dom still has the leash as it turns out. Cancel the proc.
for(var/mob/viewing in viewers(leash_master, null))
viewing.show_message("[leash_master] has dropped the leash.", 1)
diff --git a/modular_sand/code/game/objects/items/lewd_items/vibrator.dm b/modular_sand/code/game/objects/items/lewd_items/vibrator.dm
index bd91c5a5e0..9f18b726c6 100644
--- a/modular_sand/code/game/objects/items/lewd_items/vibrator.dm
+++ b/modular_sand/code/game/objects/items/lewd_items/vibrator.dm
@@ -8,7 +8,7 @@
icon_state = "vibe"
item_state = "vibe"
w_class = WEIGHT_CLASS_SMALL
- slot_flags = ITEM_SLOT_DENYPOCKET //no more pocket shockers
+ //slot_flags = ITEM_SLOT_DENYPOCKET //no more pocket shockers
var/equipment_slot = GENITAL_EQUIPMENT_VIBRATOR
var/mode = 1
var/style = "long"
diff --git a/modular_sand/code/game/objects/items/milking_machine.dm b/modular_sand/code/game/objects/items/milking_machine.dm
index 5f1c8ad865..b485641ddc 100644
--- a/modular_sand/code/game/objects/items/milking_machine.dm
+++ b/modular_sand/code/game/objects/items/milking_machine.dm
@@ -5,7 +5,7 @@
item_state = "Off"
desc = "A pocket sized pump and tubing assembly designed to collect and store products from mammary glands."
- slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKET
+ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS
var/on = FALSE
var/obj/item/reagent_containers/inserted_item = null
diff --git a/modular_splurt/code/__HELPERS/cmp.dm b/modular_splurt/code/__HELPERS/cmp.dm
deleted file mode 100644
index b2ce9eb938..0000000000
--- a/modular_splurt/code/__HELPERS/cmp.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/proc/cmp_playtime(list/A, list/B)
- return A["playtime"] - B["playtime"]
diff --git a/modular_splurt/code/game/machinery/computer/slavery.dm b/modular_splurt/code/game/machinery/computer/slavery.dm
index 8276f62302..28c800beba 100644
--- a/modular_splurt/code/game/machinery/computer/slavery.dm
+++ b/modular_splurt/code/game/machinery/computer/slavery.dm
@@ -87,7 +87,7 @@
var/mob/living/L = C.loc
var/turf/pos = get_turf(L)
- if(!pos || C != L.get_item_by_slot(SLOT_NECK))
+ if(!pos || C != L.get_item_by_slot(ITEM_SLOT_NECK))
continue
var/list/slave = list()
diff --git a/modular_splurt/code/game/object/items/devices/radio/electropack.dm b/modular_splurt/code/game/object/items/devices/radio/electropack.dm
index 85821e5bd3..95b0a4e7b8 100644
--- a/modular_splurt/code/game/object/items/devices/radio/electropack.dm
+++ b/modular_splurt/code/game/object/items/devices/radio/electropack.dm
@@ -36,7 +36,7 @@
if(isliving(user))
var/mob/living/M = user
- if(slot == SLOT_NECK)
+ if(slot == ITEM_SLOT_NECK)
playsound(get_turf(M), 'sound/machines/triple_beep.ogg', 50, 1)
ADD_TRAIT(src, TRAIT_NODROP, CLOTHING_TRAIT)
diff --git a/modular_splurt/code/modules/admin/playtimes.dm b/modular_splurt/code/modules/admin/playtimes.dm
index 126631699c..8dbdf7b22e 100644
--- a/modular_splurt/code/modules/admin/playtimes.dm
+++ b/modular_splurt/code/modules/admin/playtimes.dm
@@ -12,6 +12,8 @@
var/touched_circuit = FALSE
var/uses_vpn = FALSE
+//Most of this data is now unused except for the flags
+/*
/client/proc/cmd_player_playtimes()
set category = "Admin"
set name = "Player Playtimes"
@@ -64,6 +66,7 @@
clients = sortList(clients, /proc/cmp_playtime)
data["clients"] = clients
return data
+*/
/datum/player_playtime/proc/check_flags(client/C)
var/list/flags = list()
@@ -105,7 +108,7 @@
flags += list(flag)
return flags
-
+/*
/datum/player_playtime/ui_act(action, params)
if(..())
return
@@ -125,3 +128,4 @@
return
var/mob/dead/observer/A = C.mob
A.ManualFollow(target)
+*/
diff --git a/modular_splurt/code/modules/antagonists/wendigo/mob/mob_equip.dm b/modular_splurt/code/modules/antagonists/wendigo/mob/mob_equip.dm
index 404f43b70f..88854925f3 100644
--- a/modular_splurt/code/modules/antagonists/wendigo/mob/mob_equip.dm
+++ b/modular_splurt/code/modules/antagonists/wendigo/mob/mob_equip.dm
@@ -1,57 +1,57 @@
/mob/living/carbon/wendigo/can_equip(obj/item/I, slot, disable_warning, bypass_equip_delay_self, clothing_check, list/return_warning)
switch(slot)
- if(SLOT_HANDS)
+ if(ITEM_SLOT_HANDS)
if(get_empty_held_indexes())
return TRUE
return FALSE
- if(SLOT_GLASSES)
+ if(ITEM_SLOT_EYES)
if(glasses)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_EYES))
return FALSE
return TRUE
- if(SLOT_NECK)
+ if(ITEM_SLOT_NECK)
if(wear_neck)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_NECK))
return FALSE
return TRUE
- if(SLOT_EARS_LEFT)
+ if(ITEM_SLOT_EARS_LEFT)
if(ears)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_EARS))
return FALSE
return TRUE
- if(SLOT_EARS_RIGHT)
+ if(ITEM_SLOT_EARS_RIGHT)
if(ears_extra)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_EARS))
return FALSE
return TRUE
- if(SLOT_GLOVES)
+ if(ITEM_SLOT_GLOVES)
if(gloves)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_GLOVES))
return FALSE
return TRUE
- if(SLOT_BACK)
+ if(ITEM_SLOT_BACK)
if(back)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_BACK))
return FALSE
return TRUE
- if(SLOT_IN_BACKPACK)
+ if(ITEM_SLOT_BACKPACK)
if(back)
if(SEND_SIGNAL(back, COMSIG_TRY_STORAGE_CAN_INSERT, I, src, TRUE))
return TRUE
return FALSE
- if(SLOT_HEAD)
+ if(ITEM_SLOT_HEAD)
if(head)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_HEAD))
return FALSE
return TRUE
- if(SLOT_BELT)
+ if(ITEM_SLOT_BELT)
if(belt)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_BELT))
@@ -63,16 +63,16 @@
if(!..())
return
switch(slot)
- if(SLOT_GLASSES)
+ if(ITEM_SLOT_EYES)
glasses = I
update_inv_glasses()
- if(SLOT_EARS_LEFT)
+ if(ITEM_SLOT_EARS_LEFT)
ears = I
update_inv_ears()
- if(SLOT_EARS_RIGHT)
+ if(ITEM_SLOT_EARS_RIGHT)
ears_extra = I
update_inv_ears_extra()
- if(SLOT_GLOVES)
+ if(ITEM_SLOT_GLOVES)
gloves = I
update_inv_gloves()
return TRUE
diff --git a/modular_splurt/code/modules/antagonists/wendigo/mob/update_icons.dm b/modular_splurt/code/modules/antagonists/wendigo/mob/update_icons.dm
index ca27e1a0eb..c390cf0d67 100644
--- a/modular_splurt/code/modules/antagonists/wendigo/mob/update_icons.dm
+++ b/modular_splurt/code/modules/antagonists/wendigo/mob/update_icons.dm
@@ -107,7 +107,7 @@
remove_overlay(EAR_LEFT_LAYER)
if(ears)
if(client && hud_used)
- var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_EARS_LEFT]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_EARS_LEFT]
inv.update_icon()
ears.screen_loc = ui_ears //move the item to the appropriate screen loc
if(client && hud_used && hud_used.hud_shown)
@@ -136,7 +136,7 @@
remove_overlay(EAR_RIGHT_LAYER)
if(ears_extra)
if(client && hud_used)
- var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_EARS_RIGHT]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[ITEM_SLOT_EARS_RIGHT]
inv.update_icon()
ears_extra.screen_loc = ui_ears //move the item to the appropriate screen loc
if(client && hud_used && hud_used.hud_shown)
@@ -336,7 +336,7 @@
if(WEST)
head_icon.pixel_x += HEAD_X_OFFSET_WEST
head_icon.pixel_y += HEAD_Y_OFFSET_WEST
- overlays_standing[SLOT_HEAD] = head_icon
+ overlays_standing[ITEM_SLOT_HEAD] = head_icon
update_hud_head(head)
apply_overlay(HEAD_LAYER)
diff --git a/modular_splurt/code/modules/clothing/lewd_clothing/collar/kink_collars.dm b/modular_splurt/code/modules/clothing/lewd_clothing/collar/kink_collars.dm
index 390bccf445..d170e12dba 100644
--- a/modular_splurt/code/modules/clothing/lewd_clothing/collar/kink_collars.dm
+++ b/modular_splurt/code/modules/clothing/lewd_clothing/collar/kink_collars.dm
@@ -55,7 +55,7 @@
return ..()
/obj/item/clothing/neck/mind_collar/attack_hand(mob/living/carbon/human/user)
var/mob/living/carbon/human/C = user
- if(iscarbon(user) && seamless && (user.get_item_by_slot(SLOT_NECK)))
+ if(iscarbon(user) && seamless && (user.get_item_by_slot(ITEM_SLOT_NECK)))
to_chat(C, span_purple(pick("You can't seem to find the release latch for the collar!",
"The collar refuses to budge while you tug at it.",
"Your hands uselessly roam along the strange device.")))
diff --git a/modular_splurt/code/modules/clothing/lewd_clothing/foot/lewd_shoes.dm b/modular_splurt/code/modules/clothing/lewd_clothing/foot/lewd_shoes.dm
index 5dbb0afb3c..b03e727554 100644
--- a/modular_splurt/code/modules/clothing/lewd_clothing/foot/lewd_shoes.dm
+++ b/modular_splurt/code/modules/clothing/lewd_clothing/foot/lewd_shoes.dm
@@ -17,7 +17,7 @@
//it takes time to put them off, do not touch
/obj/item/clothing/shoes/latexheels/attack_hand(mob/user)
var/mob/living/carbon/C = user
- if(iscarbon(user) && (user.get_item_by_slot(SLOT_SHOES) == src))
+ if(iscarbon(user) && (user.get_item_by_slot(ITEM_SLOT_FEET) == src))
if(seamless)
to_chat(C, span_purple(pick("You slide your heels against eachother in a failed attempt at kicking them off.",
"The heels refuse to budge no matter how much you tug.",
diff --git a/modular_splurt/code/modules/clothing/lewd_clothing/gloves/lewd_gloves.dm b/modular_splurt/code/modules/clothing/lewd_clothing/gloves/lewd_gloves.dm
index b7df45ddee..0f1318d94f 100644
--- a/modular_splurt/code/modules/clothing/lewd_clothing/gloves/lewd_gloves.dm
+++ b/modular_splurt/code/modules/clothing/lewd_clothing/gloves/lewd_gloves.dm
@@ -12,7 +12,7 @@
/obj/item/clothing/gloves/latex_gloves/attack_hand(mob/living/carbon/human/user)
var/mob/living/carbon/human/C = user
- if(iscarbon(user) && seamless && (user.get_item_by_slot(SLOT_GLOVES) == src))
+ if(iscarbon(user) && seamless && (user.get_item_by_slot(ITEM_SLOT_GLOVES) == src))
to_chat(C, span_purple(pick("You rub your gloved fingers together as you search for some sort of escape.",
"You can't find any leverage to remove these gloves!",
"Your pointless clawing seems to only make things more skin tight")))
diff --git a/modular_splurt/code/modules/clothing/lewd_clothing/head/deprivation_helmet.dm b/modular_splurt/code/modules/clothing/lewd_clothing/head/deprivation_helmet.dm
index 2bf43a7f80..c397bcb6e8 100644
--- a/modular_splurt/code/modules/clothing/lewd_clothing/head/deprivation_helmet.dm
+++ b/modular_splurt/code/modules/clothing/lewd_clothing/head/deprivation_helmet.dm
@@ -77,14 +77,14 @@
muzzle = FALSE
//playsound(usr, 'sound/weapons/magout.ogg', 40, TRUE, ignore_walls = FALSE)
to_chat(usr, span_notice("Speech switch off"))
- if(usr.get_item_by_slot(SLOT_HEAD) == src)
+ if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src)
REMOVE_TRAIT(usr, TRAIT_MUTE, CLOTHING_TRAIT)
to_chat(usr, span_purple("Your mouth is free. you breathe out with relief."))
else
muzzle = TRUE
//playsound(usr, 'sound/weapons/magin.ogg', 40, TRUE, ignore_walls = FALSE)
to_chat(usr, span_notice("Speech switch on"))
- if(usr.get_item_by_slot(SLOT_HEAD) == src)
+ if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src)
ADD_TRAIT(usr, TRAIT_MUTE, CLOTHING_TRAIT)
to_chat(usr, span_purple("Something is gagging your mouth! You can't even make a sound..."))
if(C == "hearing")
@@ -92,7 +92,7 @@
earmuffs = FALSE
//playsound(usr, 'sound/weapons/magout.ogg', 40, TRUE, ignore_walls = FALSE)
to_chat(usr, span_notice("Hearing switch off"))
- if(usr.get_item_by_slot(SLOT_HEAD) == src)
+ if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src)
REMOVE_TRAIT(usr, TRAIT_DEAF, CLOTHING_TRAIT)
//Toggle_Sounds()
to_chat(usr, span_purple("Finally you can hear the world around again."))
@@ -100,7 +100,7 @@
earmuffs = TRUE
//playsound(usr, 'sound/weapons/magin.ogg', 40, TRUE, ignore_walls = FALSE)
to_chat(usr, span_notice("Hearing switch on"))
- if(usr.get_item_by_slot(SLOT_HEAD) == src)
+ if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src)
ADD_TRAIT(usr, TRAIT_DEAF, CLOTHING_TRAIT)
//Toggle_Sounds()
//stop_client_sounds()
@@ -111,14 +111,14 @@
prevent_vision = FALSE
//playsound(usr, 'sound/weapons/magout.ogg', 40, TRUE, ignore_walls = FALSE)
to_chat(usr, span_notice("Vision switch off"))
- if(usr.get_item_by_slot(SLOT_HEAD) == src)
+ if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src)
user.become_blind("deprivation_helmet_[REF(src)]")
to_chat(usr, span_purple("Helmet no longer restricts your vision."))
else
prevent_vision = TRUE
//playsound(usr, 'sound/weapons/magin.ogg', 40, TRUE, ignore_walls = FALSE)
to_chat(usr, span_notice("Vision switch on"))
- if(usr.get_item_by_slot(SLOT_HEAD) == src)
+ if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src)
user.become_blind("deprivation_helmet_[REF(src)]")
to_chat(usr, span_purple("The helmet is blocking your vision! You can't make out anything on the other side..."))
@@ -185,7 +185,7 @@
/obj/item/clothing/head/helmet/space/deprivation_helmet/equipped(mob/living/carbon/human/user, slot)
. = ..()
- if(slot != SLOT_HEAD)
+ if(slot != ITEM_SLOT_HEAD)
return
if(muzzle == TRUE)
ADD_TRAIT(user, TRAIT_MUTE, CLOTHING_TRAIT)
@@ -222,7 +222,7 @@
to_chat(user, span_purple("The helmet no longer restricts your vision."))
/obj/item/clothing/head/helmet/space/deprivation_helmet/attack_hand(mob/living/carbon/human/user)
- if(iscarbon(user) && seamless && (user.get_item_by_slot(SLOT_HEAD) == src))
+ if(iscarbon(user) && seamless && (user.get_item_by_slot(ITEM_SLOT_HEAD) == src))
to_chat(user, span_purple(pick("You roam your hands around the helmet for some sort of release!",
"You find it impossible to leverage your fingers underneath the helmet",
"The durable material seems to reflect your pointless force.")))
diff --git a/modular_splurt/code/modules/mob/living/carbon/human/simple_animal/hostile/deathclaw/funclaw.dm b/modular_splurt/code/modules/mob/living/carbon/human/simple_animal/hostile/deathclaw/funclaw.dm
index ff08f4ec2e..3c213c9217 100644
--- a/modular_splurt/code/modules/mob/living/carbon/human/simple_animal/hostile/deathclaw/funclaw.dm
+++ b/modular_splurt/code/modules/mob/living/carbon/human/simple_animal/hostile/deathclaw/funclaw.dm
@@ -92,9 +92,9 @@
switch(chosen_hole)
if(CUM_TARGET_ANUS)
- if(tearSlot(M, SLOT_WEAR_SUIT))
+ if(tearSlot(M, ITEM_SLOT_OCLOTHING))
return
- if(tearSlot(M, SLOT_W_UNIFORM))
+ if(tearSlot(M, ITEM_SLOT_ICLOTHING))
return
// Abomination deathclaws do other stuff instead
@@ -108,9 +108,9 @@
do_anal(M)
if(CUM_TARGET_VAGINA)
- if(tearSlot(M, SLOT_WEAR_SUIT))
+ if(tearSlot(M, ITEM_SLOT_OCLOTHING))
return
- if(tearSlot(M, SLOT_W_UNIFORM))
+ if(tearSlot(M, ITEM_SLOT_ICLOTHING))
return
// Abomination deathclaws do other stuff instead
@@ -121,9 +121,9 @@
do_vaginal(M)
if(CUM_TARGET_THROAT)
- if(tearSlot(M, SLOT_HEAD))
+ if(tearSlot(M, ITEM_SLOT_HEAD))
return
- if(tearSlot(M, SLOT_WEAR_MASK))
+ if(tearSlot(M, ITEM_SLOT_MASK))
return
// Abomination deathclaws do other stuff instead