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

Rebalances and repaths command / sec drip #2714

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion _maps/shuttles/independent/independent_halftrack.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,7 @@
/area/ship/bridge)
"Nq" = (
/obj/effect/landmark/start/head_of_security,
/obj/item/clothing/suit/armor/hos/inteq,
/obj/item/clothing/suit/,
/obj/item/clothing/head/beret/sec/hos/inteq,
/obj/item/storage/backpack/messenger/inteq,
/obj/item/storage/belt/security/webbing/inteq,
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/inteq/inteq_colossus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2640,7 +2640,7 @@
/obj/item/megaphone/command,
/obj/item/clothing/under/syndicate/inteq/skirt,
/obj/item/clothing/under/syndicate/inteq,
/obj/item/clothing/suit/armor/hos/inteq,
/obj/item/clothing/suit/armor/vest/capcarapace/inteq,
/obj/item/clothing/head/beret/sec/hos/inteq,
/obj/item/areaeditor/shuttle,
/obj/item/shield/riot/tele,
Expand All @@ -2652,7 +2652,7 @@
},
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/military/assault,
/obj/item/clothing/head/inteq_peaked,
/obj/item/clothing/head/caphat/inteq_peaked,
/turf/open/floor/carpet/orange,
/area/ship/bridge)
"Dq" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/inteq/inteq_hound.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,7 @@
/obj/item/megaphone/command,
/obj/item/clothing/under/syndicate/inteq/skirt,
/obj/item/clothing/under/syndicate/inteq,
/obj/item/clothing/suit/armor/hos/inteq,
/obj/item/clothing/suit/armor/vest/capcarapace/inteq,
/obj/item/clothing/head/beret/sec/hos/inteq,
/obj/item/radio/headset/inteq/alt/captain,
/obj/item/areaeditor/shuttle,
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/inteq/inteq_talos.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7564,7 +7564,7 @@
/obj/item/megaphone/command,
/obj/item/clothing/under/syndicate/inteq/skirt,
/obj/item/clothing/under/syndicate/inteq,
/obj/item/clothing/suit/armor/hos/inteq,
/obj/item/clothing/suit/armor/vest/capcarapace/inteq,
/obj/item/clothing/head/beret/sec/hos/inteq,
/obj/item/areaeditor/shuttle,
/obj/item/shield/riot/tele,
Expand All @@ -7587,7 +7587,7 @@
},
/obj/item/storage/belt/security/webbing/inteq/alt,
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/clothing/head/inteq_peaked,
/obj/item/clothing/head/caphat/inteq_peaked,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"YC" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/inteq/inteq_valor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2691,7 +2691,7 @@
/obj/item/megaphone/command,
/obj/item/clothing/under/syndicate/inteq/skirt,
/obj/item/clothing/under/syndicate/inteq,
/obj/item/clothing/suit/armor/hos/inteq,
/obj/item/clothing/suit/armor/vest/capcarapace/inteq,
/obj/item/clothing/head/beret/sec/hos/inteq,
/obj/structure/closet/secure_closet/wall{
dir = 4;
Expand All @@ -2703,7 +2703,7 @@
},
/obj/item/storage/lockbox/medal/sec,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/clothing/head/inteq_peaked,
/obj/item/clothing/head/caphat/inteq_peaked,
/turf/open/floor/carpet/orange,
/area/ship/bridge)
"zh" = (
Expand Down Expand Up @@ -4210,7 +4210,7 @@
/obj/item/megaphone/command,
/obj/item/clothing/under/syndicate/inteq/corpsman,
/obj/item/clothing/under/syndicate/inteq/skirt/corpsman,
/obj/item/clothing/suit/armor/hos/inteq,
/obj/item/clothing/suit/armor/vest/capcarapace/inteq,
/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt,
/obj/item/storage/backpack/messenger/med,
/obj/item/clothing/head/beret/sec/brig_phys{
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/inteq/inteq_vaquero.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@
/obj/item/megaphone/command,
/obj/item/clothing/under/syndicate/inteq/skirt,
/obj/item/clothing/under/syndicate/inteq,
/obj/item/clothing/suit/armor/hos/inteq,
/obj/item/clothing/suit/armor/vest/capcarapace/inteq,
/obj/item/clothing/head/beret/sec/hos/inteq,
/obj/item/radio/headset/inteq/alt/captain,
/obj/item/shield/riot/tele,
Expand All @@ -936,7 +936,7 @@
/obj/effect/turf_decal/corner/opaque/yellow{
dir = 1
},
/obj/item/clothing/head/inteq_peaked,
/obj/item/clothing/head/caphat/inteq_peaked,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"mE" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/roumain/srm_elder.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1995,7 +1995,7 @@
/obj/item/clothing/shoes/cowboy,
/obj/item/clothing/shoes/cowboy/black,
/obj/item/clothing/under/suit/roumain,
/obj/item/clothing/suit/armor/hos/roumain/montagne,
/obj/item/clothing/suit/armor/vest/capcarapace/roumain,
/obj/item/clothing/head/HoS/cowboy/montagne,
/obj/item/flashlight/lantern,
/obj/item/storage/fancy/candle_box{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3837,7 +3837,7 @@
/obj/item/clothing/glasses/thermal/eyepatch,
/obj/item/clothing/head/HoS/beret/syndicate,
/obj/item/clothing/head/HoS/syndicate,
/obj/item/clothing/head/ngrcap{
/obj/item/clothing/head/caphat/ngr{
pixel_x = 5;
pixel_y = -4
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_twinkleshine.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
},
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
/obj/item/clothing/head/ngrcap,
/obj/item/clothing/head/caphat/ngr,
/obj/item/clothing/shoes/combat,
/obj/item/megaphone/sec{
name = "syndicate megaphone"
Expand Down
17 changes: 2 additions & 15 deletions code/modules/clothing/head/berets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
name = "durathread beret"
desc = "A beret made from durathread, its resilient fibres provide some protection to the wearer."
icon_state = "beretdurathread"
armor = list("melee" = 15, "bullet" = 5, "laser" = 15, "energy" = 25, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 5)
armor = list("melee" = 0, "bullet" = 0, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 15, "acid" = 5)

//Civilian
/obj/item/clothing/head/beret/grey
Expand All @@ -56,7 +56,6 @@
name = "quartermaster beret"
desc = "A cargo beret with a faded medal haphazardly stitched into it. Worn by a true cargonian, it commands respect from everyone."
icon_state = "beret_qm"
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5)

/obj/item/clothing/head/beret/cargo
name = "cargo beret"
Expand All @@ -65,30 +64,25 @@

/obj/item/clothing/head/beret/mining
name = "mining beret"
desc = "A grey beret with a pickaxe insignia sewn into it. Seems to be padded and fireproofed to offer the wearer some protection."
desc = "A grey beret with a pickaxe insignia sewn into it. Seems to be fireproofed to offer the wearer some protection."
icon_state = "beret_mining"
armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 15, "bomb" = 30, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)

//Sec
/obj/item/clothing/head/beret/sec
name = "security beret"
desc = "A robust beret with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
icon_state = "beret_sec"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 60
dog_fashion = null

/obj/item/clothing/head/beret/sec/hos
name = "head of security's black beret"
desc = "A black beret with the Head of Security's insignia emblazoned on it. A symbol of excellence, a badge of courage, a mark of distinction."
icon_state = "beret_hos"
armor = list("melee" = 40, "bullet" = 30, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)

/obj/item/clothing/head/beret/sec/warden
name = "warden's beret"
desc = "A beret made with black reinforced fabric with the Warden's insignia emblazoned on it. For wardens with class."
icon_state = "beret_warden"
armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 60)

/obj/item/clothing/head/beret/sec/officer
desc = "A beret made out of black reinforced fabric with the security insignia emblazoned on it. For officers with class."
Expand Down Expand Up @@ -170,22 +164,16 @@
name = "captain beret"
desc = "A lovely blue Captain beret with a gold and white insignia. Truly fit for only the finest officers."
icon_state = "beret_captain"
armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 90

/obj/item/clothing/head/beret/hop
name = "head of personnel beret"
desc = "A lovely blue Head of Personnel's beret with a silver and white insignia. It smells faintly of paper and dogs."
icon_state = "beret_hop"
armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 90

/obj/item/clothing/head/beret/command
name = "command beret"
desc = "A modest blue command beret with a silver rank insignia. Smells of power and the sweat of assistants."
icon_state = "beret_com"
armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 15, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25)
strip_delay = 90

// SolGov

Expand All @@ -194,7 +182,6 @@
desc = "A beret with SolGov's emblem emblazoned on it. Colored in SolGov blue."
icon_state = "beret_solgov"
item_state = "beret_solgov"
armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 60)

/obj/item/clothing/head/beret/solgov/plain
name = "\improper SolGov beret"
Expand Down
34 changes: 18 additions & 16 deletions code/modules/clothing/head/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
icon_state = "captain"
item_state = "that"
flags_inv = 0
armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/captain

//Captain: This is no longer space-worthy
Expand Down Expand Up @@ -57,12 +55,25 @@
desc = "An imposing peaked cap meant for only the highest of officers of the Frontiersmen pirate fleet."
icon_state = "frontier_admiral_cap"

/obj/item/clothing/head/caphat/ngr
name = "2nd Battlegroup peaked cap"
desc = "A cap worn by officers of the Gorlex Marauders 2nd Battlegroup."
icon_state = "captain_ngr"
item_state = "captain_ngr"
flags_inv = 0

/obj/item/clothing/head/caphat/inteq_peaked
name = "inteq peaked cap"
desc = "A peaked cap for Vanguards with a commanding authority, emblazoned with the golden badge of the IRMG."
icon_state = "inteq_peaked"
item_state = "inteq_peaked"
flags_inv = 0

//Head of Personnel
/obj/item/clothing/head/hopcap
name = "head of personnel's cap"
icon_state = "hopcap"
desc = "The symbol of true bureaucratic micromanagement."
armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
dog_fashion = /datum/dog_fashion/head/head_of_personnel

/obj/item/clothing/head/hopcap/nt
Expand Down Expand Up @@ -97,7 +108,6 @@
/obj/item/clothing/head/fedora/det_hat
name = "detective's fedora"
desc = "There's only one man who can sniff out the dirty stench of crime, and he's likely wearing this hat."
armor = list("melee" = 25, "bullet" = 5, "laser" = 25, "energy" = 35, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 50)
icon_state = "detective"
var/candy_cooldown = 0
pocket_storage_component_path = /datum/component/storage/concrete/pockets/small/fedora/detective
Expand Down Expand Up @@ -135,8 +145,6 @@
name = "head of security cap"
desc = "The robust standard-issue cap of the Head of Security. For showing the officers who's in charge."
icon_state = "hoscap"
armor = list("melee" = 40, "bullet" = 30, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
strip_delay = 80

/obj/item/clothing/head/HoS/cowboy
name = "sheriff's hat"
Expand All @@ -147,10 +155,8 @@

/obj/item/clothing/head/cowboy/sec
name = "deputy hat"
desc = "A robust stetson adorned with a deputy's badge. It has a reinforced lining under the imitation leather."
desc = "A robust stetson adorned with a deputy's badge. The imitation leather is thick and worn."
icon_state = "cowboysec"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 60

/obj/item/clothing/head/cowboy/sec/minutemen
name = "colonial minutmen officer's slouch hat"
Expand Down Expand Up @@ -189,29 +195,25 @@

/obj/item/clothing/head/HoS/beret/syndicate
name = "syndicate beret"
desc = "A black beret with thick armor padding inside. Stylish and robust."
desc = "A black beret. Stylish and robust."
icon_state = "beret_officer"
item_state = "beret_officer"

/obj/item/clothing/head/warden
name = "warden's police hat"
desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts."
desc = "It's a special hat issued to the Warden of a security force. Protects the head from impacts."
icon_state = "policehelm"
armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 60)
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/warden

/obj/item/clothing/head/warden/red
name = "warden's red hat"
desc = "A warden's red hat. Looking at it gives you the feeling of wanting to keep people in cells for as long as possible."
icon_state = "wardenhat"
armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 60)
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/warden_red

/obj/item/clothing/head/warden/cowboy
name = "jailor's hat"
desc = "A menacing black stetson adorned with a jailor's badge. It has a heavily reinforced lining under the imitation leather."
desc = "A menacing black stetson hat. The imitation leather is thick and worn."
icon_state = "cowboywarden"

dog_fashion = /datum/dog_fashion/head/cowboy
Expand Down
21 changes: 0 additions & 21 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@
desc = "Ain't nobody gonna cheat the hangman in my town."
icon_state = "hunter"
item_state = "hunter"
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
resistance_flags = FIRE_PROOF | ACID_PROOF

/obj/item/clothing/head/cone
Expand Down Expand Up @@ -323,7 +322,6 @@
name = "crown"
desc = "A crown fit for a king, a petty king maybe."
icon_state = "crown"
armor = list("melee" = 15, "bullet" = 0, "laser" = 0,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF

/obj/item/clothing/head/crown/fancy
Expand Down Expand Up @@ -443,7 +441,6 @@
desc = "A cap for a party coordinator, stylish!."
icon_state = "capcap"
item_state = "that"
armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)

/obj/item/clothing/head/goatpelt
name = "goat pelt hat"
Expand All @@ -457,15 +454,6 @@
icon_state = "JackFrostHat"
item_state = "JackFrostHat"

/obj/item/clothing/head/ngrcap
name = "2nd Battlegroup peaked cap"
desc = "A cap worn by officers of the New Gorlex Republic's 2nd Battlegroup."
icon_state = "ngrcap"
item_state = "ngrcap"
flags_inv = 0
armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 60

/obj/item/clothing/head/maidheadband/syndicate
name = "tactical maid headband"
desc = "Tacticute."
Expand All @@ -478,15 +466,6 @@
icon_state = "inteqheadband"
item_state = "inteqheadband"

/obj/item/clothing/head/inteq_peaked
name = "inteq peaked cap"
desc = "A peaked cap for Vanguards with a commanding authority, emblazoned with the golden badge of the IRMG."
icon_state = "inteq_peaked"
item_state = "inteq_peaked"
flags_inv = 0
armor = list("melee" = 40, "bullet" = 30, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
strip_delay = 60

/obj/item/clothing/head/maidheadband
name = "maid headband"
desc = "Just like from one of those chinese cartoons!"
Expand Down
3 changes: 0 additions & 3 deletions code/modules/clothing/head/soft_caps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@
desc = "It's a robust baseball hat in tasteful red colour."
icon_state = "secsoft"
soft_type = "sec"
armor = list("melee" = 30, "bullet" = 25, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50)
strip_delay = 60
dog_fashion = null

/obj/item/clothing/head/soft/sec/brig_phys
Expand Down Expand Up @@ -155,7 +153,6 @@
desc = "A rich brown utility cover with the golden shield of the IRMG on it."
icon_state = "inteqsoft"
soft_type = "inteq"
armor = list("melee" = 30, "bullet" = 25, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50)
dog_fashion = null

/obj/item/clothing/head/soft/inteq/corpsman
Expand Down
Loading
Loading