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

Merge branch 'master' of https://github.com/tgstation/-tg-station.git

Browse Source
This commit is contained in:
Firecage
2014-04-20 09:30:16 +02:00
parent dff7ebc0a4 99a55bb109
commit b8be6cea71
10 changed files with 520 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/spacevine.dm
+1
View File
@@ -97,6 +97,7 @@
/datum/spacevine_mutation/aggressive_spread //very OP, but im out of other ideas currently
name = "aggressive spreading"
hue = "777777"
severity = 3
/datum/spacevine_mutation/aggressive_spread/on_spread(obj/effect/spacevine/holder, turf/target)
for(var/atom/A in target)
code/modules/mob/mob.dm
+2
View File
@@ -593,6 +593,8 @@ var/list/slot_equipment_priority = list( \
if(master_controller)
stat(null,"MasterController-[last_tick_duration] ([master_controller.processing?"On":"Off"]-[controller_iteration])")
stat(null,"Air-[master_controller.air_cost]\t#[global_activeturfs]")
stat(null,"Turfs-[master_controller.air_turfs]\tGroups-[master_controller.air_groups]")
stat(null,"SC-[master_controller.air_superconductivity]\tHP-[master_controller.air_highpressure]\tH-[master_controller.air_hotspots]")
stat(null,"Sun-[master_controller.sun_cost]")
stat(null,"Mob-[master_controller.mobs_cost]\t#[mob_list.len]")
stat(null,"Dis-[master_controller.diseases_cost]\t#[active_diseases.len]")