Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…

…dmin_console

code/defines/procs/announcement.dm

@@ -125,7 +125,7 @@
 
 //AI shipside announcement, that uses announcement mechanic instead of talking into comms
 //to ensure that all humans on ship hear it regardless of comms and power
-/proc/shipwide_ai_announcement(message, title = MAIN_AI_SYSTEM, sound_to_play = sound('sound/misc/interference.ogg'), signature)
+/proc/shipwide_ai_announcement(message, title = MAIN_AI_SYSTEM, sound_to_play = sound('sound/misc/interference.ogg'), signature, ares_logging = ARES_LOG_MAIN)
 	var/list/targets = GLOB.human_mob_list + GLOB.dead_mob_list
 	for(var/mob/T in targets)
 		if(isobserver(T))
@@ -136,8 +136,12 @@
 	if(!isnull(signature))
 		message += "<br><br><i> Signed by, <br> [signature]</i>"
 	var/datum/ares_link/link = GLOB.ares_link
-	if(link.interface && !(link.interface.inoperable()))
-		link.log_ares_announcement(title, message)
+	if(ares_can_log())
+		switch(ares_logging)
+			if(ARES_LOG_MAIN)
+				link.log_ares_announcement(title, message)
+			if(ARES_LOG_SECURITY)
+				link.log_ares_security(title, message)
 
 	announcement_helper(message, title, targets, sound_to_play)
 

code/game/area/areas.dm

@@ -90,7 +90,7 @@
 	initialize_power()
 
 /area/Initialize(mapload, ...)
-	icon_state = "" //Used to reset the icon overlay, I assume.
+	icon = null
 	layer = AREAS_LAYER
 	uid = ++global_uid
 	. = ..()

code/game/machinery/vending/vendor_types/crew/senior_officers.dm

@@ -284,7 +284,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list(
 		list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/commander, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),
 		list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),
 		list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),
-		list("Ceremonial Sword", 0, /obj/item/storage/large_holster/ceremonial_sword/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),
 
 		list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
 		list("Officer M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/SO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),

code/game/objects/effects/spawners/prop_gun_spawner.dm

@@ -17,7 +17,7 @@
 		stack_trace("[src] using incorrect typepath, \"[prop_gun_type]\".") //Can't make a prop gun of something not a gun
 		qdel(src)
 		return
-	if(!spawn_prob)
+	if(!prob(spawn_prob))
 		qdel(src)
 		return
 	if(!mapload)
@@ -71,6 +71,7 @@
 	pixel_x = source_gun.pixel_x
 	pixel_y = source_gun.pixel_y
 	layer = source_gun.layer
+	overlays = source_gun.overlays
 
 /obj/item/prop/prop_gun/attack_self(mob/user) //Mimic wielding of real guns
 	. = ..()

code/game/objects/structures/props.dm

@@ -810,8 +810,10 @@
 	var/obj/item/stack/sheet/wood/fuel = attacking_item
 	if(remaining_fuel >= initial(remaining_fuel))
 		to_chat(user, SPAN_NOTICE("You cannot fuel [src] further."))
+		return
 	if(!fuel.use(1))
 		to_chat(SPAN_NOTICE("You do not have enough [attacking_item] to fuel [src]."))
+		return
 	visible_message(SPAN_NOTICE("[user] fuels [src] with [fuel]."))
 	remaining_fuel++
 

code/game/turfs/light.dm

@@ -1,9 +1,21 @@
+#define LIGHT_FLOOR_COLOR_BLUE 0
+#define LIGHT_FLOOR_COLOR_RED 1
+#define LIGHT_FLOOR_COLOR_GREEN 2
+#define LIGHT_FLOOR_COLOR_YELLOW 3
+#define LIGHT_FLOOR_COLOR_PURPLE 4
+#define LIGHT_FLOOR_COLOR_WHITE 5
+
 /turf/open/floor/light
 	name = "light floor"
 	desc = "Beware of breakdancing on these tiles, glass shards embedded in the head is not a fun time."
+	icon_state = "light_on"
 	tile_type = /obj/item/stack/tile/light
 	var/on = TRUE
-	var/state = 0
+	var/state = LIGHT_FLOOR_COLOR_BLUE
+
+/turf/open/floor/light/get_examine_text(mob/user)
+	. = ..()
+	. += "[src] is [broken ? "broken, and requires a replacement lightbulb":"[on ? "on" : "off"]"]."
 
 /turf/open/floor/light/is_light_floor()
 	return TRUE
@@ -12,22 +24,22 @@
 	. = ..()
 	if(on && !broken) //manages color, I feel like this switch is a sin.
 		switch(state)
-			if(0)
+			if(LIGHT_FLOOR_COLOR_BLUE)
 				icon_state = "light_on"
 				set_light(5)
-			if(1)
+			if(LIGHT_FLOOR_COLOR_RED)
 				icon_state = "light_on-r"
 				set_light(5)
-			if(2)
+			if(LIGHT_FLOOR_COLOR_GREEN)
 				icon_state = "light_on-g"
 				set_light(5)
-			if(3)
+			if(LIGHT_FLOOR_COLOR_YELLOW)
 				icon_state = "light_on-y"
 				set_light(5)
-			if(4)
+			if(LIGHT_FLOOR_COLOR_PURPLE)
 				icon_state = "light_on-p"
 				set_light(5)
-			if(5,-1)
+			if(LIGHT_FLOOR_COLOR_WHITE,-1) //change this later
 				icon_state = "light_on-w"
 				set_light(5)
 				state = -1
@@ -84,3 +96,68 @@
 		broken = TRUE
 		update_icon()
 		return XENO_ATTACK_ACTION
+
+/turf/open/floor/light/red
+	icon_state = "light_on-r"
+	state = LIGHT_FLOOR_COLOR_RED
+
+/turf/open/floor/light/green
+	icon_state = "light_on-g"
+	state = LIGHT_FLOOR_COLOR_GREEN
+
+/turf/open/floor/light/yellow
+	icon_state = "light_on-y"
+	state = LIGHT_FLOOR_COLOR_YELLOW
+
+/turf/open/floor/light/purple
+	icon_state = "light_on-p"
+	state = LIGHT_FLOOR_COLOR_PURPLE
+
+/turf/open/floor/light/white
+	icon_state = "light_on-w"
+	state = LIGHT_FLOOR_COLOR_WHITE
+
+/turf/open/floor/light/off
+	icon_state = "light_off"
+	on = FALSE
+
+/turf/open/floor/light/off/red
+	state = LIGHT_FLOOR_COLOR_RED
+
+/turf/open/floor/light/off/green
+	state = LIGHT_FLOOR_COLOR_GREEN
+
+/turf/open/floor/light/off/yellow
+	state = LIGHT_FLOOR_COLOR_YELLOW
+
+/turf/open/floor/light/off/purple
+	state = LIGHT_FLOOR_COLOR_PURPLE
+
+/turf/open/floor/light/off/white
+	state = LIGHT_FLOOR_COLOR_WHITE
+
+/turf/open/floor/light/broken
+	icon_state = "light_broken"
+	broken = TRUE
+
+/turf/open/floor/light/broken/red
+	state = LIGHT_FLOOR_COLOR_RED
+
+/turf/open/floor/light/broken/green
+	state = LIGHT_FLOOR_COLOR_GREEN
+
+/turf/open/floor/light/broken/yellow
+	state = LIGHT_FLOOR_COLOR_YELLOW
+
+/turf/open/floor/light/broken/purple
+	state = LIGHT_FLOOR_COLOR_PURPLE
+
+/turf/open/floor/light/broken/white
+	state = LIGHT_FLOOR_COLOR_WHITE
+
+#undef LIGHT_FLOOR_COLOR_BLUE
+#undef LIGHT_FLOOR_COLOR_RED
+#undef LIGHT_FLOOR_COLOR_GREEN
+#undef LIGHT_FLOOR_COLOR_YELLOW
+#undef LIGHT_FLOOR_COLOR_PURPLE
+#undef LIGHT_FLOOR_COLOR_WHITE

code/modules/clothing/glasses/glasses.dm

@@ -142,7 +142,7 @@
 
 /obj/item/clothing/glasses/science/prescription
 	name = "prescription reagent scanner HUD goggles"
-	desc = "These goggles are probably of use to someone who isn't holding a rifle and actively seeking to lower their combat life expectancy. Contains prescription lenses." 
+	desc = "These goggles are probably of use to someone who isn't holding a rifle and actively seeking to lower their combat life expectancy. Contains prescription lenses."
 	prescription = TRUE
 
 /obj/item/clothing/glasses/science/get_examine_text(mob/user)
@@ -414,7 +414,7 @@
 /obj/item/clothing/glasses/mgoggles/v2
 	name = "M1A1 marine ballistic goggles"
 	desc = "Newer issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger lenses."
-	icon_state = "mgoggles2_down"
+	icon_state = "mgoggles2"
 	active_icon_state = "mgoggles2_down"
 	inactive_icon_state = "mgoggles2"
 

code/modules/paperwork/paperbin.dm

@@ -23,8 +23,7 @@
 /obj/item/paper_bin/MouseDrop(atom/over_object)
 	if(over_object == usr && ishuman(usr) && !usr.is_mob_restrained() && !usr.stat && (loc == usr || in_range(src, usr)))
 		if(!usr.get_active_hand()) //if active hand is empty
-			attack_hand(usr, 1, 1)
-
+			usr.put_in_hands(src)
 	return
 
 /obj/item/paper_bin/attack_hand(mob/user)

code/modules/shuttle/computers/dropship_computer.dm

@@ -179,6 +179,9 @@
 				return
 			to_chat(xeno, SPAN_NOTICE("You command the metal bird to come down. Clever girl."))
 			xeno_announcement(SPAN_XENOANNOUNCE("Your Queen has commanded the metal bird to the hive at [linked_lz]."), xeno.hivenumber, XENO_GENERAL_ANNOUNCE)
+			var/datum/ares_link/link = GLOB.ares_link
+			link.log_ares_flight("Unknown", "Remote launch signal for [shuttle.name] received. Authentication garbled.")
+			link.log_ares_security("Security Alert", "Remote launch signal for [shuttle.name] received. Authentication garbled.")
 			return
 		if(shuttle.destination.id != linked_lz)
 			to_chat(xeno, "The shuttle not ready. The screen reads T-[shuttle.timeLeft(10)]. Have patience.")

code/modules/shuttle/shuttles/dropship.dm

@@ -100,7 +100,7 @@
 
 			var/name = "Unidentified Lifesigns"
 			var/input = "Unidentified lifesigns detected onboard. Recommendation: lockdown of exterior access ports, including ducting and ventilation."
-			shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg')
+			shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg', ares_logging = ARES_LOG_SECURITY)
 			set_security_level(SEC_LEVEL_RED)
 			return
 

code/modules/shuttles/marine_ferry.dm

@@ -230,7 +230,7 @@
 			if(X && X.stat != DEAD)
 				var/name = "Unidentified Lifesigns"
 				var/input = "Unidentified lifesigns detected onboard. Recommendation: lockdown of exterior access ports, including ducting and ventilation."
-				shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg')
+				shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg', ares_logging = ARES_LOG_SECURITY)
 				set_security_level(SEC_LEVEL_RED)
 				break
 

html/changelogs/AutoChangeLog-pr-4599.yml

@@ -0,0 +1,5 @@
+author: "BeagleGaming1"
+delete-after: True
+changes:
+  - rscadd: "Light floor can be examined to tell if it is on, off, or broken."
+  - code_imp: "Light floor subtypes for easier mapping"

html/changelogs/AutoChangeLog-pr-4613.yml

@@ -0,0 +1,4 @@
+author: "irRegularGuy646"
+delete-after: True
+changes:
+  - bugfix: "fixed new goggle's on helmet sprite"

html/changelogs/AutoChangeLog-pr-4616.yml

@@ -0,0 +1,5 @@
+author: "Birdtalon"
+delete-after: True
+changes:
+  - bugfix: "You can now pick up paper bins"
+  - bugfix: "Campfires stop consuming wood when full"

html/changelogs/AutoChangeLog-pr-4620.yml

@@ -0,0 +1,4 @@
+author: "Zonespace27"
+delete-after: True
+changes:
+  - rscdel: "Predators can no longer see their or others cross-round honor count."

html/changelogs/archive/2023-10.yml

@@ -118,3 +118,12 @@
   - rscadd: tactical shotguns now come standard with their stock. Yes you can remove
       it if you dont want it
   - rscadd: new tactical shotgun stock sprite done by esselnek
+2023-10-10:
+  BeagleGaming1:
+  - code_imp: prop guns will copy attachments
+  CapCamIII:
+  - rscdel: XO can no longer take a sword as their personal weapon in their vendor.
+  realforest2001:
+  - rscadd: Added missing flight record for Queen dropship summon.
+  - code_imp: Added security record option for shipwide_ai_announcement.
+  - rscadd: Added security records for unidentified lifeforms announcement.

nano/templates/clan_menu.tmpl

@@ -46,7 +46,7 @@
 	}
 
 	#clan_list {
-		border-collapse: collapse; 
+		border-collapse: collapse;
 		width: 100%;
 	}
 </style>
@@ -76,9 +76,6 @@
 	<h1 class="whiteTitle">{{:data.clan_name}}</h1>
 	<pre class="whiteDescription">{{:data.clan_description}}</pre>
 
-	{{if data.clan_honor != null}}
-		<h3 class="whiteTitle">Honor: {{:data.clan_honor}}</h3>
-	{{/if}}
 	<table>
 		<tr>
 			{{if data.player_rename_clan}}
@@ -111,7 +108,6 @@
 		<th class="noPadCell"></th>
 		<th>Name</th>
 		<th>Rank</th>
-		<th>Honor</th>
 		{{if data.player_modify_ranks}}
 			<th></th>
 		{{/if}}
@@ -128,7 +124,6 @@
 			<td class="noPadCell"></td>
 			<td id="clan_name">{{:keys.name}}</td>
 			<td>{{:keys.rank}}</td>
-			<td>{{:keys.honor}}</td>
 			{{if data.player_rank_pos > keys.rank_pos}}
 				{{if data.player_modify_ranks}}
 					<td><div unselectable="on">{{:helper.link('Set Rank', '', { 'clan_target_href' : keys.player_id, 'clan_action': 'modifyrank' })}}</div></td>
@@ -142,4 +137,4 @@
 			{{/if}}
 		</tr>
 	{{/props}}
-</table>
+</table>