From 9a021cff3d48028ffdd2a5bf27c049ebe47b5f2b Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 13:11:04 -0200 Subject: [PATCH 01/12] Stacks the papers inside a folder inside briefcase Makes all paper be neatly stacked inside a folder in the briefcase. --- .../objects/items/weapons/storage/briefcase.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 728d2a99ea1..e401cf12a83 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -16,13 +16,16 @@ /obj/item/weapon/storage/briefcase/New() ..() - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) new /obj/item/weapon/pen(src) + new /obj/item/weapon/folder/blue/New() + ..() + new /obj/item/weapon/paper(src) + new /obj/item/weapon/paper(src) + new /obj/item/weapon/paper(src) + new /obj/item/weapon/paper(src) + new /obj/item/weapon/paper(src) + new /obj/item/weapon/paper(src) + /obj/item/weapon/storage/briefcase/sniperbundle name = "briefcase" From 43bf151814523f78860f678a407988fe7d733886 Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 13:26:24 -0200 Subject: [PATCH 02/12] Stacks the papers inside a folder inside briefcase Briefcases now spawn with a pen and a blue folder, filled with papers, instead of spawning filled with papers. --- .../objects/items/weapons/storage/briefcase.dm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index e401cf12a83..717c184a568 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -14,17 +14,12 @@ burn_state = FLAMMABLE burntime = 20 -/obj/item/weapon/storage/briefcase/New() - ..() - new /obj/item/weapon/pen(src) - new /obj/item/weapon/folder/blue/New() - ..() - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) - new /obj/item/weapon/paper(src) + /obj/item/weapon/storage/briefcase/New() + ..() + new /obj/item/weapon/pen(src) + var/obj/item/weapon/folder/blue/folder = new(src) + for(var/i = 0, i < folder.storage_slots, i++) + new /obj/item/weapon/paper(folder ) /obj/item/weapon/storage/briefcase/sniperbundle From 3841d8b8eae1929acf0efd0ed3458ceb8622bc70 Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 13:35:00 -0200 Subject: [PATCH 03/12] Update briefcase.dm --- code/game/objects/items/weapons/storage/briefcase.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 717c184a568..349303def17 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -19,7 +19,7 @@ new /obj/item/weapon/pen(src) var/obj/item/weapon/folder/blue/folder = new(src) for(var/i = 0, i < folder.storage_slots, i++) - new /obj/item/weapon/paper(folder ) + new /obj/item/weapon/paper(folder) /obj/item/weapon/storage/briefcase/sniperbundle From 37d8bf27be5da516896ae05bf545302448e348dd Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 13:48:21 -0200 Subject: [PATCH 04/12] Update briefcase.dm --- code/game/objects/items/weapons/storage/briefcase.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 349303def17..a5f5f6dce5b 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -17,9 +17,14 @@ /obj/item/weapon/storage/briefcase/New() ..() new /obj/item/weapon/pen(src) + new /obj/item/weapon/stamp/law(src) var/obj/item/weapon/folder/blue/folder = new(src) - for(var/i = 0, i < folder.storage_slots, i++) - new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) /obj/item/weapon/storage/briefcase/sniperbundle From 4a31ab7b3e1ce72c63c31412474d730942ffe5c7 Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 14:00:55 -0200 Subject: [PATCH 05/12] Update briefcase.dm Fixed travis(?), added law stamp to briefcase --- .../objects/items/weapons/storage/briefcase.dm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index a5f5f6dce5b..0bc1e0a046c 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -15,16 +15,12 @@ burntime = 20 /obj/item/weapon/storage/briefcase/New() - ..() - new /obj/item/weapon/pen(src) - new /obj/item/weapon/stamp/law(src) - var/obj/item/weapon/folder/blue/folder = new(src) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) + ..() + new /obj/item/weapon/pen(src) + new /obj/item/weapon/stamp/law(src) + var/obj/item/weapon/folder/blue/folder = new(src) + for(var/i = 0, i < folder.storage_slots, i++) + new /obj/item/weapon/paper(folder) /obj/item/weapon/storage/briefcase/sniperbundle From 379cdde2842edf4d5e898964b10b1e6d4fa7779d Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 14:05:51 -0200 Subject: [PATCH 06/12] Update briefcase.dm gah --- code/game/objects/items/weapons/storage/briefcase.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 0bc1e0a046c..2e698e23f6d 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -14,7 +14,7 @@ burn_state = FLAMMABLE burntime = 20 - /obj/item/weapon/storage/briefcase/New() +/obj/item/weapon/storage/briefcase/New() ..() new /obj/item/weapon/pen(src) new /obj/item/weapon/stamp/law(src) From 4d92cb1506cc228135147653d28cc4e9fd225021 Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 14:12:59 -0200 Subject: [PATCH 07/12] Update briefcase.dm Removed Law Stamp from briefcases (Not all briefcases spawn at the law office) Tried to bribe travis with cookies. --- code/game/objects/items/weapons/storage/briefcase.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 2e698e23f6d..4b31e6720e5 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -17,11 +17,13 @@ /obj/item/weapon/storage/briefcase/New() ..() new /obj/item/weapon/pen(src) - new /obj/item/weapon/stamp/law(src) var/obj/item/weapon/folder/blue/folder = new(src) - for(var/i = 0, i < folder.storage_slots, i++) new /obj/item/weapon/paper(folder) - + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) /obj/item/weapon/storage/briefcase/sniperbundle name = "briefcase" From 4f0fc81b447cd00434dd9dfcdd5f3153fcf7e434 Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 16:10:58 -0200 Subject: [PATCH 08/12] Changing folder to generic yellow color Cookies to Travis. --- code/game/objects/items/weapons/storage/briefcase.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 4b31e6720e5..ce3749855cd 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -17,7 +17,7 @@ /obj/item/weapon/storage/briefcase/New() ..() new /obj/item/weapon/pen(src) - var/obj/item/weapon/folder/blue/folder = new(src) + var/obj/item/weapon/folder/yellow/folder = new(src) new /obj/item/weapon/paper(folder) new /obj/item/weapon/paper(folder) new /obj/item/weapon/paper(folder) From 66cfbb73160f4e0415242fe1f5d8a9b115d86acb Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 16:50:56 -0200 Subject: [PATCH 09/12] Fixes folder color. Defined a new briefcase type Cookies for travis Need to fix lawyers spawned briefcase. Will try to fix it. --- .../objects/items/weapons/storage/briefcase.dm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index ce3749855cd..dcb6937b7c4 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -16,15 +16,28 @@ /obj/item/weapon/storage/briefcase/New() ..() + if(!contents.len) + new /obj/item/weapon/pen(src) + var/obj/item/weapon/folder/folder = new(src) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + new /obj/item/weapon/paper(folder) + +/obj/item/weapon/storage/briefcase/lawyer/New() + new/obj/item/weapon/stamp/law new /obj/item/weapon/pen(src) - var/obj/item/weapon/folder/yellow/folder = new(src) + var/obj/item/weapon/folder/blue/folder = new(src) new /obj/item/weapon/paper(folder) new /obj/item/weapon/paper(folder) new /obj/item/weapon/paper(folder) new /obj/item/weapon/paper(folder) new /obj/item/weapon/paper(folder) new /obj/item/weapon/paper(folder) - + ..() + /obj/item/weapon/storage/briefcase/sniperbundle name = "briefcase" desc = "It's label reads genuine hardened Captain leather, but suspiciously has no other tags or branding. Smells like L'Air du Temps." From 25f6abbf1511f22ae6c786f9de10814a48925482 Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 17:01:35 -0200 Subject: [PATCH 10/12] Changes lawyer briefcase Gives a special spaceman a special briefcase (Actually a normal briefcase with other contents) --- code/game/jobs/job/civilian.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 1756bb2945a..0289a76ace8 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -153,7 +153,7 @@ Lawyer uniform = /obj/item/clothing/under/lawyer/bluesuit suit = /obj/item/clothing/suit/toggle/lawyer shoes = /obj/item/clothing/shoes/laceup - l_hand = /obj/item/weapon/storage/briefcase + l_hand = /obj/item/weapon/storage/briefcase/lawyer l_pocket = /obj/item/device/laser_pointer /datum/outfit/job/lawyer/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -166,4 +166,4 @@ Lawyer J.lawyers++ if(J.lawyers>1) uniform = /obj/item/clothing/under/lawyer/purpsuit - suit = /obj/item/clothing/suit/toggle/lawyer/purple \ No newline at end of file + suit = /obj/item/clothing/suit/toggle/lawyer/purple From 3aa209f2b8cb138c5a32e0633d5bb8070c3caf5f Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 17:43:28 -0200 Subject: [PATCH 11/12] Update briefcase.dm Complete code overhaul --- .../items/weapons/storage/briefcase.dm | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index dcb6937b7c4..9b26c28787d 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -13,29 +13,20 @@ attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") burn_state = FLAMMABLE burntime = 20 + var/folder_path = /obj/item/weapon/folder //this is the path of the folder that gets spawned in New() /obj/item/weapon/storage/briefcase/New() ..() - if(!contents.len) - new /obj/item/weapon/pen(src) - var/obj/item/weapon/folder/folder = new(src) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - -/obj/item/weapon/storage/briefcase/lawyer/New() - new/obj/item/weapon/stamp/law new /obj/item/weapon/pen(src) - var/obj/item/weapon/folder/blue/folder = new(src) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) - new /obj/item/weapon/paper(folder) + var/obj/item/weapon/folder/folder = new folder_path(src) + for(var/i in 1 to 6) + new /obj/item/weapon/paper(folder) + +/obj/item/weapon/storage/briefcase/lawyer + folder_path = obj/item/weapon/folder/blue + +/obj/item/weapon/storage/briefcase/lawyer/New() + new/obj/item/weapon/stamp/law(src) ..() /obj/item/weapon/storage/briefcase/sniperbundle From b9f7390786c88716fd01ab0851c7a3689433d48c Mon Sep 17 00:00:00 2001 From: SouDescolado Date: Wed, 30 Dec 2015 17:50:00 -0200 Subject: [PATCH 12/12] Update briefcase.dm Fixed bogus Cookies to travis --- code/game/objects/items/weapons/storage/briefcase.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 9b26c28787d..af55712f0ae 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -23,10 +23,10 @@ new /obj/item/weapon/paper(folder) /obj/item/weapon/storage/briefcase/lawyer - folder_path = obj/item/weapon/folder/blue + folder_path = /obj/item/weapon/folder/blue /obj/item/weapon/storage/briefcase/lawyer/New() - new/obj/item/weapon/stamp/law(src) + new /obj/item/weapon/stamp/law(src) ..() /obj/item/weapon/storage/briefcase/sniperbundle