cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes ninja mask, fixes ninja internals

Browse Source
This commit is contained in:
GinjaNinja32
2014-12-14 06:58:33 +00:00
parent 920ede6767
commit 16a7e2a4b9
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/gamemodes/events/space_ninja.dm
View File

@@ -531,7 +531,6 @@ As such, it's hard-coded for now. No reason for it not to be, really.
else
equip_to_slot_or_del(new /obj/item/clothing/under/color/black(src), slot_w_uniform)
equip_to_slot_or_del(new /obj/item/clothing/mask/gas/voice/space_ninja(src), slot_wear_mask)
equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_belt)
var/obj/item/weapon/rig/light/ninja/ninjasuit = new(src)
@@ -546,16 +545,16 @@ As such, it's hard-coded for now. No reason for it not to be, really.
equip_to_slot_or_del(ninjasuit,slot_back)
if(istype(wear_suit,/obj/item/weapon/rig))
var/obj/item/weapon/rig/rig = wear_suit
if(rig.air_supply)
internal = rig.air_supply
if(!internal && s_store)
internal = s_store
if(internal)
internals.icon_state = "internal1"
spawn(10)
ninjasuit.toggle_seals(src,1)
if(istype(back,/obj/item/weapon/rig))
var/obj/item/weapon/rig/rig = back
if(rig.air_supply)
internal = rig.air_supply
if(!internal && s_store)
internal = s_store
if(internal)
internals.icon_state = "internal1"
return 1

23
code/modules/clothing/masks/voice.dm
View File

@@ -10,13 +10,22 @@
var/obj/item/voice_changer/changer
origin_tech = "syndicate=4"
/obj/item/clothing/mask/gas/voice/verb/Toggle_Voice_Changer()
set category = "Object"
set src in usr
changer.active = !changer.active
usr << "\blue You [changer.active ? "enable" : "disable"] the voice-changing module in \the [src]."
/obj/item/clothing/mask/gas/voice/verb/Set_Voice(name as text)
set category = "Object"
set src in usr
var/voice = sanitize(copytext(name,1,MAX_MESSAGE_LEN))
if(!voice || !length(voice)) return
changer.voice = voice
usr << "\blue You are now mimicking <B>[changer.voice]</B>.</font>"
/obj/item/clothing/mask/gas/voice/New()
..()
changer = new(src)
/obj/item/clothing/mask/gas/voice/space_ninja
name = "ninja mask"
desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement."
icon_state = "s-ninja"
item_state = "s-ninja_mask"
siemens_coefficient = 0.2