Merge pull request #12776 from timothyteakettle/snail-shells
snail shell backpack
This commit is contained in:
@@ -116,15 +116,16 @@ GLOBAL_LIST_INIT(ai_core_display_screens, list(
|
||||
|
||||
GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY))
|
||||
|
||||
//Backpacks
|
||||
#define GBACKPACK "Grey Backpack"
|
||||
#define GSATCHEL "Grey Satchel"
|
||||
#define GDUFFELBAG "Grey Duffel Bag"
|
||||
#define LSATCHEL "Leather Satchel"
|
||||
//Backpacks
|
||||
#define DBACKPACK "Department Backpack"
|
||||
#define DSATCHEL "Department Satchel"
|
||||
#define DDUFFELBAG "Department Duffel Bag"
|
||||
GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, GBACKPACK, GSATCHEL, GDUFFELBAG, LSATCHEL))
|
||||
GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, //everything after this point is a non-department backpack
|
||||
"Grey Backpack" = /obj/item/storage/backpack,
|
||||
"Grey Satchel" = /obj/item/storage/backpack/satchel,
|
||||
"Grey Duffel Bag" = /obj/item/storage/backpack/duffelbag,
|
||||
"Leather Satchel" = /obj/item/storage/backpack/satchel/leather,
|
||||
"Snail Shell" = /obj/item/storage/backpack/snail))
|
||||
|
||||
//Suit/Skirt
|
||||
#define PREF_SUIT "Jumpsuit"
|
||||
|
||||
@@ -648,3 +648,9 @@ obj/item/storage/backpack/duffelbag/syndie/shredderbundle
|
||||
new /obj/item/gun/ballistic/automatic/flechette/shredder(src)
|
||||
new /obj/item/storage/belt/military(src)
|
||||
new /obj/item/clothing/suit/space/hardsuit/syndi/elite(src)
|
||||
|
||||
/obj/item/storage/backpack/snail
|
||||
name = "snail shell"
|
||||
desc = "Worn by snails as armor and storage compartment."
|
||||
icon_state = "snailshell"
|
||||
item_state = "snailshell"
|
||||
|
||||
@@ -203,21 +203,24 @@
|
||||
var/pda_slot = SLOT_BELT
|
||||
|
||||
/datum/outfit/job/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
|
||||
switch(preference_source?.prefs.backbag)
|
||||
if(GBACKPACK)
|
||||
back = /obj/item/storage/backpack //Grey backpack
|
||||
if(GSATCHEL)
|
||||
back = /obj/item/storage/backpack/satchel //Grey satchel
|
||||
if(GDUFFELBAG)
|
||||
back = /obj/item/storage/backpack/duffelbag //Grey Duffel bag
|
||||
if(LSATCHEL)
|
||||
back = /obj/item/storage/backpack/satchel/leather //Leather Satchel
|
||||
if(DSATCHEL)
|
||||
back = satchel //Department satchel
|
||||
if(DDUFFELBAG)
|
||||
back = duffelbag //Department duffel bag
|
||||
else
|
||||
back = backpack //Department backpack
|
||||
var/preference_backpack = preference_source?.prefs.backbag
|
||||
|
||||
if(preference_backpack)
|
||||
switch(preference_backpack)
|
||||
if(DBACKPACK)
|
||||
back = backpack //Department backpack
|
||||
if(DSATCHEL)
|
||||
back = satchel //Department satchel
|
||||
if(DDUFFELBAG)
|
||||
back = duffelbag //Department duffel bag
|
||||
else
|
||||
var/find_preference_backpack = GLOB.backbaglist[preference_backpack] //attempt to find non-department backpack
|
||||
if(find_preference_backpack)
|
||||
back = find_preference_backpack
|
||||
else //tried loading in a backpack that we don't allow as a loadout one
|
||||
back = backpack
|
||||
else //somehow doesn't have a preference set, should never reach this point but just-in-case
|
||||
back = backpack
|
||||
|
||||
//converts the uniform string into the path we'll wear, whether it's the skirt or regular variant
|
||||
var/holder
|
||||
|
||||
@@ -150,7 +150,8 @@
|
||||
/obj/item/clothing/under/costume/qipao/red = 3,
|
||||
/obj/item/clothing/under/costume/cheongsam = 3,
|
||||
/obj/item/clothing/under/costume/cheongsam/white = 3,
|
||||
/obj/item/clothing/under/costume/cheongsam/red = 3)
|
||||
/obj/item/clothing/under/costume/cheongsam/red = 3,
|
||||
/obj/item/storage/backpack/snail = 3)
|
||||
contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3,
|
||||
/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
|
||||
/obj/item/clothing/mask/balaclava = 3,
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 100 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 72 KiB |
Reference in New Issue
Block a user