cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Two minor fixes (#7459)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
This commit is contained in:
CHOMPStation2
2023-12-21 15:10:43 -07:00
committed by GitHub
parent 2fe0dc7adb
commit 7077aea4d4
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/game/turfs/weird_turfs_vr.dm
View File

@@ -43,10 +43,6 @@
i.plane = PLANE_LIGHTING_ABOVE i.plane = PLANE_LIGHTING_ABOVE
add_overlay(i) add_overlay(i)
/turf/simulated/floor/weird_things/dark/ChangeTurf()
. = ..()
cut_overlays()
/turf/unsimulated/wall/dark /turf/unsimulated/wall/dark
name = "dark" name = "dark"
desc = "It's a strange, impenetrable darkness." desc = "It's a strange, impenetrable darkness."
@@ -64,11 +60,6 @@
i.plane = PLANE_LIGHTING_ABOVE i.plane = PLANE_LIGHTING_ABOVE
add_overlay(i) add_overlay(i)
/turf/unsimulated/wall/dark/ChangeTurf()
. = ..()
cut_overlays()
/turf/unsimulated/floor/dark /turf/unsimulated/floor/dark
name = "dark" name = "dark"
desc = "It's a strange, impenetrable darkness." desc = "It's a strange, impenetrable darkness."
@@ -79,7 +70,7 @@
. = ..() . = ..()
if(prob(5)) if(prob(5))
add_glow() add_glow()
/turf/unsimulated/floor/dark/Crossed(O) /turf/unsimulated/floor/dark/Crossed(O)
. = ..() . = ..()
if(!isliving(O)) if(!isliving(O))
@@ -111,7 +102,7 @@
var/choiceb var/choiceb
if(flip == 1) if(flip == 1)
choice = "overlay-[rand(1,6)]" choice = "overlay-[rand(1,6)]"
if(flip == 2) if(flip == 2)
choice = "overlay-[rand(7,12)]" choice = "overlay-[rand(7,12)]"
var/image/i = image('icons/turf/flooring/weird_vr.dmi', choice) var/image/i = image('icons/turf/flooring/weird_vr.dmi', choice)
i.plane = PLANE_LIGHTING_ABOVE i.plane = PLANE_LIGHTING_ABOVE
@@ -122,10 +113,4 @@
if(flip == 2) if(flip == 2)
choiceb = "overlay-[rand(1,6)]" choiceb = "overlay-[rand(1,6)]"
var/image/ii = image('icons/turf/flooring/weird_vr.dmi', choiceb) var/image/ii = image('icons/turf/flooring/weird_vr.dmi', choiceb)
add_overlay(ii) add_overlay(ii)
/turf/unsimulated/floor/dark/ChangeTurf()
. = ..()
cut_overlays()

6
maps/tether/tether-02-surface2.dmm
View File

@@ -11275,7 +11275,7 @@
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/tether/surfacebase/outside/outside2) /area/tether/surfacebase/outside/outside2)
"asy" = ( "asy" = (
/obj/structure/table/rack/holorack, /obj/structure/table/rack,
/obj/random/maintenance/clean, /obj/random/maintenance/clean,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{ /obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9 dir = 9
@@ -13254,7 +13254,7 @@
/turf/simulated/floor/tiled/techfloor, /turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar) /area/maintenance/lower/bar)
"avQ" = ( "avQ" = (
/obj/structure/table/rack/holorack, /obj/structure/table/rack,
/obj/effect/floor_decal/rust, /obj/effect/floor_decal/rust,
/obj/random/maintenance/clean, /obj/random/maintenance/clean,
/obj/random/tech_supply, /obj/random/tech_supply,
@@ -23572,7 +23572,7 @@
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/maintenance/lower/public_garden_maintenence/upper) /area/maintenance/lower/public_garden_maintenence/upper)
"aRh" = ( "aRh" = (
/obj/structure/table/rack/holorack, /obj/structure/table/rack,
/obj/random/maintenance/clean, /obj/random/maintenance/clean,
/obj/random/maintenance/clean, /obj/random/maintenance/clean,
/turf/simulated/floor/plating, /turf/simulated/floor/plating,