Skip to content

Commit

Permalink
help
Browse files Browse the repository at this point in the history
  • Loading branch information
Imaginos16 committed Nov 6, 2023
1 parent 896244b commit 69544a7
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 24 deletions.
4 changes: 2 additions & 2 deletions code/__byond_version_compat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#endif

#if (DM_VERSION == 514 && DM_BUILD == 1589)
#error Warning! Byond 514.1589 has been known to be unstable. Use at your own risk.
#error Please consider using 514.1588.
#warn Warning! Byond 514.1589 has been known to be unstable. Use at your own risk.
#warn Please consider using 514.1588.
#endif

// Keep savefile compatibilty at minimum supported level
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
new /obj/item/clothing/under/rank/command/captain/parade(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
new /obj/item/clothing/head/caphat/parade(src)
new /obj/item/clothing/suit/captunic(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/captunic(src)
new /obj/item/clothing/head/crown/fancy(src)
new /obj/item/cartridge/captain(src)
new /obj/item/storage/box/silver_ids(src)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/gloves/color.dm
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,12 @@
strip_delay = 60
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 50)

/obj/item/clothing/gloves/color/captain/nt
desc = "Regal blue gloves, with a nice gold trim, a diamond anti-shock coating, and an integrated thermal barrier, and armoured bracers. Swanky."
name = "captain's gloves"
icon_state = "captainnt"
item_state = "egloves"

/obj/item/clothing/gloves/color/latex
name = "latex gloves"
desc = "Cheap sterile gloves made from latex. Transfers minor paramedic knowledge to the user via budget nanochips."
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@
icon_state = "carapace_ntformal"
item_state = "capspacesuit"

/obj/item/clothing/suit/armor/vest/capcarapace/captunic
name = "captain's parade coat"
desc = "Worn by a Captain to show their class."
icon_state = "carapace_formal"
item_state = "bio_suit"

/obj/item/clothing/suit/armor/vest/capcarapace/minutemen
name = "colonial minutemen general coat"
desc = "A very fancy coat used by generals of the Colonial Minutemen."
Expand Down
10 changes: 0 additions & 10 deletions code/modules/clothing/suits/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@
body_parts_covered = CHEST|GROIN|LEGS
permeability_coefficient = 0.5

//Captain
/obj/item/clothing/suit/captunic
name = "captain's parade tunic"
desc = "Worn by a Captain to show their class."
icon_state = "captunic"
item_state = "bio_suit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)

//Chef
/obj/item/clothing/suit/toggle/chef
name = "chef's apron"
Expand Down
13 changes: 2 additions & 11 deletions code/modules/jobs/job_types/captain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,27 +54,18 @@

ears = /obj/item/radio/headset/nanotrasen/captain
uniform = /obj/item/clothing/under/rank/command/captain/nt
gloves = /obj/item/clothing/gloves/color/captain/nt
shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/caphat/nt

/datum/outfit/job/captain/nt/heron
name = "Captain (Nanotrasen)"

uniform = /obj/item/clothing/under/rank/centcom/officer
gloves = /obj/item/clothing/gloves/combat
head = /obj/item/clothing/head/centhat
suit = /obj/item/clothing/suit/armor/vest/bulletproof

/datum/outfit/job/captain/solgov
name = "Captain (SolGov)"

ears = /obj/item/radio/headset/solgov/captain
shoes = /obj/item/clothing/shoes/laceup
suit = /obj/item/clothing/suit/toggle/solgov

/datum/outfit/job/captain/solgov/rebel
name = "Captain (Deserter)"
suit = /obj/item/clothing/suit/toggle/solgov/terragov

/datum/outfit/job/captain/pirate
name = "Captain (Pirate)"

Expand Down
Binary file modified icons/mob/clothing/hands.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suits/armor.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/gloves.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits/armor.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/command.dmi
Binary file not shown.

0 comments on commit 69544a7

Please sign in to comment.