cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Paradise's soul removal part one of many: Captain's drip and resprite (#18891)

Browse Source 
* The sprites and stuff

* Vox re-add

* Why did I do this

* Last tweaks

* Pixel differences

* I have decided that captains need a beret

* I have decided that Ian needs drip too

* This exists sadly

* I forgor the gloves 💀

* CONFLICTSSSSSS

* "empty" commit

* White tunic

I don't get the appeal still

* bluE

* Painful

This will most likely get closed anyway so whatever

* OLD TUNICCCCCCCCC

* Conflicts

* Loadout captain's berets

* More conflicts, yay
This commit is contained in:
ElorgRHG
2022-09-17 12:13:58 +02:00
committed by GitHub
parent 938fbb5004
commit e4e06f2759
32 changed files with 114 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/garment.dm
+10 -4
View File
@@ -28,13 +28,19 @@
desc = "A bag for storing extra clothes and shoes. This one belongs to the captain."
/obj/item/storage/bag/garment/captain/populate_contents()
new /obj/item/clothing/head/caphat(src)
new /obj/item/clothing/head/caphat/parade(src)
new /obj/item/clothing/suit/captunic(src)
new /obj/item/clothing/suit/captunic/capjacket(src)
new /obj/item/clothing/head/caphat/beret(src)
new /obj/item/clothing/head/caphat/beret/white(src)
new /obj/item/clothing/head/crown/fancy(src)
new /obj/item/clothing/suit/armor/vest/capcarapace(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/jacket(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/jacket/tunic(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/coat(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/coat/white(src)
new /obj/item/clothing/suit/mantle/armor/captain(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
new /obj/item/clothing/under/captainparade(src)
new /obj/item/clothing/under/rank/captain(src)
new /obj/item/clothing/under/rank/captain/parade(src)
new /obj/item/clothing/under/dress/dress_cap(src)
new /obj/item/clothing/gloves/color/captain(src)
new /obj/item/clothing/shoes/brown(src)
code/modules/client/preference/loadout/loadout_hat.dm
+10
View File
@@ -153,6 +153,16 @@
main_typepath = /datum/gear/hat/beret_job
subtype_selection_cost = FALSE
/datum/gear/hat/beret_job/captain
display_name = "Beret, captain's"
path = /obj/item/clothing/head/caphat/beret
allowed_roles = list("Captain")
/datum/gear/hat/beret_job/captain_white
display_name = "Beret, captain's white"
path = /obj/item/clothing/head/caphat/beret/white
allowed_roles = list("Captain")
/datum/gear/hat/beret_job/sec
display_name = "Beret, security"
path = /obj/item/clothing/head/beret/sec
code/modules/clothing/gloves/color.dm
+7 -1
View File
@@ -239,7 +239,7 @@
name = "captain's gloves"
desc = "Regal blue gloves, with a nice gold trim. Swanky."
icon_state = "captain"
item_state = "egloves"
item_state = "captain"
item_color = "captain"
siemens_coefficient = 0
permeability_coefficient = 0.05
@@ -249,6 +249,12 @@
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
strip_delay = 60
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 115, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi',
)
/obj/item/clothing/gloves/furgloves
desc = "These gloves are warm and furry."
code/modules/clothing/head/collectable.dm
+2 -2
View File
@@ -48,8 +48,8 @@
/obj/item/clothing/head/collectable/captain
name = "collectable captain's hat"
desc = "A Collectable Hat that'll make you look just like a real comdom!"
icon_state = "captain"
item_state = "caphat"
icon_state = "captain_hat"
item_state = "captain_hat"
dog_fashion = /datum/dog_fashion/head/captain
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi')
code/modules/clothing/head/jobs.dm
+23 -6
View File
@@ -17,20 +17,37 @@
//Captain
/obj/item/clothing/head/caphat
name = "captain's hat"
icon_state = "captain"
desc = "It's good being the king."
item_state = "caphat"
icon_state = "captain_hat"
item_state = "captain_hat"
armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/captain
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi')
//Captain: no longer space-worthy
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head.dmi',
)
/obj/item/clothing/head/caphat/parade
name = "captain's parade cap"
desc = "Worn only by Captains with an abundance of class."
icon_state = "capcap"
dog_fashion = /datum/dog_fashion/head/captain
icon_state = "captain_cap"
/obj/item/clothing/head/caphat/beret
name = "captain's beret"
desc = "For Captains that are more inclined towards style."
icon_state = "captain_beret"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
)
/obj/item/clothing/head/caphat/beret/white
name = "captain's white beret"
desc = "For Captains that are more inclined towards style, and for the color white."
icon_state = "captain_beret_white"
//Head of Personnel
/obj/item/clothing/head/hopcap
code/modules/clothing/suits/armor.dm
+39 -5
View File
@@ -155,21 +155,55 @@
desc = "A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets."
icon_state = "warden_jacket_alt"
//Captain
/obj/item/clothing/suit/armor/vest/capcarapace
name = "captain's carapace"
desc = "An armored vest reinforced with ceramic plates and pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."
icon_state = "capcarapace"
icon_state = "captain_carapace"
item_state = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
armor = list(MELEE = 50, BULLET = 35, LASER = 50, ENERGY = 5, BOMB = 15, BIO = 0, RAD = 0, FIRE = INFINITY, ACID = 450)
dog_fashion = null
resistance_flags = FIRE_PROOF
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/flash, /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/clothing/suit/armor/vest/capcarapace/alt
name = "captain's parade jacket"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
)
/obj/item/clothing/suit/armor/vest/capcarapace/jacket
name = "captain's jacket"
desc = "A less formal jacket for everyday captain use."
icon_state = "captain_jacket"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
armor = list(MELEE = 40, BULLET = 20, LASER = 25, ENERGY = 5, BOMB = 15, BIO = 0, RAD = 0, FIRE = INFINITY, ACID = 450)
flags_inv = HIDEJUMPSUIT
/obj/item/clothing/suit/armor/vest/capcarapace/jacket/tunic
name = "captain's tunic"
desc = "Worn by a Captain to show their class."
icon_state = "captain_tunic"
/obj/item/clothing/suit/armor/vest/capcarapace/coat
name = "captain's formal coat"
desc = "For when an armored vest isn't fashionable enough."
icon_state = "capformal"
item_state = "capspacesuit"
icon_state = "captain_formal"
armor = list(MELEE = 35, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 10, BIO = 0, RAD = 0, FIRE = INFINITY, ACID = 450)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
/obj/item/clothing/suit/armor/vest/capcarapace/coat/white
name = "captain's long white tunic"
desc = "An old style captain tunic. Makes you look and feel like you're wearing a cardboard box with arm holes cut in it but looks like it would be great for a wedding... or a funeral."
icon_state = "captain_white"
sprite_sheets = list( //Drask look fine in the regular human version
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
)
/obj/item/clothing/suit/armor/riot
name = "riot suit"
code/modules/clothing/suits/jobs.dm
-26
View File
@@ -29,32 +29,6 @@
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
//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 = UPPER_TORSO|LOWER_TORSO|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/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/captunic/capjacket
name = "captain's uniform jacket"
desc = "A less formal jacket for everyday captain use."
icon_state = "capjacket"
item_state = "bio_suit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
/obj/item/clothing/suit/mantle/armor/captain
name = "captain's cloak"
desc = "An armor-plated piece of fashion for the ruling elite. Protect your upper half in style."
code/modules/clothing/under/jobs/civilian.dm
+14
View File
@@ -14,6 +14,20 @@
item_state = "caparmor"
item_color = "captain"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
"Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
"Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/uniform.dmi',
)
/obj/item/clothing/under/rank/captain/parade
name = "captain's parade uniform"
desc = "A captain's luxury-wear, for special occasions."
icon_state = "captain_parade"
item_state = "by_suit"
item_color = "captain_parade"
/obj/item/clothing/under/rank/cargo
name = "quartermaster's jumpsuit"
desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
code/modules/clothing/under/miscellaneous.dm
+9 -10
View File
@@ -451,10 +451,16 @@
item_color = "dress_rd"
/obj/item/clothing/under/dress/dress_cap
name = "captain's dress uniform"
name = "captain's dress"
desc = "Feminine fashion for the style concious captain."
icon_state = "dress_cap"
item_color = "dress_cap"
icon_state = "captain_dress"
item_color = "captain_dress"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/uniform.dmi',
"Drask" = 'icons/mob/clothing/species/drask/uniform.dmi',
"Grey" = 'icons/mob/clothing/species/grey/uniform.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/uniform.dmi',
)
/obj/item/clothing/under/dress/dress_hop
name = "head of personal's dress uniform"
@@ -531,13 +537,6 @@
item_color = "sundress"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/captainparade
name = "captain's parade uniform"
desc = "A captain's luxury-wear, for special occasions."
icon_state = "captain_parade"
item_state = "by_suit"
item_color = "captain_parade"
/obj/item/clothing/under/roman
name = "roman armor"
desc = "An ancient Roman armor. Made of metallic strips and leather straps."