This commit is contained in:
Wowzewow (Wezzy)
2022-07-10 18:31:18 +02:00
committed by GitHub
parent 070d1d1e8b
commit 2bec6f1762
33 changed files with 189 additions and 102 deletions
+2 -2
View File
@@ -11,7 +11,7 @@
gloves = /obj/item/clothing/gloves/combat
glasses = /obj/item/clothing/glasses/sunglasses
suit_store = /obj/item/gun/energy/rifle
back = /obj/item/storage/backpack/satchel_sec
back = /obj/item/storage/backpack/satchel/sec
belt = /obj/item/storage/belt/military
id = /obj/item/card/id/distress/ap_eridani
l_ear = /obj/item/device/radio/headset/distress
@@ -94,7 +94,7 @@
shoes = /obj/item/clothing/shoes/swat/ert
gloves = /obj/item/clothing/gloves/latex/nitrile
belt = /obj/item/storage/belt/medical/first_responder/combat
back = /obj/item/storage/backpack/satchel_med
back = /obj/item/storage/backpack/satchel/med
accessory = /obj/item/clothing/accessory/holster/thigh
accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1)
r_ear = /obj/item/device/flashlight/pen
+1 -1
View File
@@ -66,7 +66,7 @@
name = "Elyran Navy Corpsman"
belt = /obj/item/storage/belt/medical/first_responder/combat
back = /obj/item/storage/backpack/satchel_med
back = /obj/item/storage/backpack/satchel/med
glasses = /obj/item/clothing/glasses/hud/health
gloves = /obj/item/clothing/gloves/latex
+2 -2
View File
@@ -5,7 +5,7 @@
shoes = /obj/item/clothing/shoes/swat/ert
gloves = /obj/item/clothing/gloves/swat/ert
belt = /obj/item/storage/belt/military
back = /obj/item/storage/backpack/satchel_norm
back = /obj/item/storage/backpack/satchel/norm
head = /obj/item/clothing/head/helmet/space/void/sol/fsf
suit = /obj/item/clothing/suit/space/void/sol/fsf
suit_store = /obj/item/gun/projectile/automatic/rifle/sol
@@ -37,7 +37,7 @@
name = "Free Solarian Fleets Medic"
belt = /obj/item/storage/belt/medical/first_responder/combat
back = /obj/item/storage/backpack/satchel_med
back = /obj/item/storage/backpack/satchel/med
glasses = /obj/item/clothing/glasses/hud/health
suit_store = /obj/item/gun/projectile/shotgun/pump/combat/sol
gloves = /obj/item/clothing/gloves/latex
+1 -1
View File
@@ -9,7 +9,7 @@
shoes = /obj/item/clothing/shoes/iac
gloves = /obj/item/clothing/gloves/white
belt = /obj/item/storage/belt/medical
back = /obj/item/storage/backpack/satchel_med
back = /obj/item/storage/backpack/satchel/med
accessory = /obj/item/clothing/accessory/storage/white_vest
id = /obj/item/card/id/distress/iac
accessory_contents = list(/obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/reagent_containers/glass/bottle/mortaphenyl = 1)
+3 -3
View File
@@ -5,7 +5,7 @@
shoes = /obj/item/clothing/shoes/swat/ert
gloves = /obj/item/clothing/gloves/swat/ert
belt = /obj/item/storage/belt/military
back = /obj/item/storage/backpack/satchel_norm
back = /obj/item/storage/backpack/satchel/norm
l_hand = /obj/item/clothing/suit/space/void/freelancer
r_hand = /obj/item/clothing/head/helmet/space/void/freelancer
accessory = /obj/item/clothing/accessory/holster/thigh
@@ -64,7 +64,7 @@
/obj/item/reagent_containers/glass/bottle/dermaline = 1,
/obj/item/reagent_containers/glass/bottle/perconol = 1,
/obj/item/reagent_containers/glass/bottle/thetamycin = 1,
/obj/item/material/knife/trench = 1
/obj/item/material/knife/trench = 1
)
/datum/outfit/admin/ert/mercenary/engineer
@@ -118,4 +118,4 @@
/obj/item/shield/energy = 1,
/obj/item/ammo_magazine/a357 = 2,
/obj/item/material/knife/trench = 1
)
)
@@ -248,7 +248,7 @@
gloves = /obj/item/clothing/gloves/white
belt = /obj/item/storage/belt/medical
back = /obj/item/storage/backpack/satchel_med
back = /obj/item/storage/backpack/satchel/med
accessory = /obj/item/clothing/accessory/storage/white_vest
accessory_contents = list(/obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/reagent_containers/glass/bottle/mortaphenyl = 1)
@@ -284,7 +284,7 @@
glasses = /obj/item/clothing/glasses/hud/health
backpack = /obj/item/storage/backpack/pharmacy
satchel = /obj/item/storage/backpack/satchel_pharm
satchel = /obj/item/storage/backpack/satchel/pharm
dufflebag = /obj/item/storage/backpack/duffel/pharm
messengerbag = /obj/item/storage/backpack/messenger/pharm
+2 -2
View File
@@ -75,7 +75,7 @@
// Must be paths, used to allow player-pref backpack choice
var/allow_backbag_choice = FALSE
var/backpack = /obj/item/storage/backpack
var/satchel = /obj/item/storage/backpack/satchel_norm
var/satchel = /obj/item/storage/backpack/satchel/norm
var/satchel_alt = /obj/item/storage/backpack/satchel/leather
var/dufflebag = /obj/item/storage/backpack/duffel
var/messengerbag = /obj/item/storage/backpack/messenger
@@ -124,7 +124,7 @@
if (OUTFIT_BACKPACK)
back = use_job_specific ? backpack : /obj/item/storage/backpack
if (OUTFIT_SATCHEL)
back = use_job_specific ? satchel : /obj/item/storage/backpack/satchel_norm
back = use_job_specific ? satchel : /obj/item/storage/backpack/satchel/norm
if (OUTFIT_SATCHEL_ALT)
back = use_job_specific ? satchel_alt : /obj/item/storage/backpack/satchel/leather
if (OUTFIT_DUFFELBAG)
+1 -1
View File
@@ -43,7 +43,7 @@
)
back = list(
/obj/item/storage/backpack,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel,
/obj/item/storage/backpack/duffel,
/obj/item/storage/backpack/duffel
+1 -1
View File
@@ -7,7 +7,7 @@
uniform = /obj/item/clothing/under/syndicate
back = null
backpack = /obj/item/storage/backpack/syndie
satchel = /obj/item/storage/backpack/satchel_syndie
satchel = /obj/item/storage/backpack/satchel/syndie
satchel_alt = /obj/item/storage/backpack/satchel
dufflebag = /obj/item/storage/backpack/duffel/syndie
messengerbag = /obj/item/storage/backpack/messenger/syndie
+1 -1
View File
@@ -60,7 +60,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
)
backpack = /obj/item/storage/backpack/captain
satchel = /obj/item/storage/backpack/satchel_cap
satchel = /obj/item/storage/backpack/satchel/cap
dufflebag = /obj/item/storage/backpack/duffel/cap
messengerbag = /obj/item/storage/backpack/messenger/com
+2 -2
View File
@@ -128,7 +128,7 @@
wrist_radio = /obj/item/device/radio/headset/wrist/service
backpack = /obj/item/storage/backpack/hydroponics
satchel = /obj/item/storage/backpack/satchel_hyd
satchel = /obj/item/storage/backpack/satchel/hyd
dufflebag = /obj/item/storage/backpack/duffel/hyd
messengerbag = /obj/item/storage/backpack/messenger/hyd
@@ -497,7 +497,7 @@
)
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel_eng
satchel = /obj/item/storage/backpack/satchel/eng
dufflebag = /obj/item/storage/backpack/duffel/eng
messengerbag = /obj/item/storage/backpack/messenger/engi
+4 -4
View File
@@ -59,7 +59,7 @@
tablet = /obj/item/modular_computer/handheld/preset/engineering/ce
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel_eng
satchel = /obj/item/storage/backpack/satchel/eng
dufflebag = /obj/item/storage/backpack/duffel/eng
messengerbag = /obj/item/storage/backpack/messenger/engi
@@ -118,7 +118,7 @@
tablet = /obj/item/modular_computer/handheld/preset/engineering
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel_eng
satchel = /obj/item/storage/backpack/satchel/eng
dufflebag = /obj/item/storage/backpack/duffel/eng
messengerbag = /obj/item/storage/backpack/messenger/engi
@@ -170,7 +170,7 @@
wrist_radio = /obj/item/device/radio/headset/wrist/eng
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel_eng
satchel = /obj/item/storage/backpack/satchel/eng
dufflebag = /obj/item/storage/backpack/duffel/eng
messengerbag = /obj/item/storage/backpack/messenger/engi
@@ -234,7 +234,7 @@
wrist_radio = /obj/item/device/radio/headset/wrist/eng
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel_eng
satchel = /obj/item/storage/backpack/satchel/eng
dufflebag = /obj/item/storage/backpack/duffel/eng
messengerbag = /obj/item/storage/backpack/messenger/engi
+6 -6
View File
@@ -57,7 +57,7 @@
tablet = /obj/item/modular_computer/handheld/preset/medical/cmo
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel_med
satchel = /obj/item/storage/backpack/satchel/med
dufflebag = /obj/item/storage/backpack/duffel/med
messengerbag = /obj/item/storage/backpack/messenger/med
@@ -129,7 +129,7 @@
tablet = /obj/item/modular_computer/handheld/preset/medical
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel_med
satchel = /obj/item/storage/backpack/satchel/med
dufflebag = /obj/item/storage/backpack/duffel/med
messengerbag = /obj/item/storage/backpack/messenger/med
@@ -187,7 +187,7 @@
tablet = /obj/item/modular_computer/handheld/preset/medical
backpack = /obj/item/storage/backpack/pharmacy
satchel = /obj/item/storage/backpack/satchel_pharm
satchel = /obj/item/storage/backpack/satchel/pharm
dufflebag = /obj/item/storage/backpack/duffel/pharm
messengerbag = /obj/item/storage/backpack/messenger/pharm
@@ -236,7 +236,7 @@
tablet = /obj/item/modular_computer/handheld/preset/medical/psych
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel_med
satchel = /obj/item/storage/backpack/satchel/med
dufflebag = /obj/item/storage/backpack/duffel/med
messengerbag = /obj/item/storage/backpack/messenger/med
@@ -289,7 +289,7 @@
tablet = /obj/item/modular_computer/handheld/preset/medical
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel_med
satchel = /obj/item/storage/backpack/satchel/med
dufflebag = /obj/item/storage/backpack/duffel/med
messengerbag = /obj/item/storage/backpack/messenger/med
@@ -329,7 +329,7 @@
wrist_radio = /obj/item/device/radio/headset/wrist/med
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel_med
satchel = /obj/item/storage/backpack/satchel/med
dufflebag = /obj/item/storage/backpack/duffel/med
messengerbag = /obj/item/storage/backpack/messenger/med
+3 -3
View File
@@ -57,7 +57,7 @@
tablet = /obj/item/modular_computer/handheld/preset/research/rd
backpack = /obj/item/storage/backpack/toxins
satchel = /obj/item/storage/backpack/satchel_tox
satchel = /obj/item/storage/backpack/satchel/tox
dufflebag = /obj/item/storage/backpack/duffel/tox
messengerbag = /obj/item/storage/backpack/messenger/tox
@@ -108,7 +108,7 @@
tablet = /obj/item/modular_computer/handheld/preset/research
backpack = /obj/item/storage/backpack/toxins
satchel = /obj/item/storage/backpack/satchel_tox
satchel = /obj/item/storage/backpack/satchel/tox
dufflebag = /obj/item/storage/backpack/duffel/tox
messengerbag = /obj/item/storage/backpack/messenger/tox
@@ -205,7 +205,7 @@
wrist_radio = /obj/item/device/radio/headset/wrist/sci
backpack = /obj/item/storage/backpack/toxins
satchel = /obj/item/storage/backpack/satchel_tox
satchel = /obj/item/storage/backpack/satchel/tox
dufflebag = /obj/item/storage/backpack/duffel/tox
messengerbag = /obj/item/storage/backpack/messenger/tox
+5 -5
View File
@@ -61,7 +61,7 @@
)
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
satchel = /obj/item/storage/backpack/satchel/sec
dufflebag = /obj/item/storage/backpack/duffel/sec
messengerbag = /obj/item/storage/backpack/messenger/sec
@@ -110,7 +110,7 @@
tablet = /obj/item/modular_computer/handheld/preset/security
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
satchel = /obj/item/storage/backpack/satchel/sec
dufflebag = /obj/item/storage/backpack/duffel/sec
messengerbag = /obj/item/storage/backpack/messenger/sec
@@ -159,7 +159,7 @@
tablet = /obj/item/modular_computer/handheld/preset/security/detective
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
satchel = /obj/item/storage/backpack/satchel/sec
dufflebag = /obj/item/storage/backpack/duffel/sec
messengerbag = /obj/item/storage/backpack/messenger/sec
@@ -210,7 +210,7 @@
tablet = /obj/item/modular_computer/handheld/preset/security
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
satchel = /obj/item/storage/backpack/satchel/sec
dufflebag = /obj/item/storage/backpack/duffel/sec
messengerbag = /obj/item/storage/backpack/messenger/sec
@@ -254,7 +254,7 @@
wrist_radio = /obj/item/device/radio/headset/wrist/sec
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
satchel = /obj/item/storage/backpack/satchel/sec
dufflebag = /obj/item/storage/backpack/duffel/sec
messengerbag = /obj/item/storage/backpack/messenger/sec
@@ -60,6 +60,7 @@
desc = "A backpack that opens into a localized pocket of Blue Space."
origin_tech = list(TECH_BLUESPACE = 4)
icon_state = "holdingpack"
item_state = "holdingpack"
max_w_class = ITEMSIZE_LARGE
max_storage_space = 56
storage_cost = 29
@@ -92,46 +93,57 @@
desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
desc_cult = null
icon_state = "cultpack"
item_state = "cultpack"
/obj/item/storage/backpack/medic
name = "medical backpack"
desc = "It's a backpack especially designed for use in a sterile environment."
icon_state = "medicalpack"
item_state = "medicalpack"
/obj/item/storage/backpack/security
name = "security backpack"
desc = "It's a very robust backpack."
icon_state = "securitypack"
item_state = "securitypack"
/obj/item/storage/backpack/captain
name = "captain's backpack"
desc = "It's a special backpack made exclusively for officers."
icon_state = "captainpack"
item_state = "captainpack"
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/industrial
name = "industrial backpack"
desc = "It's a tough backpack for the daily grind of station life."
icon_state = "engiepack"
item_state = "engiepack"
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/toxins
name = "laboratory backpack"
desc = "It's a light backpack modeled for use in laboratories and other scientific institutions."
icon_state = "toxpack"
item_state = "toxpack"
/obj/item/storage/backpack/hydroponics
name = "herbalist's backpack"
desc = "It's a green backpack with many pockets to store plants and tools in."
icon_state = "hydpack"
item_state = "hydpack"
/obj/item/storage/backpack/pharmacy
name = "pharmacy backpack"
desc = "It's an orange backpack which was designed to hold beakers, pill bottles and bottles."
icon_state = "chempack"
item_state = "chempack"
/obj/item/storage/backpack/syndie
name = "syndicate rucksack"
desc = "The latest in carbon fiber and red satin combat rucksack technology. Comfortable and tough!"
icon_state = "syndiepack"
item_state = "syndiepack"
empty_delay = 0.8 SECOND
/*
@@ -158,52 +170,61 @@
max_storage_space = 32
allow_quick_empty = FALSE // Pouches 'n shit.
/obj/item/storage/backpack/satchel_norm
/obj/item/storage/backpack/satchel/norm
name = "satchel"
desc = "A trendy looking satchel."
icon_state = "satchel-norm"
item_state = "satchel-norm"
/obj/item/storage/backpack/satchel_eng
/obj/item/storage/backpack/satchel/eng
name = "industrial satchel"
desc = "A tough satchel with extra pockets."
icon_state = "satchel-eng"
item_state = "satchel-eng"
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/satchel_med
/obj/item/storage/backpack/satchel/med
name = "medical satchel"
desc = "A sterile satchel used in medical departments."
icon_state = "satchel-med"
item_state = "satchel-med"
/obj/item/storage/backpack/satchel_pharm
/obj/item/storage/backpack/satchel/pharm
name = "pharmacist satchel"
desc = "A sterile satchel with pharmacist colours."
icon_state = "satchel-chem"
item_state = "satchel-chem"
/obj/item/storage/backpack/satchel_tox
/obj/item/storage/backpack/satchel/tox
name = "scientist satchel"
desc = "Useful for holding research materials."
icon_state = "satchel-tox"
item_state = "satchel-tox"
/obj/item/storage/backpack/satchel_sec
/obj/item/storage/backpack/satchel/sec
name = "security satchel"
desc = "A robust satchel for security related needs."
icon_state = "satchel-sec"
item_state = "satchel-sec"
/obj/item/storage/backpack/satchel_hyd
/obj/item/storage/backpack/satchel/hyd
name = "hydroponics satchel"
desc = "A green satchel for plant related work."
icon_state = "satchel-hyd"
item_state = "satchel-hyd"
/obj/item/storage/backpack/satchel_cap
/obj/item/storage/backpack/satchel/cap
name = "captain's satchel"
desc = "An exclusive satchel for officers."
icon_state = "satchel-cap"
item_state = "satchel-cap"
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/satchel_syndie
/obj/item/storage/backpack/satchel/syndie
name = "syndicate satchel"
desc = "A satchel in the new age style of a multi-corperate terrorist organisation."
icon_state = "satchel-syndie"
item_state = "satchel-syndie"
empty_delay = 0.8 SECOND
//ERT backpacks.
@@ -211,6 +232,7 @@
name = "emergency response team backpack"
desc = "A spacious backpack with lots of pockets, used by members of the Emergency Response Team."
icon_state = "ert_commander"
item_state = "ert_commander"
empty_delay = 0.8 SECOND
//Commander
@@ -223,18 +245,21 @@
name = "emergency response team security backpack"
desc = "A spacious backpack with lots of pockets, worn by security members of an Emergency Response Team."
icon_state = "ert_security"
item_state = "ert_security"
//Engineering
/obj/item/storage/backpack/ert/engineer
name = "emergency response team engineer backpack"
desc = "A spacious backpack with lots of pockets, worn by engineering members of an Emergency Response Team."
icon_state = "ert_engineering"
item_state = "ert_engineering"
//Medical
/obj/item/storage/backpack/ert/medical
name = "emergency response team medical backpack"
desc = "A spacious backpack with lots of pockets, worn by medical members of an Emergency Response Team."
icon_state = "ert_medical"
item_state = "ert_medical"
// Duffel Bags
@@ -242,6 +267,7 @@
name = "duffel bag"
desc = "A spacious duffel bag."
icon_state = "duffel-norm"
item_state = "duffel-norm"
slowdown = 1
max_storage_space = 38
@@ -249,43 +275,51 @@
name = "captain's duffel bag"
desc = "A rare and special duffel bag for only the most air-headed of SCC personnel."
icon_state = "duffel-captain"
item_state = "duffel-captain"
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/duffel/hyd
name = "botanist's duffel bag"
desc = "A specially designed duffel bag for containing plant matter, regardless of how questionable it may be."
icon_state = "duffel-hydroponics"
item_state = "duffel-hydroponics"
/obj/item/storage/backpack/duffel/med
name = "medical duffel bag"
desc = "A sterilized duffel bag for the young, upcoming lesbayan."
icon_state = "duffel-medical"
item_state = "duffel-medical"
/obj/item/storage/backpack/duffel/eng
name = "industrial duffel bag"
desc = "A rough and tumble duffel bag for the hard working wrench-monkey of tomorrow."
icon_state = "duffel-engineering"
item_state = "duffel-engineering"
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/duffel/tox
name = "scientist's duffel bag"
desc = "Handy when it comes to storing volatile materials of the anomalous persuasion."
icon_state = "duffel-toxins"
item_state = "duffel-toxins"
/obj/item/storage/backpack/duffel/sec
name = "security duffel bag"
desc = "A grey and blue duffel bag for the boys in colour, with room for all the batons and flashbangs you could ever need."
icon_state = "duffel-security"
item_state = "duffel-security"
/obj/item/storage/backpack/duffel/pharm
name = "pharmacy duffel bag"
desc = "Spice up the love life a little."
icon_state = "duffel-chemistry"
item_state = "duffel-chemistry"
/obj/item/storage/backpack/duffel/syndie
name = "syndicate duffel bag"
desc = "A snazzy black and red duffel bag, perfect for smuggling C4 and Parapens. It seems to be made of a lighter material."
icon_state = "duffel-syndie"
item_state = "duffel-syndie"
slowdown = 0
empty_delay = 0.8 SECOND
@@ -298,52 +332,62 @@
desc = "A sturdy backpack worn over one shoulder."
icon = 'icons/obj/storage/courierbag.dmi'
icon_state = "courierbag"
item_state = "courierbag"
/obj/item/storage/backpack/messenger/pharm
name = "pharmacy messenger bag"
desc = "A serile backpack worn over one shoulder. This one is in pharmacy colors."
icon_state = "courierbagchem"
item_state = "courierbagchem"
/obj/item/storage/backpack/messenger/med
name = "medical messenger bag"
desc = "A sterile backpack worn over one shoulder used in medical departments."
icon_state = "courierbagmed"
item_state = "courierbagmed"
/obj/item/storage/backpack/messenger/tox
name = "research messenger bag"
desc = "A backpack worn over one shoulder. Useful for holding science materials."
icon_state = "courierbagtox"
item_state = "courierbagtox"
/obj/item/storage/backpack/messenger/com
name = "captain's messenger bag"
desc = "A special backpack worn over one shoulder. This one is made specifically for command officers."
icon_state = "courierbagcom"
item_state = "courierbagcom"
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/messenger/engi
name = "engineering messenger bag"
desc = "A strong backpack worn over one shoulder. This one is designed for industrial work."
icon_state = "courierbagengi"
item_state = "courierbagengi"
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/messenger/hyd
name = "hydroponics messenger bag"
desc = "A backpack worn over one shoulder. This one is designed for plant-related work."
icon_state = "courierbaghyd"
item_state = "courierbaghyd"
/obj/item/storage/backpack/messenger/sec
name = "security messenger bag"
desc = "A tactical backpack worn over one shoulder. This one is in security colors."
icon_state = "courierbagsec"
item_state = "courierbagsec"
/obj/item/storage/backpack/messenger/syndie
name = "syndicate messenger bag"
desc = "A sturdy backpack worn over one shoulder. This one is in red and black menacing colors."
icon_state = "courierbagsyndie"
item_state = "courierbagsyndie"
/obj/item/storage/backpack/legion
name = "military rucksack"
desc = "A sturdy backpack with the emblems and markings of the Tau Ceti Foreign Legion."
icon_state = "legion_bag"
item_state = "legion_bag"
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/typec
@@ -352,6 +396,7 @@
desc = "The wings of a CB Caste Vaurca. They are far too small at this stage to permit sustained periods of flight in most situations."
icon_state = "wings"
item_state = "wings"
contained_sprite = FALSE
w_class = ITEMSIZE_HUGE
slot_flags = SLOT_BACK
max_storage_space = 12
@@ -395,6 +440,7 @@
name = "idris service backpack"
desc = "The infamously Idris Service Standard refers to this monstrous, self-stabilizing back-mounted utensil and service item holder, not anything professional."
icon_state = "idris_backpack"
item_state = "idris_backpack"
storage_slots = 6
max_w_class = ITEMSIZE_LARGE
can_hold = list(
+9 -9
View File
@@ -434,15 +434,15 @@
/obj/item/storage/backpack/cloak = 2,
/obj/item/storage/backpack/syndie = 1,
/obj/item/storage/backpack/satchel = 3,
/obj/item/storage/backpack/satchel_norm = 3,
/obj/item/storage/backpack/satchel_eng = 3,
/obj/item/storage/backpack/satchel_med = 3,
/obj/item/storage/backpack/satchel_pharm = 3,
/obj/item/storage/backpack/satchel_tox = 3,
/obj/item/storage/backpack/satchel_sec = 3,
/obj/item/storage/backpack/satchel_hyd = 3,
/obj/item/storage/backpack/satchel_cap = 1,
/obj/item/storage/backpack/satchel_syndie = 1,
/obj/item/storage/backpack/satchel/norm = 3,
/obj/item/storage/backpack/satchel/eng = 3,
/obj/item/storage/backpack/satchel/med = 3,
/obj/item/storage/backpack/satchel/pharm = 3,
/obj/item/storage/backpack/satchel/tox = 3,
/obj/item/storage/backpack/satchel/sec = 3,
/obj/item/storage/backpack/satchel/hyd = 3,
/obj/item/storage/backpack/satchel/cap = 1,
/obj/item/storage/backpack/satchel/syndie = 1,
/obj/item/storage/backpack/ert = 1,
/obj/item/storage/backpack/ert/security = 1,
/obj/item/storage/backpack/ert/engineer = 1,
@@ -7,7 +7,7 @@
if(prob(50))
new /obj/item/storage/backpack/industrial(src)
else
new /obj/item/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/storage/backpack/duffel/eng(src)
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/blueprints(src)
@@ -40,7 +40,7 @@
/obj/structure/closet/secure_closet/engineering_chief2/fill()
new /obj/item/storage/backpack/industrial(src)
new /obj/item/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/clothing/accessory/storage/webbing(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
@@ -96,7 +96,7 @@
if(prob(50))
new /obj/item/storage/backpack/industrial(src)
else
new /obj/item/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/storage/backpack/duffel/eng(src)
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/storage/toolbox/mechanical(src)
@@ -117,7 +117,7 @@
if(prob(50))
new /obj/item/storage/backpack/industrial(src)
else
new /obj/item/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/storage/backpack/duffel/eng(src)
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/clothing/suit/fire/atmos(src)
@@ -39,7 +39,7 @@
if(prob(50))
new /obj/item/storage/backpack/medic(src)
else
new /obj/item/storage/backpack/satchel_med(src)
new /obj/item/storage/backpack/satchel/med(src)
new /obj/item/storage/backpack/duffel/med(src)
new /obj/item/clothing/head/nursehat (src)
switch(pick("blue", "green", "purple"))
@@ -81,7 +81,7 @@
/obj/structure/closet/secure_closet/medical_fr/fill()
..()
new /obj/item/storage/backpack/satchel_med(src)
new /obj/item/storage/backpack/satchel/med(src)
new /obj/item/storage/backpack/duffel/med(src)
new /obj/item/clothing/head/hardhat/first_responder(src)
new /obj/item/device/radio/headset/headset_med(src)
@@ -118,7 +118,7 @@
if(prob(50))
new /obj/item/storage/backpack/medic(src)
else
new /obj/item/storage/backpack/satchel_med(src)
new /obj/item/storage/backpack/satchel/med(src)
new /obj/item/storage/backpack/duffel/med(src)
new /obj/item/clothing/suit/bio_suit/cmo(src)
new /obj/item/clothing/head/bio_hood/cmo(src)
@@ -145,7 +145,7 @@
/obj/structure/closet/secure_closet/CMO2/fill()
new /obj/item/storage/backpack/medic(src)
new /obj/item/storage/backpack/satchel_med(src)
new /obj/item/storage/backpack/satchel/med(src)
new /obj/item/clothing/under/rank/medical/surgeon/pmc(src)
new /obj/item/clothing/head/surgery/pmc(src)
new /obj/item/clothing/under/rank/medical/surgeon/idris(src)
@@ -8,7 +8,7 @@
if(prob(50))
new /obj/item/storage/backpack(src)
else
new /obj/item/storage/backpack/satchel_norm(src)
new /obj/item/storage/backpack/satchel/norm(src)
new /obj/item/device/radio/headset(src)
new /obj/item/device/radio/headset/alt(src)
@@ -8,7 +8,7 @@
if(prob(50))
new /obj/item/storage/backpack/captain(src)
else
new /obj/item/storage/backpack/satchel_cap(src)
new /obj/item/storage/backpack/satchel/cap(src)
new /obj/item/storage/backpack/duffel/cap(src)
// Armor
new /obj/item/clothing/head/helmet(src)
@@ -33,7 +33,7 @@
/obj/structure/closet/secure_closet/captains2/fill()
new /obj/item/storage/backpack/captain(src)
new /obj/item/storage/backpack/satchel_cap(src)
new /obj/item/storage/backpack/satchel/cap(src)
new /obj/item/clothing/suit/captunic(src)
new /obj/item/clothing/suit/captunic/capjacket(src)
new /obj/item/clothing/head/caphat(src)
@@ -103,7 +103,7 @@
if(prob(50))
new /obj/item/storage/backpack/security(src)
else
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/storage/backpack/satchel/sec(src)
new /obj/item/storage/backpack/duffel/sec(src)
new /obj/item/clothing/suit/armor/carrier/hos(src)
new /obj/item/clothing/accessory/leg_guard(src)
@@ -143,7 +143,7 @@
if(prob(50))
new /obj/item/storage/backpack/security(src)
else
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/storage/backpack/satchel/sec(src)
new /obj/item/storage/backpack/duffel/sec(src)
new /obj/item/clothing/suit/armor/carrier/hos(src)
new /obj/item/clothing/accessory/leg_guard(src)
@@ -174,7 +174,7 @@
if(prob(50))
new /obj/item/storage/backpack/security(src)
else
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/storage/backpack/satchel/sec(src)
new /obj/item/storage/backpack/duffel/sec(src)
new /obj/item/clothing/suit/armor/carrier/officer(src)
new /obj/item/clothing/accessory/arm_guard(src)
@@ -209,7 +209,7 @@
if(prob(50))
new /obj/item/storage/backpack/security(src)
else
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/storage/backpack/satchel/sec(src)
new /obj/item/storage/backpack/duffel/sec(src)
new /obj/item/clothing/head/beret/security(src)
new /obj/item/clothing/head/softcap/security(src)
@@ -238,7 +238,7 @@
if(prob(50))
new /obj/item/storage/backpack/security(src)
else
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/storage/backpack/satchel/sec(src)
new /obj/item/storage/backpack/duffel/sec(src)
new /obj/item/clothing/suit/armor/carrier/officer(src)
new /obj/item/clothing/accessory/arm_guard(src)
@@ -357,4 +357,4 @@
new /obj/item/device/radio/headset/headset_com(src)
new /obj/item/device/radio/headset/headset_com/alt(src)
new /obj/item/device/radio/off(src)
new /obj/item/device/gps(src)
new /obj/item/device/gps(src)
@@ -86,7 +86,7 @@
if(prob(50))
new /obj/item/storage/backpack/captain(src)
else
new /obj/item/storage/backpack/satchel_cap(src)
new /obj/item/storage/backpack/satchel/cap(src)
new /obj/item/clothing/under/rank/sol/dress/officer(src)
new /obj/item/clothing/head/sol/dress/officer(src)
new /obj/item/clothing/suit/storage/vest(src)
@@ -68,7 +68,7 @@
possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_UNATHI)
/datum/ghostspawner/human/rescuepodsurv/select_spawnlocation(var/use=TRUE)
var/list/possible_areas = list(/area/exoplanet/barren/asteroid)
var/list/possible_areas = list(/area/exoplanet/barren/asteroid)
var/turf/T = pick_area_turf(pick(possible_areas))
if(!use) //If we are just checking if we can get one, return the turf we found
return T
@@ -288,7 +288,7 @@
uniform = /obj/item/clothing/under/rank/sol/
shoes = /obj/item/clothing/shoes/jackboots
belt = /obj/item/storage/belt/military
back = /obj/item/storage/backpack/satchel_norm
back = /obj/item/storage/backpack/satchel/norm
head = /obj/item/clothing/head/helmet/space/void/sol
suit = /obj/item/clothing/suit/space/void/sol
suit_store = /obj/item/tank/oxygen
+1 -1
View File
@@ -10,7 +10,7 @@
if(prob(50))
new /obj/item/storage/backpack/industrial(src)
else
new /obj/item/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/satchel/eng(src)
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/clothing/under/rank/miner(src)
new /obj/item/clothing/gloves/black(src)
+41
View File
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Wowzewow (Wezzy)
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixes broken job-specific satchels and bags."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

+7 -7
View File
@@ -467,7 +467,7 @@
/obj/item/storage/backpack/messenger,
/obj/item/storage/backpack/satchel/withwallet,
/obj/item/storage/backpack/duffel,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel/norm,
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/circuit.dmi';
icon_state = "bcircuit"
@@ -3566,14 +3566,14 @@
/obj/item/storage/backpack/messenger/syndie,
/obj/item/storage/backpack/duffel/syndie,
/obj/item/storage/backpack/duffel/syndie,
/obj/item/storage/backpack/satchel_syndie,
/obj/item/storage/backpack/satchel_syndie,
/obj/item/storage/backpack/satchel/syndie,
/obj/item/storage/backpack/satchel/syndie,
/obj/item/storage/backpack/syndie,
/obj/item/storage/backpack/syndie,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel,
/obj/item/storage/backpack/satchel,
/obj/item/storage/backpack/satchel,
+1 -1
View File
@@ -111,7 +111,7 @@
uniform = /obj/item/clothing/under/rank/engineer/heph
shoes = /obj/item/clothing/shoes/jackboots
back = /obj/item/storage/backpack/satchel_norm
back = /obj/item/storage/backpack/satchel/norm
belt = /obj/item/storage/belt/utility/full
accessory = /obj/item/clothing/accessory/storage/pouches/black
+3 -3
View File
@@ -24,7 +24,7 @@
uniform = /obj/item/clothing/under/rank/sol/
shoes = /obj/item/clothing/shoes/jackboots
back = /obj/item/storage/backpack/satchel_norm
back = /obj/item/storage/backpack/satchel/norm
belt = /obj/item/storage/belt/utility/full
head = /obj/item/clothing/head/sol
accessory = /obj/item/clothing/accessory/storage/brown_vest
@@ -99,7 +99,7 @@
uniform = /obj/item/clothing/under/rank/sol/marine
shoes = /obj/item/clothing/shoes/jackboots
back = /obj/item/storage/backpack/satchel_norm
back = /obj/item/storage/backpack/satchel/norm
belt = /obj/item/storage/belt/military
head = /obj/item/clothing/head/sol/marine
accessory = /obj/item/clothing/accessory/storage/pouches/black
@@ -145,7 +145,7 @@
uniform = /obj/item/clothing/under/rank/sol/
shoes = /obj/item/clothing/shoes/jackboots
back = /obj/item/storage/backpack/satchel_norm
back = /obj/item/storage/backpack/satchel/norm
belt = /obj/item/storage/belt/utility/full
head = /obj/item/clothing/head/sol
accessory = /obj/item/clothing/accessory/storage/brown_vest
+1 -1
View File
@@ -23,7 +23,7 @@
uniform = /obj/item/clothing/under/syndicate/tracksuit
shoes = /obj/item/clothing/shoes/workboots
back = /obj/item/storage/backpack/satchel_norm
back = /obj/item/storage/backpack/satchel/norm
id = /obj/item/card/id/freighter_crew_ship
@@ -467,7 +467,7 @@
/obj/item/storage/backpack/messenger,
/obj/item/storage/backpack/satchel/withwallet,
/obj/item/storage/backpack/duffel,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel/norm,
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/circuit.dmi';
icon_state = "bcircuit"
@@ -3588,14 +3588,14 @@
/obj/item/storage/backpack/messenger/syndie,
/obj/item/storage/backpack/duffel/syndie,
/obj/item/storage/backpack/duffel/syndie,
/obj/item/storage/backpack/satchel_syndie,
/obj/item/storage/backpack/satchel_syndie,
/obj/item/storage/backpack/satchel/syndie,
/obj/item/storage/backpack/satchel/syndie,
/obj/item/storage/backpack/syndie,
/obj/item/storage/backpack/syndie,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel,
/obj/item/storage/backpack/satchel,
/obj/item/storage/backpack/satchel,
@@ -20349,7 +20349,7 @@
/obj/item/storage/backpack/messenger,
/obj/item/storage/backpack/satchel/withwallet,
/obj/item/storage/backpack/duffel,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel/norm,
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/circuit.dmi';
icon_state = "bcircuit"
@@ -30224,14 +30224,14 @@
/obj/item/storage/backpack/messenger/syndie,
/obj/item/storage/backpack/duffel/syndie,
/obj/item/storage/backpack/duffel/syndie,
/obj/item/storage/backpack/satchel_syndie,
/obj/item/storage/backpack/satchel_syndie,
/obj/item/storage/backpack/satchel/syndie,
/obj/item/storage/backpack/satchel/syndie,
/obj/item/storage/backpack/syndie,
/obj/item/storage/backpack/syndie,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel_norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel/norm,
/obj/item/storage/backpack/satchel,
/obj/item/storage/backpack/satchel,
/obj/item/storage/backpack/satchel,
+1 -1
View File
@@ -588,7 +588,7 @@
/area/derelict/ship)
"bR" = (
/obj/structure/table/reinforced/steel,
/obj/item/storage/backpack/satchel_med,
/obj/item/storage/backpack/satchel/med,
/obj/machinery/light{
dir = 1
},