diff --git a/code/controllers/subsystem/security_level.dm b/code/controllers/subsystem/security_level.dm index 94fa822e8b..7e88118761 100644 --- a/code/controllers/subsystem/security_level.dm +++ b/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) diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm index ce1796346a..e26a19d3f0 100644 --- a/code/datums/traits/_quirk.dm +++ b/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) diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 5a2ece4dda..e918cf9507 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/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." diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index f5d64b101a..77cf04cbf7 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/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, "You have been assigned to [department]!") + to_chat(H, "You have been assigned to [department]!") else - to_chat(M, "You have not been assigned to any department. Patrol the halls and help where needed.") - - + to_chat(H, "You have not been assigned to any department. Patrol the halls and help where needed.") /datum/outfit/job/security name = "Security Officer" diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 376a253379..dc23a64d3d 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/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) diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index e1a5b69d72..f60ea76015 100644 --- a/code/modules/vending/wardrobes.dm +++ b/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 diff --git a/html/changelogs/AutoChangeLog-pr-15801.yml b/html/changelogs/AutoChangeLog-pr-15801.yml deleted file mode 100644 index ac72ffcc59..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15801.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Linzolle" -delete-after: True -changes: - - bugfix: "suiciding with a stamina projectile now actually works instead of doing literally nothing" diff --git a/html/changelogs/AutoChangeLog-pr-15809.yml b/html/changelogs/AutoChangeLog-pr-15809.yml new file mode 100644 index 0000000000..04d3400f3b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15809.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - rscadd: "hyper slutskirt and secukini" diff --git a/html/changelogs/archive/2022-08.yml b/html/changelogs/archive/2022-08.yml index 168654e763..83cfe7084d 100644 --- a/html/changelogs/archive/2022-08.yml +++ b/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 diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index ca3aa9be73..e4d932c860 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index 32018b117a..753ed9a4a2 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi index 12b12301d9..b274dd090e 100644 Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 77c1f1211e..bb44a20647 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ