cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3501 from Segrain/master

Browse Source 
Fixes.
This commit is contained in:
Mloc
2013-08-13 05:10:18 -07:00
parent 52397321b2 3ba5c3e450
commit a12e3b2407
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/heist/heist.dm
+1 -1
View File
@@ -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()
code/modules/reagents/reagent_containers/hypospray.dm
+2 -10
View File
@@ -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."