From 693631004fd116a1f5124c8b57bb2cd4798f7c27 Mon Sep 17 00:00:00 2001 From: ReoDaProtovali <84661000+ReoDaProtovali@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:20:29 -0500 Subject: [PATCH] EMERGENCY FIX I FORGOT TO FIX THE DEFINES! D: --- .../map_files/Deltastation/DeltaStation2.dmm | 4 +-- _maps/map_files/KiloStation/KiloStation.dmm | 4 +-- _maps/map_files/debug/multiz.dmm | 4 +-- _maps/map_files/generic/CentCom.dmm | 8 ++--- .../components/storage/concrete/pockets.dm | 4 +-- code/game/machinery/doors/airlock.dm | 2 +- code/game/objects/items/storage/belt.dm | 10 +++--- .../game/objects/items/storage/uplink_kits.dm | 4 +-- code/game/objects/items/storage/wallets.dm | 2 +- code/game/objects/items/tools/wirecutters.dm | 29 ------------------ code/modules/cargo/exports/tools.dm | 3 +- code/modules/cargo/packs/engineering.dm | 4 +-- .../hostile/mining_mobs/hivelord.dm | 2 +- code/modules/research/designs/misc_designs.dm | 4 +-- code/modules/surgery/organic_steps.dm | 2 +- .../code/datums/ert_hazard_cleanup.dm | 2 +- .../.gradle/8.8/checksums/checksums.lock | Bin 0 -> 17 bytes .../8.8/dependencies-accessors/gc.properties | 0 .../.gradle/8.8/fileChanges/last-build.bin | Bin 0 -> 1 bytes .../.gradle/8.8/fileHashes/fileHashes.bin | Bin 0 -> 18547 bytes .../.gradle/8.8/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes tools/dmitool/.gradle/8.8/gc.properties | 0 .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .../buildOutputCleanup/cache.properties | 2 ++ tools/dmitool/.gradle/vcs-1/gc.properties | 0 yogstation/code/game/objects/items/tools.dm | 13 ++++---- 26 files changed, 38 insertions(+), 65 deletions(-) create mode 100644 tools/dmitool/.gradle/8.8/checksums/checksums.lock create mode 100644 tools/dmitool/.gradle/8.8/dependencies-accessors/gc.properties create mode 100644 tools/dmitool/.gradle/8.8/fileChanges/last-build.bin create mode 100644 tools/dmitool/.gradle/8.8/fileHashes/fileHashes.bin create mode 100644 tools/dmitool/.gradle/8.8/fileHashes/fileHashes.lock create mode 100644 tools/dmitool/.gradle/8.8/gc.properties create mode 100644 tools/dmitool/.gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 tools/dmitool/.gradle/buildOutputCleanup/cache.properties create mode 100644 tools/dmitool/.gradle/vcs-1/gc.properties diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index f3fdf681..77d590b0 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -43344,7 +43344,7 @@ "bzi" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/electrical, -/obj/item/wrench/power, +/obj/item/handdrill, /obj/machinery/status_display{ pixel_y = 32 }, @@ -43376,7 +43376,7 @@ dir = 1 }, /obj/item/stack/sheet/plasteel/fifty, -/obj/item/crowbar/power, +/obj/item/jawsoflife, /obj/structure/sign/nanotrasen{ pixel_x = 32 }, diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 32dab85c..5d27fee1 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -30867,7 +30867,7 @@ dir = 4; pixel_x = -26 }, -/obj/item/crowbar/power, +/obj/item/jawsoflife, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -37577,7 +37577,7 @@ "bkt" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/silvercrate, -/obj/item/wrench/power, +/obj/item/handdrill, /obj/machinery/light/small{ dir = 4 }, diff --git a/_maps/map_files/debug/multiz.dmm b/_maps/map_files/debug/multiz.dmm index 085a64bf..c4693a69 100644 --- a/_maps/map_files/debug/multiz.dmm +++ b/_maps/map_files/debug/multiz.dmm @@ -450,8 +450,8 @@ "bo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/table, -/obj/item/screwdriver/power, -/obj/item/crowbar/power, +/obj/item/handdrill, +/obj/item/jawsoflife, /turf/open/floor/plating, /area/engine/engineering) "bp" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index ac5f5c81..5111917e 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -620,7 +620,7 @@ "eww" = (/obj/structure/mineral_door/paperframe{name = "Dojo"},/turf/open/floor/wood,/area/centcom/holding) "exI" = (/obj/effect/turf_decal/sand,/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plating/beach/sand,/area/awaymission/jungleresort) "eye" = (/obj/effect/turf_decal/loading_area{dir = 8},/turf/open/floor/plasteel,/area/centcom/supply) -"eyk" = (/obj/machinery/power/apc{dir = 4; name = "Commander's Office APC"; pixel_x = 26},/obj/structure/table/reinforced,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/plasteel{amount = 15},/obj/item/stack/sheet/rglass{amount = 50; pixel_x = 2; pixel_y = -2},/obj/item/stack/rods/fifty,/obj/item/stack/cable_coil/white,/obj/item/screwdriver/power,/obj/effect/decal/cleanable/dirt,/obj/structure/cable/white{icon_state = "0-2"},/obj/structure/cable/white{icon_state = "0-8"},/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/centcom/ferry) +"eyk" = (/obj/machinery/power/apc{dir = 4; name = "Commander's Office APC"; pixel_x = 26},/obj/structure/table/reinforced,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/plasteel{amount = 15},/obj/item/stack/sheet/rglass{amount = 50; pixel_x = 2; pixel_y = -2},/obj/item/stack/rods/fifty,/obj/item/stack/cable_coil/white,/obj/item/handdrill,/obj/effect/decal/cleanable/dirt,/obj/structure/cable/white{icon_state = "0-2"},/obj/structure/cable/white{icon_state = "0-8"},/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/centcom/ferry) "eyl" = (/obj/structure/table,/obj/machinery/computer/bounty{dir = 8},/obj/structure/window{dir = 1},/turf/open/floor/carpet/gato,/area/centcom/ferry) "eyo" = (/obj/structure/table/wood,/obj/item/camera/detective{desc = "A polaroid camera with extra capacity for social media marketing."; name = "Professional camera"},/obj/item/camera_film,/obj/item/wallframe/newscaster,/obj/item/paper_bin,/obj/item/pen/fountain,/turf/open/floor/wood,/area/centcom/holding) "eyr" = (/obj/structure/table,/obj/structure/bedsheetbin,/turf/open/floor/mineral/titanium/blue,/area/centcom/evac) @@ -1534,7 +1534,7 @@ "ldq" = (/obj/effect/overlay/palmtree_r,/turf/open/floor/holofloor/beach,/area/holodeck/rec_center/beach) "ldw" = (/obj/structure/table/wood,/obj/item/flashlight/lamp,/obj/machinery/requests_console{announcementConsole = 1; department = "Captain's Desk"; departmentType = 5; name = "Captain RC"; pixel_y = 32},/turf/open/floor/plasteel/grimy,/area/centcom/ferry) "leo" = (/obj/item/storage/briefcase{pixel_x = -3; pixel_y = 3},/obj/item/storage/secure/briefcase,/obj/structure/table/wood,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/centcom/ferry) -"leK" = (/obj/structure/table/reinforced,/obj/item/storage/box/handcuffs,/obj/item/crowbar/red,/obj/item/crowbar/power,/obj/item/storage/belt/security/full,/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/centcom/control) +"leK" = (/obj/structure/table/reinforced,/obj/item/storage/box/handcuffs,/obj/item/crowbar/red,/obj/item/jawsoflife,/obj/item/storage/belt/security/full,/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/centcom/control) "lfn" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/centcom/supplypod/loading/three) "lfQ" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/open/floor/wood,/area/centcom/holding) "lfU" = (/obj/machinery/light,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/tdome/tdomeobserve) @@ -2000,7 +2000,7 @@ "onK" = (/mob/living/simple_animal/bot/medbot/mysterious{desc = "If you don't accidentally blow yourself up from time to time you're not really a wizard anyway."; faction = list("neutral","silicon","creature"); name = "Nobody's Perfect"},/turf/open/floor/engine/cult,/area/wizard_station) "onM" = (/obj/structure/closet/secure_closet/ertMed,/obj/structure/sign/directions/medical{dir = 1; pixel_y = -24},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/centcom/ferry) "onQ" = (/obj/machinery/computer/operating{dir = 1},/obj/effect/turf_decal/box/white/corners,/turf/open/floor/plasteel/white,/area/fatlab) -"onW" = (/obj/structure/table/reinforced,/obj/item/storage/box/handcuffs,/obj/item/crowbar/red,/obj/item/crowbar/power,/obj/item/storage/belt/security/full,/obj/structure/extinguisher_cabinet{pixel_x = 26},/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/centcom/ferry) +"onW" = (/obj/structure/table/reinforced,/obj/item/storage/box/handcuffs,/obj/item/crowbar/red,/obj/item/jawsoflife,/obj/item/storage/belt/security/full,/obj/structure/extinguisher_cabinet{pixel_x = 26},/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/centcom/ferry) "ooo" = (/turf/closed/indestructible/abductor{icon_state = "alien5"},/area/abductor_ship) "oov" = (/obj/machinery/icecream_vat,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/cafeteria,/area/centcom/ferry) "ooC" = (/obj/machinery/computer/telecomms/server{dir = 8; network = "tcommsat"},/turf/open/floor/plasteel/dark,/area/centcom/ferry) @@ -2473,7 +2473,7 @@ "rGl" = (/obj/machinery/light/small{dir = 4},/turf/open/floor/carpet,/area/wizard_station) "rGx" = (/obj/structure/table/wood,/obj/item/storage/box,/obj/item/tank/internals/emergency_oxygen/double,/obj/item/reagent_containers/hypospray/medipen/survival,/obj/item/reagent_containers/hypospray/medipen,/obj/item/crowbar/red,/obj/machinery/light/small{dir = 1},/obj/item/melee/classic_baton/telescopic,/turf/open/floor/plasteel/dark/side{dir = 5},/area/centcom/ferry) "rGL" = (/obj/machinery/shower{dir = 4},/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/turf_decal/tile/green{dir = 8},/turf/open/floor/plasteel/white,/area/tdome/tdomeobserve) -"rGM" = (/obj/structure/table/reinforced,/obj/item/stack/packageWrap,/obj/item/crowbar/power,/obj/item/wrench,/obj/item/hand_labeler,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/centcom/ferry) +"rGM" = (/obj/structure/table/reinforced,/obj/item/stack/packageWrap,/obj/item/jawsoflife,/obj/item/wrench,/obj/item/hand_labeler,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/centcom/ferry) "rGR" = (/obj/structure/table/wood,/obj/item/instrument/violin,/turf/open/floor/holofloor/carpet,/area/holodeck/rec_center/lounge) "rHE" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/flora/grass/brown,/turf/open/floor/grass/snow,/area/centcom/control) "rIb" = (/obj/machinery/computer/auxillary_base{pixel_y = 32},/obj/structure/table/reinforced,/obj/item/clipboard,/obj/item/radio/headset/headset_cent,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/centcom/ferry) diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index 1068a5a0..00dfab2b 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -70,7 +70,7 @@ /datum/component/storage/concrete/pockets/shoes/Initialize() . = ..() - cant_hold = typecacheof(list(/obj/item/screwdriver/power)) + cant_hold = typecacheof(list(/obj/item/handdrill)) can_hold = typecacheof(list( /obj/item/kitchen/knife, /obj/item/switchblade, /obj/item/pen, /obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector, @@ -81,7 +81,7 @@ /datum/component/storage/concrete/pockets/shoes/clown/Initialize() . = ..() - cant_hold = typecacheof(list(/obj/item/screwdriver/power)) + cant_hold = typecacheof(list(/obj/item/handdrill)) can_hold = typecacheof(list( /obj/item/kitchen/knife, /obj/item/switchblade, /obj/item/pen, /obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector, diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 3dc99b47..bff8556e 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1113,7 +1113,7 @@ else INVOKE_ASYNC(src, (density ? PROC_REF(open) :PROC_REF(close)), 2) - if(istype(I, /obj/item/crowbar/power)) + if(istype(I, /obj/item/jawsoflife)) if(isElectrified()) shock(user,100)//it's like sticking a forck in a power socket return diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 5579c084..c06dd2b0 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -67,7 +67,7 @@ /obj/item/radio, /obj/item/clothing/gloves, /obj/item/holosign_creator/atmos, - /obj/item/holosign_creator/firelock + /obj/item/holosign_creator/firelock, /obj/item/holosign_creator/engineering, /obj/item/forcefield_projector, /obj/item/assembly/signaler, @@ -76,8 +76,8 @@ /obj/item/inducer, /obj/item/grenade/chem_grenade/smart_metal_foam, /obj/item/grenade/chem_grenade/metalfoam, - /obj/item/handdrill - /obj/item/jawsoflife + /obj/item/handdrill, + /obj/item/jawsoflife, /obj/item/carpentry/handsaw, /obj/item/carpentry/hammer, /obj/item/carpentry/sandpaper, @@ -92,8 +92,8 @@ item_state = "utility_ce" /obj/item/storage/belt/utility/chief/full/PopulateContents() - new /obj/item/screwdriver/power(src) - new /obj/item/crowbar/power(src) + new /obj/item/handdrill(src) + new /obj/item/jawsoflife(src) new /obj/item/weldingtool/experimental(src)//This can be changed if this is too much new /obj/item/multitool(src) new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange")) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index fa4ea0bf..e4e460bb 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -50,7 +50,7 @@ new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/clothing/mask/gas/clown_hat(src) new /obj/item/clothing/under/suit_jacket/really_black(src) - new /obj/item/screwdriver/power(src) //2 tc item + new /obj/item/handdrill(src) //2 tc item if("murder") // 35 tc new /obj/item/melee/transforming/energy/sword/saber(src) @@ -403,4 +403,4 @@ new /obj/item/ammo_box/magazine/m10mm/soporific(src) new /obj/item/ammo_box/magazine/m10mm/soporific(src) new /obj/item/ammo_box/c10mm/soporific(src) -//End of Chemlight changes \ No newline at end of file +//End of Chemlight changes diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index 67658748..0d5a63c9 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -13,7 +13,7 @@ . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 4 - STR.cant_hold = typecacheof(list(/obj/item/screwdriver/power)) + STR.cant_hold = typecacheof(list(/obj/item/handdrill)) STR.can_hold = typecacheof(list( /obj/item/stack/spacecash, /obj/item/card, diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index f3bc11b8..f61959f6 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -92,35 +92,6 @@ desc = "This cuts wires." toolspeed = 0.5 -/obj/item/wirecutters/power - name = "jaws of life" - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." - icon_state = "jaws_cutter" - item_state = "jawsoflife" - - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - usesound = 'sound/items/jaws_cut.ogg' - toolspeed = 0.25 - random_color = FALSE - -/obj/item/wirecutters/power/suicide_act(mob/user) - user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") - playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) - if(iscarbon(user)) - var/mob/living/carbon/C = user - var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) - if(BP) - BP.drop_limb() - playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) - return (BRUTELOSS) - -/obj/item/wirecutters/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power(drop_location()) - to_chat(user, "You attach the pry jaws to [src].") - qdel(src) - user.put_in_active_hand(pryjaws) - /obj/item/wirecutters/advanced name = "advanced wirecutters" desc = "A set of reproduction alien wirecutters, they have a silver handle with an exceedingly sharp blade." diff --git a/code/modules/cargo/exports/tools.dm b/code/modules/cargo/exports/tools.dm index 2a0cb0f3..17383ca5 100644 --- a/code/modules/cargo/exports/tools.dm +++ b/code/modules/cargo/exports/tools.dm @@ -14,8 +14,7 @@ cost = 25 k_elasticity = 1/80 //Market can only take so much unit_name = "power tool" - export_types = list(/obj/item/crowbar/power, /obj/item/screwdriver/power, \ - /obj/item/weldingtool/experimental, /obj/item/wirecutters/power, /obj/item/wrench/power) + export_types = list(/obj/item/jawsoflife, /obj/item/handdrill, /obj/item/weldingtool/experimental) include_subtypes = TRUE /datum/export/gear/advtool diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm index fa74e035..d7e2e885 100644 --- a/code/modules/cargo/packs/engineering.dm +++ b/code/modules/cargo/packs/engineering.dm @@ -124,8 +124,8 @@ access = ACCESS_ENGINE contains = list(/obj/item/clothing/head/hardhat, /obj/item/clothing/suit/hazardvest, - /obj/item/screwdriver/power, - /obj/item/crowbar/power) + /obj/item/handdrill, + /obj/item/jawsoflife) crate_name = "power tools crate" crate_type = /obj/structure/closet/crate/secure/engineering diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 536fb84c..adad2057 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -334,7 +334,7 @@ if(prob(50)) neck = /obj/item/bedsheet/rd/royal_cape if(prob(10)) - l_pocket = pick(list(/obj/item/crowbar/power, /obj/item/wrench/power, /obj/item/weldingtool/experimental)) + l_pocket = pick(list(/obj/item/jawsoflife, /obj/item/handdrill, /obj/item/weldingtool/experimental)) if("YeOlde") mob_gender = FEMALE uniform = /obj/item/clothing/under/maid diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index df51f023..91006dbb 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -469,7 +469,7 @@ id = "handdrill" build_type = PROTOLATHE materials = list(MAT_METAL = 3500, MAT_SILVER = 1500, MAT_TITANIUM = 2500) - build_path = /obj/item/screwdriver/power + build_path = /obj/item/handdrill category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING @@ -477,7 +477,7 @@ name = "Jaws of Life" desc = "A small, compact Jaws of Life with an interchangeable pry jaws and cutting jaws" id = "jawsoflife" // added one more requirment since the Jaws of Life are a bit OP - build_path = /obj/item/crowbar/power + build_path = /obj/item/jawsoflife build_type = PROTOLATHE materials = list(MAT_METAL = 4500, MAT_SILVER = 2500, MAT_TITANIUM = 3500) category = list("Equipment") diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index 392244fb..bdc92c23 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -109,7 +109,7 @@ //drill bone /datum/surgery_step/drill name = "drill bone" - implements = list(TOOL_DRILL = 100, /obj/item/screwdriver/power = 80, /obj/item/pickaxe/drill = 60, TOOL_SCREWDRIVER = 20) + implements = list(TOOL_DRILL = 100, /obj/item/handdrill = 80, /obj/item/pickaxe/drill = 60, TOOL_SCREWDRIVER = 20) time = 30 /datum/surgery_step/drill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) diff --git a/hyperstation/code/datums/ert_hazard_cleanup.dm b/hyperstation/code/datums/ert_hazard_cleanup.dm index 4a7a6646..01049422 100644 --- a/hyperstation/code/datums/ert_hazard_cleanup.dm +++ b/hyperstation/code/datums/ert_hazard_cleanup.dm @@ -47,7 +47,7 @@ belt = /obj/item/gun/energy/e_gun/advtaser backpack_contents = list(/obj/item/storage/firstaid/radbgone=2, /obj/item/storage/firstaid/toxin=1, - /obj/item/crowbar/power=1, + /obj/item/jawsoflife=1, /obj/item/shovel=1, /obj/item/geiger_counter=1) diff --git a/tools/dmitool/.gradle/8.8/checksums/checksums.lock b/tools/dmitool/.gradle/8.8/checksums/checksums.lock new file mode 100644 index 0000000000000000000000000000000000000000..f7fd2cc25c3de7dcbe0314737e2191e08b1e5c6d GIT binary patch literal 17 TcmZSfh+ekYD{{L%0~7!NEbIfB literal 0 HcmV?d00001 diff --git a/tools/dmitool/.gradle/8.8/dependencies-accessors/gc.properties b/tools/dmitool/.gradle/8.8/dependencies-accessors/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/tools/dmitool/.gradle/8.8/fileChanges/last-build.bin b/tools/dmitool/.gradle/8.8/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/tools/dmitool/.gradle/8.8/fileHashes/fileHashes.bin b/tools/dmitool/.gradle/8.8/fileHashes/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..2a26579297cb0ce998cf47c6293519a8911fc52b GIT binary patch literal 18547 zcmeI(J&J-c5CG8ZHo_vT7J`kSc7mwj30y?HfZzcvlQp$URdT0RjXF5FkK+009C72oNAZfB*pk1PBly@Gb(q z*vQwdnSAv#Nxml`G}1Bo*pIW*-+H;2?1s>7J?;-4F>Y3_M-~DE2oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK;R_=nz4%Hv41I@~ literal 0 HcmV?d00001 diff --git a/tools/dmitool/.gradle/8.8/gc.properties b/tools/dmitool/.gradle/8.8/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/tools/dmitool/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/tools/dmitool/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..6e29496ea2702e2b38dc9c4b0e3dc5df1607f07e GIT binary patch literal 17 UcmZQR>mYg5>A@CP1_)pT05V|&3jhEB literal 0 HcmV?d00001 diff --git a/tools/dmitool/.gradle/buildOutputCleanup/cache.properties b/tools/dmitool/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 00000000..cc2d617a --- /dev/null +++ b/tools/dmitool/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Wed Sep 11 13:12:44 CDT 2024 +gradle.version=8.8 diff --git a/tools/dmitool/.gradle/vcs-1/gc.properties b/tools/dmitool/.gradle/vcs-1/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/yogstation/code/game/objects/items/tools.dm b/yogstation/code/game/objects/items/tools.dm index 0f63c54a..3dd63404 100644 --- a/yogstation/code/game/objects/items/tools.dm +++ b/yogstation/code/game/objects/items/tools.dm @@ -4,7 +4,7 @@ /obj/item/jawsoflife name = "jaws of life" desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." - materials = list(/datum/material/iron=150,/datum/material/silver=50,/datum/material/titanium=25) + materials = list(/datum/material/metal=150,/datum/material/silver=50,/datum/material/titanium=25) icon = 'icons/obj/tools.dmi' icon_state = "jaws_pry" item_state = "jawsoflife" @@ -105,7 +105,7 @@ item_state = "drill" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - materials = list(/datum/material/iron=150,/datum/material/silver=50,/datum/material/titanium=25) //done for balance reasons, making them high value for research, but harder to get + materials = list(/datum/material/metal=150,/datum/material/silver=50,/datum/material/titanium=25) //done for balance reasons, making them high value for research, but harder to get force = 8 //might or might not be too high, subject to change w_class = WEIGHT_CLASS_SMALL throwforce = 8 @@ -116,8 +116,7 @@ usesound = 'sound/items/drill_use.ogg' toolspeed = 0.7 tool_behaviour = TOOL_SCREWDRIVER - sharpness = SHARP_POINTY - + sharpness = IS_SHARP_ACCURATE /obj/item/handdrill/attack(mob/living/carbon/M, mob/living/carbon/user) if(!(user.a_intent == INTENT_HARM) && attempt_initiate_surgery(src, M, user)) return @@ -146,7 +145,7 @@ desc = "A simple powered hand drill. It's fitted with a bolt bit." icon_state = "drill_bolt" tool_behaviour = TOOL_WRENCH - sharpness = SHARP_NONE + sharpness = IS_BLUNT playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) if (iscyborg(user)) to_chat(user,span_notice("Your servos whirr as the drill reconfigures into bolt mode.")) @@ -158,7 +157,7 @@ desc = "A simple powered hand drill. It's fitted with a screw bit." icon_state = "drill_screw" tool_behaviour = TOOL_SCREWDRIVER - sharpness = SHARP_POINTY + sharpness = IS_SHARP_ACCURATE playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) if (iscyborg(user)) to_chat(user,span_notice("Your servos whirr as the drill reconfigures into screw mode.")) @@ -166,6 +165,7 @@ to_chat(user, span_notice("You attach the screw driver bit to [src].")) update_icon() +/* //I'll fix this later. Maybe. It's yogs-specific ERT gear it wont be noticed. /obj/item/jawsoflife/jimmy name = "airlock jimmy" desc = "A pump assisted airlock prying jimmy." @@ -232,3 +232,4 @@ . += span_danger("The pressure gage has been tampered with.") if(user) show_gage(user) +*/