shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

Browse Source
This commit is contained in:
Putnam3145
2022-05-17 13:22:40 -07:00
parent d5c36b4a99 35f86287e2
commit 33889870c9
1311 changed files with 12771 additions and 10321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks.dm
+1 -1
View File
@@ -535,7 +535,7 @@
list_reagents = list(/datum/reagent/consumable/lemon_lime = 30)
foodtype = FRUIT
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize()
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize(mapload)
. = ..()
name = "lemon-lime soda"
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+5 -5
View File
@@ -31,7 +31,7 @@
var/obj/item/bodypart/affecting = user.zone_selected //Find what the player is aiming at
var/headarmor = 0 // Target's head armor
var/armor_block = min(90, target.run_armor_check(affecting, "melee", null, null,armour_penetration)) // For normal attack damage
var/armor_block = min(90, target.run_armor_check(affecting, MELEE, null, null,armour_penetration)) // For normal attack damage
//If they have a hat/helmet and the user is targeting their head.
if(affecting == BODY_ZONE_HEAD)
@@ -89,7 +89,7 @@
var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken")
sharpness = SHARP_EDGED
/obj/item/broken_bottle/Initialize()
/obj/item/broken_bottle/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 200, 55)
@@ -243,7 +243,7 @@
/obj/item/reagent_containers/food/drinks/bottle/absinthe/empty
list_reagents = null
/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize()
/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize(mapload)
. = ..()
redact()
@@ -332,7 +332,7 @@
/obj/item/reagent_containers/food/drinks/bottle/sake/empty
list_reagents = null
/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize(mapload)
. = ..()
if(prob(10))
name = "Fluffy Tail Sake"
@@ -509,7 +509,7 @@
..()
add_overlay("[initial(icon_state)]shine")
/obj/item/reagent_containers/food/drinks/bottle/blank/Initialize()
/obj/item/reagent_containers/food/drinks/bottle/blank/Initialize(mapload)
. = ..()
update_icon()
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+1 -1
View File
@@ -74,7 +74,7 @@
desc = "A shot glass - the universal symbol for bad decisions."
return
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/Initialize()
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/Initialize(mapload)
. = ..()
on_reagent_change(ADD_REAGENT)
code/modules/food_and_drinks/food/customizables.dm
+1 -1
View File
@@ -281,7 +281,7 @@
icon = 'icons/obj/food/soupsalad.dmi'
icon_state = "wishsoup"
/obj/item/reagent_containers/food/snacks/customizable/soup/Initialize()
/obj/item/reagent_containers/food/snacks/customizable/soup/Initialize(mapload)
. = ..()
eatverb = pick("slurp","sip","suck","inhale","drink")
code/modules/food_and_drinks/food/snacks_burgers.dm
+3 -3
View File
@@ -13,7 +13,7 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/plain/Initialize()
/obj/item/reagent_containers/food/snacks/burger/plain/Initialize(mapload)
. = ..()
if(prob(1))
new/obj/effect/particle_effect/smoke(get_turf(src))
@@ -146,7 +146,7 @@
verb_say = "moans"
verb_yell = "wails"
/obj/item/reagent_containers/food/snacks/burger/ghost/Initialize()
/obj/item/reagent_containers/food/snacks/burger/ghost/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
@@ -379,7 +379,7 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
foodtype = GRAIN | MEAT | DAIRY
/obj/item/reagent_containers/food/snacks/burger/cheese/Initialize()
/obj/item/reagent_containers/food/snacks/burger/cheese/Initialize(mapload)
. = ..()
if(prob(33))
icon_state = "cheeseburgeralt"
code/modules/food_and_drinks/food/snacks_egg.dm
+1 -1
View File
@@ -24,7 +24,7 @@
/obj/item/reagent_containers/food/snacks/egg/gland
desc = "An egg! It looks weird..."
/obj/item/reagent_containers/food/snacks/egg/gland/Initialize()
/obj/item/reagent_containers/food/snacks/egg/gland/Initialize(mapload)
. = ..()
reagents.add_reagent(get_random_reagent_id(), 15)
code/modules/food_and_drinks/food/snacks_meat.dm
+6 -6
View File
@@ -26,7 +26,7 @@
tastes = list("fish" = 1)
foodtype = MEAT
/obj/item/reagent_containers/food/snacks/carpmeat/Initialize()
/obj/item/reagent_containers/food/snacks/carpmeat/Initialize(mapload)
. = ..()
eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp")
@@ -63,7 +63,7 @@
filling_color = "#ee7676"
tastes = list("fish" = 1, "pan seared vegtables" = 1)
foodtype = MEAT | VEGETABLES | FRIED
/obj/item/reagent_containers/food/snacks/sushi_basic
name = "funa hosomaki"
desc = "A small cylindrical kudzu skin, filled with rice and fish."
@@ -172,7 +172,7 @@
foodtype = MEAT | BREAKFAST
var/roasted = FALSE
/obj/item/reagent_containers/food/snacks/sausage/Initialize()
/obj/item/reagent_containers/food/snacks/sausage/Initialize(mapload)
. = ..()
eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
@@ -283,7 +283,7 @@
tastes = list("soy" = 1, "vegetables" = 1)
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/stewedsoymeat/Initialize()
/obj/item/reagent_containers/food/snacks/stewedsoymeat/Initialize(mapload)
. = ..()
eatverb = pick("slurp","sip","suck","inhale","drink")
@@ -328,7 +328,7 @@
tastes = list("\"chicken\"" = 1)
foodtype = MEAT
/obj/item/reagent_containers/food/snacks/nugget/Initialize()
/obj/item/reagent_containers/food/snacks/nugget/Initialize(mapload)
. = ..()
var/shape = pick("lump", "star", "lizard", "corgi")
desc = "A 'chicken' nugget vaguely shaped like a [shape]."
@@ -391,7 +391,7 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("meat" = 3, "smokey sauce" = 1)
foodtype = MEAT
/obj/item/reagent_containers/food/snacks/goliathcalamari
name = "goliath calamari"
desc = "ACKCHYUALLY, this isn't calamari, guys!"
code/modules/food_and_drinks/food/snacks_other.dm
+5 -5
View File
@@ -79,7 +79,7 @@
tastes = list("popcorn" = 3, "butter" = 1)
foodtype = JUNKFOOD
/obj/item/reagent_containers/food/snacks/popcorn/Initialize()
/obj/item/reagent_containers/food/snacks/popcorn/Initialize(mapload)
. = ..()
eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp")
@@ -453,7 +453,7 @@
tastes = list("candy" = 1)
foodtype = JUNKFOOD | SUGAR | ANTITOXIC
/obj/item/reagent_containers/food/snacks/lollipop/Initialize()
/obj/item/reagent_containers/food/snacks/lollipop/Initialize(mapload)
. = ..()
head = mutable_appearance('icons/obj/lollipop.dmi', "lollipop_head")
change_head_color(rgb(rand(0, 255), rand(0, 255), rand(0, 255)))
@@ -472,7 +472,7 @@
/obj/item/reagent_containers/food/snacks/lollipop/cyborg
var/spamchecking = TRUE
/obj/item/reagent_containers/food/snacks/lollipop/cyborg/Initialize()
/obj/item/reagent_containers/food/snacks/lollipop/cyborg/Initialize(mapload)
. = ..()
addtimer(CALLBACK(src, .proc/spamcheck), 1200)
@@ -493,14 +493,14 @@
tastes = list("candy")
foodtype = JUNKFOOD
/obj/item/reagent_containers/food/snacks/gumball/Initialize()
/obj/item/reagent_containers/food/snacks/gumball/Initialize(mapload)
. = ..()
color = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
/obj/item/reagent_containers/food/snacks/gumball/cyborg
var/spamchecking = TRUE
/obj/item/reagent_containers/food/snacks/gumball/cyborg/Initialize()
/obj/item/reagent_containers/food/snacks/gumball/cyborg/Initialize(mapload)
. = ..()
addtimer(CALLBACK(src, .proc/spamcheck), 1200)
code/modules/food_and_drinks/food/snacks_pastry.dm
+5 -5
View File
@@ -19,7 +19,7 @@
var/extra_reagent = null
var/decorated_adjective = "sprinkled"
/obj/item/reagent_containers/food/snacks/donut/Initialize()
/obj/item/reagent_containers/food/snacks/donut/Initialize(mapload)
. = ..()
if(prob(30))
decorate_donut()
@@ -60,7 +60,7 @@
bitesize = 10
tastes = list("donut" = 3, "chaos" = 1)
/obj/item/reagent_containers/food/snacks/donut/chaos/Initialize()
/obj/item/reagent_containers/food/snacks/donut/chaos/Initialize(mapload)
. = ..()
extra_reagent = pick(/datum/reagent/consumable/nutriment, /datum/reagent/consumable/capsaicin, /datum/reagent/consumable/frostoil,
/datum/reagent/drug/krokodil, /datum/reagent/toxin/plasma, /datum/reagent/consumable/coco,
@@ -173,7 +173,7 @@
/obj/item/reagent_containers/food/snacks/donut/jelly/in_box_sprite()
return "[replacetext(icon_state, "jelly", "donut")]_inbox"
/obj/item/reagent_containers/food/snacks/donut/jelly/Initialize()
/obj/item/reagent_containers/food/snacks/donut/jelly/Initialize(mapload)
. = ..()
if(extra_reagent)
reagents.add_reagent(extra_reagent, 3)
@@ -569,7 +569,7 @@
tastes = list("mushroom" = 1, "biscuit" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize()
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize(mapload)
var/fey = prob(10)
if(fey)
name = "exceptional plump helmet biscuit"
@@ -736,7 +736,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("pancakes" = 1, "chocolate" = 1)
/obj/item/reagent_containers/food/snacks/pancakes/Initialize()
/obj/item/reagent_containers/food/snacks/pancakes/Initialize(mapload)
. = ..()
update_icon()
code/modules/food_and_drinks/food/snacks_pie.dm
+1 -1
View File
@@ -164,7 +164,7 @@
foodtype = GRAIN | VEGETABLES
/obj/item/reagent_containers/food/snacks/pie/plump_pie/Initialize()
/obj/item/reagent_containers/food/snacks/pie/plump_pie/Initialize(mapload)
. = ..()
var/fey = prob(10)
if(fey)
code/modules/food_and_drinks/food/snacks_pizza.dm
+2 -2
View File
@@ -35,7 +35,7 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
foodtype = GRAIN | VEGETABLES
/obj/item/reagent_containers/food/snacks/pizza/margherita/robo/Initialize()
/obj/item/reagent_containers/food/snacks/pizza/margherita/robo/Initialize(mapload)
bonus_reagents += list("nanomachines" = 70)
return ..()
@@ -187,7 +187,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/arnold
bonus_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
/obj/item/reagent_containers/food/snacks/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm
var/obj/item/bodypart/l_arm = user.get_bodypart(BODY_ZONE_L_ARM)
code/modules/food_and_drinks/food/snacks_salad.dm
+1 -1
View File
@@ -9,7 +9,7 @@
tastes = list("leaves" = 1)
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/salad/Initialize()
/obj/item/reagent_containers/food/snacks/salad/Initialize(mapload)
. = ..()
eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp") //who the fuck gnaws and devours on a salad
code/modules/food_and_drinks/food/snacks_soup.dm
+4 -4
View File
@@ -8,7 +8,7 @@
tastes = list("tasteless soup" = 1)
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/soup/Initialize()
/obj/item/reagent_containers/food/snacks/soup/Initialize(mapload)
. = ..()
eatverb = pick("slurp","sip","suck","inhale","drink")
@@ -19,7 +19,7 @@
list_reagents = list(/datum/reagent/water = 10)
tastes = list("wishes" = 1)
/obj/item/reagent_containers/food/snacks/soup/wish/Initialize()
/obj/item/reagent_containers/food/snacks/soup/wish/Initialize(mapload)
. = ..()
var/wish_true = prob(25)
if(wish_true)
@@ -99,7 +99,7 @@
list_reagents = list(/datum/reagent/consumable/nutriment = 6)
tastes = list("chaos" = 1)
/obj/item/reagent_containers/food/snacks/soup/mystery/Initialize()
/obj/item/reagent_containers/food/snacks/soup/mystery/Initialize(mapload)
. = ..()
extra_reagent = pick(/datum/reagent/consumable/capsaicin, /datum/reagent/consumable/frostoil,
/datum/reagent/medicine/omnizine, /datum/reagent/consumable/banana, /datum/reagent/blood,
@@ -184,7 +184,7 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/soup/beet/Initialize()
/obj/item/reagent_containers/food/snacks/soup/beet/Initialize(mapload)
. = ..()
name = pick("borsch","bortsch","borstch","borsh","borshch","borscht")
tastes = list(name = 1)
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+1 -1
View File
@@ -49,7 +49,7 @@ God bless America.
/obj/item/his_grace))
var/datum/looping_sound/deep_fryer/fry_loop
/obj/machinery/deepfryer/Initialize()
/obj/machinery/deepfryer/Initialize(mapload)
. = ..()
create_reagents(50, OPENCONTAINER)
reagents.add_reagent(/datum/reagent/consumable/cooking_oil, 25)
code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
+1 -1
View File
@@ -17,7 +17,7 @@
var/list/stored_food = list()
var/obj/item/reagent_containers/mixer
/obj/machinery/food_cart/Initialize()
/obj/machinery/food_cart/Initialize(mapload)
. = ..()
create_reagents(LIQUID_CAPACITY, OPENCONTAINER | NO_REACT)
mixer = new /obj/item/reagent_containers(src, MIXER_CAPACITY)
code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+1 -1
View File
@@ -17,7 +17,7 @@
var/meat_quality = 35 //food_quality of meat produced
/obj/machinery/gibber/Initialize()
/obj/machinery/gibber/Initialize(mapload)
. = ..()
add_overlay("grjam")
code/modules/food_and_drinks/kitchen_machinery/grill.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/grill_time = 0
var/datum/looping_sound/grill/grill_loop
/obj/machinery/grill/Initialize()
/obj/machinery/grill/Initialize(mapload)
. = ..()
grill_loop = new(src, FALSE)
code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
+2 -2
View File
@@ -80,7 +80,7 @@
return "vanilla"
/obj/machinery/icecream_vat/Initialize()
/obj/machinery/icecream_vat/Initialize(mapload)
. = ..()
while(product_types.len < 9)
product_types.Add(5)
@@ -249,7 +249,7 @@
bitesize = 4
foodtype = DAIRY | SUGAR
/obj/item/reagent_containers/food/snacks/icecream/Initialize()
/obj/item/reagent_containers/food/snacks/icecream/Initialize(mapload)
. = ..()
reagents.maximum_volume = 20
code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+1 -1
View File
@@ -32,7 +32,7 @@
var/static/list/radial_options = list("eject" = radial_eject, "use" = radial_use)
var/static/list/ai_radial_options = list("eject" = radial_eject, "use" = radial_use, "examine" = radial_examine)
/obj/machinery/microwave/Initialize()
/obj/machinery/microwave/Initialize(mapload)
. = ..()
wires = new /datum/wires/microwave(src)
create_reagents(100)
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+3 -3
View File
@@ -19,7 +19,7 @@
var/list/initial_contents
var/visible_contents = TRUE
/obj/machinery/smartfridge/Initialize()
/obj/machinery/smartfridge/Initialize(mapload)
. = ..()
create_reagents(100, NO_REACT)
@@ -258,7 +258,7 @@
base_build_path = /obj/machinery/smartfridge/drying_rack //should really be seeing this without admin fuckery.
var/drying = FALSE
/obj/machinery/smartfridge/drying_rack/Initialize()
/obj/machinery/smartfridge/drying_rack/Initialize(mapload)
. = ..()
// Cache the old_parts first, we'll delete it after we've changed component_parts to a new list.
@@ -471,7 +471,7 @@
/obj/item/reagent_containers/medspray/synthtissue = 1,
/obj/item/reagent_containers/medspray/sterilizine = 1)
/obj/machinery/smartfridge/organ/preloaded/Initialize()
/obj/machinery/smartfridge/organ/preloaded/Initialize(mapload)
. = ..()
var/list = list(/obj/item/organ/tongue, /obj/item/organ/brain, /obj/item/organ/heart, /obj/item/organ/liver, /obj/item/organ/ears, /obj/item/organ/eyes, /obj/item/organ/tail, /obj/item/organ/stomach)
var/newtype = pick(list)
code/modules/food_and_drinks/pizzabox.dm
+8 -8
View File
@@ -29,7 +29,7 @@
var/const/BOMB_TIMER_MIN = 1
var/const/BOMB_TIMER_MAX = 10
/obj/item/pizzabox/Initialize()
/obj/item/pizzabox/Initialize(mapload)
. = ..()
update_icon()
@@ -259,14 +259,14 @@
wires = null
update_icon()
/obj/item/pizzabox/bomb/Initialize()
/obj/item/pizzabox/bomb/Initialize(mapload)
. = ..()
var/randompizza = pick(subtypesof(/obj/item/reagent_containers/food/snacks/pizza))
pizza = new randompizza(src)
bomb = new(src)
wires = new /datum/wires/explosive/pizza(src)
/obj/item/pizzabox/margherita/Initialize()
/obj/item/pizzabox/margherita/Initialize(mapload)
. = ..()
AddPizza()
boxtag = "Margherita Deluxe"
@@ -277,22 +277,22 @@
/obj/item/pizzabox/margherita/robo/AddPizza()
pizza = new /obj/item/reagent_containers/food/snacks/pizza/margherita/robo(src)
/obj/item/pizzabox/vegetable/Initialize()
/obj/item/pizzabox/vegetable/Initialize(mapload)
. = ..()
pizza = new /obj/item/reagent_containers/food/snacks/pizza/vegetable(src)
boxtag = "Gourmet Vegatable"
/obj/item/pizzabox/mushroom/Initialize()
/obj/item/pizzabox/mushroom/Initialize(mapload)
. = ..()
pizza = new /obj/item/reagent_containers/food/snacks/pizza/mushroom(src)
boxtag = "Mushroom Special"
/obj/item/pizzabox/meat/Initialize()
/obj/item/pizzabox/meat/Initialize(mapload)
. = ..()
pizza = new /obj/item/reagent_containers/food/snacks/pizza/meat(src)
boxtag = "Meatlover's Supreme"
/obj/item/pizzabox/pineapple/Initialize()
/obj/item/pizzabox/pineapple/Initialize(mapload)
. = ..()
pizza = new /obj/item/reagent_containers/food/snacks/pizza/pineapple(src)
boxtag = "Honolulu Chew"
@@ -312,7 +312,7 @@
/obj/item/reagent_containers/food/snacks/pizza/dank = 0.1) //pizzas here are weighted by chance to be someone's favorite
var/static/list/pizza_preferences
/obj/item/pizzabox/infinite/Initialize()
/obj/item/pizzabox/infinite/Initialize(mapload)
. = ..()
if(!pizza_preferences)
pizza_preferences = list()