Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes game year to 2307 #24419

Merged
merged 1 commit into from Feb 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/_global_vars/configuration.dm
Expand Up @@ -5,7 +5,7 @@ GLOBAL_VAR_INIT(max_explosion_range, 14)
var/href_logfile = null
var/game_version = "Baystation12"
var/changelog_hash = ""
var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)
var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 288)
var/join_motd = null

var/secret_force_mode = "secret" // if this is anything but "secret", the secret rotation will forceably choose this mode.
Expand Down
2 changes: 1 addition & 1 deletion code/_helpers/time.dm
Expand Up @@ -48,7 +48,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(game_year) + "-" + time2text(timeofday, "MM-DD")
return station_date

/proc/time_stamp()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/posters/bs12.dm
Expand Up @@ -291,5 +291,5 @@

/decl/poster/bay_59
icon_state="bsposter59"
name = "poster - Miss Science 2558"
name = "poster - Miss Science 2299"
desc = "A large piece of space-resistant printed paper. This pin-up poster depicts a woman wearing a corporate labcoat, a bikini, and a sheepish grin. She's shyly posing atop some highly specialized research equipment."
2 changes: 1 addition & 1 deletion code/game/objects/items/paintkit.dm
Expand Up @@ -167,7 +167,7 @@
/obj/item/device/kit/paint/gygax/darkgygax
name = "\"Silhouette\" Gygax customisation kit"
new_name = "Gygax \"Silhouette\""
new_desc = "An ominous Gygax exosuit modelled after the fictional corporate 'death squads' that were popular in pulp action-thrillers back in 2554."
new_desc = "An ominous Gygax exosuit modelled after the fictional corporate 'death squads' that were popular in pulp action-thrillers back in 2280s."
new_icon = "darkgygax"

/obj/item/device/kit/paint/gygax/recitence
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/pit.dm
Expand Up @@ -150,7 +150,7 @@

var/decl/cultural_info/S = SSculture.get_culture(CULTURE_HUMAN)
var/nam = S.get_random_name(pick(MALE,FEMALE))
var/cur_year = text2num(time2text(world.timeofday, "YYYY"))+544
var/cur_year = game_year
var/born = cur_year - rand(5,150)
var/died = max(cur_year - rand(0,70),born)

Expand Down
5 changes: 2 additions & 3 deletions code/modules/games/spaceball_cards.dm
Expand Up @@ -6,18 +6,17 @@
/obj/item/weapon/pack/spaceball/New()
var/datum/playingcard/P
var/i
var/year = 544 + text2num(time2text(world.timeofday, "YYYY"))
for(i=0;i<5;i++)
P = new()
if(prob(1))
P.name = "Spaceball Jones, [year] Brickburn Galaxy Trekers"
P.name = "Spaceball Jones, [game_year] Brickburn Galaxy Trekers"
P.desc = "An autographed Spaceball Jones card!!"
P.card_icon = "spaceball_jones"
else
var/language_type = pick(/datum/language/human,/datum/language/diona,/datum/language/unathi)
var/datum/language/L = new language_type()
var/team = pick("Brickburn Galaxy Trekers","Mars Rovers", "Qerrbalak Saints", "Moghes Rockets", "Ahdomai Lightening")
P.name = "[L.get_random_name(pick(MALE,FEMALE))], [year - rand(0,50)] [team]"
P.name = "[L.get_random_name(pick(MALE,FEMALE))], [game_year - rand(0,50)] [team]"
P.card_icon = "spaceball_standard"
P.desc = "A Spaceball playing card."
P.back_icon = "card_back_spaceball"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/library/manuals/engineering.dm
Expand Up @@ -448,7 +448,7 @@


/obj/item/weapon/book/manual/rust_engine
name = "R-UST Operating Manual 2553"
name = "R-UST Operating Manual"
icon_state = "bookMagazine"
author = "Cindy Crawfish"
title = "R-UST Operating Manual"
Expand Down
@@ -1,6 +1,6 @@
/datum/computer_file/program/uplink
filename = "taxquickly"
filedesc = "TaxQuickly 2559"
filedesc = "TaxQuickly 1.45b"
program_icon_state = "uplink"
extended_desc = "An online tax filing software. It is a few years out of date."
size = 0 // it is cloud based
Expand All @@ -16,7 +16,7 @@
src.password = password

/datum/nano_module/program/uplink
name = "TaxQuickly 2559"
name = "TaxQuickly 1.45b"

/datum/nano_module/program/uplink/ui_interact(var/mob/user)
var/datum/computer_file/program/uplink/prog = program
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/launcher/crossbow.dm
Expand Up @@ -48,7 +48,7 @@

/obj/item/weapon/gun/launcher/crossbow
name = "powered crossbow"
desc = "A 2557AD twist on an old classic. Pick up that can."
desc = "A modern twist on an old classic. Pick up that can."
icon = 'icons/obj/guns/crossbow.dmi'
icon_state = "crossbow"
item_state = "crossbow-solid"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/projectile/automatic.dm
Expand Up @@ -229,7 +229,7 @@

/obj/item/weapon/gun/projectile/automatic/l6_saw
name = "light machine gun"
desc = "A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. Has 'Aussec Armoury- 2531' engraved on the reciever." //probably should refluff this
desc = "A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. Has 'Aussec Armoury- 2281' engraved on the reciever." //probably should refluff this
icon = 'icons/obj/guns/saw.dmi'
icon_state = "l6closed100"
item_state = "l6closedmag"
Expand Down
Expand Up @@ -399,7 +399,7 @@
..()
reagents.add_reagent(/datum/reagent/ethanol/wine/premium, 100)
var/namepick = pick("Calumont","Sciacchemont","Recioto","Torcalota")
var/agedyear = rand(2350,2550)
var/agedyear = rand(game_year-150,game_year)
name = "Chateau [namepick] De Blanc"
desc += " This bottle is marked as [agedyear] Vintage."

Expand Down
5 changes: 4 additions & 1 deletion maps/torch/structures/signs.dm
@@ -1,8 +1,11 @@
/obj/structure/sign/dedicationplaque
name = "\improper SEV Torch dedication plaque"
desc = "S.E.V. Torch - Mako Class - Sol Expeditionary Corps Registry 95519 - Shiva Fleet Yards, Mars - First Vessel To Bear The Name - Launched 2560 - Sol Central Government - 'Never was anything great achieved without danger.'"
icon_state = "lightplaque"

/obj/structure/sign/dedicationplaque/Initialize()
. = ..()
desc = "S.E.V. Torch - Mako Class - Sol Expeditionary Corps Registry 95519 - Shiva Fleet Yards, Mars - First Vessel To Bear The Name - Launched [game_year-5] - Sol Central Government - 'Never was anything great achieved without danger.'"

/obj/structure/sign/ecplaque
name = "\improper Expeditionary Directives"
desc = "A plaque with Expeditionary Corps logo etched in it."
Expand Down
2 changes: 1 addition & 1 deletion nano/templates/laptop_configuration.tmpl
Expand Up @@ -83,4 +83,4 @@
</div>
<br><br>
<hr><hr>
<i>NTOS v2.0.4b Copyright NanoTrasen 2557 - 2559</i>
<i>NTOS v2.0.4b Copyright NanoTrasen</i>
1 change: 0 additions & 1 deletion nano/templates/library.tmpl
Expand Up @@ -72,4 +72,3 @@
{{/for}}
</table>
{{/if}}
<br><br><hr><i>NTOS v2.0.4b Copyright NanoTrasen 2557 - 2561</i>
2 changes: 0 additions & 2 deletions nano/templates/ntnet_downloader.tmpl
Expand Up @@ -96,5 +96,3 @@
</div>
{{/for}}
{{/if}}

<br><br><hr><i>NTOS v2.0.4b Copyright NanoTrasen 2557 - 2559</i>