Merge remote-tracking branch 'upstream/master' into node-18

code/__DEFINES/admin.dm

@@ -76,6 +76,7 @@
 #define ADMIN_PUNISHMENT_TOE "Stub Toe (Once)"
 #define ADMIN_PUNISHMENT_TOEPLUS "Stub Toe (Always)"
 #define ADMIN_PUNISHMENT_CRYO "Force Cryo"
+#define ADMIN_PUNISHMENT_DOCK "Dock Pay" //NSV13
 
 #define AHELP_UNCLAIMED 1
 #define AHELP_ACTIVE 2

code/_onclick/hud/fullscreen.dm

@@ -110,6 +110,11 @@
 	layer = BLIND_LAYER
 	plane = FULLSCREEN_PLANE
 
+/atom/movable/screen/fullscreen/law_change
+    icon_state = "law_change"
+    layer = BLIND_LAYER
+    plane = FULLSCREEN_PLANE
+
 /atom/movable/screen/fullscreen/curse
 	icon_state = "curse"
 	layer = CURSE_LAYER

code/game/objects/effects/landmarks.dm

@@ -107,7 +107,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
 
 /obj/effect/landmark/start/security_officer
 	name = "Military Police" //Nsv13 - Crayon eaters & MPs
-	icon_state = "Military Police"
+	icon_state = "Military Police" //Nsv13 - Crayon eaters & MPs
 
 /obj/effect/landmark/start/botanist
 	name = "Botanist"

code/modules/admin/verbs/randomverbs.dm

@@ -1086,7 +1086,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(!check_rights(R_ADMIN) || !check_rights(R_FUN))
 		return
 
-	var/list/punishment_list = list(ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_ROD, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_FLOORCLUWNE, ADMIN_PUNISHMENT_CLUWNE, ADMIN_PUNISHMENT_IMMERSE, ADMIN_PUNISHMENT_GHOST, ADMIN_PUNISHMENT_DEMOCRACY, ADMIN_PUNISHMENT_ANARCHY, ADMIN_PUNISHMENT_TOE, ADMIN_PUNISHMENT_TOEPLUS, ADMIN_PUNISHMENT_CRYO, ADMIN_PUNISHMENT_ENTRAPPED) //NSV13 - added entrapped
+	var/list/punishment_list = list(ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_ROD, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_FLOORCLUWNE, ADMIN_PUNISHMENT_CLUWNE, ADMIN_PUNISHMENT_IMMERSE, ADMIN_PUNISHMENT_GHOST, ADMIN_PUNISHMENT_DEMOCRACY, ADMIN_PUNISHMENT_ANARCHY, ADMIN_PUNISHMENT_TOE, ADMIN_PUNISHMENT_TOEPLUS, ADMIN_PUNISHMENT_CRYO, ADMIN_PUNISHMENT_ENTRAPPED, ADMIN_PUNISHMENT_DOCK) //NSV13 - added entrapped + Dock
 	if(istype(target, /mob/living/carbon))
 		punishment_list += ADMIN_PUNISHMENT_NUGGET
 	var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in sortList(punishment_list)
@@ -1099,7 +1099,33 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			for(var/turf/T in (orange(1, target) - target.loc))
 				new /obj/item/ship_weapon/ammunition/naval_artillery/cannonball/admin(T)
 			target.playsound_local(get_turf(target), 'sound/magic/clockwork/invoke_general.ogg', 200, pressure_affected = FALSE)
-			to_chat(target, "<span class='narsiesmall'>Entrapped.</span>") //NSV13 end
+			to_chat(target, "<span class='narsiesmall'>Entrapped.</span>")
+		if(ADMIN_PUNISHMENT_DOCK)
+			if(!iscarbon(target))
+				to_chat(usr,"<span class='warning'>This must be used on a carbon mob.</span>")
+				return
+			var/mob/living/carbon/dude = target
+			var/obj/item/card/id/card = dude.get_idcard(TRUE)
+			if(!card)
+				to_chat(usr,"<span class='warning'>[dude] does not have an ID card on!</span>")
+				return
+			if(!card.registered_account)
+				to_chat(usr,"<span class='warning'>[dude] does not have an ID card with an account!</span>")
+				return
+			if(card.registered_account.account_balance == 0)
+				to_chat(usr, "<span class='warning'>ID Card lacks any funds. No pay to dock.</span>")
+				return
+			var/new_cost = input("How much pay are we docking? Current balance: [card.registered_account.account_balance] credits.","BUDGET CUTS") as num|null
+			if(!new_cost)
+				return
+			if(!(card.registered_account.has_money(new_cost)))
+				to_chat(usr, "<span class='warning'>ID Card lacked funds. Emptying account.</span>")
+				card.registered_account.bank_card_talk("[new_cost] credits deducted from your account based on performance review.")
+				card.registered_account.account_balance = 0
+			else
+				card.registered_account.account_balance = card.registered_account.account_balance - new_cost
+				card.registered_account.bank_card_talk("[new_cost] credits deducted from your account based on performance review.")
+			SEND_SOUND(target, 'sound/machines/buzz-sigh.ogg') //NSV13 end
 		if(ADMIN_PUNISHMENT_LIGHTNING)
 			var/turf/T = get_step(get_step(target, NORTH), NORTH)
 			T.Beam(target, icon_state="lightning[rand(1,12)]", time = 5)

code/modules/mob/living/silicon/laws.dm

@@ -14,9 +14,12 @@
 	throw_alert("newlaw", /atom/movable/screen/alert/newlaw)
 	if(announce && last_lawchange_announce != world.time)
 		to_chat(src, "<b>Your laws have been changed.</b>")
+		overlay_fullscreen("law_change", /atom/movable/screen/fullscreen/law_change, 1)
 		// lawset modules cause this function to be executed multiple times in a tick, so we wait for the next tick in order to be able to see the entire lawset
 		addtimer(CALLBACK(src, PROC_REF(show_laws)), 0)
 		addtimer(CALLBACK(src, PROC_REF(deadchat_lawchange)), 0)
+		// Wait a tick and clear the vignette
+		addtimer(CALLBACK(src, PROC_REF(clear_fullscreen), "law_change"), 0.2 SECONDS)
 		last_lawchange_announce = world.time
 
 /mob/living/silicon/proc/set_law_sixsixsix(law, announce = TRUE)

html/changelog.html

@@ -56,6 +56,25 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">27 October 2023</h2>
+			<h3 class="author">Bobbanz1 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes the issue where small crafts such as Sabres, dropships and ghost ships were showing non-existing armour quadrants!</li>
+			</ul>
+			<h3 class="author">someone543 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">added back MP start landmark icon</li>
+			</ul>
+
+			<h2 class="date">20 October 2023</h2>
+			<h3 class="author">Bokkiewokkie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added light fighter plushie</li>
+				<li class="rscadd">Added heavy fighter plushie</li>
+				<li class="rscadd">Added sabre plushie</li>
+				<li class="rscadd">Added mining sabre plushie</li>
+			</ul>
+
 			<h2 class="date">17 October 2023</h2>
 			<h3 class="author">Bokkiewokkie updated:</h3>
 			<ul class="changes bgimages16">
@@ -179,47 +198,6 @@ <h3 class="author">someone543 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">Ecto Sniffer has a cooldown for radio messages, and can now send visible_messages</li>
 			</ul>
-
-			<h2 class="date">25 August 2023</h2>
-			<h3 class="author">BlueHNT updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added Glock AP magazine and ammo box</li>
-				<li class="rscadd">Added Glock I magazine and ammo box</li>
-				<li class="rscadd">Added Glock-related designs to proto-lathe</li>
-			</ul>
-			<h3 class="author">Bokkiewokkie updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added an emag effect to plasma constrictors</li>
-				<li class="tweak">Combined Stormdrive RCC and plasma constrictor tech into one</li>
-				<li class="bugfix">Fixed constrictors not pixel shifting on different layers</li>
-				<li class="bugfix">Made it possible for constrictors to be rotated</li>
-				<li class="code_imp">Moved plasma constrictors into their own file</li>
-				<li class="bugfix">Fixed VV menu not showing new turfs after deleting a turf</li>
-				<li class="bugfix">Fixed admins adding components not logging the object it was added to</li>
-			</ul>
-			<h3 class="author">Ikalpo updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed the holomap not working when inside objects</li>
-				<li class="tweak">The holomap cursor now shows the location of your camera</li>
-			</ul>
-			<h3 class="author">SerynEngi updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Added normal armor to all overmap ships.</li>
-			</ul>
-			<h3 class="author">bruhlookatthisdood updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">torpedo crate comes with torpedo warheads now</li>
-				<li class="bugfix">fixed borg crew manifest button overlapping</li>
-			</ul>
-			<h3 class="author">cacogen, Profakos updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Modifying a navigation beacon's codes list or location name now correctly updates the associated global lists</li>
-				<li class="refactor">Refactored navigational beacons, making them constructable, deconstructable, and generally easier to use</li>
-			</ul>
-			<h3 class="author">covertcorvid updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Make gun deletion actually pass in a source to UnregisterSignal</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -1768,3 +1768,15 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - refactor: Removed the unintended ability for the mission extension to select any
       random objective
   - admin: Made it possible for admins to select a target for the "clear system" objective
+2023-10-20:
+  Bokkiewokkie:
+  - rscadd: Added light fighter plushie
+  - rscadd: Added heavy fighter plushie
+  - rscadd: Added sabre plushie
+  - rscadd: Added mining sabre plushie
+2023-10-27:
+  Bobbanz1:
+  - bugfix: Fixes the issue where small crafts such as Sabres, dropships and ghost
+      ships were showing non-existing armour quadrants!
+  someone543:
+  - imageadd: added back MP start landmark icon

html/changelogs/AutoChangeLog-pr-2545.yml

@@ -0,0 +1,4 @@
+author: covertcorvid
+delete-after: true
+changes:
+  - bugfix: fixed window damage overlay

html/changelogs/AutoChangeLog-pr-2561.yml

@@ -0,0 +1,5 @@
+author: DuskLight9978
+delete-after: true
+changes:
+  - rscadd: Added dock pay smite
+  - admin: new dock pay smite

html/changelogs/AutoChangeLog-pr-2562.yml

@@ -0,0 +1,5 @@
+author: covertcorvid
+delete-after: true
+changes:
+  - bugfix: Fixed a runtime in the power generation objective when there is no storm
+      drive or AGCNR

html/changelogs/AutoChangeLog-pr-2564.yml

@@ -0,0 +1,6 @@
+author: Harranhall
+delete-after: true
+changes:
+  - rscadd: Added a vignette that appears momentarily when your laws are changed as
+      AI.
+  - imageadd: added the "law_change" fullscreen vignette.

html/changelogs/AutoChangeLog-pr-2565.yml

@@ -0,0 +1,4 @@
+author: someone543
+delete-after: true
+changes:
+  - rscadd: Added Flight Lead fighter colorizer

html/changelogs/AutoChangeLog-pr-2568.yml

@@ -0,0 +1,5 @@
+author: someone543
+delete-after: true
+changes:
+  - bugfix: Ammo sorters on snake now start linked
+  - bugfix: Prevents a failsafe from triggering every time the snake is loaded

nsv13.dme

@@ -3813,12 +3813,14 @@
 #include "nsv13\code\game\objects\items\custom_items.dm"
 #include "nsv13\code\game\objects\items\custom_materials.dm"
 #include "nsv13\code\game\objects\items\munitions_items.dm"
+#include "nsv13\code\game\objects\items\nsv13_plushes.dm"
 #include "nsv13\code\game\objects\items\nsv_candle.dm"
 #include "nsv13\code\game\objects\items\nsv_circuitboards.dm"
 #include "nsv13\code\game\objects\items\RCD.dm"
 #include "nsv13\code\game\objects\items\religion.dm"
 #include "nsv13\code\game\objects\items\space_pirate_items.dm"
 #include "nsv13\code\game\objects\items\storage_items.dm"
+#include "nsv13\code\game\objects\items\colorizers\fighters.dm"
 #include "nsv13\code\game\objects\items\devices\radio\gulagpack.dm"
 #include "nsv13\code\game\objects\items\robot\hypo.dm"
 #include "nsv13\code\game\objects\items\stacks\tiles\tile_types.dm"
@@ -3854,6 +3856,7 @@
 #include "nsv13\code\modules\cargo\exports\engineering.dm"
 #include "nsv13\code\modules\cargo\exports\syndie.dm"
 #include "nsv13\code\modules\client\zoom.dm"
+#include "nsv13\code\modules\client\loadout\loadout_colorizers.dm"
 #include "nsv13\code\modules\client\loadout\loadout_donator.dm"
 #include "nsv13\code\modules\client\loadout\loadout_general.dm"
 #include "nsv13\code\modules\client\loadout\loadout_uniform.dm"

nsv13/code/game/machinery/computer/tactical.dm

@@ -78,6 +78,14 @@
 	data["flakrange"] = linked.get_flak_range(linked.last_target)
 	data["integrity"] = linked.obj_integrity
 	data["max_integrity"] = linked.max_integrity
+	if(istype(linked, /obj/structure/overmap/small_craft))
+		var/obj/structure/overmap/small_craft/small_ship = linked
+		var/obj/item/fighter_component/armour_plating/A = small_ship.loadout.get_slot(HARDPOINT_SLOT_ARMOUR)
+		data["has_quadrant"] = FALSE
+		data["armour_integrity"] = (A) ? A.obj_integrity : 0
+		data["max_armour_integrity"] = (A) ? A.max_integrity : 100
+	else
+		data["has_quadrant"] = TRUE
 	data["quadrant_fs_armour_current"] = linked.armour_quadrants["forward_starboard"]["current_armour"]
 	data["quadrant_fs_armour_max"] = linked.armour_quadrants["forward_starboard"]["max_armour"]
 	data["quadrant_as_armour_current"] = linked.armour_quadrants["aft_starboard"]["current_armour"]
@@ -157,6 +165,14 @@
 	data["flakrange"] = linked.get_flak_range(linked.last_target)
 	data["integrity"] = linked.obj_integrity
 	data["max_integrity"] = linked.max_integrity
+	if(istype(linked, /obj/structure/overmap/small_craft))
+		var/obj/structure/overmap/small_craft/small_ship = linked
+		var/obj/item/fighter_component/armour_plating/A = small_ship.loadout.get_slot(HARDPOINT_SLOT_ARMOUR)
+		data["has_quadrant"] = FALSE
+		data["armour_integrity"] = (A) ? A.obj_integrity : 0
+		data["max_armour_integrity"] = (A) ? A.max_integrity : 100
+	else
+		data["has_quadrant"] = TRUE // I'm uncertain about whether or not we have ANY small crafts that have armor quadrants so I'm making it like this instead.
 	data["quadrant_fs_armour_current"] = linked.armour_quadrants["forward_starboard"]["current_armour"]
 	data["quadrant_fs_armour_max"] = linked.armour_quadrants["forward_starboard"]["max_armour"]
 	data["quadrant_as_armour_current"] = linked.armour_quadrants["aft_starboard"]["current_armour"]

nsv13/code/game/objects/items/colorizers/fighters.dm

@@ -0,0 +1,5 @@
+/obj/item/colorizer/fighterace
+    name = "Su-818 Rapier Colorizer (Flight Lead)"
+    desc = "This colorizer will apply a new livery to a light fighter. Upgraded parts are not included."
+    allowed_targets = list(/obj/structure/overmap/small_craft/combat/light)
+    apply_icon_state = "ace"

nsv13/code/game/objects/items/nsv13_plushes.dm

@@ -1,3 +1,4 @@
+/* This file was unticked before so I just commented this out
 /obj/item/toy/plush/random
 	name = "\improper Random Plush"
 	icon_state = "debug"
@@ -7,3 +8,32 @@
 	var/plush_type = pick(subtypesof(/obj/item/toy/plush/) - /obj/item/toy/plush/random/)
 	new plush_type(loc)
 	return INITIALIZE_HINT_QDEL
+*/
+/obj/item/toy/plush/hfighter
+	name = "heavy fighter plush"
+	desc = "An adorable stuffed toy shaped like a Su-410 Scimitar heavy fighter."
+	icon = 'nsv13/icons/obj/custom_plushes.dmi'
+	icon_state = "heavyfighter"
+	attack_verb = list("bombed", "bumped", "rammed", "torpedoed")
+	squeak_override = list('nsv13/sound/effects/fighters/BRRTTTTTT.ogg'=1)
+
+/obj/item/toy/plush/lfighter
+	name = "light fighter plush"
+	desc = "An adorable stuffed toy shaped like a Su-818 Rapier light fighter."
+	icon = 'nsv13/icons/obj/custom_plushes.dmi'
+	icon_state = "lightfighter"
+	attack_verb = list("bumped", "rammed", "missiled")
+	squeak_override = list('nsv13/sound/effects/fighters/autocannon.ogg'=1)
+
+/obj/item/toy/plush/transport
+	name = "utility craft plush"
+	desc = "An adorable stuffed toy shaped like a Su-437 Sabre utility vessel."
+	icon = 'nsv13/icons/obj/custom_plushes.dmi'
+	icon_state = "transport"
+	attack_verb = list("bumped", "rammed")
+	squeak_override = list('nsv13/sound/effects/fighters/warmup.ogg'=1)
+
+/obj/item/toy/plush/transport/mining
+	name = "mining craft plush"
+	desc = "An adorable stuffed toy shaped like a Su-437 Sabre mining vessel."
+	icon_state = "mining"

nsv13/code/game/turfs/legacy_smooth.dm

@@ -42,6 +42,8 @@
 /obj/structure/window/legacy_smooth()
 	//A little cludge here, since I don't know how it will work with slim windows. Most likely VERY wrong.
 	//this way it will only update full-tile ones
+	if(QDELETED(src))
+		return
 	. = ..()
 	if(!can_visually_connect())
 		icon_state = initial(icon_state)
@@ -59,6 +61,16 @@
 			I = image(icon, "[basestate][connections[i]]", dir = 1<<(i-1))
 		overlays += I
 
+	if(!fulltile)
+		return
+	var/ratio = obj_integrity / max_integrity
+	ratio = CEILING(ratio*4, 1) * 25
+	cut_overlay(crack_overlay)
+	if(ratio > 75)
+		return
+	crack_overlay = mutable_appearance('icons/obj/structures.dmi', "damage[ratio]", (layer+0.1)) //NSV13 - made layer in front of windows
+	add_overlay(crack_overlay)
+
 /obj/structure/window/proc/can_visually_connect_to(obj/structure/S)
 	return istype(S, src)
 

nsv13/code/modules/client/loadout/loadout_colorizers.dm

@@ -0,0 +1,5 @@
+/datum/gear/colorizer/fighterace
+    display_name = "Su-818 Rapier Colorizer (Flight Lead)"
+    path = /obj/item/colorizer/fighterace
+    allowed_roles = list(JOB_NAME_PILOT)
+    cost = 10000