cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-13 16:12:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
Zuhayr
2015-04-11 22:19:24 +09:30
parent a029f88cfc 56019b80e6
commit e833c14975
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/outsider/vox.dm
+2 -3
View File
@@ -30,7 +30,7 @@
poison_type = "oxygen"
siemens_coefficient = 0.2
flags = IS_WHITELISTED | NO_SCAN | HAS_EYE_COLOR
flags = CAN_JOIN | IS_WHITELISTED | NO_SCAN | HAS_EYE_COLOR
blood_color = "#2299FC"
flesh_color = "#808D11"
@@ -47,8 +47,7 @@
"liver" = /obj/item/organ/liver,
"kidneys" = /obj/item/organ/kidneys,
"brain" = /obj/item/organ/brain,
"eyes" = /obj/item/organ/eyes,
"stack" = /obj/item/organ/stack/vox
"eyes" = /obj/item/organ/eyes
)
/datum/species/vox/get_random_name(var/gender)
code/modules/nano/modules/alarm_monitor.dm
+1 -1
View File
@@ -85,7 +85,7 @@
"origin_lost" = A.origin == null,
"has_cameras" = cameras.len,
"cameras" = cameras,
"lost_sources" = sanitize(english_list(lost_sources, nothing_text = "", and_text = ", "))))
"lost_sources" = lost_sources.len ? sanitize(english_list(lost_sources, nothing_text = "", and_text = ", ")) : ""))
data["categories"] = categories
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)