Skip to content

Commit

Permalink
awful
Browse files Browse the repository at this point in the history
  • Loading branch information
meemofcourse committed Nov 18, 2023
1 parent 70b0fad commit 4adc56c
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 19 deletions.
8 changes: 4 additions & 4 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -476,11 +476,11 @@
icon_state = "JackFrostHat"
item_state = "JackFrostHat"

/obj/item/clothing/head/aclfcap
/obj/item/clothing/head/gorlexcap
name = "2nd Battlegroup peaked cap"
desc = "A cap worn by officers of the Gorlex Marauders 2nd Battlegroup, or as they say, the ACLF."
icon_state = "aclfcap"
item_state = "aclfcap"
desc = "A cap worn by officers of the Gorlex Marauders 2nd Battlegroup."
icon_state = "gorlexcap"
item_state = "gorlexcap"
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
Expand Down
15 changes: 8 additions & 7 deletions code/modules/clothing/outfits/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@

id = /obj/item/card/id/syndicate_command/captain_id
ears = /obj/item/radio/headset/syndicate/alt/captain
uniform = /obj/item/clothing/under/syndicate/aclf
uniform = /obj/item/clothing/under/syndicate/officer
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/HoS/syndicate
gloves = /obj/item/clothing/gloves/combat
Expand All @@ -232,7 +232,7 @@
/datum/outfit/job/syndicate/captain/twink
name = "Captain (Twinkleshine)"

uniform = /obj/item/clothing/under/syndicate/aclf
uniform = /obj/item/clothing/under/syndicate/officer
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
ears = /obj/item/radio/headset/syndicate/alt/captain
Expand All @@ -253,10 +253,10 @@

/datum/outfit/job/syndicate/captain/gorlex
name = "Captain (Gorlex Marauders)"
uniform = /obj/item/clothing/under/syndicate/aclf
uniform = /obj/item/clothing/under/syndicate/officer

head = /obj/item/clothing/head/aclfcap
suit = /obj/item/clothing/suit/aclf
head = /obj/item/clothing/head/gorlexcap
suit = /obj/item/clothing/suit/gorlex

/datum/outfit/job/syndicate/captain/cybersun
name = "Captain (Cybersun)"
Expand Down Expand Up @@ -441,7 +441,8 @@

/datum/outfit/job/syndicate/hos/twink
name = "Lieutenant (Twinkleshine)"
uniform = /obj/item/clothing/under/syndicate/aclf

uniform = /obj/item/clothing/under/syndicate/officer
head = /obj/item/clothing/head/HoS/beret/syndicate
ears = /obj/item/radio/headset/syndicate/alt
mask = /obj/item/clothing/mask/chameleon
Expand All @@ -451,7 +452,7 @@
belt = /obj/item/storage/belt/military/assault
shoes = /obj/item/clothing/shoes/combat
suit = /obj/item/clothing/suit/armor/vest
alt_suit = /obj/item/clothing/suit/aclf
alt_suit = /obj/item/clothing/suit/gorlex
id = /obj/item/card/id/syndicate_command/lieutenant
implants = list(/obj/item/implant/weapons_auth)
backpack_contents = list(/obj/item/melee/baton)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -686,11 +686,11 @@
item_state = "DutchJacket"
body_parts_covered = ARMS

/obj/item/clothing/suit/aclf
/obj/item/clothing/suit/gorlex
name = "\improper 2nd Battlegroup jacket"
desc = "An armored jacket worn by the Gorlex Marauders 2nd Battlegroup."
desc = "An armored jacket worn by the 2nd Battlegroup."
body_parts_covered = CHEST|GROIN|ARMS|HANDS
icon_state = "aclfjacket"
item_state = "aclfjacket"
icon_state = "gorlexjacket"
item_state = "gorlexjacket"
blood_overlay_type = "coat"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
8 changes: 4 additions & 4 deletions code/modules/clothing/under/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE

/obj/item/clothing/under/syndicate/aclf
name = "2nd Battlegroup uniform"
desc = "A black uniform worn by the officers of the Gorlex Marauders 2nd Battlegroup."
icon_state = "aclf"
/obj/item/clothing/under/syndicate/officer
name = "syndicate officer uniform"
desc = "A black uniform worn by officers of many branches of the Syndicate."
icon_state = "officer"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE

Expand Down
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/under/syndicate.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/under/syndicate.dmi
Binary file not shown.

0 comments on commit 4adc56c

Please sign in to comment.