cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-21 04:06:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5322 from VOREStation/pol-planetstart

Browse Source 
Move planets to SSplanets
This commit is contained in:
Anewbe
2018-06-15 18:05:25 -05:00
committed by GitHub
parent 8b6377016f 462effc1d2
commit 9e28740697
14 changed files with 213 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/Cleanable/humans.dm
+1 -1
View File
@@ -248,6 +248,6 @@ var/global/list/image/splatter_cache=list()
//This version should be used for admin spawns and pre-mapped virus vectors (e.g. in PoIs), this version does not dry
/obj/effect/decal/cleanable/mucus/mapped/New()
...()
..()
virus2 = new /datum/disease2/disease
virus2.makerandom()
code/game/objects/items/devices/communicator/UI.dm
+10 -11
View File
@@ -69,17 +69,16 @@
im_list_ui[++im_list_ui.len] = list("address" = I["address"], "to_address" = I["to_address"], "im" = I["im"])
//Weather reports.
if(planet_controller)
for(var/datum/planet/planet in planet_controller.planets)
if(planet.weather_holder && planet.weather_holder.current_weather)
var/list/W = list(
"Planet" = planet.name,
"Time" = planet.current_time.show_time("hh:mm"),
"Weather" = planet.weather_holder.current_weather.name,
"Temperature" = planet.weather_holder.temperature - T0C,
"High" = planet.weather_holder.current_weather.temp_high - T0C,
"Low" = planet.weather_holder.current_weather.temp_low - T0C)
weather[++weather.len] = W
for(var/datum/planet/planet in SSplanets.planets)
if(planet.weather_holder && planet.weather_holder.current_weather)
var/list/W = list(
"Planet" = planet.name,
"Time" = planet.current_time.show_time("hh:mm"),
"Weather" = planet.weather_holder.current_weather.name,
"Temperature" = planet.weather_holder.temperature - T0C,
"High" = planet.weather_holder.current_weather.temp_high - T0C,
"Low" = planet.weather_holder.current_weather.temp_low - T0C)
weather[++weather.len] = W
injection = "<div>Test</div>"