cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split up and rename var/flags (#17794)

Browse Source 
* 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:
Cody Brittain
2023-11-22 16:27:51 +00:00
committed by GitHub
co-authored by Cody Brittain
parent 4b9303a1e9
commit 06601c9ec3
335 changed files with 763 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/rods.dm
+2 -2
View File
@@ -22,7 +22,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list(
Clicking on a floor without any tiles will reinforce the floor. You can make reinforced glass by combining rods and normal glass sheets."
singular_name = "metal rod"
icon_state = "rods"
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
w_class = ITEMSIZE_NORMAL
force = 9.0
throwforce = 15.0
@@ -141,7 +141,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list(
for(var/obj/O in user.loc) //Objects, we don't care about mobs. Turfs are checked elsewhere
if(O.density)
if(!(O.flags & ON_BORDER) || O.dir == user.dir)
if(!(O.atom_flags & ATOM_FLAG_CHECKS_BORDER) || O.dir == user.dir)
return
var/build_stack = amount
code/game/objects/items/stacks/stack.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/obj/item/stack
gender = PLURAL
origin_tech = list(TECH_MATERIAL = 1)
flags = HELDMAPTEXT
item_flags = ITEM_FLAG_HELD_MAP_TEXT
var/list/datum/stack_recipe/recipes
var/singular_name
var/amount = 1
code/game/objects/items/stacks/telecrystal.dm
+1 -1
View File
@@ -9,7 +9,7 @@
icon_state = "telecrystal"
w_class = ITEMSIZE_TINY
max_amount = 50
flags = NOBLUDGEON
item_flags = ITEM_FLAG_NO_BLUDGEON
origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4)
icon_has_variants = TRUE
var/crystal_type = CRYSTAL_TYPE_TELECRYSTAL
code/game/objects/items/stacks/tiles/tile_types.dm
+5 -7
View File
@@ -23,6 +23,8 @@
randpixel = 7
drop_sound = 'sound/items/drop/axe.ogg'
pickup_sound = 'sound/items/pickup/axe.ogg'
item_flags = 0
obj_flags = 0
/obj/item/stack/tile/New()
..()
@@ -40,7 +42,6 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
origin_tech = list(TECH_BIO = 1)
drop_sound = 'sound/items/drop/herb.ogg'
pickup_sound = 'sound/items/pickup/herb.ogg'
@@ -57,7 +58,6 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
@@ -108,7 +108,6 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
@@ -177,7 +176,6 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
matter = list(MATERIAL_PLASTIC = TILE_MATERIAL_AMOUNT)
@@ -200,7 +198,7 @@
throwforce = 15.0
throw_speed = 5
throw_range = 20
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
/obj/item/stack/tile/circuit_green
name = "circuit tile"
@@ -212,7 +210,7 @@
throwforce = 15.0
throw_speed = 5
throw_range = 20
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
/*
* Floors
@@ -228,7 +226,7 @@
throwforce = 6
throw_speed = 5
throw_range = 10
flags = CONDUCT
obj_flags = OBJ_FLAG_CONDUCTABLE
/obj/item/stack/tile/floor/full_stack/Initialize(mapload)
. = ..()