Merge remote-tracking branch 'upstream/main'

NPC1314 · Nov 8, 2024 · 8ce68aa · 8ce68aa
2 parents 891774d + f763f4f
commit 8ce68aa
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 15 deletions.
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
@@ -335,6 +335,8 @@
 	newforce = (newforce * user.used_intent.damfactor) * dullfactor
 	if(user.used_intent.get_chargetime() && user.client?.chargedprog < 100)
 		newforce = newforce * 0.5
+	if(!(user.mobility_flags & MOBILITY_STAND))
+		newforce *= 0.5
 	// newforce is rounded upto the nearest intiger.
 	newforce = round(newforce,1)
 	//This is returning the maximum of the arguments meaning this is to prevent negative values.

diff --git a/code/game/objects/items/rogueitems/dmusicbox.dm b/code/game/objects/items/rogueitems/dmusicbox.dm
@@ -47,7 +47,7 @@
 
 /obj/item/dmusicbox/attackby(obj/item/P, mob/user, params)
 	if(!loaded)
-		if(istype(P, /obj/item/reagent_containers/food/snacks/rogue/honey))
+		if(istype(P, /obj/item/roguecoin/gold))
 			loaded=TRUE
 			qdel(P)
 			update_icon()
@@ -74,9 +74,9 @@
 		if(world.time < lastfilechange + 3 MINUTES)
 			say("NOT YET!")
 			return
-//	if(!loaded)
-//		say("FEED ME SPIDER MILK!")
-//		return
+	if(!loaded)
+		say("A GOLD COIN FOR A CAROL!")
+		return
 	playsound(loc, 'sound/misc/beep.ogg', 100, FALSE, -1)
 	var/infile = input(user, "CHOOSE A NEW SONG", src) as null|file
 

diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
@@ -412,11 +412,6 @@
 	desc = ""
 	icon_state = "kippah"
 
-/obj/item/clothing/head/medievaljewhat
-	name = "medieval Jew hat"
-	desc = ""
-	icon_state = "medievaljewhat"
-
 /obj/item/clothing/head/taqiyahwhite
 	name = "white taqiyah"
 	desc = ""

diff --git a/code/modules/clothing/rogueclothes/cloaks.dm b/code/modules/clothing/rogueclothes/cloaks.dm
@@ -885,6 +885,23 @@
 	allowed_sex = list(MALE, FEMALE)
 	allowed_race = list("human", "tiefling", "elf", "aasimar")
 
+/obj/item/clothing/cloak/half/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/storage/concrete)
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	if(STR)
+		STR.max_combined_w_class = 3
+		STR.max_w_class = WEIGHT_CLASS_NORMAL
+		STR.max_items = 1
+
+/obj/item/clothing/cloak/half/dropped(mob/living/carbon/human/user)
+	..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	if(STR)
+		var/list/things = STR.contents()
+		for(var/obj/item/I in things)
+			STR.remove_from_storage(I, get_turf(src))
+
 /obj/item/clothing/cloak/half/shadowcloak
 	name = "stalker cloak"
 	desc = "A heavy leather cloak held together by a gilded pin. The pin depicts a spider with disconnected legs."

diff --git a/code/modules/mob/living/carbon/rogfatstam.dm b/code/modules/mob/living/carbon/rogfatstam.dm
@@ -1,7 +1,5 @@
 /mob/living/proc/update_rogfat() //update hud and regen after last_fatigued delay on taking
-	maxrogfat = round(100 * (rogstam/maxrogstam))
-	if(maxrogfat < 5)
-		maxrogfat = 5
+	maxrogfat = maxrogstam / 10
 
 	if(world.time > last_fatigued + 20) //regen fatigue
 		var/added = rogstam / maxrogstam
@@ -137,7 +135,7 @@
 		var/matrix/skew = matrix()
 		skew.Scale(2)
 		//skew.Translate(-224,0)
-		var/matrix/newmatrix = skew 
+		var/matrix/newmatrix = skew
 		for(var/C in hud_used.plane_masters)
 			var/atom/movable/screen/plane_master/whole_screen = hud_used.plane_masters[C]
 			if(whole_screen.plane == HUD_PLANE)

diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
@@ -356,7 +356,6 @@
 					/obj/item/clothing/head/beanie/rasta = 1)
 	contraband = list(/obj/item/toy/plush/plushvar = 1,
 					/obj/item/toy/plush/narplush = 1,
-					/obj/item/clothing/head/medievaljewhat = 3,
 					/obj/item/clothing/suit/chaplainsuit/clownpriest = 1,
 					/obj/item/clothing/head/clownmitre = 1)
 	premium = list(/obj/item/clothing/suit/chaplainsuit/bishoprobe = 1,

diff --git a/tools/UpdatePaths/Scripts/70060_hats_repath.txt b/tools/UpdatePaths/Scripts/70060_hats_repath.txt
@@ -106,7 +106,6 @@
 /obj/item/clothing/head/bandana/armored : /obj/item/clothing/head/costume/pirate/bandana/armored {@OLD}
 /obj/item/clothing/head/clownmitre : /obj/item/clothing/head/chaplain/clownmitre {@OLD}
 /obj/item/clothing/head/kippah : /obj/item/clothing/head/chaplain/kippah {@OLD}
-/obj/item/clothing/head/medievaljewhat : /obj/item/clothing/head/chaplain/medievaljewhat {@OLD}
 /obj/item/clothing/head/taqiyahwhite : /obj/item/clothing/head/chaplain/taqiyah/white {@OLD}
 /obj/item/clothing/head/taqiyahred : /obj/item/clothing/head/chaplain/taqiyah/red {@OLD}
 /obj/item/clothing/head/sombrero : /obj/item/clothing/head/costume/sombrero {@OLD}