Merge pull request #1625 from SquishyRolls/threepwood

Monkeying Around Update
This commit is contained in:
QuoteFox
2022-06-08 04:24:46 +01:00
committed by GitHub
17 changed files with 61 additions and 4 deletions
+3
View File
@@ -112,6 +112,9 @@
/obj/item/clothing/head/wig/random = 3,
/obj/item/clothing/suit/ran = 2,
/obj/item/clothing/head/ran = 2,
/obj/item/clothing/suit/threepwoodjacket = 3,
/obj/item/clothing/under/threepwood = 2,
/obj/item/clothing/shoes/threepwoodboots = 1,
/obj/item/clothing/under/vaultsuit = 3)
contraband = list(/obj/item/clothing/suit/judgerobe = 1,
/obj/item/clothing/head/powdered_wig = 1,
+41 -3
View File
@@ -160,9 +160,6 @@ obj/item/clothing/neck/stole/black
var/firstpickup = TRUE
var/pickupsound = TRUE
/obj/item/clothing/under/vaultsuit/no_sound
pickupsound = FALSE
/obj/item/clothing/under/vaultsuit/equipped(mob/user, slot)
. = ..()
if(!pickupsound)
@@ -198,3 +195,44 @@ obj/item/clothing/neck/stole/black
body_parts_covered = CHEST|LEGS|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
/obj/item/clothing/suit/threepwoodjacket
name = "threepwood's jacket"
desc = "A jacket fit for a Mighty Pirate!"
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
icon_state = "threepwoodjacket"
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
item_state = "b_suit"
var/firstpickup = TRUE
var/pickupsound = TRUE
/obj/item/clothing/suit/threepwoodjacket/equipped(mob/user, slot)
. = ..()
if(!pickupsound)
return
if(!ishuman(user))
return
if(slot == SLOT_WEAR_SUIT)
if(!firstpickup)
SEND_SOUND(user, sound('hyperstation/sound/effects/vaultsuit/FalloutEXPUp.ogg', volume = 00))
else
firstpickup = FALSE
SEND_SOUND(user, sound('hyperstation/sound/effects/vaultsuit/bartandfink.ogg', volume = 60))
return
/obj/item/clothing/under/threepwood
name = "threepwood's outfit"
desc = "An outfit fit for a Mighty Pirate!."
icon = 'hyperstation/icons/obj/clothing/uniforms.dmi'
icon_state = "threepwood"
alternate_worn_icon = 'hyperstation/icons/mobs/uniforms.dmi'
item_state = "w_suit"
can_adjust = FALSE
/obj/item/clothing/shoes/threepwoodboots
name = "threepwood's boots"
desc = "A pair of boots fit for a Mighty Pirate!."
icon = 'hyperstation/icons/obj/clothing/shoes.dmi'
icon_state = "threepwoodboots"
alternate_worn_icon = 'hyperstation/icons/obj/clothing/shoes.dmi'
item_state = "threepwoodboots"
alternate_worn_icon = 'hyperstation/icons/mobs/feet.dmi'
Binary file not shown.

Before

Width:  |  Height:  |  Size: 613 B

After

Width:  |  Height:  |  Size: 727 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 471 B

After

Width:  |  Height:  |  Size: 550 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 444 KiB

After

Width:  |  Height:  |  Size: 445 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 382 KiB

After

Width:  |  Height:  |  Size: 383 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

@@ -111,4 +111,9 @@
/datum/gear/cowboyboots/black
name = "Cowboy Boots, Black"
category = SLOT_SHOES
path = /obj/item/clothing/shoes/cowboyboots/black
path = /obj/item/clothing/shoes/cowboyboots/black
/datum/gear/threepwoodboots
name = "theepwood's boots"
category = SLOT_SHOES
path = /obj/item/clothing/shoes/threepwoodboots
@@ -259,3 +259,8 @@
name = "Bathrobe"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/bathrobe
/datum/gear/uniform/threepwoodjacket
name = "threepwood's jacket"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/threepwoodjacket
@@ -541,4 +541,10 @@
name = "vault jumpsuit"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/vaultsuit
cost = 1
/datum/gear/threepwood
name = "threepwood's outfit"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/threepwood
cost = 1
Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 435 KiB

After

Width:  |  Height:  |  Size: 436 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 KiB

After

Width:  |  Height:  |  Size: 341 KiB