Skip to content

Commit

Permalink
1
Browse files Browse the repository at this point in the history
  • Loading branch information
AndroBetel committed Aug 20, 2024
1 parent 1ed3fe5 commit 434c83c
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 11 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -557,3 +557,4 @@
#define DROPSHIP_CAMO_TAN "Tan"
#define DROPSHIP_CAMO_NAVY "Navy"
#define DROPSHIP_CAMO_URBAN "Urban"
#define DROPSHIP_CAMO_JUNGLE "Jungle"
2 changes: 1 addition & 1 deletion code/_globalvars/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ GLOBAL_REFERENCE_LIST_INDEXED(hair_gradient_list, /datum/sprite_accessory/hair_g
GLOBAL_REFERENCE_LIST_INDEXED(yautja_hair_styles_list, /datum/sprite_accessory/yautja_hair, name)
//Dropship camos

GLOBAL_LIST_INIT(dropship_camos, list(DROPSHIP_CAMO_TAN, DROPSHIP_CAMO_NAVY, DROPSHIP_CAMO_URBAN))
GLOBAL_LIST_INIT(dropship_camos, list(DROPSHIP_CAMO_TAN, DROPSHIP_CAMO_NAVY, DROPSHIP_CAMO_URBAN, DROPSHIP_CAMO_JUNGLE))

//Backpacks
var/global/list/backbaglist = list("Backpack", "Satchel")
Expand Down
37 changes: 28 additions & 9 deletions code/modules/admin/game_master/extra_buttons/rename_platoon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,40 @@ GLOBAL_VAR_INIT(main_platoon_initial_name, GLOB.main_platoon_name)


/proc/change_dropship_camo(camo, mob/renamer)
var/icon_to_change
var/turf_icon
var/cargo_icon
var/cockpit_icon

switch(camo)
if(DROPSHIP_CAMO_NAVY)
icon_to_change = 'icons/turf/dropship2.dmi'
if(DROPSHIP_CAMO_TAN)
icon_to_change = 'icons/turf/dropship.dmi'
turf_icon = 'icons/turf/dropship.dmi'
cargo_icon = 'icons/obj/structures/doors/dropship1_cargo.dmi'
cockpit_icon = 'icons/obj/structures/doors/dropship1_pilot.dmi'
if(DROPSHIP_CAMO_NAVY)
turf_icon = 'icons/turf/dropship2.dmi'
cargo_icon = 'icons/obj/structures/doors/dropship2_cargo.dmi'
cockpit_icon = 'icons/obj/structures/doors/dropship2_pilot.dmi'
if(DROPSHIP_CAMO_URBAN)
icon_to_change = 'icons/turf/dropship3.dmi'

turf_icon = 'icons/turf/dropship3.dmi'
cargo_icon = 'icons/obj/structures/doors/dropship2_cargo.dmi'
cockpit_icon = 'icons/obj/structures/doors/dropship2_pilot.dmi'
if(DROPSHIP_CAMO_JUNGLE)
turf_icon = 'icons/turf/dropship4.dmi'
cargo_icon = 'icons/obj/structures/doors/dropship4_cargo.dmi'
cockpit_icon = 'icons/obj/structures/doors/dropship4_pilot.dmi'

for(var/turf/closed/shuttle/midway/midway_turfs in world)
if(istype(midway_turfs.loc, /area/shuttle/midway))
midway_turfs.icon = icon_to_change
for(var/obj/structure/shuttle/part/dropship1/midway_parts in world)
midway_turfs.icon = turf_icon
for(var/obj/structure/shuttle/part/midway/midway_parts in world)
var/turf/turf_to_check = get_turf(midway_parts)
if(istype(turf_to_check.loc, /area/shuttle/midway))
midway_parts.icon = icon_to_change
midway_parts.icon = turf_icon
for(var/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/cargo in world)
var/turf/turf_to_check = get_turf(cargo)
if(istype(turf_to_check.loc, /area/shuttle/midway))
cargo.icon = cargo_icon
for(var/obj/structure/machinery/door/airlock/hatch/cockpit/cockpit in world)
var/turf/turf_to_check = get_turf(cockpit)
if(istype(turf_to_check.loc, /area/shuttle/midway))
cockpit.icon = cockpit_icon
2 changes: 1 addition & 1 deletion code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ var/const/MAX_SAVE_SLOTS = 10
/// Name for platoon used when spawning as LT
var/platoon_name = "Sun Riders"
/// Dropship camo used when spawning as LT
var/dropship_camo = DROPSHIP_CAMO_TAN
var/dropship_camo = DROPSHIP_CAMO_JUNGLE

/datum/preferences/New(client/C)
key_bindings = deep_copy_list(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds and update their movement keys
Expand Down

0 comments on commit 434c83c

Please sign in to comment.