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

Merge branch 'master' of https://github.com/tgstation/-tg-station into 1storydonuttweaks

Browse Source
This commit is contained in:
MMMiracles
2020-01-02 17:41:31 -05:00
parent ad618c5d69 3e4706d178
commit 595cf643f6
80 changed files with 3429 additions and 6141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/religion.dm
+2 -2
View File
@@ -102,7 +102,7 @@
item_state = "banner_medical"
lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi'
job_loyalties = list("Medical Doctor", "Chemist", "Geneticist", "Virologist", "Chief Medical Officer")
job_loyalties = list("Medical Doctor", "Chemist", "Virologist", "Chief Medical Officer")
warcry = "No wounds cannot be healed!"
/obj/item/banner/medical/mundane
@@ -131,7 +131,7 @@
item_state = "banner_science"
lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi'
job_loyalties = list("Scientist", "Roboticist", "Research Director")
job_loyalties = list("Scientist", "Roboticist", "Research Director", "Geneticist",)
warcry = "For Cuban Pete!"
/obj/item/banner/science/mundane
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+1 -1
View File
@@ -243,7 +243,7 @@
/obj/structure/closet/wardrobe/genetics_white/PopulateContents()
var/static/items_inside = list(
/obj/item/clothing/under/rank/medical/geneticist = 2,
/obj/item/clothing/under/rank/rnd/geneticist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
/obj/item/storage/backpack/genetics = 2,