cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
=
2015-04-11 13:23:17 +09:30
parent 7a40d193fe c9fc94e1ff
commit 78987a436a
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/__HELPERS/atom_pool.dm
View File

@@ -38,7 +38,6 @@ var/global/list/GlobalPool = list()
else else
AM = new get_type (second_arg) AM = new get_type (second_arg)
else else
if(AM)
return AM return AM

1
code/game/objects/structures/mirror.dm
View File

@@ -80,6 +80,7 @@
var/mob/living/carbon/human/vox/vox = new(get_turf(src),"Vox") var/mob/living/carbon/human/vox/vox = new(get_turf(src),"Vox")
vox.gender = user.gender vox.gender = user.gender
raiders.equip(vox) raiders.equip(vox)
new /obj/item/organ/stack/vox(vox)
if(user.mind) if(user.mind)
user.mind.transfer_to(vox) user.mind.transfer_to(vox)
spawn(1) spawn(1)

5
code/modules/mob/living/carbon/human/species/outsider/vox.dm
View File

@@ -30,7 +30,7 @@
poison_type = "oxygen" poison_type = "oxygen"
siemens_coefficient = 0.2 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" blood_color = "#2299FC"
flesh_color = "#808D11" flesh_color = "#808D11"
@@ -47,8 +47,7 @@
"liver" = /obj/item/organ/liver, "liver" = /obj/item/organ/liver,
"kidneys" = /obj/item/organ/kidneys, "kidneys" = /obj/item/organ/kidneys,
"brain" = /obj/item/organ/brain, "brain" = /obj/item/organ/brain,
"eyes" = /obj/item/organ/eyes, "eyes" = /obj/item/organ/eyes
"stack" = /obj/item/organ/stack/vox
) )
/datum/species/vox/get_random_name(var/gender) /datum/species/vox/get_random_name(var/gender)

2
code/modules/nano/modules/alarm_monitor.dm
View File

@@ -85,7 +85,7 @@
"origin_lost" = A.origin == null, "origin_lost" = A.origin == null,
"has_cameras" = cameras.len, "has_cameras" = cameras.len,
"cameras" = cameras, "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 data["categories"] = categories
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)