cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 02:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Taser fix v.3.2

Browse Source 
Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
This commit is contained in:
MisterBook
2013-06-05 19:37:29 -05:00
parent a34174e124
commit eab6f4fc44
7 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
baystation12.dme
View File

@@ -492,6 +492,7 @@
#include "code\game\objects\items\devices\transfer_valve.dm"
#include "code\game\objects\items\devices\uplinks.dm"
#include "code\game\objects\items\devices\violin.dm"
#include "code\game\objects\items\devices\whistle.dm"
#include "code\game\objects\items\devices\PDA\cart.dm"
#include "code\game\objects\items\devices\PDA\chatroom.dm"
#include "code\game\objects\items\devices\PDA\PDA.dm"

2
code/datums/datacore.dm
View File

@@ -122,8 +122,10 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
icobase = 'icons/mob/human_races/r_lizard.dmi'
if("Skrell")
icobase = 'icons/mob/human_races/r_skrell.dmi'
/*
if("Vox")
icobase = 'icons/mob/human_races/r_vox.dmi'
*/
else
icobase = 'icons/mob/human_races/r_human.dmi'

2
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -186,7 +186,7 @@
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/taperoll/police(src)
new /obj/item/device/hailer
new /obj/item/device/hailer(src)
return

2
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -444,9 +444,11 @@ proc/get_damage_icon_part(damage_state, body_part)
if("skrell")
race_icon = 'icons/mob/human_races/r_skrell.dmi'
deform_icon = 'icons/mob/human_races/r_def_skrell.dmi'
/*
if("vox")
race_icon = 'icons/mob/human_races/r_vox.dmi'
deform_icon = 'icons/mob/human_races/r_def_vox.dmi'
*/
else
race_icon = 'icons/mob/human_races/r_human.dmi'
deform_icon = 'icons/mob/human_races/r_def_human.dmi'

2
code/modules/mob/new_player/preferences_setup.dm
View File

@@ -144,8 +144,10 @@ datum/preferences
icobase = 'icons/mob/human_races/r_lizard.dmi'
if("Skrell")
icobase = 'icons/mob/human_races/r_skrell.dmi'
/*
if("Vox")
icobase = 'icons/mob/human_races/r_vox.dmi'
*/
else
icobase = 'icons/mob/human_races/r_human.dmi'
preview_icon = new /icon(icobase, "torso_[g]")

2
code/modules/organs/organ_external.dm
View File

@@ -740,8 +740,10 @@ obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
base = new('icons/mob/human_races/r_lizard.dmi')
if("skrell")
base = new('icons/mob/human_races/r_skrell.dmi')
/*
if("vox")
base = new('icons/mob/human_races/r_vox.dmi')
*/
else
base = new('icons/mob/human_races/r_human.dmi')
if(base)