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.

Sign up for GitHub

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

Jump to bottom

Adds 4 cool jackets #11930

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
+30 −1
Open

Adds 4 cool jackets #11930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
986b3e1
kimkaneda
ClownMoff Oct 29, 2024
c3d5650
jacket
ClownMoff Nov 23, 2024
0fe7a90
the code part
ClownMoff Nov 23, 2024
9510078
Forgot to add this banger
ClownMoff Nov 23, 2024
708aada
oopsies
ClownMoff Nov 23, 2024
bfe8d43
Update jacket.dm
ClownMoff Nov 23, 2024
7b2869b
Summary (required)
ClownMoff Nov 23, 2024
10ffb84
Summary(Required)
ClownMoff Nov 23, 2024
4d431fc
update the icon names on the /obj/ icons
ClownMoff Nov 23, 2024
bb56683
Update jacket.dm
ClownMoff Nov 23, 2024
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
25 changes: 25 additions & 0 deletions code/modules/clothing/suits/jacket.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,28 @@
desc = "A fancy coat made of silk. This one is blue."
icon_state = "aristo_blue"
item_state = "aristo_blue"

// New COOL jackets
/obj/item/clothing/suit/jacket/undergroundserpents //www.youtube.com/watch?v=S0ximxe4XtU&t=61s
name = "Underground Serpents jacket"
desc = "Underground Serpents Jacket rules, we are the underground serpents. That's us, and we rule! ."
icon_state = "userpents_jacket"
item_state = "userpents_jacket"

/obj/item/clothing/suit/jacket/teenbiker
name = "Teen biker jacket"
desc = "A red jacket with a pill on its back."
icon_state = "teenbiker_jacket"
item_state = "teenbiker_jacket"

/obj/item/clothing/suit/jacket/driver
name = "Driver jacket"
desc = "A white and black jacket with a golden scorpion on its back. Perfect for driving through the night."
icon_state = "driver_jacket"
item_state = "driver_jacket"

/obj/item/clothing/suit/jacket/liutenant
name = "Liutenant Vest"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The correct spelling is lieutenant

desc = "A short orange vest that once belonged to a liutenant."
icon_state = "liutenant_jacket"
item_state = "liutenant_jacket"
6 changes: 5 additions & 1 deletion code/modules/vending/autodrobe.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,11 @@
/obj/item/clothing/under/dress/sailor = 1,
/obj/item/clothing/head/wig/random = 3,
/obj/item/clothing/head/costume/delinquent = 1,
/obj/item/clothing/ears/headphones = 2)
/obj/item/clothing/ears/headphones = 2,
/obj/item/clothing/suit/jacket/undergroundserpents = 1,
/obj/item/clothing/suit/jacket/liutenant = 1,
/obj/item/clothing/suit/jacket/teenbiker = 1,
/obj/item/clothing/suit/jacket/driver = 1)

contraband = list(/obj/item/clothing/suit/costume/judgerobe = 1,
/obj/item/clothing/head/costume/powdered_wig = 1,
Expand Down
Binary file modified icons/mob/clothing/suits/jacket.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/suits/jacket.dmi
View file
Open in desktop
Binary file not shown.
Loading