We Are Chompers!

Changelog Notes:

- Fixes welcome image, its displayed name on the bottom.

- Fixes window title name.

- Comments out unneeded stuff about YW and Virgo in global.dm.
This commit is contained in:
TheFurryFeline
2019-12-24 14:00:43 -05:00
parent ec15c914ce
commit 724ca28fc0
11 changed files with 22 additions and 1302 deletions

View File

@@ -26,6 +26,8 @@ var/diary = null
var/error_log = null var/error_log = null
var/debug_log = null var/debug_log = null
var/href_logfile = null var/href_logfile = null
//CHOMPStation Removal Start TFF 24/12/19 - Blep. Remove extra stuff. Where do these even come in?
/*
var/station_name = "Yawn Wider Station" var/station_name = "Yawn Wider Station"
var/const/station_orig = "Yawn Wider Station" //station_name can't be const due to event prefix/suffix var/const/station_orig = "Yawn Wider Station" //station_name can't be const due to event prefix/suffix
var/const/station_short = "V.O.R.E." var/const/station_short = "V.O.R.E."
@@ -36,7 +38,9 @@ var/const/company_name = "NanoTrasen"
var/const/company_short = "NT" var/const/company_short = "NT"
var/const/star_name = "Virgo-Erigone" var/const/star_name = "Virgo-Erigone"
var/const/starsys_name = "Virgo-Erigone" var/const/starsys_name = "Virgo-Erigone"
var/const/game_version = "VOREStation" */
//CHOMPStation Removal End
var/const/game_version = "CHOMPStation" //CHOMPStation Edit TFF 24/12/19 - Chompers
var/changelog_hash = "" var/changelog_hash = ""
var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544) var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)
var/round_progressing = 1 var/round_progressing = 1

View File

@@ -0,0 +1,2 @@
/obj/effect/lobby_image
name = "CHOMPStation"

View File

@@ -1,2 +1,5 @@
//CHOMPStation Edit TFF 24/12/19 - Prioritise login_ch.dm over this
/*
/obj/effect/lobby_image /obj/effect/lobby_image
name = "VORE Station" name = "VORE Station"
*/

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1009 KiB

After

Width:  |  Height:  |  Size: 872 KiB

BIN
icons/misc/title_ch.dmi Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -6,7 +6,7 @@
full_name = "The Test Map" full_name = "The Test Map"
path = "example" path = "example"
lobby_icon = 'icons/misc/title.dmi' lobby_icon = 'icons/misc/title_ch.dmi' //CHOMPStation Edit TFF 24/12/19 - _ch.dmi
lobby_screens = list("mockingjay00") lobby_screens = list("mockingjay00")
zlevel_datum_type = /datum/map_z_level/example zlevel_datum_type = /datum/map_z_level/example

View File

@@ -6,7 +6,7 @@
full_name = "The Flat Test Map" full_name = "The Flat Test Map"
path = "plane" path = "plane"
lobby_icon = 'icons/misc/title.dmi' lobby_icon = 'icons/misc/title_ch.dmi' //CHOMPStation Edit TFF 24/12/19 - _ch.dmi
lobby_screens = list("mockingjay00") lobby_screens = list("mockingjay00")
zlevel_datum_type = /datum/map_z_level/plane zlevel_datum_type = /datum/map_z_level/plane

View File

@@ -16,8 +16,8 @@
full_name = "Southern Cross" full_name = "Southern Cross"
path = "southern_cross" path = "southern_cross"
lobby_icon = 'icons/misc/title.dmi' lobby_icon = 'icons/misc/title_ch.dmi' //CHOMPStation Edit TFF 24/12/19 - _ch.dmi
lobby_screens = list("mockingjay00") // New lobby screen if possible. lobby_screens = list("mockingjay00") //CHOMPStation Edit TFF 24/12/19 - CHOMPStation image
holomap_smoosh = list(list( holomap_smoosh = list(list(
Z_LEVEL_STATION_ONE, Z_LEVEL_STATION_ONE,

View File

@@ -93,8 +93,10 @@ var/list/all_maps = list()
var/datum/spawnpoint/spawnpoint_stayed = /datum/spawnpoint/cryo // Used if you end the round on the station. var/datum/spawnpoint/spawnpoint_stayed = /datum/spawnpoint/cryo // Used if you end the round on the station.
// VOREStation Edit End // VOREStation Edit End
var/lobby_icon = 'icons/misc/title.dmi' // The icon which contains the lobby image(s) //CHOMPStation Edit Start TFF 24/12/19 - Chompers welcome screen message
var/lobby_icon = 'icons/misc/title_ch.dmi' // The icon which contains the lobby image(s)
var/list/lobby_screens = list("mockingjay00") // The list of lobby screen to pick() from. If left unset the first icon state is always selected. var/list/lobby_screens = list("mockingjay00") // The list of lobby screen to pick() from. If left unset the first icon state is always selected.
//CHOMPStation Edit End
var/default_law_type = /datum/ai_laws/nanotrasen // The default lawset use by synth units, if not overriden by their laws var. var/default_law_type = /datum/ai_laws/nanotrasen // The default lawset use by synth units, if not overriden by their laws var.

View File

@@ -2643,6 +2643,7 @@
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\types.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\types.dm"
#include "code\modules\mob\living\voice\voice.dm" #include "code\modules\mob\living\voice\voice.dm"
#include "code\modules\mob\new_player\login.dm" #include "code\modules\mob\new_player\login.dm"
#include "code\modules\mob\new_player\login_ch.dm"
#include "code\modules\mob\new_player\login_vr.dm" #include "code\modules\mob\new_player\login_vr.dm"
#include "code\modules\mob\new_player\logout.dm" #include "code\modules\mob\new_player\logout.dm"
#include "code\modules\mob\new_player\new_player.dm" #include "code\modules\mob\new_player\new_player.dm"