From 70f7ef7d6f5ecbfb409c5b6c6d4600987ca3c871 Mon Sep 17 00:00:00 2001 From: mistyLuminescence Date: Sat, 17 Mar 2018 21:10:23 +0000 Subject: [PATCH 1/5] Wallet expansion! --- .../objects/items/weapons/storage/wallets.dm | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 02be9fdfaf..efa5ae3129 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -10,21 +10,42 @@ /obj/item/weapon/card, /obj/item/clothing/mask/smokable/cigarette/, /obj/item/device/flashlight/pen, + /obj/item/device/camera_bug, + /obj/item/device/gps, + /obj/item/device/tape, + /obj/item/device/hailer, + /obj/item/weapon/cartridge, + /obj/item/device/encryptionkey, + /obj/item/weapon/reagent_containers/glass/beaker/vial, + /obj/item/weapon/reagent_containers/pill, + /obj/item/weapon/reagent_containers/syringe, /obj/item/seeds, /obj/item/stack/medical, /obj/item/weapon/coin, /obj/item/weapon/dice, /obj/item/weapon/disk, + /obj/item/weapon/ducttape, /obj/item/weapon/implanter, /obj/item/weapon/flame/lighter, /obj/item/weapon/flame/match, + /obj/item/weapon/forensics, + /obj/item/weapon/glass_extra, + /obj/item/weapon/haircomb, + /obj/item/weapon/hand, + /obj/item/weapon/key, + /obj/item/weapon/lipstick, /obj/item/weapon/paper, /obj/item/weapon/pen, /obj/item/weapon/photo, /obj/item/weapon/reagent_containers/dropper, + /obj/item/weapon/sample, /obj/item/weapon/screwdriver, /obj/item/weapon/stamp, - /obj/item/clothing/accessory/permit + /obj/item/weapon/surgical/scalpel, + /obj/item/weapon/tape_roll, + /obj/item/toy/bosunwhistle, + /obj/item/clothing/accessory/permit, + /obj/item/clothing/accessory/badge ) slot_flags = SLOT_ID From 49f2a3281cd4c4f838bd541655d34321cb21b44d Mon Sep 17 00:00:00 2001 From: mistyLuminescence Date: Sat, 17 Mar 2018 21:13:47 +0000 Subject: [PATCH 2/5] changelog --- .../MistyLuminescence - Wallets.yml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/MistyLuminescence - Wallets.yml diff --git a/html/changelogs/MistyLuminescence - Wallets.yml b/html/changelogs/MistyLuminescence - Wallets.yml new file mode 100644 index 0000000000..56be452853 --- /dev/null +++ b/html/changelogs/MistyLuminescence - Wallets.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# + +# Your name. +author: N3X15 + +# 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: + - tweak: "Wallets can now hold a wider variety of objects." \ No newline at end of file From d644104f058745fef66d2d4c5a3ef32895306308 Mon Sep 17 00:00:00 2001 From: mistyLuminescence Date: Sat, 17 Mar 2018 21:20:19 +0000 Subject: [PATCH 3/5] actually puts my name in the changelog --- html/changelogs/MistyLuminescence - Wallets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/changelogs/MistyLuminescence - Wallets.yml b/html/changelogs/MistyLuminescence - Wallets.yml index 56be452853..085f19d40d 100644 --- a/html/changelogs/MistyLuminescence - Wallets.yml +++ b/html/changelogs/MistyLuminescence - Wallets.yml @@ -22,7 +22,7 @@ ################################# # Your name. -author: N3X15 +author: MistyLuminescence # Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True From 8769f4605ac6bdbdbd063be2feddeeecd0a5ab19 Mon Sep 17 00:00:00 2001 From: mistyLuminescence Date: Sun, 18 Mar 2018 03:20:36 +0000 Subject: [PATCH 4/5] trims list --- code/game/objects/items/weapons/storage/wallets.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index efa5ae3129..0ac2bfaf98 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -10,21 +10,15 @@ /obj/item/weapon/card, /obj/item/clothing/mask/smokable/cigarette/, /obj/item/device/flashlight/pen, - /obj/item/device/camera_bug, - /obj/item/device/gps, /obj/item/device/tape, - /obj/item/device/hailer, /obj/item/weapon/cartridge, /obj/item/device/encryptionkey, /obj/item/weapon/reagent_containers/glass/beaker/vial, - /obj/item/weapon/reagent_containers/pill, - /obj/item/weapon/reagent_containers/syringe, /obj/item/seeds, /obj/item/stack/medical, /obj/item/weapon/coin, /obj/item/weapon/dice, /obj/item/weapon/disk, - /obj/item/weapon/ducttape, /obj/item/weapon/implanter, /obj/item/weapon/flame/lighter, /obj/item/weapon/flame/match, @@ -41,9 +35,6 @@ /obj/item/weapon/sample, /obj/item/weapon/screwdriver, /obj/item/weapon/stamp, - /obj/item/weapon/surgical/scalpel, - /obj/item/weapon/tape_roll, - /obj/item/toy/bosunwhistle, /obj/item/clothing/accessory/permit, /obj/item/clothing/accessory/badge ) From dfc0dd48bcdd1a00a1541eca52d196fb09e4f552 Mon Sep 17 00:00:00 2001 From: mistyLuminescence Date: Fri, 30 Mar 2018 02:12:58 +0100 Subject: [PATCH 5/5] Removes vials --- code/game/objects/items/weapons/storage/wallets.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 0ac2bfaf98..cb376787ab 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -13,7 +13,6 @@ /obj/item/device/tape, /obj/item/weapon/cartridge, /obj/item/device/encryptionkey, - /obj/item/weapon/reagent_containers/glass/beaker/vial, /obj/item/seeds, /obj/item/stack/medical, /obj/item/weapon/coin,