shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10488 from Xantholne/xantholne-cowboy02

Browse Source 
Red Dead Redemption 2 but it's a crappy 2D space man game
This commit is contained in:
kevinz000
2020-01-10 14:01:06 -08:00
committed by GitHub
parent d4592449d2 753c572a5e
commit 8f60099595
11 changed files with 126 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
code/modules/clothing/head/misc.dm
View File

@@ -392,3 +392,33 @@
desc = "A green Christmas Hat! How festive!"
icon_state = "christmashatg"
item_state = "christmashatg"
/obj/item/clothing/head/cowboyhat
name = "cowboy hat"
desc = "A standard brown cowboy hat, yeehaw."
icon_state = "cowboyhat"
item_state= "cowboyhat"
/obj/item/clothing/head/cowboyhat/black
name = "black cowboy hat"
desc = "A a black cowboy hat, perfect for any outlaw"
icon_state = "cowboyhat_black"
item_state= "cowboyhat_black"
/obj/item/clothing/head/cowboyhat/white
name = "white cowboy hat"
desc = "A white cowboy hat, perfect for your every day rancher"
icon_state = "cowboyhat_white"
item_state= "cowboyhat_white"
/obj/item/clothing/head/cowboyhat/pink
name = "pink cowboy hat"
desc = "A pink cowboy? more like cowgirl hat, just don't be a buckle bunny."
icon_state = "cowboyhat_pink"
item_state= "cowboyhat_pink"
/obj/item/clothing/head/cowboyhat/sec
name = "security cowboy hat"
desc = "A security cowboy hat, perfect for any true lawman"
icon_state = "cowboyhat_sec"
item_state= "cowboyhat_sec"

10
code/modules/clothing/shoes/miscellaneous.dm
View File

@@ -355,3 +355,13 @@
name = "blue leg wraps"
desc = "Ankle coverings. Hang ten, brother."
icon_state = "bluecuffs"
/obj/item/clothing/shoes/cowboyboots
name = "cowboy boots"
desc = "A standard pair of brown cowboy boots."
icon_state = "cowboyboots"
/obj/item/clothing/shoes/cowboyboots/black
name = "black cowboy boots"
desc = "A pair of black cowboy boots, pretty easy to scuff up."
icon_state = "cowboyboots_black"

38
code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
View File

@@ -310,4 +310,40 @@
name = "Tube Top"
icon_state = "tubetop"
has_color = TRUE
gender = FEMALE
gender = FEMALE
/datum/sprite_accessory/underwear/top/cowboyshirt
name = "Cowboy Shirt Black"
icon_state = "cowboyshirt"
/datum/sprite_accessory/underwear/top/cowboyshirt/s
name = "Cowboy Shirt Shortsleeved Black"
icon_state = "cowboyshirt_s"
/datum/sprite_accessory/underwear/top/cowboyshirt/white
name = "Cowboy Shirt White"
icon_state = "cowboyshirt_white"
/datum/sprite_accessory/underwear/top/cowboyshirt/white/s
name = "Cowboy Shirt Shortsleeved White"
icon_state = "cowboyshirt_whites"
/datum/sprite_accessory/underwear/top/cowboyshirt/navy
name = "Cowboy Shirt Navy"
icon_state = "cowboyshirt_navy"
/datum/sprite_accessory/underwear/top/cowboyshirt/navy/s
name = "Cowboy Shirt Shortsleeved Navy"
icon_state = "cowboyshirt_navys"
/datum/sprite_accessory/underwear/top/cowboyshirt/red
name = "Cowboy Shirt Red"
icon_state = "cowboyshirt_red"
/datum/sprite_accessory/underwear/top/cowboyshirt/red/s
name = "Cowboy Shirt Shortsleeved Red"
icon_state = "cowboyshirt_reds"

8
code/modules/vending/clothesmate.dm
View File

@@ -134,7 +134,13 @@
/obj/item/clothing/head/christmashatg = 3,
/obj/item/clothing/shoes/winterboots/christmasbootsr = 3,
/obj/item/clothing/shoes/winterboots/christmasbootsg = 3,
/obj/item/clothing/shoes/winterboots/santaboots = 3)
/obj/item/clothing/shoes/winterboots/santaboots = 3,
/obj/item/clothing/head/cowboyhat = 3,
/obj/item/clothing/head/cowboyhat/black = 3,
/obj/item/clothing/head/cowboyhat/white = 3,
/obj/item/clothing/head/cowboyhat/pink = 3,
/obj/item/clothing/shoes/cowboyboots = 3,
/obj/item/clothing/shoes/cowboyboots/black = 3)
contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3,
/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
/obj/item/clothing/mask/balaclava = 3,