cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +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 18:18:43 +00:00
committed by GitHub
co-authored by Luc
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
_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
+3 -3
View File
@@ -131,9 +131,9 @@
"gp" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
/obj/item/clothing/suit/jacket/cargobomber,
/obj/item/clothing/suit/jacket/cargobomber,
/obj/item/clothing/suit/jacket/cargobomber,
/obj/item/clothing/suit/jacket/bomber/cargo,
/obj/item/clothing/suit/jacket/bomber/cargo,
/obj/item/clothing/suit/jacket/bomber/cargo,
/obj/item/clothing/under/rank/cargo/tech,
/obj/item/clothing/under/rank/cargo/tech,
/obj/item/clothing/under/rank/cargo/tech,
_maps/map_files/generic/centcomm.dmm
+1 -1
View File
@@ -3597,7 +3597,7 @@
pixel_y = 3
},
/obj/item/clothing/suit/blacktrenchcoat,
/obj/item/clothing/suit/jacket{
/obj/item/clothing/suit/jacket/bomber{
pixel_x = 3;
pixel_y = -3
},
code/datums/outfits/outfit_admin.dm
+3 -3
View File
@@ -856,13 +856,13 @@
/datum/outfit/admin/trader/sol
name = "Trans-Solar Federation Trader"
suit = /obj/item/clothing/suit/jacket/cargobomber
suit = /obj/item/clothing/suit/jacket/bomber/cargo
head = /obj/item/clothing/head/soft/cargo
/datum/outfit/admin/trader/cyber
name = "Cybersun Industries Trader"
uniform = /obj/item/clothing/under/syndicate/tacticool
suit = /obj/item/clothing/suit/jacket/syndicatebomber
suit = /obj/item/clothing/suit/jacket/bomber/syndicate
gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/combat
belt = /obj/item/melee/classic_baton/telescopic
@@ -915,7 +915,7 @@
/datum/outfit/admin/trader/grey
name = "Technocracy Trader"
uniform = /obj/item/clothing/under/costume/psyjump
suit = /obj/item/clothing/suit/jacket/robobomber
suit = /obj/item/clothing/suit/jacket/bomber/robo
belt = /obj/item/melee/classic_baton/telescopic
back = /obj/item/storage/backpack/robotics
code/datums/uplink_items/uplink_general.dm
+1 -1
View File
@@ -932,7 +932,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Syndicate Bomber Jacket"
desc = "An awesome jacket to help you style on Nanotrasen with. The lining is made of a thin polymer to provide a small amount of armor. Does not provide any extra storage space."
reference = "JCKT"
item = /obj/item/clothing/suit/jacket/syndicatebomber
item = /obj/item/clothing/suit/jacket/bomber/syndicate
cost = 3
/datum/uplink_item/badass/tpsuit
code/game/machinery/vendors/generic_vendors.dm
Vendored
+2 -2
View File
@@ -434,7 +434,7 @@
/obj/item/clothing/under/dress/redeveninggown = 2,
/obj/item/clothing/under/dress/blacktango = 2,
/obj/item/clothing/suit/hooded/wintercoat = 3,
/obj/item/clothing/suit/jacket = 3,
/obj/item/clothing/suit/jacket/bomber = 3,
/obj/item/clothing/suit/hooded/hoodie = 3,
/obj/item/clothing/suit/hooded/hoodie/blue = 3,
/obj/item/clothing/suit/jacket/motojacket = 3,
@@ -520,7 +520,7 @@
/obj/item/clothing/under/dress/redeveninggown = 100,
/obj/item/clothing/under/dress/blacktango = 100,
/obj/item/clothing/suit/hooded/wintercoat = 75,
/obj/item/clothing/suit/jacket = 75,
/obj/item/clothing/suit/jacket/bomber = 75,
/obj/item/clothing/suit/hooded/hoodie = 75,
/obj/item/clothing/suit/hooded/hoodie/blue = 75,
/obj/item/clothing/suit/jacket/motojacket = 75,
code/game/machinery/vendors/wardrobe_vendors.dm
Vendored
+20 -20
View File
@@ -31,7 +31,7 @@
/obj/item/clothing/mask/bandana/red = 4,
/obj/item/clothing/mask/balaclava = 1,
/obj/item/clothing/mask/gas/sechailer/swat = 2,
/obj/item/clothing/suit/jacket/secbomber = 2,
/obj/item/clothing/suit/jacket/bomber/sec = 2,
/obj/item/clothing/suit/armor/secjacket = 4,
/obj/item/clothing/suit/armor/secponcho = 4,
/obj/item/clothing/suit/hooded/wintercoat/security = 4,
@@ -68,7 +68,7 @@
/obj/item/clothing/mask/bandana/red = 40,
/obj/item/clothing/mask/balaclava = 60,
/obj/item/clothing/mask/gas/sechailer/swat = 60,
/obj/item/clothing/suit/jacket/secbomber = 75,
/obj/item/clothing/suit/jacket/bomber/sec = 75,
/obj/item/clothing/suit/armor/secjacket = 75,
/obj/item/clothing/suit/armor/secponcho = 75,
/obj/item/clothing/suit/hooded/wintercoat/security = 75,
@@ -173,7 +173,7 @@
/obj/item/clothing/suit/storage/fr_jacket = 3,
/obj/item/clothing/suit/storage/labcoat = 3,
/obj/item/clothing/suit/apron/surgical = 3,
/obj/item/clothing/suit/jacket/medbomber = 3,
/obj/item/clothing/suit/jacket/bomber/med = 3,
/obj/item/clothing/accessory/armband/med = 3,
/obj/item/clothing/accessory/armband/medgreen = 3,
/obj/item/clothing/shoes/laceup = 3,
@@ -203,7 +203,7 @@
/obj/item/clothing/suit/storage/fr_jacket = 75,
/obj/item/clothing/suit/storage/labcoat = 75,
/obj/item/clothing/suit/apron/surgical = 75,
/obj/item/clothing/suit/jacket/medbomber = 75,
/obj/item/clothing/suit/jacket/bomber/med = 75,
/obj/item/clothing/accessory/armband/med = 20,
/obj/item/clothing/accessory/armband/medgreen = 20,
/obj/item/clothing/shoes/laceup = 30,
@@ -272,7 +272,7 @@
/obj/item/clothing/under/rank/medical/chemist/skirt = 2,
/obj/item/clothing/head/beret/med = 2,
/obj/item/clothing/suit/storage/labcoat/chemist = 2,
/obj/item/clothing/suit/jacket/chembomber = 2,
/obj/item/clothing/suit/jacket/bomber/chem = 2,
/obj/item/clothing/accessory/armband/med = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/clothing/shoes/laceup = 2,
@@ -287,7 +287,7 @@
/obj/item/clothing/under/rank/medical/chemist/skirt = 50,
/obj/item/clothing/head/beret/med = 20,
/obj/item/clothing/suit/storage/labcoat/chemist = 75,
/obj/item/clothing/suit/jacket/chembomber = 75,
/obj/item/clothing/suit/jacket/bomber/chem = 75,
/obj/item/clothing/accessory/armband/med = 20,
/obj/item/clothing/shoes/laceup = 30,
/obj/item/clothing/shoes/white = 20,
@@ -350,7 +350,7 @@
/obj/item/clothing/under/rank/rnd/scientist/skirt = 3,
/obj/item/clothing/suit/hooded/wintercoat/science = 3,
/obj/item/clothing/suit/storage/labcoat/science = 3,
/obj/item/clothing/suit/jacket/scibomber = 3,
/obj/item/clothing/suit/jacket/bomber/sci = 3,
/obj/item/clothing/head/beret/sci = 3,
/obj/item/clothing/accessory/armband/science = 6,
/obj/item/clothing/shoes/laceup = 3,
@@ -367,7 +367,7 @@
/obj/item/clothing/under/rank/rnd/scientist/skirt = 50,
/obj/item/clothing/suit/hooded/wintercoat/science = 75,
/obj/item/clothing/suit/storage/labcoat/science = 75,
/obj/item/clothing/suit/jacket/scibomber = 75,
/obj/item/clothing/suit/jacket/bomber/sci = 75,
/obj/item/clothing/head/beret/sci = 20,
/obj/item/clothing/accessory/armband/science = 20,
/obj/item/clothing/shoes/laceup = 30,
@@ -395,7 +395,7 @@
/obj/item/clothing/under/rank/rnd/roboticist/skirt = 3,
/obj/item/clothing/suit/storage/labcoat/roboblack = 3,
/obj/item/clothing/suit/storage/labcoat/robowhite = 3,
/obj/item/clothing/suit/jacket/robobomber = 3,
/obj/item/clothing/suit/jacket/bomber/robo = 3,
/obj/item/clothing/head/beret/roboblack = 3,
/obj/item/clothing/head/beret/robowhite = 3,
/obj/item/clothing/head/soft/black = 3,
@@ -414,7 +414,7 @@
/obj/item/clothing/under/rank/rnd/roboticist/skirt = 50,
/obj/item/clothing/suit/storage/labcoat/roboblack = 75,
/obj/item/clothing/suit/storage/labcoat/robowhite = 75,
/obj/item/clothing/suit/jacket/robobomber = 75,
/obj/item/clothing/suit/jacket/bomber/robo = 75,
/obj/item/clothing/head/beret/roboblack = 20,
/obj/item/clothing/head/beret/robowhite = 20,
/obj/item/clothing/head/soft/black = 20,
@@ -443,7 +443,7 @@
products = list(/obj/item/clothing/under/rank/engineering/engineer = 6,
/obj/item/clothing/under/rank/engineering/engineer/skirt = 3,
/obj/item/clothing/suit/hooded/wintercoat/engineering = 3,
/obj/item/clothing/suit/jacket/engibomber = 3,
/obj/item/clothing/suit/jacket/bomber/engi = 3,
/obj/item/clothing/suit/storage/hazardvest/staff = 3,
/obj/item/clothing/head/beret/eng = 3,
/obj/item/clothing/head/hardhat = 2,
@@ -464,7 +464,7 @@
prices = list(/obj/item/clothing/under/rank/engineering/engineer = 50,
/obj/item/clothing/under/rank/engineering/engineer/skirt = 50,
/obj/item/clothing/suit/hooded/wintercoat/engineering = 75,
/obj/item/clothing/suit/jacket/engibomber = 75,
/obj/item/clothing/suit/jacket/bomber/engi = 75,
/obj/item/clothing/suit/storage/hazardvest/staff = 50,
/obj/item/clothing/head/beret/eng = 20,
/obj/item/clothing/head/hardhat = 20,
@@ -496,7 +496,7 @@
products = list(/obj/item/clothing/under/rank/engineering/atmospheric_technician = 6,
/obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 3,
/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
/obj/item/clothing/suit/jacket/atmosbomber = 3,
/obj/item/clothing/suit/jacket/bomber/atmos = 3,
/obj/item/clothing/suit/storage/hazardvest/staff = 3,
/obj/item/clothing/head/beret/atmos = 3,
/obj/item/clothing/head/hardhat = 2,
@@ -517,7 +517,7 @@
prices = list(/obj/item/clothing/under/rank/engineering/atmospheric_technician = 50,
/obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 50,
/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 75,
/obj/item/clothing/suit/jacket/atmosbomber = 75,
/obj/item/clothing/suit/jacket/bomber/atmos = 75,
/obj/item/clothing/suit/storage/hazardvest/staff = 50,
/obj/item/clothing/head/beret/atmos = 20,
/obj/item/clothing/head/hardhat = 20,
@@ -553,7 +553,7 @@
/obj/item/clothing/under/rank/cargo/tech/overalls = 3,
/obj/item/clothing/under/rank/cargo/tech/delivery = 2,
/obj/item/clothing/suit/hooded/wintercoat/cargo = 3,
/obj/item/clothing/suit/jacket/cargobomber = 3,
/obj/item/clothing/suit/jacket/bomber/cargo = 3,
/obj/item/clothing/suit/storage/hazardvest/staff = 3,
/obj/item/clothing/head/soft/cargo = 3,
/obj/item/clothing/head/beret/cargo = 3,
@@ -572,7 +572,7 @@
/obj/item/clothing/under/rank/cargo/tech/overalls = 50,
/obj/item/clothing/under/rank/cargo/tech/delivery = 100,
/obj/item/clothing/suit/hooded/wintercoat/cargo = 75,
/obj/item/clothing/suit/jacket/cargobomber = 75,
/obj/item/clothing/suit/jacket/bomber/cargo = 75,
/obj/item/clothing/suit/storage/hazardvest/staff = 50,
/obj/item/clothing/head/soft/cargo = 20,
/obj/item/clothing/head/beret/cargo = 20,
@@ -601,7 +601,7 @@
/obj/item/clothing/under/rank/cargo/expedition/overalls = 3,
/obj/item/clothing/head/soft/expedition = 3,
/obj/item/clothing/head/beret/expedition = 3,
/obj/item/clothing/suit/jacket/expeditionbomber = 3,
/obj/item/clothing/suit/jacket/bomber/expedition = 3,
/obj/item/clothing/suit/storage/hazardvest/staff = 3,
/obj/item/mod/skin_applier = 3,
/obj/item/clothing/gloves/color/black = 3,
@@ -618,7 +618,7 @@
/obj/item/clothing/under/rank/cargo/expedition/overalls = 50,
/obj/item/clothing/head/soft/expedition = 20,
/obj/item/clothing/head/beret/expedition = 20,
/obj/item/clothing/suit/jacket/expeditionbomber = 75,
/obj/item/clothing/suit/jacket/bomber/expedition = 75,
/obj/item/clothing/suit/storage/hazardvest/staff = 50,
/obj/item/clothing/gloves/color/black = 20,
/obj/item/clothing/accessory/armband/cargo = 20,
@@ -730,7 +730,7 @@
/obj/item/clothing/suit/apron = 3,
/obj/item/clothing/suit/apron/overalls = 3,
/obj/item/clothing/suit/hooded/wintercoat/hydro = 3,
/obj/item/clothing/suit/jacket/hydrobomber = 3,
/obj/item/clothing/suit/jacket/bomber/hydro = 3,
/obj/item/clothing/suit/storage/labcoat/hydro = 3,
/obj/item/clothing/mask/bandana/botany = 3,
/obj/item/clothing/accessory/armband/hydro = 3,
@@ -746,7 +746,7 @@
/obj/item/clothing/suit/apron = 50,
/obj/item/clothing/suit/apron/overalls = 50,
/obj/item/clothing/suit/hooded/wintercoat/hydro = 75,
/obj/item/clothing/suit/jacket/hydrobomber = 75,
/obj/item/clothing/suit/jacket/bomber/hydro = 75,
/obj/item/clothing/suit/storage/labcoat/hydro = 75,
/obj/item/clothing/mask/bandana/botany = 20,
/obj/item/clothing/accessory/armband/hydro = 20,
code/game/objects/effects/spawners/lootdrop.dm
+4 -4
View File
@@ -165,7 +165,7 @@
/obj/item/storage/secure/briefcase/syndie = 2,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 2,
/obj/item/storage/pill_bottle/fakedeath = 2,
/obj/item/clothing/suit/jacket/syndicatebomber = 5,
/obj/item/clothing/suit/jacket/bomber/syndicate = 5,
/obj/item/clothing/suit/storage/iaa/blackjacket/armored = 2, // More armored than bomber and has pockets, so it is rarer
/obj/item/melee/knuckleduster/syndie = 2,
"" = 61 // This should be a decently high number for chances where no loot will spawn
@@ -449,7 +449,7 @@
name = "11. cybersun industries small gear"
loot = list(
/obj/item/storage/box/syndidonkpockets = 50,
/obj/item/clothing/suit/jacket/syndicatebomber = 50,
/obj/item/clothing/suit/jacket/bomber/syndicate = 50,
/obj/item/storage/box/syndie_kit/space = 50,
/obj/item/clothing/glasses/meson/sunglasses = 50,
/obj/item/storage/pill_bottle/zoom = 50,
@@ -460,7 +460,7 @@
)
// Damn near all of this is illegal. Gives officers something to do on a shift quiet enough to spawn traders.
/obj/effect/spawner/lootdrop/trade_sol/cybersun_major
/obj/effect/spawner/lootdrop/trade_sol/cybersun_major
name = "12. cybersun industries large gear"
lootcount = 3
loot = list(
@@ -494,7 +494,7 @@
)
// Lots of things to write permits for. Gives officers something to do on a shift quiet enough to spawn traders.
/obj/effect/spawner/lootdrop/trade_sol/ussp_major
/obj/effect/spawner/lootdrop/trade_sol/ussp_major
name = "12. USSP large gear"
lootcount = 2 //Lots of dangerous stuff here - reduced amount
loot = list(
code/game/objects/effects/spawners/random_spawners.dm
+1 -1
View File
@@ -290,7 +290,7 @@
/obj/item/mod/module/visor/night = 1,
/obj/item/clothing/gloves/color/black/thief = 1,
/obj/item/clothing/suit/storage/iaa/blackjacket/armored = 1,
/obj/item/clothing/suit/jacket/syndicatebomber = 1,
/obj/item/clothing/suit/jacket/bomber/syndicate = 1,
/obj/item/mod/module/holster/hidden = 1,
/obj/item/storage/firstaid/tactical = 1,
/obj/item/clothing/under/syndicate/silicon_cham = 1,
code/game/objects/items/weapons/storage/uplink_kits.dm
+1 -1
View File
@@ -288,7 +288,7 @@
/obj/item/deck/cards/syndicate, // 2 TC
/obj/item/storage/secure/briefcase/syndie, // 5 TC
/obj/item/storage/fancy/cigarettes/cigpack_syndicate, // 7 TC
/obj/item/clothing/suit/jacket/syndicatebomber, // 3 TC
/obj/item/clothing/suit/jacket/bomber/syndicate, // 3 TC
/obj/item/melee/knuckleduster/syndie, // 10 TC
)
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)
icons/mob/clothing/species/drask/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 123 KiB

After

Width:  |  Height:  |  Size: 104 KiB

icons/mob/clothing/species/drask/suits/coat.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

icons/mob/clothing/species/grey/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 89 KiB

icons/mob/clothing/species/grey/suits/coat.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

icons/mob/clothing/species/kidan/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 39 KiB

icons/mob/clothing/species/kidan/suits/coat.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

icons/mob/clothing/species/vox/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 322 KiB

After

Width:  |  Height:  |  Size: 310 KiB

icons/mob/clothing/species/vox/suits/coat.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

icons/mob/clothing/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 536 KiB

After

Width:  |  Height:  |  Size: 519 KiB

icons/mob/clothing/suits/coat.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

icons/obj/clothing/suits.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 157 KiB

After

Width:  |  Height:  |  Size: 150 KiB

icons/obj/clothing/suits/coat.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB