diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index ebc8a5421eb..451e40b712b 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -194,7 +194,7 @@ while(!accepted) if(!B) break // prevents possible runtime errors - switch(input(src,"Which bible style would you like?") in list("Normal (Christianity)", "Koran", "Scrapbook", "Daederic Scroll", "Creeper", "White", "Banana", "Holy Light", "Athiest", "Necromancer", "Tome")) + switch(input(src,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Daederic Scroll", "Creeper", "White Bible", "Holy Light", "Athiest", "Tome", "The King in Yellow", "Ithaqua", "Scientology")) if("Koran") B.icon_state = "koran" B.item_state = "koran" @@ -207,24 +207,27 @@ if("Creeper") B.icon_state = "creeper" B.item_state = "syringe_kit" - if("White") + if("White Bible") B.icon_state = "white" B.item_state = "syringe_kit" - if("Banana") - B.icon_state = "banana" - B.item_state = "syringe_kit" if("Holy Light") B.icon_state = "holylight" B.item_state = "syringe_kit" if("Athiest") B.icon_state = "athiest" B.item_state = "syringe_kit" - if("Necromancer") - B.icon_state = "necro" - B.item_state = "syringe_kit" if("Tome") B.icon_state = "tome" B.item_state = "syringe_kit" + if("The King in Yellow") + B.icon_state = "kingyellow" + B.item_state = "kingyellow" + if("Ithaqua") + B.icon_state = "ithaqua" + B.item_state = "ithaqua" + if("Scientology") + B.icon_state = "scientology" + B.item_state = "scientology" else // if christian bible, revert to default B.icon_state = "bible" diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 3993949b450..d99d3920b9f 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -594,7 +594,7 @@ /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay name = "Energy Relay" desc = "Wirelessly drains energy from any available power channel in area. The performance index is quite low." - icon_state = "mecha_equip" + icon_state = "tesla" origin_tech = "magnets=3" equip_cooldown = 10 energy_drain = 0 diff --git a/icons/misc/mech_construct.dmi b/icons/misc/mech_construct.dmi index 6e6a04aa589..b57e48d008a 100644 Binary files a/icons/misc/mech_construct.dmi and b/icons/misc/mech_construct.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 3517d5152f4..baafe6d7f84 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index d774f90ebf8..db70168ffa2 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 49da22e3e15..0596407ae8f 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 84c5515a9de..57747702a2e 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ