Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into empty-find-lint

code/controllers/subsystem/security_level.dm

@@ -14,7 +14,7 @@ SUBSYSTEM_DEF(security_level)
  */
 /datum/controller/subsystem/security_level/proc/set_level(new_level)
 	if(!isnum(new_level))
-		new_level = GLOB.all_security_levels.Find()
+		new_level = SECLEVEL2NUM(new_level)
 
 	//Will not be announced if you try to set to the same level as it already is
 	if(new_level >= SEC_LEVEL_GREEN && new_level <= SEC_LEVEL_DELTA && new_level != GLOB.security_level)

code/datums/traits/_quirk.dm

@@ -22,7 +22,8 @@
 		return
 	quirk_holder = quirk_mob
 	SSquirks.quirk_objects += src
-	to_chat(quirk_holder, gain_text)
+	if(gain_text)
+		to_chat(quirk_holder, gain_text)
 	quirk_holder.roundstart_quirks += src
 	if(mob_trait)
 		ADD_TRAIT(quirk_holder, mob_trait, ROUNDSTART_TRAIT)
@@ -41,7 +42,8 @@
 		STOP_PROCESSING(SSquirks, src)
 	remove()
 	if(quirk_holder)
-		to_chat(quirk_holder, lose_text)
+		if(lose_text)
+			to_chat(quirk_holder, lose_text)
 		quirk_holder.roundstart_quirks -= src
 		if(mob_trait)
 			REMOVE_TRAIT(quirk_holder, mob_trait, ROUNDSTART_TRAIT)

code/modules/clothing/under/jobs/security.dm

@@ -40,10 +40,19 @@
 	icon_state = "secskirt"
 	item_state = "r_suit"
 	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE //you know now that i think of it if you adjust the skirt and the sprite disappears isn't that just like flashing everyone
+	alt_covers_chest = TRUE
 	fitted = FEMALE_UNIFORM_TOP
 	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
 
+/obj/item/clothing/under/rank/security/stripper
+	name = "secukini"
+	icon_state = "secukini"
+	item_state = "secukini"
+	armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, WOUND = 0) //exchange powergame in order to be a whore what are you going to do about it
+	body_parts_covered = CHEST|GROIN
+	can_adjust = FALSE
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+
 /obj/item/clothing/under/rank/security/officer/formal
 	name = "security officer's formal uniform"
 	desc = "The latest in fashionable security outfits."

code/modules/jobs/job_types/security_officer.dm

@@ -35,12 +35,15 @@
 
 GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY))
 
-/datum/job/officer/after_spawn(mob/living/carbon/human/H, mob/M)
+/datum/job/officer/after_spawn(mob/living/spawned, client/player_client, latejoin = FALSE)
 	. = ..()
+	if(!ishuman(spawned))
+		return
+	var/mob/living/carbon/human/H = spawned
 	// Assign department security
 	var/department
-	if(M && M.client && M.client.prefs)
-		department = M.client.prefs.prefered_security_department
+	if(player_client?.prefs)
+		department = player_client.prefs.prefered_security_department
 		if(!LAZYLEN(GLOB.available_depts) || department == "None")
 			return
 		else if(department in GLOB.available_depts)
@@ -108,11 +111,9 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
 				else
 					break
 	if(department)
-		to_chat(M, "<b>You have been assigned to [department]!</b>")
+		to_chat(H, "<b>You have been assigned to [department]!</b>")
 	else
-		to_chat(M, "<b>You have not been assigned to any department. Patrol the halls and help where needed.</b>")
-
-
+		to_chat(H, "<b>You have not been assigned to any department. Patrol the halls and help where needed.</b>")
 
 /datum/outfit/job/security
 	name = "Security Officer"

code/modules/shuttle/shuttle.dm

@@ -891,7 +891,7 @@
 	var/range = (engine_coeff * max(width, height))
 	var/long_range = range * 2.5
 	var/atom/distant_source
-	if(engine_list[1])
+	if(length(engine_list))
 		distant_source = engine_list[1]
 	else
 		for(var/A in areas)

code/modules/vending/wardrobes.dm

@@ -32,6 +32,7 @@
 					/obj/item/clothing/suit/toggle/labcoat/depjacket/sec = 5,
 					/obj/item/clothing/under/rank/security/officer/util = 5,
 					/obj/item/clothing/under/rank/security/officer/blueshirt/seccorp = 5)
+	contraband = list(/obj/item/clothing/under/rank/security/stripper = 5)
 	premium = list(/obj/item/clothing/under/rank/security/officer/formal = 5,
 					/obj/item/clothing/head/beret/sec/navyofficer = 5)
 	refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe

html/changelogs/AutoChangeLog-pr-15801.yml

@@ -1,4 +0,0 @@
-author: "Linzolle"
-delete-after: True
-changes: 
-  - bugfix: "suiciding with a stamina projectile now actually works instead of doing literally nothing"

html/changelogs/AutoChangeLog-pr-15809.yml

@@ -0,0 +1,4 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes: 
+  - rscadd: "hyper slutskirt and secukini"

html/changelogs/archive/2022-08.yml

@@ -144,3 +144,11 @@
   zeroisthebiggay:
   - rscadd: Added polychromatic workout shorts to the loadout and to the clothesmate
       vendors for various workout procedures.
+2022-08-23:
+  Linzolle:
+  - bugfix: suiciding with a stamina projectile now actually works instead of doing
+      literally nothing
+  Putnam3145:
+  - bugfix: security levels work now
+  TrojanCoyote:
+  - tweak: slight change to sprite