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/research/circuitprinter.dm
+1 -1
View File
@@ -8,7 +8,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
name = "circuit imprinter"
desc = "Manufactures circuit boards for the construction of machines."
icon_state = "circuit_imprinter"
container_type = OPENCONTAINER_1
container_type = OPENCONTAINER
circuit = /obj/item/weapon/circuitboard/machine/circuit_imprinter
var/datum/material_container/materials
code/modules/research/circuitprinter.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm (rejected hunks)
@@ -8,7 +8,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
name = "circuit imprinter"
desc = "Manufactures circuit boards for the construction of machines."
icon_state = "circuit_imprinter"
- container_type = OPENCONTAINER
+ container_type = OPENCONTAINER_1
circuit = /obj/item/circuitboard/machine/circuit_imprinter
var/datum/material_container/materials
code/modules/research/protolathe.dm
+1 -1
View File
@@ -11,7 +11,7 @@ Note: Must be placed west/left of and R&D console to function.
name = "protolathe"
desc = "Converts raw materials into useful objects."
icon_state = "protolathe"
container_type = OPENCONTAINER_1
container_type = OPENCONTAINER
circuit = /obj/item/weapon/circuitboard/machine/protolathe
var/datum/material_container/materials
code/modules/research/protolathe.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm (rejected hunks)
@@ -11,7 +11,7 @@ Note: Must be placed west/left of and R&D console to function.
name = "protolathe"
desc = "Converts raw materials into useful objects."
icon_state = "protolathe"
- container_type = OPENCONTAINER
+ container_type = OPENCONTAINER_1
circuit = /obj/item/circuitboard/machine/protolathe
var/datum/material_container/materials
code/modules/research/xenobiology/xenobiology.dm
+9 -9
View File
@@ -12,7 +12,7 @@
throw_speed = 3
throw_range = 6
origin_tech = "biotech=3"
container_type = INJECTABLE_1
container_type = INJECTABLE
var/Uses = 1 // uses before it goes inert
var/qdel_timer = null // deletion timer, for delayed reactions
@@ -419,7 +419,7 @@
icon_state = "golem"
item_state = "golem"
item_color = "golem"
flags_1 = ABSTRACT_1 | NODROP_1
flags = ABSTRACT | NODROP
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
has_sensor = NO_SENSORS
@@ -434,7 +434,7 @@
body_parts_covered = FULL_BODY
flags_inv = HIDEGLOVES | HIDESHOES | HIDEJUMPSUIT
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags_1 = ABSTRACT_1 | NODROP_1
flags = ABSTRACT | NODROP
/obj/item/clothing/shoes/golem
name = "golem's feet"
@@ -442,7 +442,7 @@
icon_state = "golem"
item_state = null
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags_1 = NOSLIP_1 | ABSTRACT_1 | NODROP_1
flags = NOSLIP | ABSTRACT | NODROP
/obj/item/clothing/mask/breath/golem
@@ -452,7 +452,7 @@
item_state = "golem"
siemens_coefficient = 0
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags_1 = ABSTRACT_1 | NODROP_1
flags = ABSTRACT | NODROP
/obj/item/clothing/gloves/golem
@@ -461,7 +461,7 @@
icon_state = "golem"
item_state = null
siemens_coefficient = 0
flags_1 = ABSTRACT_1 | NODROP_1
flags = ABSTRACT | NODROP
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -472,7 +472,7 @@
name = "golem's head"
desc = "a golem's head"
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags_1 = ABSTRACT_1 | NODROP_1
flags = ABSTRACT | NODROP
/obj/effect/golemrune
anchored = TRUE
@@ -632,7 +632,7 @@
throwforce = 10
throw_speed = 3
throw_range = 7
flags_1 = CONDUCT_1
flags = CONDUCT
max_amount = 60
turf_type = /turf/open/floor/bluespace
@@ -648,7 +648,7 @@
throwforce = 10
throw_speed = 3
throw_range = 7
flags_1 = CONDUCT_1
flags = CONDUCT
max_amount = 60
turf_type = /turf/open/floor/sepia