diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 2f98a4b4..ef1c0cf4 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -28,6 +28,46 @@ allowed = list (/obj/item/gun/energy/laser/redtag) resistance_flags = NONE +/* + * Posshim's Corpus atire + */ +/obj/item/clothing/suit/hooded/corpus/ + name = "Standard Voidsuit" + desc = "Standard issue voidsuit in the name of Grofit!" + icon_state = "corpus" + item_state = "armor" + body_parts_covered = CHEST|GROIN|LEGS|ARMS|FEET|HANDS + hoodtype = /obj/item/clothing/head/hooded/corpus + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT //"Hide shoes" but digi shoes dont get hidden, too bad! + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + mutantrace_variation = NO_MUTANTRACE_VARIATION //There is no need for a digi variant, it's a costume + +/obj/item/clothing/suit/hooded/corpus/s //sec + name = "Enforcer Voidsuit" + desc = "Delux issue grofit voidsuit. Let the middle class know You're in charge." + icon_state = "corpuss" + hoodtype = /obj/item/clothing/head/hooded/corpus/s //Enjoy this nice red outfit Kinaris! There is NO NEED for a pink one! xoxo -VivI Fanteriso + +/obj/item/clothing/suit/hooded/corpus/c //command + name = "Commander Voidsuit" + desc = "Premium issue correctional worker attire. Grease the gears of production." + icon_state = "corpusc" + hoodtype = /obj/item/clothing/head/hooded/corpus/c + +/obj/item/clothing/head/hooded/corpus + name = "Voidsuit helmet" + desc = "galvanized reinforced helm to protect against the elements" + icon_state = "corpus" + body_parts_covered = HEAD + flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK|HIDESNOUT|HIDENECK //hide your ugly face with this one simple trick! + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + +/obj/item/clothing/head/hooded/corpus/s //sec + icon_state = "corpuss" + +/obj/item/clothing/head/hooded/corpus/c //command + icon_state = "corpusc" + /* * Costume */ diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm index 318d1edc..055999f7 100644 --- a/code/modules/food_and_drinks/food/snacks_salad.dm +++ b/code/modules/food_and_drinks/food/snacks_salad.dm @@ -124,4 +124,4 @@ trash = /obj/item/reagent_containers/glass/bowl/mushroom_bowl bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("fruity cactus" = 5, "ash" = 1, "tough meat" = 3, "your eternal damnation" = 1) - foodtype = FRUIT | MEAT | VEGETABLES //MUSHROOM = VEGETABLE -VladinXXV 2021 + foodtype = FRUIT | MEAT | VEGETABLES //MUSHROOM = VEGETABLE -VivI Fanteriso: 2021. Totally didnt steal this comment form vladin. diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 2363e6a3..67e1d769 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -438,6 +438,15 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ value = 0 grind_results = list(/datum/reagent/consumable/sodiumchloride = 4) +/obj/item/coin/vivitoken + name = ".... token?" + icon_state = "coin_vivi_wizard" + cmineral = "vivi" + desc = "This shouldnt be here....." + sideslist = list("wizard", "engie") + value = 0 + grind_results = list(/datum/reagent/medicine/copium = 10) + /obj/item/coin/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 3941974c..e53d8a47 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -8,6 +8,8 @@ vend_reply = "Thank you for using AutoDrobe!" products = list(/obj/item/clothing/suit/chickensuit = 1, /obj/item/clothing/head/chicken = 1, + /obj/item/clothing/suit/hooded/corpus = 1, + /obj/item/clothing/suit/hooded/corpus/c = 1, /obj/item/clothing/under/gladiator = 1, /obj/item/clothing/head/helmet/gladiator = 1, /obj/item/clothing/under/gimmick/rank/captain/suit = 1, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 96d9ec1d..0d1e1f3d 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -18,7 +18,8 @@ /obj/item/clothing/mask/bandana/red = 5, /obj/item/clothing/under/rank/security/skirt = 5, /obj/item/clothing/under/rank/security/grey = 5, - /obj/item/clothing/under/pants/khaki = 5) + /obj/item/clothing/under/pants/khaki = 5, + /obj/item/clothing/suit/hooded/corpus/s = 5) premium = list(/obj/item/clothing/under/rank/security/navyblue = 5, /obj/item/clothing/suit/security/officer = 5, /obj/item/clothing/head/beret/sec/navyofficer = 5, diff --git a/hyperstation/code/obj/plushes.dm b/hyperstation/code/obj/plushes.dm index d744793d..58de2e35 100644 --- a/hyperstation/code/obj/plushes.dm +++ b/hyperstation/code/obj/plushes.dm @@ -64,19 +64,6 @@ light_range = 1.4 attack_verb = list("bapped", "slapped", "bonked") -//Vladplush containment starts here -/obj/item/toy/plush/nukeplushie/vladin - name = "elite operative plushie" - desc = "A stuffed toy that resembles an elite syndicate nuclear operative. He has a little wedding band!" - gender = MALE //he's a boy, there is no doubt here - young = TRUE //he's not actually young, but i refuse to have a plush that is not loyal to his partner. this is the only way i could figure out. - icon = 'hyperstation/icons/obj/plushes.dmi' - icon_state = "vladin" - item_state = "vladin" - attack_verb = list("nuked", "detonated", "CQC'd", "robusted") - squeak_override = list('sound/effects/hit_punch.ogg' = 1, 'sound/effects/hit_kick.ogg' = 1, 'sound/weapons/cqchit1.ogg' = 1, 'sound/weapons/cqchit2.ogg' = 1) -//I can't figure out how to make him loyal to a specific type of plush. If anyone figures that out, there will be more. Until then, this is the end of the vladplush. - //Enzo_Leon patron stuff /obj/item/toy/plush/mammal/enzo_leon name = "rat plushie" @@ -87,4 +74,4 @@ item_state = "enzor" attack_verb = list("tail bapped", "whomped", "squeaked") squeak_override = list('sound/effects/mousesqueek.ogg'= 1) -//End \ No newline at end of file +//End diff --git a/hyperstation/icons/obj/plushes.dmi b/hyperstation/icons/obj/plushes.dmi index e0496bfb..0438ab7d 100644 Binary files a/hyperstation/icons/obj/plushes.dmi and b/hyperstation/icons/obj/plushes.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index de97e09f..b21c68bc 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index d93dda66..2f8f0e51 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 028962e3..33db51e1 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 003ff83f..95d36176 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/economy.dmi b/icons/obj/economy.dmi index fef7637b..c281432d 100644 Binary files a/icons/obj/economy.dmi and b/icons/obj/economy.dmi differ