April sync (#360)
* Maps and things no code/icons * helpers defines globalvars * Onclick world.dm orphaned_procs * subsystems Round vote and shuttle autocall done here too * datums * Game folder * Admin - chatter modules * clothing - mining * modular computers - zambies * client * mob level 1 * mob stage 2 + simple_animal * silicons n brains * mob stage 3 + Alien/Monkey * human mobs * icons updated * some sounds * emitter y u no commit * update tgstation.dme * compile fixes * travis fixes Also removes Fast digest mode, because reasons. * tweaks for travis Mentors are broke again Also fixes Sizeray guns * oxygen loss fix for vore code. * removes unused code * some code updates * bulk fixes * further fixes * outside things * whoops. * Maint bar ported * GLOBs.
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
obj_integrity = 50
|
||||
max_integrity = 50
|
||||
layer = LATTICE_LAYER //under pipes
|
||||
var/obj/item/stack/rods/stored
|
||||
var/number_of_rods = 1
|
||||
canSmoothWith = list(/obj/structure/lattice,
|
||||
/turf/open/floor,
|
||||
/turf/closed/wall,
|
||||
@@ -17,26 +17,20 @@
|
||||
smooth = SMOOTH_MORE
|
||||
// flags = CONDUCT
|
||||
|
||||
/obj/structure/lattice/New()
|
||||
/obj/structure/lattice/Initialize(mapload)
|
||||
..()
|
||||
for(var/obj/structure/lattice/LAT in src.loc)
|
||||
for(var/obj/structure/lattice/LAT in loc)
|
||||
if(LAT != src)
|
||||
qdel(LAT)
|
||||
stored = new/obj/item/stack/rods(src)
|
||||
|
||||
/obj/structure/lattice/Destroy()
|
||||
qdel(stored)
|
||||
stored = null
|
||||
return ..()
|
||||
QDEL_IN(LAT, 0)
|
||||
|
||||
/obj/structure/lattice/blob_act(obj/structure/blob/B)
|
||||
return
|
||||
|
||||
/obj/structure/lattice/ratvar_act()
|
||||
if(IsEven(x + y))
|
||||
new/obj/structure/lattice/clockwork(loc)
|
||||
new /obj/structure/lattice/clockwork(loc)
|
||||
else
|
||||
new/obj/structure/lattice/clockwork/large(loc)
|
||||
new /obj/structure/lattice/clockwork/large(loc)
|
||||
|
||||
/obj/structure/lattice/attackby(obj/item/C, mob/user, params)
|
||||
if(istype(C, /obj/item/weapon/wirecutters))
|
||||
@@ -48,8 +42,7 @@
|
||||
|
||||
/obj/structure/lattice/deconstruct(disassembled = TRUE)
|
||||
if(!(flags & NODECONSTRUCT))
|
||||
stored.forceMove(get_turf(src))
|
||||
stored = null
|
||||
new /obj/item/stack/rods(get_turf(src), number_of_rods)
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/lattice/singularity_pull(S, current_size)
|
||||
@@ -61,15 +54,15 @@
|
||||
desc = "A lightweight support lattice. These hold the Justicar's station together."
|
||||
icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
|
||||
|
||||
/obj/structure/lattice/clockwork/New()
|
||||
/obj/structure/lattice/clockwork/Initialize(mapload)
|
||||
..()
|
||||
ratvar_act()
|
||||
|
||||
/obj/structure/lattice/clockwork/ratvar_act()
|
||||
if(IsOdd(x+y))
|
||||
new/obj/structure/lattice/clockwork/large(loc)
|
||||
new /obj/structure/lattice/clockwork/large(loc) // deletes old one
|
||||
|
||||
/obj/structure/lattice/clockwork/large/New()
|
||||
/obj/structure/lattice/clockwork/large/Initialize(mapload)
|
||||
..()
|
||||
icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi'
|
||||
pixel_x = -9
|
||||
@@ -77,23 +70,19 @@
|
||||
|
||||
/obj/structure/lattice/clockwork/large/ratvar_act()
|
||||
if(IsEven(x + y))
|
||||
new/obj/structure/lattice/clockwork(loc)
|
||||
new /obj/structure/lattice/clockwork(loc)
|
||||
|
||||
/obj/structure/lattice/catwalk
|
||||
name = "catwalk"
|
||||
desc = "A catwalk for easier EVA maneuvering and cable placement."
|
||||
icon = 'icons/obj/smooth_structures/catwalk.dmi'
|
||||
icon_state = "catwalk"
|
||||
number_of_rods = 2
|
||||
smooth = SMOOTH_TRUE
|
||||
canSmoothWith = null
|
||||
|
||||
/obj/structure/lattice/catwalk/New()
|
||||
..()
|
||||
stored.amount++
|
||||
stored.update_icon()
|
||||
|
||||
/obj/structure/lattice/catwalk/ratvar_act()
|
||||
new/obj/structure/lattice/catwalk/clockwork(loc)
|
||||
new /obj/structure/lattice/catwalk/clockwork(loc)
|
||||
|
||||
/obj/structure/lattice/catwalk/Move()
|
||||
var/turf/T = loc
|
||||
@@ -111,7 +100,7 @@
|
||||
name = "clockwork catwalk"
|
||||
icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
|
||||
|
||||
/obj/structure/lattice/catwalk/clockwork/New()
|
||||
/obj/structure/lattice/catwalk/clockwork/Initialize(mapload)
|
||||
..()
|
||||
new /obj/effect/overlay/temp/ratvar/floor/catwalk(loc)
|
||||
new /obj/effect/overlay/temp/ratvar/beam/catwalk(loc)
|
||||
|
||||
Reference in New Issue
Block a user