cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing conflicts

Browse Source
This commit is contained in:
Cadyn
2020-10-05 18:10:53 -07:00
parent 7b44df4701 2a79ecfdad
commit 07775449d7
2080 changed files with 1768339 additions and 30848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/reagents/reagent_containers/borghypo.dm
View File

@@ -9,12 +9,12 @@
possible_transfer_amounts = null
var/mode = 1
var/charge_cost = 50
var/charge_cost = 325
var/charge_tick = 0
var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
var/bypass_protection = FALSE // If true, can inject through things like spacesuits and armor.
var/list/reagent_ids = list("tricordrazine", "inaprovaline", "anti_toxin", "tramadol", "dexalin" ,"spaceacillin")
var/list/reagent_ids = list("tricordrazine", "inaprovaline", "bicaridine", "anti_toxin", "kelotane", "tramadol", "dexalin" ,"spaceacillin")
var/list/reagent_volumes = list()
var/list/reagent_names = list()
@@ -58,8 +58,11 @@
if(R && R.cell)
for(var/T in reagent_ids)
if(reagent_volumes[T] < volume)
R.cell.use(charge_cost)
reagent_volumes[T] = min(reagent_volumes[T] + 5, volume)
if(R.cell.charge - charge_cost < 800) //This is so borgs don't kill themselves with it.
return 0
else
R.cell.use(charge_cost)
reagent_volumes[T] = min(reagent_volumes[T] + 5, volume)
return 1
/obj/item/weapon/reagent_containers/borghypo/attack(var/mob/living/M, var/mob/user)

15
code/modules/reagents/reagent_containers/food/drinks/bluespacecoffee.dm Normal file
View File

@@ -0,0 +1,15 @@
/obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee
name = "bluespace coffee"
desc = "Dreamt up in a strange feverish dream, this coffee cup seems to have been heavily modified with a variety of unlikely parts and wires, and never seems to run out of coffee. Truly the differance between madmen and genius is success."
icon = 'icons/obj/coffee.dmi'
icon_state = "bluespace_coffee"
center_of_mass = list("x"=15, "y"=10)
volume = 50
Initialize()
..()
reagents.add_reagent("coffee", 50)
//Infinite Coffee
attack(mob/M as mob, mob/user as mob, def_zone)
..()
src.reagents.add_reagent("coffee", 50)

6
code/modules/reagents/reagent_containers/pill_vr.dm
View File

@@ -137,12 +137,14 @@
reagents.add_reagent("healing_nanites", 30)
color = reagents.get_color()
/*CHOMPStation removal begin
/obj/item/weapon/reagent_containers/pill/sleevingcure
name = "Kitsuhanan Cure (1u)"
desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery."
name = "Vey-Med Resleeving Booster pill" //YW Edit
desc = "A rare medication provided by Vey-Med that helps counteract negative side effects of using resleeving machinery. Numb tongue before swallowing." //YW Edit
icon_state = "pill3"
/obj/item/weapon/reagent_containers/pill/sleevingcure/Initialize()
..()
reagents.add_reagent("sleevingcure", 1)
color = reagents.get_color()
*/ //CHOMPStation removal end