From ccb87c446ad53541f2e1d1cf1bba1ae1690456b6 Mon Sep 17 00:00:00 2001 From: Segrain Date: Tue, 13 Aug 2013 09:21:28 +0300 Subject: [PATCH 1/3] Vox beards. --- code/game/gamemodes/heist/heist.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 4e269152ff9..0f1fd97b36f 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -106,7 +106,7 @@ var/global/vox_kills = 0 //Used to check the Inviolate. vox.flavor_text = "" vox.add_language("Vox-pidgin") vox.h_style = "Short Vox Quills" - vox.flavor_text = "" + vox.f_style = "Shaved" for(var/datum/organ/external/limb in vox.organs) limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT) vox.equip_vox_raider() From 6122d50ce032dff3c311fad1e507a028e843c568 Mon Sep 17 00:00:00 2001 From: Segrain Date: Tue, 13 Aug 2013 09:25:28 +0300 Subject: [PATCH 2/3] Reverting to as advertised. --- .../modules/reagents/reagent_containers/hypospray.dm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index f14712865aa..eba96d7bbe9 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -68,17 +68,11 @@ /obj/item/weapon/reagent_containers/hypospray/autoinjector/attack(mob/M as mob, mob/user as mob) ..() -/*if(reagents.total_volume <= 0) //Prevents autoinjectors to be refilled. +if(reagents.total_volume <= 0) //Prevents autoinjectors to be refilled. flags &= ~OPENCONTAINER -*/ update_icon() return -/obj/item/weapon/reagent_containers/hypospray/autoinjector/attackby(obj/item/I as obj, mob/user as mob) - ..() - update_icon() //Allows the autoinjector to be reset. - return - /obj/item/weapon/reagent_containers/hypospray/autoinjector/update_icon() if(reagents.total_volume > 0) icon_state = "[initial(icon_state)]1" @@ -90,6 +84,4 @@ if(reagents && reagents.reagent_list.len) usr << "\blue It is currently loaded." else - usr << "\blue It is spent." - - + usr << "\blue It is spent." \ No newline at end of file From 3ba5c3e450c30ce5a49188c96625503b8b00e124 Mon Sep 17 00:00:00 2001 From: Segrain Date: Tue, 13 Aug 2013 13:47:22 +0300 Subject: [PATCH 3/3] Compile fix. --- code/modules/reagents/reagent_containers/hypospray.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index eba96d7bbe9..0b4a3c1e7e9 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -68,7 +68,7 @@ /obj/item/weapon/reagent_containers/hypospray/autoinjector/attack(mob/M as mob, mob/user as mob) ..() -if(reagents.total_volume <= 0) //Prevents autoinjectors to be refilled. + if(reagents.total_volume <= 0) //Prevents autoinjectors to be refilled. flags &= ~OPENCONTAINER update_icon() return