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/game/objects/items/devices/PDA/PDA.dm
+1 -1
View File
@@ -12,7 +12,7 @@ GLOBAL_LIST_EMPTY(PDAs)
item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
flags = NOBLUDGEON
flags_1 = NOBLUDGEON_1
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_ID | SLOT_BELT
origin_tech = "programming=2"
code/game/objects/items/devices/aicard.dm
+1 -1
View File
@@ -8,7 +8,7 @@
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
flags = NOBLUDGEON
flags_1 = NOBLUDGEON_1
var/flush = FALSE
var/mob/living/silicon/ai/AI
origin_tech = "programming=3;materials=3"
code/game/objects/items/devices/camera_bug.dm
+1 -1
View File
@@ -15,7 +15,7 @@
throw_speed = 4
throw_range = 20
origin_tech = "syndicate=1;engineering=3"
flags = NOBLUDGEON
flags_1 = NOBLUDGEON_1
var/obj/machinery/camera/current = null
code/game/objects/items/devices/chameleonproj.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/item/device/chameleon
name = "chameleon-projector"
icon_state = "shield0"
flags = CONDUCT | NOBLUDGEON
flags_1 = CONDUCT_1 | NOBLUDGEON_1
slot_flags = SLOT_BELT
item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
code/game/objects/items/devices/doorCharge.dm
+1 -1
View File
@@ -8,7 +8,7 @@
w_class = WEIGHT_CLASS_SMALL
throw_range = 4
throw_speed = 1
flags = NOBLUDGEON
flags_1 = NOBLUDGEON_1
force = 3
attack_verb = list("blown up", "exploded", "detonated")
materials = list(MAT_METAL=50, MAT_GLASS=30)
code/game/objects/items/devices/flashlight.dm
+4 -4
View File
@@ -7,7 +7,7 @@
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
flags_1 = CONDUCT_1
slot_flags = SLOT_BELT
materials = list(MAT_METAL=50, MAT_GLASS=20)
actions_types = list(/datum/action/item_action/toggle_light)
@@ -162,7 +162,7 @@
desc = "A pen-sized light, used by medical staff. It can also be used to create a hologram to alert people of incoming medical assistance."
icon_state = "penlight"
item_state = ""
flags = CONDUCT
flags_1 = CONDUCT_1
brightness_on = 2
var/holo_cooldown = 0
@@ -210,7 +210,7 @@
item_state = "lamp"
brightness_on = 5
w_class = WEIGHT_CLASS_BULKY
flags = CONDUCT
flags_1 = CONDUCT_1
materials = list()
on = TRUE
@@ -524,5 +524,5 @@
desc = "This shouldn't exist outside of someone's head, how are you seeing this?"
brightness_on = 15
flashlight_power = 1
flags = CONDUCT | DROPDEL
flags_1 = CONDUCT_1 | DROPDEL_1
actions_types = list()
code/game/objects/items/devices/forcefieldprojector.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "signmaker_engi"
slot_flags = SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
flags = NOBLUDGEON
flags_1 = NOBLUDGEON_1
item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
code/game/objects/items/devices/gps.dm
+2 -2
View File
@@ -158,11 +158,11 @@ GLOBAL_LIST_EMPTY(GPS_list)
icon_state = "gps-b"
gpstag = "BORG0"
desc = "A mining cyborg internal positioning system. Used as a recovery beacon for damaged cyborg assets, or a collaboration tool for mining teams."
flags = NODROP
flags_1 = NODROP_1
/obj/item/device/gps/internal
icon_state = null
flags = ABSTRACT
flags_1 = ABSTRACT_1
gpstag = "Eerie Signal"
desc = "Report to a coder immediately."
invisibility = INVISIBILITY_MAXIMUM
code/game/objects/items/devices/laserpointer.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "pointer"
item_state = "pen"
var/pointer_icon_state
flags = CONDUCT | NOBLUDGEON
flags_1 = CONDUCT_1 | NOBLUDGEON_1
slot_flags = SLOT_BELT
materials = list(MAT_METAL=500, MAT_GLASS=500)
w_class = WEIGHT_CLASS_SMALL
code/game/objects/items/devices/lightreplacer.dm
+1 -1
View File
@@ -49,7 +49,7 @@
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
flags = CONDUCT
flags_1 = CONDUCT_1
slot_flags = SLOT_BELT
origin_tech = "magnets=3;engineering=4"
code/game/objects/items/devices/pipe_painter.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "labeler1"
item_state = "flight"
flags = NOBLUDGEON
flags_1 = NOBLUDGEON_1
var/list/modes = list(
"grey" = rgb(255,255,255),
"red" = rgb(255,0,0),
code/game/objects/items/devices/powersink.dm
+1 -1
View File
@@ -8,7 +8,7 @@
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
w_class = WEIGHT_CLASS_BULKY
flags = CONDUCT
flags_1 = CONDUCT_1
throwforce = 5
throw_speed = 1
throw_range = 2
code/game/objects/items/devices/radio/electropack.dm
+3 -3
View File
@@ -6,7 +6,7 @@
item_state = "electropack"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
flags = CONDUCT
flags_1 = CONDUCT_1
slot_flags = SLOT_BACK
w_class = WEIGHT_CLASS_HUGE
materials = list(MAT_METAL=10000, MAT_GLASS=2500)
@@ -52,8 +52,8 @@
user.put_in_hands(A)
A.add_fingerprint(user)
if(src.flags & NODROP)
A.flags |= NODROP
if(src.flags_1 & NODROP_1)
A.flags_1 |= NODROP_1
else
return ..()
code/game/objects/items/devices/radio/headset.dm
+5 -20
View File
@@ -45,10 +45,7 @@
origin_tech = "syndicate=3"
icon_state = "syndie_headset"
item_state = "syndie_headset"
/obj/item/device/radio/headset/syndicate/alt/Initialize(mapload)
. = ..()
SET_SECONDARY_FLAG(src, BANG_PROTECT)
flags_2 = BANG_PROTECT_2
/obj/item/device/radio/headset/syndicate/alt/leader
name = "team leader headset"
@@ -77,10 +74,7 @@
desc = "This is used by your elite security force. Protects ears from flashbangs. \nTo access the security channel, use :s."
icon_state = "sec_headset_alt"
item_state = "sec_headset_alt"
/obj/item/device/radio/headset/headset_sec/alt/Initialize(mapload)
. = ..()
SET_SECONDARY_FLAG(src, BANG_PROTECT)
flags_2 = BANG_PROTECT_2
/obj/item/device/radio/headset/headset_eng
name = "engineering radio headset"
@@ -132,10 +126,7 @@
desc = "The headset of the boss. Protects ears from flashbangs. \nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
/obj/item/device/radio/headset/heads/captain/alt/Initialize(mapload)
. = ..()
SET_SECONDARY_FLAG(src, BANG_PROTECT)
flags_2 = BANG_PROTECT_2
/obj/item/device/radio/headset/heads/rd
name = "\proper the research director's headset"
@@ -154,10 +145,7 @@
desc = "The headset of the man in charge of keeping order and protecting the station. Protects ears from flashbangs. \nTo access the security channel, use :s. For command, use :c."
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
/obj/item/device/radio/headset/heads/hos/alt/Initialize(mapload)
. = ..()
SET_SECONDARY_FLAG(src, BANG_PROTECT)
flags_2 = BANG_PROTECT_2
/obj/item/device/radio/headset/heads/ce
name = "\proper the chief engineer's headset"
@@ -211,10 +199,7 @@
icon_state = "cent_headset_alt"
item_state = "cent_headset_alt"
keyslot = null
/obj/item/device/radio/headset/headset_cent/alt/Initialize(mapload)
. = ..()
SET_SECONDARY_FLAG(src, BANG_PROTECT)
flags_2 = BANG_PROTECT_2
/obj/item/device/radio/headset/ai
name = "\proper Integrated Subspace Transceiver "
code/game/objects/items/devices/radio/radio.dm
+2 -2
View File
@@ -27,7 +27,7 @@
var/freqlock = 0 //Frequency lock to stop the user from untuning specialist radios.
var/emped = 0 //Highjacked to track the number of consecutive EMPs on the radio, allowing consecutive EMP's to stack properly.
// "Example" = FREQ_LISTENING|FREQ_BROADCASTING
flags = CONDUCT | HEAR
flags_1 = CONDUCT_1 | HEAR_1
slot_flags = SLOT_BELT
throw_speed = 3
throw_range = 7
@@ -547,10 +547,10 @@
name = "cyborg radio"
subspace_switchable = 1
dog_fashion = null
flags_2 = NO_EMP_WIRES_2
/obj/item/device/radio/borg/Initialize(mapload)
..()
SET_SECONDARY_FLAG(src, NO_EMP_WIRES)
/obj/item/device/radio/borg/syndicate
syndie = 1
code/game/objects/items/devices/scanners.dm
+5 -5
View File
@@ -63,7 +63,7 @@ MASS SPECTROMETER
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
desc = "A hand-held body scanner able to distinguish vital signs of the subject."
flags = CONDUCT | NOBLUDGEON
flags_1 = CONDUCT_1 | NOBLUDGEON_1
slot_flags = SLOT_BELT
throwforce = 3
w_class = WEIGHT_CLASS_TINY
@@ -260,7 +260,7 @@ MASS SPECTROMETER
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT | NOBLUDGEON
flags_1 = CONDUCT_1 | NOBLUDGEON_1
slot_flags = SLOT_BELT
throwforce = 0
throw_speed = 3
@@ -336,9 +336,9 @@ MASS SPECTROMETER
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
flags_1 = CONDUCT_1
slot_flags = SLOT_BELT
container_type = OPENCONTAINER
container_type = OPENCONTAINER_1
throwforce = 0
throw_speed = 3
throw_range = 7
@@ -400,7 +400,7 @@ MASS SPECTROMETER
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
origin_tech = "biotech=2"
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
flags_1 = CONDUCT_1
throwforce = 0
throw_speed = 3
throw_range = 7
code/game/objects/items/devices/taperecorder.dm
+1 -1
View File
@@ -6,7 +6,7 @@
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
flags = HEAR
flags_1 = HEAR_1
slot_flags = SLOT_BELT
materials = list(MAT_METAL=60, MAT_GLASS=30)
force = 2
code/game/objects/items/devices/traitordevices.dm
+1 -1
View File
@@ -23,7 +23,7 @@ effective or pretty fucking useless.
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
throw_range = 7
flags = CONDUCT
flags_1 = CONDUCT_1
item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'