diff --git a/Nanako-PR-348.yml b/Nanako-PR-348.yml new file mode 100644 index 00000000000..236548b2789 --- /dev/null +++ b/Nanako-PR-348.yml @@ -0,0 +1,38 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Nanako + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Tajarans can now wear tajaran-specific gloves" + - bugfix: "Tajaran wardens, detectives and heads of security will properly spawn wearing black tajara gloves" + diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 9a4b3564b1b..09055963748 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -31,7 +31,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hos(H), slot_belt) - if(H.species.name == "Tajaran") + if(H.species.name == "Tajara") H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/tajara(H), slot_gloves) if(H.species.name == "Unathi") H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/unathi(H), slot_gloves) @@ -73,7 +73,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/warden(H), slot_belt) - if(H.species.name == "Tajaran") + if(H.species.name == "Tajara") H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/tajara(H), slot_gloves) if(H.species.name == "Unathi") H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/unathi(H), slot_gloves) @@ -116,7 +116,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/det(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/detective(H), slot_belt) - if(H.species.name == "Tajaran") + if(H.species.name == "Tajara") H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/tajara(H), slot_gloves) if(H.species.name == "Unathi") H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/unathi(H), slot_gloves) diff --git a/code/modules/admin/verbs/bluespacetech.dm b/code/modules/admin/verbs/bluespacetech.dm index e7f74e47877..e83865c4fb5 100644 --- a/code/modules/admin/verbs/bluespacetech.dm +++ b/code/modules/admin/verbs/bluespacetech.dm @@ -70,7 +70,7 @@ for(var/i = 1, i < 12, i++) new /obj/item/weapon/reagent_containers/pill/adminordrazine(pills) bst.equip_to_slot_or_del(pills, slot_in_backpack) - + //Implant because access bst.implant_loyalty(bst,TRUE) @@ -128,7 +128,7 @@ suicide() if(key && species.name != "Human") switch(species.name) - if("Tajaran") + if("Tajara") bsc() if("Machine") bsb() @@ -161,7 +161,7 @@ return proc/bsc() //because we all have our unrealistic snowflakes right? - if(set_species("Tajaran")) + if(set_species("Tajara")) h_style = "Tajaran Ears" name = "Bluespace Cat" voice_name = "Bluespace Cat" diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 05fb759f872..0836befa81a 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -61,7 +61,7 @@ /obj/item/clothing/gloves/latex/tajara name = "tajara latex gloves" desc = "Sterile latex gloves. Designed for Tajara use." - species_restricted = list("Tajaran") + species_restricted = list("Tajara") /obj/item/clothing/gloves/watch desc = "A small wristwatch, capable of telling time."