Merge pull request #7527 from Novacat/nova-basicfixes

New Lore Oversights
This commit is contained in:
Novacat
2020-04-30 09:37:18 -04:00
committed by GitHub
3 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -55,7 +55,7 @@ var/next_station_date_change = 1 DAY
if(!station_date || update_time)
var/extra_days = round(station_time_in_ticks / (1 DAY)) DAYS
var/timeofday = world.timeofday + extra_days
station_date = num2text((text2num(time2text(timeofday, "YYYY"))+544)) + "-" + time2text(timeofday, "MM-DD")
station_date = num2text((text2num(time2text(timeofday, "YYYY"))+300)) + "-" + time2text(timeofday, "MM-DD") //VOREStation Edit
return station_date
//ISO 8601
@@ -321,7 +321,7 @@
owner = 1
if(new_name)
src.name += " ([new_name])"
desc += "\nVALID THROUGH END OF: [time2text(world.timeofday, "Month") +" "+ num2text(text2num(time2text(world.timeofday, "YYYY"))+544)]\nREGISTRANT: [new_name]"
desc += "\nVALID THROUGH END OF: [time2text(world.timeofday, "Month") +" "+ num2text(text2num(time2text(world.timeofday, "YYYY"))+300)]\nREGISTRANT: [new_name]"
#undef DAM_SCALE_FACTOR
#undef METAL_PER_TICK
+1
View File
@@ -982,6 +982,7 @@
#include "code\game\mecha\working\ripley.dm"
#include "code\game\mecha\working\working.dm"
#include "code\game\objects\banners.dm"
#include "code\game\objects\banners_vr.dm"
#include "code\game\objects\buckling.dm"
#include "code\game\objects\empulse.dm"
#include "code\game\objects\explosion.dm"