Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes Centcomm Junkfood Vending Machines #5190

Merged
merged 12 commits into from Oct 1, 2018
1 change: 1 addition & 0 deletions code/game/objects/items/weapons/storage/boxes.dm
Expand Up @@ -131,6 +131,7 @@
..()
new /obj/item/clothing/mask/breath( src )
new /obj/item/weapon/reagent_containers/inhaler/phoron_special(src)
new /obj/item/weapon/reagent_containers/food/snacks/koisbar_clean(src)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They already got their phoron inhaler, not sure why give vaurca more access to k'ois/phoron at roundstart, feels like this is going against stopping people from spawning with food suggestion.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It basically is (hypocritical). If lunch boxes are power gaming by virtue of giving you access to an in-game resource you should normally work for, then this does exactly the same shit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll remove it then. I was on the fence about adding this in the first place.

for(var/obj/item/thing in contents)
thing.autodrobe_no_remove = 1

Expand Down
17 changes: 0 additions & 17 deletions code/modules/client/preference_setup/loadout/loadout_general.dm
Expand Up @@ -46,23 +46,6 @@
..()
gear_tweaks += new/datum/gear_tweak/reagents(lunchables_drink_reagents())

/datum/gear/lunchbox
display_name = "lunchbox"
description = "A little lunchbox."
cost = 2
path = /obj/item/weapon/storage/toolbox/lunchbox

/datum/gear/lunchbox/New()
..()
var/list/lunchboxes = list()
for(var/lunchbox_type in typesof(/obj/item/weapon/storage/toolbox/lunchbox))
var/obj/item/weapon/storage/toolbox/lunchbox/lunchbox = lunchbox_type
if(!initial(lunchbox.filled))
lunchboxes[initial(lunchbox.name)] = lunchbox_type
sortTim(lunchboxes, /proc/cmp_text_asc)
gear_tweaks += new/datum/gear_tweak/path(lunchboxes)
gear_tweaks += new/datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks())

/datum/gear/banner
display_name = "banner selection"
path = /obj/item/weapon/flag
Expand Down
39 changes: 39 additions & 0 deletions html/changelogs/burgerbb - lunchbox removal.yml
@@ -0,0 +1,39 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################

# Your name.
author: BurgerBB

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscdel: "Removed lunchboxes from loadouts."
- maptweak: "Removed the centcomm departures vending machines."
- rscadd: "Added a filtered K'ois bar to the Vaurca spawning box."