cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Yet another Christasmurf bomber jacket PR (dmi split) (#25684)

Browse Source 
* dmisplit

* stinky new instance

* Apply suggestions from code review

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
Christasmurf
2024-06-12 19:18:43 +01:00
committed by GitHub
parent a58d766f72
commit c84349aab3
24 changed files with 187 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/loadout/loadout_suit.dm
+13 -13
View File
@@ -85,7 +85,7 @@
/datum/gear/suit/bomber/basic
display_name = "Bomber jacket"
path = /obj/item/clothing/suit/jacket
path = /obj/item/clothing/suit/jacket/bomber
/datum/gear/suit/bomber/job
main_typepath = /datum/gear/suit/bomber/job
@@ -93,62 +93,62 @@
/datum/gear/suit/bomber/job/sec
display_name = "Bomber jacket, security"
path = /obj/item/clothing/suit/jacket/secbomber
path = /obj/item/clothing/suit/jacket/bomber/sec
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/suit/bomber/job/cargo
display_name = "Bomber jacket, cargo"
path = /obj/item/clothing/suit/jacket/cargobomber
path = /obj/item/clothing/suit/jacket/bomber/cargo
allowed_roles = list("Quartermaster", "Cargo Technician")
/datum/gear/suit/bomber/job/miner
display_name = "Bomber jacket, mining"
path = /obj/item/clothing/suit/jacket/miningbomber
path = /obj/item/clothing/suit/jacket/bomber/mining
allowed_roles = list("Quartermaster", "Shaft Miner")
/datum/gear/suit/bomber/job/expedition
display_name = "Bomber jacket, expedition"
path = /obj/item/clothing/suit/jacket/expeditionbomber
path = /obj/item/clothing/suit/jacket/bomber/expedition
allowed_roles = list("Quartermaster", "Explorer")
/datum/gear/suit/bomber/job/engi
display_name = "Bomber jacket, engineering"
path = /obj/item/clothing/suit/jacket/engibomber
path = /obj/item/clothing/suit/jacket/bomber/engi
allowed_roles = list("Chief Engineer", "Station Engineer")
/datum/gear/suit/bomber/job/atmos
display_name = "Bomber jacket, atmospherics"
path = /obj/item/clothing/suit/jacket/atmosbomber
path = /obj/item/clothing/suit/jacket/bomber/atmos
allowed_roles = list("Chief Engineer", "Life Support Specialist")
/datum/gear/suit/bomber/job/hydro
display_name = "Bomber jacket, hydroponics"
path = /obj/item/clothing/suit/jacket/hydrobomber
path = /obj/item/clothing/suit/jacket/bomber/hydro
allowed_roles = list("Botanist")
/datum/gear/suit/bomber/job/medical
display_name = "Bomber jacket, medical"
path = /obj/item/clothing/suit/jacket/medbomber
path = /obj/item/clothing/suit/jacket/bomber/med
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner")
/datum/gear/suit/bomber/job/chemist
display_name = "Bomber jacket, chemist"
path = /obj/item/clothing/suit/jacket/chembomber
path = /obj/item/clothing/suit/jacket/bomber/chem
allowed_roles = list("Chemist")
/datum/gear/suit/bomber/job/coroner
display_name = "Bomber jacket, coroner"
path = /obj/item/clothing/suit/jacket/coronerbomber
path = /obj/item/clothing/suit/jacket/bomber/coroner
allowed_roles = list("Coroner")
/datum/gear/suit/bomber/job/science
display_name = "Bomber jacket, science"
path = /obj/item/clothing/suit/jacket/scibomber
path = /obj/item/clothing/suit/jacket/bomber/sci
allowed_roles = list("Research Director", "Scientist")
/datum/gear/suit/bomber/job/robotics
display_name = "Bomber jacket, robotics"
path = /obj/item/clothing/suit/jacket/robobomber
path = /obj/item/clothing/suit/jacket/bomber/robo
allowed_roles = list("Research Director", "Roboticist")
//JACKETS
code/modules/clothing/suits/misc_suits.dm
+136 -120
View File
@@ -840,11 +840,10 @@
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 50, ACID = 50)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
//Basic jacket and subtypes
/obj/item/clothing/suit/jacket
name = "bomber jacket"
desc = "Aviators not included."
icon_state = "bomber"
item_state = "bomber"
name = "jacket"
desc = "Basic jacket item, should not be seen in game."
ignore_suitadjust = FALSE
allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -853,13 +852,6 @@
actions_types = list(/datum/action/item_action/zipper)
adjust_flavour = "unzip"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi'
)
/obj/item/clothing/suit/jacket/varsity
name = "varsity jacket"
desc = "Stylish jacket for young and invincible."
@@ -904,115 +896,6 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
)
/obj/item/clothing/suit/jacket/syndicatebomber
name = "suspicious bomber jacket"
desc = "A suspicious but extremely stylish jacket."
icon_state = "bombersyndie"
item_state = "bombersyndie"
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, /obj/item/melee/classic_baton/telescopic/contractor, /obj/item/kitchen/knife/combat)
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 30, ACID = 30)
/obj/item/clothing/suit/jacket/secbomber
name = "security bomber jacket"
desc = "A stylish and worn-in armoured black bomber jacket emblazoned with a red stripe across the left. Looks rugged."
w_class = WEIGHT_CLASS_NORMAL
icon_state = "bombersec"
item_state = "bombersec"
//Inherited from Security armour.
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)
heat_protection = UPPER_TORSO|LOWER_TORSO
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
strip_delay = 60
put_on_delay = 40
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 20, ACID = 20)
//End of inheritance from Security armour.
/obj/item/clothing/suit/jacket/engibomber
name = "engineering bomber jacket"
desc = "A stylish and warm jacket adorned with the colors of the humble Station Engineer."
icon_state = "bomberengi"
item_state = "bomberengi"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 20, ACID = 40)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd)
/obj/item/clothing/suit/jacket/atmosbomber
name = "atmospherics bomber jacket"
desc = "A stylish and warm jacket adorned with the colors of the magical Atmospherics Technician."
icon_state = "bomberatmos"
item_state = "bomberatmos"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 20, ACID = 40)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd)
/obj/item/clothing/suit/jacket/cargobomber
name = "cargo bomber jacket"
desc = "A stylish jacket to keep you warm in the warehouse."
icon_state = "bombercargo"
item_state = "bombercargo"
allowed = list(/obj/item/rcs, /obj/item/clipboard, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/lighter, /obj/item/storage/fancy/cigarettes, /obj/item/storage/bag/mail, /obj/item/envelope)
/obj/item/clothing/suit/jacket/miningbomber
name = "mining bomber jacket"
desc = "A slightly armoured and stylish jacket for shaft miners."
icon_state = "bombermining"
item_state = "bombermining"
allowed = list(/obj/item/pickaxe, /obj/item/t_scanner/adv_mining_scanner, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/energy/kinetic_accelerator, /obj/item/shovel, /obj/item/storage/bag/ore)
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
/obj/item/clothing/suit/jacket/expeditionbomber
name = "expedition bomber jacket"
desc = "A stylish jacket for station-side explorers. Won't do much to protect you from space."
icon_state = "bomberexpedition"
item_state = "bomberexpedition"
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/energy/kinetic_accelerator, /obj/item/t_scanner/adv_mining_scanner, /obj/item/shovel, /obj/item/pickaxe, /obj/item/storage/bag/ore, /obj/item/gps)
/obj/item/clothing/suit/jacket/hydrobomber
name = "hydroponics bomber jacket"
desc = "A stylish choice for the workers of the hydroponics lab."
icon_state = "bomberhydro"
item_state = "bomberhydro"
allowed = list(/obj/item/reagent_containers/spray, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/hatchet, /obj/item/storage/bag/plants)
/obj/item/clothing/suit/jacket/medbomber
name = "medical bomber jacket"
desc = "A stain-resistant and stylish option for any member of the medical department."
icon_state = "bombermed"
item_state = "bombermed"
allowed = list(/obj/item/bodyanalyzer, /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)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 0, ACID = 20)
/obj/item/clothing/suit/jacket/chembomber
name = "chemistry bomber jacket"
desc = "An exclusive and stylish variant of the medical bomber, for chemists only."
icon_state = "bomberchem"
item_state = "bomberchem"
allowed = list(/obj/item/reagent_scanner, /obj/item/reagent_scanner/adv, /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)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 40)
/obj/item/clothing/suit/jacket/coronerbomber
name = "coroner's bomber jacket"
desc = "An extremely exclusive and stylish jacket. Coroner's use only!"
icon_state = "bombercoroner"
item_state = "bombercoroner"
allowed = list(/obj/item/autopsy_scanner, /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)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 0, ACID = 20)
/obj/item/clothing/suit/jacket/scibomber
name = "science bomber jacket"
desc = "A stylish and slightly bomb-resistant jacket for warmth within the sterile labs."
icon_state = "bombersci"
item_state = "bombersci"
allowed = list(/obj/item/slime_scanner, /obj/item/reagent_scanner/adv, /obj/item/reagent_scanner, /obj/item/analyzer, /obj/item/stack/medical, /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)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 20)
/obj/item/clothing/suit/jacket/robobomber
name = "robotics bomber jacket"
desc = "A stylish jacket to warm you up after handling cold robotic limbs."
icon_state = "bomberrobo"
item_state = "bomberrobo"
allowed = list(/obj/item/robotanalyzer, /obj/item/analyzer, /obj/item/stack/medical, /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)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 20)
/obj/item/clothing/suit/jacket/leather
name = "leather jacket"
desc = "Pompadour not included."
@@ -1051,6 +934,139 @@
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//Bomber jackets
/obj/item/clothing/suit/jacket/bomber
name = "bomber jacket"
desc = "Aviators not included."
icon = 'icons/obj/clothing/suits/coat.dmi'
icon_state = "bomber"
item_state = "bomber"
icon_override = 'icons/mob/clothing/suits/coat.dmi'
ignore_suitadjust = FALSE
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS
cold_protection = UPPER_TORSO | LOWER_TORSO | ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
actions_types = list(/datum/action/item_action/zipper)
adjust_flavour = "unzip"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suits/coat.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suits/coat.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/coat.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/coat.dmi'
)
/obj/item/clothing/suit/jacket/bomber/syndicate
name = "suspicious bomber jacket"
desc = "A suspicious but extremely stylish jacket."
icon_state = "bombersyndie"
item_state = "bombersyndie"
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, /obj/item/melee/classic_baton/telescopic/contractor, /obj/item/kitchen/knife/combat)
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 30, ACID = 30)
/obj/item/clothing/suit/jacket/bomber/sec
name = "security bomber jacket"
desc = "A stylish and worn-in armoured black bomber jacket emblazoned with a red stripe across the left. Looks rugged."
w_class = WEIGHT_CLASS_NORMAL
icon_state = "bombersec"
item_state = "bombersec"
//Inherited from Security armour.
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)
heat_protection = UPPER_TORSO|LOWER_TORSO
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
strip_delay = 60
put_on_delay = 40
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 20, ACID = 20)
//End of inheritance from Security armour.
/obj/item/clothing/suit/jacket/bomber/engi
name = "engineering bomber jacket"
desc = "A stylish and warm jacket adorned with the colors of the humble Station Engineer."
icon_state = "bomberengi"
item_state = "bomberengi"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 20, ACID = 40)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd)
/obj/item/clothing/suit/jacket/bomber/atmos
name = "atmospherics bomber jacket"
desc = "A stylish and warm jacket adorned with the colors of the magical Atmospherics Technician."
icon_state = "bomberatmos"
item_state = "bomberatmos"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 20, ACID = 40)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd)
/obj/item/clothing/suit/jacket/bomber/cargo
name = "cargo bomber jacket"
desc = "A stylish jacket to keep you warm in the warehouse."
icon_state = "bombercargo"
item_state = "bombercargo"
allowed = list(/obj/item/rcs, /obj/item/clipboard, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/lighter, /obj/item/storage/fancy/cigarettes, /obj/item/storage/bag/mail, /obj/item/envelope)
/obj/item/clothing/suit/jacket/bomber/mining
name = "mining bomber jacket"
desc = "A slightly armoured and stylish jacket for shaft miners."
icon_state = "bombermining"
item_state = "bombermining"
allowed = list(/obj/item/pickaxe, /obj/item/t_scanner/adv_mining_scanner, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/energy/kinetic_accelerator, /obj/item/shovel, /obj/item/storage/bag/ore)
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
/obj/item/clothing/suit/jacket/bomber/expedition
name = "expedition bomber jacket"
desc = "A stylish jacket for station-side explorers. Won't do much to protect you from space."
icon_state = "bomberexpedition"
item_state = "bomberexpedition"
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/energy/kinetic_accelerator, /obj/item/t_scanner/adv_mining_scanner, /obj/item/shovel, /obj/item/pickaxe, /obj/item/storage/bag/ore, /obj/item/gps)
/obj/item/clothing/suit/jacket/bomber/hydro
name = "hydroponics bomber jacket"
desc = "A stylish choice for the workers of the hydroponics lab."
icon_state = "bomberhydro"
item_state = "bomberhydro"
allowed = list(/obj/item/reagent_containers/spray, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/hatchet, /obj/item/storage/bag/plants)
/obj/item/clothing/suit/jacket/bomber/med
name = "medical bomber jacket"
desc = "A stain-resistant and stylish option for any member of the medical department."
icon_state = "bombermed"
item_state = "bombermed"
allowed = list(/obj/item/bodyanalyzer, /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)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 0, ACID = 20)
/obj/item/clothing/suit/jacket/bomber/chem
name = "chemistry bomber jacket"
desc = "An exclusive and stylish variant of the medical bomber, for chemists only."
icon_state = "bomberchem"
item_state = "bomberchem"
allowed = list(/obj/item/reagent_scanner, /obj/item/reagent_scanner/adv, /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)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 40)
/obj/item/clothing/suit/jacket/bomber/coroner
name = "coroner's bomber jacket"
desc = "An extremely exclusive and stylish jacket. Coroner's use only!"
icon_state = "bombercoroner"
item_state = "bombercoroner"
allowed = list(/obj/item/autopsy_scanner, /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)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 0, ACID = 20)
/obj/item/clothing/suit/jacket/bomber/sci
name = "science bomber jacket"
desc = "A stylish and slightly bomb-resistant jacket for warmth within the sterile labs."
icon_state = "bombersci"
item_state = "bombersci"
allowed = list(/obj/item/slime_scanner, /obj/item/reagent_scanner/adv, /obj/item/reagent_scanner, /obj/item/analyzer, /obj/item/stack/medical, /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)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 20)
/obj/item/clothing/suit/jacket/bomber/robo
name = "robotics bomber jacket"
desc = "A stylish jacket to warm you up after handling cold robotic limbs."
icon_state = "bomberrobo"
item_state = "bomberrobo"
allowed = list(/obj/item/robotanalyzer, /obj/item/analyzer, /obj/item/stack/medical, /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)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 20)
//End of bombers
/obj/item/clothing/suit/officercoat
name = "clown officer's coat"
desc = "An overcoat for the clown officer, to keep him warm during those cold winter nights on the front."
code/modules/mining/mine_items.dm
+2 -2
View File
@@ -38,8 +38,8 @@
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/suit/jacket/miningbomber(src)
new /obj/item/clothing/suit/jacket/miningbomber(src)
new /obj/item/clothing/suit/jacket/bomber/mining(src)
new /obj/item/clothing/suit/jacket/bomber/mining(src)
new /obj/item/clothing/suit/hooded/wintercoat/miner(src)
new /obj/item/clothing/suit/hooded/wintercoat/miner(src)