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

Adds handheld booze and soda dispensers to the service borg (#14530)

Browse Source 
* Saving progress

* changed from true/false

* Committing progress

* Fixes charging to be an even number

* Fixes botanical dispenser. PlantBGone and Weedkiller are NOT chems

* Removes depricated item

* Resolves merge conflict

* Adds the ability to swap cells

* Formatting changes

* Formatting fix

* Sprites updated

* Assorted fixes

* Fixed merge conflict

* Resolved Merge Conflict

* New to Initialize and adds switch

* Removes UI title var

* Removes comment

* adds switch statement

* Static data for chemicals

* Resolve Merge conflict
This commit is contained in:
Ryal
2020-10-30 11:22:42 -04:00
committed by GitHub
parent eaeb527e1c
commit 4013fa8c15
6 changed files with 370 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_modules.dm
+2 -19
View File
@@ -301,23 +301,8 @@
/obj/item/robot_module/butler/New()
..()
modules += new /obj/item/reagent_containers/food/drinks/cans/beer(src)
modules += new /obj/item/reagent_containers/food/drinks/cans/cola(src)
modules += new /obj/item/reagent_containers/food/drinks/cans/sodawater(src)
modules += new /obj/item/reagent_containers/food/condiment/enzyme(src)
modules += new /obj/item/reagent_containers/food/drinks/bottle/orangejuice(src) // -0.3 oxy/sec
modules += new /obj/item/reagent_containers/food/drinks/bottle/tomatojuice(src) // -0.2 fire/sec
modules += new /obj/item/reagent_containers/food/drinks/bottle/limejuice(src) // -0.2 tox/sec
modules += new /obj/item/reagent_containers/food/drinks/coffee(src) // -1 paralysis stunned & weakened/sec
modules += new /obj/item/reagent_containers/food/drinks/tea(src)
modules += new /obj/item/reagent_containers/food/drinks/bottle/milk(src) // -0.2 brute/sec
modules += new /obj/item/reagent_containers/food/condiment/sugar(src)
modules += new /obj/item/reagent_containers/food/drinks/ice(src)
modules += new /obj/item/reagent_containers/food/drinks/bottle/cream(src)
modules += new /obj/item/reagent_containers/food/drinks/bottle/tequila(src)
modules += new /obj/item/reagent_containers/food/drinks/bottle/vodka(src)
modules += new /obj/item/reagent_containers/food/drinks/bottle/whiskey(src)
modules += new /obj/item/handheld_chem_dispenser/booze(src)
modules += new /obj/item/handheld_chem_dispenser/soda(src)
modules += new /obj/item/pen(src)
modules += new /obj/item/razor(src)
@@ -344,8 +329,6 @@
fix_modules()
/obj/item/robot_module/butler/respawn_consumable(var/mob/living/silicon/robot/R)
var/obj/item/reagent_containers/food/condiment/enzyme/E = locate() in modules
E.reagents.add_reagent("enzyme", 2)
if(emag)
var/obj/item/reagent_containers/food/drinks/cans/beer/B = emag
B.reagents.add_reagent("beer2", 2)