End game turf changes now simply alters color.

This commit is contained in:
PsiOmega
2015-05-29 23:38:09 +02:00
parent d7ae2222c0
commit bf27545841
7 changed files with 20 additions and 7660 deletions

View File

@@ -33,12 +33,11 @@ In short:
/datum/universal_state/hell/OnTurfChange(var/turf/T) /datum/universal_state/hell/OnTurfChange(var/turf/T)
if(istype(T, /turf/space)) var/turf/space/S = T
T.color = "#FF0000" if(istype(S))
T.set_light(2, 2, "#FF0000") S.color = "#FF0000"
else else
T.color = initial(T.color) S.color = initial(S.color)
T.set_light(0)
// Apply changes when entering state // Apply changes when entering state
/datum/universal_state/hell/OnEnter() /datum/universal_state/hell/OnEnter()
@@ -70,8 +69,7 @@ In short:
L.update_lumcount(1, 0, 0) L.update_lumcount(1, 0, 0)
for(var/turf/space/T in turfs) for(var/turf/space/T in turfs)
T.color = "#FF0000" OnTurfChange(T)
T.set_light(2, 2, "#FF0000")
/datum/universal_state/hell/proc/MiscSet() /datum/universal_state/hell/proc/MiscSet()
for(var/turf/simulated/floor/T in turfs) for(var/turf/simulated/floor/T in turfs)

View File

@@ -38,7 +38,7 @@ var/global/list/narsie_list = list()
current_size = 12 current_size = 12
consume_range = 12 // How many tiles out do we eat. consume_range = 12 // How many tiles out do we eat.
var/announce=1 var/announce=1
var/narnar = 1 var/cause_hell = 1
/obj/singularity/narsie/large/New() /obj/singularity/narsie/large/New()
..() ..()
@@ -49,7 +49,7 @@ var/global/list/narsie_list = list()
narsie_spawn_animation() narsie_spawn_animation()
if(!narsie_cometh)//so we don't initiate Hell more than one time. if(!narsie_cometh)//so we don't initiate Hell more than one time.
if(narnar) if(cause_hell)
SetUniversalState(/datum/universal_state/hell) SetUniversalState(/datum/universal_state/hell)
narsie_cometh = 1 narsie_cometh = 1
@@ -86,14 +86,14 @@ var/global/list/narsie_list = list()
/obj/singularity/narsie/large/Bump(atom/A) /obj/singularity/narsie/large/Bump(atom/A)
if(!narnar) return if(!cause_hell) return
if(isturf(A)) if(isturf(A))
narsiewall(A) narsiewall(A)
else if(istype(A, /obj/structure/cult)) else if(istype(A, /obj/structure/cult))
qdel(A) qdel(A)
/obj/singularity/narsie/large/Bumped(atom/A) /obj/singularity/narsie/large/Bumped(atom/A)
if(!narnar) return if(!cause_hell) return
if(isturf(A)) if(isturf(A))
narsiewall(A) narsiewall(A)
else if(istype(A, /obj/structure/cult)) else if(istype(A, /obj/structure/cult))

View File

@@ -8,7 +8,7 @@
move_self = 0 move_self = 0
announce=0 announce=0
narnar=0 cause_hell=0
layer=LIGHTING_LAYER+2 // ITS SO BRIGHT layer=LIGHTING_LAYER+2 // ITS SO BRIGHT

View File

@@ -13,13 +13,11 @@ var/global/universe_has_ended = 0
return 0 return 0
/datum/universal_state/supermatter_cascade/OnTurfChange(var/turf/T) /datum/universal_state/supermatter_cascade/OnTurfChange(var/turf/T)
if(istype(T, /turf/space)) var/turf/space/S = T
T.color = "#0066FF" if(istype(S))
T.set_light(2, 2, "#0066FF") S.color = "#0066FF"
else else
T.color = initial(T.color) S.color = initial(S.color)
T.set_light(0)
/datum/universal_state/supermatter_cascade/DecayTurf(var/turf/T) /datum/universal_state/supermatter_cascade/DecayTurf(var/turf/T)
if(istype(T,/turf/simulated/wall)) if(istype(T,/turf/simulated/wall))
@@ -103,8 +101,7 @@ The access requirements on the Asteroid Shuttles' consoles have now been revoked
L.update_lumcount(0.0, 0.4, 1) L.update_lumcount(0.0, 0.4, 1)
for(var/turf/space/T in turfs) for(var/turf/space/T in turfs)
T.color = "#0066FF" OnTurfChange(T)
T.set_light(2, 2, "#0066FF")
/datum/universal_state/supermatter_cascade/proc/MiscSet() /datum/universal_state/supermatter_cascade/proc/MiscSet()
for (var/obj/machinery/firealarm/alm in machines) for (var/obj/machinery/firealarm/alm in machines)

View File

@@ -2270,14 +2270,14 @@
if("hellonearth") if("hellonearth")
feedback_inc("admin_secrets_fun_used",1) feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","NS") feedback_add_details("admin_secrets_fun_used","NS")
var/choice = input("You sure you want to end the round and summon narsie at your location? Misuse of this could result in removal of flags or halarity.") in list("PRAISE SATAN", "Cancel") var/choice = input("You sure you want to end the round and summon narsie at your location? Misuse of this could result in removal of flags or hilarity.") in list("PRAISE SATAN", "Cancel")
if(choice == "PRAISE SATAN") if(choice == "PRAISE SATAN")
new /obj/singularity/narsie/large(get_turf(usr)) new /obj/singularity/narsie/large(get_turf(usr))
message_admins("[key_name_admin(usr)] has summoned narsie and brought about a new realm of suffering.") message_admins("[key_name_admin(usr)] has summoned narsie and brought about a new realm of suffering.")
if("supermattercascade") if("supermattercascade")
feedback_inc("admin_secrets_fun_used",1) feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","SC") feedback_add_details("admin_secrets_fun_used","SC")
var/choice = input("You sure you want to destroy the universe and create a large explosion at your location? Misuse of this could result in removal of flags or halarity.") in list("NO TIME TO EXPLAIN", "Cancel") var/choice = input("You sure you want to destroy the universe and create a large explosion at your location? Misuse of this could result in removal of flags or hilarity.") in list("NO TIME TO EXPLAIN", "Cancel")
if(choice == "NO TIME TO EXPLAIN") if(choice == "NO TIME TO EXPLAIN")
explosion(get_turf(usr), 8, 16, 24, 32, 1) explosion(get_turf(usr), 8, 16, 24, 32, 1)
new /turf/unsimulated/wall/supermatter(get_turf(usr)) new /turf/unsimulated/wall/supermatter(get_turf(usr))

View File

@@ -78,6 +78,9 @@
return 5000 return 5000
/obj/machinery/power/supermatter/singularity_act() /obj/machinery/power/supermatter/singularity_act()
if(!src.loc)
return
var/prints = "" var/prints = ""
if(src.fingerprintshidden) if(src.fingerprintshidden)
prints = ", all touchers : " + src.fingerprintshidden prints = ", all touchers : " + src.fingerprintshidden

File diff suppressed because it is too large Load Diff