mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
Adds new PDA sprites.
This commit is contained in:
@@ -57,7 +57,7 @@ var/global/list/undershirt_t = list(
|
|||||||
"White tank top" = "u1", "Black tank top" = "u2", "Black shirt" = "u3",
|
"White tank top" = "u1", "Black tank top" = "u2", "Black shirt" = "u3",
|
||||||
"White shirt" = "u4", "White shirt 2" = "shirt_white_s", "White tank top 2" = "tank_white_s",
|
"White shirt" = "u4", "White shirt 2" = "shirt_white_s", "White tank top 2" = "tank_white_s",
|
||||||
"Black shirt 2" = "shirt_black_s", "Grey shirt" = "shirt_grey_s", "Heart shirt" = "lover_s",
|
"Black shirt 2" = "shirt_black_s", "Grey shirt" = "shirt_grey_s", "Heart shirt" = "lover_s",
|
||||||
"I love NT shirt" = "ilovent_s", "White shortsleeve shirt" = "whiteshortsleeve_s", "Purple shirtsleeve shirt" = "purpleshortsleeve_s",
|
"I love NT shirt" = "ilovent_s", "White shortsleeve shirt" = "whiteshortsleeve_s", "Purple shortsleeve shirt" = "purpleshortsleeve_s",
|
||||||
"Blue shortsleeve shirt" = "blueshortsleeve_s", "Green shortsleeve shirt" = "greenshortsleeve_s", "Black shortsleeve shirt" = "blackshortsleeve_s",
|
"Blue shortsleeve shirt" = "blueshortsleeve_s", "Green shortsleeve shirt" = "greenshortsleeve_s", "Black shortsleeve shirt" = "blackshortsleeve_s",
|
||||||
"Blue shirt" = "blueshirt_s", "Red shirt" = "redshirt_s", "Yellow shirt" = "yellowshirt_s", "Green shirt" = "greenshirt_s",
|
"Blue shirt" = "blueshirt_s", "Red shirt" = "redshirt_s", "Yellow shirt" = "yellowshirt_s", "Green shirt" = "greenshirt_s",
|
||||||
"Blue polo shirt" = "bluepolo_s", "Red polo shirt" = "redpolo_s", "White polo shirt" = "whitepolo_s",
|
"Blue polo shirt" = "bluepolo_s", "Red polo shirt" = "redpolo_s", "White polo shirt" = "whitepolo_s",
|
||||||
@@ -76,6 +76,7 @@ var/global/list/socks_t = list(
|
|||||||
|
|
||||||
//Backpacks
|
//Backpacks
|
||||||
var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt")
|
var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt")
|
||||||
|
var/global/list/pdachoicelist = list("Default", "Slim", "Old")
|
||||||
var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg)
|
var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg)
|
||||||
|
|
||||||
// Visual nets
|
// Visual nets
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
|||||||
slot_flags = SLOT_ID | SLOT_BELT
|
slot_flags = SLOT_ID | SLOT_BELT
|
||||||
|
|
||||||
//Main variables
|
//Main variables
|
||||||
|
var/pdachoice = 1
|
||||||
var/owner = null
|
var/owner = null
|
||||||
var/default_cartridge = 0 // Access level defined by cartridge
|
var/default_cartridge = 0 // Access level defined by cartridge
|
||||||
var/obj/item/weapon/cartridge/cartridge = null //current cartridge
|
var/obj/item/weapon/cartridge/cartridge = null //current cartridge
|
||||||
@@ -316,6 +317,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
|||||||
if(default_cartridge)
|
if(default_cartridge)
|
||||||
cartridge = new default_cartridge(src)
|
cartridge = new default_cartridge(src)
|
||||||
new /obj/item/weapon/pen(src)
|
new /obj/item/weapon/pen(src)
|
||||||
|
var/mob/living/carbon/human/H
|
||||||
|
pdachoice = isnull(H) ? 1 : H.pdachoice
|
||||||
|
switch(pdachoice)
|
||||||
|
if(2) icon = 'icons/obj/pda_slim.dmi'
|
||||||
|
if(3) icon = 'icons/obj/pda_old.dmi'
|
||||||
|
else icon = 'icons/obj/pda.dmi'
|
||||||
|
|
||||||
/obj/item/device/pda/proc/can_use()
|
/obj/item/device/pda/proc/can_use()
|
||||||
|
|
||||||
@@ -869,7 +876,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
|||||||
|
|
||||||
overlays.Cut()
|
overlays.Cut()
|
||||||
if(new_message || new_news)
|
if(new_message || new_news)
|
||||||
overlays += image('icons/obj/pda.dmi', "pda-r")
|
overlays += image(icon, "pda-r")
|
||||||
|
|
||||||
/obj/item/device/pda/proc/detonate_act(var/obj/item/device/pda/P)
|
/obj/item/device/pda/proc/detonate_act(var/obj/item/device/pda/P)
|
||||||
//TODO: sometimes these attacks show up on the message server
|
//TODO: sometimes these attacks show up on the message server
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
S["undershirt"] >> pref.undershirt
|
S["undershirt"] >> pref.undershirt
|
||||||
S["socks"] >> pref.socks
|
S["socks"] >> pref.socks
|
||||||
S["backbag"] >> pref.backbag
|
S["backbag"] >> pref.backbag
|
||||||
|
S["pdachoice"] >> pref.pdachoice
|
||||||
S["gear"] >> pref.gear
|
S["gear"] >> pref.gear
|
||||||
|
|
||||||
/datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
|
/datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
|
||||||
@@ -14,10 +15,12 @@
|
|||||||
S["undershirt"] << pref.undershirt
|
S["undershirt"] << pref.undershirt
|
||||||
S["socks"] << pref.socks
|
S["socks"] << pref.socks
|
||||||
S["backbag"] << pref.backbag
|
S["backbag"] << pref.backbag
|
||||||
|
S["pdachoice"] << pref.pdachoice
|
||||||
S["gear"] << pref.gear
|
S["gear"] << pref.gear
|
||||||
|
|
||||||
/datum/category_item/player_setup_item/general/equipment/sanitize_character()
|
/datum/category_item/player_setup_item/general/equipment/sanitize_character()
|
||||||
pref.backbag = sanitize_integer(pref.backbag, 1, backbaglist.len, initial(pref.backbag))
|
pref.backbag = sanitize_integer(pref.backbag, 1, backbaglist.len, initial(pref.backbag))
|
||||||
|
pref.pdachoice = sanitize_integer(pref.pdachoice, 1, pdachoicelist.len, initial(pref.pdachoice))
|
||||||
|
|
||||||
if(!islist(pref.gear)) pref.gear = list()
|
if(!islist(pref.gear)) pref.gear = list()
|
||||||
|
|
||||||
@@ -48,6 +51,7 @@
|
|||||||
. += "Undershirt: <a href='?src=\ref[src];change_undershirt=1'><b>[get_key_by_value(undershirt_t,pref.undershirt)]</b></a><br>"
|
. += "Undershirt: <a href='?src=\ref[src];change_undershirt=1'><b>[get_key_by_value(undershirt_t,pref.undershirt)]</b></a><br>"
|
||||||
. += "Socks: <a href='?src=\ref[src];change_socks=1'><b>[get_key_by_value(socks_t,pref.socks)]</b></a><br>"
|
. += "Socks: <a href='?src=\ref[src];change_socks=1'><b>[get_key_by_value(socks_t,pref.socks)]</b></a><br>"
|
||||||
. += "Backpack Type: <a href='?src=\ref[src];change_backpack=1'><b>[backbaglist[pref.backbag]]</b></a><br>"
|
. += "Backpack Type: <a href='?src=\ref[src];change_backpack=1'><b>[backbaglist[pref.backbag]]</b></a><br>"
|
||||||
|
. += "PDA Type: <a href='?src=\ref[src];change_pda=1'><b>[pdachoicelist[pref.pdachoice]]</b></a><br>"
|
||||||
|
|
||||||
. += "<br><b>Custom Loadout:</b><br>"
|
. += "<br><b>Custom Loadout:</b><br>"
|
||||||
var/total_cost = 0
|
var/total_cost = 0
|
||||||
@@ -109,6 +113,12 @@
|
|||||||
pref.backbag = backbaglist.Find(new_backbag)
|
pref.backbag = backbaglist.Find(new_backbag)
|
||||||
return TOPIC_REFRESH
|
return TOPIC_REFRESH
|
||||||
|
|
||||||
|
else if(href_list["change_pda"])
|
||||||
|
var/new_pdachoice = input(user, "Choose your character's style of PDA:", "Character Preference", pdachoicelist[pref.pdachoice]) as null|anything in pdachoicelist
|
||||||
|
if(!isnull(new_pdachoice) && CanUseTopic(user))
|
||||||
|
pref.pdachoice = pdachoicelist.Find(new_pdachoice)
|
||||||
|
return TOPIC_REFRESH
|
||||||
|
|
||||||
else if(href_list["add_loadout"])
|
else if(href_list["add_loadout"])
|
||||||
var/total_cost = 0
|
var/total_cost = 0
|
||||||
for(var/gear_name in pref.gear)
|
for(var/gear_name in pref.gear)
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ datum/preferences
|
|||||||
var/undershirt //undershirt type
|
var/undershirt //undershirt type
|
||||||
var/socks //socks type
|
var/socks //socks type
|
||||||
var/backbag = 2 //backpack type
|
var/backbag = 2 //backpack type
|
||||||
|
var/pdachoice = 1 //PDA type
|
||||||
var/h_style = "Bald" //Hair type
|
var/h_style = "Bald" //Hair type
|
||||||
var/r_hair = 0 //Hair color
|
var/r_hair = 0 //Hair color
|
||||||
var/g_hair = 0 //Hair color
|
var/g_hair = 0 //Hair color
|
||||||
@@ -336,6 +337,10 @@ datum/preferences
|
|||||||
backbag = 1 //Same as above
|
backbag = 1 //Same as above
|
||||||
character.backbag = backbag
|
character.backbag = backbag
|
||||||
|
|
||||||
|
if(pdachoice > 3 || pdachoice < 1)
|
||||||
|
pdachoice = 1
|
||||||
|
character.pdachoice = pdachoice
|
||||||
|
|
||||||
character.update_body()
|
character.update_body()
|
||||||
|
|
||||||
/datum/preferences/proc/open_load_dialog(mob/user)
|
/datum/preferences/proc/open_load_dialog(mob/user)
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
var/undershirt = 0 //Which undershirt the player wants.
|
var/undershirt = 0 //Which undershirt the player wants.
|
||||||
var/socks = 0 //Which socks the player wants.
|
var/socks = 0 //Which socks the player wants.
|
||||||
var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack.
|
var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack.
|
||||||
|
var/pdachoice = 1 //Which PDA type the player has chosen. Default, Slim, or Old.
|
||||||
|
|
||||||
// General information
|
// General information
|
||||||
var/home_system = ""
|
var/home_system = ""
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 29 KiB |
BIN
icons/obj/pda_old.dmi
Normal file
BIN
icons/obj/pda_old.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
BIN
icons/obj/pda_slim.dmi
Normal file
BIN
icons/obj/pda_slim.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
Reference in New Issue
Block a user