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/hydroponics/beekeeping/beebox.dm
+1 -1
View File
@@ -18,7 +18,7 @@
/mob/living/carbon/human/bee_friendly()
if(dna && dna.species && dna.species.id == "pod") //bees pollinate plants, duh.
return 1
if((wear_suit && (wear_suit.flags & THICKMATERIAL)) && (head && (head.flags & THICKMATERIAL)))
if((wear_suit && (wear_suit.flags_1 & THICKMATERIAL_1)) && (head && (head.flags_1 & THICKMATERIAL_1)))
return 1
return 0
code/modules/hydroponics/beekeeping/beekeeper_suit.dm
+2 -2
View File
@@ -4,7 +4,7 @@
desc = "Keeps the lil buzzing buggers out of your eyes."
icon_state = "beekeeper"
item_state = "beekeeper"
flags = THICKMATERIAL
flags_1 = THICKMATERIAL_1
/obj/item/clothing/suit/beekeeper_suit
@@ -12,5 +12,5 @@
desc = "Keeps the lil buzzing buggers away from your squishy bits."
icon_state = "beekeeper"
item_state = "beekeeper"
flags = THICKMATERIAL
flags_1 = THICKMATERIAL_1
code/modules/hydroponics/grown/towercap.dm
+1 -1
View File
@@ -147,7 +147,7 @@
if(W.is_hot())
StartBurning()
if(grill)
if(user.a_intent != INTENT_HARM && !(W.flags & ABSTRACT))
if(user.a_intent != INTENT_HARM && !(W.flags_1 & ABSTRACT_1))
if(user.temporarilyRemoveItemFromInventory(W))
W.forceMove(get_turf(src))
var/list/click_params = params2list(params)
code/modules/hydroponics/hydroitemdefines.dm
+5 -5
View File
@@ -23,7 +23,7 @@
icon_state = "weedspray"
item_state = "spray"
volume = 100
container_type = OPENCONTAINER
container_type = OPENCONTAINER_1
slot_flags = SLOT_BELT
throwforce = 0
w_class = WEIGHT_CLASS_SMALL
@@ -47,7 +47,7 @@
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
volume = 100
container_type = OPENCONTAINER
container_type = OPENCONTAINER_1
slot_flags = SLOT_BELT
throwforce = 0
w_class = WEIGHT_CLASS_SMALL
@@ -71,7 +71,7 @@
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
origin_tech = "engineering=2;biotech=2"
flags = CONDUCT
flags_1 = CONDUCT_1
force = 5
throwforce = 7
w_class = WEIGHT_CLASS_SMALL
@@ -87,7 +87,7 @@
item_state = "hatchet"
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
flags = CONDUCT
flags_1 = CONDUCT_1
force = 12
w_class = WEIGHT_CLASS_TINY
throwforce = 15
@@ -115,7 +115,7 @@
throw_speed = 2
throw_range = 3
w_class = WEIGHT_CLASS_BULKY
flags = CONDUCT
flags_1 = CONDUCT_1
armour_penetration = 20
slot_flags = SLOT_BACK
origin_tech = "materials=3;combat=2"