diff --git a/GainStation13/code/modules/food_and_drinks/drinks.dm b/GainStation13/code/modules/food_and_drinks/drinks.dm index a4f22f7a..626e64fb 100644 --- a/GainStation13/code/modules/food_and_drinks/drinks.dm +++ b/GainStation13/code/modules/food_and_drinks/drinks.dm @@ -9,7 +9,7 @@ lefthand_file = 'GainStation13/icons/obj/food_lefthand.dmi' righthand_file = 'GainStation13/icons/obj/food_righthand.dmi' icon_state = "fizzwiz" - list_reagents = list(/datum/reagent/consumable/space_cola = 5, /datum/reagent/consumable/fizulphite = 3) + list_reagents = list(/datum/reagent/consumable/space_cola = 25, /datum/reagent/consumable/fizulphite = 15) foodtype = SUGAR price = 3 @@ -21,6 +21,6 @@ lefthand_file = 'GainStation13/icons/obj/food_lefthand.dmi' righthand_file = 'GainStation13/icons/obj/food_righthand.dmi' icon_state = "soothseltz" - list_reagents = list(/datum/reagent/consumable/space_cola = 5, /datum/reagent/consumable/extilphite = 3) + list_reagents = list(/datum/reagent/consumable/space_cola = 25, /datum/reagent/consumable/extilphite = 15) foodtype = SUGAR price = 3 diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index bdf6274d..4a5a302a 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -253,7 +253,7 @@ SSblackbox.Seal() sleep(50) - world.hypermessage(botmsg) + // world.hypermessage(botmsg) ready_for_reboot = TRUE standard_reboot() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index d2c3716f..b7f30200 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin()) /datum/admins/proc/BC_RemoveKeyVerb, /datum/admins/proc/BC_ToggleState, /client/proc/addbunkerbypass, - /client/proc/discordmessage, + // /client/proc/discordmessage, /client/proc/revokebunkerbypass, /client/proc/stop_sounds, /client/proc/debugstatpanel, diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index ca6060d2..5034b2c6 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -499,7 +499,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/list/standing = list() var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD) - H.handle_cosmetic_parts() if(HD && !(HAS_TRAIT(H, TRAIT_HUSK))) // lipstick diff --git a/tgstation.dme b/tgstation.dme index 439abfde..68f787ba 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3090,7 +3090,8 @@ #include "GainStation13\code\mobs\chocoslime.dm" #include "GainStation13\code\mobs\races\caloritegolem.dm" #include "GainStation13\code\modules\client\preferences\preferences.dm" -#include "GainStation13\code\modules\food_and_drinks\drinks\drinks.dm" +#include "GainStation13\code\modules\food_and_drinks\drinks.dm" +#include "GainStation13\code\modules\food_and_drinks\food.dm" #include "GainStation13\code\modules\food_and_drinks\objects\candy_flora.dm" #include "GainStation13\code\modules\mob\living\emote.dm" #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm" @@ -3103,7 +3104,6 @@ #include "GainStation13\code\modules\research\techweb\nutritech_nodes.dm" #include "GainStation13\code\modules\surgery\organs\augments.dm" #include "GainStation13\code\modules\vending\gatocola.dm" -#include "GainStation13\code\modules\vending\GBBurrito.dm" #include "GainStation13\code\modules\vending\mealdor.dm" #include "GainStation13\code\obj\items\minor_items.dm" #include "GainStation13\code\obj\structure\calorite_doors.dm" @@ -3134,14 +3134,11 @@ #include "hyperstation\code\game\objects\structures\sauna_oven.dm" #include "hyperstation\code\gamemode\traitor_lewd.dm" #include "hyperstation\code\gamemode\traitor_thief.dm" -#include "hyperstation\code\gamemode\werewolf\werewolf.dm" -#include "hyperstation\code\hyperbot\hyperbot.dm" #include "hyperstation\code\mobs\carrion.dm" #include "hyperstation\code\mobs\dancer.dm" #include "hyperstation\code\mobs\emote.dm" #include "hyperstation\code\mobs\hugbot.dm" #include "hyperstation\code\mobs\mimic.dm" -#include "hyperstation\code\mobs\werewolf.dm" #include "hyperstation\code\modules\pen.dm" #include "hyperstation\code\modules\traits.dm" #include "hyperstation\code\modules\admin\verbs\hyperverbs.dm" @@ -3155,7 +3152,6 @@ #include "hyperstation\code\modules\antagonists\wendigo\mob\mob_equip.dm" #include "hyperstation\code\modules\antagonists\wendigo\mob\organs_bodyparts.dm" #include "hyperstation\code\modules\antagonists\wendigo\mob\update_icons.dm" -#include "hyperstation\code\modules\antagonists\werewolf\werewolf.dm" #include "hyperstation\code\modules\arousal\arousalhud.dm" #include "hyperstation\code\modules\arousal\creampie.dm" #include "hyperstation\code\modules\cargo\exports\engineering.dm"