cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

You can now select whether to start with a dufflebag. Also, you have the option to choose between generic or departmental bags.

Browse Source 
And for all you baystation fans, I added leather satchels while I was at it.

Minor change: Atmos techs now start with engineering bags.
This commit is contained in:
KazeEspada
2016-02-11 16:48:08 -07:00
parent 2b8d835771
commit 653902068e
13 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/lists/flavor_misc.dm
+8 -1
View File
@@ -29,7 +29,14 @@ var/global/list/frills_list = list()
var/global/list/spines_list = list()
var/global/list/animated_spines_list = list()
//Backpacks
var/global/list/backbaglist = list("Backpack", "Satchel")
#define GBACKPACK "Grey Backpack"
#define GSATCHEL "Grey Satchel"
#define GDUFFLEBAG "Grey Dufflebag"
#define LSATCHEL "Leather Satchel"
#define DBACKPACK "Department Backpack"
#define DSATCHEL "Department Satchel"
#define DDUFFLEBAG "Department Dufflebag"
var/global/list/backbaglist = list(GBACKPACK, GSATCHEL, GDUFFLEBAG, LSATCHEL, DBACKPACK, DSATCHEL, DDUFFLEBAG)
//Female Uniforms
var/global/list/female_clothing_icons = list()
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+3 -3
View File
@@ -172,9 +172,9 @@
/obj/structure/closet/wardrobe/atmospherics_yellow/New()
..()
contents = list()
new /obj/item/weapon/storage/backpack/dufflebag(src)
new /obj/item/weapon/storage/backpack/satchel_norm(src)
new /obj/item/weapon/storage/backpack(src)
new /obj/item/weapon/storage/backpack/dufflebag/engineering(src)
new /obj/item/weapon/storage/backpack/satchel_eng(src)
new /obj/item/weapon/storage/backpack/industrial(src)
for(var/i in 1 to 3)
new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src)
for(var/i in 1 to 3)
code/modules/client/preferences.dm
+4 -4
View File
@@ -49,7 +49,7 @@ var/list/preferences_datums = list()
var/underwear = "Nude" //underwear type
var/undershirt = "Nude" //undershirt type
var/socks = "Nude" //socks type
var/backbag = 1 //backpack type
var/backbag = GBACKPACK //backpack type
var/hair_style = "Bald" //Hair type
var/hair_color = "000" //Hair color
var/facial_hair_style = "Shaved" //Face hair type
@@ -193,7 +193,7 @@ var/list/preferences_datums = list()
dat += "<b>Underwear:</b><BR><a href ='?_src_=prefs;preference=underwear;task=input'>[underwear]</a><BR>"
dat += "<b>Undershirt:</b><BR><a href ='?_src_=prefs;preference=undershirt;task=input'>[undershirt]</a><BR>"
dat += "<b>Socks:</b><BR><a href ='?_src_=prefs;preference=socks;task=input'>[socks]</a><BR>"
dat += "<b>Backpack:</b><BR><a href ='?_src_=prefs;preference=bag;task=input'>[backbaglist[backbag]]</a><BR></td>"
dat += "<b>Backpack:</b><BR><a href ='?_src_=prefs;preference=bag;task=input'>[backbag]</a><BR></td>"
if(pref_species.use_skintones)
@@ -735,7 +735,7 @@ var/list/preferences_datums = list()
if("s_tone")
skin_tone = random_skin_tone()
if("bag")
backbag = rand(1,2)
backbag = pick(backbaglist)
if("all")
random_character()
@@ -934,7 +934,7 @@ var/list/preferences_datums = list()
if("bag")
var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference") as null|anything in backbaglist
if(new_backbag)
backbag = backbaglist.Find(new_backbag)
backbag = new_backbag
if("clown_name")
var/new_clown_name = reject_bad_name( input(user, "Choose your character's clown name:", "Character Preference") as text|null )
code/modules/client/preferences_savefile.dm
+2 -2
View File
@@ -2,7 +2,7 @@
#define SAVEFILE_VERSION_MIN 8
//This is the current version, anything below this will attempt to update (if it's not obsolete)
#define SAVEFILE_VERSION_MAX 12
#define SAVEFILE_VERSION_MAX 13
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
This proc checks if the current directory of the savefile S needs updating
@@ -375,7 +375,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0)
eye_color = sanitize_hexcolor(eye_color, 3, 0)
skin_tone = sanitize_inlist(skin_tone, skin_tones)
backbag = sanitize_integer(backbag, 1, backbaglist.len, initial(backbag))
backbag = sanitize_inlist(backbag, backbaglist)
features["mcolor"] = sanitize_hexcolor(features["mcolor"], 3, 0)
features["tail_lizard"] = sanitize_inlist(features["tail_lizard"], tails_list_lizard)
features["tail_human"] = sanitize_inlist(features["tail_human"], tails_list_human, "None")
code/modules/jobs/job_types/captain.dm
+1
View File
@@ -39,6 +39,7 @@ Captain
backpack = /obj/item/weapon/storage/backpack/captain
satchel = /obj/item/weapon/storage/backpack/satchel_cap
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/captain
/datum/outfit/job/captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
code/modules/jobs/job_types/cargo_service.dm
+4
View File
@@ -86,6 +86,7 @@ Shaft Miner
backpack = /obj/item/weapon/storage/backpack/industrial
satchel = /obj/item/weapon/storage/backpack/satchel_eng
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/engineering
box = /obj/item/weapon/storage/box/engineer
/*
@@ -186,6 +187,9 @@ Botanist
gloves =/obj/item/clothing/gloves/botanic_leather
suit_store = /obj/item/device/analyzer/plant_analyzer
backpack = /obj/item/weapon/storage/backpack/botany
satchel = /obj/item/weapon/storage/backpack/satchel_hyd
/*
Janitor
code/modules/jobs/job_types/civilian.dm
+2
View File
@@ -30,6 +30,7 @@ Clown
backpack = /obj/item/weapon/storage/backpack/clown
satchel = /obj/item/weapon/storage/backpack/clown
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/clown //strangely has a duffle
/datum/outfit/job/clown/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -84,6 +85,7 @@ Mime
backpack = /obj/item/weapon/storage/backpack/mime
satchel = /obj/item/weapon/storage/backpack/mime
/datum/outfit/job/mime/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
code/modules/jobs/job_types/civilian_chaplain.dm
+2
View File
@@ -24,6 +24,8 @@ Chaplain
belt = /obj/item/device/pda/chaplain
uniform = /obj/item/clothing/under/rank/chaplain
backpack_contents = list(/obj/item/device/camera/spooky = 1)
backpack = /obj/item/weapon/storage/backpack/cultpack
satchel = /obj/item/weapon/storage/backpack/cultpack
/datum/outfit/job/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
code/modules/jobs/job_types/engineering.dm
+5
View File
@@ -40,6 +40,7 @@ Chief Engineer
backpack = /obj/item/weapon/storage/backpack/industrial
satchel = /obj/item/weapon/storage/backpack/satchel_eng
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/engineering
box = /obj/item/weapon/storage/box/engineer
pda_slot = slot_l_store
@@ -85,6 +86,7 @@ Station Engineer
backpack = /obj/item/weapon/storage/backpack/industrial
satchel = /obj/item/weapon/storage/backpack/satchel_eng
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/engineering
box = /obj/item/weapon/storage/box/engineer
pda_slot = slot_l_store
@@ -117,5 +119,8 @@ Atmospheric Technician
uniform = /obj/item/clothing/under/rank/atmospheric_technician
r_pocket = /obj/item/device/analyzer
backpack = /obj/item/weapon/storage/backpack/industrial
satchel = /obj/item/weapon/storage/backpack/satchel_eng
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/engineering
box = /obj/item/weapon/storage/box/engineer
pda_slot = slot_l_store
code/modules/jobs/job_types/job.dm
+17 -4
View File
@@ -142,15 +142,28 @@
var/backpack = /obj/item/weapon/storage/backpack
var/satchel = /obj/item/weapon/storage/backpack/satchel_norm
var/dufflebag = /obj/item/weapon/storage/backpack/dufflebag
var/box = /obj/item/weapon/storage/box/survival
var/pda_slot = slot_belt
/datum/outfit/job/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H.backbag == 1) //Backpack
back = backpack
else //Satchel
back = satchel
switch(H.backbag)
//Grey backpacks are handled later.
if(GSATCHEL)
back = /obj/item/weapon/storage/backpack/satchel_norm //Grey satchel
if(GDUFFLEBAG)
back = /obj/item/weapon/storage/backpack/dufflebag //Grey Dufflebag
if(LSATCHEL)
back = /obj/item/weapon/storage/backpack/satchel //Leather Satchel
if(DBACKPACK)
back = backpack //Department backpack
if(DSATCHEL)
back = satchel //Department satchel
if(DDUFFLEBAG)
back = dufflebag //Department dufflebag
else
back = /obj/item/weapon/storage/backpack //Grey backpack
backpack_contents[box] = 1
code/modules/jobs/job_types/medical.dm
+13 -2
View File
@@ -38,6 +38,7 @@ Chief Medical Officer
backpack = /obj/item/weapon/storage/backpack/medic
satchel = /obj/item/weapon/storage/backpack/satchel_med
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/med
/datum/outfit/job/cmo/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -79,6 +80,7 @@ Medical Doctor
backpack = /obj/item/weapon/storage/backpack/medic
satchel = /obj/item/weapon/storage/backpack/satchel_med
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/med
/*
Chemist
@@ -109,6 +111,10 @@ Chemist
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/chemist
backpack = /obj/item/weapon/storage/backpack/chemistry
satchel = /obj/item/weapon/storage/backpack/satchel_chem
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/med
/*
Geneticist
*/
@@ -138,6 +144,10 @@ Geneticist
suit = /obj/item/clothing/suit/toggle/labcoat/genetics
suit_store = /obj/item/device/flashlight/pen
backpack = /obj/item/weapon/storage/backpack/genetics
satchel = /obj/item/weapon/storage/backpack/satchel_gen
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/med
/*
Virologist
*/
@@ -168,5 +178,6 @@ Virologist
suit = /obj/item/clothing/suit/toggle/labcoat/virologist
suit_store = /obj/item/device/flashlight/pen
backpack = /obj/item/weapon/storage/backpack/medic
satchel = /obj/item/weapon/storage/backpack/satchel_med
backpack = /obj/item/weapon/storage/backpack/virology
satchel = /obj/item/weapon/storage/backpack/satchel_vir
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/med
code/modules/jobs/job_types/science.dm
+9
View File
@@ -40,6 +40,9 @@ Research Director
l_pocket = /obj/item/device/laser_pointer
backpack_contents = list(/obj/item/weapon/melee/classic_baton/telescopic=1)
backpack = /obj/item/weapon/storage/backpack/science
satchel = /obj/item/weapon/storage/backpack/satchel_tox
/datum/outfit/job/rd/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -76,6 +79,9 @@ Scientist
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/science
backpack = /obj/item/weapon/storage/backpack/science
satchel = /obj/item/weapon/storage/backpack/satchel_tox
/*
Roboticist
*/
@@ -104,4 +110,7 @@ Roboticist
uniform = /obj/item/clothing/under/rank/roboticist
suit = /obj/item/clothing/suit/toggle/labcoat
backpack = /obj/item/weapon/storage/backpack/science
satchel = /obj/item/weapon/storage/backpack/satchel_tox
pda_slot = slot_l_store
code/modules/jobs/job_types/security.dm
+3
View File
@@ -49,6 +49,7 @@ Head of Security
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/sec
/datum/outfit/job/hos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -104,6 +105,7 @@ Warden
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/sec
/datum/outfit/job/warden/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -210,6 +212,7 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science")
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/sec
box = /obj/item/weapon/storage/box/security
var/department = null