diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index 73615b12168..671db1f07d6 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -228,6 +228,75 @@ path = /obj/item/clothing/suit/storage/suragi_jacket/janitor allowed_roles = list("Janitor") +/datum/gear/suit/suragi_jacket/cor + display_name = "Suragi Jacket - Coroner" + path = /obj/item/clothing/suit/storage/suragi_jacket/cor + allowed_roles = list("Coroner") + +/datum/gear/suit/suragi_jacket/mech + display_name = "Suragi Jacket - Mechanic" + path = /obj/item/clothing/suit/storage/suragi_jacket/mech + allowed_roles = list("Mechanic") + +/datum/gear/suit/suragi_jacket/paramed + display_name = "Suragi Jacket - Paramedic" + path = /obj/item/clothing/suit/storage/suragi_jacket/paramed + allowed_roles = list("Paramedic") + +/datum/gear/suit/suragi_jacket/dec + display_name = "Suragi Jacket - Detective" + path = /obj/item/clothing/suit/storage/suragi_jacket/dec + allowed_roles = list("Detective") + +/datum/gear/suit/suragi_jacket/miner + display_name = "Suragi Jacket - Miner" + path = /obj/item/clothing/suit/storage/suragi_jacket/miner + allowed_roles = list("Shaft Miner") + +/datum/gear/suit/suragi_jacket/clown + display_name = "Suragi Jacket - Funny and Colourful" + path = /obj/item/clothing/suit/storage/suragi_jacket/clown + allowed_roles = list("Clown") + +/datum/gear/suit/suragi_jacket/mime + display_name = "Suragi Jacket - Sad and Monochrome" + path = /obj/item/clothing/suit/storage/suragi_jacket/mime + allowed_roles = list("Mime") + +/datum/gear/suit/suragi_jacket/capt + display_name = "Suragi Jacket - Captain" + path = /obj/item/clothing/suit/storage/suragi_jacket/capt + allowed_roles = list("Captain") + +/datum/gear/suit/suragi_jacket/hop + display_name = "Suragi Jacket - Head of Personnel" + path = /obj/item/clothing/suit/storage/suragi_jacket/hop + allowed_roles = list("Head of Personnel") + +/datum/gear/suit/suragi_jacket/huesos + display_name = "Suragi Jacket - Head of Security" + path = /obj/item/clothing/suit/storage/suragi_jacket/huesos + allowed_roles = list("Head of Security") + +/datum/gear/suit/suragi_jacket/qm + display_name = "Suragi Jacket - Quartermaster" + path = /obj/item/clothing/suit/storage/suragi_jacket/qm + allowed_roles = list("Quartermaster") + +/datum/gear/suit/suragi_jacket/rd + display_name = "Suragi Jacket - Research Director" + path = /obj/item/clothing/suit/storage/suragi_jacket/rd + allowed_roles = list("Research Director") + +/datum/gear/suit/suragi_jacket/ce + display_name = "Suragi Jacket - Chief Engineer" + path = /obj/item/clothing/suit/storage/suragi_jacket/ce + allowed_roles = list("Chief Engineer") + +/datum/gear/suit/suragi_jacket/cmo + display_name = "Suragi Jacket - Chief Medical Officer" + path = /obj/item/clothing/suit/storage/suragi_jacket/cmo + allowed_roles = list("Chief Medical Officer") /datum/gear/suit/ianshirt display_name = "Ian Shirt" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 86d3fe02882..e061a444f37 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -1214,6 +1214,17 @@ blood_overlay_type = "" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter,/obj/item/gun/projectile/automatic/pistol,/obj/item/gun/projectile/revolver,/obj/item/gun/projectile/revolver/detective) + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Monkey" = 'icons/mob/clothing/species/monkey/suit.dmi', + "Farwa" = 'icons/mob/clothing/species/monkey/suit.dmi', + "Wolpin" = 'icons/mob/clothing/species/monkey/suit.dmi', + "Neara" = 'icons/mob/clothing/species/monkey/suit.dmi', + "Stok" = 'icons/mob/clothing/species/monkey/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Plasmaman" = 'icons/mob/clothing/species/plasmaman/suit.dmi' + ) // Suragi Children /obj/item/clothing/suit/storage/suragi_jacket/civ @@ -1330,6 +1341,123 @@ item_state = "suragi_jacket_jan" armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 3, "rad" = 0, "fire" = 0, "acid" = 3) allowed = list(/obj/item/soap, /obj/item/reagent_containers/spray/cleaner, /obj/item/storage/bag/trash, /obj/item/lightreplacer) + +/obj/item/clothing/suit/storage/suragi_jacket/cor + desc = "Standard issue black jacket manufactured by Suragi Kit. Extremely durable and easy to clean. Endless swarm of souls gaze upon you from the pitch black void of space. The ferryman has arrived." + name = "Coroner Suragi Jacket" + icon_state = "suragi_jacket_cor" + item_state = "suragi_jacket_cor" + allowed = list(/obj/item/analyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, + /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/stack/medical, /obj/item/paper, /obj/item/rad_laser) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 5, "rad" = 0, "fire" = 0, "acid" = 5) + +/obj/item/clothing/suit/storage/suragi_jacket/mech + desc = "Standard issue brown and gold jacket manufactured by Suragi Kit. Extremely durable. Reeks of oil and rust." + name = "Mechanic Suragi Jacket" + icon_state = "suragi_jacket_mech" + item_state = "suragi_jacket_mech" + allowed = list (/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/rcd, /obj/item/rpd, /obj/item/holosign_creator/atmos) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 5, "bomb" = 5, "bio" = 0, "rad" = 5, "fire" = 5, "acid" = 0) + +/obj/item/clothing/suit/storage/suragi_jacket/paramed + desc = "Standard issue dark blue jacket manufactured by Suragi Kit. Extremely durable and easy to clean. The angel has arrived. The thrumpets are singing from the skies. Ah, no. Just an ambulance siren." + name = "Paramedic Suragi Jacket" + icon_state = "suragi_jacket_paramed" + item_state = "suragi_jacket_paramed" + allowed = list(/obj/item/analyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, + /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/stack/medical, /obj/item/paper, /obj/item/rad_laser) + armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 5, "rad" = 0, "fire" = 0, "acid" = 0) + +/obj/item/clothing/suit/storage/suragi_jacket/dec + desc = "Standard issue brown jacket manufactured by Suragi Kit. Extremely durable. Very slick. Look at the world through noir. Listen to blues. Drink some whiskey. Smoke a cigar. Find the culprit." + name = "Detective Suragi Jacket" + icon_state = "suragi_jacket_dec" + item_state = "suragi_jacket_dec" + allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/flashlight/seclite,/obj/item/melee/classic_baton/telescopic,/obj/item/kitchen/knife/combat) + armor = list("melee" = 0, "bullet" = 5, "laser" = 0,"energy" = 0, "bomb" = 2, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + +/obj/item/clothing/suit/storage/suragi_jacket/miner + desc = "Standard issue dark green jacket manufactured by Suragi Kit. Extremely durable. Perfect for slaying hellish titans, mining gems, looting chests and swimming in lava." + name = "Miner Suragi Jacket" + icon_state = "suragi_jacket_miner" + item_state = "suragi_jacket_miner" + allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/kinetic_crusher, /obj/item/hierophant_club, /obj/item/twohanded/fireaxe/boneaxe) + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 3, "acid" = 0) + +/obj/item/clothing/suit/storage/suragi_jacket/clown + desc = "Special issue funky jacket manufactured by Suragi Kit. Extremely funny. Probably belongs to a Captain or Head of Personnel." + name = "Colourful and funny Suragi Jacket" + icon_state = "suragi_jacket_clown" + item_state = "suragi_jacket_clown" + allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/flashlight/seclite,/obj/item/melee/classic_baton/telescopic,/obj/item/kitchen/knife/combat) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 7, "bio" = 0, "rad" = 0, "fire" = 4, "acid" = 0) + +/obj/item/clothing/suit/storage/suragi_jacket/mime + desc = "Special issue monochrome manufactured by Suragi Kit. Extremely depressive. Le chef des forces de securite se prend un baton dans le cul." + name = "Monochrome and sad Suragi Jacket" + icon_state = "suragi_jacket_mime" + item_state = "suragi_jacket_mime" + allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/flashlight/seclite,/obj/item/melee/classic_baton/telescopic,/obj/item/kitchen/knife/combat) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 0, "acid" = 0) + +/obj/item/clothing/suit/storage/suragi_jacket/capt + desc = "Premium issue blue and gold jacket manufactured by Suragi Kit. Maximum style, Unlimited authority." + name = "Captain Suragi Jacket" + icon_state = "suragi_jacket_capt" + item_state = "suragi_jacket_capt" + allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/flashlight/seclite,/obj/item/melee/classic_baton/telescopic,/obj/item/kitchen/knife/combat) + armor = list("melee" = 7, "bullet" = 2, "laser" = 2,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + +/obj/item/clothing/suit/storage/suragi_jacket/hop + desc = "Premium issue blue and red jacket manufactured by Suragi Kit. Incompetence. Mediocrity. Conscripts." + name = "Head of Personnel Suragi Jacket" + icon_state = "suragi_jacket_hop" + item_state = "suragi_jacket_hop" + allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen) + armor = list("melee" = 0, "bullet" = 5, "laser" = 0,"energy" = 0, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + +/obj/item/clothing/suit/storage/suragi_jacket/huesos + desc = "Premium issue black jacket manufactured by Suragi Kit. Extremely durable. The ground trembles with my every step. I am the judge, the jury, the executioner." + name = "Head of Security Suragi Jacket" + icon_state = "suragi_jacket_huesos" + item_state = "suragi_jacket_huesos" + allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic) + armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + +/obj/item/clothing/suit/storage/suragi_jacket/qm + desc = "Premium issue black jacket manufactured by Suragi Kit. Extremely durable. There is nothing points can't buy. Except this jacket. It is priceless." + name = "Quartermeister Suragi Jacket" + icon_state = "suragi_jacket_qm" + item_state = "suragi_jacket_qm" + allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/clothing/mask/cigarette, /obj/item/lighter, /obj/item/rcs, /obj/item/stack/packageWrap, /obj/item/stack/wrapping_paper, /obj/item/destTagger, /obj/item/pen, /obj/item/paper, /obj/item/stamp) + armor = list("melee" = 7, "bullet" = 2, "laser" = 2,"energy" = 0, "bomb" = 2, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) + +/obj/item/clothing/suit/storage/suragi_jacket/rd + desc = "Premium issue black and purple jacket manufactured by Suragi Kit. Extremely durable. Massive anomaly detected on long range scanners. Expected location: my crotch." + name = "Research Director Suragi Jacket" + icon_state = "suragi_jacket_rd" + item_state = "suragi_jacket_rd" + allowed = list(/obj/item/analyzer, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/applicator, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper, + /obj/item/stack/medical,/obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/reagent_containers/food/pill, /obj/item/rad_laser) + armor = list("melee" = 2, "bullet" = 2, "laser" = 2, "energy" = 2, "bomb" = 2, "bio" = 2, "rad" = 2, "fire" = 2, "acid" = 2) + +/obj/item/clothing/suit/storage/suragi_jacket/ce + desc = "Premium issue white and black jacket manufactured by Suragi Kit. Extremely durable. Instead of regular reflective stripes there is a thin coating of supermatter dust. And some feathers in the sleeves?.." + name = "Chief Engineer Suragi Jacket" + icon_state = "suragi_jacket_ce" + item_state = "suragi_jacket_ce" + allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/rcd, /obj/item/rpd, /obj/item/holosign_creator/atmos) + armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 5, "fire" = 5, "acid" = 0) + +/obj/item/clothing/suit/storage/suragi_jacket/cmo + desc = "Premium issue cyan jacket anufactured by Suragi Kit. Extremely durable and easy to clean. Countless lives are crippled. Endless minds are broken. And i am the cure." + name = "Chief Medical Officer Suragi Jacket" + icon_state = "suragi_jacket_cmo" + item_state = "suragi_jacket_cmo" + allowed = list(/obj/item/analyzer, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/applicator, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper, + /obj/item/stack/medical,/obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/reagent_containers/food/pill, /obj/item/rad_laser) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 5, "rad" = 0, "fire" = 0, "acid" = 5) + // Suragi end /obj/item/clothing/suit/mr_chang_coat diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi index 5e9ef5f7f5e..b8c051ce7b2 100644 Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index cd01acb00a2..b5f9c9a526d 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ diff --git a/icons/mob/clothing/species/monkey/suit.dmi b/icons/mob/clothing/species/monkey/suit.dmi index 1907f97163c..13e8b53eb5e 100644 Binary files a/icons/mob/clothing/species/monkey/suit.dmi and b/icons/mob/clothing/species/monkey/suit.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/suit.dmi b/icons/mob/clothing/species/plasmaman/suit.dmi new file mode 100644 index 00000000000..fcc34f4b11f Binary files /dev/null and b/icons/mob/clothing/species/plasmaman/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 60ea6cc443c..2543cc03cb6 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 2a223322dda..8c284d4ccdb 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 35911416574..aa8fa87e4be 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ