Skip to content

Commit

Permalink
[MIRROR] [MODULAR] Tarkon Content Update part 1: Backpacks and unifor…
Browse files Browse the repository at this point in the history
…m updates (#5304)

* [MODULAR] Tarkon Content Update part 1: Backpacks and uniform updates (#4745)

* Porting stuff over from progress branch

* i hate dmes

* cleanup and markation

* further clarification i ment to put in earlier

* [MIRROR] [MODULAR] Tarkon Content Update part 1: Backpacks and uniform updates

---------

Co-authored-by: Zenitheevee <[email protected]>
Co-authored-by: StealsThePRs <[email protected]>
  • Loading branch information
3 people authored Jan 18, 2025
1 parent 2260213 commit 67628ce
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 1 deletion.
38 changes: 38 additions & 0 deletions modular_nova/modules/tarkon/code/clothing/backpack.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/obj/item/storage/backpack/tarkon
name = "tarkon industries backpack"
desc = "A rugged backpack for colony and port life. Made in the typical tarkon colours"
icon = 'modular_nova/modules/tarkon/icons/obj/clothing/backpack.dmi'
icon_state = "backpack-tarkon"
worn_icon = 'modular_nova/modules/tarkon/icons/mob/clothing/backpack.dmi'
worn_icon_state = "backpack-tarkon"
resistance_flags = FIRE_PROOF //Industrial grade

/obj/item/storage/backpack/satchel/tarkon
name = "tarkon industries satchel"
desc = "A rugged satchel for colony and port life. Made in the typical tarkon colours"
icon = 'modular_nova/modules/tarkon/icons/obj/clothing/backpack.dmi'
icon_state = "satchel-tarkon"
worn_icon = 'modular_nova/modules/tarkon/icons/mob/clothing/backpack.dmi'
worn_icon_state = "satchel-tarkon"
resistance_flags = FIRE_PROOF

/obj/item/storage/backpack/duffelbag/tarkon
name = "tarkon industries duffelbag"
desc = "A rugged duffelbag for colony and port life. Made in the typical tarkon colours"
icon = 'modular_nova/modules/tarkon/icons/obj/clothing/backpack.dmi'
icon_state = "duffel-tarkon"
worn_icon = 'modular_nova/modules/tarkon/icons/mob/clothing/backpack.dmi'
worn_icon_state = "duffel-tarkon"
righthand_file = 'modular_nova/modules/tarkon/icons/mob/inhands/righthand.dmi' //this is the only one i honestly care about doing, as its most likely to be held rather than worn
lefthand_file = 'modular_nova/modules/tarkon/icons/mob/inhands/lefthand.dmi'
inhand_icon_state = "duffel-tarkon"
resistance_flags = FIRE_PROOF

/obj/item/storage/backpack/messenger/tarkon
name = "tarkon industries messenger bag"
desc = "A rugged messenger bag for colony and port life. Made in the typical tarkon colours"
icon = 'modular_nova/modules/tarkon/icons/obj/clothing/backpack.dmi'
icon_state = "messenger-tarkon"
worn_icon = 'modular_nova/modules/tarkon/icons/mob/clothing/backpack.dmi'
worn_icon_state = "messenger-tarkon"
resistance_flags = FIRE_PROOF
46 changes: 45 additions & 1 deletion modular_nova/modules/tarkon/code/misc_fluff/spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,59 @@
name = "default port tarkon outfit"
uniform = /obj/item/clothing/under/tarkon
head = /obj/item/clothing/head/utility/welding/hat
back = /obj/item/storage/backpack
shoes = /obj/item/clothing/shoes/winterboots
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack
id = /obj/item/card/id/advanced/tarkon
id_trim = /datum/id_trim/away/tarkon
ears = /obj/item/radio/headset/tarkon
backpack_contents = list(
/obj/item/crowbar = 1
)
var/backpack = /obj/item/storage/backpack/tarkon //Replaces "back" item with provided backpack based on preference on role spawn. Will be used further in project Colony Echo
var/satchel = /obj/item/storage/backpack/satchel/tarkon //Replaces "back" item with provided satchel
var/duffelbag = /obj/item/storage/backpack/duffelbag/tarkon //Replaces "back" item with provided duffelbag
var/messenger = /obj/item/storage/backpack/messenger/tarkon //Replaces "back" item with provided messenger bag.

/datum/outfit/tarkon/pre_equip(mob/living/carbon/human/tarkon, visuals_only = FALSE)
if(ispath(back, /obj/item/storage/backpack)) //we just steal this from the job outfit datum.
switch(tarkon.backpack)
if(GBACKPACK)
back = /obj/item/storage/backpack //Grey backpack
if(GSATCHEL)
back = /obj/item/storage/backpack/satchel //Grey satchel
if(GDUFFELBAG)
back = /obj/item/storage/backpack/duffelbag //Grey Duffel bag
if(LSATCHEL)
back = /obj/item/storage/backpack/satchel/leather //Leather Satchel
if(GMESSENGER)
back = /obj/item/storage/backpack/messenger //Grey messenger bag
if(DBACKPACK)
back = backpack //faction backpack
if(DSATCHEL)
back = satchel //faction satchel
if(DMESSENGER)
back = messenger //faction messenger bag
if(DDUFFELBAG)
back = duffelbag //faction duffel bag
else
back = backpack //faction backpack fallback incase bag pref shits bed

var/client/client = GLOB.directory[ckey(tarkon.mind?.key)]

if(isplasmaman(tarkon))
uniform = /obj/item/clothing/under/plasmaman
gloves = /obj/item/clothing/gloves/color/plasmaman
head = /obj/item/clothing/head/helmet/space/plasmaman
r_hand = /obj/item/tank/internals/plasmaman/belt/full
internals_slot = ITEM_SLOT_HANDS
if(isvox(tarkon) || isvoxprimalis(tarkon))
r_hand = /obj/item/tank/internals/nitrogen/belt/full
mask = /obj/item/clothing/mask/breath/vox
internals_slot = ITEM_SLOT_HANDS

if(client?.is_veteran() && client?.prefs.read_preference(/datum/preference/toggle/playtime_reward_cloak))
neck = /obj/item/clothing/neck/cloak/skill_reward/playing

/datum/outfit/tarkon/post_equip(mob/living/carbon/human/tarkon, visualsOnly = FALSE)
var/obj/item/card/id/id_card = tarkon.wear_id
Expand Down
Binary file not shown.
Binary file modified modular_nova/modules/tarkon/icons/mob/clothing/uniform.dmi
Binary file not shown.
Binary file modified modular_nova/modules/tarkon/icons/mob/clothing/uniform_digi.dmi
Binary file not shown.
Binary file modified modular_nova/modules/tarkon/icons/mob/inhands/lefthand.dmi
Binary file not shown.
Binary file modified modular_nova/modules/tarkon/icons/mob/inhands/righthand.dmi
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -8715,6 +8715,7 @@
#include "modular_nova\modules\system_shock\code\system_shock_quirk.dm"
#include "modular_nova\modules\tableflip\code\flipped_table.dm"
#include "modular_nova\modules\tagline\code\world.dm"
#include "modular_nova\modules\tarkon\code\clothing\backpack.dm"
#include "modular_nova\modules\tarkon\code\clothing\head.dm"
#include "modular_nova\modules\tarkon\code\clothing\mod.dm"
#include "modular_nova\modules\tarkon\code\clothing\neck.dm"
Expand Down

0 comments on commit 67628ce

Please sign in to comment.