cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Outfit fixes: question marks IDs, backbags (#27583)

Browse Source 
* Outfit fixes: question marks IDs, backbags

* nah
This commit is contained in:
ShiftyRail
2020-08-19 19:17:11 +02:00
committed by GitHub
parent 8bb64f930b
commit 3becdd1b06
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/datums/outfit/civilian.dm
View File

@@ -340,7 +340,7 @@
associated_job = /datum/job/mime associated_job = /datum/job/mime
backpack_types = list( backpack_types = list(
BACKPACK_STRING = /obj/item/weapon/storage, BACKPACK_STRING = /obj/item/weapon/storage/backpack,
SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm, SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm,
SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel, SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel,
MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger, MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger,
@@ -404,7 +404,7 @@
associated_job = /datum/job/janitor associated_job = /datum/job/janitor
backpack_types = list( backpack_types = list(
BACKPACK_STRING = /obj/item/weapon/storage, BACKPACK_STRING = /obj/item/weapon/storage/backpack,
SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm, SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm,
SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel, SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel,
MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger, MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger,
@@ -451,7 +451,7 @@
associated_job = /datum/job/librarian associated_job = /datum/job/librarian
backpack_types = list( backpack_types = list(
BACKPACK_STRING = /obj/item/weapon/storage, BACKPACK_STRING = /obj/item/weapon/storage/backpack,
SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm, SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm,
SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel, SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel,
MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger, MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger,
@@ -517,7 +517,7 @@
associated_job = /datum/job/iaa associated_job = /datum/job/iaa
backpack_types = list( backpack_types = list(
BACKPACK_STRING = /obj/item/weapon/storage, BACKPACK_STRING = /obj/item/weapon/storage/backpack,
SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm, SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm,
SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel, SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel,
MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger, MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger,
@@ -624,7 +624,7 @@
associated_job = /datum/job/chaplain associated_job = /datum/job/chaplain
backpack_types = list( backpack_types = list(
BACKPACK_STRING = /obj/item/weapon/storage, BACKPACK_STRING = /obj/item/weapon/storage/backpack,
SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm, SATCHEL_NORM_STRING = /obj/item/weapon/storage/backpack/satchel_norm,
SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel, SATCHEL_ALT_STRING = /obj/item/weapon/storage/backpack/satchel,
MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger, MESSENGER_BAG_STRING = /obj/item/weapon/storage/backpack/messenger,

4
code/datums/outfit/outfit.dm
View File

@@ -229,7 +229,7 @@
H.species.final_equip(H) H.species.final_equip(H)
// -- Spawn correct ID and PDA // -- Spawn correct ID and PDA
/datum/outfit/proc/spawn_id(var/mob/living/carbon/human/H, rank) /datum/outfit/proc/spawn_id(var/mob/living/carbon/human/H)
if (!associated_job) if (!associated_job)
CRASH("Outfit [outfit_name] has no associated job, and the proc to spawn the ID is not overriden.") CRASH("Outfit [outfit_name] has no associated job, and the proc to spawn the ID is not overriden.")
var/datum/job/concrete_job = new associated_job var/datum/job/concrete_job = new associated_job
@@ -238,7 +238,7 @@
C = new id_type(H) C = new id_type(H)
C.access = concrete_job.get_access() C.access = concrete_job.get_access()
C.registered_name = H.real_name C.registered_name = H.real_name
C.rank = rank C.rank = concrete_job.title
C.assignment = H.mind ? H.mind.role_alt_title : concrete_job.title C.assignment = H.mind ? H.mind.role_alt_title : concrete_job.title
C.name = "[C.registered_name]'s ID Card ([C.assignment])" C.name = "[C.registered_name]'s ID Card ([C.assignment])"
C.associated_account_number = H?.mind?.initial_account?.account_number C.associated_account_number = H?.mind?.initial_account?.account_number