Reebe is fancier now

This commit is contained in:
Joan Lung
2017-09-28 21:59:05 -05:00
committed by CitadelStationBot
parent d25894447e
commit e4b4860e44
10 changed files with 65952 additions and 19 deletions
@@ -142,10 +142,16 @@
name = "clockwork floor"
desc = "Tightly-pressed brass tiles. They emit minute vibration."
icon_state = "plating"
<<<<<<< HEAD
=======
baseturf = /turf/open/floor/clockwork
var/uses_overlay = TRUE
>>>>>>> 5b73196... Reebe is fancier now (#31045)
var/obj/effect/clockwork/overlay/floor/realappearence
/turf/open/floor/clockwork/Initialize()
. = ..()
<<<<<<< HEAD
new /obj/effect/temp_visual/ratvar/floor(src)
new /obj/effect/temp_visual/ratvar/beam(src)
realappearence = new /obj/effect/clockwork/overlay/floor(src)
@@ -158,9 +164,23 @@
if(realappearence)
qdel(realappearence)
realappearence = null
=======
if(uses_overlay)
new /obj/effect/temp_visual/ratvar/floor(src)
new /obj/effect/temp_visual/ratvar/beam(src)
realappearence = new /obj/effect/clockwork/overlay/floor(src)
realappearence.linked = src
/turf/open/floor/clockwork/Destroy()
STOP_PROCESSING(SSobj, src)
if(uses_overlay && realappearence)
QDEL_NULL(realappearence)
>>>>>>> 5b73196... Reebe is fancier now (#31045)
return ..()
/turf/open/floor/clockwork/ReplaceWithLattice()
if(baseturf == type)
return
..()
for(var/obj/structure/lattice/L in src)
L.ratvar_act()
@@ -194,6 +214,8 @@
L.adjustToxLoss(-3, TRUE, TRUE)
/turf/open/floor/clockwork/attackby(obj/item/I, mob/living/user, params)
if(baseturf == type)
return
if(istype(I, /obj/item/crowbar))
user.visible_message("<span class='notice'>[user] begins slowly prying up [src]...</span>", "<span class='notice'>You begin painstakingly prying up [src]...</span>")
playsound(src, I.usesound, 20, 1)
+47
View File
@@ -0,0 +1,47 @@
/turf/open/indestructible/reebe_void
name = "void"
icon_state = "reebemap"
layer = SPACE_LAYER
baseturf = /turf/open/indestructible/reebe_void
planetary_atmos = TRUE
/turf/open/indestructible/reebe_void/Initialize(mapload)
. = ..()
icon_state = "reebegame"
/turf/open/indestructible/reebe_void/spawning
icon_state = "reebespawn"
/turf/open/indestructible/reebe_void/spawning/Initialize(mapload)
. = ..()
if(mapload)
for(var/i in 1 to 3)
if(prob(1))
new /obj/item/clockwork/alloy_shards/large(src)
if(prob(2))
new /obj/item/clockwork/alloy_shards/medium(src)
if(prob(3))
new /obj/item/clockwork/alloy_shards/small(src)
/turf/open/indestructible/reebe_void/spawning/lattices
icon_state = "reebelattice"
/turf/open/indestructible/reebe_void/spawning/lattices/Initialize(mapload)
. = ..()
if(mapload)
if(prob(2.5))
new /obj/structure/lattice/catwalk/clockwork(src)
else if(prob(5))
new /obj/structure/lattice/clockwork(src)
/turf/open/indestructible/reebe_void/Enter(atom/movable/AM, atom/old_loc)
if(!..())
return FALSE
else
if(istype(AM, /obj/structure/window))
return FALSE
if(istype(AM, /obj/item/projectile))
return TRUE
if((locate(/obj/structure/lattice) in src))
return TRUE
return FALSE
@@ -55,6 +55,7 @@
sheet_type = /obj/item/stack/tile/brass
sheet_amount = 1
girder_type = /obj/structure/destructible/clockwork/wall_gear
baseturf = /turf/open/floor/clockwork/reebe
var/obj/effect/clockwork/overlay/wall/realappearence
var/obj/structure/destructible/clockwork/cache/linkedcache
@@ -64,6 +65,7 @@
new /obj/effect/temp_visual/ratvar/beam(src)
realappearence = new /obj/effect/clockwork/overlay/wall(src)
realappearence.linked = src
<<<<<<< HEAD
change_construction_value(5)
/turf/closed/wall/clockwork/examine(mob/user)
@@ -76,6 +78,10 @@
linkedcache.linkedwall = null
linkedcache = null
change_construction_value(-5)
=======
/turf/closed/wall/clockwork/Destroy()
>>>>>>> 5b73196... Reebe is fancier now (#31045)
if(realappearence)
qdel(realappearence)
realappearence = null