cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] clean up flags (Requires #11623 Merged First) (#11637)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-14 11:19:32 -07:00
committed by GitHub
parent b549e3bb9c
commit ba1065b92e
49 changed files with 122 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/contraband.dm
View File

@@ -16,7 +16,7 @@
starts_with = list(/obj/item/reagent_containers/pill/zoom = 7)
/obj/item/reagent_containers/glass/beaker/vial/random
flags = 0
flags = NONE
var/list/random_reagent_list = list(list(REAGENT_ID_WATER = 15) = 1, list(REAGENT_ID_CLEANER = 15) = 1)
/obj/item/reagent_containers/glass/beaker/vial/random/toxin

12
code/game/objects/items/stacks/tiles/tile_types.dm
View File

@@ -82,7 +82,7 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
flags = NONE
origin_tech = list(TECH_BIO = 1)
no_variants = FALSE
drop_sound = 'sound/items/drop/herb.ogg'
@@ -116,7 +116,7 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
flags = NONE
no_variants = FALSE
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
@@ -164,7 +164,7 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
flags = NONE
no_variants = FALSE
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
@@ -344,7 +344,7 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
flags = NONE
no_variants = FALSE
can_weld = FALSE
@@ -357,7 +357,7 @@
throwforce = 15.0
throw_speed = 5
throw_range = 20
flags = 0
flags = NONE
no_variants = FALSE
can_weld = TRUE
welds_into = /obj/item/stack/material/marble
@@ -371,7 +371,7 @@
throwforce = 15.0
throw_speed = 5
throw_range = 20
flags = 0
flags = NONE
no_variants = FALSE
can_weld = TRUE
welds_into = /obj/item/stack/material/marble

2
code/game/objects/structures/ledges.dm
View File

@@ -16,7 +16,7 @@
/obj/structure/ledge_corner
icon_state = "ledge-corner"
flags = 0
flags = NONE
name = "rock ledge"
desc = "An easily scaleable rocky ledge."
icon = 'icons/obj/ledges.dmi'

2
code/game/objects/structures/low_wall.dm
View File

@@ -397,7 +397,7 @@
icon_state = "preview_glass"
basestate = "window"
alpha = 180
flags = 0
flags = NONE
fulltile = TRUE
maxhealth = 24
glasstype = /obj/item/stack/material/glass

12
code/game/objects/structures/window.dm
View File

@@ -448,7 +448,7 @@
icon_state = "[basestate]"
return
else
flags = 0 // Removes ON_BORDER and OPPOSITE_OPACITY
flags = NONE // Removes ON_BORDER and OPPOSITE_OPACITY
var/list/dirs = list()
if(anchored)
for(var/obj/structure/window/W in orange(src,1))
@@ -494,7 +494,7 @@
icon_state = "window-full"
maxhealth = 24
fulltile = TRUE
flags = 0
flags = NONE
/obj/structure/window/phoronbasic
name = "phoron window"
@@ -512,7 +512,7 @@
icon_state = "phoronwindow-full"
maxhealth = 80
fulltile = TRUE
flags = 0
flags = NONE
/obj/structure/window/phoronreinforced
name = "reinforced borosilicate window"
@@ -531,7 +531,7 @@
icon_state = "phoronrwindow-full"
maxhealth = 160
fulltile = TRUE
flags = 0
flags = NONE
/obj/structure/window/reinforced
name = "reinforced window"
@@ -549,7 +549,7 @@
icon_state = "rwindow-full"
maxhealth = 80
fulltile = TRUE
flags = 0
flags = NONE
/obj/structure/window/reinforced/tinted
name = "tinted window"
@@ -587,7 +587,7 @@
icon_state = "rwindow-full"
maxhealth = 80
fulltile = TRUE
flags = 0
flags = NONE
/obj/structure/window/reinforced/polarized/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/multitool) && !anchored) // Only allow programming if unanchored!