cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-09 20:43:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

rendering update (#3695)

Browse Source 
* rnedering update

* fixes

* wack

* wack

* placeholder

* sigh

* sigh

Co-authored-by: fake_vm_user <fake_vm_user>
This commit is contained in:
silicons
2022-04-23 21:12:54 -07:00
committed by GitHub
parent 4a3ebfed98
commit 71889b4f65
312 changed files with 3387 additions and 2372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maps/nsv_triumph/triumph_defines.dm
View File

@@ -41,7 +41,6 @@
lobby_icon = 'icons/misc/title_vr.dmi'
lobby_screens = list("title1", "title2", "title3", "title4", "title5", "title6", "title7", "title8", "title9")
id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' //CITADEL CHANGE: Ignore this line because it's going to be overriden in modular_citadel\maps\triumph\triumph_defines.dm //TODO Remove/Fix these unneccessary Override Overrides everywhere ffs - Zandario
admin_levels = list()
sealed_levels = list()
@@ -124,8 +123,6 @@
meteor_strike_areas = null
default_skybox = /datum/skybox_settings/triumph
unit_test_exempt_areas = list(
/area/vacant/vacant_site,
/area/vacant/vacant_site/east,
@@ -189,17 +186,12 @@
/datum/map/triumph/perform_map_generation()
return 1
/datum/skybox_settings/triumph/New()
icon_state = "space1" // This is set again to a static state until a proper RNG of a static backdrop for every new round is set-up.
return icon_state
// For making the 4-in-1 holomap, we calculate some offsets
#define TRIUMPH_MAP_SIZE 140 // Width and height of compiled in triumph z levels.
#define TRIUMPH_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns
#define TRIUMPH_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*TRIUMPH_MAP_SIZE) - TRIUMPH_HOLOMAP_CENTER_GUTTER) / 2) // 100
#define TRIUMPH_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (3*TRIUMPH_MAP_SIZE)) / 2) // 60
// We have a bunch of stuff common to the station z levels
/datum/map_z_level/triumph/ship
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_XENOARCH_EXEMPT

4
maps/nsv_triumph/triumph_turfs.dm
View File

@@ -157,11 +157,11 @@
// Bluespace jump turf!
/turf/space/bluespace
name = "bluespace"
icon = 'icons/turf/space_vr.dmi'
icon = 'icons/turf/space.dmi'
icon_state = "bluespace"
/turf/space/bluespace/Initialize(mapload)
. = ..()
icon = 'icons/turf/space_vr.dmi'
icon = 'icons/turf/space.dmi'
icon_state = "bluespace"
// Desert jump turf!

4
maps/tether/tether_turfs.dm
View File

@@ -209,12 +209,12 @@ turf/simulated/mineral/rich/make_ore(var/rare_ore)
// Bluespace jump turf!
/turf/space/bluespace
name = "bluespace"
icon = 'icons/turf/space_vr.dmi'
icon = 'icons/turf/space.dmi'
icon_state = "bluespace"
/turf/space/bluespace/Initialize(mapload)
. = ..()
icon = 'icons/turf/space_vr.dmi'
icon = 'icons/turf/space.dmi'
icon_state = "bluespace"
// Desert jump turf!

15
maps/~map_system/maps.dm
View File

@@ -116,15 +116,11 @@ var/list/all_maps = list()
var/overmap_z = 0 // If 0 will generate overmap zlevel on init. Otherwise will populate the zlevel provided.
var/overmap_event_areas = 0 // How many event "clouds" will be generated
var/default_skybox = /datum/skybox_settings // What skybox do we use if a zlevel doesn't have a custom one?
var/lobby_icon = 'icons/misc/title.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/default_law_type = /datum/ai_laws/nanotrasen // The default lawset use by synth units, if not overriden by their laws var.
var/id_hud_icons = 'icons/mob/hud.dmi' // Used by the ID HUD (primarily sechud) overlay.
// Some maps include areas for that map only and don't exist when not compiled, so Travis needs this to learn of new areas that are specific to a map.
var/list/unit_test_exempt_areas = list()
var/list/unit_test_exempt_from_atmos = list()
@@ -257,14 +253,6 @@ var/list/all_maps = list()
num2text(SRV_FREQ) = list(access_janitor, access_hydroponics),
)
/datum/map/proc/get_skybox_datum(z)
if(map_levels["[z]"])
var/datum/map_z_level/picked = map_levels["[z]"]
if(picked.custom_skybox)
return new picked.custom_skybox
return new default_skybox
// Another way to setup the map datum that can be convenient. Just declare all your zlevels as subtypes of a common
// subtype of /datum/map_z_level and set zlevel_datum_type on /datum/map to have the lists auto-initialized.
@@ -282,9 +270,6 @@ var/list/all_maps = list()
var/holomap_legend_x = 96 // x position of the holomap legend for this z
var/holomap_legend_y = 96 // y position of the holomap legend for this z
// Skybox
var/custom_skybox = null // Can override skybox type here for this z
// Default constructor applies itself to the parent map datum
/datum/map_z_level/New(var/datum/map/map, _z)
if(_z)