shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] More Initialize() fixes, requires someone to test with DB (#2857)

Browse Source 
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
This commit is contained in:
CitadelStationBot
2017-09-22 23:35:22 -05:00
committed by Poojawa
parent 6717720356
commit 2a860d1954
45 changed files with 161 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor.dm
+1 -1
View File
@@ -21,7 +21,7 @@
broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
if (!burnt_states)
burnt_states = list()
..()
. = ..()
//This is so damaged or burnt tiles or platings don't get remembered as the default tile
var/static/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","damaged4",
"damaged5","panelscorched","floorscorched1","floorscorched2","platingdmg1","platingdmg2", "foam_plating",
code/game/turfs/simulated/floor/fancy_floor.dm
+5 -5
View File
@@ -71,7 +71,7 @@
var/turfverb = "uproot"
/turf/open/floor/grass/Initialize()
..()
. = ..()
update_icon()
/turf/open/floor/grass/attackby(obj/item/C, mob/user, params)
@@ -109,7 +109,7 @@
slowdown = 0
/turf/open/floor/grass/snow/basalt/Initialize()
..()
. = ..()
if(prob(15))
icon_state = "basalt[rand(0, 12)]"
set_basalt_light(src)
@@ -126,7 +126,7 @@
slowdown = 0
/turf/open/floor/grass/fakebasalt/Initialize()
..()
. = ..()
if(prob(15))
icon_state = "basalt[rand(0, 12)]"
set_basalt_light(src)
@@ -144,7 +144,7 @@
flags_1 = NONE
/turf/open/floor/carpet/Initialize()
..()
. = ..()
update_icon()
/turf/open/floor/carpet/update_icon()
@@ -205,7 +205,7 @@
plane = PLANE_SPACE
/turf/open/floor/fakespace/Initialize()
..()
. = ..()
icon_state = SPACE_ICON_STATE
/turf/open/floor/fakespace/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
code/game/turfs/simulated/floor/light_floor.dm
+1 -1
View File
@@ -13,7 +13,7 @@
/turf/open/floor/light/Initialize()
..()
. = ..()
update_icon()
/turf/open/floor/light/break_tile()
code/game/turfs/simulated/floor/mineral_floor.dm
+2 -2
View File
@@ -18,7 +18,7 @@
/turf/open/floor/mineral/Initialize()
broken_states = list("[initial(icon_state)]_dam")
..()
. = ..()
if (!icons)
icons = list()
@@ -221,7 +221,7 @@
icons = list("alienpod1", "alienpod2", "alienpod3", "alienpod4", "alienpod5", "alienpod6", "alienpod7", "alienpod8", "alienpod9")
/turf/open/floor/mineral/abductor/Initialize()
..()
. = ..()
icon_state = "alienpod[rand(1,9)]"
/turf/open/floor/mineral/abductor/break_tile()
code/game/turfs/simulated/floor/misc_floor.dm
+2 -2
View File
@@ -20,7 +20,7 @@
/turf/open/floor/circuit/Initialize()
SSmapping.nuke_tiles += src
update_icon()
..()
. = ..()
/turf/open/floor/circuit/Destroy()
SSmapping.nuke_tiles -= src
@@ -145,7 +145,7 @@
var/obj/effect/clockwork/overlay/floor/realappearence
/turf/open/floor/clockwork/Initialize()
..()
. = ..()
new /obj/effect/temp_visual/ratvar/floor(src)
new /obj/effect/temp_visual/ratvar/beam(src)
realappearence = new /obj/effect/clockwork/overlay/floor(src)
code/game/turfs/simulated/floor/plating.dm
+1 -1
View File
@@ -17,7 +17,7 @@
broken_states = list("platingdmg1", "platingdmg2", "platingdmg3")
if (!burnt_states)
burnt_states = list("panelscorched")
..()
. = ..()
icon_plating = icon_state
/turf/open/floor/plating/update_icon()
code/game/turfs/simulated/floor/reinf_floor.dm
+1 -1
View File
@@ -108,7 +108,7 @@
var/obj/effect/clockwork/overlay/floor/bloodcult/realappearence
/turf/open/floor/engine/cult/Initialize()
..()
. = ..()
new /obj/effect/temp_visual/cult/turf/floor(src)
realappearence = new /obj/effect/clockwork/overlay/floor/bloodcult(src)
realappearence.linked = src
code/game/turfs/simulated/minerals.dm
+3 -3
View File
@@ -30,7 +30,7 @@
pixel_y = -4
pixel_x = -4
icon = smooth_icon
..()
. = ..()
if (mineralType && mineralAmt && spread && spreadChance)
for(var/dir in GLOB.cardinals)
if(prob(spreadChance))
@@ -153,7 +153,7 @@
/turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1)
if (display_icon_state)
icon_state = display_icon_state
..()
. = ..()
if (prob(mineralChance))
var/path = pickweight(mineralSpawnChanceList)
var/turf/T = ChangeTurf(path,FALSE,FALSE,TRUE)
@@ -393,7 +393,7 @@
/turf/closed/mineral/gibtonite/Initialize()
det_time = rand(8,10) //So you don't know exactly when the hot potato will explode
..()
. = ..()
/turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) && stage == 1)