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

Whitespace Standardization [MDB IGNORE] (#15748)

Browse Source 
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d844.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d.

* Attempt to normalize example.yml (and another file I guess)

* Try again
This commit is contained in:
Drathek
2024-02-20 11:28:51 +01:00
committed by GitHub
parent 3b61f677b3
commit 7c8bb85de3
1175 changed files with 818171 additions and 818145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/misc.dm
+102 -102
View File
@@ -1,103 +1,103 @@
/*
* Donut Box
*/
var/list/random_weighted_donuts = list(
/obj/item/weapon/reagent_containers/food/snacks/donut/plain = 5,
/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly = 5,
/obj/item/weapon/reagent_containers/food/snacks/donut/pink = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/purple = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/green = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/beige = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/choc = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/blue = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/yellow = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/olive = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/homer = 3,
/obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly = 3,
/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles = 3,
/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly = 3,
/obj/item/weapon/reagent_containers/food/snacks/donut/chaos = 1
)
/obj/item/weapon/storage/box/donut
icon = 'icons/obj/food_donuts.dmi'
icon_state = "donutbox"
name = "donut box"
desc = "A box that holds tasty donuts, if you're lucky."
center_of_mass = list("x" = 16,"y" = 9)
max_storage_space = ITEMSIZE_COST_SMALL * 6
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut)
foldable = /obj/item/stack/material/cardboard
//starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6)
/obj/item/weapon/storage/box/donut/Initialize()
if(!empty)
for(var/i in 1 to 6)
var/type_to_spawn = pickweight(random_weighted_donuts)
new type_to_spawn(src)
. = ..()
update_icon()
/obj/item/weapon/storage/box/donut/update_icon()
cut_overlays()
var/x_offset = 0
for(var/obj/item/weapon/reagent_containers/food/snacks/donut/D in contents)
var/mutable_appearance/ma = mutable_appearance(icon = icon, icon_state = D.overlay_state)
ma.pixel_x = x_offset
add_overlay(ma)
x_offset += 3
/obj/item/weapon/storage/box/donut/empty
empty = TRUE
/obj/item/weapon/storage/box/wormcan
icon = 'icons/obj/food.dmi'
icon_state = "wormcan"
name = "can of worms"
desc = "You probably do want to open this can of worms."
max_storage_space = ITEMSIZE_COST_TINY * 6
can_hold = list(
/obj/item/weapon/reagent_containers/food/snacks/wormsickly,
/obj/item/weapon/reagent_containers/food/snacks/worm,
/obj/item/weapon/reagent_containers/food/snacks/wormdeluxe
)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/worm = 6)
/obj/item/weapon/storage/box/wormcan/Initialize()
. = ..()
update_icon()
/obj/item/weapon/storage/box/wormcan/update_icon(var/itemremoved = 0)
if (contents.len == 0)
icon_state = "wormcan_empty"
/obj/item/weapon/storage/box/wormcan/sickly
icon_state = "wormcan_sickly"
name = "can of sickly worms"
desc = "You probably don't want to open this can of worms."
max_storage_space = ITEMSIZE_COST_TINY * 6
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/wormsickly = 6)
/obj/item/weapon/storage/box/wormcan/sickly/update_icon(var/itemremoved = 0)
if (contents.len == 0)
icon_state = "wormcan_empty_sickly"
/obj/item/weapon/storage/box/wormcan/deluxe
icon_state = "wormcan_deluxe"
name = "can of deluxe worms"
desc = "You absolutely want to open this can of worms."
max_storage_space = ITEMSIZE_COST_TINY * 6
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/wormdeluxe = 6)
/obj/item/weapon/storage/box/wormcan/deluxe/update_icon(var/itemremoved = 0)
if (contents.len == 0)
/*
* Donut Box
*/
var/list/random_weighted_donuts = list(
/obj/item/weapon/reagent_containers/food/snacks/donut/plain = 5,
/obj/item/weapon/reagent_containers/food/snacks/donut/plain/jelly = 5,
/obj/item/weapon/reagent_containers/food/snacks/donut/pink = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/purple = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/purple/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/green = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/green/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/beige = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/beige/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/choc = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/blue = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/blue/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/yellow = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/yellow/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/olive = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/olive/jelly = 4,
/obj/item/weapon/reagent_containers/food/snacks/donut/homer = 3,
/obj/item/weapon/reagent_containers/food/snacks/donut/homer/jelly = 3,
/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles = 3,
/obj/item/weapon/reagent_containers/food/snacks/donut/choc_sprinkles/jelly = 3,
/obj/item/weapon/reagent_containers/food/snacks/donut/chaos = 1
)
/obj/item/weapon/storage/box/donut
icon = 'icons/obj/food_donuts.dmi'
icon_state = "donutbox"
name = "donut box"
desc = "A box that holds tasty donuts, if you're lucky."
center_of_mass = list("x" = 16,"y" = 9)
max_storage_space = ITEMSIZE_COST_SMALL * 6
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut)
foldable = /obj/item/stack/material/cardboard
//starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6)
/obj/item/weapon/storage/box/donut/Initialize()
if(!empty)
for(var/i in 1 to 6)
var/type_to_spawn = pickweight(random_weighted_donuts)
new type_to_spawn(src)
. = ..()
update_icon()
/obj/item/weapon/storage/box/donut/update_icon()
cut_overlays()
var/x_offset = 0
for(var/obj/item/weapon/reagent_containers/food/snacks/donut/D in contents)
var/mutable_appearance/ma = mutable_appearance(icon = icon, icon_state = D.overlay_state)
ma.pixel_x = x_offset
add_overlay(ma)
x_offset += 3
/obj/item/weapon/storage/box/donut/empty
empty = TRUE
/obj/item/weapon/storage/box/wormcan
icon = 'icons/obj/food.dmi'
icon_state = "wormcan"
name = "can of worms"
desc = "You probably do want to open this can of worms."
max_storage_space = ITEMSIZE_COST_TINY * 6
can_hold = list(
/obj/item/weapon/reagent_containers/food/snacks/wormsickly,
/obj/item/weapon/reagent_containers/food/snacks/worm,
/obj/item/weapon/reagent_containers/food/snacks/wormdeluxe
)
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/worm = 6)
/obj/item/weapon/storage/box/wormcan/Initialize()
. = ..()
update_icon()
/obj/item/weapon/storage/box/wormcan/update_icon(var/itemremoved = 0)
if (contents.len == 0)
icon_state = "wormcan_empty"
/obj/item/weapon/storage/box/wormcan/sickly
icon_state = "wormcan_sickly"
name = "can of sickly worms"
desc = "You probably don't want to open this can of worms."
max_storage_space = ITEMSIZE_COST_TINY * 6
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/wormsickly = 6)
/obj/item/weapon/storage/box/wormcan/sickly/update_icon(var/itemremoved = 0)
if (contents.len == 0)
icon_state = "wormcan_empty_sickly"
/obj/item/weapon/storage/box/wormcan/deluxe
icon_state = "wormcan_deluxe"
name = "can of deluxe worms"
desc = "You absolutely want to open this can of worms."
max_storage_space = ITEMSIZE_COST_TINY * 6
starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/wormdeluxe = 6)
/obj/item/weapon/storage/box/wormcan/deluxe/update_icon(var/itemremoved = 0)
if (contents.len == 0)
icon_state = "wormcan_empty_deluxe"