cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 13:09:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Surgical tools will no longer cause damage on help intent

Browse Source
This commit is contained in:
Anewbe
2017-01-21 18:34:05 -06:00
parent 022ea9f15e
commit ac4b355f5e
33 changed files with 213 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bones.dm
+4 -4
View File
@@ -5,7 +5,7 @@
/datum/surgery_step/glue_bone
allowed_tools = list(
/obj/item/weapon/bonegel = 100, \
/obj/item/weapon/surgical/bonegel = 100, \
/obj/item/weapon/screwdriver = 75
)
can_infect = 1
@@ -41,7 +41,7 @@
/datum/surgery_step/set_bone
allowed_tools = list(
/obj/item/weapon/bonesetter = 100, \
/obj/item/weapon/surgical/bonesetter = 100, \
/obj/item/weapon/wrench = 75 \
)
@@ -80,7 +80,7 @@
/datum/surgery_step/mend_skull
allowed_tools = list(
/obj/item/weapon/bonesetter = 100, \
/obj/item/weapon/surgical/bonesetter = 100, \
/obj/item/weapon/wrench = 75 \
)
@@ -114,7 +114,7 @@
/datum/surgery_step/finish_bone
allowed_tools = list(
/obj/item/weapon/bonegel = 100, \
/obj/item/weapon/surgical/bonegel = 100, \
/obj/item/weapon/screwdriver = 75
)
can_infect = 1
code/modules/surgery/encased.dm
+4 -4
View File
@@ -17,7 +17,7 @@
/datum/surgery_step/open_encased/saw
allowed_tools = list(
/obj/item/weapon/circular_saw = 100, \
/obj/item/weapon/surgical/circular_saw = 100, \
/obj/item/weapon/material/hatchet = 75
)
@@ -66,7 +66,7 @@
/datum/surgery_step/open_encased/retract
allowed_tools = list(
/obj/item/weapon/retractor = 100, \
/obj/item/weapon/surgical/retractor = 100, \
/obj/item/weapon/crowbar = 75
)
@@ -122,7 +122,7 @@
/datum/surgery_step/open_encased/close
allowed_tools = list(
/obj/item/weapon/retractor = 100, \
/obj/item/weapon/surgical/retractor = 100, \
/obj/item/weapon/crowbar = 75
)
@@ -179,7 +179,7 @@
/datum/surgery_step/open_encased/mend
allowed_tools = list(
/obj/item/weapon/bonegel = 100, \
/obj/item/weapon/surgical/bonegel = 100, \
/obj/item/weapon/screwdriver = 75
)
code/modules/surgery/face.dm
+4 -4
View File
@@ -17,7 +17,7 @@
/datum/surgery_step/generic/cut_face
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/surgical/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
)
@@ -47,7 +47,7 @@
/datum/surgery_step/face/mend_vocal
allowed_tools = list(
/obj/item/weapon/hemostat = 100, \
/obj/item/weapon/surgical/hemostat = 100, \
/obj/item/stack/cable_coil = 75, \
/obj/item/device/assembly/mousetrap = 10 //I don't know. Don't ask me. But I'm leaving it because hilarity.
)
@@ -75,7 +75,7 @@
/datum/surgery_step/face/fix_face
allowed_tools = list(
/obj/item/weapon/retractor = 100, \
/obj/item/weapon/surgical/retractor = 100, \
/obj/item/weapon/crowbar = 55, \
/obj/item/weapon/material/kitchen/utensil/fork = 75)
@@ -103,7 +103,7 @@
/datum/surgery_step/face/cauterize
allowed_tools = list(
/obj/item/weapon/cautery = 100, \
/obj/item/weapon/surgical/cautery = 100, \
/obj/item/clothing/mask/smokable/cigarette = 75, \
/obj/item/weapon/flame/lighter = 50, \
/obj/item/weapon/weldingtool = 25
code/modules/surgery/generic.dm
+9 -9
View File
@@ -23,9 +23,9 @@
/datum/surgery_step/generic/cut_with_laser
allowed_tools = list(
/obj/item/weapon/scalpel/laser3 = 95, \
/obj/item/weapon/scalpel/laser2 = 85, \
/obj/item/weapon/scalpel/laser1 = 75, \
/obj/item/weapon/surgical/scalpel/laser3 = 95, \
/obj/item/weapon/surgical/scalpel/laser2 = 85, \
/obj/item/weapon/surgical/scalpel/laser1 = 75, \
/obj/item/weapon/melee/energy/sword = 5
)
priority = 2
@@ -65,7 +65,7 @@
/datum/surgery_step/generic/incision_manager
allowed_tools = list(
/obj/item/weapon/scalpel/manager = 100
/obj/item/weapon/surgical/scalpel/manager = 100
)
priority = 2
req_open = 0
@@ -106,7 +106,7 @@
/datum/surgery_step/generic/cut_open
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/surgical/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
)
@@ -146,7 +146,7 @@
/datum/surgery_step/generic/clamp_bleeders
allowed_tools = list(
/obj/item/weapon/hemostat = 100, \
/obj/item/weapon/surgical/hemostat = 100, \
/obj/item/stack/cable_coil = 75, \
/obj/item/device/assembly/mousetrap = 20
)
@@ -181,7 +181,7 @@
/datum/surgery_step/generic/retract_skin
allowed_tools = list(
/obj/item/weapon/retractor = 100, \
/obj/item/weapon/surgical/retractor = 100, \
/obj/item/weapon/crowbar = 75, \
/obj/item/weapon/material/kitchen/utensil/fork = 50
)
@@ -236,7 +236,7 @@
/datum/surgery_step/generic/cauterize
allowed_tools = list(
/obj/item/weapon/cautery = 100, \
/obj/item/weapon/surgical/cautery = 100, \
/obj/item/clothing/mask/smokable/cigarette = 75, \
/obj/item/weapon/flame/lighter = 50, \
/obj/item/weapon/weldingtool = 25
@@ -273,7 +273,7 @@
/datum/surgery_step/generic/amputate
allowed_tools = list(
/obj/item/weapon/circular_saw = 100, \
/obj/item/weapon/surgical/circular_saw = 100, \
/obj/item/weapon/material/hatchet = 75
)
req_open = 0
code/modules/surgery/implant.dm
+3 -3
View File
@@ -40,7 +40,7 @@
/datum/surgery_step/cavity/make_space
allowed_tools = list(
/obj/item/weapon/surgicaldrill = 100, \
/obj/item/weapon/surgical/surgicaldrill = 100, \
/obj/item/weapon/pen = 75, \
/obj/item/stack/rods = 50
)
@@ -69,7 +69,7 @@
/datum/surgery_step/cavity/close_space
priority = 2
allowed_tools = list(
/obj/item/weapon/cautery = 100, \
/obj/item/weapon/surgical/cautery = 100, \
/obj/item/clothing/mask/smokable/cigarette = 75, \
/obj/item/weapon/flame/lighter = 50, \
/obj/item/weapon/weldingtool = 25
@@ -144,7 +144,7 @@
/datum/surgery_step/cavity/implant_removal
allowed_tools = list(
/obj/item/weapon/hemostat = 100, \
/obj/item/weapon/surgical/hemostat = 100, \
/obj/item/weapon/wirecutters = 75, \
/obj/item/weapon/material/kitchen/utensil/fork = 20
)
code/modules/surgery/limb_reattach.dm
+1 -1
View File
@@ -57,7 +57,7 @@
/datum/surgery_step/limb/connect
allowed_tools = list(
/obj/item/weapon/hemostat = 100, \
/obj/item/weapon/surgical/hemostat = 100, \
/obj/item/stack/cable_coil = 75, \
/obj/item/device/assembly/mousetrap = 20
)
code/modules/surgery/organs_internal.dm
+4 -4
View File
@@ -106,7 +106,7 @@
/datum/surgery_step/internal/detatch_organ
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/surgical/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
)
@@ -166,7 +166,7 @@
/datum/surgery_step/internal/remove_organ
allowed_tools = list(
/obj/item/weapon/hemostat = 100, \
/obj/item/weapon/surgical/hemostat = 100, \
/obj/item/weapon/wirecutters = 75, \
/obj/item/weapon/material/kitchen/utensil/fork = 20
)
@@ -292,7 +292,7 @@
/datum/surgery_step/internal/attach_organ
allowed_tools = list(
/obj/item/weapon/FixOVein = 100, \
/obj/item/weapon/surgical/FixOVein = 100, \
/obj/item/stack/cable_coil = 75
)
@@ -345,7 +345,7 @@
// To be finished after some tests.
// /datum/surgery_step/ribcage/heart/cut
// allowed_tools = list(
// /obj/item/weapon/scalpel = 100, \
// /obj/item/weapon/surgical/scalpel = 100, \
// /obj/item/weapon/material/knife = 75, \
// /obj/item/weapon/material/shard = 50, \
// )
code/modules/surgery/other.dm
+3 -3
View File
@@ -7,7 +7,7 @@
/datum/surgery_step/fix_vein
priority = 2
allowed_tools = list(
/obj/item/weapon/FixOVein = 100, \
/obj/item/weapon/surgical/FixOVein = 100, \
/obj/item/stack/cable_coil = 75
)
can_infect = 1
@@ -55,7 +55,7 @@
/datum/surgery_step/fix_dead_tissue //Debridement
priority = 2
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/surgical/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
)
@@ -172,7 +172,7 @@
/datum/surgery_step/hardsuit
allowed_tools = list(
/obj/item/weapon/weldingtool = 80,
/obj/item/weapon/circular_saw = 60,
/obj/item/weapon/surgical/circular_saw = 60,
/obj/item/weapon/pickaxe/plasmacutter = 100
)
req_open = 0
code/modules/surgery/robotics.dm
+3 -3
View File
@@ -56,7 +56,7 @@
/datum/surgery_step/robotics/open_hatch
allowed_tools = list(
/obj/item/weapon/retractor = 100,
/obj/item/weapon/surgical/retractor = 100,
/obj/item/weapon/crowbar = 100,
/obj/item/weapon/material/kitchen/utensil = 50
)
@@ -88,7 +88,7 @@
/datum/surgery_step/robotics/close_hatch
allowed_tools = list(
/obj/item/weapon/retractor = 100,
/obj/item/weapon/surgical/retractor = 100,
/obj/item/weapon/crowbar = 100,
/obj/item/weapon/material/kitchen/utensil = 50
)
@@ -196,7 +196,7 @@
/datum/surgery_step/robotics/fix_organ_robotic //For artificial organs
allowed_tools = list(
/obj/item/stack/nanopaste = 100, \
/obj/item/weapon/bonegel = 30, \
/obj/item/weapon/surgical/bonegel = 30, \
/obj/item/weapon/screwdriver = 70, \
)
code/modules/surgery/slimes.dm
+3 -3
View File
@@ -11,7 +11,7 @@
/datum/surgery_step/slime/cut_flesh
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/surgical/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
)
@@ -37,7 +37,7 @@
/datum/surgery_step/slime/cut_innards
allowed_tools = list(
/obj/item/weapon/scalpel = 100, \
/obj/item/weapon/surgical/scalpel = 100, \
/obj/item/weapon/material/knife = 75, \
/obj/item/weapon/material/shard = 50, \
)
@@ -63,7 +63,7 @@
/datum/surgery_step/slime/saw_core
allowed_tools = list(
/obj/item/weapon/circular_saw = 100, \
/obj/item/weapon/surgical/circular_saw = 100, \
/obj/item/weapon/material/hatchet = 75
)