mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 08:37:43 +01:00
We Begin Bombing Jackets in Five Minutes [READY] (#4725)
## About The Pull Request Added a bunch of bomber jackets from para, by Christasmurf & Synth. <img width="462" height="398" alt="image" src="https://github.com/user-attachments/assets/70ddb5cb-3504-498f-8ef8-bdd9ae00fac6" /> I'm a bit drunk and also very lazy, pretend you saw the rest in this image and that you clapped like a seal. ## Why It's Good For The Game they look cool I THINK ## Proof Of Testing <details> <summary>Screenshots/Videos</summary> </details> ## Changelog 🆑 add: Even more bomber coats. Now in Deptartment Vendors. /🆑
This commit is contained in:
@@ -840,3 +840,207 @@
|
||||
var/list/hoodie_colors = (SSgreyscale.ParseColorString(greyscale_colors))
|
||||
var/list/new_hoodie_colors = hoodie_colors.Copy(1,2)
|
||||
hood.set_greyscale(new_hoodie_colors)
|
||||
|
||||
//Bombers by Christasmurf, Synth of Paradice & Soljurn respectively.
|
||||
|
||||
//Base so we don't need to keep putting icon/worn over and over
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber
|
||||
name = "please stop spawning me"
|
||||
desc = "one down, cmon now"
|
||||
icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi'
|
||||
worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi'
|
||||
icon_state = "bomber"
|
||||
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber
|
||||
name = "three piece bomber jacket"
|
||||
desc = "People love these things. Seriously. Three seperate versions? Come on now."
|
||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
||||
|
||||
|
||||
//Engineering
|
||||
|
||||
/obj/item/clothing/suit/utility/fire/atmosbomber
|
||||
name = "atmos technician bomber jacket"
|
||||
desc = "You might be shocked that this fur lined jacket is fireproof! I am too!"
|
||||
icon_state = "bomberatmos"
|
||||
icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi'
|
||||
worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi'
|
||||
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
body_parts_covered = CHEST|GROIN|ARMS
|
||||
slowdown = 0
|
||||
armor_type = /datum/armor/atmos_tech_tailcoat
|
||||
|
||||
/obj/item/clothing/suit/utility/fire/atmosbomber/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/toggle_clothes, "bomberatmos_t")
|
||||
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/engi
|
||||
name = "engineering bomber jacket"
|
||||
desc = "You can still carry your gear on this! Shocking, I know."
|
||||
icon_state = "bomberengi"
|
||||
allowed = list(
|
||||
/obj/item/fireaxe/metal_h2_axe,
|
||||
/obj/item/flashlight,
|
||||
/obj/item/radio,
|
||||
/obj/item/storage/bag/construction,
|
||||
/obj/item/tank/internals/emergency_oxygen,
|
||||
/obj/item/tank/internals/plasmaman,
|
||||
/obj/item/t_scanner,
|
||||
/obj/item/gun/ballistic/rifle/boltaction/pipegun/prime,
|
||||
)
|
||||
|
||||
//Cargo
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/cargo
|
||||
name = "cargo bomber jacket"
|
||||
desc = "Keep your rifle close, Cargonia isn't lost yet."
|
||||
icon_state = "bombercargo"
|
||||
allowed = list(
|
||||
/obj/item/tank/internals/emergency_oxygen,
|
||||
/obj/item/tank/internals/plasmaman,
|
||||
/obj/item/boxcutter,
|
||||
/obj/item/dest_tagger,
|
||||
/obj/item/stamp,
|
||||
/obj/item/storage/bag/mail,
|
||||
/obj/item/universal_scanner,
|
||||
)
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/cargo/smith
|
||||
name = "blacksmith bomber jacket"
|
||||
desc = "1940s fashion mixed with 1140s typhoid."
|
||||
icon_state = "bombersmith"
|
||||
allowed = list(
|
||||
/obj/item/tank/internals/emergency_oxygen,
|
||||
/obj/item/forging/hammer,
|
||||
/obj/item/forging/tongs,
|
||||
/obj/item/forging/billow,
|
||||
)
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/mining
|
||||
name = "mining bomber jacket"
|
||||
desc = "For a second, you swore this had a hood. Must be your brain playing tricks. You can glue plates onto it, too!"
|
||||
icon_state = "bombermining"
|
||||
cold_protection = CHEST|GROIN|ARMS
|
||||
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
|
||||
heat_protection = CHEST|GROIN|ARMS
|
||||
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
|
||||
armor_type = /datum/armor/hooded_explorer
|
||||
allowed = list(
|
||||
/obj/item/flashlight,
|
||||
/obj/item/gun/energy/recharge/kinetic_accelerator,
|
||||
/obj/item/mining_scanner,
|
||||
/obj/item/pickaxe,
|
||||
/obj/item/resonator,
|
||||
/obj/item/storage/bag/ore,
|
||||
/obj/item/t_scanner/adv_mining_scanner,
|
||||
/obj/item/tank/internals,
|
||||
)
|
||||
resistance_flags = FIRE_PROOF
|
||||
clothing_traits = list(TRAIT_SNOWSTORM_IMMUNE)
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/mining/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/armor_plate)
|
||||
|
||||
//Science
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science
|
||||
name = "science bomber jacket"
|
||||
desc = "Trade in your, and these are not my words, 'pussy repellent labcoat' for something with some more style!"
|
||||
icon_state = "bombersci"
|
||||
allowed = list(
|
||||
/obj/item/analyzer,
|
||||
/obj/item/biopsy_tool,
|
||||
/obj/item/dnainjector,
|
||||
/obj/item/flashlight/pen,
|
||||
/obj/item/healthanalyzer,
|
||||
/obj/item/paper,
|
||||
/obj/item/reagent_containers/dropper,
|
||||
/obj/item/reagent_containers/cup/beaker,
|
||||
/obj/item/reagent_containers/cup/bottle,
|
||||
/obj/item/reagent_containers/cup/tube,
|
||||
/obj/item/reagent_containers/hypospray,
|
||||
/obj/item/reagent_containers/applicator,
|
||||
/obj/item/reagent_containers/syringe,
|
||||
/obj/item/gun/syringe,
|
||||
/obj/item/sensor_device,
|
||||
/obj/item/soap,
|
||||
/obj/item/stack/medical,
|
||||
/obj/item/storage/pill_bottle,
|
||||
/obj/item/tank/internals/emergency_oxygen,
|
||||
/obj/item/tank/internals/plasmaman,
|
||||
)
|
||||
armor_type = /datum/armor/toggle_labcoat
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/robotics
|
||||
name = "roboticist bomber jacket"
|
||||
desc = "Those terrifying dog creatures treating your lab like a kennel might show you some respect if you wear the skin of their originators."
|
||||
icon_state = "bomberrobo"
|
||||
|
||||
|
||||
//Medical
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/med
|
||||
name = "medical bomber jacket"
|
||||
desc = "Let's be honest here, we threw out sterility the second we hired anything with fur."
|
||||
icon_state = "bombermed"
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/chem
|
||||
name = "chemistry bomber jacket"
|
||||
desc = "<b>STOP AURA FARMING AND GET US SYNTHFLESH!</b>"
|
||||
icon_state = "bomberchem"
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/coroner
|
||||
name = "black bomber jacket"
|
||||
desc = "A pitch black, tar bomber jacket. If all your friends weren't dead, they'd think you're the coolest person around."
|
||||
icon_state = "bombercoroner"
|
||||
|
||||
//Misc
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/hydro
|
||||
name = "botanical bomber blazer"
|
||||
desc = "Not actually a blazer! But, to quote the designer 'Alliteration, an art.'"
|
||||
icon_state = "bomberhydro"
|
||||
allowed = list(
|
||||
/obj/item/cultivator,
|
||||
/obj/item/geneshears,
|
||||
/obj/item/graft,
|
||||
/obj/item/hatchet,
|
||||
/obj/item/plant_analyzer,
|
||||
/obj/item/reagent_containers/cup/beaker,
|
||||
/obj/item/reagent_containers/cup/bottle,
|
||||
/obj/item/reagent_containers/spray/pestspray,
|
||||
/obj/item/reagent_containers/spray/plantbgone,
|
||||
/obj/item/secateurs,
|
||||
/obj/item/seeds,
|
||||
/obj/item/storage/bag/plants,
|
||||
)
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/sec
|
||||
name = "security bomber jacket"
|
||||
desc = "Our clothing company keeps out of any 'blue/red' related debates after <b>THE INCIDENT</b>, sorry."
|
||||
icon_state = "bombersec"
|
||||
armor_type = /datum/armor/suit_armor
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/syndicate
|
||||
name = "suspicious bomber jacket"
|
||||
desc = "If the Bomber Harris book isn't a giveaway, someone's taking 'bomber' to heart."
|
||||
icon_state = "bombersyndie"
|
||||
armor_type = /datum/armor/wintercoat_syndicate
|
||||
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/syndicate/Initialize(mapload)
|
||||
. = ..()
|
||||
allowed += list(
|
||||
/obj/item/ammo_box,
|
||||
/obj/item/ammo_casing,
|
||||
/obj/item/gun/ballistic,
|
||||
/obj/item/gun/energy,
|
||||
/obj/item/restraints/handcuffs,
|
||||
/obj/item/knife/combat,
|
||||
/obj/item/melee/baton,
|
||||
)
|
||||
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/syndicate/fake
|
||||
armor_type = /datum/armor/hooded_wintercoat
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
//Title Capitalization for names please!!!
|
||||
|
||||
/datum/loadout_item/suit/secjacket
|
||||
name = "High-Vis Security Jacket"
|
||||
item_path = /obj/item/clothing/suit/armor/vest/secjacket/blue
|
||||
restricted_roles = list(ALL_JOBS_SEC)
|
||||
|
||||
/datum/loadout_item/suit/leather_apron
|
||||
name = "Leather Apron"
|
||||
item_path = /obj/item/clothing/suit/leatherapron
|
||||
@@ -44,6 +39,16 @@
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/sec/old
|
||||
restricted_roles = list(ALL_JOBS_SEC)
|
||||
|
||||
/datum/loadout_item/suit/secjacket
|
||||
name = "High-Vis Security Jacket"
|
||||
item_path = /obj/item/clothing/suit/armor/vest/secjacket/blue
|
||||
restricted_roles = list(ALL_JOBS_SEC)
|
||||
|
||||
/datum/loadout_item/suit/secjacket/bomber
|
||||
name = "Security Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/sec
|
||||
restricted_roles = list(ALL_JOBS_SEC)
|
||||
|
||||
/datum/loadout_item/suit/jacket/officer/tan
|
||||
name = "Tan Security Blazer"
|
||||
item_path = /obj/item/clothing/suit/jacket/officer/tan
|
||||
@@ -175,3 +180,59 @@
|
||||
/datum/loadout_item/suit/hoodie/twee_hoodie
|
||||
name = "Disconcertingly Twee Hoodie"
|
||||
item_path = /obj/item/clothing/suit/hooded/twee_hoodie
|
||||
|
||||
//Para Bombers
|
||||
//Unless it has armor, real armor and not just like minor acid/fire I'm just gonna leave it unrestricted because the people want their drip. Me. I'm the people.
|
||||
/datum/loadout_item/suit/parabomber
|
||||
name = "Three Piece Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber
|
||||
|
||||
/datum/loadout_item/suit/paraatmosbomber
|
||||
name = "Atmos Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/utility/fire/atmosbomber
|
||||
restricted_roles = list(ALL_JOBS_ENGINEERING)
|
||||
|
||||
/datum/loadout_item/suit/paraengibomber
|
||||
name = "Engineering Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/engi
|
||||
|
||||
/datum/loadout_item/suit/paracargobomber
|
||||
name = "Cargo Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/cargo
|
||||
|
||||
/datum/loadout_item/suit/parathesmithsbomber
|
||||
name = "Blacksmith Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/cargo/smith
|
||||
|
||||
/datum/loadout_item/suit/paraminingbomber
|
||||
name = "Mining Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/mining
|
||||
restricted_roles = list(JOB_SHAFT_MINER)
|
||||
|
||||
/datum/loadout_item/suit/parascibomber
|
||||
name = "Scientist Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/science
|
||||
|
||||
/datum/loadout_item/suit/pararobobomber
|
||||
name = "Robotics Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/robotics
|
||||
|
||||
/datum/loadout_item/suit/paramedbomber
|
||||
name = "Medical Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/med
|
||||
|
||||
/datum/loadout_item/suit/parachembomber
|
||||
name = "Chemical Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/chem
|
||||
|
||||
/datum/loadout_item/suit/paracorobomber
|
||||
name = "Black Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/coroner
|
||||
|
||||
/datum/loadout_item/suit/parabotbomber
|
||||
name = "Botanical Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/hydro
|
||||
|
||||
/datum/loadout_item/suit/paraimposterbomber
|
||||
name = "Suspicious Bomber Jacket"
|
||||
item_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/syndicate/fake
|
||||
|
||||
@@ -36,6 +36,11 @@
|
||||
desc = "A mining outfit kit themed around bunnies, they do live in burrows after all..."
|
||||
cost_per_order = 500
|
||||
|
||||
/datum/orderable_item/mining/bombercoat
|
||||
purchase_path = /obj/item/clothing/suit/toggle/jacket/zubber/bomber/mining
|
||||
desc = "A mining bomber jacket. Probably not great for Lavaland, but this, a hot chocolate and some snow? Comfymaxxing has never been so cheap!"
|
||||
cost_per_order = 100
|
||||
|
||||
/obj/item/survivalcapsule/medical
|
||||
name = "medical trauma pod"
|
||||
desc = "A bluespace capsule that deploys a fairly effective medical treatment pod!"
|
||||
|
||||
@@ -74,6 +74,8 @@
|
||||
/obj/item/clothing/suit/crop_jacket/sleeveless/long = 5,
|
||||
/obj/item/clothing/suit/hooded/big_hoodie = 5,
|
||||
/obj/item/clothing/suit/hooded/twee_hoodie = 5,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber = 5,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/coroner = 5,
|
||||
/obj/item/clothing/under/dress/skirt/skyrat/black_skirt = 5,
|
||||
/obj/item/clothing/suit/misc/suit_harness = 5,
|
||||
/obj/item/clothing/under/dress/miniskirt = 5,
|
||||
|
||||
@@ -78,6 +78,7 @@
|
||||
/obj/item/clothing/neck/tie/bunnytie/syndicate = 3, //Armored but it's only Fire and Acid, not a balance concern
|
||||
/obj/item/clothing/under/syndicate/syndibunny/fake = 3,
|
||||
/obj/item/clothing/suit/jacket/tailcoat/syndicate/fake = 3,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/syndicate/fake = 3,
|
||||
/obj/item/clothing/neck/warrior_cape/loadout = 3,
|
||||
)
|
||||
|
||||
@@ -100,6 +101,7 @@
|
||||
/obj/item/clothing/head/playbunnyears/psychologist = 3,
|
||||
/obj/item/clothing/under/rank/civilian/psychologist_bunnysuit = 3,
|
||||
/obj/item/clothing/suit/jacket/tailcoat/psychologist = 3,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/med = 3,
|
||||
)
|
||||
|
||||
/obj/machinery/vending/wardrobe/chem_wardrobe
|
||||
@@ -108,6 +110,7 @@
|
||||
/obj/item/clothing/under/rank/medical/chemist/bunnysuit = 2,
|
||||
/obj/item/clothing/suit/toggle/labcoat/chemist/doctor_tailcoat = 2,
|
||||
/obj/item/clothing/neck/tie/bunnytie/chemist = 2,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/chem = 2,
|
||||
)
|
||||
|
||||
/obj/machinery/vending/wardrobe/viro_wardrobe
|
||||
@@ -124,6 +127,7 @@
|
||||
/obj/item/clothing/under/rank/medical/coroner_bunnysuit = 2,
|
||||
/obj/item/clothing/suit/toggle/labcoat/coroner/doctor_tailcoat = 2,
|
||||
/obj/item/clothing/neck/tie/bunnytie/coroner = 2,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/coroner = 2,
|
||||
)
|
||||
|
||||
|
||||
@@ -134,6 +138,7 @@
|
||||
/obj/item/clothing/suit/toggle/labcoat/science/doctor_tailcoat = 3,
|
||||
/obj/item/clothing/neck/tie/bunnytie/scientist = 3,
|
||||
/obj/item/storage/bag/xeno = 3,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science = 3,
|
||||
)
|
||||
|
||||
/obj/machinery/vending/wardrobe/robo_wardrobe
|
||||
@@ -143,6 +148,7 @@
|
||||
/obj/item/clothing/under/rank/rnd/scientist/roboticist_bunnysuit = 2,
|
||||
/obj/item/clothing/suit/toggle/labcoat/roboticist/doctor_tailcoat = 2,
|
||||
/obj/item/clothing/neck/tie/bunnytie/roboticist = 2,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/science/robotics = 2,
|
||||
)
|
||||
|
||||
/obj/machinery/vending/wardrobe/gene_wardrobe
|
||||
@@ -170,6 +176,8 @@
|
||||
/obj/item/clothing/head/caligram_cap_tan = 3,
|
||||
/obj/item/clothing/under/jumpsuit/caligram_fatigues_tan = 3,
|
||||
/obj/item/clothing/suit/jacket/caligram_parka_tan = 3,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/cargo = 3,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/cargo/smith = 3,
|
||||
/obj/item/clothing/head/playbunnyears/cargo = 3,
|
||||
/obj/item/clothing/under/rank/cargo/cargo_bunnysuit = 3,
|
||||
/obj/item/clothing/suit/jacket/tailcoat/cargo = 3,
|
||||
@@ -281,6 +289,7 @@
|
||||
/obj/item/clothing/neck/tie/bunnytie/syndicate = 3,
|
||||
/obj/item/clothing/under/syndicate/syndibunny = 3,
|
||||
/obj/item/clothing/suit/jacket/tailcoat/syndicate = 3,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/syndicate = 3,
|
||||
)
|
||||
|
||||
/obj/machinery/vending/magivend
|
||||
@@ -298,6 +307,7 @@
|
||||
/obj/item/clothing/neck/tie/bunnytie/engineer = 3,
|
||||
/obj/item/clothing/shoes/workboots/heeled = 3,
|
||||
/obj/item/clothing/shoes/workboots/toeless = 3,
|
||||
/obj/item/clothing/suit/toggle/jacket/zubber/bomber/engi = 3,
|
||||
)
|
||||
|
||||
/obj/machinery/vending/wardrobe/atmos_wardrobe
|
||||
@@ -307,4 +317,5 @@
|
||||
/obj/item/clothing/suit/utility/fire/atmos_tech_tailcoat = 3,
|
||||
/obj/item/clothing/neck/tie/bunnytie/atmos_tech = 3,
|
||||
/obj/item/clothing/shoes/workboots/heeled = 3,
|
||||
/obj/item/clothing/suit/utility/fire/atmosbomber = 3,
|
||||
)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 84 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 32 KiB |
Reference in New Issue
Block a user