From c62738cad2817dc85528d38e67d25f569b7aa6a9 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Mon, 13 Jan 2025 13:09:14 -0600 Subject: [PATCH 1/6] Removes some magazines and vending machine overhaul removes guns and bullets updates wasteland vendors prices to reflect money income from active bounty system --- .../coyote_bayou/Nash_and_Texarkana.dmm | 121 ++------ code/_globalvars/lists/maintenance_loot.dm | 86 +++--- code/game/machinery/autolathe.dm | 106 +++---- .../effects/spawners/masterlootdrop.dm | 8 +- code/game/objects/items/granters.dm | 62 ++-- code/game/objects/items/prize_loot.dm | 38 +-- code/game/objects/items/shields.dm | 4 +- code/game/objects/structures/divine.dm | 8 +- code/modules/WVM/wvm.dm | 276 +++++++++--------- code/modules/cargo/exports/misc_export.dm | 12 +- .../kitchen_machinery/smartfridge.dm | 8 +- code/modules/jobs/job_types/bos.dm | 8 +- 12 files changed, 332 insertions(+), 405 deletions(-) diff --git a/_maps/map_files/coyote_bayou/Nash_and_Texarkana.dmm b/_maps/map_files/coyote_bayou/Nash_and_Texarkana.dmm index 0a5170e5df..9e1cf1e914 100644 --- a/_maps/map_files/coyote_bayou/Nash_and_Texarkana.dmm +++ b/_maps/map_files/coyote_bayou/Nash_and_Texarkana.dmm @@ -22253,9 +22253,6 @@ "bNf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/wood/settler, -/obj/item/book/granter/crafting_recipe/gunsmith_one, -/obj/item/book/granter/crafting_recipe/gunsmith_two, -/obj/item/book/granter/crafting_recipe/gunsmith_three, /obj/item/storage/trash_stack/loot/common, /obj/item/storage/trash_stack/loot/common, /turf/open/indestructible/ground/outside/dirt, @@ -29713,10 +29710,6 @@ }, /turf/closed/wall/mineral/concrete, /area/f13/ruins) -"dnR" = ( -/obj/item/book/granter/crafting_recipe/gunsmith_two, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) "dnX" = ( /obj/structure/junk/locker, /obj/effect/decal/cleanable/dirt/dust, @@ -33020,24 +33013,6 @@ icon_state = "housewood4-broken" }, /area/f13/building/abandoned) -"ebA" = ( -/obj/structure/noticeboard{ - layer = 5; - pixel_x = -4; - pixel_y = 45 - }, -/obj/item/bedsheet{ - anchored = 1; - pixel_y = 41 - }, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 8 - }, -/turf/open/indestructible/ground/outside/sidewalk{ - icon_state = "verticalleftborderleft0" - }, -/area/f13/wasteland/nash) "ebL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/fermenting_barrel, @@ -35620,14 +35595,6 @@ "eIY" = ( /turf/closed/wall/mineral/concrete, /area/f13/building/coyote/nash/grocery/southloop) -"eJb" = ( -/obj/structure/rack/shelf_metal, -/obj/item/book/granter/crafting_recipe/gunsmith_four, -/obj/item/storage/trash_stack/loot/common, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/building/trader) "eJk" = ( /obj/effect/decal/cleanable/dirt/dust{ alpha = 155 @@ -39930,16 +39897,6 @@ icon_state = "bluerustychess2" }, /area/f13/building/abandoned) -"fJj" = ( -/obj/machinery/door/unpowered/securedoor{ - name = "Bar"; - req_access_txt = null; - req_one_access_txt = "25, 28" - }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/bar/nash) "fJl" = ( /obj/structure/car{ layer = 5 @@ -40016,16 +39973,6 @@ }, /turf/open/floor/carpet/red, /area/f13/building/church) -"fJz" = ( -/obj/effect/decal/cleanable/dirt/dust{ - alpha = 155 - }, -/obj/structure/rack/shelf_metal, -/obj/item/storage/trash_stack/loot/common, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/building/workshop/nash) "fJA" = ( /obj/effect/turf_decal/weather/dirt{ dir = 6 @@ -45094,7 +45041,7 @@ /area/f13/ruins) "gOG" = ( /obj/machinery/light/sign/heaven{ - pixel_y = 26; + pixel_y = -32; light_color = "#FF55FF"; light_range = 1; light_power = 2 @@ -46361,8 +46308,6 @@ /area/f13/wasteland) "heI" = ( /obj/structure/rack/shelf_metal, -/obj/item/storage/trash_stack/loot/common, -/obj/item/storage/trash_stack/loot/common, /turf/open/floor/plasteel, /area/f13/building/workshop/nash) "heK" = ( @@ -46610,6 +46555,21 @@ alpha = 0; mouse_opacity = 0 }, +/obj/item/bedsheet{ + anchored = 1; + pixel_y = 1; + pixel_x = -24 + }, +/obj/structure/sign/directions/dorms{ + layer = 6; + pixel_y = 7; + pixel_x = -29 + }, +/obj/structure/noticeboard{ + layer = 5; + pixel_x = -30; + pixel_y = 4 + }, /turf/open/indestructible/ground/outside/sidewalk{ icon_state = "outerborder - E" }, @@ -57889,10 +57849,6 @@ /turf/open/indestructible/ground/inside/dirt, /area/f13/wasteland) "jQo" = ( -/obj/structure/sign/directions/dorms{ - layer = 6; - pixel_y = 16 - }, /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d"; dir = 8 @@ -64800,7 +64756,6 @@ alpha = 155 }, /obj/structure/rack/shelf_metal, -/obj/item/storage/trash_stack/loot/common, /obj/machinery/camera/autoname{ dir = 5; pixel_y = 14; @@ -66674,11 +66629,7 @@ /obj/effect/decal/cleanable/dirt/dust{ alpha = 155 }, -/obj/machinery/door/unpowered/securedoor{ - name = "Bar"; - req_access_txt = null; - req_one_access_txt = "25, 28" - }, +/obj/structure/simple_door/room, /turf/open/floor/wood_common{ color = "#779999" }, @@ -72380,11 +72331,7 @@ /obj/effect/decal/cleanable/dirt/dust{ alpha = 155 }, -/obj/machinery/door/unpowered/securedoor{ - name = "Bar"; - req_access_txt = null; - req_one_access_txt = "25, 28" - }, +/obj/structure/simple_door/room, /turf/open/floor/wood_common{ color = "#779999" }, @@ -75856,7 +75803,6 @@ "nUX" = ( /obj/structure/table/wood/settler, /obj/machinery/cell_charger, -/obj/item/book/granter/crafting_recipe/gunsmith_one, /turf/open/floor/wood_common{ color = "#779999" }, @@ -91589,8 +91535,6 @@ alpha = 155 }, /obj/structure/rack/shelf_metal, -/obj/item/storage/trash_stack/loot/common, -/obj/item/storage/trash_stack/loot/common, /turf/open/floor/plasteel, /area/f13/building/workshop/nash) "rIJ" = ( @@ -92647,11 +92591,7 @@ }, /area/f13/wasteland) "rWA" = ( -/obj/machinery/door/unpowered/securedoor{ - name = "Sheriff's Department"; - req_access_txt = null; - req_one_access_txt = "62" - }, +/obj/structure/simple_door/room, /turf/open/floor/f13{ icon_state = "floorrusty" }, @@ -93957,7 +93897,7 @@ /turf/closed/wall/mineral/concrete, /area/f13/building/coyote/nash/museum/groundfloor) "smI" = ( -/obj/machinery/vending/matvend, +/obj/machinery/mineral/wasteland_vendor/crafting, /turf/open/floor/wood_common{ color = "#779999" }, @@ -104974,7 +104914,6 @@ /area/f13/ruins) "uLh" = ( /obj/structure/rack/shelf_metal, -/obj/item/storage/trash_stack/loot/common, /turf/open/floor/wood_common{ color = "#779999" }, @@ -117270,10 +117209,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/caves) "xCW" = ( -/obj/machinery/vending/medical, /obj/machinery/light{ light_color = "#e8eaff" }, +/obj/machinery/mineral/wasteland_vendor/medical, /turf/open/floor/f13/wood, /area/f13/building/hospital/clinic/nash) "xCZ" = ( @@ -123962,7 +123901,7 @@ tDL tEB szs mkb -fJj +orQ sMi sMi txF @@ -124217,7 +124156,7 @@ cYF bAR uYZ nFA -fJj +orQ nFA nFA nFA @@ -124730,7 +124669,7 @@ gRR szs mkb mkb -fJj +orQ szs mkb fUG @@ -127553,7 +127492,7 @@ cPR ehf cPR jQo -ebA +ehf nkm rIC hiA @@ -129069,7 +129008,7 @@ sCQ smI lZn jGB -fJz +bXi lZn lZn fsE @@ -129583,7 +129522,7 @@ sCQ tJO lZn lZn -fJz +bXi jGB jGB uFN @@ -131372,7 +131311,7 @@ sPU iFl ptY iFl -eJb +sPU hsY iFl vaZ @@ -131629,7 +131568,7 @@ sPU iFl sMo iFl -eJb +sPU cUu aTd eML @@ -163126,7 +163065,7 @@ aae tOf aOk aOk -dnR +aOk aOk kFs aOk diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 2172ee77c6..96dd7734eb 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -814,46 +814,46 @@ GLOBAL_LIST_INIT(loot_t3_money, list( /obj/item/stack/f13Cash/random/high )) -GLOBAL_LIST_INIT(loot_skillbook, list( - /obj/item/book/granter/trait/chemistry, - // /obj/item/book/granter/trait/trekking, - /obj/item/book/granter/trait/pa_wear, - /obj/item/book/granter/crafting_recipe/gunsmith_one, - /obj/item/book/granter/crafting_recipe/gunsmith_two, - /obj/item/book/granter/crafting_recipe/gunsmith_three, - /obj/item/book/granter/crafting_recipe/gunsmith_four -)) - -GLOBAL_LIST_INIT(loot_craft_advanced, list( - /obj/item/advanced_crafting_components/flux, - /obj/item/advanced_crafting_components/lenses, - /obj/item/advanced_crafting_components/conductors, - /obj/item/advanced_crafting_components/receiver, - /obj/item/advanced_crafting_components/assembly, - /obj/item/advanced_crafting_components/alloys -)) - -GLOBAL_LIST_INIT(loot_t1_blueprint, list( - /obj/item/book/granter/crafting_recipe/blueprint/marksman, - /obj/item/book/granter/crafting_recipe/blueprint/combatrifle, - /obj/item/book/granter/crafting_recipe/blueprint/plasmapistol, - /obj/item/book/granter/crafting_recipe/blueprint/brushgun, - /obj/item/book/granter/crafting_recipe/blueprint/aer9, - /obj/item/book/granter/crafting_recipe/blueprint/smg10mm -)) - -GLOBAL_LIST_INIT(loot_t2_blueprint, list( - /obj/item/book/granter/crafting_recipe/blueprint/r91, - /obj/item/book/granter/crafting_recipe/blueprint/sniper, - /obj/item/book/granter/crafting_recipe/blueprint/riotshotgun, - /obj/item/book/granter/crafting_recipe/blueprint/thatgun, - /obj/item/book/granter/crafting_recipe/blueprint/lsw, - /obj/item/book/granter/crafting_recipe/blueprint/deagle -)) - -GLOBAL_LIST_INIT(loot_t3_blueprint, list( - /obj/item/book/granter/crafting_recipe/blueprint/am_rifle, - /obj/item/book/granter/crafting_recipe/blueprint/citykiller, - /obj/item/book/granter/crafting_recipe/blueprint/rangemaster, - /obj/item/book/granter/crafting_recipe/blueprint/bozar -)) +// GLOBAL_LIST_INIT(loot_skillbook, list( +// /obj/item/book/granter/trait/chemistry, +// // /obj/item/book/granter/trait/trekking, +// /obj/item/book/granter/trait/pa_wear, +// /obj/item/book/granter/crafting_recipe/gunsmith_one, +// /obj/item/book/granter/crafting_recipe/gunsmith_two, +// /obj/item/book/granter/crafting_recipe/gunsmith_three, +// /obj/item/book/granter/crafting_recipe/gunsmith_four +// )) + +// GLOBAL_LIST_INIT(loot_craft_advanced, list( +// /obj/item/advanced_crafting_components/flux, +// /obj/item/advanced_crafting_components/lenses, +// /obj/item/advanced_crafting_components/conductors, +// /obj/item/advanced_crafting_components/receiver, +// /obj/item/advanced_crafting_components/assembly, +// /obj/item/advanced_crafting_components/alloys +// )) + +// GLOBAL_LIST_INIT(loot_t1_blueprint, list( +// /obj/item/book/granter/crafting_recipe/blueprint/marksman, +// /obj/item/book/granter/crafting_recipe/blueprint/combatrifle, +// /obj/item/book/granter/crafting_recipe/blueprint/plasmapistol, +// /obj/item/book/granter/crafting_recipe/blueprint/brushgun, +// /obj/item/book/granter/crafting_recipe/blueprint/aer9, +// /obj/item/book/granter/crafting_recipe/blueprint/smg10mm +// )) + +// GLOBAL_LIST_INIT(loot_t2_blueprint, list( +// /obj/item/book/granter/crafting_recipe/blueprint/r91, +// /obj/item/book/granter/crafting_recipe/blueprint/sniper, +// /obj/item/book/granter/crafting_recipe/blueprint/riotshotgun, +// /obj/item/book/granter/crafting_recipe/blueprint/thatgun, +// /obj/item/book/granter/crafting_recipe/blueprint/lsw, +// /obj/item/book/granter/crafting_recipe/blueprint/deagle +// )) + +// GLOBAL_LIST_INIT(loot_t3_blueprint, list( +// /obj/item/book/granter/crafting_recipe/blueprint/am_rifle, +// /obj/item/book/granter/crafting_recipe/blueprint/citykiller, +// /obj/item/book/granter/crafting_recipe/blueprint/rangemaster, +// /obj/item/book/granter/crafting_recipe/blueprint/bozar +// )) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 31bfdc72a7..74632ae061 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -730,48 +730,48 @@ GLOBAL_VAR_INIT(lathe_reports_done, 0) var/accepts_books = TRUE tooadvanced = TRUE //technophobes will still need to be able to make ammo //not anymore they wont -/obj/machinery/autolathe/ammo/attackby(obj/item/O, mob/user, params) -/* if(!busy && !stat) - if(istype(O, /obj/item/storage/bag/casings)) - insert_things_from_bag(user, O) - return - if(istype(O, /obj/item/ammo_box)) - if(pre_insert_check(user, O)) - if(insert_bullets_from_box(user, O) == AUTOLATHE_INSERT_CONTAINER_TOO) - return ..() - return - if(istype(O, /obj/item/gun/ballistic)) - var/obj/item/gun/ballistic/gun_thing = O - if(!gun_thing.magazine) - if(!do_after(user, 2 SECONDS, target = src)) - to_chat(user, span_notice("You stop dumping \the [gun_thing] into \the [src].")) - return - return ..() - if(pre_insert_check(user, O)) - insert_magazine_from_gun(user, O) - return */ - if(panel_open && accepts_books) - if(!simple && istype(O, /obj/item/book/granter/crafting_recipe/gunsmith_one)) - to_chat(user, span_notice("You upgrade [src] with simple ammunition schematics.")) - simple = TRUE - qdel(O) - return - if(!basic && istype(O, /obj/item/book/granter/crafting_recipe/gunsmith_two)) - to_chat(user, span_notice("You upgrade [src] with basic ammunition schematics.")) - basic = TRUE - qdel(O) - return - else if(!intermediate && istype(O, /obj/item/book/granter/crafting_recipe/gunsmith_three)) - to_chat(user, span_notice("You upgrade [src] with intermediate ammunition schematics.")) - intermediate = TRUE - qdel(O) - return - else if(!advanced && istype(O, /obj/item/book/granter/crafting_recipe/gunsmith_four)) - to_chat(user, span_notice("You upgrade [src] with advanced ammunition schematics.")) - advanced = TRUE - qdel(O) - return - return ..() +// /obj/machinery/autolathe/ammo/attackby(obj/item/O, mob/user, params) +// /* if(!busy && !stat) +// if(istype(O, /obj/item/storage/bag/casings)) +// insert_things_from_bag(user, O) +// return +// if(istype(O, /obj/item/ammo_box)) +// if(pre_insert_check(user, O)) +// if(insert_bullets_from_box(user, O) == AUTOLATHE_INSERT_CONTAINER_TOO) +// return ..() +// return +// if(istype(O, /obj/item/gun/ballistic)) +// var/obj/item/gun/ballistic/gun_thing = O +// if(!gun_thing.magazine) +// if(!do_after(user, 2 SECONDS, target = src)) +// to_chat(user, span_notice("You stop dumping \the [gun_thing] into \the [src].")) +// return +// return ..() +// if(pre_insert_check(user, O)) +// insert_magazine_from_gun(user, O) +// return */ +// if(panel_open && accepts_books) +// if(!simple && istype(O, /obj/item/book/granter/crafting_recipe/gunsmith_one)) +// to_chat(user, span_notice("You upgrade [src] with simple ammunition schematics.")) +// simple = TRUE +// qdel(O) +// return +// if(!basic && istype(O, /obj/item/book/granter/crafting_recipe/gunsmith_two)) +// to_chat(user, span_notice("You upgrade [src] with basic ammunition schematics.")) +// basic = TRUE +// qdel(O) +// return +// else if(!intermediate && istype(O, /obj/item/book/granter/crafting_recipe/gunsmith_three)) +// to_chat(user, span_notice("You upgrade [src] with intermediate ammunition schematics.")) +// intermediate = TRUE +// qdel(O) +// return +// else if(!advanced && istype(O, /obj/item/book/granter/crafting_recipe/gunsmith_four)) +// to_chat(user, span_notice("You upgrade [src] with advanced ammunition schematics.")) +// advanced = TRUE +// qdel(O) +// return +// return ..() /* /obj/machinery/autolathe/ammo/proc/insert_thing(obj/item/thing, obj/item/thing_bag, datum/component/material_container/mat_box) var/mat_amount = mat_box.get_item_material_amount(thing) @@ -951,17 +951,17 @@ GLOBAL_VAR_INIT(lathe_reports_done, 0) else . = ..() -/obj/machinery/autolathe/ammo/on_deconstruction() - ..() - if(simple) - new /obj/item/book/granter/crafting_recipe/gunsmith_one(src) - if(basic) - new /obj/item/book/granter/crafting_recipe/gunsmith_two(src) - if(intermediate) - new /obj/item/book/granter/crafting_recipe/gunsmith_three(src) - if(advanced) - new /obj/item/book/granter/crafting_recipe/gunsmith_four(src) - return +// /obj/machinery/autolathe/ammo/on_deconstruction() +// ..() +// if(simple) +// new /obj/item/book/granter/crafting_recipe/gunsmith_one(src) +// if(basic) +// new /obj/item/book/granter/crafting_recipe/gunsmith_two(src) +// if(intermediate) +// new /obj/item/book/granter/crafting_recipe/gunsmith_three(src) +// if(advanced) +// new /obj/item/book/granter/crafting_recipe/gunsmith_four(src) +// return /obj/machinery/autolathe/ammo/unlocked_basic desc = "A ammo bench where you can make ammo and magazines. Copies of Guns and Ammo, parts one and two, can be found in a drawer." diff --git a/code/game/objects/effects/spawners/masterlootdrop.dm b/code/game/objects/effects/spawners/masterlootdrop.dm index fc53bb60cf..b5cde70dac 100644 --- a/code/game/objects/effects/spawners/masterlootdrop.dm +++ b/code/game/objects/effects/spawners/masterlootdrop.dm @@ -1233,7 +1233,7 @@ /obj/item/restraints/handcuffs/cable = 1, /obj/item/restraints/handcuffs/sinew = 1, /obj/item/lockpick_set = 1, - /obj/item/book/granter/crafting_recipe/gunsmith_one = 1, + // /obj/item/book/granter/crafting_recipe/gunsmith_one = 1, /obj/item/book/granter/crafting_recipe/ODF = 1, /obj/item/geiger_counter = 1, /obj/item/reagent_containers/glass/beaker = 1, @@ -1265,7 +1265,7 @@ /obj/item/mop = 1, /obj/item/lockpick_set = 1, /obj/item/stealthboy = 1, - /obj/item/book/granter/crafting_recipe/gunsmith_two = 1, + // /obj/item/book/granter/crafting_recipe/gunsmith_two = 1, /obj/item/book/granter/crafting_recipe/scav_one = 1, /obj/item/book/granter/crafting_recipe/blueprint/trapper = 1, /obj/item/reagent_containers/glass/beaker/large = 1, @@ -1290,7 +1290,7 @@ /obj/item/mop/advanced = 1, /obj/item/stealthboy = 1, /obj/item/book/granter/action/drink_fling = 1, - /obj/item/book/granter/crafting_recipe/gunsmith_three = 1, + // /obj/item/book/granter/crafting_recipe/gunsmith_three = 1, /obj/item/book/granter/crafting_recipe/scav_two = 1, /obj/item/book/granter/trait/explosives = 1, /obj/item/reagent_containers/glass/beaker/plastic = 1, @@ -1315,7 +1315,7 @@ /obj/item/defibrillator/compact = 1, /obj/item/extinguisher/advanced = 1, /obj/item/stealthboy = 1, - /obj/item/book/granter/crafting_recipe/gunsmith_four = 1, + // /obj/item/book/granter/crafting_recipe/gunsmith_four = 1, /obj/item/book/granter/crafting_recipe/scav_three = 1, /obj/item/book/granter/trait/explosives_advanced = 1, /obj/item/reagent_containers/glass/beaker/meta = 1, diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 6da4dee71b..c764370c8b 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -628,37 +628,37 @@ oneuse = FALSE remarks = list() -/obj/item/book/granter/crafting_recipe/gunsmith_one - name = "Guns and Bullets, Part 1" - desc = "A rare issue of Guns and Bullets detailing the basic manufacture of firearms, allowing the reader to craft firearms. It's barely holding up, and looks like only one person can study the knowledge from it." - icon_state = "gab1" - oneuse = TRUE - remarks = list("Always keep your gun well lubricated...", "Keep your barrel free of grime...", "Perfect fitment is the key to a good firearm...", "Maintain a proper trigger pull length...", "Keep your sights zeroed to proper range...") - crafting_recipe_types = list(/datum/crafting_recipe/ninemil, /datum/crafting_recipe/huntingrifle, /datum/crafting_recipe/tec22) - -/obj/item/book/granter/crafting_recipe/gunsmith_two - name = "Guns and Bullets, Part 2" - desc = "A rare issue of Guns and Bullets following up Part 1, going further indepth into weapon mechanics, allowing the reader to craft certain firearms. It's barely holding up, and looks like only one person can study the knowledge from it." - icon_state = "gab2" - oneuse = TRUE - remarks = list("Always keep your gun well lubricated...", "Keep your barrel free of grime...", "Perfect fitment is the key to a good firearm...", "Maintain a proper trigger pull length...", "Keep your sights zeroed to proper range...") - crafting_recipe_types = list(/datum/crafting_recipe/n99, /datum/crafting_recipe/huntingrifle, /datum/crafting_recipe/m1911, /datum/crafting_recipe/varmintrifle, /datum/crafting_recipe/caravanshotty, /datum/crafting_recipe/widowmakershotty, /datum/crafting_recipe/auto9mm) - -/obj/item/book/granter/crafting_recipe/gunsmith_three - name = "Guns and Bullets, Part 3" - desc = "A rare issue of Guns and Bullets following up Part 2, explaining difficult ballistics theory and weapon mechanics, allowing the reader to craft weapon attachments. It's barely holding up, and looks like only one person can study the knowledge from it." - icon_state = "gab3" - oneuse = TRUE - remarks = list("Always keep your gun well lubricated...", "Keep your barrel free of grime...", "Perfect fitment is the key to a good firearm...", "Maintain a proper trigger pull length...", "Keep your sights zeroed to proper range...") - crafting_recipe_types = list(/datum/crafting_recipe/smg10mm) - -/obj/item/book/granter/crafting_recipe/gunsmith_four - name = "Guns and Bullets, Part 4" - desc = "An extremely rare issue of Guns and Bullets, showing some design flaws of weapons and how to rectify them. It's barely holding up, and looks like only one person can study the knowledge from it." - icon_state = "gab4" - oneuse = TRUE - remarks = list("Always keep your gun well lubricated...", "Keep your barrel free of grime...", "Perfect fitment is the key to a good firearm...", "Maintain a proper trigger pull length...", "Keep your sights zeroed to proper range...") - crafting_recipe_types = list(/datum/crafting_recipe/flux, /datum/crafting_recipe/lenses, /datum/crafting_recipe/conductors, /datum/crafting_recipe/receiver, /datum/crafting_recipe/assembly, /datum/crafting_recipe/alloys) +// /obj/item/book/granter/crafting_recipe/gunsmith_one +// name = "Guns and Bullets, Part 1" +// desc = "A rare issue of Guns and Bullets detailing the basic manufacture of firearms, allowing the reader to craft firearms. It's barely holding up, and looks like only one person can study the knowledge from it." +// icon_state = "gab1" +// oneuse = TRUE +// remarks = list("Always keep your gun well lubricated...", "Keep your barrel free of grime...", "Perfect fitment is the key to a good firearm...", "Maintain a proper trigger pull length...", "Keep your sights zeroed to proper range...") +// crafting_recipe_types = list(/datum/crafting_recipe/ninemil, /datum/crafting_recipe/huntingrifle, /datum/crafting_recipe/tec22) + +// /obj/item/book/granter/crafting_recipe/gunsmith_two +// name = "Guns and Bullets, Part 2" +// desc = "A rare issue of Guns and Bullets following up Part 1, going further indepth into weapon mechanics, allowing the reader to craft certain firearms. It's barely holding up, and looks like only one person can study the knowledge from it." +// icon_state = "gab2" +// oneuse = TRUE +// remarks = list("Always keep your gun well lubricated...", "Keep your barrel free of grime...", "Perfect fitment is the key to a good firearm...", "Maintain a proper trigger pull length...", "Keep your sights zeroed to proper range...") +// crafting_recipe_types = list(/datum/crafting_recipe/n99, /datum/crafting_recipe/huntingrifle, /datum/crafting_recipe/m1911, /datum/crafting_recipe/varmintrifle, /datum/crafting_recipe/caravanshotty, /datum/crafting_recipe/widowmakershotty, /datum/crafting_recipe/auto9mm) + +// /obj/item/book/granter/crafting_recipe/gunsmith_three +// name = "Guns and Bullets, Part 3" +// desc = "A rare issue of Guns and Bullets following up Part 2, explaining difficult ballistics theory and weapon mechanics, allowing the reader to craft weapon attachments. It's barely holding up, and looks like only one person can study the knowledge from it." +// icon_state = "gab3" +// oneuse = TRUE +// remarks = list("Always keep your gun well lubricated...", "Keep your barrel free of grime...", "Perfect fitment is the key to a good firearm...", "Maintain a proper trigger pull length...", "Keep your sights zeroed to proper range...") +// crafting_recipe_types = list(/datum/crafting_recipe/smg10mm) + +// /obj/item/book/granter/crafting_recipe/gunsmith_four +// name = "Guns and Bullets, Part 4" +// desc = "An extremely rare issue of Guns and Bullets, showing some design flaws of weapons and how to rectify them. It's barely holding up, and looks like only one person can study the knowledge from it." +// icon_state = "gab4" +// oneuse = TRUE +// remarks = list("Always keep your gun well lubricated...", "Keep your barrel free of grime...", "Perfect fitment is the key to a good firearm...", "Maintain a proper trigger pull length...", "Keep your sights zeroed to proper range...") +// crafting_recipe_types = list(/datum/crafting_recipe/flux, /datum/crafting_recipe/lenses, /datum/crafting_recipe/conductors, /datum/crafting_recipe/receiver, /datum/crafting_recipe/assembly, /datum/crafting_recipe/alloys) /obj/item/book/granter/crafting_recipe/scav_one name = "SCAV! Issue 1" diff --git a/code/game/objects/items/prize_loot.dm b/code/game/objects/items/prize_loot.dm index 6ac23e81b7..a90f3147f6 100644 --- a/code/game/objects/items/prize_loot.dm +++ b/code/game/objects/items/prize_loot.dm @@ -524,9 +524,9 @@ prize_amount = 2 locked = TRUE -/obj/item/locked_box/misc/crafting/advanced/initialize_prizes() - global_loot_lists = list(GLOB.loot_craft_advanced) - . = ..() +// /obj/item/locked_box/misc/crafting/advanced/initialize_prizes() +// global_loot_lists = list(GLOB.loot_craft_advanced) +// . = ..() /obj/item/locked_box/misc/resource easy_naming = "resource " @@ -602,9 +602,9 @@ locked = TRUE lock_tier = 3 -/obj/item/locked_box/misc/skillbook/initialize_prizes() - global_loot_lists = list(GLOB.loot_skillbook) - . = ..() +// /obj/item/locked_box/misc/skillbook/initialize_prizes() +// global_loot_lists = list(GLOB.loot_skillbook) +// . = ..() /obj/item/locked_box/misc/attachments easy_naming = "attachment " @@ -624,20 +624,20 @@ /obj/item/locked_box/misc/blueprints/tier1 lock_tier = 2 -/obj/item/locked_box/misc/blueprints/tier1/initialize_prizes() - global_loot_lists = list(GLOB.loot_t1_blueprint) - . = ..() +// /obj/item/locked_box/misc/blueprints/tier1/initialize_prizes() +// global_loot_lists = list(GLOB.loot_t1_blueprint) +// . = ..() -/obj/item/locked_box/misc/blueprints/tier2 - lock_tier = 3 +// /obj/item/locked_box/misc/blueprints/tier2 +// lock_tier = 3 -/obj/item/locked_box/misc/blueprints/tier2/initialize_prizes() - global_loot_lists = list(GLOB.loot_t2_blueprint) - . = ..() +// /obj/item/locked_box/misc/blueprints/tier2/initialize_prizes() +// global_loot_lists = list(GLOB.loot_t2_blueprint) +// . = ..() -/obj/item/locked_box/misc/blueprints/tier3 - lock_tier = 4 +// /obj/item/locked_box/misc/blueprints/tier3 +// lock_tier = 4 -/obj/item/locked_box/misc/blueprints/tier3/initialize_prizes() - global_loot_lists = list(GLOB.loot_t3_blueprint) - . = ..() +// /obj/item/locked_box/misc/blueprints/tier3/initialize_prizes() +// global_loot_lists = list(GLOB.loot_t3_blueprint) +// . = ..() diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index b7442dd11e..4e78fdb9ee 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -35,8 +35,8 @@ /datum/block_parry_data/shield block_damage_multiplier = 0.25 block_stamina_efficiency = 2.5 - block_stamina_cost_per_second = 2.5 - block_slowdown = 0.4 + block_stamina_cost_per_second = 5 + block_slowdown = 0.2 block_lock_attacking = FALSE block_lock_sprinting = TRUE block_start_delay = 1.5 diff --git a/code/game/objects/structures/divine.dm b/code/game/objects/structures/divine.dm index b7dddd4a9c..e84e833a15 100644 --- a/code/game/objects/structures/divine.dm +++ b/code/game/objects/structures/divine.dm @@ -38,10 +38,10 @@ GLOBAL_LIST_INIT(gunparts_rates, list( var/loot_item = pick(GLOB.gunparts_rates) new loot_item (get_turf(user)) return - if(TRUE) - var/pick_adcomp = pickweight(GLOB.loot_craft_advanced) - new pick_adcomp(get_turf(user)) - return + // if(TRUE) + // // var/pick_adcomp = pickweight(GLOB.loot_craft_advanced) + // new pick_adcomp(get_turf(user)) + // return if(!has_buckled_mobs()) return var/mob/living/L = locate() in buckled_mobs diff --git a/code/modules/WVM/wvm.dm b/code/modules/WVM/wvm.dm index bfd85af77e..76b3d9aa56 100644 --- a/code/modules/WVM/wvm.dm +++ b/code/modules/WVM/wvm.dm @@ -529,34 +529,32 @@ GLOBAL_VAR_INIT(vendor_cash, 0) var/list/prize_list = list() //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces. var/list/highpop_list = list() //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces. + + /obj/machinery/mineral/wasteland_vendor/medical name = "Wasteland Vending Machine - Medical" icon_state = "numed_idle" prize_list = list( new /datum/data/wasteland_equipment("Syringe", /obj/item/reagent_containers/syringe, 5), - new /datum/data/wasteland_equipment("Rad-X Bottle", /obj/item/storage/pill_bottle/chem_tin/radx, 25), - new /datum/data/wasteland_equipment("RadAway", /obj/item/reagent_containers/blood/radaway, 40), - new /datum/data/wasteland_equipment("Basic Bandages", /obj/item/stack/medical/gauze/improvised, 30), - new /datum/data/wasteland_equipment("Basic Stitches", /obj/item/stack/medical/suture/emergency/fifteen, 30), - new /datum/data/wasteland_equipment("Healing Powder", /obj/item/reagent_containers/pill/healingpowder, 30), + new /datum/data/wasteland_equipment("Radiation Blocker Bottle", /obj/item/storage/pill_bottle/chem_tin/radx, 150), + new /datum/data/wasteland_equipment("Radiation Purge", /obj/item/reagent_containers/blood/radaway, 300), + new /datum/data/wasteland_equipment("Stimpack", /obj/item/reagent_containers/hypospray/medipen/stimpak, 300), + new /datum/data/wasteland_equipment("Basic Bandages", /obj/item/stack/medical/gauze/improvised, 250), + new /datum/data/wasteland_equipment("Basic Stitches", /obj/item/stack/medical/suture/emergency/fifteen, 500), + new /datum/data/wasteland_equipment("Healing Powder", /obj/item/reagent_containers/pill/healingpowder, 250), new /datum/data/wasteland_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 120), - new /datum/data/wasteland_equipment("Improvised Defibrillator", /obj/item/defibrillator/primitive, 150), - new /datum/data/wasteland_equipment("Surgery for Wastelanders", /obj/item/book/granter/trait/lowsurgery, 300), - new /datum/data/wasteland_equipment("D.C. Journal of Internal Medicine", /obj/item/book/granter/trait/midsurgery, 750), - new /datum/data/wasteland_equipment("Chemistry for Wastelanders", /obj/item/book/granter/trait/chemistry, 1500) + new /datum/data/wasteland_equipment("Improvised Defibrillator", /obj/item/defibrillator/primitive, 1000), ) highpop_list = list( new /datum/data/wasteland_equipment("Syringe", /obj/item/reagent_containers/syringe, 5), - new /datum/data/wasteland_equipment("Rad-X Bottle", /obj/item/storage/pill_bottle/chem_tin/radx, 25), - new /datum/data/wasteland_equipment("RadAway", /obj/item/reagent_containers/blood/radaway, 40), - new /datum/data/wasteland_equipment("Basic Bandages", /obj/item/stack/medical/gauze/improvised, 30), - new /datum/data/wasteland_equipment("Basic Stitches", /obj/item/stack/medical/suture/emergency/fifteen, 30), - new /datum/data/wasteland_equipment("Healing Powder", /obj/item/reagent_containers/pill/healingpowder, 30), + new /datum/data/wasteland_equipment("Radiation Blocker Bottle", /obj/item/storage/pill_bottle/chem_tin/radx, 150), + new /datum/data/wasteland_equipment("Radiation Purge", /obj/item/reagent_containers/blood/radaway, 300), + new /datum/data/wasteland_equipment("Stimpack", /obj/item/reagent_containers/hypospray/medipen/stimpak, 300), + new /datum/data/wasteland_equipment("Basic Bandages", /obj/item/stack/medical/gauze/improvised, 250), + new /datum/data/wasteland_equipment("Basic Stitches", /obj/item/stack/medical/suture/emergency/fifteen, 500), + new /datum/data/wasteland_equipment("Healing Powder", /obj/item/reagent_containers/pill/healingpowder, 250), new /datum/data/wasteland_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 120), - new /datum/data/wasteland_equipment("Improvised Defibrillator", /obj/item/defibrillator/primitive, 150), - new /datum/data/wasteland_equipment("Surgery for Wastelanders", /obj/item/book/granter/trait/lowsurgery, 300), - new /datum/data/wasteland_equipment("D.C. Journal of Internal Medicine", /obj/item/book/granter/trait/midsurgery, 750), - new /datum/data/wasteland_equipment("Chemistry for Wastelanders", /obj/item/book/granter/trait/chemistry, 1500) + new /datum/data/wasteland_equipment("Improvised Defibrillator", /obj/item/defibrillator/primitive, 1000), ) /obj/machinery/mineral/wasteland_vendor/supermedical @@ -740,52 +738,52 @@ GLOBAL_VAR_INIT(vendor_cash, 0) name = "Wasteland Vending Machine - Ammunition" icon_state = "nuammo_idle" prize_list = list( - new /datum/data/wasteland_equipment(".22lr BP Box (60 Bullets)", /obj/item/ammo_box/b22, 80), - new /datum/data/wasteland_equipment(".22lr BP Crate (240 Bullets)", /obj/item/ammo_box/b22/crate, 200), - new /datum/data/wasteland_equipment("9mm BP Box (60 Bullets)", /obj/item/ammo_box/b9mm, 120), - new /datum/data/wasteland_equipment("9mm BP Crate (240 Bullets)", /obj/item/ammo_box/b9mm/crate, 250), - new /datum/data/wasteland_equipment(".357 BP Box (60 Bullets)", /obj/item/ammo_box/b357, 120), - new /datum/data/wasteland_equipment(".357 BP Crate (240 Bullets)", /obj/item/ammo_box/b357/crate, 250), - new /datum/data/wasteland_equipment(".44 BP Box (60 Bullets)", /obj/item/ammo_box/b44, 170), - new /datum/data/wasteland_equipment(".44 BP Crate (240 Bullets)", /obj/item/ammo_box/b44/crate, 300), - new /datum/data/wasteland_equipment(".45 BP Box (60 Bullets)", /obj/item/ammo_box/b45, 175), - new /datum/data/wasteland_equipment(".45 BP Crate (240 Bullets)", /obj/item/ammo_box/b45/crate, 350), - new /datum/data/wasteland_equipment("5.56 SL Box (60 Bullets)", /obj/item/ammo_box/s556, 200), - new /datum/data/wasteland_equipment("5.56 SL Crate (240 Bullets)", /obj/item/ammo_box/s556/crate, 350), - new /datum/data/wasteland_equipment("7.62x39 SL Box (60 Bullets)", /obj/item/ammo_box/s762by39, 220), - new /datum/data/wasteland_equipment("7.62x39 SL Crate (240 Bullets)", /obj/item/ammo_box/s762by39/crate, 350), - new /datum/data/wasteland_equipment(".308 SL Box (60 Bullets)", /obj/item/ammo_box/s308, 225), - new /datum/data/wasteland_equipment(".308 SL Crate (240 Bullets)", /obj/item/ammo_box/s308/crate, 450), - new /datum/data/wasteland_equipment(".30-06 SL Box (60 Bullets)", /obj/item/ammo_box/s3006, 300), - new /datum/data/wasteland_equipment(".30-06 SL Crate (240 Bullets)", /obj/item/ammo_box/s3006/crate, 500), + new /datum/data/wasteland_equipment(".22lr BP Box (120 Bullets)", /obj/item/ammo_box/b22, 120), + new /datum/data/wasteland_equipment(".22lr BP Crate (400 Bullets)", /obj/item/ammo_box/b22/crate, 400), + new /datum/data/wasteland_equipment("9mm BP Box (90 Bullets)", /obj/item/ammo_box/b9mm, 270), + new /datum/data/wasteland_equipment("9mm BP Crate (360 Bullets)", /obj/item/ammo_box/b9mm/crate, 700), + new /datum/data/wasteland_equipment(".357 BP Box (90 Bullets)", /obj/item/ammo_box/b357, 270), + new /datum/data/wasteland_equipment(".357 BP Crate (360 Bullets)", /obj/item/ammo_box/b357/crate, 700), + new /datum/data/wasteland_equipment(".44 BP Box (90 Bullets)", /obj/item/ammo_box/b44, 270), + new /datum/data/wasteland_equipment(".44 BP Crate (360 Bullets)", /obj/item/ammo_box/b44/crate, 700), + new /datum/data/wasteland_equipment(".45 BP Box (90 Bullets)", /obj/item/ammo_box/b45, 270), + new /datum/data/wasteland_equipment(".45 BP Crate (360 Bullets)", /obj/item/ammo_box/b45/crate, 700), + new /datum/data/wasteland_equipment("5.56 SL Box (60 Bullets)", /obj/item/ammo_box/s556, 330), + new /datum/data/wasteland_equipment("5.56 SL Crate (240 Bullets)", /obj/item/ammo_box/s556/crate, 900), + new /datum/data/wasteland_equipment("7.62x39 SL Box (60 Bullets)", /obj/item/ammo_box/s762by39, 330), + new /datum/data/wasteland_equipment("7.62x39 SL Crate (240 Bullets)", /obj/item/ammo_box/s762by39/crate, 900), + new /datum/data/wasteland_equipment(".308 SL Box (30 Bullets)", /obj/item/ammo_box/s308, 400), + new /datum/data/wasteland_equipment(".308 SL Crate (120 Bullets)", /obj/item/ammo_box/s308/crate, 1000), + new /datum/data/wasteland_equipment(".30-06 SL Box (30 Bullets)", /obj/item/ammo_box/s3006, 400), + new /datum/data/wasteland_equipment(".30-06 SL Crate (120 Bullets)", /obj/item/ammo_box/s3006/crate, 1000), new /datum/data/wasteland_equipment("Buckshot BP Box (60 Bullets)", /obj/item/ammo_box/bbuckshot, 275), new /datum/data/wasteland_equipment("Buckshot SL Crate (240 Bullets)", /obj/item/ammo_box/sbuckshot/crate, 550), - new /datum/data/wasteland_equipment("Field Arrow (1 arrow)", /obj/item/ammo_casing/caseless/arrow/field, 60), - new /datum/data/wasteland_equipment("Minie Ball Ammo", /obj/item/ammo_box/flintlock/minie, 150), + new /datum/data/wasteland_equipment("Field Arrow (1 arrow)", /obj/item/ammo_casing/caseless/arrow/field, 100), + new /datum/data/wasteland_equipment("Minie Ball Ammo", /obj/item/ammo_box/flintlock/minie, 500), ) highpop_list = list( - new /datum/data/wasteland_equipment(".22lr BP Box (60 Bullets)", /obj/item/ammo_box/b22, 100), - new /datum/data/wasteland_equipment(".22lr BP Crate (240 Bullets)", /obj/item/ammo_box/b22/crate, 250), - new /datum/data/wasteland_equipment("9mm BP Box (60 Bullets)", /obj/item/ammo_box/b9mm, 150), - new /datum/data/wasteland_equipment("9mm BP Crate (240 Bullets)", /obj/item/ammo_box/b9mm/crate, 300), - new /datum/data/wasteland_equipment(".357 BP Box (60 Bullets)", /obj/item/ammo_box/b357, 150), - new /datum/data/wasteland_equipment(".357 BP Crate (240 Bullets)", /obj/item/ammo_box/b357/crate, 300), - new /datum/data/wasteland_equipment(".44 BP Box (60 Bullets)", /obj/item/ammo_box/b44, 200), - new /datum/data/wasteland_equipment(".44 BP Crate (240 Bullets)", /obj/item/ammo_box/b44/crate, 400), - new /datum/data/wasteland_equipment(".45 BP Box (60 Bullets)", /obj/item/ammo_box/b45, 225), - new /datum/data/wasteland_equipment(".45 BP Crate (240 Bullets)", /obj/item/ammo_box/b45/crate, 425), - new /datum/data/wasteland_equipment("5.56 SL Box (60 Bullets)", /obj/item/ammo_box/s556, 250), - new /datum/data/wasteland_equipment("5.56 SL Crate (240 Bullets)", /obj/item/ammo_box/s556/crate, 450), - new /datum/data/wasteland_equipment("7.62x39 SL Box (60 Bullets)", /obj/item/ammo_box/s762by39, 275), - new /datum/data/wasteland_equipment("7.62x39 SL Crate (240 Bullets)", /obj/item/ammo_box/s762by39/crate, 460), - new /datum/data/wasteland_equipment(".308 SL Box (60 Bullets)", /obj/item/ammo_box/s308, 300), - new /datum/data/wasteland_equipment(".308 SL Crate (240 Bullets)", /obj/item/ammo_box/s308/crate, 600), - new /datum/data/wasteland_equipment(".30-06 SL Box (60 Bullets)", /obj/item/ammo_box/s3006, 400), - new /datum/data/wasteland_equipment(".30-06 SL Crate (240 Bullets)", /obj/item/ammo_box/s3006/crate, 800), - new /datum/data/wasteland_equipment("Buckshot BP Box (60 Bullets)", /obj/item/ammo_box/bbuckshot, 350), - new /datum/data/wasteland_equipment("Buckshot SL Crate (240 Bullets)", /obj/item/ammo_box/sbuckshot/crate, 700), + new /datum/data/wasteland_equipment(".22lr BP Box (120 Bullets)", /obj/item/ammo_box/b22, 120), + new /datum/data/wasteland_equipment(".22lr BP Crate (400 Bullets)", /obj/item/ammo_box/b22/crate, 400), + new /datum/data/wasteland_equipment("9mm BP Box (90 Bullets)", /obj/item/ammo_box/b9mm, 270), + new /datum/data/wasteland_equipment("9mm BP Crate (360 Bullets)", /obj/item/ammo_box/b9mm/crate, 700), + new /datum/data/wasteland_equipment(".357 BP Box (90 Bullets)", /obj/item/ammo_box/b357, 270), + new /datum/data/wasteland_equipment(".357 BP Crate (360 Bullets)", /obj/item/ammo_box/b357/crate, 700), + new /datum/data/wasteland_equipment(".44 BP Box (90 Bullets)", /obj/item/ammo_box/b44, 270), + new /datum/data/wasteland_equipment(".44 BP Crate (360 Bullets)", /obj/item/ammo_box/b44/crate, 700), + new /datum/data/wasteland_equipment(".45 BP Box (90 Bullets)", /obj/item/ammo_box/b45, 270), + new /datum/data/wasteland_equipment(".45 BP Crate (360 Bullets)", /obj/item/ammo_box/b45/crate, 700), + new /datum/data/wasteland_equipment("5.56 SL Box (60 Bullets)", /obj/item/ammo_box/s556, 330), + new /datum/data/wasteland_equipment("5.56 SL Crate (240 Bullets)", /obj/item/ammo_box/s556/crate, 900), + new /datum/data/wasteland_equipment("7.62x39 SL Box (60 Bullets)", /obj/item/ammo_box/s762by39, 330), + new /datum/data/wasteland_equipment("7.62x39 SL Crate (240 Bullets)", /obj/item/ammo_box/s762by39/crate, 900), + new /datum/data/wasteland_equipment(".308 SL Box (30 Bullets)", /obj/item/ammo_box/s308, 400), + new /datum/data/wasteland_equipment(".308 SL Crate (120 Bullets)", /obj/item/ammo_box/s308/crate, 1000), + new /datum/data/wasteland_equipment(".30-06 SL Box (30 Bullets)", /obj/item/ammo_box/s3006, 400), + new /datum/data/wasteland_equipment(".30-06 SL Crate (120 Bullets)", /obj/item/ammo_box/s3006/crate, 1000), + new /datum/data/wasteland_equipment("Buckshot BP Box (60 Bullets)", /obj/item/ammo_box/bbuckshot, 275), + new /datum/data/wasteland_equipment("Buckshot SL Crate (240 Bullets)", /obj/item/ammo_box/sbuckshot/crate, 550), new /datum/data/wasteland_equipment("Field Arrow (1 arrow)", /obj/item/ammo_casing/caseless/arrow/field, 100), - new /datum/data/wasteland_equipment("Minie Ball Ammo", /obj/item/ammo_box/flintlock/minie, 250), + new /datum/data/wasteland_equipment("Minie Ball Ammo", /obj/item/ammo_box/flintlock/minie, 500), ) /obj/machinery/mineral/wasteland_vendor/badammo @@ -870,43 +868,43 @@ GLOBAL_VAR_INIT(vendor_cash, 0) new /datum/data/wasteland_equipment("Explorer satchel", /obj/item/storage/backpack/satchel/explorer, 15), new /datum/data/wasteland_equipment("Spray bottle", /obj/item/reagent_containers/spray, 15), new /datum/data/wasteland_equipment("Bottle of E-Z-Nutrient", /obj/item/reagent_containers/glass/bottle/nutrient/ez, 20), - new /datum/data/wasteland_equipment("Craftsmanship Monthly", /obj/item/book/granter/trait/techno, 150), - new /datum/data/wasteland_equipment("Scav! Vol.1", /obj/item/book/granter/crafting_recipe/scav_one, 250), - new /datum/data/wasteland_equipment("Portable Cell Charger", /obj/item/storage/battery_box, 50), - new /datum/data/wasteland_equipment("Weapons of Texarkana", /obj/item/book/granter/crafting_recipe/ODF, 150), + // new /datum/data/wasteland_equipment("Craftsmanship Monthly", /obj/item/book/granter/trait/techno, 150), + // new /datum/data/wasteland_equipment("Scav! Vol.1", /obj/item/book/granter/crafting_recipe/scav_one, 250), + // new /datum/data/wasteland_equipment("Portable Cell Charger", /obj/item/storage/battery_box, 50), + // new /datum/data/wasteland_equipment("Weapons of Texarkana", /obj/item/book/granter/crafting_recipe/ODF, 150), // new /datum/data/wasteland_equipment("Ranger's Guide to the Wasteland", /obj/item/book/granter/trait/trekking, 350), - new /datum/data/wasteland_equipment("Rift Repelling Machine", /obj/item/packaged_respawner_blocker, 0), // let's encourage players to clear out areas constantly - new /datum/data/wasteland_equipment("Glowstick Pouch", /obj/item/storage/fancy/flare_pouch/glowstick, 5), - new /datum/data/wasteland_equipment("Flare Pouch", /obj/item/storage/fancy/flare_pouch, 5), // larp - new /datum/data/wasteland_equipment("Hand teleporter", /obj/item/hand_tele, 0), - new /datum/data/wasteland_equipment("Blue Flashlight (Tier 2)", /obj/item/flashlight/blue, 50), - new /datum/data/wasteland_equipment("Seclite (Tier 3)", /obj/item/flashlight/seclite, 100), - new /datum/data/wasteland_equipment("Prospector Lamp (Tier 2)", /obj/item/flashlight/lantern/mining, 50), - new /datum/data/wasteland_equipment("Lantern (Tier 3)", /obj/item/flashlight/lantern, 100), - new /datum/data/wasteland_equipment("Fulton Pack", /obj/item/extraction_pack, 10), - new /datum/data/wasteland_equipment("Fulton Core", /obj/item/fulton_core, 10), + new /datum/data/wasteland_equipment("Rift Repelling Machine", /obj/item/packaged_respawner_blocker, 100), + new /datum/data/wasteland_equipment("Glowstick Pouch", /obj/item/storage/fancy/flare_pouch/glowstick, 150), + new /datum/data/wasteland_equipment("Flare Pouch", /obj/item/storage/fancy/flare_pouch, 150), // larp + new /datum/data/wasteland_equipment("Hand teleporter", /obj/item/hand_tele, 1000), + new /datum/data/wasteland_equipment("Blue Flashlight (Tier 2)", /obj/item/flashlight/blue, 150), + new /datum/data/wasteland_equipment("Seclite (Tier 3)", /obj/item/flashlight/seclite, 300), + new /datum/data/wasteland_equipment("Prospector Lamp (Tier 2)", /obj/item/flashlight/lantern/mining, 500), + new /datum/data/wasteland_equipment("Lantern (Tier 3)", /obj/item/flashlight/lantern, 500), + new /datum/data/wasteland_equipment("Fulton Pack", /obj/item/extraction_pack, 500), + new /datum/data/wasteland_equipment("Fulton Core", /obj/item/fulton_core, 400), ) highpop_list = list( - new /datum/data/wasteland_equipment("Drinking glass", /obj/item/reagent_containers/food/drinks/drinkingglass, 5), + new /datum/data/wasteland_equipment("Drinking glass", /obj/item/reagent_containers/food/drinks/drinkingglass, 5), new /datum/data/wasteland_equipment("Zippo", /obj/item/lighter, 10), new /datum/data/wasteland_equipment("Explorer satchel", /obj/item/storage/backpack/satchel/explorer, 15), new /datum/data/wasteland_equipment("Spray bottle", /obj/item/reagent_containers/spray, 15), new /datum/data/wasteland_equipment("Bottle of E-Z-Nutrient", /obj/item/reagent_containers/glass/bottle/nutrient/ez, 20), - new /datum/data/wasteland_equipment("Craftsmanship Monthly", /obj/item/book/granter/trait/techno, 150), - new /datum/data/wasteland_equipment("Scav! Vol.1", /obj/item/book/granter/crafting_recipe/scav_one, 250), - new /datum/data/wasteland_equipment("Portable Cell Charger", /obj/item/storage/battery_box, 50), - new /datum/data/wasteland_equipment("Weapons of Texarkana", /obj/item/book/granter/crafting_recipe/ODF, 150), + // new /datum/data/wasteland_equipment("Craftsmanship Monthly", /obj/item/book/granter/trait/techno, 150), + // new /datum/data/wasteland_equipment("Scav! Vol.1", /obj/item/book/granter/crafting_recipe/scav_one, 250), + // new /datum/data/wasteland_equipment("Portable Cell Charger", /obj/item/storage/battery_box, 50), + // new /datum/data/wasteland_equipment("Weapons of Texarkana", /obj/item/book/granter/crafting_recipe/ODF, 150), // new /datum/data/wasteland_equipment("Ranger's Guide to the Wasteland", /obj/item/book/granter/trait/trekking, 350), - new /datum/data/wasteland_equipment("Rift Repellent", /obj/item/packaged_respawner_blocker, 0), // let's encourage players to clear out areas constantly - new /datum/data/wasteland_equipment("Glowstick Pouch", /obj/item/storage/fancy/flare_pouch/glowstick, 5), - new /datum/data/wasteland_equipment("Flare Pouch", /obj/item/storage/fancy/flare_pouch, 5), // larp - new /datum/data/wasteland_equipment("Hand teleporter", /obj/item/hand_tele, 0), - new /datum/data/wasteland_equipment("Blue Flashlight (Tier 2)", /obj/item/flashlight/blue, 50), - new /datum/data/wasteland_equipment("Seclite (Tier 3)", /obj/item/flashlight/seclite, 100), - new /datum/data/wasteland_equipment("Prospector Lamp (Tier 2)", /obj/item/flashlight/lantern/mining, 50), - new /datum/data/wasteland_equipment("Lantern (Tier 3)", /obj/item/flashlight/lantern, 100), - new /datum/data/wasteland_equipment("Fulton Pack", /obj/item/extraction_pack, 10), - new /datum/data/wasteland_equipment("Fulton Core", /obj/item/fulton_core, 10), + new /datum/data/wasteland_equipment("Rift Repelling Machine", /obj/item/packaged_respawner_blocker, 100), + new /datum/data/wasteland_equipment("Glowstick Pouch", /obj/item/storage/fancy/flare_pouch/glowstick, 150), + new /datum/data/wasteland_equipment("Flare Pouch", /obj/item/storage/fancy/flare_pouch, 150), // larp + new /datum/data/wasteland_equipment("Hand teleporter", /obj/item/hand_tele, 1000), + new /datum/data/wasteland_equipment("Blue Flashlight (Tier 2)", /obj/item/flashlight/blue, 150), + new /datum/data/wasteland_equipment("Seclite (Tier 3)", /obj/item/flashlight/seclite, 300), + new /datum/data/wasteland_equipment("Prospector Lamp (Tier 2)", /obj/item/flashlight/lantern/mining, 500), + new /datum/data/wasteland_equipment("Lantern (Tier 3)", /obj/item/flashlight/lantern, 500), + new /datum/data/wasteland_equipment("Fulton Pack", /obj/item/extraction_pack, 500), + new /datum/data/wasteland_equipment("Fulton Core", /obj/item/fulton_core, 400), ) /* These are shit, don't add them. @@ -1265,78 +1263,68 @@ GLOBAL_VAR_INIT(vendor_cash, 0) name = "Wasteland Vending Machine - Crafting" icon_state = "seller_crafting" prize_list = list( - new /datum/data/wasteland_equipment("Metal Parts (x5)", /obj/item/stack/crafting/metalparts/five, 10), - new /datum/data/wasteland_equipment("High Quality Metal Parts (x5)", /obj/item/stack/crafting/goodparts/five, 25), - new /datum/data/wasteland_equipment("Electronic Parts (x5)", /obj/item/stack/crafting/electronicparts/five, 25), - new /datum/data/wasteland_equipment("Metal Sheets (x20)", /obj/item/stack/sheet/metal/twenty, 30), - new /datum/data/wasteland_equipment("Metal Sheets (x50)", /obj/item/stack/sheet/metal/fifty, 65), - new /datum/data/wasteland_equipment("Glass Sheets (x10)", /obj/item/stack/sheet/glass/ten, 10), - new /datum/data/wasteland_equipment("Glass Sheets (x50)", /obj/item/stack/sheet/glass/fifty, 50), - new /datum/data/wasteland_equipment("Gunpowder (x50)", /obj/item/stack/ore/blackpowder/fifty, 300), - new /datum/data/wasteland_equipment("Sacks of Concrete (x50)", /obj/item/stack/sheet/mineral/concrete/fifty, 20), + new /datum/data/wasteland_equipment("Metal Parts (x5)", /obj/item/stack/crafting/metalparts/five, 100), + new /datum/data/wasteland_equipment("High Quality Metal Parts (x5)", /obj/item/stack/crafting/goodparts/five, 250), + new /datum/data/wasteland_equipment("Electronic Parts (x5)", /obj/item/stack/crafting/electronicparts/five, 250), + new /datum/data/wasteland_equipment("Metal Sheets (x20)", /obj/item/stack/sheet/metal/twenty, 300), + new /datum/data/wasteland_equipment("Metal Sheets (x50)", /obj/item/stack/sheet/metal/fifty, 650), + new /datum/data/wasteland_equipment("Glass Sheets (x10)", /obj/item/stack/sheet/glass/ten, 100), + new /datum/data/wasteland_equipment("Glass Sheets (x50)", /obj/item/stack/sheet/glass/fifty, 500), + new /datum/data/wasteland_equipment("Sacks of Concrete (x50)", /obj/item/stack/sheet/mineral/concrete/fifty, 200), new /datum/data/wasteland_equipment("Art Canvas 19x19", /obj/item/canvas/nineteenXnineteen, 20), new /datum/data/wasteland_equipment("Art Canvas 23x19", /obj/item/canvas/twentythreeXnineteen, 20), new /datum/data/wasteland_equipment("Art Canvas 23x23", /obj/item/canvas/twentythreeXtwentythree, 20), - new /datum/data/wasteland_equipment("Mechanical Toolbox", /obj/item/storage/toolbox/mechanical, 15), - new /datum/data/wasteland_equipment("Electrician Toolbox", /obj/item/storage/toolbox/electrical, 15), - new /datum/data/wasteland_equipment("Insulated Gloves", /obj/item/clothing/gloves/color/yellow, 15), - new /datum/data/wasteland_equipment("Military Engineer Gloves", /obj/item/clothing/gloves/f13/military/engineer, 75), - new /datum/data/wasteland_equipment("Nest Repellant", /obj/item/packaged_respawner_blocker, 0), + new /datum/data/wasteland_equipment("Mechanical Toolbox", /obj/item/storage/toolbox/mechanical, 150), + new /datum/data/wasteland_equipment("Electrician Toolbox", /obj/item/storage/toolbox/electrical, 150), + new /datum/data/wasteland_equipment("Insulated Gloves", /obj/item/clothing/gloves/color/yellow, 150) ) highpop_list = list( - new /datum/data/wasteland_equipment("Metal Parts (x5)", /obj/item/stack/crafting/metalparts/five, 10), - new /datum/data/wasteland_equipment("High Quality Metal Parts (x5)", /obj/item/stack/crafting/goodparts/five, 25), - new /datum/data/wasteland_equipment("Electronic Parts (x5)", /obj/item/stack/crafting/electronicparts/five, 25), - new /datum/data/wasteland_equipment("Metal Sheets (x20)", /obj/item/stack/sheet/metal/twenty, 30), - new /datum/data/wasteland_equipment("Metal Sheets (x50)", /obj/item/stack/sheet/metal/fifty, 65), - new /datum/data/wasteland_equipment("Glass Sheets (x10)", /obj/item/stack/sheet/glass/ten, 10), - new /datum/data/wasteland_equipment("Glass Sheets (x50)", /obj/item/stack/sheet/glass/fifty, 50), - new /datum/data/wasteland_equipment("Gunpowder (x50)", /obj/item/stack/ore/blackpowder/fifty, 300), - new /datum/data/wasteland_equipment("Sacks of Concrete (x50)", /obj/item/stack/sheet/mineral/concrete/fifty, 20), + new /datum/data/wasteland_equipment("Metal Parts (x5)", /obj/item/stack/crafting/metalparts/five, 100), + new /datum/data/wasteland_equipment("High Quality Metal Parts (x5)", /obj/item/stack/crafting/goodparts/five, 250), + new /datum/data/wasteland_equipment("Electronic Parts (x5)", /obj/item/stack/crafting/electronicparts/five, 250), + new /datum/data/wasteland_equipment("Metal Sheets (x20)", /obj/item/stack/sheet/metal/twenty, 300), + new /datum/data/wasteland_equipment("Metal Sheets (x50)", /obj/item/stack/sheet/metal/fifty, 650), + new /datum/data/wasteland_equipment("Glass Sheets (x10)", /obj/item/stack/sheet/glass/ten, 100), + new /datum/data/wasteland_equipment("Glass Sheets (x50)", /obj/item/stack/sheet/glass/fifty, 500), + new /datum/data/wasteland_equipment("Sacks of Concrete (x50)", /obj/item/stack/sheet/mineral/concrete/fifty, 200), new /datum/data/wasteland_equipment("Art Canvas 19x19", /obj/item/canvas/nineteenXnineteen, 20), new /datum/data/wasteland_equipment("Art Canvas 23x19", /obj/item/canvas/twentythreeXnineteen, 20), new /datum/data/wasteland_equipment("Art Canvas 23x23", /obj/item/canvas/twentythreeXtwentythree, 20), - new /datum/data/wasteland_equipment("Mechanical Toolbox", /obj/item/storage/toolbox/mechanical, 15), - new /datum/data/wasteland_equipment("Electrician Toolbox", /obj/item/storage/toolbox/electrical, 15), - new /datum/data/wasteland_equipment("Insulated Gloves", /obj/item/clothing/gloves/color/yellow, 15), - new /datum/data/wasteland_equipment("Military Engineer Gloves", /obj/item/clothing/gloves/f13/military/engineer, 75), + new /datum/data/wasteland_equipment("Mechanical Toolbox", /obj/item/storage/toolbox/mechanical, 150), + new /datum/data/wasteland_equipment("Electrician Toolbox", /obj/item/storage/toolbox/electrical, 150), + new /datum/data/wasteland_equipment("Insulated Gloves", /obj/item/clothing/gloves/color/yellow, 150) ) /obj/machinery/mineral/wasteland_vendor/mining name = "Wasteland Vending Machine - Mining and Salvage" icon_state = "generic_idle" prize_list = list( - new /datum/data/wasteland_equipment("Lantern", /obj/item/flashlight/lantern, 25), - new /datum/data/wasteland_equipment("Pickaxe", /obj/item/pickaxe, 10), - new /datum/data/wasteland_equipment("Mining drill", /obj/item/pickaxe/drill, 50), - new /datum/data/wasteland_equipment("Manual mining scanner", /obj/item/mining_scanner, 15), - new /datum/data/wasteland_equipment("Automatic mining scanner", /obj/item/t_scanner/adv_mining_scanner/lesser, 100), - new /datum/data/wasteland_equipment("Advanced mining scanner", /obj/item/t_scanner/adv_mining_scanner, 200), - new /datum/data/wasteland_equipment("Welding goggles", /obj/item/clothing/glasses/welding, 20), - new /datum/data/wasteland_equipment("Industrial welding tool", /obj/item/weldingtool/largetank, 30), - new /datum/data/wasteland_equipment("Upgraded industrial welding tool", /obj/item/weldingtool/hugetank, 50), - new /datum/data/wasteland_equipment("Experimental welding tool", /obj/item/weldingtool/experimental, 200), - new /datum/data/wasteland_equipment("Hand drill", /obj/item/screwdriver/power, 200), - new /datum/data/wasteland_equipment("Jaws of life", /obj/item/crowbar/power, 200), - new /datum/data/wasteland_equipment("1000 Mining Points", /obj/item/card/mining_point_card/mp1000, 250), - new /datum/data/wasteland_equipment("ORM Board", /obj/item/circuitboard/machine/ore_redemption, 50), - new /datum/data/wasteland_equipment("Portable Cell Charger", /obj/item/storage/battery_box, 50), + new /datum/data/wasteland_equipment("Pickaxe", /obj/item/pickaxe, 300), + new /datum/data/wasteland_equipment("Mining drill", /obj/item/pickaxe/drill, 600), + new /datum/data/wasteland_equipment("Manual mining scanner", /obj/item/mining_scanner, 200), + new /datum/data/wasteland_equipment("Automatic mining scanner", /obj/item/t_scanner/adv_mining_scanner/lesser, 400), + new /datum/data/wasteland_equipment("Advanced mining scanner", /obj/item/t_scanner/adv_mining_scanner, 600), + new /datum/data/wasteland_equipment("Welding goggles", /obj/item/clothing/glasses/welding, 200), + new /datum/data/wasteland_equipment("Industrial welding tool", /obj/item/weldingtool/largetank, 150), + new /datum/data/wasteland_equipment("Upgraded industrial welding tool", /obj/item/weldingtool/hugetank, 250), + new /datum/data/wasteland_equipment("Experimental welding tool", /obj/item/weldingtool/experimental, 1000), + new /datum/data/wasteland_equipment("Hand drill", /obj/item/screwdriver/power, 300), + new /datum/data/wasteland_equipment("Jaws of life", /obj/item/crowbar/power, 1000), + new /datum/data/wasteland_equipment("ORM Board", /obj/item/circuitboard/machine/ore_redemption, 300), ) highpop_list = list( - new /datum/data/wasteland_equipment("Lantern", /obj/item/flashlight/lantern, 25), - new /datum/data/wasteland_equipment("Pickaxe", /obj/item/pickaxe, 10), - new /datum/data/wasteland_equipment("Mining drill", /obj/item/pickaxe/drill, 50), - new /datum/data/wasteland_equipment("Manual mining scanner", /obj/item/mining_scanner, 15), - new /datum/data/wasteland_equipment("Automatic mining scanner", /obj/item/t_scanner/adv_mining_scanner/lesser, 100), - new /datum/data/wasteland_equipment("Advanced mining scanner", /obj/item/t_scanner/adv_mining_scanner, 200), - new /datum/data/wasteland_equipment("Welding goggles", /obj/item/clothing/glasses/welding, 20), - new /datum/data/wasteland_equipment("Industrial welding tool", /obj/item/weldingtool/largetank, 30), - new /datum/data/wasteland_equipment("Upgraded industrial welding tool", /obj/item/weldingtool/hugetank, 50), - new /datum/data/wasteland_equipment("Experimental welding tool", /obj/item/weldingtool/experimental, 200), - new /datum/data/wasteland_equipment("Hand drill", /obj/item/screwdriver/power, 200), - new /datum/data/wasteland_equipment("Jaws of life", /obj/item/crowbar/power, 200), - new /datum/data/wasteland_equipment("1000 Mining Points", /obj/item/card/mining_point_card/mp1000, 250), - new /datum/data/wasteland_equipment("ORM Board", /obj/item/circuitboard/machine/ore_redemption, 50) + new /datum/data/wasteland_equipment("Pickaxe", /obj/item/pickaxe, 300), + new /datum/data/wasteland_equipment("Mining drill", /obj/item/pickaxe/drill, 600), + new /datum/data/wasteland_equipment("Manual mining scanner", /obj/item/mining_scanner, 200), + new /datum/data/wasteland_equipment("Automatic mining scanner", /obj/item/t_scanner/adv_mining_scanner/lesser, 400), + new /datum/data/wasteland_equipment("Advanced mining scanner", /obj/item/t_scanner/adv_mining_scanner, 600), + new /datum/data/wasteland_equipment("Welding goggles", /obj/item/clothing/glasses/welding, 200), + new /datum/data/wasteland_equipment("Industrial welding tool", /obj/item/weldingtool/largetank, 150), + new /datum/data/wasteland_equipment("Upgraded industrial welding tool", /obj/item/weldingtool/hugetank, 250), + new /datum/data/wasteland_equipment("Experimental welding tool", /obj/item/weldingtool/experimental, 1000), + new /datum/data/wasteland_equipment("Hand drill", /obj/item/screwdriver/power, 300), + new /datum/data/wasteland_equipment("Jaws of life", /obj/item/crowbar/power, 1000), + new /datum/data/wasteland_equipment("ORM Board", /obj/item/circuitboard/machine/ore_redemption, 300), ) /datum/data/wasteland_equipment diff --git a/code/modules/cargo/exports/misc_export.dm b/code/modules/cargo/exports/misc_export.dm index 2f0f301332..af8b383cb8 100644 --- a/code/modules/cargo/exports/misc_export.dm +++ b/code/modules/cargo/exports/misc_export.dm @@ -430,8 +430,8 @@ /obj/item/book/granter/trait/explosives, /obj/item/book/granter/trait/techno, /obj/item/book/granter/crafting_recipe/ODF, - /obj/item/book/granter/action/drink_fling, - /obj/item/book/granter/crafting_recipe/gunsmith_one) + /obj/item/book/granter/action/drink_fling,) + // /obj/item/book/granter/crafting_recipe/gunsmith_one) /datum/export/item/traitbooks cost = 1000 @@ -442,10 +442,10 @@ /obj/item/book/granter/trait/pa_wear, /obj/item/book/granter/trait/explosives, /obj/item/book/granter/trait/explosives_advanced, - /obj/item/book/granter/trait/rifleman, - /obj/item/book/granter/crafting_recipe/gunsmith_two, - /obj/item/book/granter/crafting_recipe/gunsmith_three, - /obj/item/book/granter/crafting_recipe/gunsmith_four) + /obj/item/book/granter/trait/rifleman,) + // /obj/item/book/granter/crafting_recipe/gunsmith_two, + // /obj/item/book/granter/crafting_recipe/gunsmith_three, + // /obj/item/book/granter/crafting_recipe/gunsmith_four) /datum/export/item/crops cost = 50 diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index c3e325894a..9214209721 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -847,10 +847,10 @@ /obj/machinery/smartfridge/bottlerack/lootshelf/books chance_initial_contents = list( /obj/item/reagent_containers/food/snacks/deadmouse = 1, - /obj/item/book/granter/crafting_recipe/gunsmith_one = 1, - /obj/item/book/granter/crafting_recipe/gunsmith_two = 1, - /obj/item/book/granter/crafting_recipe/gunsmith_three = 1, - /obj/item/book/granter/crafting_recipe/gunsmith_four = 1, + // /obj/item/book/granter/crafting_recipe/gunsmith_one = 1, + // /obj/item/book/granter/crafting_recipe/gunsmith_two = 1, + // /obj/item/book/granter/crafting_recipe/gunsmith_three = 1, + // /obj/item/book/granter/crafting_recipe/gunsmith_four = 1, /obj/item/book/granter/crafting_recipe/scav_two = 1, /obj/item/book/granter/crafting_recipe/scav_three = 1) diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm index 0b65709926..19a583c677 100644 --- a/code/modules/jobs/job_types/bos.dm +++ b/code/modules/jobs/job_types/bos.dm @@ -834,8 +834,8 @@ Senior Knight /obj/item/melee/onehanded/knife/hunting=1, /obj/item/storage/belt/army/assault = 1, /obj/item/reagent_containers/hypospray/medipen/stimpak=2, - /obj/item/book/granter/crafting_recipe/gunsmith_one=1, - /obj/item/book/granter/crafting_recipe/gunsmith_two=1 + // /obj/item/book/granter/crafting_recipe/gunsmith_one=1, + // /obj/item/book/granter/crafting_recipe/gunsmith_two=1 ) /* /datum/outfit/loadout/sknighta @@ -946,8 +946,8 @@ Knight /obj/item/melee/onehanded/knife/survival=1, /obj/item/storage/belt/army/assault = 1, /obj/item/reagent_containers/hypospray/medipen/stimpak=1, - /obj/item/book/granter/crafting_recipe/gunsmith_one=1, - /obj/item/book/granter/crafting_recipe/gunsmith_two=1 + // /obj/item/book/granter/crafting_recipe/gunsmith_one=1, + // /obj/item/book/granter/crafting_recipe/gunsmith_two=1 ) /datum/outfit/loadout/knighta From 1d0c0c93e21fadca9e2c79118da8bc84be8f46fe Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Mon, 13 Jan 2025 13:10:19 -0600 Subject: [PATCH 2/6] lol --- .../code/modules/client/loadout/hands.dm | 252 +++++++++--------- 1 file changed, 126 insertions(+), 126 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/hands.dm b/modular_citadel/code/modules/client/loadout/hands.dm index d9857fdc96..7ac0cc049d 100644 --- a/modular_citadel/code/modules/client/loadout/hands.dm +++ b/modular_citadel/code/modules/client/loadout/hands.dm @@ -186,132 +186,132 @@ name = "Yet A Third Plushie Delivery Service" path = /obj/item/choice_beacon/box/plushie -/datum/gear/hands/shield/buckler - name = "Wooden Buckler" - path = /obj/item/shield/riot/buckler - cost = 0 - -/datum/gear/hands/shield/buckler/stopsign - name = "Stopsign Shield" - path = /obj/item/shield/riot/buckler/stop - cost = 0 - -/datum/gear/hands/shield/kiteshield - name = "Kite Shield" - path = /obj/item/shield/coyote/kiteshield - cost = 0 - -/datum/gear/hands/shield/buckler2 - name = "Oak Buckler" - path = /obj/item/shield/coyote/bucklertwo - cost = 0 - -/datum/gear/hands/shield/egyptianshield - name = "Dusty Shield" - path = /obj/item/shield/coyote/egyptianshield - cost = 0 - -/datum/gear/hands/shield/semioval - name = "Semioval Metal Shield" - path = /obj/item/shield/coyote/semioval - cost = 0 - -/datum/gear/hands/shield/romanbuckler - name = "Skirmisher's Buckler" - path = /obj/item/shield/coyote/romanbuckler - cost = 0 - -/datum/gear/hands/shield/ironshieldfour - name = "Checkered Shield" - path = /obj/item/shield/coyote/ironshieldfour - cost = 0 - -/datum/gear/hands/shield/ironshieldthree - name = "Red Oval Shield" - path = /obj/item/shield/coyote/ironshieldthree - cost = 0 - -/datum/gear/hands/shield/ironshieldtwo - name = "Oval Shield" - path = /obj/item/shield/coyote/ironshieldtwo - cost = 0 - -/datum/gear/hands/shield/bronzeshield - name = "Bronze Shield" - path = /obj/item/shield/coyote/bronzeshield - cost = 0 - -/datum/gear/hands/shield/ironshield - name = "Iron Shield" - path = /obj/item/shield/coyote/ironshield - cost = 0 - -/datum/gear/hands/shield/steelshield - name = "Steel Shield" - path = /obj/item/shield/coyote/steelshield - cost = 0 - -/datum/gear/hands/shield/bluebuckler - name = "Blue Buckler" - path = /obj/item/shield/coyote/bluebuckler - cost = 0 - -/datum/gear/hands/shield/redbuckler - name = "Red Buckler" - path = /obj/item/shield/coyote/redbuckler - cost = 0 - -/datum/gear/hands/shield/chitinbuckler - name = "Fire Ant Buckler" - path = /obj/item/shield/coyote/chitinbuckler - cost = 0 - -/datum/gear/hands/shield/chitinshield - name = "Fire Ant Shield" - path = /obj/item/shield/coyote/chitinshield - cost = 0 - -/datum/gear/hands/shield/brahminleathershield - name = "Brahmin Leather Shield" - path = /obj/item/shield/coyote/brahminleathershield - cost = 0 - - -/datum/gear/hands/shield/roughshield - name = "Rough Shield" - path = /obj/item/shield/coyote/roughshield - cost = 0 - -/datum/gear/hands/shield/scutum - name = "Scutum" - path = /obj/item/shield/coyote/scutum - cost = 0 - - -/datum/gear/hands/shield/chimalli - name = "Chimalli" - path = /obj/item/shield/coyote/chimalli - cost = 0 - -/datum/gear/hands/shield/owlshield - name = "Owl Shield" - path = /obj/item/shield/coyote/owlshield - cost = 0 - -/datum/gear/hands/shield/pegasusshield - name = "Pegasus Shield" - path = /obj/item/shield/coyote/pegasusshield - cost = 0 - -/datum/gear/hands/shield/riotweathered - name = "Weathered Riot Shield" - path = /obj/item/shield/coyote/riotweathered - cost = 0 - -/datum/gear/hands/shield/crusader - name = "Iron Crusader Shield" - path = /obj/item/shield/coyote/crusader - cost = 0 +// /datum/gear/hands/shield/buckler +// name = "Wooden Buckler" +// path = /obj/item/shield/riot/buckler +// cost = 0 + +// /datum/gear/hands/shield/buckler/stopsign +// name = "Stopsign Shield" +// path = /obj/item/shield/riot/buckler/stop +// cost = 0 + +// /datum/gear/hands/shield/kiteshield +// name = "Kite Shield" +// path = /obj/item/shield/coyote/kiteshield +// cost = 0 + +// /datum/gear/hands/shield/buckler2 +// name = "Oak Buckler" +// path = /obj/item/shield/coyote/bucklertwo +// cost = 0 + +// /datum/gear/hands/shield/egyptianshield +// name = "Dusty Shield" +// path = /obj/item/shield/coyote/egyptianshield +// cost = 0 + +// /datum/gear/hands/shield/semioval +// name = "Semioval Metal Shield" +// path = /obj/item/shield/coyote/semioval +// cost = 0 + +// /datum/gear/hands/shield/romanbuckler +// name = "Skirmisher's Buckler" +// path = /obj/item/shield/coyote/romanbuckler +// cost = 0 + +// /datum/gear/hands/shield/ironshieldfour +// name = "Checkered Shield" +// path = /obj/item/shield/coyote/ironshieldfour +// cost = 0 + +// /datum/gear/hands/shield/ironshieldthree +// name = "Red Oval Shield" +// path = /obj/item/shield/coyote/ironshieldthree +// cost = 0 + +// /datum/gear/hands/shield/ironshieldtwo +// name = "Oval Shield" +// path = /obj/item/shield/coyote/ironshieldtwo +// cost = 0 + +// /datum/gear/hands/shield/bronzeshield +// name = "Bronze Shield" +// path = /obj/item/shield/coyote/bronzeshield +// cost = 0 + +// /datum/gear/hands/shield/ironshield +// name = "Iron Shield" +// path = /obj/item/shield/coyote/ironshield +// cost = 0 + +// /datum/gear/hands/shield/steelshield +// name = "Steel Shield" +// path = /obj/item/shield/coyote/steelshield +// cost = 0 + +// /datum/gear/hands/shield/bluebuckler +// name = "Blue Buckler" +// path = /obj/item/shield/coyote/bluebuckler +// cost = 0 + +// /datum/gear/hands/shield/redbuckler +// name = "Red Buckler" +// path = /obj/item/shield/coyote/redbuckler +// cost = 0 + +// /datum/gear/hands/shield/chitinbuckler +// name = "Fire Ant Buckler" +// path = /obj/item/shield/coyote/chitinbuckler +// cost = 0 + +// /datum/gear/hands/shield/chitinshield +// name = "Fire Ant Shield" +// path = /obj/item/shield/coyote/chitinshield +// cost = 0 + +// /datum/gear/hands/shield/brahminleathershield +// name = "Brahmin Leather Shield" +// path = /obj/item/shield/coyote/brahminleathershield +// cost = 0 + + +// /datum/gear/hands/shield/roughshield +// name = "Rough Shield" +// path = /obj/item/shield/coyote/roughshield +// cost = 0 + +// /datum/gear/hands/shield/scutum +// name = "Scutum" +// path = /obj/item/shield/coyote/scutum +// cost = 0 + + +// /datum/gear/hands/shield/chimalli +// name = "Chimalli" +// path = /obj/item/shield/coyote/chimalli +// cost = 0 + +// /datum/gear/hands/shield/owlshield +// name = "Owl Shield" +// path = /obj/item/shield/coyote/owlshield +// cost = 0 + +// /datum/gear/hands/shield/pegasusshield +// name = "Pegasus Shield" +// path = /obj/item/shield/coyote/pegasusshield +// cost = 0 + +// /datum/gear/hands/shield/riotweathered +// name = "Weathered Riot Shield" +// path = /obj/item/shield/coyote/riotweathered +// cost = 0 + +// /datum/gear/hands/shield/crusader +// name = "Iron Crusader Shield" +// path = /obj/item/shield/coyote/crusader +// cost = 0 /datum/gear/hands/defib/carbattery name = "Primitive Defib" From 00d1f42721023a03b47937490f88d31820332e15 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Mon, 13 Jan 2025 13:15:41 -0600 Subject: [PATCH 3/6] a --- _maps/map_files/coyote_bayou/Dungeons.dmm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/_maps/map_files/coyote_bayou/Dungeons.dmm b/_maps/map_files/coyote_bayou/Dungeons.dmm index 7c373af789..ff12113b75 100644 --- a/_maps/map_files/coyote_bayou/Dungeons.dmm +++ b/_maps/map_files/coyote_bayou/Dungeons.dmm @@ -1570,7 +1570,6 @@ /obj/structure/table{ layer = 2.9 }, -/obj/item/book/granter/crafting_recipe/gunsmith_three, /obj/machinery/cell_charger{ pixel_y = 6 }, @@ -47756,9 +47755,6 @@ pixel_x = -9; pixel_y = 4 }, -/obj/item/book/granter/crafting_recipe/gunsmith_three{ - pixel_x = 5 - }, /obj/effect/spawner/lootdrop/f13/uncommon, /obj/effect/spawner/lootdrop/f13/uncommon, /turf/open/floor/plasteel/darkred/side{ From 6112a9348cfda6f941d6047ab9cabf3fe122afe7 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Mon, 13 Jan 2025 13:26:59 -0600 Subject: [PATCH 4/6] b --- _maps/map_files/coyote_bayou/Garland-City.dmm | 1 - .../coyote_bayou/Nash_and_Texarkana-Upper.dmm | 4 - _maps/map_files/coyote_bayou/Newboston.dmm | 283 ++++++------------ _maps/map_files/coyote_bayou/Redwater.dmm | 3 - .../coyote_bayou/Texarkana_underground.dmm | 16 +- 5 files changed, 92 insertions(+), 215 deletions(-) diff --git a/_maps/map_files/coyote_bayou/Garland-City.dmm b/_maps/map_files/coyote_bayou/Garland-City.dmm index b317d1d563..36b3c82e85 100644 --- a/_maps/map_files/coyote_bayou/Garland-City.dmm +++ b/_maps/map_files/coyote_bayou/Garland-City.dmm @@ -31483,7 +31483,6 @@ "xSS" = ( /obj/machinery/autolathe/ammo, /obj/effect/decal/cleanable/dirt, -/obj/item/book/granter/crafting_recipe/gunsmith_four, /turf/open/floor/f13{ icon_state = "reddirtyfull" }, diff --git a/_maps/map_files/coyote_bayou/Nash_and_Texarkana-Upper.dmm b/_maps/map_files/coyote_bayou/Nash_and_Texarkana-Upper.dmm index c0819f2905..0979f9f91b 100644 --- a/_maps/map_files/coyote_bayou/Nash_and_Texarkana-Upper.dmm +++ b/_maps/map_files/coyote_bayou/Nash_and_Texarkana-Upper.dmm @@ -931,7 +931,6 @@ /area/f13/caves) "azD" = ( /obj/structure/bookcase, -/obj/item/book/granter/crafting_recipe/gunsmith_three, /obj/item/storage/trash_stack/loot/uncommon, /turf/open/floor/f13/wood, /area/f13/building/mall) @@ -15386,9 +15385,6 @@ /area/f13/bar/nash) "idL" = ( /obj/machinery/autolathe/ammo/unlocked, -/obj/item/book/granter/crafting_recipe/gunsmith_one, -/obj/item/book/granter/crafting_recipe/gunsmith_three, -/obj/item/book/granter/crafting_recipe/gunsmith_two, /obj/item/stack/ore/blackpowder/twenty, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/building) diff --git a/_maps/map_files/coyote_bayou/Newboston.dmm b/_maps/map_files/coyote_bayou/Newboston.dmm index adb34b6eca..1fe6c628a6 100644 --- a/_maps/map_files/coyote_bayou/Newboston.dmm +++ b/_maps/map_files/coyote_bayou/Newboston.dmm @@ -2446,15 +2446,6 @@ icon_state = "floorrusty" }, /area/f13/building) -"bVD" = ( -/obj/structure/window/fulltile/house, -/obj/structure/curtain{ - color = "#363636" - }, -/turf/closed/wall/f13/coyote/oldwood{ - color = "#BB5555" - }, -/area/f13/caves) "bVF" = ( /obj/effect/decal/remains/human, /turf/open/indestructible/ground/outside/dirt, @@ -4009,12 +4000,6 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/city) -"ddb" = ( -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/f13/uncommon, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building) "ddB" = ( /obj/structure/barricade/sandbags, /obj/effect/decal/waste{ @@ -4951,9 +4936,6 @@ "dNR" = ( /obj/machinery/autolathe/ammo, /obj/effect/decal/cleanable/dirt, -/obj/item/book/granter/crafting_recipe/gunsmith_two, -/obj/item/book/granter/crafting_recipe/gunsmith_three, -/obj/item/book/granter/crafting_recipe/gunsmith_one, /turf/open/floor/f13{ dir = 9; icon_state = "yellowsiding" @@ -5875,12 +5857,6 @@ /obj/effect/spawner/lootdrop/f13/uncommon, /turf/open/floor/f13/wood, /area/f13/city) -"exZ" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/f13/uncommon, -/turf/open/floor/f13/wood, -/area/f13/building) "ezh" = ( /obj/structure/window/fulltile/wood, /obj/structure/curtain{ @@ -6171,10 +6147,6 @@ /obj/machinery/vending/medical, /turf/closed/wall/f13/supermart, /area/f13/followers) -"eIu" = ( -/obj/structure/table/wood/settler, -/turf/open/floor/f13/wood, -/area/f13/building) "eIv" = ( /obj/structure/barricade/sandbags, /obj/structure/barricade/sandbags, @@ -6612,12 +6584,6 @@ }, /turf/open/floor/carpet/black, /area/f13/building) -"eYh" = ( -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/f13/foodspawner, -/obj/effect/spawner/lootdrop/f13/common, -/turf/open/floor/f13/wood, -/area/f13/building) "eYk" = ( /obj/structure/closet/bus, /turf/open/indestructible/ground/outside/dirt, @@ -6751,11 +6717,6 @@ }, /turf/open/floor/f13/wood, /area/f13/building) -"fcu" = ( -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/f13/uncommon, -/turf/open/floor/f13/wood, -/area/f13/building) "fcV" = ( /obj/structure/window/fulltile/house{ icon_state = "storewindowright" @@ -6797,12 +6758,6 @@ /obj/effect/spawner/lootdrop/f13/armor/tier1, /turf/open/floor/f13/wood, /area/f13/building) -"feR" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/f13/uncommon, -/turf/open/floor/carpet/black, -/area/f13/building) "feY" = ( /obj/structure/chair/stool/retro/black, /turf/open/indestructible/ground/outside/dirt, @@ -7264,11 +7219,6 @@ /obj/effect/spawner/lootdrop/f13/uncommon, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/building) -"fvB" = ( -/obj/structure/table/wood/settler, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building) "fvM" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/f13/common, @@ -7884,11 +7834,6 @@ icon_state = "redrustyfull" }, /area/f13/building) -"fUp" = ( -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/f13/common, -/turf/open/floor/f13/wood, -/area/f13/building) "fUs" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -8186,11 +8131,6 @@ /obj/effect/landmark/start/f13/texasranger, /turf/open/floor/f13/wood, /area/f13/ncr) -"gdh" = ( -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/f13/foodspawner, -/turf/open/floor/f13/wood, -/area/f13/building) "gdi" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/f13/uncommon, @@ -12037,13 +11977,6 @@ icon_state = "yellowsiding" }, /area/f13/brotherhood) -"iUF" = ( -/obj/structure/table/wood/settler, -/obj/item/book/granter/crafting_recipe/gunsmith_one, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building) "iVg" = ( /obj/structure/table/wood/settler, /obj/machinery/recharger, @@ -12390,12 +12323,6 @@ /obj/structure/barricade/sandbags, /turf/closed/wall/f13/coyote/oldwood, /area/f13/wasteland) -"jfE" = ( -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/f13/common, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building) "jfT" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/common, @@ -13002,12 +12929,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building) -"jyZ" = ( -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/f13/common, -/obj/effect/spawner/lootdrop/f13/common, -/turf/open/floor/f13/wood, -/area/f13/building) "jzb" = ( /obj/structure/car/rubbish2, /turf/open/indestructible/ground/outside/dirt, @@ -13819,10 +13740,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, /area/f13/building) -"kcO" = ( -/obj/structure/table/wood/settler, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland) "kcY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/outside/sidewalk{ @@ -15157,7 +15074,6 @@ /area/f13/wasteland) "ldM" = ( /obj/machinery/workbench, -/obj/item/book/granter/crafting_recipe/gunsmith_two, /turf/open/floor/f13/wood{ icon_state = "housewood2" }, @@ -19356,10 +19272,6 @@ icon_state = "bluedirtychess2" }, /area/f13/building) -"nZO" = ( -/obj/structure/window/fulltile/house, -/turf/open/floor/f13/wood, -/area/f13/building) "oar" = ( /obj/item/storage/trash_stack, /turf/open/indestructible/ground/outside/sidewalk{ @@ -19838,9 +19750,6 @@ "ovZ" = ( /obj/machinery/autolathe/ammo, /obj/effect/decal/cleanable/dirt, -/obj/item/book/granter/crafting_recipe/gunsmith_two, -/obj/item/book/granter/crafting_recipe/gunsmith_three, -/obj/item/book/granter/crafting_recipe/gunsmith_one, /turf/open/floor/f13/wood, /area/f13/building) "owx" = ( @@ -22231,9 +22140,6 @@ "qpD" = ( /obj/machinery/autolathe/ammo, /obj/effect/decal/cleanable/dirt, -/obj/item/book/granter/crafting_recipe/gunsmith_two, -/obj/item/book/granter/crafting_recipe/gunsmith_three, -/obj/item/book/granter/crafting_recipe/gunsmith_one, /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ dir = 10; @@ -22908,13 +22814,6 @@ icon_state = "floorrusty" }, /area/f13/building) -"qNz" = ( -/obj/structure/table/wood/settler, -/obj/effect/spawner/lootdrop/f13/common, -/obj/effect/spawner/lootdrop/f13/common, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, -/area/f13/building) "qNE" = ( /obj/structure/billboard/powerlines2{ icon_state = "rr17" @@ -36041,7 +35940,7 @@ tPQ tPQ tPQ tPQ -kcO +xgN tPQ pvv jvo @@ -36298,7 +36197,7 @@ tPQ tPQ tPQ duj -kcO +xgN tPQ pvv pvv @@ -36555,7 +36454,7 @@ tPQ tPQ tPQ tPQ -kcO +xgN mmS tPQ tPQ @@ -45549,7 +45448,7 @@ dpp hFJ lJm aMU -nZO +aDh vzy ksO hhK @@ -45800,13 +45699,13 @@ dVq yde suY wDP -fcu +ihC lPo dpp axg kwB pNj -nZO +aDh vzy llm cvO @@ -46060,7 +45959,7 @@ qPb yde aMU dpp -fcu +ihC mpQ aMU yde @@ -46815,7 +46714,7 @@ tPQ nfO aMU jUy -fcu +ihC ykj aMU lhn @@ -47087,7 +46986,7 @@ lCM gdi gVL itw -nZO +aDh krV ykj rlH @@ -47344,7 +47243,7 @@ tse vOm lqG itw -nZO +aDh lRE kwB lPo @@ -48879,12 +48778,12 @@ iJJ yde mQz mQz -nZO -fcu +aDh +ihC ykj nfC jwk -eIu +nWC cZe hdY axP @@ -49136,8 +49035,8 @@ pfD yde hjL tPQ -nZO -eIu +aDh +nWC ykj gtK lPo @@ -49647,7 +49546,7 @@ kwB lhn kwB kwB -nZO +aDh tPQ aGs doB @@ -49661,7 +49560,7 @@ kwB kwB kwB kwB -nZO +aDh vzy lWa hHk @@ -49761,8 +49660,8 @@ vzy qQj kwB qIp -fUp -eIu +hvj +nWC cQY vzy vzy @@ -50161,7 +50060,7 @@ kwB dpp aMU pNj -nZO +aDh egy iCa iam @@ -50172,7 +50071,7 @@ yde yde aoT fjf -fcu +ihC aMU nkB yde @@ -50530,7 +50429,7 @@ uWo mec vzy ghC -fUp +hvj oVo fUN aMU @@ -53342,7 +53241,7 @@ mec yde aMU aMU -fUp +hvj mnE tjv kNK @@ -53586,7 +53485,7 @@ vzy cQY cQY xuQ -eYh +wAO bat aMU aMU @@ -53903,7 +53802,7 @@ uWo uYv eWw qQj -jfE +sJw kwB kwB wYh @@ -54098,7 +53997,7 @@ xeN hKA vzy qQj -fcu +ihC bCO tqZ wst @@ -54357,7 +54256,7 @@ vzy cQY wVh bCO -iUF +wWs wst xie aMU @@ -54874,7 +54773,7 @@ bOu rwz aMU cWt -fcu +ihC qQj lWa hhK @@ -56734,7 +56633,7 @@ inV aMU aMU dpp -ddb +wVh jaI qrS ujy @@ -56988,7 +56887,7 @@ uYv hKA xrx aMU -gdh +ais laR hdY uAa @@ -58537,7 +58436,7 @@ qhV emj nrg ljC -jfE +sJw cQY ksO hHk @@ -59512,7 +59411,7 @@ qQj aMU gqW ihC -qNz +sPL mlm gqW qQj @@ -63581,7 +63480,7 @@ ucr ucr kwB fjf -qNz +sPL aMU vNf vzy @@ -67703,7 +67602,7 @@ uWo uWo mec avQ -nZO +aDh avQ brX lez @@ -70619,7 +70518,7 @@ phu iCJ mYh kwB -jfE +sJw kwB aoT kwB @@ -71090,7 +70989,7 @@ uWo hGE xSA qGg -gdh +ais qQj wah nBZ @@ -71300,16 +71199,16 @@ hhK uYv uWo mec -nZO +aDh aMU gqW aMU tNf kwB -fvB -fvB +kBU +kBU ykj -nZO +aDh lWa hHk uWo @@ -71546,7 +71445,7 @@ igI oPC yiB kwB -jyZ +tvh yde eia ias @@ -71566,7 +71465,7 @@ aMU hDV aMU aMU -nZO +aDh lWa hHk uYv @@ -71800,7 +71699,7 @@ vzy brd yde fff -qNz +sPL dsk aMU aCb @@ -72117,7 +72016,7 @@ kHa uWo mec qQj -gdh +ais aMU tnh aMU @@ -72451,7 +72350,7 @@ kll cVf goC drw -bVD +gPh hRl "} (154,1,1) = {" @@ -72587,8 +72486,8 @@ uWo hKA eSQ eSQ -nZO -nZO +aDh +aDh qQj qQj ikM @@ -72965,7 +72864,7 @@ cVf cVf bRy dAF -bVD +gPh hRl "} (156,1,1) = {" @@ -73479,7 +73378,7 @@ wTT cVf cVf jcA -bVD +gPh hRl "} (158,1,1) = {" @@ -74764,7 +74663,7 @@ cVf cVf ttr adl -bVD +gPh hRl "} (163,1,1) = {" @@ -75278,7 +75177,7 @@ cVf cVf goC drw -bVD +gPh hRl "} (165,1,1) = {" @@ -75535,7 +75434,7 @@ cVf cVf vVV adl -bVD +gPh hRl "} (166,1,1) = {" @@ -75792,7 +75691,7 @@ jHQ cVf bRy dAF -bVD +gPh hRl "} (167,1,1) = {" @@ -75931,9 +75830,9 @@ cQY kwB jgh qQj -jyZ +tvh jLd -jfE +sJw qQj aWo bZq @@ -76412,9 +76311,9 @@ kQt kQt aMU yde -nZO +aDh yde -nZO +aDh yde vzy lWa @@ -76915,7 +76814,7 @@ tPQ tPQ mQz vzy -nZO +aDh aMU kQt kQt @@ -77172,7 +77071,7 @@ tPQ tPQ tPQ vzy -nZO +aDh aMU wBE kQt @@ -77429,7 +77328,7 @@ tPQ tPQ mQz vzy -nZO +aDh aMU kQt kQt @@ -77686,7 +77585,7 @@ mQz dVq tPQ vzy -nZO +aDh aMU kQt kQt @@ -77943,7 +77842,7 @@ mQz tPQ tPQ vzy -nZO +aDh aMU kQt kQt @@ -78287,7 +78186,7 @@ mec vzy pOC frq -jyZ +tvh hvj aMU aMU @@ -78468,9 +78367,9 @@ dpp dpp dpp yde -nZO +aDh yde -nZO +aDh yde vzy oQs @@ -80253,7 +80152,7 @@ tPQ tPQ tPQ qQj -gdh +ais qYP mNi dpp @@ -80278,7 +80177,7 @@ uWo uWo mec brd -nZO +aDh smR ykj mUH @@ -80375,7 +80274,7 @@ uYv mec vzy qQj -fvB +kBU kwB oUU oUU @@ -80535,8 +80434,8 @@ oWa rYM mec brd -nZO -fUp +aDh +hvj ykj jLf pNj @@ -81060,7 +80959,7 @@ sae kwB kwB aMU -nZO +aDh lWa iiM iiM @@ -81155,7 +81054,7 @@ aoT aoT ijc aMU -jyZ +tvh kwB aMU qQj @@ -81828,7 +81727,7 @@ pqR lhn kwB aMU -eIu +nWC dsk lnH qQj @@ -82054,7 +81953,7 @@ tPQ tPQ qQj uTO -gdh +ais aMU dpp ihC @@ -82897,7 +82796,7 @@ wvK wYh kwB aMU -fvB +kBU qQj bXO xZj @@ -84253,7 +84152,7 @@ qQj qQj qQj qQj -fvB +kBU kwB vKC nDu @@ -85604,7 +85503,7 @@ txY vNf xLg fwG -fUp +hvj ius aMU aMU @@ -85745,7 +85644,7 @@ aMU dpp aMU aMU -nZO +aDh lWa apj kBI @@ -86031,7 +85930,7 @@ sGP kwB aMU aMU -jyZ +tvh tWq qQj gcG @@ -86259,7 +86158,7 @@ aMU lhn aMU pNj -nZO +aDh lWa hHk qTU @@ -86510,8 +86409,8 @@ rYM mec qQj pYi -fUp -fUp +hvj +hvj tFI dpp tOU @@ -86819,7 +86718,7 @@ kwB kwB kwB bDb -exZ +ehp cQY nxv kwB @@ -89460,7 +89359,7 @@ fwG dIh vNf saZ -eIu +nWC vNf aMU tlg @@ -89974,7 +89873,7 @@ fwG jnp vNf snw -eIu +nWC aMU aMU yiB @@ -90436,7 +90335,7 @@ wAc nKC cQY bhk -feR +kZZ osP qQj fjq @@ -90693,7 +90592,7 @@ wAc uHG cQY bhk -feR +kZZ kQZ cQY wAc @@ -90745,7 +90644,7 @@ fwG xrl vNf aMU -fUp +hvj vNf tlg txY @@ -91002,7 +90901,7 @@ vNf izJ vNf rXj -fUp +hvj vNf aMU aMU @@ -91721,7 +91620,7 @@ llz uHG cQY nMz -feR +kZZ pGE qQj fyL @@ -91978,7 +91877,7 @@ wAc uHG cQY guP -feR +kZZ liZ qQj vMp diff --git a/_maps/map_files/coyote_bayou/Redwater.dmm b/_maps/map_files/coyote_bayou/Redwater.dmm index 8088e3b1eb..ffd81792bc 100644 --- a/_maps/map_files/coyote_bayou/Redwater.dmm +++ b/_maps/map_files/coyote_bayou/Redwater.dmm @@ -22555,9 +22555,6 @@ /area/f13/building) "irK" = ( /obj/structure/rack, -/obj/item/book/granter/crafting_recipe/gunsmith_four, -/obj/item/book/granter/crafting_recipe/gunsmith_three, -/obj/item/book/granter/crafting_recipe/gunsmith_two, /obj/item/storage/trash_stack/loot/uncommon, /obj/item/storage/trash_stack/loot/uncommon, /turf/open/floor/f13{ diff --git a/_maps/map_files/coyote_bayou/Texarkana_underground.dmm b/_maps/map_files/coyote_bayou/Texarkana_underground.dmm index 1f91ac8d06..b4bfe66a9b 100644 --- a/_maps/map_files/coyote_bayou/Texarkana_underground.dmm +++ b/_maps/map_files/coyote_bayou/Texarkana_underground.dmm @@ -358,7 +358,6 @@ "aij" = ( /obj/machinery/autolathe/ammo, /obj/effect/decal/cleanable/dirt, -/obj/item/book/granter/crafting_recipe/gunsmith_four, /turf/open/floor/f13{ icon_state = "reddirtyfull" }, @@ -3556,8 +3555,6 @@ /area/f13/tunnel) "bKW" = ( /obj/machinery/workbench/advanced, -/obj/item/book/granter/crafting_recipe/gunsmith_three, -/obj/item/book/granter/crafting_recipe/gunsmith_two, /turf/open/floor/plasteel/f13/vault_floor/yellow, /area/f13/tunnel) "bKX" = ( @@ -13183,7 +13180,6 @@ /turf/open/water, /area/f13/caves) "gQi" = ( -/obj/item/book/granter/crafting_recipe/gunsmith_three, /obj/structure/table, /turf/open/floor/f13{ icon_state = "reddirtyfull" @@ -17071,8 +17067,6 @@ }, /area/f13/caves) "joN" = ( -/obj/item/book/granter/crafting_recipe/gunsmith_three, -/obj/item/book/granter/crafting_recipe/gunsmith_two, /obj/structure/table/wood/settler, /turf/open/floor/plasteel/f13/vault_floor/yellow, /area/f13/caves) @@ -32177,7 +32171,6 @@ /obj/item/reagent_containers/glass/bottle/blackpowder, /obj/item/reagent_containers/glass/bottle/blackpowder, /obj/item/reagent_containers/glass/bottle/blackpowder, -/obj/item/book/granter/crafting_recipe/gunsmith_three, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/building) "sAJ" = ( @@ -37311,13 +37304,6 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/carpet/blue, /area/f13/caves) -"vPp" = ( -/obj/structure/table, -/obj/item/book/granter/crafting_recipe/gunsmith_three, -/turf/open/floor/f13{ - icon_state = "yellowdirtyfull" - }, -/area/f13/caves) "vPS" = ( /obj/structure/table, /obj/machinery/button/door{ @@ -67888,7 +67874,7 @@ aaa aaa aaA bIh -vPp +lkD oyg vdG cWp From 0b76147ffc121bf6b824137c075736310446d4c9 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Mon, 13 Jan 2025 13:32:45 -0600 Subject: [PATCH 5/6] b --- _maps/map_files/coyote_bayou/Ashdown.dmm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/_maps/map_files/coyote_bayou/Ashdown.dmm b/_maps/map_files/coyote_bayou/Ashdown.dmm index 7f6434f3cf..47339ed6d0 100644 --- a/_maps/map_files/coyote_bayou/Ashdown.dmm +++ b/_maps/map_files/coyote_bayou/Ashdown.dmm @@ -30405,15 +30405,6 @@ /obj/effect/decal/cleanable/oil, /turf/open/indestructible/ground/outside/desert, /area/f13/wasteland) -"nkK" = ( -/obj/structure/rack/shelf_metal, -/obj/item/locked_box/misc/blueprints/tier3, -/turf/open/floor/f13{ - color = "#ffe9de"; - icon_state = "darkrusty"; - name = "dirty floor" - }, -/area/f13/building) "nlb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -89267,7 +89258,7 @@ dZs dZs ndZ xMQ -nkK +ukj dZs dZs dZs From 31b2f70f6f01a184f77e73afa30739c97045aae1 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Mon, 13 Jan 2025 13:37:00 -0600 Subject: [PATCH 6/6] d --- _maps/map_files/coyote_bayou/Texarkana_underground.dmm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/_maps/map_files/coyote_bayou/Texarkana_underground.dmm b/_maps/map_files/coyote_bayou/Texarkana_underground.dmm index b4bfe66a9b..b890e05369 100644 --- a/_maps/map_files/coyote_bayou/Texarkana_underground.dmm +++ b/_maps/map_files/coyote_bayou/Texarkana_underground.dmm @@ -30754,11 +30754,6 @@ dir = 8 }, /area/f13/building) -"rJl" = ( -/obj/structure/rack/shelf_metal, -/obj/item/locked_box/misc/blueprints/tier2, -/turf/open/indestructible/ground/inside/subway, -/area/f13/tunnel) "rJm" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13{ @@ -81266,7 +81261,7 @@ fJM jGk hFl aah -rJl +oMw pwE bGZ aah