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

Merge pull request #5842 from Fox-McCloud/reagent-reorganization

Browse Source 
Reagent Reorganization
This commit is contained in:
Crazy Lemon
2016-11-21 16:54:41 -08:00
committed by GitHub
parent f215041315 feecce9d2e
commit 405fe1bb54
84 changed files with 7651 additions and 7929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/scanners.dm
+1 -3
View File
@@ -381,9 +381,7 @@ REAGENT SCANNER
/obj/item/device/mass_spectrometer/New()
..()
var/datum/reagents/R = new/datum/reagents(5)
reagents = R
R.my_atom = src
create_reagents(5)
/obj/item/device/mass_spectrometer/on_reagent_change()
if(reagents.total_volume)
code/game/objects/items/toys.dm
+1 -3
View File
@@ -38,9 +38,7 @@
item_state = "balloon-empty"
/obj/item/toy/balloon/New()
var/datum/reagents/R = new/datum/reagents(10)
reagents = R
R.my_atom = src
create_reagents(10)
/obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob)
return