Merge branch 'master' into boxfix

cmss13-devs · May 18, 2024 · edcce1e · edcce1e
2 parents 7593037 + bc59712
commit edcce1e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/code/game/objects/items/devices/helmet_visors.dm b/code/game/objects/items/devices/helmet_visors.dm
@@ -82,7 +82,7 @@
 
 /obj/item/device/helmet_visor/medical/advanced
 	name = "advanced medical optic"
-	helmet_overlay = "med_sight_left"
+	helmet_overlay = "med_sight_right"
 
 /obj/item/device/helmet_visor/medical/advanced/activate_visor(obj/item/clothing/head/helmet/marine/attached_helmet, mob/living/carbon/human/user)
 	. = ..()

diff --git a/code/modules/projectiles/magazines/specialist.dm b/code/modules/projectiles/magazines/specialist.dm
@@ -254,10 +254,16 @@
 			user.put_in_hands(fuel)
 			fuel = null
 		update_icon()
-		desc = initial(desc) + "\n Contains[fuel?" fuel":""] [warhead?" and warhead":""]."
 		return
 	. = ..()
 
+/obj/item/ammo_magazine/rocket/custom/get_examine_text(mob/user)
+	. = ..()
+	if(fuel)
+		. += SPAN_NOTICE("Contains fuel.")
+	if(warhead)
+		. += SPAN_NOTICE("Contains a warhead.")
+
 /obj/item/ammo_magazine/rocket/custom/attackby(obj/item/W as obj, mob/user as mob)
 	if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
 		to_chat(user, SPAN_WARNING("You do not know how to tinker with [name]."))
@@ -284,7 +290,6 @@
 			W.forceMove(src)
 			fuel = W
 			to_chat(user, SPAN_DANGER("You add [W] to [name]."))
-			desc = initial(desc) + "\n Contains[fuel?" fuel":""] [warhead?" and warhead":""]."
 			playsound(loc, 'sound/items/Screwdriver2.ogg', 25, 0, 6)
 	else if(istype(W,/obj/item/explosive/warhead/rocket) && !locked)
 		if(warhead)
@@ -298,7 +303,6 @@
 		W.forceMove(src)
 		warhead = W
 		to_chat(user, SPAN_DANGER("You add [W] to [name]."))
-		desc = initial(desc) + "\n Contains[fuel?" fuel":""] [warhead?" and warhead":""]."
 		playsound(loc, 'sound/items/Screwdriver2.ogg', 25, 0, 6)
 	update_icon()
 

diff --git a/html/changelogs/AutoChangeLog-pr-6294.yml b/html/changelogs/AutoChangeLog-pr-6294.yml
@@ -0,0 +1,4 @@
+author: "Git-Nivrak"
+delete-after: True
+changes:
+  - rscadd: "Changed advanced medhud visor to be displayed on the same eye as normal medhud visor"
diff --git a/html/changelogs/AutoChangeLog-pr-6299.yml b/html/changelogs/AutoChangeLog-pr-6299.yml
@@ -0,0 +1,4 @@
+author: "iloveloopers"
+delete-after: True
+changes:
+  - spellcheck: "Custom rocket description now looks nicer"