Skip to content

Commit

Permalink
add: Added Adidas Uniform (#4381)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gottfrei authored Feb 12, 2024
1 parent 39d5e1c commit 4ef8f44
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 15 deletions.
34 changes: 19 additions & 15 deletions code/game/machinery/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1492,23 +1492,27 @@
/obj/item/clothing/under/redhawaiianshirt = 1,
/obj/item/clothing/under/pinkhawaiianshirt = 1,
/obj/item/clothing/under/bluehawaiianshirt = 1,
/obj/item/clothing/under/orangehawaiianshirt = 1)
/obj/item/clothing/under/orangehawaiianshirt = 1,
/obj/item/clothing/under/ussptracksuit_red = 4,
/obj/item/clothing/under/ussptracksuit_blue = 4)
contraband = list(/obj/item/clothing/suit/judgerobe = 1,
/obj/item/clothing/head/powdered_wig = 1,
/obj/item/gun/magic/wand = 1,
/obj/item/clothing/mask/balaclava =1,
/obj/item/clothing/under/syndicate/blackops_civ = 1,
/obj/item/clothing/glasses/thermal_fake = 1,
/obj/item/clothing/mask/horsehead = 2)
/obj/item/clothing/head/powdered_wig = 1,
/obj/item/gun/magic/wand = 1,
/obj/item/clothing/mask/balaclava =1,
/obj/item/clothing/under/syndicate/blackops_civ = 1,
/obj/item/clothing/glasses/thermal_fake = 1,
/obj/item/clothing/mask/horsehead = 2)
premium = list(/obj/item/clothing/suit/hgpirate = 1,
/obj/item/clothing/head/hgpiratecap = 1,
/obj/item/clothing/head/helmet/roman/fake = 1,
/obj/item/clothing/head/helmet/roman/legionaire/fake = 1,
/obj/item/clothing/under/roman = 1,
/obj/item/clothing/shoes/roman = 1,
/obj/item/shield/riot/roman/fake = 1,
/obj/item/clothing/under/cuban_suit = 1,
/obj/item/clothing/head/cuban_hat = 1)
/obj/item/clothing/head/hgpiratecap = 1,
/obj/item/clothing/head/helmet/roman/fake = 1,
/obj/item/clothing/head/helmet/roman/legionaire/fake = 1,
/obj/item/clothing/under/roman = 1,
/obj/item/clothing/shoes/roman = 1,
/obj/item/shield/riot/roman/fake = 1,
/obj/item/clothing/under/cuban_suit = 1,
/obj/item/clothing/head/cuban_hat = 1,
/obj/item/clothing/under/ussptracksuit_black = 1,
/obj/item/clothing/under/ussptracksuit_white = 1)
refill_canister = /obj/item/vending_refill/autodrobe

/obj/machinery/vending/dinnerware
Expand Down
12 changes: 12 additions & 0 deletions code/modules/client/preference/loadout/loadout_donor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
sort_category = "Donor"
subtype_path = /datum/gear/donor

/datum/gear/donor/ussptracksuit_black
donator_tier = 1
cost = 1
display_name = "track suit (black)"
path = /obj/item/clothing/under/ussptracksuit_black

/datum/gear/donor/ussptracksuit_white
donator_tier = 1
cost = 1
display_name = "track suit (white)"
path = /obj/item/clothing/under/ussptracksuit_white

/datum/gear/donor/kittyears
display_name = "Kitty ears"
path = /obj/item/clothing/head/kitty
Expand Down
10 changes: 10 additions & 0 deletions code/modules/client/preference/loadout/loadout_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -442,3 +442,13 @@
display_name = "hawaiian shirt (orange)"
description = "Come one step closer and I will knock his teeth out!"
path = /obj/item/clothing/under/orangehawaiianshirt

/datum/gear/uniform/ussptracksuit_red
display_name = "track suit (red)"
description = "A classic track suit. There is a small tag on the clothes that says \"Made in the USSP\"."
path = /obj/item/clothing/under/ussptracksuit_red

/datum/gear/uniform/ussptracksuit_blue
display_name = "track suit (blue)"
description = "A classic track suit. There is a small tag on the clothes that says \"Made in the USSP\"."
path = /obj/item/clothing/under/ussptracksuit_blue
33 changes: 33 additions & 0 deletions code/modules/clothing/under/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1077,3 +1077,36 @@
AddComponent(/datum/component/spraycan_paintable)
START_PROCESSING(SSobj, src)
update_icon()


/obj/item/clothing/under/ussptracksuit_red
name = "red track suit"
desc = "A classic track suit. There is a small tag on the clothes that says \"Made in the USSP\"."
icon_state = "ussptracksuit_red"
item_state = "ussptracksuit_red"
item_color = "ussptracksuit_red"


/obj/item/clothing/under/ussptracksuit_blue
name = "blue track suit"
desc = "A classic track suit. There is a small tag on the clothes that says \"Made in the USSP\"."
icon_state = "ussptracksuit_blue"
item_state = "ussptracksuit_blue"
item_color = "ussptracksuit_blue"


/obj/item/clothing/under/ussptracksuit_black
name = "black track suit"
desc = "A classic track suit. There is a small tag on the clothes that says \"Made in the USSP\"."
icon_state = "ussptracksuit_black"
item_state = "ussptracksuit_black"
item_color = "ussptracksuit_black"


/obj/item/clothing/under/ussptracksuit_white
name = "white track suit"
desc = "A classic track suit. There is a small tag on the clothes that says \"Made in the USSP\"."
icon_state = "ussptracksuit_white"
item_state = "ussptracksuit_white"
item_color = "ussptracksuit_white"

Binary file modified icons/mob/clothing/species/drask/uniform.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/grey/uniform.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/monkey/uniform.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/unathi/uniform.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/uniform.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/uniform.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/uniforms.dmi
Binary file not shown.

0 comments on commit 4ef8f44

Please sign in to comment.