cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 02:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into updates_the_nbt

Browse Source 
# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm
This commit is contained in:
alberyk
2022-02-19 10:26:35 -03:00
parent 32601c50bf 82969930ff
commit 12a70b50b7
149 changed files with 2287 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/overmap/exoplanets/turfs.dm
View File

@@ -152,7 +152,7 @@
/turf/simulated/floor/exoplanet/desert/Initialize()
. = ..()
icon_state = "desert[rand(0,5)]"
icon_state = "desert[rand(0,4)]"
//Concrete
/turf/simulated/floor/exoplanet/concrete