Merge branch 'clothing' of https://github.com/Helg2/RuTGMC-Reborn int…

…o clothing
PMC-Unga-Marines · Jul 31, 2024 · cc2f6ca · cc2f6ca
2 parents fb9d9a9 + 4cb6e44
commit cc2f6ca
Show file tree

Hide file tree

Showing 54 changed files with 155 additions and 151 deletions.
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -10,7 +10,7 @@
 ///Speed mod for run intent
 #define MOB_RUN_MOVE_MOD 3
 ///Move mod for going diagonally
-#define DIAG_MOVEMENT_ADDED_DELAY_MULTIPLIER 1.6
+#define DIAG_MOVEMENT_ADDED_DELAY_MULTIPLIER (sqrt(2))
 
 
 //Pain or shock reduction for different reagents

diff --git a/code/__DEFINES/movement.dm b/code/__DEFINES/movement.dm
@@ -1,6 +1,6 @@
 //The minimum for glide_size to be clamped to.
 //If you want more classic style "delay" movement while still retaining the smoothness improvements at higher framerates, set this to 8
-#define MIN_GLIDE_SIZE 3
+#define MIN_GLIDE_SIZE 1
 //The maximum for glide_size to be clamped to.
 //This shouldn't be higher than the icon size, and generally you shouldn't be changing this, but it's here just in case.
 #define MAX_GLIDE_SIZE 32

diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm
@@ -159,7 +159,7 @@
 
 /atom/movable/proc/simple_rotate_clockwise()
 	set name = "Rotate Clockwise"
-	set category = "Object"
+	set category = "Object.Rotate"
 	set src in oview(1)
 	var/datum/component/simple_rotation/rotcomp = GetComponent(/datum/component/simple_rotation)
 	if(rotcomp)
@@ -168,7 +168,7 @@
 
 /atom/movable/proc/simple_rotate_counterclockwise()
 	set name = "Rotate Counter-Clockwise"
-	set category = "Object"
+	set category = "Object.Rotate"
 	set src in oview(1)
 	var/datum/component/simple_rotation/rotcomp = GetComponent(/datum/component/simple_rotation)
 	if(rotcomp)
@@ -177,7 +177,7 @@
 
 /atom/movable/proc/simple_rotate_flip()
 	set name = "Flip"
-	set category = "Object"
+	set category = "Object.Rotate"
 	set src in oview(1)
 	var/datum/component/simple_rotation/rotcomp = GetComponent(/datum/component/simple_rotation)
 	if(rotcomp)

diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
@@ -63,7 +63,7 @@
 		. += "<a href=\"[CONFIG_GET(string/githuburl)]/pull/[tm.number]\">#[tm.number][details]</a><br>"
 
 /client/verb/showrevinfo()
-	set category = "OOC"
+	set category = "OOC.Fix"
 	set name = "Show Server Revision"
 	set desc = "Check the current server code revision"
 

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -189,7 +189,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan
 
 /obj/item/verb/move_to_top()
 	set name = "Move To Top"
-	set category = "Object"
+	set category = "Object.Mob"
 	set src in oview(1)
 
 	if(!isturf(loc) || usr.stat || usr.restrained())
@@ -785,7 +785,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan
 
 /obj/item/verb/verb_pickup()
 	set src in oview(1)
-	set category = "Object"
+	set category = "Object.Mob"
 	set name = "Pick up"
 
 	if(usr.incapacitated() || !Adjacent(usr))
@@ -810,7 +810,7 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan
 
 /mob/living/carbon/verb/showoff()
 	set name = "Show Held Item"
-	set category = "Object"
+	set category = "Object.Mob"
 
 	var/obj/item/I = get_active_held_item()
 	if(I && !(I.flags_item & ITEM_ABSTRACT))

diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
@@ -135,13 +135,12 @@
 
 /obj/item/card/id/verb/read()
 	set name = "Read ID Card"
-	set category = "Object"
+	set category = "Object.Clothing"
 	set src in usr
 
 	to_chat(usr, "[icon2html(src, usr)] [name]: The current assignment on the card is [assignment].")
 	to_chat(usr, "The blood type on the card is [blood_type].")
 
-
 /obj/item/card/id/silver
 	name = "identification card"
 	desc = "A silver card which shows honour and dedication."

diff --git a/code/game/objects/items/embedding.dm b/code/game/objects/items/embedding.dm
@@ -150,7 +150,7 @@
 
 
 /mob/living/proc/yank_out_object()
-	set category = "Object"
+	set category = "Object.Mob"
 	set name = "Yank out object"
 	set desc = "Remove an embedded item at the cost of bleeding and pain."
 	set src in view(1)

diff --git a/code/game/objects/items/motion_detector.dm b/code/game/objects/items/motion_detector.dm
@@ -59,7 +59,7 @@
 	///If a hostile was detected
 	var/hostile_detected = FALSE
 	///The time needed after the last move to not be detected by this motion detector
-	//var/move_sensitivity = 1 SECONDS RU TGMC EDIT
+	var/move_sensitivity = 1 SECONDS
 	///The range of this motion detector
 	var/range = 16
 	///The list of all the blips
@@ -135,12 +135,16 @@
 	for(var/mob/living/carbon/human/nearby_human AS in cheap_get_humans_near(operator, range))
 		if(nearby_human == operator)
 			continue
+		if(nearby_human.last_move_time + move_sensitivity < world.time)
+			continue
 		if(HAS_TRAIT(nearby_human, TRAIT_LIGHT_STEP))
 			continue
 		prepare_blip(nearby_human, nearby_human.wear_id?.iff_signal & operator.wear_id.iff_signal ? MOTION_DETECTOR_FRIENDLY : MOTION_DETECTOR_HOSTILE)
 	for(var/mob/living/carbon/xenomorph/nearby_xeno AS in cheap_get_xenos_near(operator, range))
 		if(HAS_TRAIT(nearby_xeno, TRAIT_TURRET_HIDDEN))
 			continue
+		if(nearby_xeno.last_move_time + move_sensitivity < world.time )
+			continue
 		prepare_blip(nearby_xeno, MOTION_DETECTOR_HOSTILE)
 	for(var/mob/illusion/nearby_illusion AS in cheap_get_illusions_near(operator, range))
 		prepare_blip(nearby_illusion, MOTION_DETECTOR_HOSTILE)
@@ -160,7 +164,7 @@
 /obj/item/attachable/motiondetector/proc/prepare_blip(mob/target, status)
 	if(!operator.client)
 		return
-	if(!target)
+	if(!target) //если мы вызываем метод без target то где то в вышестоящем коде ошибка, но всё же лучше чем ничего
 		return
 	if(status == MOTION_DETECTOR_HOSTILE)
 		hostile_detected = TRUE

diff --git a/code/game/objects/items/radio/headset.dm b/code/game/objects/items/radio/headset.dm
@@ -368,7 +368,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 
 /obj/item/radio/headset/mainship/verb/configure_squadhud()
 	set name = "Configure Headset HUD"
-	set category = "Object"
+	set category = "Object.Clothing"
 	set src in usr
 
 	if(!can_interact(usr))

diff --git a/code/game/objects/items/taperecorder.dm b/code/game/objects/items/taperecorder.dm
@@ -31,7 +31,7 @@
 
 /obj/item/taperecorder/verb/record()
 	set name = "Start Recording"
-	set category = "Object"
+	set category = "Object.Tape Recorder"
 
 	if(usr.stat)
 		return
@@ -55,7 +55,7 @@
 
 /obj/item/taperecorder/verb/stop()
 	set name = "Stop"
-	set category = "Object"
+	set category = "Object.Tape Recorder"
 
 	if(usr.stat)
 		return
@@ -76,7 +76,7 @@
 
 /obj/item/taperecorder/verb/clear_memory()
 	set name = "Clear Memory"
-	set category = "Object"
+	set category = "Object.Tape Recorder"
 
 	if(usr.stat)
 		return
@@ -93,7 +93,7 @@
 
 /obj/item/taperecorder/verb/playback_memory()
 	set name = "Playback Memory"
-	set category = "Object"
+	set category = "Object.Tape Recorder"
 
 	if(usr.stat)
 		return
@@ -132,7 +132,7 @@
 
 /obj/item/taperecorder/verb/print_transcript()
 	set name = "Print Transcript"
-	set category = "Object"
+	set category = "Object.Tape Recorder"
 
 	if(usr.stat)
 		return

diff --git a/code/game/objects/items/toys/cards.dm b/code/game/objects/items/toys/cards.dm
@@ -53,7 +53,7 @@
 
 /obj/item/toy/deck/verb/draw_card()
 
-	set category = "Object"
+	set category = "Object.Cards"
 	set name = "Draw"
 	set desc = "Draw a card from a deck."
 	set src in view(1)
@@ -95,7 +95,7 @@
 
 /obj/item/toy/deck/verb/deal_card()
 
-	set category = "Object"
+	set category = "Object.Cards"
 	set name = "Deal"
 	set desc = "Deal a card from a deck."
 	set src in view(1)
@@ -195,7 +195,7 @@
 /// Takes a selected card, and puts it down, face-up, in front
 /obj/item/toy/handcard/verb/discard()
 
-	set category = "Object"
+	set category = "Object.Cards"
 	set name = "Discard"
 	set desc = "Place a card from your hand in front of you."
 
@@ -259,7 +259,7 @@
 		name = "hand of cards"
 	else
 		name = "a playing card"
-	
+
 /obj/item/toy/handcard/update_desc(updates)
 	. = ..()
 	if(length(cards) > 1)
@@ -372,9 +372,9 @@
 /obj/item/toy/deck/kotahi/update_icon_state()
 	. = ..()
 	switch(length(cards))
-		if(107 to 108) 
+		if(107 to 108)
 			icon_state = "deck"
-		if(37 to 106) 
+		if(37 to 106)
 			icon_state = "deck_open"
-		if(0 to 36) 
+		if(0 to 36)
 			icon_state = "deck_empty"
diff --git a/code/game/objects/machinery/OpTable.dm b/code/game/objects/machinery/OpTable.dm
@@ -167,7 +167,7 @@
 
 /obj/machinery/optable/verb/climb_on()
 	set name = "Climb On Table"
-	set category = "Object"
+	set category = "Object.Mob"
 	set src in oview(1)
 
 	if(usr.stat || !ishuman(usr) || usr.restrained() || !check_table(usr))

diff --git a/code/game/objects/machinery/adv_med.dm b/code/game/objects/machinery/adv_med.dm
@@ -52,7 +52,7 @@
 
 /obj/machinery/bodyscanner/verb/eject()
 	set src in oview(1)
-	set category = "Object"
+	set category = "Object.Mob"
 	set name = "Eject Body Scanner"
 
 	if (usr.stat != CONSCIOUS)
@@ -80,7 +80,7 @@
 
 /obj/machinery/bodyscanner/verb/move_inside()
 	set src in oview(1)
-	set category = "Object"
+	set category = "Object.Mob"
 	set name = "Enter Body Scanner"
 
 	move_inside_wrapper(usr, usr)

diff --git a/code/game/objects/machinery/autodoc.dm b/code/game/objects/machinery/autodoc.dm
@@ -698,7 +698,7 @@
 
 /obj/machinery/autodoc/verb/eject()
 	set name = "Eject Med-Pod"
-	set category = "Object"
+	set category = "Object.Mob"
 	set src in oview(1)
 	if(usr.incapacitated())
 		return // nooooooooooo
@@ -805,7 +805,7 @@
 
 /obj/machinery/autodoc/verb/move_inside()
 	set name = "Enter Med-Pod"
-	set category = "Object"
+	set category = "Object.Mob"
 	set src in oview(1)
 
 	move_inside_wrapper(usr, usr)

diff --git a/code/game/objects/machinery/cryopod.dm b/code/game/objects/machinery/cryopod.dm
@@ -238,7 +238,7 @@
 
 /obj/machinery/cryopod/verb/eject()
 	set name = "Eject Pod"
-	set category = "Object"
+	set category = "Object.Mob"
 	set src in view(0)
 
 	if(usr.incapacitated(TRUE) || usr.loc != src)
@@ -267,7 +267,7 @@
 
 /obj/machinery/cryopod/verb/move_inside()
 	set name = "Enter Pod"
-	set category = "Object"
+	set category = "Object.Mob"
 	set src in oview(1)
 
 	move_inside_wrapper(usr, usr)

diff --git a/code/game/objects/machinery/pipe/construction.dm b/code/game/objects/machinery/pipe/construction.dm
@@ -88,7 +88,7 @@ Buildable meters
 	icon_state = initial(fakeA.pipe_state)
 
 /obj/item/pipe/verb/flip()
-	set category = "Object"
+	set category = "Object.Rotate"
 	set name = "Flip Pipe"
 	set src in view(1)
 

diff --git a/code/game/objects/machinery/robotic_cradle.dm b/code/game/objects/machinery/robotic_cradle.dm
@@ -198,7 +198,7 @@
 
 /obj/machinery/robotic_cradle/verb/move_inside()
 	set name = "Enter Cradle"
-	set category = "Object"
+	set category = "Object.Mob"
 	set src in oview(1)
 
 	if(place_mob_inside(usr, usr))
@@ -246,7 +246,7 @@
 
 /obj/machinery/robotic_cradle/verb/eject()
 	set name = "Eject cradle"
-	set category = "Object"
+	set category = "Object.Mob"
 	set src in oview(1)
 	if(usr.incapacitated())
 		return

diff --git a/code/game/objects/machinery/sleeper.dm b/code/game/objects/machinery/sleeper.dm
@@ -402,7 +402,7 @@
 
 /obj/machinery/sleeper/verb/eject()
 	set name = "Eject Sleeper"
-	set category = "Object"
+	set category = "Object.Mob"
 	set src in oview(1)
 
 	if(usr.stat != CONSCIOUS)
@@ -446,7 +446,7 @@
 
 /obj/machinery/sleeper/verb/move_inside()
 	set name = "Enter Sleeper"
-	set category = "Object"
+	set category = "Object.Mob"
 	set src in oview(1)
 
 	move_inside_wrapper(usr, usr)

diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
@@ -34,7 +34,7 @@
 
 	set name = "Climb structure"
 	set desc = "Climbs onto a structure."
-	set category = "Object"
+	set category = "Object.Mob"
 	set src in oview(1)
 
 	do_climb(usr)

diff --git a/code/game/objects/structures/barricade.dm b/code/game/objects/structures/barricade.dm
@@ -221,7 +221,7 @@
 
 /obj/structure/barricade/verb/rotate()
 	set name = "Rotate Barricade Counter-Clockwise"
-	set category = "Object"
+	set category = "Object.Rotate"
 	set src in oview(1)
 
 	if(anchored)
@@ -232,7 +232,7 @@
 
 /obj/structure/barricade/verb/revrotate()
 	set name = "Rotate Barricade Clockwise"
-	set category = "Object"
+	set category = "Object.Rotate"
 	set src in oview(1)
 
 	if(anchored)

diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -57,7 +57,7 @@
 
 /obj/structure/bed/chair/verb/rotate()
 	set name = "Rotate Chair"
-	set category = "Object"
+	set category = "Object.Rotate"
 	set src in view(0)
 
 	var/mob/living/carbon/user = usr