Fixes stray bugs

This commit is contained in:
MistakeNot4892
2021-09-12 20:17:24 -04:00
committed by VirgoBot
parent f1fdc853cd
commit 67efbfb247
5 changed files with 23 additions and 1 deletions
@@ -73,6 +73,7 @@
/mob/living/carbon/human/set_id_info(var/obj/item/weapon/card/id/id_card)
..()
id_card.age = age
id_card.sex = capitalize(name_gender())
/obj/item/weapon/card/id/tgui_data(mob/user)
var/list/data = list()
@@ -11,7 +11,11 @@
var/list/insertable = list(
/obj/item/weapon/reagent_containers/food/snacks,
/obj/item/weapon/holder,
/obj/item/weapon/paper
/obj/item/weapon/paper,
/obj/item/clothing/head/wizard,
/obj/item/clothing/head/cakehat,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/head/beret
)
/obj/item/weapon/reagent_containers/cooking_container/Initialize()
@@ -67,7 +67,13 @@
"points" = inserted_id.mining_points,
)
else
<<<<<<< HEAD
data["has_id"] = FALSE
=======
dat += "No ID inserted. <A href='?src=\ref[src];choice=insert'>Insert ID.</A><br>"
dat += "High-speed processing is <A href='?src=\ref[src];toggle_speed=1'>[(machine.speed_process ? "<font color='green'>active</font>" : "<font color='red'>inactive</font>")]</A>."
dat += "<hr><table>"
>>>>>>> 0f574bd2a48... Merge pull request #8292 from Schnayy/bugfixes-9-11-21
var/list/ores = list()
@@ -95,6 +95,14 @@
/mob/living/carbon/human/get_gender()
return identifying_gender ? identifying_gender : gender
/mob/living/carbon/human/name_gender() /// Returns proper names for gender identites
if(identifying_gender == "plural")
return "other"
if(identifying_gender == "neuter")
return "none"
else
return get_gender()
// This is the 'mechanical' check for synthetic-ness, not appearance
// Returns the company that made the synthetic
/mob/living/carbon/human/isSynthetic()
+3
View File
@@ -586,6 +586,9 @@
/mob/proc/get_gender()
return gender
/mob/proc/name_gender()
return gender
/mob/proc/see(message)
if(!is_active())
return 0