mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 21:12:24 +01:00
Split up and rename var/flags (#17794)
* Split up and rename `var/flags` * Various fixes * CL * Don't rename Phoron Guard phoron preset --------- Co-authored-by: Cody Brittain <cbrittain10@live.com>
This commit is contained in:
co-authored by
Cody Brittain
parent
4b9303a1e9
commit
06601c9ec3
@@ -3,7 +3,7 @@
|
||||
desc = "A small electronic device that should never exist."
|
||||
icon = 'icons/obj/assemblies/new_assemblies.dmi'
|
||||
icon_state = ""
|
||||
flags = CONDUCT
|
||||
obj_flags = OBJ_FLAG_CONDUCTABLE
|
||||
w_class = ITEMSIZE_SMALL
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 100)
|
||||
recyclable = TRUE
|
||||
|
||||
@@ -6,7 +6,8 @@
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
throw_speed = 2
|
||||
throw_range = 4
|
||||
flags = CONDUCT | PROXMOVE
|
||||
obj_flags = OBJ_FLAG_CONDUCTABLE
|
||||
movable_flags = MOVABLE_FLAG_PROXMOVE
|
||||
var/status = FALSE // FALSE - not readied // TRUE - bomb finished with welder
|
||||
var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device
|
||||
var/obj/item/tank/bombtank = null //the second part of the bomb is a phoron tank
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
icon = 'icons/obj/assemblies/new_assemblies.dmi'
|
||||
icon_state = "holder"
|
||||
item_state = "assembly"
|
||||
flags = CONDUCT | PROXMOVE
|
||||
obj_flags = OBJ_FLAG_CONDUCTABLE
|
||||
movable_flags = MOVABLE_FLAG_PROXMOVE
|
||||
throwforce = 5
|
||||
w_class = ITEMSIZE_SMALL
|
||||
throw_speed = 3
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
triggered(AM)
|
||||
else if(ishuman(AM))
|
||||
var/mob/living/carbon/human/H = AM
|
||||
if(!(H.shoes?.item_flags & LIGHTSTEP))
|
||||
if(!(H.shoes?.item_flags & ITEM_FLAG_LIGHT_STEP))
|
||||
triggered(H)
|
||||
H.visible_message(SPAN_WARNING("\The [H] accidentally steps on \the [src]."), SPAN_WARNING("You accidentally step on \the [src]."))
|
||||
else if(isliving(AM))
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
pickup_sound = 'sound/items/pickup/component.ogg'
|
||||
origin_tech = list(TECH_MAGNET = 1)
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 800, MATERIAL_GLASS = 200)
|
||||
flags = PROXMOVE
|
||||
movable_flags = MOVABLE_FLAG_PROXMOVE
|
||||
wires = WIRE_PULSE
|
||||
|
||||
secured = FALSE
|
||||
|
||||
Reference in New Issue
Block a user