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

Merge branch 'master' of github.com:Baystation12/Baystation12

Browse Source 
Conflicts:
	maps/tgstation.2.0.8.dmm
This commit is contained in:
SkyMarshal
2012-01-28 02:03:42 -07:00
parent f623c4848e 416cec5da9
commit 3e9146f99a
39 changed files with 100 additions and 4389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/devices/PDA/PDA.dm
-9
View File
@@ -775,15 +775,6 @@
user << "\blue \t [re]"
else
user << "\blue No active chemical agents found in [A]."
else if(istype(A,/obj/machinery/water/pipe))
var/datum/water/pipeline/P = A:parent
if(P.reagents.reagent_list.len > 0)
var/reagents_length = P.reagents.reagent_list.len
user << "\blue [reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found at [P.return_pressure()]kPa."
for (var/re in P.reagents.reagent_list)
user << "\blue \t [re]"
else
user << "\blue No active chemical agents found in [A]."
else
user << "\blue No significant chemical agents found in [A]."
code/game/objects/devices/PDA/cart.dm
-1
View File
@@ -34,7 +34,6 @@
name = "Power-ON Cartridge"
icon_state = "cart-e"
access_engine = 1
access_reagent_scanner = 1
medical
name = "Med-U Cartridge"