Tg 2 11 sync (#215)

* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes
This commit is contained in:
Poojawa
2017-02-12 03:56:14 -06:00
committed by GitHub
parent 30b3dff395
commit 6674f9fc15
153 changed files with 1651 additions and 1368 deletions
+6 -9
View File
@@ -30,23 +30,20 @@
/turf/closed/indestructible/splashscreen
name = "Space Station 13"
icon = 'icons/misc/fullscreen.dmi'
icon_state = "title1"
icon_state = "title"
layer = FLY_LAYER
var/titlescreen = TITLESCREEN
/turf/closed/indestructible/splashscreen/New()
/turf/closed/indestructible/splashscreen/Initialize()
..()
icon_state = pick("title1","title2","title3","title4","title5")
if(titlescreen)
icon_state = titlescreen
/turf/closed/indestructible/riveted
icon = 'icons/turf/walls/riveted.dmi'
icon_state = "riveted"
smooth = SMOOTH_TRUE
/turf/closed/indestructible/New()
..()
if(smooth)
queue_smooth(src)
/turf/closed/indestructible/riveted/uranium
icon = 'icons/turf/walls/uranium_wall.dmi'
icon_state = "uranium"
@@ -64,7 +61,7 @@
smooth = SMOOTH_TRUE
icon = 'icons/obj/smooth_structures/reinforced_window.dmi'
/turf/closed/indestructible/fakeglass/New()
/turf/closed/indestructible/fakeglass/Initialize()
..()
icon_state = null //set the icon state to null, so our base state isn't visible
var/image/I = image('icons/obj/structures.dmi', loc = src, icon_state = "grille")
+4 -6
View File
@@ -29,22 +29,20 @@
baseturf = /turf/open/indestructible/necropolis
initial_gas_mix = "o2=14;n2=23;TEMP=300"
/turf/open/indestructible/necropolis/New()
/turf/open/indestructible/necropolis/Initialize()
..()
if(prob(12))
icon_state = "necro[rand(2,3)]"
/turf/open/indestructible/necropolis/air
initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
/turf/open/indestructible/hierophant
icon = 'icons/turf/floors/hierophant_floor.dmi'
initial_gas_mix = "o2=14;n2=23;TEMP=300"
baseturf = /turf/open/indestructible/hierophant
smooth = SMOOTH_TRUE
/turf/open/indestructible/hierophant/New()
..()
if(smooth)
queue_smooth(src)
/turf/open/indestructible/hierophant/two
/turf/open/indestructible/paper
+1 -1
View File
@@ -69,7 +69,7 @@
L.adjustBruteLoss(30)
/turf/open/chasm/straight_down/New()
/turf/open/chasm/straight_down/Initialize()
..()
drop_x = x
drop_y = y
+3 -6
View File
@@ -33,7 +33,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
var/list/broken_states
var/list/burnt_states
/turf/open/floor/New()
/turf/open/floor/Initialize(mapload)
if (!broken_states)
broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
if (!burnt_states)
@@ -43,6 +43,8 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
icon_regular_floor = "floor"
else
icon_regular_floor = icon_state
if(mapload)
MakeDirty()
/turf/open/floor/ex_act(severity, target)
var/shielded = is_shielded()
@@ -179,10 +181,5 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
if(.)
ChangeTurf(/turf/open/floor/clockwork)
/turf/open/floor/Initialize(mapload)
..()
if(mapload)
MakeDirty()
/turf/open/floor/acid_melt()
ChangeTurf(baseturf)
@@ -36,10 +36,9 @@
flags = NONE
var/ore_type = /obj/item/weapon/ore/glass
/turf/open/floor/grass/New()
/turf/open/floor/grass/Initialize()
..()
spawn(1)
update_icon()
update_icon()
/turf/open/floor/grass/attackby(obj/item/C, mob/user, params)
if(istype(C, /obj/item/weapon/shovel) && params)
@@ -76,7 +75,7 @@
initial_gas_mix = "o2=14;n2=23;TEMP=300"
slowdown = 0
/turf/open/floor/grass/snow/basalt/New()
/turf/open/floor/grass/snow/basalt/Initialize()
..()
if(prob(15))
icon_state = "basalt[rand(0, 12)]"
@@ -96,10 +95,9 @@
canSmoothWith = null
flags = NONE
/turf/open/floor/carpet/New()
/turf/open/floor/carpet/Initialize()
..()
spawn(1)
update_icon()
update_icon()
/turf/open/floor/carpet/update_icon()
if(!..())
@@ -131,6 +129,6 @@
broken_states = list("damaged")
plane = PLANE_SPACE
/turf/open/floor/fakespace/New()
/turf/open/floor/fakespace/Initialize()
..()
icon_state = "[rand(0,25)]"
@@ -12,7 +12,7 @@
var/can_modify_colour = TRUE
/turf/open/floor/light/New()
/turf/open/floor/light/Initialize()
..()
update_icon()
@@ -16,7 +16,7 @@
/turf/open/floor/mineral/New()
/turf/open/floor/mineral/Initialize()
broken_states = list("[initial(icon_state)]_dam")
..()
if (!icons)
@@ -221,7 +221,7 @@
floor_tile = /obj/item/stack/tile/mineral/abductor
icons = list("alienpod1", "alienpod2", "alienpod3", "alienpod4", "alienpod5", "alienpod6", "alienpod7", "alienpod8", "alienpod9")
/turf/open/floor/mineral/abductor/New()
/turf/open/floor/mineral/abductor/Initialize()
..()
icon_state = "alienpod[rand(1,9)]"
@@ -13,9 +13,9 @@
icon_state = "bcircuit"
floor_tile = /obj/item/stack/tile/plasteel
/turf/open/floor/bluegrid/New()
..()
/turf/open/floor/bluegrid/Initialize()
SSmapping.nuke_tiles += src
..()
/turf/open/floor/bluegrid/Destroy()
SSmapping.nuke_tiles -= src
@@ -67,7 +67,7 @@
icon_state = "plating"
var/obj/effect/clockwork/overlay/floor/realappearence
/turf/open/floor/clockwork/New()
/turf/open/floor/clockwork/Initialize()
..()
new /obj/effect/overlay/temp/ratvar/floor(src)
new /obj/effect/overlay/temp/ratvar/beam(src)
+1 -1
View File
@@ -13,7 +13,7 @@
icon_state = "plating"
intact = 0
/turf/open/floor/plating/New()
/turf/open/floor/plating/Initialize()
if (!broken_states)
broken_states = list("platingdmg1", "platingdmg2", "platingdmg3")
if (!burnt_states)
@@ -15,7 +15,7 @@
var/sand_type = /obj/item/weapon/ore/glass
var/floor_variance = 20 //probability floor has a different icon state
/turf/open/floor/plating/asteroid/New()
/turf/open/floor/plating/asteroid/Initialize()
var/proper_name = name
..()
name = proper_name
@@ -117,7 +117,7 @@
/turf/open/floor/plating/asteroid/basalt/airless
initial_gas_mix = "TEMP=2.7"
/turf/open/floor/plating/asteroid/basalt/New()
/turf/open/floor/plating/asteroid/basalt/Initialize()
..()
switch(icon_state)
if("basalt1", "basalt2", "basalt3") //5 and 9 are too dark to glow and make the amount of glows in tunnels too high
@@ -176,7 +176,7 @@
/turf/open/floor/plating/asteroid/airless/cave/volcanic/has_data //subtype for producing a tunnel with given data
has_data = TRUE
/turf/open/floor/plating/asteroid/airless/cave/New(loc)
/turf/open/floor/plating/asteroid/airless/cave/Initialize()
if (!mob_spawn_list)
mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
if (!megafauna_spawn_list)
@@ -186,7 +186,8 @@
if(!has_data)
produce_tunnel_from_data()
..()
else
..() //do not continue after changeturfing or we will do a double initialize
/turf/open/floor/plating/asteroid/airless/cave/proc/get_cave_data(set_length, exclude_dir = -1)
// If set_length (arg1) isn't defined, get a random length; otherwise assign our length to the length arg.
@@ -7,12 +7,6 @@
baseturf = /turf/open/floor/plating/lava //lava all the way down
slowdown = 2
luminosity = 1
var/static/list/safeties_typecache = list(/obj/structure/lattice/catwalk)
//if anything matching this typecache is found in the lava, we don't burn things
/turf/open/floor/plating/lava/New()
..()
safeties_typecache = typecacheof(safeties_typecache)
/turf/open/floor/plating/lava/ex_act()
return
@@ -51,7 +45,9 @@
/turf/open/floor/plating/lava/proc/is_safe()
var/list/found_safeties = typecache_filter_list(contents, safeties_typecache)
//if anything matching this typecache is found in the lava, we don't burn things
var/static/list/lava_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk))
var/list/found_safeties = typecache_filter_list(contents, lava_safeties_typecache)
return LAZYLEN(found_safeties)
@@ -7,7 +7,7 @@
name = "alien floor"
icon_state = "alienpod1"
/turf/open/floor/plating/abductor/New()
/turf/open/floor/plating/abductor/Initialize()
..()
icon_state = "alienpod[rand(1,9)]"
@@ -41,7 +41,7 @@
initial_gas_mix = "o2=14;n2=23;TEMP=300"
planetary_atmos = TRUE
/turf/open/floor/plating/ashplanet/New()
/turf/open/floor/plating/ashplanet/Initialize()
if(smooth)
pixel_y = -4
pixel_x = -4
@@ -72,7 +72,7 @@
icon_state = "wateryrock"
slowdown = 2
/turf/open/floor/plating/ashplanet/wateryrock/New()
/turf/open/floor/plating/ashplanet/wateryrock/Initialize()
icon_state = "[icon_state][rand(1, 9)]"
..()
@@ -113,7 +113,7 @@
name = "iron sand"
desc = "Like sand, but more <i>metal</i>."
/turf/open/floor/plating/ironsand/New()
/turf/open/floor/plating/ironsand/Initialize()
..()
icon_state = "ironsand[rand(1,15)]"
@@ -106,7 +106,7 @@
icon_state = "plating"
var/obj/effect/clockwork/overlay/floor/bloodcult/realappearence
/turf/open/floor/engine/cult/New()
/turf/open/floor/engine/cult/Initialize()
..()
new /obj/effect/overlay/temp/cult/turf/floor(src)
realappearence = new /obj/effect/clockwork/overlay/floor/bloodcult(src)
+3 -3
View File
@@ -24,7 +24,7 @@
var/scan_state = null //Holder for the image we display when we're pinged by a mining scanner
var/defer_change = 0
/turf/closed/mineral/New()
/turf/closed/mineral/Initialize()
if (!canSmoothWith)
canSmoothWith = list(/turf/closed)
pixel_y = -4
@@ -139,7 +139,7 @@
var/mineralChance = 13
var/display_icon_state = "rock"
/turf/closed/mineral/random/New()
/turf/closed/mineral/random/Initialize()
if (!mineralSpawnChanceList)
mineralSpawnChanceList = list(
/turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10,
@@ -385,7 +385,7 @@
var/activated_name = null
var/activated_image = null
/turf/closed/mineral/gibtonite/New()
/turf/closed/mineral/gibtonite/Initialize()
det_time = rand(8,10) //So you don't know exactly when the hot potato will explode
..()
+2 -2
View File
@@ -8,7 +8,7 @@
sheet_amount = 1
girder_type = /obj/structure/girder/cult
/turf/closed/wall/mineral/cult/New()
/turf/closed/wall/mineral/cult/Initialize()
new /obj/effect/overlay/temp/cult/turf(src)
..()
@@ -50,7 +50,7 @@
var/obj/effect/clockwork/overlay/wall/realappearence
var/obj/structure/destructible/clockwork/cache/linkedcache
/turf/closed/wall/clockwork/New()
/turf/closed/wall/clockwork/Initialize()
..()
new /obj/effect/overlay/temp/ratvar/wall(src)
new /obj/effect/overlay/temp/ratvar/beam(src)
+7 -6
View File
@@ -15,15 +15,16 @@
var/global/datum/gas_mixture/space/space_gas = new
plane = PLANE_SPACE
/turf/open/space/New()
/turf/open/space/Initialize()
icon_state = SPACE_ICON_STATE
air = space_gas
if(initialized)
stack_trace("Warning: [src]([type]) initialized multiple times!")
initialized = TRUE
/turf/open/space/Destroy(force)
if(force)
. = ..()
else
return QDEL_HINT_LETMELIVE
if(requires_activation)
SSair.add_to_active(src)
/turf/open/space/attack_ghost(mob/dead/observer/user)
if(destination_z)
+1 -3
View File
@@ -61,14 +61,12 @@
/turf/open/space/transit/attackby()
return
/turf/open/space/transit/New()
/turf/open/space/transit/Initialize()
..()
update_icon()
for(var/atom/movable/AM in src)
throw_atom(AM)
/turf/open/space/transit/proc/update_icon()
var/p = 9
var/angle = 0
+12 -3
View File
@@ -23,14 +23,17 @@
var/explosion_id = 0
var/list/decals
var/requires_activation //add to air processing after initialize?
/turf/SDQL_update(const/var_name, new_value)
if(var_name == "x" || var_name == "y" || var_name == "z")
return FALSE
. = ..()
/turf/New()
..()
/turf/Initialize()
if(initialized)
stack_trace("Warning: [src]([type]) initialized multiple times!")
initialized = TRUE
levelupdate()
if(smooth)
@@ -40,11 +43,17 @@
for(var/atom/movable/AM in src)
Entered(AM)
if(requires_activation)
CalculateAdjacentTurfs()
SSair.add_to_active(src)
/turf/proc/Initalize_Atmos(times_fired)
CalculateAdjacentTurfs()
/turf/Destroy()
visibilityChanged()
initialized = FALSE
requires_activation = FALSE
..()
return QDEL_HINT_HARDDEL_NOW
@@ -454,4 +463,4 @@
/turf/proc/remove_decal(group)
LAZYINITLIST(decals)
overlays -= decals[group]
decals[group] = null
decals[group] = null