Revert "12/21 modernizations from TG live"

This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
+18 -17
View File
@@ -2,8 +2,11 @@
icon = 'icons/turf/space.dmi'
icon_state = "0"
name = "\proper space"
desc = "A vast, cold, and lonely place."
intact = 0
plane = PLANE_SPACE_BACKGROUND
temperature = TCMB
thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
heat_capacity = 700000
@@ -13,11 +16,18 @@
var/destination_y
var/global/datum/gas_mixture/space/space_gas = new
plane = PLANE_SPACE
light_power = 0.25
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/turf/open/space/New()
icon_state = SPACE_ICON_STATE
update_icon()
air = space_gas
var/image/I = image('icons/turf/space_parallax1.dmi',"[icon_state]")
I.plane = PLANE_SPACE_DUST
I.alpha = 80
I.blend_mode = BLEND_ADD
overlays += I
/turf/open/space/Destroy(force)
if(force)
@@ -38,12 +48,9 @@
/turf/open/space/TakeTemperature(temp)
/turf/open/space/RemoveLattice()
return
/turf/open/space/AfterChange()
..()
atmos_overlay_types = null
atmos_overlay_types.Cut()
/turf/open/space/Assimilate_Air()
return
@@ -51,13 +58,12 @@
/turf/open/space/proc/update_starlight()
if(config.starlight)
for(var/t in RANGE_TURFS(1,src)) //RANGE_TURFS is in code\__HELPERS\game.dm
if(isspaceturf(t))
if(istype(t, /turf/open/space))
//let's NOT update this that much pls
continue
SetLuminosity(4,5)
light.mode = LIGHTING_STARLIGHT
set_light(2)
return
SetLuminosity(0)
set_light(0)
/turf/open/space/attack_paw(mob/user)
return src.attack_hand(user)
@@ -169,10 +175,5 @@
return 1
return 0
/turf/open/space/is_transition_turf()
if(destination_x || destination_y || destination_z)
return 1
/turf/open/space/acid_act(acidpwr, acid_volume)
return 0
/turf/open/space/proc/update_icon()
icon_state = SPACE_ICON_STATE
+7 -23
View File
@@ -2,28 +2,13 @@
icon_state = "black"
dir = SOUTH
baseturf = /turf/open/space/transit
flags = NOJAUNT //This line goes out to every wizard that ever managed to escape the den. I'm sorry.
/turf/open/space/transit/south
dir = SOUTH
/turf/open/space/transit/north
dir = NORTH
plane = PLANE_TURF
/turf/open/space/transit/horizontal
dir = WEST
/turf/open/space/transit/west
dir = WEST
/turf/open/space/transit/east
dir = EAST
/turf/open/space/transit/Entered(atom/movable/AM, atom/OldLoc)
throw_atom(AM)
/turf/open/space/transit/proc/throw_atom(atom/movable/AM)
if(!AM || istype(AM, /obj/docking_port))
if(!AM)
return
var/max = world.maxx-TRANSITIONEDGE
var/min = 1+TRANSITIONEDGE
@@ -57,19 +42,18 @@
AM.loc = T
AM.newtonian_move(dir)
//Overwrite because we dont want people building rods in space.
/turf/open/space/transit/attackby()
return
/turf/open/space/transit/New()
..()
update_icon()
for(var/atom/movable/AM in src)
throw_atom(AM)
..()
/turf/open/space/transit/proc/update_icon()
/turf/open/space/transit/update_icon()
var/p = 9
var/angle = 0
var/state = 1