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/stacks/rods.dm
+1 -1
View File
@@ -10,7 +10,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
singular_name = "metal rod"
icon_state = "rods"
item_state = "rods"
flags = CONDUCT
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_NORMAL
force = 9
throwforce = 10
code/game/objects/items/stacks/sheets/leather.dm
+2 -2
View File
@@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
singular_name = "hide plate"
max_amount = 6
novariants = FALSE
flags = NOBLUDGEON
flags_1 = NOBLUDGEON_1
w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
@@ -192,7 +192,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
singular_name = "drake plate"
max_amount = 10
novariants = FALSE
flags = NOBLUDGEON
flags_1 = NOBLUDGEON_1
w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
code/game/objects/items/stacks/sheets/light.dm
+1 -1
View File
@@ -9,7 +9,7 @@
throwforce = 5
throw_speed = 3
throw_range = 7
flags = CONDUCT
flags_1 = CONDUCT_1
max_amount = 60
/obj/item/stack/light_w/attackby(obj/item/O, mob/user, params)
code/game/objects/items/stacks/sheets/sheet_types.dm
+2 -2
View File
@@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
icon_state = "sheet-metal"
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)
throwforce = 10
flags = CONDUCT
flags_1 = CONDUCT_1
origin_tech = "materials=1"
resistance_flags = FIRE_PROOF
merge_type = /obj/item/stack/sheet/metal
@@ -109,7 +109,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
item_state = "sheet-metal"
materials = list(MAT_METAL=2000, MAT_PLASMA=2000)
throwforce = 10
flags = CONDUCT
flags_1 = CONDUCT_1
origin_tech = "materials=2"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 80)
resistance_flags = FIRE_PROOF
code/game/objects/items/stacks/telecrystal.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "telecrystal"
w_class = WEIGHT_CLASS_TINY
max_amount = 50
flags = NOBLUDGEON
flags_1 = NOBLUDGEON_1
origin_tech = "materials=6;syndicate=1"
/obj/item/stack/telecrystal/attack(mob/target, mob/user)
code/game/objects/items/stacks/tiles/light.dm
+1 -1
View File
@@ -3,7 +3,7 @@
singular_name = "light floor tile"
desc = "A floor tile, made out of glass. It produces light."
icon_state = "tile_e"
flags = CONDUCT
flags_1 = CONDUCT_1
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
turf_type = /turf/open/floor/light
var/state = 0
code/game/objects/items/stacks/tiles/tile_types.dm
+1 -1
View File
@@ -211,7 +211,7 @@
force = 6
materials = list(MAT_METAL=500)
throwforce = 10
flags = CONDUCT
flags_1 = CONDUCT_1
turf_type = /turf/open/floor/plasteel
mineralType = "metal"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70)
code/game/objects/items/stacks/wrap.dm.rej
+19
View File
@@ -0,0 +1,19 @@
diff a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm (rejected hunks)
@@ -9,7 +9,7 @@
desc = "Wrap packages with this festive paper to make gifts."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "wrap_paper"
- flags = NOBLUDGEON
+ flags_1 = NOBLUDGEON_1
amount = 25
max_amount = 25
resistance_flags = FLAMMABLE
@@ -30,7 +30,7 @@
desc = "You can use this to wrap items in."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "deliveryPaper"
- flags = NOBLUDGEON
+ flags_1 = NOBLUDGEON_1
amount = 25
max_amount = 25
resistance_flags = FLAMMABLE