cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

October Bugfix Bonanza (#3767)

Browse Source 
Fixes #3742 - someone unfucked the fix again.
Resolves #3740 and resolves #3739.
Fixes #1558 - a 10 month long meme is dead.
Resolves #3720 by making robo-eyes immune only to the eye stinging effects of pepperspray. Let there be equality amongst the synths.
Fixes #3676 - tested, shouldn't break. It was double-calling set_death_timer.
Fixes #3672 and fixes #3658 - that was my bad on not noticing the diff around hologram.icon = icon vs add_overlay(icon).
Fixes #3762 - I'm surprised this didn't fuck over more.
This commit is contained in:
Erki
2017-10-29 19:03:24 +02:00
committed by GitHub
parent 2d52377ad8
commit 7b1bcdc8f3
14 changed files with 102 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/virus2/dishincubator.dm
+2 -2
View File
@@ -137,10 +137,10 @@
SSnanoui.update_uis(src)
if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list && toxins < 100)
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)
beaker.reagents.remove_reagent(T.id, 1)
if(toxins > 100)
toxins = 100
break