Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TCAF Corvette Remap #19877

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
4b46f2b
Saving progress.
hazelrat Sep 4, 2024
7ece971
beep
hazelrat Sep 4, 2024
ff6dfea
Committing progress before I try something completely different.
hazelrat Sep 5, 2024
6e50cfa
And now, for something completely different.
hazelrat Sep 5, 2024
0b4d588
Saving progress.
hazelrat Sep 7, 2024
2bdb74d
Progress
hazelrat Sep 7, 2024
3974fc4
This should work.
hazelrat Sep 8, 2024
96f8071
boop
hazelrat Sep 8, 2024
4a7d2bd
Saving progress
hazelrat Sep 8, 2024
3bdd4f2
blep
hazelrat Sep 8, 2024
be1d54a
beep
hazelrat Sep 8, 2024
ddd2655
sd
hazelrat Sep 9, 2024
85e4d71
:D
hazelrat Sep 9, 2024
e7b6fae
Progress.
hazelrat Sep 9, 2024
5d6924f
boop
hazelrat Sep 9, 2024
d8359ec
ewf
hazelrat Sep 9, 2024
75c247e
Merge branch 'master' into tcafremap
hazelrat Sep 9, 2024
3af19cd
flipping switches
hazelrat Sep 9, 2024
b4b317a
With some luck things will stop exploding now
hazelrat Sep 9, 2024
3affd09
I hate lifts
hazelrat Sep 11, 2024
556fbed
argh
hazelrat Sep 11, 2024
1fcf71d
lift works :D
hazelrat Sep 11, 2024
7674616
Progress.
hazelrat Sep 12, 2024
73c743f
boop
hazelrat Sep 12, 2024
66149d6
Uniform stuff, moving TCAF assets into a single faction file.
hazelrat Sep 13, 2024
8f64fbb
ee
hazelrat Sep 13, 2024
8647115
Progress!
hazelrat Sep 15, 2024
0a8d71f
ee
hazelrat Sep 15, 2024
07d0dca
Added entry points
hazelrat Sep 15, 2024
5b508eb
Functional airlocks!
hazelrat Sep 16, 2024
30747ae
Removed duplicate airlock.
hazelrat Sep 16, 2024
9d2c4a7
ee
hazelrat Sep 16, 2024
109079a
May resolve that
hazelrat Sep 16, 2024
773a7d0
Added changelog and fixed raskariim thing.
hazelrat Sep 16, 2024
b8b34eb
boop
hazelrat Sep 16, 2024
30b13ab
Speeds up the shuttle a little.
hazelrat Sep 16, 2024
dd92966
Putting a pin in this for now
hazelrat Sep 16, 2024
6de8c8d
Limits selection of species a little, per discussion of lore. Liable …
hazelrat Sep 17, 2024
a70e2e9
Removes template flag.
hazelrat Sep 17, 2024
7092db2
Updates ghostrole descriptions and armoury a little.
hazelrat Sep 17, 2024
0997432
e
hazelrat Sep 17, 2024
66fdaa6
Replaces chapel with a mechbay, adds a TCAF powerloader variant.
hazelrat Sep 18, 2024
ca1b94b
Minor tweaks.
hazelrat Sep 18, 2024
3e0c58c
guh
hazelrat Sep 18, 2024
c25afbc
Merge branch 'master' of https://github.com/Aurorastation/Aurora.3 in…
hazelrat Sep 21, 2024
dc0b328
Adds the new fancy hardsuit, and also adds a TCAF ID for ghostroles. …
hazelrat Sep 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions aurorastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1868,6 +1868,7 @@
#include "code\modules\clothing\ears\xeno\skrell.dm"
#include "code\modules\clothing\ears\xeno\tajara.dm"
#include "code\modules\clothing\factions\assunzione.dm"
#include "code\modules\clothing\factions\biesel.dm"
#include "code\modules\clothing\factions\dominia.dm"
#include "code\modules\clothing\factions\einstein.dm"
#include "code\modules\clothing\factions\elyra.dm"
Expand Down Expand Up @@ -3878,6 +3879,7 @@
#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette.dm"
#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_areas.dm"
#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_ghostroles.dm"
#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_landmarks.dm"
#include "maps\away\ships\biesel\tcfl_patrol\tcfl_peacekeeper_ship.dm"
#include "maps\away\ships\biesel\tcfl_patrol\tcfl_peacekeeper_ship_ghostroles.dm"
#include "maps\away\ships\casino\casino.dm"
Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/items/weapons/cards_ids.dm
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,12 @@ var/const/NO_EMAG_ACT = -50
icon_state = "coalition_card"
overlay_state = "nothing"

/obj/item/card/id/tcaf // For ghostroles, rather than ERTs.
name = "\improper Tau Ceti Armed Forces identification card"
desc = "An old-fashioned, practical plastic card. Cheaply produced for Tau Ceti's finest."
icon_state = "legion"
overlay_state = "nothing"

/obj/item/card/id/bluespace
name = "bluespace identification card"
desc = "A bizarre imitation of an ID card; shifting and moving."
Expand Down
125 changes: 125 additions & 0 deletions code/modules/clothing/factions/biesel.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
// This file contains assets for the Tau Ceti Armed Forces. Excludes some older TCFL assets.

// Intended for legionnaires that are expected to engage in combat.
/obj/item/clothing/under/legion/tcaf
name = "\improper TCAF armsman's uniform"
desc = "A black longsleeved top over rough khaki tactical pants. Designed for the use of on-ship legionnaires of the Tau Ceti Armed Forces."
icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
contained_sprite = TRUE
icon_state = "tcaf_armsman_uniform"
item_state = "tcaf_armsman_uniform"
worn_state = "tcaf_armsman_uniform"

// Generic gloves.
/obj/item/clothing/gloves/tcaf
name = "\improper TCAF uniform gloves"
desc = "A pair of khaki tactical gloves with reinforcement at the knuckles and an adjustable strap at the wrist."
icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
contained_sprite = TRUE
icon_state = "tcaf_armsman_gloves"
item_state = "tcaf_armsman_gloves"
build_from_parts = TRUE
worn_overlay = "over"

// Intended for legionnaires that aren't in active combat roles but are still expected to be able to fight if necessary, like ship crews, engineers, and medics.
/obj/item/clothing/under/legion/tcaf/technician
name = "\improper TCAF technician's uniform"
desc = "A plain drab jumpsuit trimmed with dark accents, designed to be cheap and stain-resistant. It could be more comfortable. Worn by members of the Tau Ceti Armed Forces that aren't in active combat roles, such as medical and engineering staff."
icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
contained_sprite = TRUE
icon_state = "tcaf_technician_uniform"
item_state = "tcaf_technician_uniform"
worn_state = "tcaf_technician_uniform"

/obj/item/clothing/head/tcaf_technician
name = "\improper TCAF technician's cap"
desc = "A plain drab softcap, marked in a small manner at the front with the insignia of the Tau Ceti Armed Forces. Worn by members of the Tau Ceti Armed Forces that aren't in active combat roles, such as medical and engineering staff."
icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
icon_state = "tcaf_technician_cap"
item_state = "tcaf_technician_cap"
contained_sprite = TRUE

// For specialist roles.
/obj/item/clothing/accessory/legion/specialist
name = "specialist medallion"
desc = "Two small medallions, one worn on the shoulder and the other worn on the chest. Meant to display the rank of specialist troops in the Tau Ceti Armed Forces."
icon_state = "specialist_medallion"
item_state = "specialist_medallion"
overlay_state = "specialist_medallion"

// For any legionnaires with significant authority, including officers.
/obj/item/clothing/accessory/legion
name = "seniority ribbons"
desc = "A ribbon meant to attach to the chest and sling around the shoulder accompanied by two medallions, marking seniority in the Tau Ceti Armed Forces."
icon_state = "senior_ribbon"
item_state = "senior_ribbon"
overlay_state = "senior_ribbon"
slot = ACCESSORY_SLOT_CAPE
flippable = TRUE

// Specifically for Prefects.
/obj/item/clothing/accessory/tcaf_prefect_pauldron
name = "\improper TCAF prefect pauldron"
desc = "A bright red hard pauldron to indicate the wearer has the rank of Prefect in the Tau Ceti Armed Forces."
icon = 'icons/clothing/kit/modular_armor.dmi'
icon_state = "tcaf_prefect_pauldron"
item_state = "tcaf_prefect_pauldron"
contained_sprite = TRUE
slot = ACCESSORY_SLOT_GENERIC
flippable = FALSE

// Specifically for Senior Legionnaires.
/obj/item/clothing/accessory/tcaf_senior_legion_pauldron
name = "\improper TCAF senior legionnaire pauldron"
desc = "A blue hard pauldron to indicate the wearer has the rank of Senior Legionnaire in the Tau Ceti Armed Forces."
icon = 'icons/clothing/kit/modular_armor.dmi'
icon_state = "tcaf_senior_legion_pauldron"
item_state = "tcaf_senior_legion_pauldron"
contained_sprite = TRUE
slot = ACCESSORY_SLOT_GENERIC
flippable = FALSE

// For officers that want to look like a One Piece villain.
/obj/item/clothing/suit/storage/toggle/tcaf_officer_greatcoat
name = "\improper TCAF officer's greatcoat"
desc = "This is a well-trimmed greatcoat worn by commissioned officers in the Tau Ceti Armed Forces, such as by a Decurion or Captain. The fabric seems quite robust, but not particularly well used."
icon = 'icons/clothing/suits/coats/tcaf_coat.dmi'
icon_state = "tcaf_officer_coat"
item_state = "tcaf_officer_coat"
contained_sprite = TRUE
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
protects_against_weather = TRUE

/obj/item/clothing/head/tcaf_officer
name = "\improper TCAF officer's cap"
desc = "This is a peaked cap bearing the colours and insignia of the Tau Ceti Armed Forces, typically worn by commissioned officers therein. It looks like it'd fly off one's head very easily in windy weather."
icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
icon_state = "tcaf_officer_cap"
item_state = "tcaf_officer_cap"
contained_sprite = TRUE

/obj/item/clothing/under/legion/tcaf_officer
name = "\improper TCAF officer's uniform"
desc = "A pristine, well-ironed, and perfectly cleaned white jumpsuit with black trimmings, worn by commissioned officers of the Tau Ceti Armed Forces. Who wears a white uniform but someone who intends never to dirty it?"
icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
contained_sprite = TRUE
icon_state = "tcaf_officer_uniform"
item_state = "tcaf_officer_uniform"
worn_state = "tcaf_officer_uniform"

// Not to be confused with the TCFL variant. Redeclaring icon for clarity's sake, this isn't in the tcaf_uniform file.
/obj/item/clothing/head/helmet/pilot/tcaf
name = "\improper TCAF flight helmet"
desc = "A pilot's helmet marked all over with the imagery of the Republic of Biesel, worn by the pilots of the Tau Ceti Armed Forces. It looks a little scuffed."
icon = 'icons/clothing/head/pilot_helmets.dmi'
icon_state = "tcaf_pilot"
item_state = "tcaf_pilot"

// Identical sprites to the TCFL variant, just reflavoured.
/obj/item/clothing/head/softcap/tcaf_cap
name = "TCAF uniform cap"
icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
desc = "A rugged blue softcap bearing the insignia of the Tau Ceti Armed Forces, the military of the Republic of Biesel."
icon_state = "tcaf_cap"
item_state = "tcaf_cap"
10 changes: 0 additions & 10 deletions code/modules/clothing/gloves/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -285,16 +285,6 @@
build_from_parts = TRUE
worn_overlay = "over"

/obj/item/clothing/gloves/tcaf
name = "\improper TCAF armsman gloves"
desc = "A pair of khaki tactical gloves with reinforcement at the knuckles and an adjustable strap at the wrist."
icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
contained_sprite = TRUE
icon_state = "tcaf_armsman_gloves"
item_state = "tcaf_armsman_gloves"
build_from_parts = TRUE
worn_overlay = "over"

/obj/item/clothing/gloves/ballistic
name = "ballistic gauntlet"
desc = "A metal gauntlet armed with a wrist-mounted shotgun."
Expand Down
6 changes: 5 additions & 1 deletion code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,10 @@
)
siemens_coefficient = 0.75

/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion/tcaf
name = "TCAF flight jacket"
desc = "A cheap pilot's jacket. An immense stock of exactly this design has been grandfathered into the Tau Ceti Armed Forces via its predecessor, the Tau Ceti Foreign Legion, to the point of a near-complete ubiquity."

/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion/alt
desc = "A Tau Ceti Foreign Legion pilot's jacket made from a silky, shiny nanonylon material and lined with tough, protective synthfabrics."
armor = list(
Expand Down Expand Up @@ -499,7 +503,7 @@
item_state = "tcfljacket"

/obj/item/clothing/suit/storage/legion/tcaf
name = "tcaf jacket"
name = "TCAF jacket"
desc = "A pale blue canvas jacket embossed with the insignia of the Tau Ceti Armed Forces."
icon_state = "tcaf_jacket"
item_state = "tcaf_jacket"
Expand Down
22 changes: 1 addition & 21 deletions code/modules/clothing/suits/modular_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@

/obj/item/clothing/accessory/storage/chest_gear
name = "standard vest equipment"
desc = "the standard pouch and commlink each Minuteman gets issued out of basic. This one has a bullet wedged in the radio, don't expect it to work anytime soon."
desc = "The standard pouch and commlink each Minuteman gets issued out of basic. This one has a bullet wedged in the radio, don't expect it to work anytime soon."
icon = 'icons/clothing/kit/modular_armor.dmi'
icon_state = "tcaf_chest_gear"
item_state = "tcaf_chest_gear"
Expand Down Expand Up @@ -865,23 +865,3 @@
Szalai and MacPherson sought to undo."
icon_state = "flagpatch_ssmd"
item_state = "flagpatch_ssmd"

/obj/item/clothing/accessory/tcaf_prefect_pauldron
name = "\improper TCAF prefect pauldron"
desc = "A bright red hard pauldron to indicate the wearer has the rank of Prefect in the Tau Ceti Armed Forces."
icon = 'icons/clothing/kit/modular_armor.dmi'
icon_state = "tcaf_prefect_pauldron"
item_state = "tcaf_prefect_pauldron"
contained_sprite = TRUE
slot = ACCESSORY_SLOT_GENERIC
flippable = FALSE

/obj/item/clothing/accessory/tcaf_senior_legion_pauldron
name = "\improper TCAF senior legionnaire pauldron"
desc = "A blue hard pauldron to indicate the wearer has the rank of Senior Legionnaire in the Tau Ceti Armed Forces."
icon = 'icons/clothing/kit/modular_armor.dmi'
icon_state = "tcaf_senior_legion_pauldron"
item_state = "tcaf_senior_legion_pauldron"
contained_sprite = TRUE
slot = ACCESSORY_SLOT_GENERIC
flippable = FALSE
17 changes: 0 additions & 17 deletions code/modules/clothing/under/accessories/accessory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -782,23 +782,6 @@
base.AddOverlays(robe_backing)
return base

//tau ceti legion ribbons
/obj/item/clothing/accessory/legion
name = "seniority ribbons"
desc = "A ribbon meant to attach to the chest and sling around the shoulder accompanied by two medallions, marking seniority in the Tau Ceti Armed Forces."
icon_state = "senior_ribbon"
item_state = "senior_ribbon"
overlay_state = "senior_ribbon"
slot = ACCESSORY_SLOT_CAPE
flippable = TRUE

/obj/item/clothing/accessory/legion/specialist
name = "specialist medallion"
desc = "Two small medallions, one worn on the shoulder and the other worn on the chest. Meant to display the rank of specialist troops in the Tau Ceti Armed Forces."
icon_state = "specialist_medallion"
item_state = "specialist_medallion"
overlay_state = "specialist_medallion"

/obj/item/clothing/accessory/offworlder
name = "venter assembly"
desc = "A series of complex tubing meant to dissipate heat from the skin passively."
Expand Down
9 changes: 0 additions & 9 deletions code/modules/clothing/under/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -540,15 +540,6 @@
item_state = "tauceti_pilot"
worn_state = "tauceti_pilot"

/obj/item/clothing/under/legion/tcaf
name = "\improper TCAF armsman uniform"
desc = "A black longsleeved top over rough khaki tactical pants. Designed for the use of on-ship legionnaires serving the Republic."
icon = 'icons/clothing/under/uniforms/tcaf_uniform.dmi'
contained_sprite = TRUE
icon_state = "tcaf_armsman_uniform"
item_state = "tcaf_armsman_uniform"
worn_state = "tcaf_armsman_uniform"

/obj/item/clothing/under/offworlder
name = "\improper CR suit"
desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear."
Expand Down
4 changes: 4 additions & 0 deletions code/modules/heavy_vehicle/premade/powerloader.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
name = "damaged solarian powerloader"
h_l_hand = null

/mob/living/heavy_vehicle/premade/ripley/loader/tcaf
name = "TCAF powerloader"
e_color = COLOR_TCFL

/mob/living/heavy_vehicle/premade/ripley/janitorial
name = "janitorial power loader"
desc = "A standard cargo-handling power loader converted into a cleaning machine."
Expand Down
60 changes: 60 additions & 0 deletions html/changelogs/hazelmouse-tcafcorvette.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: hazelmouse

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Remaps the Tau Ceti Armed Forces corvette ghostrole map to fit newer mapping standards. Go Biesel!"
- rscadd: "Adds a variety of Tau Ceti Armed Forces uniform assets to the codebase, including assets for officers and non-combatants, sprited by NobleRow."
- bugfix: "The TCAF jacket is no longer invisible when worn."
Binary file modified icons/clothing/head/pilot_helmets.dmi
Binary file not shown.
Binary file added icons/clothing/suits/coats/tcaf_coat.dmi
Binary file not shown.
Binary file modified icons/clothing/under/uniforms/tcaf_uniform.dmi
Binary file not shown.
Binary file modified icons/mob/suit.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/overmap/overmap_ships.dmi
Binary file not shown.
Loading
Loading