cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 21:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8302 from Kyep/better_service_borgs

Browse Source 
Buffs Service Borgs
This commit is contained in:
tigercat2000
2017-11-26 12:15:25 -08:00
committed by GitHub
parent 99b3120e3a 173a9f443d
commit 0dfdc8ae2a
4 changed files with 63 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+8
View File
@@ -283,6 +283,14 @@
isGlass = 0
list_reagents = list("limejuice" = 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/milk
name = "Milk"
desc = "Soothing milk."
icon_state = "milk"
item_state = "carton"
isGlass = 0
list_reagents = list("milk" = 100)
////////////////////////// MOLOTOV ///////////////////////
/obj/item/weapon/reagent_containers/food/drinks/bottle/molotov
name = "molotov cocktail"
code/modules/mob/living/silicon/robot/robot_modules.dm
+17
View File
@@ -270,10 +270,27 @@
/obj/item/weapon/robot_module/butler/New()
..()
modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/cola(src)
modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater(src)
modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice(src) // -0.3 oxy/sec
modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice(src) // -0.2 fire/sec
modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice(src) // -0.2 tox/sec
modules += new /obj/item/weapon/reagent_containers/food/drinks/coffee(src) // -1 paralysis stunned & weakened/sec
modules += new /obj/item/weapon/reagent_containers/food/drinks/tea(src)
modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/milk(src) // -0.2 brute/sec
modules += new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
modules += new /obj/item/weapon/reagent_containers/food/drinks/ice(src)
modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/cream(src)
modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/tequila(src)
modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka(src)
modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey(src)
modules += new /obj/item/weapon/pen(src)
modules += new /obj/item/weapon/razor(src)
modules += new /obj/item/device/instrument/piano_synth(src)
modules += new /obj/item/device/healthanalyzer/advanced(src)
var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src)
M.matter = 30
code/modules/reagents/chemistry/reagents/toxins.dm
+2 -2
View File
@@ -323,12 +323,12 @@
M.EyeBlurry(3)
..()
/datum/reagent/beer2 //disguised as normal beer for use by emagged brobots
/datum/reagent/beer2 //disguised as normal beer for use by emagged service borgs
name = "Beer"
id = "beer2"
description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
color = "#664300" // rgb: 102, 67, 0
metabolization_rate = 1.5 * REAGENTS_METABOLISM
metabolization_rate = 0.1 * REAGENTS_METABOLISM
drink_icon ="beerglass"
drink_name = "Beer glass"
drink_desc = "A freezing pint of beer"