shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citadel/master' into unarmed_parry

Browse Source
This commit is contained in:
silicons
2020-07-16 19:39:46 -07:00
parent 6cbab55ef8 aeacc3ab62
commit 993b4ec222
1129 changed files with 38441 additions and 43871 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/clock_cult/clock_cult.dm
+2 -1
View File
@@ -350,8 +350,9 @@ Credit where due:
for(var/entry in changelog)
changelog_contents += "<li>[entry]</li>"
info = replacetext(info, "CLOCKCULTCHANGELOG", changelog_contents)
/*
/obj/item/paper/servant_primer/oui_getcontent(mob/target)
if(!is_servant_of_ratvar(target) && !isobserver(target))
return "<HTML><HEAD><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>"
return ..()
*/
code/game/gamemodes/objective_items.dm
+1 -1
View File
@@ -125,7 +125,7 @@
/datum/objective_item/steal/plasma/check_special_completion(obj/item/tank/T)
var/target_amount = text2num(name)
var/found_amount = 0
found_amount += T.air_contents.gases[/datum/gas/plasma]
found_amount += T.air_contents.get_moles(/datum/gas/plasma)
return found_amount>=target_amount