cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-09 07:02:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

EMERGENCY FIX

Browse Source 
I FORGOT TO FIX THE DEFINES! D:
This commit is contained in:
ReoDaProtovali
2024-09-11 13:20:29 -05:00
parent e3181d3893
commit 693631004f
26 changed files with 38 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/storage/concrete/pockets.dm
+2 -2
View File
@@ -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,
code/game/machinery/doors/airlock.dm
+1 -1
View File
@@ -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
code/game/objects/items/storage/belt.dm
+5 -5
View File
@@ -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"))
code/game/objects/items/storage/uplink_kits.dm
+2 -2
View File
@@ -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
//End of Chemlight changes
code/game/objects/items/storage/wallets.dm
+1 -1
View File
@@ -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,
code/game/objects/items/tools/wirecutters.dm
-29
View File
@@ -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("<span class='suicide'>[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!</span>")
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, "<span class='notice'>You attach the pry jaws to [src].</span>")
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."
code/modules/cargo/exports/tools.dm
+1 -2
View File
@@ -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
code/modules/cargo/packs/engineering.dm
+2 -2
View File
@@ -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
code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+1 -1
View File
@@ -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
code/modules/research/designs/misc_designs.dm
+2 -2
View File
@@ -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")
code/modules/surgery/organic_steps.dm
+1 -1
View File
@@ -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)