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

Replace all secondary flags with bitflags stored in the flags_2 var

Browse Source
This commit is contained in:
CitadelStationBot
2017-08-17 09:19:14 -05:00
parent 2b144561e1
commit 87b3df3069
367 changed files with 1887 additions and 880 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bodyparts/robot_bodyparts.dm
+6 -6
View File
@@ -6,7 +6,7 @@
attack_verb = list("slapped", "punched")
item_state = "buildpipe"
icon = 'icons/obj/robot_parts.dmi'
flags = CONDUCT
flags_1 = CONDUCT_1
icon_state = "borg_l_arm"
status = BODYPART_ROBOTIC
@@ -17,7 +17,7 @@
attack_verb = list("slapped", "punched")
item_state = "buildpipe"
icon = 'icons/obj/robot_parts.dmi'
flags = CONDUCT
flags_1 = CONDUCT_1
icon_state = "borg_r_arm"
status = BODYPART_ROBOTIC
@@ -28,7 +28,7 @@
attack_verb = list("kicked", "stomped")
item_state = "buildpipe"
icon = 'icons/obj/robot_parts.dmi'
flags = CONDUCT
flags_1 = CONDUCT_1
icon_state = "borg_l_leg"
status = BODYPART_ROBOTIC
@@ -39,7 +39,7 @@
attack_verb = list("kicked", "stomped")
item_state = "buildpipe"
icon = 'icons/obj/robot_parts.dmi'
flags = CONDUCT
flags_1 = CONDUCT_1
icon_state = "borg_r_leg"
status = BODYPART_ROBOTIC
@@ -49,7 +49,7 @@
desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell."
item_state = "buildpipe"
icon = 'icons/obj/robot_parts.dmi'
flags = CONDUCT
flags_1 = CONDUCT_1
icon_state = "borg_chest"
status = BODYPART_ROBOTIC
var/wired = 0
@@ -99,7 +99,7 @@
desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals."
item_state = "buildpipe"
icon = 'icons/obj/robot_parts.dmi'
flags = CONDUCT
flags_1 = CONDUCT_1
icon_state = "borg_head"
status = BODYPART_ROBOTIC
var/obj/item/device/assembly/flash/handheld/flash1 = null
code/modules/surgery/cavity_implant.dm
+1 -1
View File
@@ -24,7 +24,7 @@
/datum/surgery_step/handle_cavity/success(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/bodypart/chest/CH = target.get_bodypart("chest")
if(tool)
if(IC || tool.w_class > WEIGHT_CLASS_NORMAL || (NODROP in tool.flags) || istype(tool, /obj/item/organ))
if(IC || tool.w_class > WEIGHT_CLASS_NORMAL || (tool.flags_1 & NODROP_1) || istype(tool, /obj/item/organ))
to_chat(user, "<span class='warning'>You can't seem to fit [tool] in [target]'s [target_zone]!</span>")
return 0
else
code/modules/surgery/organs/augments_arms.dm
+1 -1
View File
@@ -82,7 +82,7 @@
holder = item
holder.flags |= NODROP
holder.flags_1 |= NODROP_1
holder.resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
holder.slot_flags = null
holder.materials = null
code/modules/surgery/organs/augments_internal.dm
+4 -4
View File
@@ -51,8 +51,8 @@
active = !active
if(active)
for(var/obj/item/I in owner.held_items)
if(!(I.flags & NODROP))
stored_items += I
if(!(I.flags_1 & NODROP_1))
flags_1 += I
var/list/L = owner.get_empty_held_indexes()
if(LAZYLEN(L) == owner.held_items.len)
@@ -62,7 +62,7 @@
else
for(var/obj/item/I in stored_items)
to_chat(owner, "<span class='notice'>Your [owner.get_held_index_name(owner.get_held_index_of_item(I))]'s grip tightens.</span>")
I.flags |= NODROP
I.flags_1 |= NODROP_1
else
release_items()
@@ -86,7 +86,7 @@
/obj/item/organ/cyberimp/brain/anti_drop/proc/release_items()
for(var/obj/item/I in stored_items)
I.flags &= ~NODROP
I.flags_1 &= ~NODROP_1
/obj/item/organ/cyberimp/brain/anti_drop/Remove(var/mob/living/carbon/M, special = 0)
code/modules/surgery/organs/ears.dm
+1 -1
View File
@@ -25,7 +25,7 @@
if(C.disabilities & DEAF)
deaf = max(deaf, 1)
else
if(C.ears && HAS_SECONDARY_FLAG(C.ears, HEALS_EARS))
if(C.ears && (C.ears.flags_2 & HEALS_EARS_2))
deaf = max(deaf - 1, 1)
ear_damage = max(ear_damage - 0.10, 0)
// if higher than UNHEALING_EAR_DAMAGE, no natural healing occurs.
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 = CONDUCT
flags_1 = CONDUCT_1
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 = CONDUCT
flags_1 = CONDUCT_1
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 = CONDUCT
flags_1 = CONDUCT_1
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 = CONDUCT
flags_1 = CONDUCT_1
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 = CONDUCT
flags_1 = CONDUCT_1
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 = CONDUCT
flags_1 = CONDUCT_1
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 = CONDUCT
flags_1 = CONDUCT_1
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 = CONDUCT
flags_1 = CONDUCT_1
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 = CONDUCT
flags_1 = CONDUCT_1
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 = CONDUCT
flags_1 = CONDUCT_1
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 = CONDUCT
flags_1 = CONDUCT_1
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 = CONDUCT
flags_1 = CONDUCT_1
force = 10
w_class = WEIGHT_CLASS_SMALL
throwforce = 9