Skip to content

Commit

Permalink
Merge pull request #128 from Mirag1993/Мердж-с-оффами
Browse files Browse the repository at this point in the history
Digi sprites for pants, cmm jumpsuit (shiptest-ss13#2457)
  • Loading branch information
MysticalFaceLesS authored Nov 9, 2023
2 parents 93c2a27 + acb2e18 commit f974c04
Show file tree
Hide file tree
Showing 11 changed files with 5 additions and 42 deletions.
9 changes: 0 additions & 9 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4990,15 +4990,6 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
"sH" = (
/obj/item/clothing/under/pants/classicjeans{
pixel_y = -5
},
/obj/item/clothing/under/pants/classicjeans{
pixel_y = -5
},
/obj/item/clothing/under/pants/classicjeans{
pixel_y = -5
},
/obj/item/clothing/suit/ianshirt,
/obj/item/clothing/suit/ianshirt,
/obj/item/clothing/suit/ianshirt,
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/independent/independent_tranquility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4729,7 +4729,6 @@
/obj/item/clothing/head/beret/chem,
/obj/item/clothing/suit/hooded/wintercoat/science,
/obj/item/clothing/suit/jacket/miljacket,
/obj/item/clothing/under/pants/mustangjeans,
/obj/item/clothing/under/dress/sundress,
/obj/item/clothing/under/color/random,
/obj/item/clothing/under/color/jumpskirt/random,
Expand Down
4 changes: 1 addition & 3 deletions code/modules/antagonists/gang/gang.dm
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,9 @@
roundend_category = "The Tunnel Snakes"
gang_name = "Tunnel Snakes"
gang_id = "TS"
acceptable_clothes = list(/obj/item/clothing/under/pants/classicjeans,
/obj/item/clothing/suit/jacket,
acceptable_clothes = list(/obj/item/clothing/suit/jacket,
/obj/item/clothing/mask/bandana/skull)
free_clothes = list(/obj/item/clothing/suit/jacket,
/obj/item/clothing/under/pants/classicjeans,
/obj/item/toy/crayon/spraycan)
gang_objective = "TUNNEL SNAKES RULE!!! Make sure that everyone knows that, by getting 25% of people on station to wear any part of our uniform! TUNNEL SNAKES RULE!!!"
antag_hud_name = "Snakes"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/awaymissions/corpse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,8 @@
name = "Beach Bum"
glasses = /obj/item/clothing/glasses/sunglasses
r_pocket = /obj/item/storage/wallet/random
l_pocket = /obj/item/reagent_containers/food/snacks/pizzaslice/dank;
uniform = /obj/item/clothing/under/pants/youngfolksjeans
l_pocket = /obj/item/reagent_containers/food/snacks/pizzaslice/dank
uniform = /obj/item/clothing/under/pants/jeans
id = /obj/item/card/id

/datum/outfit/beachbum/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
Expand Down
8 changes: 0 additions & 8 deletions code/modules/client/loadout/loadout_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@
display_name = "jeans"
path = /obj/item/clothing/under/pants/jeans

/datum/gear/uniform/pants/classicjeans
display_name = "classic jeans"
path = /obj/item/clothing/under/pants/classicjeans

/datum/gear/uniform/pants/khaki
display_name = "khaki pants"
path = /obj/item/clothing/under/pants/khaki
Expand All @@ -119,10 +115,6 @@
display_name = "black jeans"
path = /obj/item/clothing/under/pants/blackjeans

/datum/gear/uniform/pants/mustangjeans
display_name = "Must Hang jeans"
path = /obj/item/clothing/under/pants/mustangjeans

/datum/gear/uniform/pants/black
display_name = "black pants"
path = /obj/item/clothing/under/pants/black
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/under/jobs/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@
icon_state = "minuteman"
item_state = "b_suit"
can_adjust = FALSE
supports_variations = DIGITIGRADE_VARIATION

/obj/item/clothing/under/rank/security/officer/camo
name = "fatigues"
Expand Down
17 changes: 1 addition & 16 deletions code/modules/clothing/under/pants.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,13 @@
mob_overlay_icon = 'icons/mob/clothing/under/shorts_pants.dmi'
greyscale_colors = list(list(14, 10), list(16, 10), list(16, 9))
greyscale_icon_state = "pants"

/obj/item/clothing/under/pants/classicjeans
name = "classic jeans"
desc = "You feel cooler already."
icon_state = "jeansclassic"

/obj/item/clothing/under/pants/mustangjeans
name = "Must Hang jeans"
desc = "Made in the finest space jeans factory this side of Alpha Centauri."
icon_state = "jeans"
custom_price = 180
supports_variations = DIGITIGRADE_VARIATION

/obj/item/clothing/under/pants/blackjeans
name = "black jeans"
desc = "Only for those who can pull it off."
icon_state = "jeansblack"

/obj/item/clothing/under/pants/youngfolksjeans
name = "Young Folks jeans"
desc = "For those tired of boring old jeans. Relive the passion of your youth!"
icon_state = "jeansclassic"

/obj/item/clothing/under/pants/white
name = "white pants"
desc = "Plain white pants. Boring."
Expand Down
1 change: 0 additions & 1 deletion code/modules/jobs/job_types/chaplain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
belt = /obj/item/pda/chaplain
ears = /obj/item/radio/headset/headset_srv
uniform = /obj/item/clothing/under/rank/civilian/chaplain
alt_uniform = /obj/item/clothing/under/pants/youngfolksjeans //WS Edit - Alt Uniforms
backpack_contents = list(
/obj/item/stamp/chap = 1,
/obj/item/camera/spooky = 1
Expand Down
2 changes: 0 additions & 2 deletions code/modules/vending/clothesmate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
/obj/item/storage/belt/fannypack/blue = 3,
/obj/item/storage/belt/fannypack/red = 3,
/obj/item/clothing/under/pants/jeans = 2,
/obj/item/clothing/under/pants/classicjeans = 2,
/obj/item/clothing/under/pants/camo = 2,
/obj/item/clothing/under/pants/blackjeans = 2,
/obj/item/clothing/under/pants/khaki = 2,
Expand Down Expand Up @@ -122,7 +121,6 @@
/obj/item/clothing/under/suit/checkered = 1,
/obj/item/clothing/suit/jacket/leather = 1,
/obj/item/clothing/suit/jacket/leather/overcoat = 1,
/obj/item/clothing/under/pants/mustangjeans = 1,
/obj/item/clothing/neck/necklace/dope = 3,
/obj/item/clothing/suit/jacket/letterman_nanotrasen = 1,
/obj/item/instrument/piano_synth/headphones/spacepods = 1)
Expand Down
Binary file modified icons/mob/clothing/under/shorts_pants.dmi
Binary file not shown.
Binary file modified icons/mob/species/misc/digitigrade.dmi
Binary file not shown.

0 comments on commit f974c04

Please sign in to comment.