cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 15:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull

Browse Source 
August2020UpstreamPull
This commit is contained in:
Razgriz
2020-08-09 02:58:18 -07:00
parent deecf5e4dc 9d3b96c8bd
commit f00fdebbb9
915 changed files with 253357 additions and 90809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_boxes_vr.dm
+4 -20
View File
@@ -281,35 +281,19 @@ Swimsuits, for general use, to avoid arriving to work with your swimsuit.
/obj/item/weapon/storage/box/monkeycubes/sobakacubes
name = "sobaka cube box"
desc = "Drymate brand sobaka cubes. Just add water!"
/obj/item/weapon/storage/box/monkeycubes/sobakacubes/New()
..()
for(var/i = 1 to 4)
new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube(src)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube = 4)
/obj/item/weapon/storage/box/monkeycubes/sarucubes
name = "saru cube box"
desc = "Drymate brand saru cubes. Just add water!"
/obj/item/weapon/storage/box/monkeycubes/sarucubes/New()
..()
for(var/i = 1 to 4)
new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube(src)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube = 4)
/obj/item/weapon/storage/box/monkeycubes/sparracubes
name = "sparra cube box"
desc = "Drymate brand sparra cubes. Just add water!"
/obj/item/weapon/storage/box/monkeycubes/sparracubes/New()
..()
for(var/i = 1 to 4)
new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube(src)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube = 4)
/obj/item/weapon/storage/box/monkeycubes/wolpincubes
name = "wolpin cube box"
desc = "Drymate brand wolpin cubes. Just add water!"
/obj/item/weapon/storage/box/monkeycubes/wolpincubes/New()
..()
for(var/i = 1 to 4)
new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube(src)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube = 4)
code/modules/vore/fluffstuff/custom_clothes_yw.dm
+55 -1
View File
@@ -1649,4 +1649,58 @@
icon_state = "khlife3"
icon_override = 'icons/vore/custom_items_vr.dmi'
item_state = "khlife_overlay"
overlay_state = "khlife_overlay"
overlay_state = "khlife_overlay"
// ******
// KBraid
// ******
/obj/item/clothing/glasses/fluff/avigoggles_yw
name = "aviation goggles"
desc = "You're such a goggle head!"
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_state = "avigoggles_i"
item_state = "avigoggles"
icon_override = 'icons/vore/custom_clothes_yw.dmi'
action_button_name = "Flip Aviation Goggles"
item_flags = AIRTIGHT
var/up = 0
/obj/item/clothing/glasses/fluff/avigoggles_yw/attack_self()
toggle()
/obj/item/clothing/glasses/fluff/avigoggles_yw/verb/toggle()
set category = "Object"
set name = "Adjust aviation goggles"
set src in usr
if(usr.canmove && !usr.stat && !usr.restrained())
if(src.up)
src.up = !src.up
flags_inv |= HIDEEYES
body_parts_covered |= EYES
item_state = initial(item_state)
to_chat(usr, "You flip \the [src] down to protect your eyes.")
else
src.up = !src.up
flags_inv &= ~HIDEEYES
body_parts_covered &= ~EYES
item_state = "[initial(item_state)]_up"
to_chat(usr, "You push \the [src] up out of your face.")
update_clothing_icon()
usr.update_action_buttons()
/obj/item/clothing/glasses/fluff/avigoggles_yw/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands)
if(body_type == SPECIES_TESHARI)
if(!inhands)
return 'icons/vore/custom_clothes_yw_special.dmi'
else
return ..()
/obj/item/clothing/under/harness_white
name = "white gear harness"
desc = "How... minimalist."
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_state = "gear_harness_white"
icon_override = 'icons/vore/custom_clothes_yw.dmi'
item_state = "gear_harness_white"
body_parts_covered = 0