cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] :siffet: (#11584)

Browse Source 
* :siffet: code

* Siffet suit icon merge

* Fix path

* Fix OTHER path

Co-authored-by: Aronai Sieyes <arokha@arokha.com>
This commit is contained in:
VirgoBot
2021-10-24 19:49:05 -04:00
committed by GitHub
co-authored by Aronai Sieyes
parent 79f1a263e4
commit 737c473e4b
11 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/loot_vr.dm
+1 -1
View File
@@ -282,7 +282,7 @@
for(var/i=0,i<num,i++)
new /mob/living/simple_mob/animal/space/carp(C)
else // Just a costume.
new /obj/item/clothing/suit/storage/hooded/carp_costume(C)
new /obj/item/clothing/suit/storage/hooded/costume/carp(C)
else if(prob(50))
if(live_cargo) // Something else very much alive and angry.
var/spawn_type = pick(/mob/living/simple_mob/animal/space/alien, /mob/living/simple_mob/animal/space/alien/drone, /mob/living/simple_mob/animal/space/alien/sentinel)
code/modules/casino/casino_prize_vendor.dm
+2 -2
View File
@@ -88,8 +88,8 @@
CASINO_PRIZE("Dolphin mask", /obj/item/clothing/mask/dolphin, 1, 50, "clothing"),
CASINO_PRIZE("Demon mask", /obj/item/clothing/mask/demon, 1, 50, "clothing"),
CASINO_PRIZE("Chameleon mask", /obj/item/clothing/under/chameleon, 1, 250, "clothing"),
CASINO_PRIZE("Ian costume", /obj/item/clothing/suit/storage/hooded/ian_costume, 1, 50, "clothing"),
CASINO_PRIZE("Carp costume", /obj/item/clothing/suit/storage/hooded/carp_costume, 1, 50, "clothing"),
CASINO_PRIZE("Ian costume", /obj/item/clothing/suit/storage/hooded/costume/ian, 1, 50, "clothing"),
CASINO_PRIZE("Carp costume", /obj/item/clothing/suit/storage/hooded/costume/carp, 1, 50, "clothing"),
)
item_list["Miscellaneous"] = list(
CASINO_PRIZE("Toy sword", /obj/item/toy/sword, 1, 50, "misc"),
code/modules/clothing/head/hood.dm
+7 -1
View File
@@ -192,4 +192,10 @@
/obj/item/clothing/head/hood/techpriest
name = "techpriest hood"
desc = "A techpriest hood."
icon_state = "techpriesthood"
icon_state = "techpriesthood"
/obj/item/clothing/head/hood/siffet_hood
name = "siffet hood"
desc = "A hood that looks vaguely like a siffet's head. Guaranteed to traumatize your Promethean coworkers."
icon_state = "siffet"
item_state_slots = list(slot_r_hand_str = "siffet", slot_l_hand_str = "siffet")
code/modules/clothing/suits/hooded.dm
+16 -10
View File
@@ -63,26 +63,32 @@
else
RemoveHood()
/obj/item/clothing/suit/storage/hooded/carp_costume
/obj/item/clothing/suit/storage/hooded/costume
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
action_button_name = "Toggle Hood"
/obj/item/clothing/suit/storage/hooded/costume/siffet
name = "siffet costume"
desc = "A costume made from 'synthetic' siffet fur, it smells like a weasel nest."
icon_state = "siffet"
item_state_slots = list(slot_r_hand_str = "siffet", slot_l_hand_str = "siffet")
hoodtype = /obj/item/clothing/head/hood/siffet_hood
/obj/item/clothing/suit/storage/hooded/costume/carp
name = "carp costume"
desc = "A costume made from 'synthetic' carp scales, it smells."
icon_state = "carp_casual"
item_state_slots = list(slot_r_hand_str = "carp_casual", slot_l_hand_str = "carp_casual") //Does not exist -S2-
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE //Space carp like space, so you should too
action_button_name = "Toggle Carp Hood"
hoodtype = /obj/item/clothing/head/hood/carp_hood
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE //Space carp like space, so you should too
/obj/item/clothing/suit/storage/hooded/ian_costume //It's Ian, rub his bell- oh god what happened to his inside parts?
/obj/item/clothing/suit/storage/hooded/costume/ian //It's Ian, rub his bell- oh god what happened to his inside parts?
name = "corgi costume"
desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs."
icon_state = "ian"
item_state_slots = list(slot_r_hand_str = "ian", slot_l_hand_str = "ian") //Does not exist -S2-
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER
action_button_name = "Toggle Ian Hood"
hoodtype = /obj/item/clothing/head/hood/ian_hood
// winter coats go here
code/modules/economy/vending_machines_vr.dm
+12 -12
View File
@@ -1325,8 +1325,8 @@
product_ads = "Don't let your art be stifled!;Remember, practice makes perfect!;Break a leg!;Don't make me get the cane!;Thespian's Delight entering stage right!;Costumes for your acting needs!"
icon = 'icons/obj/vending.dmi'
icon_state = "theater"
products = list(/obj/item/clothing/suit/storage/hooded/carp_costume = 3,
/obj/item/clothing/suit/storage/hooded/carp_costume = 3,
products = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 3,
/obj/item/clothing/suit/storage/hooded/costume/carp = 3,
/obj/item/clothing/suit/chickensuit = 3,
/obj/item/clothing/head/chicken = 3,
/obj/item/clothing/head/helmet/gladiator = 3,
@@ -1390,8 +1390,8 @@
/obj/item/clothing/gloves/combat/knight_costume/brown = 3,
/obj/item/clothing/shoes/knight_costume = 3,
/obj/item/clothing/shoes/knight_costume/black = 3)
prices = list(/obj/item/clothing/suit/storage/hooded/carp_costume = 200,
/obj/item/clothing/suit/storage/hooded/carp_costume = 200,
prices = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 200,
/obj/item/clothing/suit/storage/hooded/costume/carp = 200,
/obj/item/clothing/suit/chickensuit = 200,
/obj/item/clothing/head/chicken = 200,
/obj/item/clothing/head/helmet/gladiator = 300,
@@ -2505,8 +2505,8 @@
product_ads = "Don't let your art be stifled!;Remember, practice makes perfect!;Break a leg!;Don't make me get the cane!;Thespian's Delight entering stage right!;Costumes for your acting needs!"
icon = 'icons/obj/vending.dmi'
icon_state = "theater"
products = list(/obj/item/clothing/suit/storage/hooded/carp_costume = 3,
/obj/item/clothing/suit/storage/hooded/carp_costume = 3,
products = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 3,
/obj/item/clothing/suit/storage/hooded/costume/carp = 3,
/obj/item/clothing/suit/chickensuit = 3,
/obj/item/clothing/head/chicken = 3,
/obj/item/clothing/head/helmet/gladiator = 3,
@@ -2570,8 +2570,8 @@
/obj/item/clothing/gloves/combat/knight_costume/brown = 3,
/obj/item/clothing/shoes/knight_costume = 3,
/obj/item/clothing/shoes/knight_costume/black = 3)
prices = list(/obj/item/clothing/suit/storage/hooded/carp_costume = 200,
/obj/item/clothing/suit/storage/hooded/carp_costume = 200,
prices = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 200,
/obj/item/clothing/suit/storage/hooded/costume/carp = 200,
/obj/item/clothing/suit/chickensuit = 200,
/obj/item/clothing/head/chicken = 200,
/obj/item/clothing/head/helmet/gladiator = 300,
@@ -2668,8 +2668,8 @@
/obj/item/clothing/under/color/yellow = 5,
/obj/item/clothing/shoes/black = 5,
/obj/item/clothing/shoes/white = 5,
/obj/item/clothing/suit/storage/hooded/carp_costume = 3,
/obj/item/clothing/suit/storage/hooded/carp_costume = 3,
/obj/item/clothing/suit/storage/hooded/costume/carp = 3,
/obj/item/clothing/suit/storage/hooded/costume/carp = 3,
/obj/item/clothing/suit/chickensuit = 3,
/obj/item/clothing/head/chicken = 3,
/obj/item/clothing/head/helmet/gladiator = 3,
@@ -3411,8 +3411,8 @@
product_ads = "Don't let your art be stifled!;Remember, practice makes perfect!;Break a leg!;Don't make me get the cane!;Thespian's Delight entering stage right!;Costumes for your acting needs!"
icon = 'icons/obj/vending.dmi'
icon_state = "theater"
products = list(/obj/item/clothing/suit/storage/hooded/carp_costume = 3,
/obj/item/clothing/suit/storage/hooded/carp_costume = 3,
products = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 3,
/obj/item/clothing/suit/storage/hooded/costume/carp = 3,
/obj/item/clothing/suit/chickensuit = 3,
/obj/item/clothing/head/chicken = 3,
/obj/item/clothing/head/helmet/gladiator = 3,
icons/inventory/head/item.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 118 KiB

icons/inventory/head/mob.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 242 KiB

After

Width:  |  Height:  |  Size: 243 KiB

icons/inventory/suit/item.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 207 KiB

After

Width:  |  Height:  |  Size: 207 KiB

icons/inventory/suit/mob.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 613 KiB

After

Width:  |  Height:  |  Size: 614 KiB

maps/gateway_archive_vr/zoo.dmm
+2 -2
View File
@@ -528,8 +528,8 @@
"kh" = (/obj/machinery/vending/food,/turf/simulated/floor/tiled/white,/area/awaymission/zoo)
"ki" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/holofloor/beach/sand{icon_state = "dgrass0"},/area/awaymission/zoo)
"kj" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/simulated/floor/holofloor/beach/sand{icon_state = "dgrass0"},/area/awaymission/zoo)
"kk" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/ian_costume,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo)
"kl" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/carp_costume,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo)
"kk" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/costume/ian,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo)
"kl" = (/obj/structure/table/rack,/obj/item/clothing/suit/storage/hooded/costume/carp,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo)
"km" = (/obj/structure/table/rack,/obj/effect/landmark/costume,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo)
"kn" = (/obj/structure/table/rack,/obj/item/clothing/suit/chickensuit,/obj/item/clothing/head/chicken,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo)
"ko" = (/obj/structure/table/rack,/obj/item/clothing/head/sombrero,/turf/simulated/floor/holofloor/carpet,/area/awaymission/zoo)
maps/gateway_vr/zoo.dmm
+2 -2
View File
@@ -3856,12 +3856,12 @@
/area/awaymission/zoo)
"kk" = (
/obj/structure/table/rack,
/obj/item/clothing/suit/storage/hooded/ian_costume,
/obj/item/clothing/suit/storage/hooded/costume/ian,
/turf/simulated/floor/holofloor/carpet,
/area/awaymission/zoo)
"kl" = (
/obj/structure/table/rack,
/obj/item/clothing/suit/storage/hooded/carp_costume,
/obj/item/clothing/suit/storage/hooded/costume/carp,
/turf/simulated/floor/holofloor/carpet,
/area/awaymission/zoo)
"km" = (