diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index abcffc6a79..5dfcb7e10c 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -8,6 +8,7 @@ w_class = WEIGHT_CLASS_TINY light_color = LIGHT_COLOR_FIRE heat = 1000 + dropshrink = 0.8 var/wax = 1000 var/lit = FALSE var/infinite = FALSE diff --git a/code/game/objects/items/rogueitems/books.dm b/code/game/objects/items/rogueitems/books.dm index 6be231936d..247e445df3 100644 --- a/code/game/objects/items/rogueitems/books.dm +++ b/code/game/objects/items/rogueitems/books.dm @@ -659,6 +659,14 @@ ____________End of Example*/ base_icon_state = "book8" bookfile = "Neu_cooking.json" +/obj/item/book/rogue/advice_weaving + name = "A hundred kinds of stitches" + desc = "Howe to weave, tailor, and sundry tailoring. By Agnea Corazzani." + icon_state ="book8_0" + base_icon_state = "book8" + bookfile = "AdviceWeaving.json" + + /obj/item/book/rogue/psybibble name = "The Book" icon_state = "psybibble_0" diff --git a/code/game/objects/items/rogueitems/cup.dm b/code/game/objects/items/rogueitems/cup.dm index a5ad296622..d6acc89898 100644 --- a/code/game/objects/items/rogueitems/cup.dm +++ b/code/game/objects/items/rogueitems/cup.dm @@ -11,7 +11,7 @@ reagent_flags = OPENCONTAINER amount_per_transfer_from_this = 6 possible_transfer_amounts = list(6) - dropshrink = 0.8 + dropshrink = 0.7 w_class = WEIGHT_CLASS_NORMAL volume = 24 obj_flags = CAN_BE_HIT diff --git a/code/game/objects/items/rogueitems/keys.dm b/code/game/objects/items/rogueitems/keys.dm index 2c679180b1..4761b9bf8f 100644 --- a/code/game/objects/items/rogueitems/keys.dm +++ b/code/game/objects/items/rogueitems/keys.dm @@ -168,6 +168,8 @@ icon_state = "brownkey" lockid = "roomi" color = CLOTHING_CHALK_WHITE +/obj/item/roguekey/roomi/duchess + name = "duchess room key" /obj/item/roguekey/roomii name = "room II key" @@ -175,6 +177,8 @@ icon_state = "brownkey" lockid = "roomii" color = CLOTHING_CHALK_WHITE +/obj/item/roguekey/roomii/wanderer + name = "wanderer room key" /obj/item/roguekey/roomiii name = "room III key" @@ -182,6 +186,8 @@ icon_state = "brownkey" lockid = "roomiii" color = CLOTHING_CHALK_WHITE +/obj/item/roguekey/roomiii/yeoman + name = "yeoman room key" /obj/item/roguekey/roomiv name = "room IV key" @@ -189,6 +195,8 @@ icon_state = "brownkey" lockid = "roomiv" color = CLOTHING_CHALK_WHITE +/obj/item/roguekey/roomiv/castellan + name = "castellan room key" /obj/item/roguekey/roomv name = "room V key" @@ -287,7 +295,7 @@ lockid = "mason" /obj/item/roguekey/niteman - name = "nitemaster's key" + name = "nitemans key" desc = "The master key of the bathhouse." icon_state = "greenkey" lockid = "nightman" diff --git a/code/game/objects/items/rogueweapons/ranged/ammo.dm b/code/game/objects/items/rogueweapons/ranged/ammo.dm index e3e913da15..ebd1cc62a6 100644 --- a/code/game/objects/items/rogueweapons/ranged/ammo.dm +++ b/code/game/objects/items/rogueweapons/ranged/ammo.dm @@ -1,6 +1,7 @@ #define ARROW_DAMAGE 35 #define BOLT_DAMAGE 45 #define BULLET_DAMAGE 80 +#define BLOWDART_DAMAGE 20 #define ARROW_PENETRATION 25 #define BOLT_PENETRATION 50 #define BULLET_PENETRATION 100 @@ -406,31 +407,67 @@ caliber = "dart" icon = 'icons/roguetown/weapons/ammo.dmi' icon_state = "dart" - dropshrink = 0.8 + dropshrink = 0.9 max_integrity = 10 force = 10 /obj/projectile/bullet/reusable/dart name = "dart" desc = "A thorn faschioned into a primitive dart." - damage = 20 + damage = BLOWDART_DAMAGE damage_type = BRUTE icon = 'icons/roguetown/weapons/ammo.dmi' icon_state = "dart_proj" ammo_type = /obj/item/ammo_casing/caseless/rogue/dart - range = 20 + range = 6 hitsound = 'sound/combat/hits/hi_arrow2.ogg' - embedchance = 100 - armor_penetration = 10 + embedchance = 0 + armor_penetration = 0 woundclass = BCLASS_STAB - flag = "dart" + flag = "bullet" speed = 0.3 accuracy = 50 +//................ Poison Dart ............... // +/obj/item/ammo_casing/caseless/rogue/dart/poison + name = "poison dart" + desc = "A dart with it's tip drenched in a weak poison." + projectile_type = /obj/projectile/bullet/reusable/dart/poison + icon_state = "dart_poison" + +/obj/projectile/bullet/reusable/dart/poison + name = "poison dart" + desc = "A dart with its tip drenched in a powerful poison." + var/piercing = FALSE + +/obj/projectile/bullet/reusable/dart/poison/Initialize() + . = ..() + create_reagents(50, NO_REACT) + reagents.add_reagent(/datum/reagent/berrypoison, 3) + +/obj/projectile/bullet/reusable/dart/poison/on_hit(atom/target, blocked = FALSE) + if(iscarbon(target)) + var/mob/living/carbon/M = target + if(blocked != 100) // not completely blocked + if(M.can_inject(null, FALSE, def_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body. + ..() + reagents.reaction(M, INJECT) + reagents.trans_to(M, reagents.total_volume) + return BULLET_ACT_HIT + else + blocked = 100 + target.visible_message( span_danger("\The [src] was deflected!"), span_danger("My armor protected me against \the [src]!")) + + ..(target, blocked) + DISABLE_BITFIELD(reagents.flags, NO_REACT) + reagents.handle_reactions() + return BULLET_ACT_HIT + #undef ARROW_DAMAGE #undef BOLT_DAMAGE #undef BULLET_DAMAGE +#undef BLOWDART_DAMAGE #undef ARROW_PENETRATION #undef BOLT_PENETRATION #undef BULLET_PENETRATION diff --git a/code/game/objects/items/rogueweapons/ranged/blowgun.dm b/code/game/objects/items/rogueweapons/ranged/blowgun.dm index f25e0319e0..3915d81802 100644 --- a/code/game/objects/items/rogueweapons/ranged/blowgun.dm +++ b/code/game/objects/items/rogueweapons/ranged/blowgun.dm @@ -1,22 +1,22 @@ /obj/item/gun/ballistic/revolver/grenadelauncher/blowgun name = "blowgun" - desc = "A primitive tool used for hunting. Sometimes favored by Rogues for its ease of use and easy obtainability." + desc = "A primitive tool used for hunting. To use most accuratly, hold your breath for a moment before releasing." icon = 'icons/roguetown/weapons/bows.dmi' icon_state = "blowgun" possible_item_intents = list(/datum/intent/shoot/blowgun, /datum/intent/arc/blowgun, INTENT_GENERIC) mag_type = /obj/item/ammo_box/magazine/internal/shot/blowgun slot_flags = ITEM_SLOT_HIP w_class = WEIGHT_CLASS_NORMAL - randomspread = 1 + randomspread = 0 spread = 0 can_parry = FALSE pin = /obj/item/firing_pin - force = 10 + force = 6 var/cocked = FALSE cartridge_wording = "dart" fire_sound = 'sound/combat/Ranged/blowgun_shot.ogg' - associated_skill = /datum/skill/combat/crossbows + associated_skill = /datum/skill/combat/bows /obj/item/gun/ballistic/revolver/grenadelauncher/blowgun/getonmobprop(tag) . = ..() @@ -93,34 +93,22 @@ start_empty = TRUE /datum/intent/shoot/blowgun - chargetime = 0.5 + chargetime = 1 chargedrain = 1 charging_slowdown = 1 /datum/intent/shoot/blowgun/can_charge() if(mastermob) - if(mastermob.get_num_arms(FALSE) < 2) - return FALSE - if(mastermob.get_inactive_held_item()) + if(mastermob.get_num_arms(FALSE) < 1) return FALSE return TRUE -/datum/intent/shoot/blowgun/prewarning() - if(mastermob) - mastermob.visible_message("[mastermob] takes a deep breath!") - /datum/intent/shoot/blowgun/get_chargetime() if(mastermob && chargetime) + mastermob.visible_message("[mastermob] takes a deep breath!") var/newtime = 0 - //skill block - newtime = newtime + 10 - newtime = newtime - (mastermob.mind.get_skill_level(/datum/skill/combat/bows) * (10/6)) - //str block //rtd replace 10 with drawdiff on bows that are hard and scale str more (10/20 = 0.5) - newtime = newtime + 10 - newtime = newtime - (mastermob.STASTR * (10/20)) - //per block - newtime = newtime + 20 - newtime = newtime - (mastermob.STAPER * 1) //20/20 is 1 + newtime = newtime + 3 SECONDS + newtime = newtime - (mastermob.mind.get_skill_level(/datum/skill/combat/bows) * (5))- (mastermob.STAPER * 0.5) if(newtime > 0) return newtime else @@ -128,7 +116,7 @@ return chargetime /datum/intent/arc/blowgun - chargetime = 0.5 + chargetime = 1 SECONDS chargedrain = 1 charging_slowdown = 1 @@ -140,12 +128,9 @@ return FALSE return TRUE -/datum/intent/arc/blowgun/prewarning() - if(mastermob) - mastermob.visible_message("[mastermob] takes a deep breath!") - /datum/intent/arc/blowgun/get_chargetime() if(mastermob && chargetime) + mastermob.visible_message("[mastermob] takes a deep breath!") var/newtime = 0 //skill block newtime = newtime + 10 diff --git a/code/game/objects/structures/beds_chairs/roguechair.dm b/code/game/objects/structures/beds_chairs/roguechair.dm index 3e3225e7ca..fd3919e629 100644 --- a/code/game/objects/structures/beds_chairs/roguechair.dm +++ b/code/game/objects/structures/beds_chairs/roguechair.dm @@ -390,6 +390,7 @@ /obj/item/sleepingbag name = "roll of sleepcloth" + desc = "If placed on the ground it can be unrolled from the middle to provide a resting place." icon = 'icons/roguetown/misc/structure.dmi' icon_state = "sleepingcloth_rolled" w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index d47b4ffe2d..ec3dc38296 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -342,29 +342,8 @@ if(!total_override) ..() -/obj/structure/table/wood - name = "wooden table" - desc = "" - icon = 'icons/roguetown/misc/tables.dmi' - icon_state = "tablewood" - resistance_flags = FLAMMABLE - max_integrity = 70 - smooth = 0 - debris = list(/obj/item/grown/log/tree/small = 1) - climb_offset = 10 -/obj/structure/table/church - name = "stone table" - desc = "" - icon = 'icons/roguetown/misc/tables.dmi' - icon_state = "churchtable" - max_integrity = 300 - smooth = 0 - climb_offset = 10 -/obj/structure/table/church/m - icon = 'icons/roguetown/misc/tables.dmi' - icon_state = "churchtable_mid" /obj/structure/table/vtable name = "ancient wooden table" @@ -520,6 +499,78 @@ buildstack = /obj/item/stack/tile/carpet/royalblue smooth_icon = 'icons/obj/smooth_structures/fancy_table_royalblue.dmi' +/obj/structure/table/church + name = "stone table" + desc = "" + icon = 'icons/roguetown/misc/tables.dmi' + icon_state = "churchtable" + max_integrity = 300 + smooth = 0 + climb_offset = 10 + +/obj/structure/table/church/m + icon = 'icons/roguetown/misc/tables.dmi' + icon_state = "churchtable_mid" +/*/................ Stone tables ............... // +/obj/structure/table/church + name = "stone table" + desc = "" + icon = 'icons/roguetown/misc/tables.dmi' + icon_state = "church_mid" + max_integrity = 300 + smooth = 0 + climb_offset = 10 +*/ +/obj/structure/table/stone + name = "stone table" + desc = "" + icon = 'icons/roguetown/misc/tables.dmi' + icon_state = "stonetable_mid" + max_integrity = 200 + smooth = 0 + climb_offset = 10 + +/obj/structure/table/stone/OnCrafted(dirin, user) + if(dirin == NORTH) + dir = NORTH + if(dirin == SOUTH) + dir = SOUTH + if(dirin == WEST) + dir = WEST + if(dirin == EAST) + dir = EAST + . = ..() + +/obj/structure/table/stone_end + name = "stone table" + desc = "" + icon = 'icons/roguetown/misc/tables.dmi' + icon_state = "stonetable_end" + max_integrity = 200 + smooth = 0 + climb_offset = 10 + +/obj/structure/table/stone_end/OnCrafted(dirin, user) + if(dirin == NORTH) + dir = NORTH + if(dirin == SOUTH) + dir = SOUTH + if(dirin == WEST) + dir = WEST + if(dirin == EAST) + dir = EAST + . = ..() + +/obj/structure/table/stone_small + name = "stone table" + desc = "" + icon = 'icons/roguetown/misc/tables.dmi' + icon_state = "stonetable_small" + max_integrity = 200 + smooth = 0 + climb_offset = 10 + + /* .................. More tables ................... */ /obj/structure/table/wood/reinf_long icon_state = "tablewood_reinf" diff --git a/code/modules/cargo/packsrogue/food.dm b/code/modules/cargo/packsrogue/food.dm index 7e8dd8f4ed..e952c52728 100644 --- a/code/modules/cargo/packsrogue/food.dm +++ b/code/modules/cargo/packsrogue/food.dm @@ -49,12 +49,12 @@ /datum/supply_pack/rogue/food/spottedhen name = "Rockhill Brewed" - cost = 10 + cost = 11 contains = /obj/item/reagent_containers/glass/bottle/rogue/beer/spottedhen /datum/supply_pack/rogue/food/blackgoat name = "Jacksberry Mix" - cost = 20 + cost = 16 contains = /obj/item/reagent_containers/glass/bottle/rogue/beer/blackgoat /datum/supply_pack/rogue/food/onin @@ -64,47 +64,47 @@ /datum/supply_pack/rogue/food/grenzelbeer name = "Grenzelhoftian Bitter Beer" - cost = 20 + cost = 19 contains = /obj/item/reagent_containers/glass/bottle/rogue/beer/hagwoodbitter /datum/supply_pack/rogue/food/elfbeer name = "Elvish Beer" - cost = 35 + cost = 28 contains = /obj/item/reagent_containers/glass/bottle/rogue/beer/aurorian /datum/supply_pack/rogue/food/elfcab name = "Elvish Fireleaf" - cost = 40 + cost = 34 contains = /obj/item/reagent_containers/glass/bottle/rogue/beer/fireleaf /datum/supply_pack/rogue/food/butterhair name = "Dwarvish Butterhairs" - cost = 50 + cost = 20 contains = /obj/item/reagent_containers/glass/bottle/rogue/beer/butterhairs /datum/supply_pack/rogue/food/stonebeard name = "Stonebeards Reserve" - cost = 45 + cost = 25 contains = /obj/item/reagent_containers/glass/bottle/rogue/beer/stonebeardreserve /datum/supply_pack/rogue/food/voddena name = "Dwarven Voddena" - cost = 40 + cost = 35 contains = /obj/item/reagent_containers/glass/bottle/rogue/beer/voddena /datum/supply_pack/rogue/food/winezybantu name = "Zybantu Wine" - cost = 15 + cost = 12 contains = /obj/item/reagent_containers/glass/bottle/rogue/wine /datum/supply_pack/rogue/food/winegrenzel name = "Grenzelhoftian Sour Wine" - cost = 25 + cost = 18 contains = /obj/item/reagent_containers/glass/bottle/rogue/wine/sourwine /datum/supply_pack/rogue/food/winevalorred name = "Valorian Red Wine" - cost = 50 + cost = 30 contains = /obj/item/reagent_containers/glass/bottle/rogue/redwine /datum/supply_pack/rogue/food/winevalorwhite @@ -114,12 +114,12 @@ /datum/supply_pack/rogue/food/elfred name = "Elvish Red Wine" - cost = 165 + cost = 70 contains = /obj/item/reagent_containers/glass/bottle/rogue/elfred /datum/supply_pack/rogue/food/elfblue name = "Valmora Blue Wine" - cost = 320 + cost = 120 contains = /obj/item/reagent_containers/glass/bottle/rogue/elfblue /datum/supply_pack/rogue/food/meat diff --git a/code/modules/cargo/packsrogue/narcotics.dm b/code/modules/cargo/packsrogue/narcotics.dm index 09cdf045e9..71f356569e 100644 --- a/code/modules/cargo/packsrogue/narcotics.dm +++ b/code/modules/cargo/packsrogue/narcotics.dm @@ -1,3 +1,4 @@ +// ---------- NARCOTICS -------------- /datum/supply_pack/rogue/narcotics group = "Narcotics" crate_name = "merchant guild's crate" @@ -5,40 +6,121 @@ /datum/supply_pack/rogue/narcotics/sigs name = "Pipe Weed Zig" - cost = 5 + cost = 4 contains = /obj/item/clothing/mask/cigarette/rollie/nicotine - /datum/supply_pack/rogue/narcotics/zigbox name = "Zigbox" - cost = 30 + cost = 28 contains = /obj/item/storage/fancy/cigarettes/zig - /datum/supply_pack/rogue/narcotics/zigboxempt name = "Empty Zigbox" cost = 1 contains = /obj/item/storage/fancy/cigarettes/zig/empty - /datum/supply_pack/rogue/narcotics/spice name = "Spice" - cost = 35 + cost = 26 contains = /obj/item/reagent_containers/powder/spice - /datum/supply_pack/rogue/narcotics/ozium name = "Ozium" - cost = 30 + cost = 22 contains = /obj/item/reagent_containers/powder/ozium - /datum/supply_pack/rogue/narcotics/moondust name = "Moon Dust" - cost = 55 + cost = 28 contains = /obj/item/reagent_containers/powder/moondust - /datum/supply_pack/rogue/narcotics/soap name = "Herbal Soap" - cost = 20 + cost = 15 contains = /obj/item/bath/soap - /datum/supply_pack/rogue/narcotics/perfume name = "Perfume" cost = 25 contains = list(/obj/item/perfume/random) + + +// ---------- SUSPICIOUS -------------- +/datum/supply_pack/rogue/suspicious + group = "Suspicious" + crate_name = "mislabeled crate" + crate_type = /obj/structure/closet/crate/chest/merchant + +/datum/supply_pack/rogue/suspicious/crossbow + name = "Crossbow" + cost = 50 + contains = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow +/datum/supply_pack/rogue/suspicious/boltquiver + name = "Quiver of Bolts" + cost = 40 + contains = /obj/item/quiver/bolts +/datum/supply_pack/rogue/suspicious/bolts + name = "Crossbow Bolt" + cost = 4 + contains = /obj/item/ammo_casing/caseless/rogue/bolt +/datum/supply_pack/rogue/suspicious/idagger + name = "Iron Dagger" + cost = 30 + contains = /obj/item/rogueweapon/knife/dagger +/datum/supply_pack/rogue/suspicious/poison + name = "Poison Bottle" + cost = 65 + contains = /obj/item/reagent_containers/glass/bottle/rogue/poison +/datum/supply_pack/rogue/suspicious/lockpick + name = "Lockpick" + cost = 35 + contains = /obj/item/lockpickring/mundane + + + +// ---------- OUTFITS -------------- +/datum/supply_pack/rogue/outfits + group = "Outfits" + crate_name = "outfit crate" + crate_type = /obj/structure/closet/crate/chest/merchant + +/datum/supply_pack/rogue/outfits/tophat + name = "Tophat" + cost = 20 + contains = /obj/item/clothing/head/roguetown/tophat +/datum/supply_pack/rogue/outfits/flathat + name = "Flathat" + cost = 20 + contains = /obj/item/clothing/head/roguetown/flathat +/datum/supply_pack/rogue/outfits/stockings + name = "Stockings" + cost = 20 + contains = /obj/item/clothing/under/roguetown/tights/stockings/silk/random +/datum/supply_pack/rogue/outfits/eorarobe + name = "Eoran robe" + cost = 33 + contains = /obj/item/clothing/suit/roguetown/shirt/robe/eora/alt + +// ---------- MERCHANT -------------- +/datum/supply_pack/rogue/recreation + group = "Medicae" + crate_name = "merchant guild's crate" + crate_type = /obj/structure/closet/crate/chest/merchant + +/datum/supply_pack/rogue/recreation/sigs + name = "Pipe Weed Zig" + cost = 5 + contains = /obj/item/clothing/mask/cigarette/rollie/nicotine +/datum/supply_pack/rogue/recreation/zigbox + name = "Zigbox" + cost = 25 + contains = /obj/item/storage/fancy/cigarettes/zig +/datum/supply_pack/rogue/recreation/zigboxempt + name = "Empty Zigbox" + cost = 1 + contains = /obj/item/storage/fancy/cigarettes/zig/empty +/datum/supply_pack/rogue/recreation/moondust + name = "Moon Dust" + cost = 33 + contains = /obj/item/reagent_containers/powder/moondust +/datum/supply_pack/rogue/recreation/soap + name = "Herbal Soap" + cost = 20 + contains = /obj/item/bath/soap +/datum/supply_pack/rogue/recreation/perfume + name = "Perfume" + cost = 25 + contains = list(/obj/item/perfume/random) diff --git a/code/modules/cargo/packsrogue/tools.dm b/code/modules/cargo/packsrogue/tools.dm index 6fbdcf41d0..835aa475ad 100644 --- a/code/modules/cargo/packsrogue/tools.dm +++ b/code/modules/cargo/packsrogue/tools.dm @@ -15,7 +15,7 @@ /datum/supply_pack/rogue/tools/lockpicks name = "Lockpicks" - cost = 20 + cost = 25 contains = /obj/item/lockpickring/mundane /datum/supply_pack/rogue/tools/needle @@ -49,10 +49,9 @@ contains = /obj/item/flint /datum/supply_pack/rogue/tools/dyebin - name = "Fine dyes" - cost = 200 - contains = /obj/machinery/dye_bin - + name = "Luxury dyes" + cost = 100 + contains = /obj/item/luxury_dyes /datum/supply_pack/rogue/tools/candles name = "Candles" diff --git a/code/modules/cargo/packsrogue/weapons.dm b/code/modules/cargo/packsrogue/weapons.dm index dee82cd8dd..757667d401 100644 --- a/code/modules/cargo/packsrogue/weapons.dm +++ b/code/modules/cargo/packsrogue/weapons.dm @@ -6,7 +6,7 @@ /datum/supply_pack/rogue/weapons/shortsword name = "Iron Short Sword" cost = 15 - contains = /obj/item/rogueweapon/sword/short + contains = /obj/item/rogueweapon/sword/short/iron /datum/supply_pack/rogue/weapons/sword name = "Iron Sword" @@ -23,20 +23,15 @@ cost = 20 contains = /obj/item/rogueweapon/mace -/datum/supply_pack/rogue/weapons/greatmace - name = "Iron Warclub" - cost = 28 - contains = /obj/item/rogueweapon/mace/goden - /datum/supply_pack/rogue/weapons/axe name = "Iron Axe" cost = 20 contains = /obj/item/rogueweapon/axe/iron -/datum/supply_pack/rogue/weapons/huntingknife - name = "Iron Hunting Knife" - cost = 12 - contains = /obj/item/rogueweapon/knife/hunting +/datum/supply_pack/rogue/weapons/peasantknife + name = "Peasant Knife" + cost = 15 + contains = /obj/item/rogueweapon/knife/villager /datum/supply_pack/rogue/weapons/dagger name = "Iron Dagger" @@ -44,15 +39,10 @@ contains = /obj/item/rogueweapon/knife/dagger /datum/supply_pack/rogue/weapons/spear - name = "Iron Spear" + name = "Spear" cost = 22 contains = /obj/item/rogueweapon/polearm/spear -/datum/supply_pack/rogue/weapons/flail - name = "Iron Flail" - cost = 20 - contains = /obj/item/rogueweapon/flail - /datum/supply_pack/rogue/weapons/whip name = "Leather Whip" cost = 16 @@ -73,20 +63,6 @@ cost = 40 contains = /obj/item/bomb/homemade -/* -/datum/supply_pack/rogue/weapons/nets - name = "Throwing Net" - cost = 15 - contains = list(/obj/item/net, - /obj/item/net, - /obj/item/net) -*/ - -/datum/supply_pack/rogue/weapons/crossbow - name = "Crossbow" - cost = 40 - contains = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow - /datum/supply_pack/rogue/weapons/bow name = "Bow" cost = 30 @@ -107,17 +83,8 @@ cost = 40 contains = /obj/item/quiver/arrows -/datum/supply_pack/rogue/weapons/boltquiver - name = "Quiver of Bolts" - cost = 60 - contains = /obj/item/quiver/bolts - /datum/supply_pack/rogue/weapons/arrows name = "Arrow" cost = 2 contains = /obj/item/ammo_casing/caseless/rogue/arrow -/datum/supply_pack/rogue/weapons/bolts - name = "Crossbow Bolt" - cost = 3 - contains = /obj/item/ammo_casing/caseless/rogue/bolt diff --git a/code/modules/clothing/rogueclothes/armor.dm b/code/modules/clothing/rogueclothes/armor.dm index 5f96691e74..45d682d8a2 100644 --- a/code/modules/clothing/rogueclothes/armor.dm +++ b/code/modules/clothing/rogueclothes/armor.dm @@ -317,7 +317,7 @@ //................ Silk Jacket ............... // /obj/item/clothing/suit/roguetown/armor/leather/jacket/niteman name = "silk jacket" - icon_state = "nightman" + icon_state = "niteman" desc = "Displaying wealth while keeping your guts safe from blades with thick leather pads underneath." sellprice = VALUE_LEATHER_ARMOR_LORD diff --git a/code/modules/mob/living/carbon/human/npc/stonekeep_carbons.dm b/code/modules/mob/living/carbon/human/npc/stonekeep_carbons.dm index 19c74b7352..8bc543c8f6 100644 --- a/code/modules/mob/living/carbon/human/npc/stonekeep_carbons.dm +++ b/code/modules/mob/living/carbon/human/npc/stonekeep_carbons.dm @@ -331,7 +331,7 @@ H.STAEND = rand(8,10) H.STAINT = 7 -/mob/living/carbon/human/species/human/northern/bum/skilled/after_creation() +/mob/living/carbon/human/species/human/northern/bum/skilled/after_creation(mob/living/carbon/C) ..() ADD_TRAIT(src, TRAIT_CRITICAL_WEAKNESS, TRAIT_GENERIC) ADD_TRAIT(src, TRAIT_ZOMBIE_IMMUNE, TRAIT_GENERIC) @@ -346,6 +346,7 @@ wander = FALSE ambushable = FALSE faction = list("bums", "station") + C.grant_language(/datum/language/common) /mob/living/carbon/human/species/human/northern/bum/skilled/proc/configure_mind() if(!mind) @@ -497,7 +498,6 @@ configure_mind() d_intent = INTENT_PARRY //these ones will parry instead of dodge, the higher the skill the more powerful this is of course ADD_TRAIT(src, TRAIT_ZOMBIE_IMMUNE, TRAIT_GENERIC) -// equipOutfit(new /datum/outfit/job/roguetown/npc/goblin) /mob/living/carbon/human/species/goblin/skilled/ambush/moon name = "moon goblin" @@ -507,6 +507,10 @@ name = "hell goblin" race = /datum/species/goblin/hell +/mob/living/carbon/human/species/goblin/skilled/hell/after_creation(mob/living/carbon/C) + ..() + C.grant_language(/datum/language/hellspeak) + /mob/living/carbon/human/species/goblin/skilled/ambush/cave name = "cave goblin" race = /datum/species/goblin/cave diff --git a/code/modules/paperwork/papers/scrap.dm b/code/modules/paperwork/papers/scrap.dm index ec8321168a..fe218c324d 100644 --- a/code/modules/paperwork/papers/scrap.dm +++ b/code/modules/paperwork/papers/scrap.dm @@ -1,5 +1,6 @@ /obj/item/paper/bsmith - info = "It's easy to smith. Put ores in the smelter. Put ingots on the anvil. Use your tongs to handle ingots. Hit them with the hammer. Quench hot ingots in the barrel (there must be water in it). Steel is an alloy from iron and coal, find the golden ratio" + info = "It's easy to smith. Put ores in the smelter. Put ingots on the anvil. Use your tongs to handle ingots. Hit them with the hammer. \ + Quench hot ingots in the barrel (there must be water in it). Steel is an alloy from iron and coal, find the golden ratio" /obj/item/paper/heartfelt/goal3 info = "Establish a diplomatic alliance with the King of Rockhill to strengthen the relationship between Heartfelt and Rockhill." @@ -23,17 +24,17 @@ /obj/item/paper/feldsher_certificate name = "feldsher health certificate" - info = "This member of the nitemaidens guild hath passed the feldshers monthly inspection as mandated by the law, and is not a bearer of maladies to infect our towne. I so swear on this date. (signed by the town feldsher, the date is a few weeks ago)" - icon_state = "certificate" - + info = "The wearer hath passed the feldshers monthly inspection as mandated by the pestilence laws, and is not a bearer of maladies to infect our towne. \ + Thus they are allowede legally to ply the nitemaidens trade. I so swear on this date. (signed by the town feldsher, the date is a few weeks ago)" /obj/item/paper/feldsher_certificate/expired - info = "This member of the nitemaidens guild hath passed the feldshers monthly inspection as mandated by the law, and is not a bearer of maladies to infect our towne. I so swear on this date. (signed by the town feldsher, the date is a smudge)" - -/obj/item/paper/nitemaiden_certificate/Initialize() + info = "The wearer hath passed the feldshers monthly inspection as mandated by the pestilence laws, and is not a bearer of maladies to infect our towne. \ + Thus they are allowede legally to ply the nitemaidens trade. I so swear on this date. (signed by the town feldsher, the date is half a year ago)" +/obj/item/paper/feldsher_certificate/fake + info = "The wearer hath passed the feldshers monthly inspection as mandated by the pestilence laws, and is not a bearer of maladies to infect our towne. \ + Thus they are allowede legally to ply the nitemaidens trade. I so swear on this date. (signature is undreadable, the date is a few weeks ago)" +/obj/item/paper/feldsher_certificate/Initialize() ..() - var/type = pick(typesof(/obj/item/paper/feldsher_certificate)) - new type(loc) - return INITIALIZE_HINT_QDEL + icon_state = "certificate" /obj/item/paper/heartfelt/random/Initialize() ..() diff --git a/code/modules/roguetown/roguecrafting/items.dm b/code/modules/roguetown/roguecrafting/items.dm index ff48676dfc..55fd543643 100644 --- a/code/modules/roguetown/roguecrafting/items.dm +++ b/code/modules/roguetown/roguecrafting/items.dm @@ -146,6 +146,11 @@ /obj/item/reagent_containers/food/snacks/produce/jacksberry = 1, /obj/item/ash = 1) +/datum/crafting_recipe/roguetown/zigbox + name = "paper zigbox" + result = list(/obj/item/storage/fancy/cigarettes/zig/empty) + reqs = list(/obj/item/paper = 1) + /* /datum/crafting_recipe/roguetown/net name = "net" diff --git a/code/modules/roguetown/roguecrafting/sewing.dm b/code/modules/roguetown/roguecrafting/sewing.dm index 8158020c84..3680510b0f 100644 --- a/code/modules/roguetown/roguecrafting/sewing.dm +++ b/code/modules/roguetown/roguecrafting/sewing.dm @@ -127,11 +127,6 @@ tools = list(/obj/item/needle) req_antikaizoku = TRUE -/datum/crafting_recipe/roguetown/sewing/zigbox - name = "paper zigbox" - result = list(/obj/item/storage/fancy/cigarettes/zig/empty) - reqs = list(/obj/item/paper = 1) - /datum/crafting_recipe/roguetown/sewing/sack name = "sack hood" result = list(/obj/item/clothing/head/roguetown/menacing) diff --git a/code/modules/roguetown/roguejobs/craftsman/tools.dm b/code/modules/roguetown/roguejobs/craftsman/tools.dm index ae1afba5c5..bb613988bd 100644 --- a/code/modules/roguetown/roguejobs/craftsman/tools.dm +++ b/code/modules/roguetown/roguejobs/craftsman/tools.dm @@ -25,7 +25,7 @@ /obj/item/rogueweapon/handsaw/crude name = "crude sawing tool" - desc = "A serrated piece of flint with a bone handle." + desc = "A stick with sharp pieces of flint added." icon_state = "stonesaw" wlength = WLENGTH_LONG w_class = WEIGHT_CLASS_BULKY diff --git a/code/modules/roguetown/roguemachine/drugmachine.dm b/code/modules/roguetown/roguemachine/drugmachine.dm index 479565010e..365613cd2c 100644 --- a/code/modules/roguetown/roguemachine/drugmachine.dm +++ b/code/modules/roguetown/roguemachine/drugmachine.dm @@ -243,7 +243,7 @@ contents += "
" - var/list/unlocked_cats = list("Narcotics","Instruments") + var/list/unlocked_cats = list("Narcotics","Instruments","Suspicious","Outfits") if(current_cat == "1") contents += "
" for(var/X in unlocked_cats) diff --git a/code/modules/roguetown/roguemachine/vendor.dm b/code/modules/roguetown/roguemachine/vendor.dm index 63d0f41835..3cd9f48ff3 100644 --- a/code/modules/roguetown/roguemachine/vendor.dm +++ b/code/modules/roguetown/roguemachine/vendor.dm @@ -277,21 +277,21 @@ /obj/structure/roguemachine/vendor/inn_hamlet/Initialize() . = ..() - for(var/X in list(/obj/item/roguekey/roomii)) + for(var/X in list(/obj/item/roguekey/roomii/wanderer)) var/obj/P = new X(src) held_items[P] = list() held_items[P]["NAME"] = P.name held_items[P]["PRICE"] = 15 - for(var/X in list(/obj/item/roguekey/roomiii,/obj/item/roguekey/roomiv)) + for(var/X in list(/obj/item/roguekey/roomiii/yeoman,/obj/item/roguekey/roomiv/castellan)) var/obj/P = new X(src) held_items[P] = list() held_items[P]["NAME"] = P.name - held_items[P]["PRICE"] = 20 - for(var/X in list(/obj/item/roguekey/roomi)) + held_items[P]["PRICE"] = 25 + for(var/X in list(/obj/item/roguekey/roomi/duchess)) var/obj/P = new X(src) held_items[P] = list() held_items[P]["NAME"] = P.name - held_items[P]["PRICE"] = 30 + held_items[P]["PRICE"] = 50 update_icon() /obj/structure/roguemachine/vendor/steward diff --git a/icons/effects/landmarks_static.dmi b/icons/effects/landmarks_static.dmi index 9da16538c2..430c9da49d 100644 Binary files a/icons/effects/landmarks_static.dmi and b/icons/effects/landmarks_static.dmi differ diff --git a/icons/roguetown/clothing/armor.dmi b/icons/roguetown/clothing/armor.dmi index 28e40b2ea7..a8be271de1 100644 Binary files a/icons/roguetown/clothing/armor.dmi and b/icons/roguetown/clothing/armor.dmi differ diff --git a/icons/roguetown/clothing/head.dmi b/icons/roguetown/clothing/head.dmi index 2f5fe5c9d3..2d8b8e922b 100644 Binary files a/icons/roguetown/clothing/head.dmi and b/icons/roguetown/clothing/head.dmi differ diff --git a/icons/roguetown/clothing/masks.dmi b/icons/roguetown/clothing/masks.dmi index 2df291f1cc..497195e8a5 100644 Binary files a/icons/roguetown/clothing/masks.dmi and b/icons/roguetown/clothing/masks.dmi differ diff --git a/icons/roguetown/clothing/onmob/armor.dmi b/icons/roguetown/clothing/onmob/armor.dmi index b3987cd9bc..140c4b3860 100644 Binary files a/icons/roguetown/clothing/onmob/armor.dmi and b/icons/roguetown/clothing/onmob/armor.dmi differ diff --git a/icons/roguetown/clothing/onmob/feet.dmi b/icons/roguetown/clothing/onmob/feet.dmi index e0d2571889..3be93db63a 100644 Binary files a/icons/roguetown/clothing/onmob/feet.dmi and b/icons/roguetown/clothing/onmob/feet.dmi differ diff --git a/icons/roguetown/clothing/onmob/head.dmi b/icons/roguetown/clothing/onmob/head.dmi index b404320714..8854c8aff5 100644 Binary files a/icons/roguetown/clothing/onmob/head.dmi and b/icons/roguetown/clothing/onmob/head.dmi differ diff --git a/icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi b/icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi index 9562396ea2..92a5f53743 100644 Binary files a/icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi and b/icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi differ diff --git a/icons/roguetown/clothing/onmob/helpers/sleeves_shirts.dmi b/icons/roguetown/clothing/onmob/helpers/sleeves_shirts.dmi index 5fe48dca4a..55bc4ac279 100644 Binary files a/icons/roguetown/clothing/onmob/helpers/sleeves_shirts.dmi and b/icons/roguetown/clothing/onmob/helpers/sleeves_shirts.dmi differ diff --git a/icons/roguetown/clothing/onmob/masks.dmi b/icons/roguetown/clothing/onmob/masks.dmi index 95ef7cabd9..acfe51ca3b 100644 Binary files a/icons/roguetown/clothing/onmob/masks.dmi and b/icons/roguetown/clothing/onmob/masks.dmi differ diff --git a/icons/roguetown/clothing/onmob/shirts.dmi b/icons/roguetown/clothing/onmob/shirts.dmi index 63698dd53d..40c305304a 100644 Binary files a/icons/roguetown/clothing/onmob/shirts.dmi and b/icons/roguetown/clothing/onmob/shirts.dmi differ diff --git a/icons/roguetown/items/crafting.dmi b/icons/roguetown/items/crafting.dmi index ceea916663..1443a59594 100644 Binary files a/icons/roguetown/items/crafting.dmi and b/icons/roguetown/items/crafting.dmi differ diff --git a/icons/roguetown/items/valuable.dmi b/icons/roguetown/items/valuable.dmi index 6586708364..4b58e6b017 100644 Binary files a/icons/roguetown/items/valuable.dmi and b/icons/roguetown/items/valuable.dmi differ diff --git a/icons/roguetown/misc/tables.dmi b/icons/roguetown/misc/tables.dmi index 4737f08eba..10e5352bfa 100644 Binary files a/icons/roguetown/misc/tables.dmi and b/icons/roguetown/misc/tables.dmi differ diff --git a/icons/roguetown/weapons/ammo.dmi b/icons/roguetown/weapons/ammo.dmi index dc312ffcc8..9af3413a2a 100644 Binary files a/icons/roguetown/weapons/ammo.dmi and b/icons/roguetown/weapons/ammo.dmi differ diff --git a/strings/books/AdviceWeaving.json b/strings/books/AdviceWeaving.json new file mode 100644 index 0000000000..40232668f9 --- /dev/null +++ b/strings/books/AdviceWeaving.json @@ -0,0 +1,23 @@ +{"Contents":[" +


" +THE 100 STITCHES - How to clothe the people rightly +"


+ +There be three main ways to make clothing, sewing, weaving and leatherworking. +


+ +Sewing requires a needle, cloth and fibres. This arte is most useful for common clothing and padding, fancy hats may require a feather as well. +


+ +Weaving requires a loom and silk. Sometimes fibres and cloth may be needed to complete your work. +You can make padded gambesons with plenty of cloth, or more exotic clothing such as bathrobes or a royal cloak by adding fur, and some religious masks by adding a silver ingot. +


+ +Leatherworking requires a drying rack and a needle, using furs and hide to make a variety of clothing and armor. Some may need the head of an animal. +


+ +On the art of dyes: Cheap dyes can be produced using dirt clods or ash, combined with jacksberries or swampweed. Added to any bin allowes you to easily dye many pieces of clothing. +More luxurious dyes can be imported by the Merchant, and added to a cheap dye bin. +


+ +


"]}