cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 08:36:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Scopes NODECONSTRUCT_1 from flags_1 to obj_flags [MDB IGNORE] (#25496)

Browse Source 
* Scopes `NODECONSTRUCT_1` from `flags_1` to `obj_flags`

* Update bitfields.dm

* Modular

* Update rack.dm

---------

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-12-09 05:24:46 +01:00
committed by GitHub
parent 62616edede
commit 41ea46d5f2
142 changed files with 238 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/item/computer.dm
+1 -1
View File
@@ -839,7 +839,7 @@
/obj/item/modular_computer/deconstruct(disassembled = TRUE)
remove_pai()
eject_aicard()
if(!(flags_1 & NODECONSTRUCT_1))
if(!(obj_flags & NO_DECONSTRUCTION))
if (disassembled)
internal_cell?.forceMove(drop_location())
computer_id_slot?.forceMove(drop_location())
code/modules/modular_computers/computers/machinery/modular_computer.dm
+1 -1
View File
@@ -134,7 +134,7 @@
return ..()
/obj/machinery/modular_computer/attackby(obj/item/W as obj, mob/living/user)
if (cpu && !user.combat_mode && !(flags_1 & NODECONSTRUCT_1))
if (cpu && !user.combat_mode && !(obj_flags & NO_DECONSTRUCTION))
return cpu.attackby(W, user)
return ..()