ok this is going to be a pain in the ass ain't it (#2458)

lets hope nothing blows up this time (Flags PR but it works!)
This commit is contained in:
kevinz000
2017-08-22 05:01:38 -07:00
committed by GitHub
parent 6a309b5996
commit 35b7b93b24
535 changed files with 2471 additions and 1486 deletions
+1 -1
View File
@@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list("tag","area","type","loc","locs",
M.power_change()
if(holoitem)
SET_SECONDARY_FLAG(O, HOLOGRAM)
O.flags_2 |= HOLOGRAM_2
return O
+4 -4
View File
@@ -247,9 +247,9 @@
// this is an exercise left to others I'm afraid. -Sayu
spawned = A.copy_contents_to(linked, 1, nerf_weapons = !emagged)
for(var/obj/machinery/M in spawned)
M.flags |= NODECONSTRUCT
M.flags_1 |= NODECONSTRUCT_1
for(var/obj/structure/S in spawned)
S.flags |= NODECONSTRUCT
S.flags_1 |= NODECONSTRUCT_1
effects = list()
addtimer(CALLBACK(src, .proc/finish_spawn), 30)
@@ -264,9 +264,9 @@
spawned += x // holocarp are not forever
added += x
for(var/obj/machinery/M in added)
M.flags |= NODECONSTRUCT
M.flags_1 |= NODECONSTRUCT_1
for(var/obj/structure/S in added)
S.flags |= NODECONSTRUCT
S.flags_1 |= NODECONSTRUCT_1
/obj/machinery/computer/holodeck/proc/derez(obj/O, silent = TRUE, forced = FALSE)
// Emagging a machine creates an anomaly in the derez systems.
+6 -6
View File
@@ -57,7 +57,7 @@
last_change = world.time
active = (A != offline_program)
use_power = active ? ACTIVE_POWER_USE : IDLE_POWER_USE
use_power = active ? ACTIVE_POWER_USE : IDLE_POWER_USE
for(var/obj/effect/holodeck_effect/HE in effects)
HE.deactivate(src)
@@ -71,9 +71,9 @@
// this is an exercise left to others I'm afraid. -Sayu
spawned = A.copy_contents_to(linked, 1, nerf_weapons = !emagged)
for(var/obj/machinery/M in spawned)
M.flags |= NODECONSTRUCT
M.flags_1 |= NODECONSTRUCT_1
for(var/obj/structure/S in spawned)
S.flags |= NODECONSTRUCT
S.flags_1 |= NODECONSTRUCT_1
effects = list()
spawn(30)
@@ -86,9 +86,9 @@
spawned += x // holocarp are not forever
added += x
for(var/obj/machinery/M in added)
M.flags |= NODECONSTRUCT
M.flags_1 |= NODECONSTRUCT_1
for(var/obj/structure/S in added)
S.flags |= NODECONSTRUCT
S.flags_1 |= NODECONSTRUCT_1
/obj/machinery/computer/holodeck/proc/derez(var/obj/obj, var/silent = 1, var/forced = 0)
// Emagging a machine creates an anomaly in the derez systems.
@@ -108,4 +108,4 @@
if(!silent)
visible_message("The [obj.name] fades away!")
qdel(obj)
qdel(obj)
+1 -1
View File
@@ -204,7 +204,7 @@
eventstarted = TRUE
for(var/obj/structure/window/W in currentarea)
if(W.flags&NODECONSTRUCT) // Just in case: only holo-windows
if(W.flags_1&NODECONSTRUCT_1) // Just in case: only holo-windows
qdel(W)
for(var/mob/M in currentarea)
+1 -1
View File
@@ -3,7 +3,7 @@
thermal_conductivity = 0
broken_states = list("engine")
burnt_states = list("engine")
flags = NONE
flags_1 = NONE
/turf/open/floor/holofloor/attackby(obj/item/I, mob/living/user)
return // HOLOFLOOR DOES NOT GIVE A FUCK