shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)

Browse Source 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
This commit is contained in:
kevinz000
2017-08-22 04:04:21 -07:00
committed by GitHub
parent 15b378ddf4
commit 6a309b5996
536 changed files with 1489 additions and 2474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/tools.dm
+12 -12
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "retractor"
materials = list(MAT_METAL=6000, MAT_GLASS=3000)
flags_1 = CONDUCT_1
flags = CONDUCT
w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=1;biotech=1"
@@ -15,7 +15,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "retractor"
materials = list(MAT_METAL=6000, MAT_GLASS=3000)
flags_1 = CONDUCT_1
flags = CONDUCT
w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=1;biotech=1"
toolspeed = 0.5
@@ -27,7 +27,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "hemostat"
materials = list(MAT_METAL=5000, MAT_GLASS=2500)
flags_1 = CONDUCT_1
flags = CONDUCT
w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "pinched")
@@ -39,7 +39,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "hemostat"
materials = list(MAT_METAL=5000, MAT_GLASS=2500)
flags_1 = CONDUCT_1
flags = CONDUCT
w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=1;biotech=1"
toolspeed = 0.5
@@ -52,7 +52,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "cautery"
materials = list(MAT_METAL=2500, MAT_GLASS=750)
flags_1 = CONDUCT_1
flags = CONDUCT
w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=1;biotech=1"
attack_verb = list("burnt")
@@ -64,7 +64,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "cautery"
materials = list(MAT_METAL=2500, MAT_GLASS=750)
flags_1 = CONDUCT_1
flags = CONDUCT
w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=1;biotech=1"
toolspeed = 0.5
@@ -80,7 +80,7 @@
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
hitsound = 'sound/weapons/circsawhit.ogg'
materials = list(MAT_METAL=10000, MAT_GLASS=6000)
flags_1 = CONDUCT_1
flags = CONDUCT
force = 15
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "materials=1;biotech=1"
@@ -94,7 +94,7 @@
icon_state = "drill"
hitsound = 'sound/weapons/circsawhit.ogg'
materials = list(MAT_METAL=10000, MAT_GLASS=6000)
flags_1 = CONDUCT_1
flags = CONDUCT
force = 10
w_class = WEIGHT_CLASS_SMALL
origin_tech = "materials=1;biotech=1"
@@ -109,7 +109,7 @@
icon_state = "scalpel"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
flags_1 = CONDUCT_1
flags = CONDUCT
force = 10
w_class = WEIGHT_CLASS_TINY
throwforce = 5
@@ -126,7 +126,7 @@
desc = "Ultra-sharp blade attached directly to your bone for extra-accuracy."
icon = 'icons/obj/surgery.dmi'
icon_state = "scalpel"
flags_1 = CONDUCT_1
flags = CONDUCT
force = 10
w_class = WEIGHT_CLASS_TINY
throwforce = 5
@@ -153,7 +153,7 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
hitsound = 'sound/weapons/circsawhit.ogg'
throwhitsound = 'sound/weapons/pierce.ogg'
flags_1 = CONDUCT_1
flags = CONDUCT
force = 15
w_class = WEIGHT_CLASS_NORMAL
throwforce = 9
@@ -171,7 +171,7 @@
icon_state = "saw"
hitsound = 'sound/weapons/circsawhit.ogg'
throwhitsound = 'sound/weapons/pierce.ogg'
flags_1 = CONDUCT_1
flags = CONDUCT
force = 10
w_class = WEIGHT_CLASS_SMALL
throwforce = 9