Skip to content

Commit

Permalink
[MIRROR] packified frontier alliance and terran commonwealth assets
Browse files Browse the repository at this point in the history
  • Loading branch information
Spookerton authored and LordNest committed Feb 22, 2024
1 parent 3ef8f1d commit 420f39e
Show file tree
Hide file tree
Showing 33 changed files with 322 additions and 192 deletions.
2 changes: 0 additions & 2 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1667,7 +1667,6 @@
#include "code\modules\clothing\under\color.dm"
#include "code\modules\clothing\under\corporate.dm"
#include "code\modules\clothing\under\formal_pants.dm"
#include "code\modules\clothing\under\frontier.dm"
#include "code\modules\clothing\under\miscellaneous.dm"
#include "code\modules\clothing\under\shorts.dm"
#include "code\modules\clothing\under\skirts.dm"
Expand All @@ -1686,7 +1685,6 @@
#include "code\modules\clothing\under\accessories\dashiki.dm"
#include "code\modules\clothing\under\accessories\fire_overpants.dm"
#include "code\modules\clothing\under\accessories\flannel_shirt.dm"
#include "code\modules\clothing\under\accessories\frontier.dm"
#include "code\modules\clothing\under\accessories\ftu_pin.dm"
#include "code\modules\clothing\under\accessories\hawaii.dm"
#include "code\modules\clothing\under\accessories\helmcover.dm"
Expand Down
18 changes: 0 additions & 18 deletions code/datums/outfits/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,3 @@
id_types = list(/obj/item/card/id/syndicate)
id_pda_assignment = "Scavenger"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_RESET_EQUIPMENT


/singleton/hierarchy/outfit/earhart
name = "FPE Standard Equipment"
uniform = /obj/item/clothing/under/earhart
gloves = /obj/item/clothing/gloves/thick
shoes = /obj/item/clothing/shoes/jackboots/medievalboots
belt = /obj/item/storage/belt/holster
l_hand = /obj/item/clothing/accessory/patch/earhart


/singleton/hierarchy/outfit/commonwealth_sailor
name = "Terran Commonwealth Sailor"
uniform = /obj/item/clothing/under/commonwealth
head = /obj/item/clothing/head/commonwealthhat
gloves = /obj/item/clothing/gloves/thick
shoes = /obj/item/clothing/shoes/dutyboots
belt = /obj/item/storage/belt/holster
105 changes: 0 additions & 105 deletions code/modules/clothing/under/accessories/frontier.dm

This file was deleted.

65 changes: 0 additions & 65 deletions code/modules/clothing/under/frontier.dm

This file was deleted.

Binary file modified icons/mob/onmob/onmob_accessories.dmi
Binary file not shown.
Binary file removed icons/mob/onmob/onmob_accessories_frontier.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/onmob_head.dmi
Binary file not shown.
Binary file modified icons/mob/onmob/onmob_suit.dmi
Binary file not shown.
Binary file removed icons/mob/onmob/onmob_under_frontier.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_accessories.dmi
Binary file not shown.
Binary file removed icons/obj/clothing/obj_accessories_frontier.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_head.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_suit.dmi
Binary file not shown.
Binary file removed icons/obj/clothing/obj_under_frontier.dmi
Binary file not shown.
7 changes: 5 additions & 2 deletions maps/torch/torch.dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#if !defined(using_map_DATUM)

#include "../../packs/deepmaint/_pack.dm"
#include "../../packs/event_2022jul30/_pack.dm"

#include "../../packs/factions/fa/_pack.dm"
#include "../../packs/factions/iccgn/_pack.dm"
#include "../../packs/factions/scga/_pack.dm"
#include "../../packs/factions/scgec/_pack.dm"
#include "../../packs/event_2022jul30/_pack.dm"
#include "../../packs/deepmaint/_pack.dm"
#include "../../packs/factions/tc/_pack.dm"

#include "torch_announcements.dm"
#include "torch_antagonism.dm"
Expand Down
5 changes: 5 additions & 0 deletions packs/factions/fa/_pack.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include "badges.dm"
#include "clothing.dm"
#include "misc.dm"
#include "outfits.dm"
#include "tweaks.dm"
50 changes: 50 additions & 0 deletions packs/factions/fa/badges.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/obj/item/clothing/accessory/fa_badge
abstract_type = /obj/item/clothing/accessory/fa_badge
icon = 'packs/factions/fa/badges.dmi'
accessory_icons = list(
slot_w_uniform_str = 'packs/factions/fa/badges.dmi',
slot_wear_suit_str = 'packs/factions/fa/badges.dmi'
)
icon_state = null
on_rolled_down = ACCESSORY_ROLLED_NONE
w_class = ITEM_SIZE_TINY
slot = ACCESSORY_SLOT_INSIGNIA
sprite_sheets = list(
SPECIES_UNATHI = 'packs/factions/fa/badges_unathi.dmi'
)


/obj/item/clothing/accessory/fa_badge/get_fibers()
return null


/obj/item/clothing/accessory/fa_badge/guardsman
name = "guardsman medal"
desc = {"\
A copper four-pointed star denoting that the wearer is a Guardsman of the \
Frontier Alliance. Not worth enough in the scrapyard to justify being reprimanded.\
"}
icon_state = "gam"
overlay_state = "gam_worn"


/obj/item/clothing/accessory/fa_badge/warden
name = "warden medal"
desc = {"\
A silver four-pointed star denoting that the wearer is a Warden of the Frontier \
Alliance. Shinier than necessarily practical, and also clearly made of nickel \
silver if you bother to stare.\
"}
icon_state = "wam"
overlay_state = "wam_worn"


/obj/item/clothing/accessory/fa_badge/marshal
name = "star marshal medal"
desc = {"\
A golden four-pointed star denoting that the wearer is a Star Marshal of the \
Frontier Alliance. If you take a real close look at it, you can see that the \
gold isn't real. It's plated tin.\
"}
icon_state = "sam"
overlay_state = "sam_worn"
Binary file added packs/factions/fa/badges.dmi
Binary file not shown.
File renamed without changes.
29 changes: 29 additions & 0 deletions packs/factions/fa/clothing.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/obj/item/clothing/under/fa
abstract_type = /obj/item/clothing/under/fa
icon = 'packs/factions/fa/clothing.dmi'
item_icons = list(
slot_w_uniform_str = 'packs/factions/fa/clothing.dmi'
)
sprite_sheets = list()
body_parts_covered = FULL_TORSO | ARMS | FULL_LEGS
siemens_coefficient = 0.9
armor = list(
melee = ARMOR_MELEE_MINOR,
energy = ARMOR_ENERGY_MINOR
)


/obj/item/clothing/under/fa/vacsuit
name = "copernican VAC-suit"
desc = {"\
A somewhat uncomfortable, utilitarian uniform meant to be worn under \
spacesuits by orbital shipyard workers. This one has Frontier Alliance \
crests on both shoulders.\
"}
icon_state = "vacsuit"
item_state_slots = list(
slot_w_uniform_str = "vacsuit"
)
sprite_sheets = list(
SPECIES_UNATHI = 'packs/factions/fa/clothing_unathi.dmi'
)
Binary file added packs/factions/fa/clothing.dmi
Binary file not shown.
File renamed without changes.
7 changes: 7 additions & 0 deletions packs/factions/fa/misc.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/obj/item/storage/backpack/dufflebag/kit_fa
name = "dressup kit, FA"
startswith = list(
/obj/item/clothing/accessory/fa_badge/guardsman,
/obj/item/clothing/accessory/fa_badge/warden,
/obj/item/clothing/accessory/fa_badge/marshal
)
7 changes: 7 additions & 0 deletions packs/factions/fa/outfits.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/singleton/hierarchy/outfit/fa
name = "FA - Kit"
uniform = /obj/item/clothing/under/fa/vacsuit
gloves = /obj/item/clothing/gloves/thick
shoes = /obj/item/clothing/shoes/dutyboots
belt = /obj/item/storage/belt/holster
l_hand = /obj/item/storage/backpack/dufflebag/kit_fa
5 changes: 5 additions & 0 deletions packs/factions/fa/tweaks.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/obj/item/storage/wallet/Initialize()
. = ..()
contents_allowed |= list(
/obj/item/clothing/accessory/fa_badge
)
5 changes: 5 additions & 0 deletions packs/factions/tc/_pack.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include "badges.dm"
#include "clothing.dm"
#include "misc.dm"
#include "outfits.dm"
#include "tweaks.dm"
Loading

0 comments on commit 420f39e

Please sign in to comment.