Skip to content

Commit

Permalink
sing a song of sex but a bucket full of dosh
Browse files Browse the repository at this point in the history
dable dable dable dable bosh bosh bosh
  • Loading branch information
Paxilmaniac committed Dec 4, 2024
1 parent d5b92e2 commit f1e5f58
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 78 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

/obj/item/storage/bag/garment/hop/PopulateContents()
. = ..()
new /obj/item/clothing/under/misc/doppler_uniform/service(src)
new /obj/item/clothing/under/misc/doppler_uniform/command(src)
new /obj/item/clothing/neck/doppler_mantle/service(src)

Check failure on line 11 in modular_doppler/modular_cosmetics/code/garment_bag_overrides.dm

View workflow job for this annotation

GitHub Actions / Run Linters

failed to resolve path /obj/item/clothing/neck/doppler_mantle/service

Check failure on line 11 in modular_doppler/modular_cosmetics/code/garment_bag_overrides.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0404: Path /obj/item/clothing/neck/doppler_mantle/service does not exist
new /obj/item/clothing/head/beret/doppler_command/service(src)
new /obj/item/clothing/head/beret/doppler_command/command(src)
new /obj/item/clothing/head/utility/hardhat/welding/doppler_command/service(src)

Check failure on line 13 in modular_doppler/modular_cosmetics/code/garment_bag_overrides.dm

View workflow job for this annotation

GitHub Actions / Run Linters

failed to resolve path /obj/item/clothing/head/utility/hardhat/welding/doppler_command/service

Check failure on line 13 in modular_doppler/modular_cosmetics/code/garment_bag_overrides.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0404: Path /obj/item/clothing/head/utility/hardhat/welding/doppler_command/service does not exist

/obj/item/storage/bag/garment/hos/PopulateContents()
Expand Down
71 changes: 19 additions & 52 deletions modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm
Original file line number Diff line number Diff line change
@@ -1,66 +1,49 @@
// Cool firehelmets

/obj/item/clothing/head/utility/hardhat/welding/doppler_command
name = "generic doppler command hardhat"
desc = "You shouldn't be seeing this. Yell at Naaka."
name = "generic command hardhat"
desc = "A heavy-duty hardhat for protecting the heads of the heads when everything starts to go wrong."
icon = 'modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hardhats.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi'
resistance_flags = FIRE_PROOF | ACID_PROOF
icon_state = null
hat_type = null

/obj/item/clothing/head/utility/hardhat/welding/doppler_command/medical
name = "doppler medical hardhat"
desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations."
name = "medical command hardhat"
icon_state = "hardhat0_med"
hat_type = "med"

/obj/item/clothing/head/utility/hardhat/welding/doppler_command/science
name = "doppler science hardhat"
desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations."
name = "science command hardhat"
icon_state = "hardhat0_sci"
hat_type = "sci"

/obj/item/clothing/head/utility/hardhat/welding/doppler_command/engineering
name = "doppler engineering hardhat"
desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations."
name = "engineering command hardhat"
icon_state = "hardhat0_eng"
hat_type = "eng"

/obj/item/clothing/head/utility/hardhat/welding/doppler_command/cargo
name = "doppler cargo hardhat"
desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations."
name = "supply command hardhat"
icon_state = "hardhat0_cargo"
hat_type = "cargo"

/obj/item/clothing/head/utility/hardhat/welding/doppler_command/service
name = "doppler service hardhat"
desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations."
icon_state = "hardhat0_serv"
hat_type = "serv"

/obj/item/clothing/head/utility/hardhat/welding/doppler_command/command
name = "doppler command hardhat"
desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations."
name = "command hardhat"
icon_state = "hardhat0_cmd"
hat_type = "cmd"

/obj/item/clothing/head/utility/hardhat/welding/doppler_command/performer
name = "doppler performer hardhat"
desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations."
icon_state = "hardhat0_perf"
hat_type = "perf"

/obj/item/clothing/head/utility/hardhat/welding/doppler_command/security
name = "doppler security hardhat"
desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations."
name = "security command hardhat"
icon_state = "hardhat0_sec"
hat_type = "sec"

/// Beret but cooler


/// Beret breaker
/obj/item/clothing/head/beret/doppler_command
name = "generic doppler command beret"
desc = "You shouldn't be seeing this. Yell at Naaka."
name = "generic command beret"
desc = "A slim beret denoting the wearer as the command for some aspect of the station."
icon = 'modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hats.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi'
icon_state = null
Expand All @@ -72,41 +55,25 @@
flags_1 = NONE

/obj/item/clothing/head/beret/doppler_command/medical
name = "doppler medical beret"
desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations."
name = "medical command beret"
icon_state = "doppler_med"

/obj/item/clothing/head/beret/doppler_command/science
name = "doppler science beret"
desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations."
name = "science command beret"
icon_state = "doppler_sci"

/obj/item/clothing/head/beret/doppler_command/engineering
name = "doppler engineering beret"
desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations."
name = "engineering command beret"
icon_state = "doppler_eng"

/obj/item/clothing/head/beret/doppler_command/cargo
name = "doppler cargo beret"
desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations."
name = "supply command beret"
icon_state = "doppler_cargo"

/obj/item/clothing/head/beret/doppler_command/service
name = "doppler service beret"
desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations."
icon_state = "doppler_serv"

/obj/item/clothing/head/beret/doppler_command/command
name = "doppler command beret"
desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations."
name = "command beret"
icon_state = "doppler_cmd"

/obj/item/clothing/head/beret/doppler_command/performer
name = "doppler performer beret"
desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations."
icon_state = "doppler_perf"

/obj/item/clothing/head/beret/doppler_command/security
name = "doppler security beret"
desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations."
name = "security command beret"
icon_state = "doppler_sec"
Original file line number Diff line number Diff line change
@@ -1,49 +1,34 @@
/obj/item/clothing/neck/doppler_mantle
name = "generic doppler mantle"
desc = "You shouldn't be seeing this. Yell at Naaka."
name = "generic command mantle"
desc = "A command mantle made of fire and acid proof materials to protect the wearer."
icon = 'modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi'
icon_state = ""
inhand_icon_state = null
w_class = WEIGHT_CLASS_SMALL
body_parts_covered = CHEST|ARMS
resistance_flags = FIRE_PROOF | ACID_PROOF

/obj/item/clothing/neck/doppler_mantle/medical
name = "doppler medical mantle"
desc = "A stylish command mantle from Doppler Shift-series stations."
name = "medical command mantle"
icon_state = "doppler_med"

/obj/item/clothing/neck/doppler_mantle/science
name = "doppler science mantle"
desc = "A stylish command mantle from Doppler Shift-series stations."
name = "science command mantle"
icon_state = "doppler_sci"

/obj/item/clothing/neck/doppler_mantle/engineering
name = "doppler engineering mantle"
desc = "A stylish command mantle from Doppler Shift-series stations."
name = "engineering command mantle"
icon_state = "doppler_eng"

/obj/item/clothing/neck/doppler_mantle/cargo
name = "doppler cargo mantle"
desc = "A stylish command mantle from Doppler Shift-series stations."
name = "supply command mantle"
icon_state = "doppler_cargo"

/obj/item/clothing/neck/doppler_mantle/service
name = "doppler service mantle"
desc = "A stylish command mantle from Doppler Shift-series stations."
icon_state = "doppler_serv"

/obj/item/clothing/neck/doppler_mantle/command
name = "doppler command mantle"
desc = "A stylish command mantle from Doppler Shift-series stations."
name = "command mantle"
icon_state = "doppler_cmd"

/obj/item/clothing/neck/doppler_mantle/performer
name = "doppler performer mantle"
desc = "A stylish command mantle from Doppler Shift-series stations."
icon_state = "doppler_perf"

/obj/item/clothing/neck/doppler_mantle/security
name = "doppler security mantle"
desc = "A stylish command mantle from Doppler Shift-series stations."
name = "security command mantle"
icon_state = "doppler_sec"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit f1e5f58

Please sign in to comment.