mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 01:49:19 +00:00
Reebe is fancier now
This commit is contained in:
committed by
CitadelStationBot
parent
d25894447e
commit
e4b4860e44
65838
_maps/map_files/generic/City_of_Cogs.dmm
Normal file
65838
_maps/map_files/generic/City_of_Cogs.dmm
Normal file
File diff suppressed because it is too large
Load Diff
@@ -7,6 +7,8 @@
|
||||
#define PLANE_SPACE_PARALLAX -90
|
||||
|
||||
#define GAME_PLANE 0
|
||||
#define SPACE_LAYER 1.8
|
||||
#define ABOVE_SPACE_LAYER 1.9
|
||||
//#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define
|
||||
#define MID_TURF_LAYER 2.02
|
||||
#define HIGH_TURF_LAYER 2.03
|
||||
|
||||
@@ -26,12 +26,11 @@
|
||||
return
|
||||
|
||||
/obj/structure/lattice/ratvar_act()
|
||||
if(IsEven(x + y))
|
||||
new /obj/structure/lattice/clockwork(loc)
|
||||
else
|
||||
new /obj/structure/lattice/clockwork/large(loc)
|
||||
new /obj/structure/lattice/clockwork(loc)
|
||||
|
||||
/obj/structure/lattice/attackby(obj/item/C, mob/user, params)
|
||||
if(resistance_flags & INDESTRUCTIBLE)
|
||||
return
|
||||
if(istype(C, /obj/item/wirecutters))
|
||||
to_chat(user, "<span class='notice'>Slicing [name] joints ...</span>")
|
||||
deconstruct()
|
||||
@@ -45,7 +44,6 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/lattice/singularity_pull(S, current_size)
|
||||
..()
|
||||
if(current_size >= STAGE_FOUR)
|
||||
deconstruct()
|
||||
|
||||
@@ -55,22 +53,22 @@
|
||||
icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
|
||||
|
||||
/obj/structure/lattice/clockwork/Initialize(mapload)
|
||||
canSmoothWith += /turf/open/indestructible/clock_spawn_room //list overrides are a terrible thing
|
||||
. = ..()
|
||||
ratvar_act()
|
||||
if(z == ZLEVEL_CITYOFCOGS)
|
||||
resistance_flags |= INDESTRUCTIBLE
|
||||
|
||||
/obj/structure/lattice/clockwork/ratvar_act()
|
||||
if(IsOdd(x+y))
|
||||
new /obj/structure/lattice/clockwork/large(loc) // deletes old one
|
||||
|
||||
/obj/structure/lattice/clockwork/large/Initialize(mapload)
|
||||
. = ..()
|
||||
icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi'
|
||||
pixel_x = -9
|
||||
pixel_y = -9
|
||||
|
||||
/obj/structure/lattice/clockwork/large/ratvar_act()
|
||||
if(IsEven(x + y))
|
||||
new /obj/structure/lattice/clockwork(loc)
|
||||
icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi'
|
||||
pixel_x = -9
|
||||
pixel_y = -9
|
||||
else
|
||||
icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
|
||||
pixel_x = 0
|
||||
pixel_y = 0
|
||||
return TRUE
|
||||
|
||||
/obj/structure/lattice/catwalk
|
||||
name = "catwalk"
|
||||
@@ -99,11 +97,29 @@
|
||||
/obj/structure/lattice/catwalk/clockwork
|
||||
name = "clockwork catwalk"
|
||||
icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
|
||||
canSmoothWith = list(/obj/structure/lattice,
|
||||
/turf/open/floor,
|
||||
/turf/open/indestructible/clock_spawn_room,
|
||||
/turf/closed/wall,
|
||||
/obj/structure/falsewall)
|
||||
smooth = SMOOTH_MORE
|
||||
|
||||
/obj/structure/lattice/catwalk/clockwork/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/effect/temp_visual/ratvar/floor/catwalk(loc)
|
||||
new /obj/effect/temp_visual/ratvar/beam/catwalk(loc)
|
||||
ratvar_act()
|
||||
if(!mapload)
|
||||
new /obj/effect/temp_visual/ratvar/floor/catwalk(loc)
|
||||
new /obj/effect/temp_visual/ratvar/beam/catwalk(loc)
|
||||
if(z == ZLEVEL_CITYOFCOGS)
|
||||
resistance_flags |= INDESTRUCTIBLE
|
||||
|
||||
/obj/structure/lattice/catwalk/clockwork/ratvar_act()
|
||||
return
|
||||
if(IsOdd(x+y))
|
||||
icon = 'icons/obj/smooth_structures/catwalk_clockwork_large.dmi'
|
||||
pixel_x = -9
|
||||
pixel_y = -9
|
||||
else
|
||||
icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
|
||||
pixel_x = 0
|
||||
pixel_y = 0
|
||||
return TRUE
|
||||
|
||||
@@ -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
code/game/turfs/simulated/reebe_void.dm
Normal file
47
code/game/turfs/simulated/reebe_void.dm
Normal 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
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
var/global/datum/gas_mixture/immutable/space/space_gas = new
|
||||
plane = PLANE_SPACE
|
||||
layer = SPACE_LAYER
|
||||
light_power = 0.25
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.4 KiB |
BIN
icons/obj/smooth_structures/catwalk_clockwork_large.dmi
Normal file
BIN
icons/obj/smooth_structures/catwalk_clockwork_large.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
@@ -1030,6 +1030,7 @@
|
||||
#include "code\game\turfs\simulated\floor.dm"
|
||||
#include "code\game\turfs\simulated\lava.dm"
|
||||
#include "code\game\turfs\simulated\minerals.dm"
|
||||
#include "code\game\turfs\simulated\reebe_void.dm"
|
||||
#include "code\game\turfs\simulated\river.dm"
|
||||
#include "code\game\turfs\simulated\walls.dm"
|
||||
#include "code\game\turfs\simulated\water.dm"
|
||||
|
||||
Reference in New Issue
Block a user