diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 0f889adf366..140d91368ca 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -754,6 +754,23 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "europazippo" flame_light_power = 1 +/obj/item/flame/lighter/zippo/gadpathur + name = "\improper Gadpathurian Zippo lighter" + desc = "A zippo lighter with a depiction of the flag of the United Planetary Defense Council of Gadpathur. The nozzle seems to be especially small in order to produce a weaker and dimmer flame." + desc_fluff = "Owing to the relative poverty of Gadpathur and the ever-present need for gasmasks, smoking is a rare habit on the planet. Still, Gadpathurians who choose to smoke typically keep lighters with smaller nozzles, both to reduce light and thus attention in the confines of a bunker and to conserve on fuel which too is hoarded for their endless war preparations. The Gadpathurian flag emblazoned on the side of the lighter is not a common feature, with most Gadpathurians who stay on the planet preferring to place a symbol of their cadre in its stead." + icon_state = "gadpathurzippo" + item_state = "gadpathurzippo" + flame_light_power = 1 + +/obj/item/flame/lighter/zippo/asoral + name = "\improper Asoral jet lighter" + desc = "A thin lighter made from a heat-resistant polymer and a nozzle that wouldn't be out of place on a jet. While it might bear the logo of the Asoral Orbital and Suborbital Racing network on it, it utilizes advanced fuel from Xanu Prime which burns hotter, causing a blue flame." + desc_fluff = "The Asoral jet lighter began as a publicity stunt by a few intrepid engineers looking to recycle old and underperforming racing probe engines. Although that particular plan ended in disaster, the Asoral Racing network ended up loving the concept and adopting a smaller and safer version of the lighter as a form of advertising. In a pinch, lighters such as these are known to serve as replacement igniters for racers' engines. Until recently, they were produced with a plume similar to that of an afterburner before the merger of Crosk's racing networks with those of Xanu Prime." + icon_state = "lighter-asoral" + item_state = "lighter-asoral" + flame_light_color = LIGHT_COLOR_BLUE + flame_light_range = 2 + /obj/item/flame/lighter/random/Initialize() . = ..() icon_state = "lighter-[pick("r","c","y","g")]" diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index 6670f9f47f3..b05d24a5ad2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -21,6 +21,8 @@ zippolighters["bieselite zippo"] = /obj/item/flame/lighter/zippo/tcfl zippolighters["himeo zippo"] = /obj/item/flame/lighter/zippo/himeo zippolighters["europan zippo"] = /obj/item/flame/lighter/zippo/europa + zippolighters["gadpathurian zippo"] = /obj/item/flame/lighter/zippo/gadpathur + zippolighters["asoral jet lighter"] = /obj/item/flame/lighter/zippo/asoral gear_tweaks += new/datum/gear_tweak/path(zippolighters) /datum/gear/smoking/lighter diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 1988e4e2d5f..3dd9454760e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -85,6 +85,7 @@ suits["shiny black suit"] = /obj/item/clothing/under/lawyer/black suits["tan suit"] = /obj/item/clothing/under/suit_jacket/tan suits["white suit"] = /obj/item/clothing/under/suit_jacket/white + suits["nt skirtsuit"] = /obj/item/clothing/under/suit_jacket/nt_skirtsuit gear_tweaks += new/datum/gear_tweak/path(suits) /datum/gear/uniform/scrubs diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 34717f8b76a..b51d67853f9 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -189,6 +189,14 @@ item_state = "r_suit" worn_state = "red_suit" +/obj/item/clothing/under/suit_jacket/nt_skirtsuit + name = "nanotrasen skirtsuit" + desc = "A black coat with an NT blue kerchief accompanied by a swept skirt with a tasteful blue stripe. Works for every occasion." + icon_state = "nt_skirtsuit" + item_state = "bl_suit" + worn_state = "nt_skirtsuit" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + /obj/item/clothing/under/kilt name = "kilt" desc = "Includes shoes and plaid" diff --git a/html/changelogs/stryker-loadout4.yml b/html/changelogs/stryker-loadout4.yml new file mode 100644 index 00000000000..d7974bfddbf --- /dev/null +++ b/html/changelogs/stryker-loadout4.yml @@ -0,0 +1,5 @@ +author: The Stryker +delete-after: True +changes: + - rscadd: "Adds a swept NanoTrasen skirt suit to the loadout under suit selection." + - rscadd: "Adds two new lighters to the zippo collection: Gadpathur and Asoral." diff --git a/icons/mob/items/lefthand_cigs_lighters.dmi b/icons/mob/items/lefthand_cigs_lighters.dmi index 941e5a91e51..ad304898999 100644 Binary files a/icons/mob/items/lefthand_cigs_lighters.dmi and b/icons/mob/items/lefthand_cigs_lighters.dmi differ diff --git a/icons/mob/items/righthand_cigs_lighters.dmi b/icons/mob/items/righthand_cigs_lighters.dmi index c02d441a9fa..031047bcab6 100644 Binary files a/icons/mob/items/righthand_cigs_lighters.dmi and b/icons/mob/items/righthand_cigs_lighters.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 0478d353df8..7804ac5809b 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi index 994e636ef4a..f11cc43b8ce 100644 Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 3d4c65f3454..89e050c8d2c 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ