cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes dumb cat mistakes

Browse Source
This commit is contained in:
Casey
2022-05-18 04:58:20 -04:00
committed by CHOMPStation2
parent 1820631ada
commit c608a6b9bc
4 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
View File

@@ -124,3 +124,8 @@ Talon winter coat
display_name = "hazard vest, atmospherics" display_name = "hazard vest, atmospherics"
path = /obj/item/clothing/suit/storage/hazardvest/atmos path = /obj/item/clothing/suit/storage/hazardvest/atmos
allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer") allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer")
//Long fur coat
/datum/gear/suit/russofurcoat
display_name = "long fur coat"
path = /obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat

10
code/modules/clothing/under/accessories/accessory_vr.dm
View File

@@ -289,6 +289,16 @@
item_state = "collar_cowbell_overlay" item_state = "collar_cowbell_overlay"
overlay_state = "collar_cowbell_overlay" overlay_state = "collar_cowbell_overlay"
<<<<<<< HEAD
=======
/obj/item/clothing/accessory/collar/collarplanet_earth
name = "planet collar"
desc = "A collar featuring a surprisingly detailed replica of a earth-like planet surrounded by a weak battery powered force shield. There is a button to turn it off."
icon_state = "collarplanet_earth"
item_state = "collarplanet_earth"
overlay_state = "collarplanet_earth"
>>>>>>> a55f8374da... Merge pull request #12982 from FunnyCatEnjoyer/FunnyCatEnjoyer
/obj/item/clothing/accessory/collar/holo /obj/item/clothing/accessory/collar/holo
name = "Holo-collar" name = "Holo-collar"

3
code/modules/economy/vending_machines_vr.dm
View File

@@ -754,7 +754,8 @@
/obj/item/clothing/mask/bandana/red = 50, /obj/item/clothing/mask/bandana/red = 50,
/obj/item/clothing/mask/surgical = 50) /obj/item/clothing/mask/surgical = 50)
premium = list(/obj/item/weapon/bedsheet/rainbow = 1) premium = list(/obj/item/weapon/bedsheet/rainbow = 1)
contraband = list(/obj/item/clothing/mask/gas/clown_hat = 1) contraband = list(/obj/item/clothing/mask/gas/clown_hat = 1,
/obj/item/clothing/accessory/collar/collarplanet_earth = 5)
/obj/machinery/vending/loadout/clothing /obj/machinery/vending/loadout/clothing
name = "General Jump" name = "General Jump"

14
code/modules/vore/fluffstuff/custom_clothes_vr.dm
View File

@@ -207,6 +207,20 @@
icon_override = 'icons/vore/custom_clothes_vr.dmi' icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "greatcoat_mob" item_state = "greatcoat_mob"
//For general use
/obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat
name = "long fur coat"
desc = "A sophisticated long coat made of fur."
icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "russofurcoat"
icon_override = 'icons/inventory/suit/mob_vr.dmi'
item_state = "russofurcoat"
allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)
flags_inv = HIDETIE|HIDEHOLSTER
//For general use //For general use
/obj/item/clothing/suit/storage/fluff/fedcoat /obj/item/clothing/suit/storage/fluff/fedcoat
name = "Federation Uniform Jacket (Red)" name = "Federation Uniform Jacket (Red)"