From 03dae580a9c51d4be822035cf308ad8bc7bf65da Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Fri, 22 Nov 2019 14:08:12 -0500 Subject: [PATCH 1/4] Minor QoL and Wardrobe Updates --- code/game/objects/items/storage/belt.dm | 4 +++- code/modules/cargo/bounties/assistant.dm | 6 +++--- code/modules/vending/clothesmate.dm | 5 +++++ code/modules/vending/wardrobes.dm | 4 +++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 713dbe4133..6cba9c77b8 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -575,7 +575,9 @@ /obj/item/clothing/gloves, /obj/item/melee/flyswatter, /obj/item/paint/paint_remover, - /obj/item/assembly/mousetrap + /obj/item/assembly/mousetrap, + /obj/item/screwdriver, + /obj/item/stack/cable_coil )) /obj/item/storage/belt/bandolier diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index d65c595b8f..b8f026d890 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -201,10 +201,10 @@ wanted_types = list(/obj/item/restraints/legcuffs/bola) /datum/bounty/item/assistant/metalshields - name = "Metal Shields" + name = "Metal Shields" //I didnt realise how much work it was to make these, you need 6 Cloth, 9 Leather, Tools, 30 Metal, and 3 Cable Coil Stacks for this. description = "NT is testing the effects of electricity on clowns wielding metal shields. We have clowns, and we have electricity. Send us the shields." - reward = 1400 - required_count = 4 + reward = 2300 + required_count = 3 wanted_types = list(/obj/item/shield/makeshift) /datum/bounty/item/assistant/toolbelts diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index c66e350af6..7ca5f74492 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -12,6 +12,7 @@ /obj/item/clothing/suit/jacket = 4, /obj/item/clothing/suit/jacket/puffer/vest = 4, /obj/item/clothing/suit/jacket/puffer = 4, + /obj/item/clothing/suit/hooded/cloak/david = 4, /obj/item/clothing/under/suit_jacket/navy = 3, /obj/item/clothing/under/suit_jacket/really_black = 3, /obj/item/clothing/under/suit_jacket/burgundy = 3, @@ -74,6 +75,10 @@ /obj/item/clothing/suit/ianshirt = 3, /obj/item/clothing/shoes/laceup = 5, /obj/item/clothing/shoes/sneakers/black = 6, + /obj/item/clothing/shoes/wraps = 3, + /obj/item/clothing/shoes/wraps/silver = 3, + /obj/item/clothing/shoes/wraps/red = 3, + /obj/item/clothing/shoes/wraps/blue = 3, /obj/item/clothing/shoes/sandal = 3, /obj/item/clothing/gloves/fingerless = 3, /obj/item/clothing/glasses/orange = 5, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index adaa56fc6d..159887cf49 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -273,7 +273,9 @@ /obj/item/storage/bag/trash = 1, /obj/item/clothing/shoes/galoshes = 1, /obj/item/watertank/janitor = 1, - /obj/item/storage/belt/janitor = 2) + /obj/item/storage/belt/janitor = 2, + /obj/item/screwdriver = 2, + /obj/item/stack/cable_coil/random = 4) refill_canister = /obj/item/vending_refill/wardrobe/jani_wardrobe /obj/item/vending_refill/wardrobe/jani_wardrobe From eee8c8c108389ecd12a2d7516d9f478adceb14fe Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sat, 23 Nov 2019 03:11:00 -0500 Subject: [PATCH 2/4] Shields Bounty is now 2 for 3000 --- code/modules/cargo/bounties/assistant.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index b8f026d890..9e26cd25fc 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -201,10 +201,10 @@ wanted_types = list(/obj/item/restraints/legcuffs/bola) /datum/bounty/item/assistant/metalshields - name = "Metal Shields" //I didnt realise how much work it was to make these, you need 6 Cloth, 9 Leather, Tools, 30 Metal, and 3 Cable Coil Stacks for this. + name = "Metal Shields" //I didnt realise how much work it was to make these, you need 2 Cloth, 3 Leather, Tools, 10 Metal, and a Cable Coil Stack for each one. description = "NT is testing the effects of electricity on clowns wielding metal shields. We have clowns, and we have electricity. Send us the shields." - reward = 2300 - required_count = 3 + reward = 3000 + required_count = 2 wanted_types = list(/obj/item/shield/makeshift) /datum/bounty/item/assistant/toolbelts From fb4a47d310014c6de9c6e94c11fd380be007d931 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sat, 23 Nov 2019 15:58:04 -0500 Subject: [PATCH 3/4] Added more items to vendors. -Added stuff to the following: clothing vendor chef utensil vendor snack vendors kinkmate --- code/modules/reagents/reagent_containers/bottle.dm | 5 +++++ code/modules/vending/clothesmate.dm | 9 ++++++++- code/modules/vending/drinnerware.dm | 12 +++++++++--- code/modules/vending/snack.dm | 13 ++++++++++--- modular_citadel/code/game/machinery/vending.dm | 4 +++- 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index afe48ab3fb..0ee131bc14 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -77,6 +77,11 @@ desc = "A small bottle of charcoal, which removes toxins and other chemicals from the bloodstream." list_reagents = list("charcoal" = 30) +/obj/item/reagent_containers/glass/bottle/cryoxadone + name = "cryoxadone bottle" + desc = "A small bottle of cryoxadone, heals most types of damage when used in extremely cold enviornments." + list_reagents = list("cryoxadone" = 30) + /obj/item/reagent_containers/glass/bottle/mutagen name = "unstable mutagen bottle" desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact." diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 7ca5f74492..f2307cad3e 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -21,6 +21,12 @@ /obj/item/clothing/under/kilt = 3, /obj/item/clothing/under/overalls = 3, /obj/item/clothing/under/sl_suit = 3, + /obj/item/clothing/under/bb_sweater = 3, + /obj/item/clothing/under/bb_sweater/black = 3, + /obj/item/clothing/under/bb_sweater/purple = 3, + /obj/item/clothing/under/bb_sweater/green = 3, + /obj/item/clothing/under/bb_sweater/red = 3, + /obj/item/clothing/under/bb_sweater/blue = 3, /obj/item/clothing/under/pants/jeans = 5, /obj/item/clothing/under/pants/classicjeans = 5, /obj/item/clothing/under/pants/camo = 3, @@ -117,7 +123,8 @@ /obj/item/clothing/under/jabroni = 2, /obj/item/clothing/suit/vapeshirt = 2, /obj/item/clothing/under/geisha = 4, - /obj/item/clothing/accessory/syndi_pokadots = 4) + /obj/item/clothing/accessory/syndi_pokadots = 4, + /obj/item/clothing/under/keyholesweater = 3) premium = list(/obj/item/clothing/under/suit_jacket/checkered = 4, /obj/item/clothing/head/mailman = 2, /obj/item/clothing/under/rank/mailman = 2, diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm index 0cd68e818a..1c29fff137 100644 --- a/code/modules/vending/drinnerware.dm +++ b/code/modules/vending/drinnerware.dm @@ -6,7 +6,7 @@ products = list(/obj/item/storage/bag/tray = 8, /obj/item/kitchen/fork = 6, /obj/item/kitchen/knife = 6, - /obj/item/kitchen/rollingpin = 2, + /obj/item/kitchen/rollingpin = 4, /obj/item/reagent_containers/food/drinks/drinkingglass = 8, /obj/item/clothing/suit/apron/chef = 2, /obj/item/storage/box/cups = 2, @@ -17,7 +17,13 @@ /obj/item/reagent_containers/food/condiment/saltshaker = 5, /obj/item/reagent_containers/food/condiment/peppermill = 5, /obj/item/reagent_containers/glass/bowl = 30) - contraband = list(/obj/item/kitchen/rollingpin = 2, - /obj/item/kitchen/knife/butcher = 2) + contraband = list( + /obj/item/reagent_containers/food/snacks/monkeycube = 1, + /obj/item/kitchen/knife/butcher = 2, + /obj/item/reagent_containers/syringe = 3) + premium = list( + /obj/item/reagent_containers/food/condiment/enzyme = 1, + /obj/item/reagent_containers/food/condiment/soysauce = 1, + /obj/item/reagent_containers/glass/bottle/cryoxadone = 2) // Bartender can literally make this with upgraded parts, or it gets stolen from medical. armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index c8d9035998..efb0905f6b 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -11,9 +11,16 @@ /obj/item/reagent_containers/food/snacks/no_raisin = 6, /obj/item/reagent_containers/food/snacks/spacetwinkie = 6, /obj/item/reagent_containers/food/snacks/cheesiehonkers = 6) - contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6) - premium = list(/obj/item/storage/box/donkpockets = 1, - /obj/item/reagent_containers/food/snacks/poppypretzel = 3) + contraband = list( + /obj/item/reagent_containers/food/snacks/cracker = 12, + /obj/item/reagent_containers/food/snacks/beans = 2, + /obj/item/reagent_containers/food/snacks/honeybar = 6, + /obj/item/reagent_containers/food/snacks/syndicake = 6) + premium = list( + /obj/item/reagent_containers/food/snacks/lollipop = 2, + /obj/item/reagent_containers/food/snacks/spiderlollipop = 2, + /obj/item/reagent_containers/food/snacks/chococoin = 1, + /obj/item/storage/box/donkpockets = 2) refill_canister = /obj/item/vending_refill/snack var/chef_compartment_access = "28" //ACCESS_KITCHEN diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index a71175c345..53fe6a8f56 100755 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -43,6 +43,7 @@ vend_reply = "Have fun, you shameless pervert!" products = list( /obj/item/clothing/under/maid = 5, + /obj/item/clothing/under/janimaid = 5, /obj/item/clothing/neck/petcollar = 5, /obj/item/clothing/neck/petcollar/choker = 5, /obj/item/clothing/neck/petcollar/leather = 5, @@ -51,6 +52,7 @@ /obj/item/clothing/mask/muzzle = 4, /obj/item/clothing/under/stripper_pink = 3, /obj/item/clothing/under/stripper_green = 3, + /obj/item/clothing/under/gear_harness = 10, /obj/item/dildo/custom = 5, /obj/item/electropack/shockcollar = 3, /obj/item/assembly/signaler = 3 @@ -60,6 +62,7 @@ /obj/item/key/collar = 2, /obj/item/clothing/head/kitty = 3, /obj/item/clothing/head/rabbitears = 3, + /obj/item/clothing/under/keyholesweater = 2, /obj/item/clothing/under/mankini = 2, /obj/item/clothing/under/jabroni = 2, /obj/item/dildo/flared/huge = 3, @@ -68,7 +71,6 @@ ) premium = list( /obj/item/clothing/accessory/skullcodpiece/fake = 3, - /obj/item/clothing/under/gear_harness = 10, /obj/item/reagent_containers/glass/bottle/hexacrocin = 10 ) refill_canister = /obj/item/vending_refill/kink From e7523862ebbe19ced56cd60402eb7ea287923bce Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Mon, 25 Nov 2019 06:02:50 -0500 Subject: [PATCH 4/4] Added Newspaperr to Loadout --- modular_citadel/code/modules/client/loadout/backpack.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index c2713b49be..66ed4f00c6 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -99,4 +99,9 @@ /datum/gear/tape name = "Spare cassette tape" category = SLOT_IN_BACKPACK - path = /obj/item/tape/random \ No newline at end of file + path = /obj/item/tape/random + +/datum/gear/newspaper + name = "Newspaper" + category = SLOT_IN_BACKPACK + path = /obj/item/newspaper \ No newline at end of file