cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/game/objects/items/weapons/material/shards.dm
This commit is contained in:
PsiOmega
2015-08-30 10:23:14 +02:00
parent 13a11f89ac 88250ad57f
commit 6165b6fee3
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/items/weapons/material/shards.dm
View File

@@ -62,8 +62,7 @@
/obj/item/weapon/material/shard/Crossed(AM as mob|obj)
..()
if(ismob(AM))
if(isliving(AM))
var/mob/M = AM
if(M.buckled) //wheelchairs, office chairs, rollerbeds

15
code/modules/virus2/dishincubator.dm
View File

@@ -128,14 +128,21 @@
nanomanager.update_uis(src)
if(beaker)
if(!beaker.reagents.remove_reagent("virusfood",5))
foodsupply += 10
if(foodsupply < 100 && beaker.reagents.remove_reagent("virusfood",5))
if(foodsupply + 10 <= 100)
foodsupply += 10
else
beaker.reagents.add_reagent("virusfood",(100 - foodsupply)/2)
foodsupply = 100
nanomanager.update_uis(src)
if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list)
if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list && toxins < 100)
for(var/datum/reagent/toxin/T in beaker.reagents.reagent_list)
toxins += max(T.strength,1)
beaker.reagents.remove_reagent(T.id,1)
if(toxins > 100)
toxins = 100
break
nanomanager.update_uis(src)
/obj/machinery/disease2/incubator/Topic(href, href_list)
@@ -170,7 +177,7 @@
return 1
if (href_list["rad"])
radiation += 10
radiation = min(100, radiation + 10)
return 1
if (href_list["flush"])