diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 4a2e0cbe848..cb56c226698 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -132,6 +132,10 @@ //Cameras can't track people wearing an agent card or a ninja hood. if(H.wear_id && istype(H.wear_id.GetID(), /obj/item/weapon/card/id/syndicate)) continue + if(istype(H.head, /obj/item/clothing/head)) + var/obj/item/clothing/head/hat = H.head + if(hat.blockTracking) + continue // Now, are they viewable by a camera? (This is last because it's the most intensive check) if(!near_camera(M)) continue @@ -193,6 +197,11 @@ if(H.digitalcamo) U.ai_cancel_tracking(1) return + if(istype(H.head, /obj/item/clothing/head)) + var/obj/item/clothing/head/hat = H.head + if (hat.blockTracking) + U.ai_cancel_tracking(1) + return if(istype(target.loc,/obj/effect/dummy)) U.ai_cancel_tracking() return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 9d14c48765c..d0c2f8f006e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -75,9 +75,9 @@ else if(src.allowed(user) || !src.registered_name || (istype(I) && (src.registered_name == I.registered_name))) //they can open all lockers, or nobody owns this, or they own this locker src.locked = !( src.locked ) - if(src.locked) + if(src.locked) src.icon_state = src.icon_locked - else + else src.icon_state = src.icon_closed registered_name = null desc = initial(desc) @@ -87,19 +87,8 @@ src.desc = "Owned by [I.registered_name]." else user << "\red Access Denied" - else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken) - broken = 1 - locked = 0 - desc = "It appears to be broken." - icon_state = src.icon_broken - if(istype(W, /obj/item/weapon/melee/energy/blade)) - var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() - spark_system.set_up(5, 0, src.loc) - spark_system.start() - playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) - playsound(src.loc, "sparks", 50, 1) - for(var/mob/O in viewers(user, 3)) - O.show_message("\blue The locker has been sliced open by [user] with an energy blade!", 1, "\red You hear metal being sliced and sparks flying.", 2) + else if((istype(W, /obj/item/weapon/card/emag)) && !src.broken) + emag_act() else user << "\red Access Denied" return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 7d3fde7744c..16bc29de13e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -78,27 +78,20 @@ if(W) W.loc = src.loc else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken) - broken = 1 - locked = 0 - desc = "It appears to be broken." - icon_state = icon_off - flick(icon_broken, src) - if(istype(W, /obj/item/weapon/melee/energy/blade)) - var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() - spark_system.set_up(5, 0, src.loc) - spark_system.start() - playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) - playsound(src.loc, "sparks", 50, 1) - for(var/mob/O in viewers(user, 3)) - O.show_message("The locker has been sliced open by [user] with an energy blade!", 1, "You hear metal being sliced and sparks flying.", 2) - else - for(var/mob/O in viewers(user, 3)) - O.show_message("The locker has been broken by [user] with an electromagnetic card!", 1, "You hear a faint electrical spark.", 2) + emag_act() else if(istype(W,/obj/item/stack/packageWrap) || istype(W,/obj/item/weapon/weldingtool)) return ..(W,user) else togglelock(user) +/obj/structure/closet/secure_closet/emag_act() + broken = 1 + locked = 0 + desc = "It appears to be broken." + icon_state = icon_off + flick(icon_broken, src) + usr<< "You unlock \the [src]." + /obj/structure/closet/secure_closet/attack_hand(mob/user as mob) src.add_fingerprint(user) if(src.locked) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 59edffe4b0d..cf6e23615e2 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -295,19 +295,23 @@ if(is_type_in_list(W, list(/obj/item/stack/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters))) return ..() if(locked && (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade))) - overlays += sparks - spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* - playsound(src.loc, "sparks", 60, 1) - src.locked = 0 - src.broken = 1 - update_icon() - user << "You unlock \the [src]." + emag_act() return if(!opened) src.togglelock(user) return return ..() +/obj/structure/closet/crate/secure/emag_act() + overlays += sparks + spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface* + playsound(src.loc, "sparks", 60, 1) + src.locked = 0 + src.broken = 1 + update_icon() + usr << "You unlock \the [src]." + return + /obj/structure/closet/crate/secure/emp_act(severity) for(var/obj/O in src) O.emp_act(severity) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 33a75e7639c..011c1f27f0a 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -235,6 +235,7 @@ BLIND // can't see anything body_parts_covered = HEAD slot_flags = SLOT_HEAD var/loose = 10 // probability (0..100) of coming off your head when you fall over or lay down + var/blockTracking // Do we block AI tracking? //Mask diff --git a/code/modules/clothing/spacesuits/space_ninja.dm b/code/modules/clothing/spacesuits/space_ninja.dm deleted file mode 100644 index acc53c3dc40..00000000000 --- a/code/modules/clothing/spacesuits/space_ninja.dm +++ /dev/null @@ -1,350 +0,0 @@ -// ** BEGIN NINJA CLOTHING DEFINES ** - -/obj/item/clothing/head/helmet/space/space_ninja - desc = "What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear." - name = "ninja hood" - icon_state = "s-ninja" - item_state = "s-ninja_hood" - armor = list(melee = 60, bullet = 60, laser = 45, energy = 15, bomb = 30, bio = 30, rad = 25) - unacidable = 1 - siemens_coefficient = 0.2 - - -/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(norm)" - item_state = "s-ninja_mask" - unacidable = 1 - siemens_coefficient = 0.2 - -/obj/item/clothing/glasses/hud/space_ninja - name = "vision enhancement implant" - desc = "A high-tech ocular implant designed for Spider Clan operatives." - icon_state = "cybereye-off" - item_state = "eyepatch" - flags = NODROP - - var/enabled = 0 - var/energyConsumption = 0 - var/antagHUDEnabled = 0 - var/mesonEnabled = 0 - var/materialEnabled = 0 - var/thermalEnabled = 0 - -/obj/item/clothing/suit/space/space_ninja - name = "ninja suit" - desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins." - icon_state = "s-ninja" - item_state = "s-ninja_suit" - allowed = list(/obj/item/weapon/gun, /obj/item/ammo_box, /obj/item/weapon/melee/baton, /obj/item/weapon/tank, /obj/item/weapon/stock_parts/cell) - slowdown = 0 - unacidable = 1 - armor = list(melee = 60, bullet = 60, laser = 45,energy = 15, bomb = 30, bio = 30, rad = 30) - siemens_coefficient = 0.2 - - var/suitActive = 0 - var/suitBusy = 0 - - var/obj/item/weapon/stock_parts/cell/suitCell - var/obj/item/clothing/head/helmet/space/space_ninja/suitHood - var/obj/item/clothing/gloves/space_ninja/suitGloves - var/obj/item/clothing/shoes/space_ninja/suitShoes - var/obj/item/clothing/mask/gas/voice/space_ninja/suitMask - var/obj/item/clothing/glasses/hud/space_ninja/suitGlasses - var/mob/living/carbon/human/suitOccupant - -/obj/item/clothing/gloves/space_ninja - desc = "These nano-enhanced gloves insulate from electricity and provide fire resistance." - name = "ninja gloves" - icon_state = "s-ninja" - item_state = "s-ninja" - siemens_coefficient = 0 - cold_protection = HANDS - min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = HANDS - max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE - transfer_prints = FALSE - - -/obj/item/clothing/shoes/space_ninja - name = "ninja shoes" - desc = "A pair of running shoes. Excellent for running and even better for smashing skulls." - icon_state = "s-ninja" - permeability_coefficient = 0.01 - flags = NOSLIP - armor = list(melee = 60, bullet = 60, laser = 45,energy = 15, bomb = 30, bio = 30, rad = 30) - siemens_coefficient = 0.2 - cold_protection = FEET - min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE - heat_protection = FEET - max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE - -// ** END NINJA CLOTHING DEFINES ** - -// ** BEGIN NINJA SUIT PROCS ** - -/obj/item/clothing/suit/space/space_ninja/New() - suitCell = new/obj/item/weapon/stock_parts/cell/ninja // The Ninja starts out with a 10,000 energy cell. - if(suitCell.charge != suitCell.maxcharge) - suitCell.charge = suitCell.maxcharge - -/obj/item/clothing/suit/space/space_ninja/verb/toggle_suit() - set category = "Space Ninja - Equiptment" - set name = "Toggle Suit" - - if(usr.mind.special_role == "Ninja") - if(suitBusy) - usr << "ERROR: Suit systems busy, cannot initiate [suitActive ? "de-activation" : "activation"] protocals at this time." - return - - suitBusy = 1 - - if(suitActive && (alert("Confirm suit systems shutdown? This cannot be halted once it has started.", "Confirm Shutdown", "Yes", "No") == "Yes")) - usr << "Now de-initializing..." - - sleep(15) - usr << "Logging off, [usr.real_name]. Shutting down SpiderOS." - - sleep(10) - usr<< "Primary system status: OFFLINE.\nBackup system status: OFFLINE." - - sleep(5) - usr<< "VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE." - //TODO: Shut down any active abilities - - sleep(10) - usr<< "Disconnecting neural-net interface... Success." - usr.hud_used.instantiate() - usr.regenerate_icons() - - sleep(5) - usr<< "Disengaging neural-net interface... Success." - - sleep(10) - usr<< "Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED." - //TODO: Grant verbs - toggle_suit_lock(usr) - usr.regenerate_icons() - suitBusy = 0 - suitActive = 0 - - else if(!suitActive) // Activate the suit. - usr << "Now initializing..." - - sleep(15) - usr<< "Now establishing neural-net interface..." - if(usr.mind.special_role != "Ninja") - usr << "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked." - return - - sleep(10) - usr<< "Neural-net established. Now monitoring brainwave pattern. \nBrainwave pattern GREEN, proceeding." - - sleep(10) - usr<< "Securing external locking mechanism..." - if(!toggle_suit_lock(usr)) - return - - sleep(5) - usr<< "Suit secured, extending neural-net interface..." - usr.hud_used.human_hud('icons/mob/screen1_NinjaHUD.dmi',"#ffffff",255) - usr.regenerate_icons() - - sleep(10) - usr<< "VOID-shift device status: ONLINE.\nCLOAK-tech device status:ONLINE" - - sleep(5) - usr<< "Primary system status: ONLINE.\nBackup system status: ONLINE.\nCurrent energy capacity: [suitCell.charge]/[suitCell.maxcharge]." - - sleep(10) - usr<< "All systems operational. Welcome to SpiderOS, [usr.real_name]." - //TODO: Grant ninja verbs here. - suitBusy = 0 - suitActive = 1 - - else - suitBusy = 0 - usr << "NOTICE: Suit de-activation protocals aborted." - else - usr << "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked." - return - -/obj/item/clothing/suit/space/space_ninja/proc/toggle_suit_lock(mob/living/carbon/human/user) - if(!suitActive) - if(!istype(user.wear_suit, /obj/item/clothing/suit/space/space_ninja)) - user<< "ERROR: Unable to locate user.\nABORTING..." - return 0 - if(!istype(user.head, /obj/item/clothing/head/helmet/space/space_ninja)) - user<< "ERROR: Unable to locate hood.\nABORTING..." - return 0 - if(!istype(user.gloves, /obj/item/clothing/gloves/space_ninja)) - user<< "ERROR: Unable to locate gloves.\nABORTING..." - return 0 - if(!istype(user.shoes, /obj/item/clothing/shoes/space_ninja)) - user<< "ERROR: Unable to locate foot gear.\nABORTING..." - return 0 - if(!istype(user.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)) - user<< "ERROR: Unable to locate mask.\nABORTING..." - return 0 - if(!istype(user.glasses, /obj/item/clothing/glasses/hud/space_ninja)) - user<< "WARNING: Unable to locate eye gear, vision enhancement unavailable.\nProceeding..." - else - suitGlasses = user.glasses - suitGlasses.enabled = 1 - suitGlasses.icon_state = "cybereye-green" - - suitHood = user.head - suitMask = user.wear_mask - suitGloves = user.gloves - suitShoes = user.shoes - suitOccupant = user - - flags |= NODROP - suitHood.flags |= NODROP - suitMask.flags |= NODROP - suitGloves.flags |= NODROP - suitGloves.pickpocket = 1 - suitShoes.flags |= NODROP - suitShoes.slowdown = -2 - - icon_state = (user.gender == MALE ? "s-ninjan" : "s-ninjanf") - suitGloves.icon_state = "s-ninjan" - suitGloves.item_state = "s-ninjan" - - return 1 - - else - flags &= ~NODROP - suitHood.flags &= ~NODROP - suitMask.flags &= ~NODROP - if(suitGlasses) - suitGlasses.enabled = 0 - suitGlasses.icon_state = "cybereye-off" - suitGloves.flags &= ~NODROP - suitGloves.pickpocket = 0 - suitShoes.flags &= ~NODROP - suitShoes.slowdown = -1 - icon_state = "s-ninja" - suitGloves.icon_state = "s-ninja" - suitGloves.item_state = "s-ninja" - - suitHood = null - suitMask = null - suitGlasses = null - suitGloves = null - suitShoes = null - suitOccupant = null - - return 1 - -// ** END NINJA SUIT PROCS ** - -// **BEGIN NINJA GLASSES PROCS** - -/obj/item/clothing/glasses/hud/space_ninja/process_hud(var/mob/M) // Antag HUD processing. - - if(antagHUDEnabled) // We only process if the antag-vision mode is enabled. - if(!M) return - if(!M.client) return - var/client/C = M.client - for(var/mob/living/carbon/human/target in view(get_turf(M))) - if(M.see_invisible < target.invisibility) - continue - if(!C) continue - C.images += target.hud_list[SPECIALROLE_HUD] - -/obj/item/clothing/glasses/hud/space_ninja/verb/modifyHUD(mob/user as mob) - set category = "Space Ninja - Equiptment" - set name = "Modify Vision" - - if(usr.mind.special_role != "Ninja") - usr << "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked." - return - - if(!enabled) // If the Ninja's suit is on and connected. - usr << "ERROR: No power supply detected, cannot activate optical implant." - return - - if(!user) // The user var is, so far as I can tell, required to refresh the window after each click. - user = usr - - /* - * Each vision type the Ninja enables will drain more from his suit's battery per tick. - * For instance, if the Ninja were to rn around with thermals and AntagHUD on he would be losing an additional 10 energy per tick. - * Current vision modes are: - * - Night - * - Meson (Turfs) - * - Material (Objects) - * - Thermal (Mobs) - * - Antag HUD - * - * -Dave - */ - var/dat = {" -
Night Vision (2E) - [darkness_view ? "ENABLED" : "DISABLED"]
- Meson Scanner (2E) - [mesonEnabled ? "ENABLED" : "DISABLED"]
- Material Scanner (4E) - [materialEnabled ? "ENABLED" : "DISABLED"]
- Thermal Scanner (4E) - [thermalEnabled ? "ENABLED" : "DISABLED"]
- Threat Identification HUD (6E) - [antagHUDEnabled ? "ENABLED" : "DISABLED"]
- "} - - var/datum/browser/popup = new(user, "SpiderOS", "SpiderOS Optical Interface", 310, 150) - popup.set_content(dat) - popup.open() - - -/obj/item/clothing/glasses/hud/space_ninja/Topic(href, href_list) - if(usr.stat != 0 || !enabled) - return 1 - - if(href_list["night"]) - darkness_view = (darkness_view ? 0 : 8) - see_darkness = (darkness_view ? 0 : 1) - energyConsumption += (darkness_view ? 2 : -2) - usr << "Light amplification [(darkness_view ? "ENABLED" : "DISABLED")]." - - else if(href_list["meson"]) - mesonEnabled = (mesonEnabled ? 0 : 1) - - if(mesonEnabled) - vision_flags |= SEE_TURFS - else - vision_flags &= ~SEE_TURFS - - energyConsumption += (mesonEnabled ? 2 : -2) - usr << "Meson scanning [(mesonEnabled ? "ENABLED" : "DISABLED")]." - - else if(href_list["material"]) - materialEnabled = (materialEnabled ? 0 : 1) - - if(materialEnabled) - vision_flags |= SEE_OBJS - else - vision_flags &= ~SEE_OBJS - - energyConsumption += (materialEnabled ? 4 : -4) - usr << "Material scanning [(materialEnabled ? "ENABLED" : "DISABLED")]." - - else if(href_list["thermal"]) - thermalEnabled = (thermalEnabled ? 0 : 1) - - if(thermalEnabled) - vision_flags |= SEE_MOBS - invisa_view = 2 - else - vision_flags &= ~SEE_MOBS - invisa_view = 0 - - energyConsumption += (thermalEnabled ? 4 : -4) - usr << "Thermal scanning [(thermalEnabled ? "ENABLED" : "DISABLED")]." - - else if(href_list["antagHUD"]) - antagHUDEnabled = (antagHUDEnabled ? 0 : 1) - energyConsumption += (antagHUDEnabled ? 6 : -6) - usr << "Threat identification HUD [(antagHUDEnabled ? "ENABLED" : "DISABLED")]." - - modifyHUD(usr) // Re-call the verb to get a fresh version of the window. - return - -// **END NINJA GLASSES PROCS** \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index bde2a71847e..0d5bbb95252 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -797,6 +797,7 @@ proc/get_damage_icon_part(damage_state, body_part) if(!t_state) t_state = belt.icon_state if(belt.icon_override) + t_state = "[t_state]_be" overlays_standing[BELT_LAYER] = image("icon" = belt.icon_override, "icon_state" = "[t_state]") else if(belt.sprite_sheets && belt.sprite_sheets[species.name]) overlays_standing[BELT_LAYER] = image("icon" = belt.sprite_sheets[species.name], "icon_state" = "[t_state]") diff --git a/code/modules/ninja/Ninja_Readme.dm b/code/modules/ninja/Ninja_Readme.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/Ninja_Readme.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/__ninjaDefines.dm b/code/modules/ninja/__ninjaDefines.dm new file mode 100644 index 00000000000..a8dc65f9f13 --- /dev/null +++ b/code/modules/ninja/__ninjaDefines.dm @@ -0,0 +1,13 @@ + +/* + +Contents: +- Definitions, because the original Ninja code has so much magic. + +*/ + + +//ninjacost() specificCheck defines +#define N_STEALTH_CANCEL 1 +#define N_SMOKE_BOMB 2 +#define N_ADRENALINE 3 \ No newline at end of file diff --git a/code/modules/ninja/admin_ninja_verbs.dm b/code/modules/ninja/admin_ninja_verbs.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/admin_ninja_verbs.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm new file mode 100644 index 00000000000..6aa5a5c7f38 --- /dev/null +++ b/code/modules/ninja/energy_katana.dm @@ -0,0 +1,29 @@ + + +/obj/item/weapon/katana/energy + name = "energy katana" + desc = "A katana infused with a strong energy" + icon_state = "energy_katana" + item_state = "energy_katana" + icon_override = 'icons/mob/in-hand/swords.dmi' + force = 40 + throwforce = 20 + var/cooldown = 0 // Because spam aint cool, yo. + +/obj/item/weapon/katana/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(user, 'sound/weapons/blade1.ogg', 50, 1, -1) + return ..() + +/obj/item/weapon/katana/energy/afterattack(atom/target, mob/user, proximity_flag, click_parameters) + if(!user || !target) + return + + if(proximity_flag && user.mind.special_role == "Ninja" && !cooldown) + cooldown = 1 + playsound(user, "sparks", 50, 1) + playsound(user, 'sound/weapons/blade1.ogg', 50, 1) + user.visible_message("[user] masterfully slices [target]!", "You masterfully slice [target]!") + target.emag_act() + sleep(15) + cooldown = 0 + diff --git a/code/modules/ninja/ninja_event.dm b/code/modules/ninja/ninja_event.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/ninja_event.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/suit/SpiderOS.dm b/code/modules/ninja/suit/SpiderOS.dm new file mode 100644 index 00000000000..8b030b11ffb --- /dev/null +++ b/code/modules/ninja/suit/SpiderOS.dm @@ -0,0 +1,276 @@ + +//HERE BE A VERY LARGE DRAGON + +/obj/item/clothing/suit/space/space_ninja/proc/spideros() + set name = "Display SpiderOS" + set desc = "Utilize built-in computer system." + set category = "Ninja Equip" + + if(!s_busy) + display_spideros() + else + affecting << "The interface is locked!" + + +/obj/item/clothing/suit/space/space_ninja/proc/display_spideros() + if(!affecting) return//If no mob is wearing the suit. I almost forgot about this variable. + var/mob/living/carbon/human/U = affecting + var/display_to = U//Who do we want to display certain messages to? + + var/dat = "SpiderOS" + dat += " Refresh" + if(spideros) + dat += " | Return" + dat += " | Close" + dat += "
" + dat += "

SpiderOS v.1.337

" + dat += "Welcome, [U.real_name].
" + dat += "
" + dat += " Current Time: [worldtime2text()]
" + dat += " Battery Life: [round(cell.charge/100)]%
" + dat += " Smoke Bombs: \Roman [s_bombs]
" + dat += "

" + + switch(spideros) + if(0) + dat += "

Available Functions:

" + dat += "" + if(3) + dat += "

Medical Report:

" + if(U.dna) + dat += "Fingerprints: [md5(U.dna.uni_identity)]
" + dat += "Unique identity: [U.dna.unique_enzymes]
" + dat += "

Overall Status: [U.stat > 1 ? "dead" : "[U.health]% healthy"]

" + dat += "

Nutrition Status: [U.nutrition]

" + dat += "Oxygen loss: [U.getOxyLoss()]" + dat += " | Toxin levels: [U.getToxLoss()]
" + dat += "Burn severity: [U.getFireLoss()]" + dat += " | Brute trauma: [U.getBruteLoss()]
" + dat += "Radiation Level: [U.radiation] rad
" + dat += "Body Temperature: [U.bodytemperature-T0C]°C ([U.bodytemperature*1.8-459.67]°F)
" + + for(var/datum/disease/D in U.viruses) + dat += "Warning: Virus Detected. Name: [D.name].Type: [D.spread_text]. Stage: [D.stage]/[D.max_stages]. Possible Cure: [D.cure_text].
" + dat += "" + if(1) + dat += "

Atmospheric Scan:

"//Headers don't need breaks. They are automatically placed. + var/turf/T = get_turf(U.loc) + if (isnull(T)) + dat += "Unable to obtain a reading." + else + var/datum/gas_mixture/environment = T.return_air() + + var/pressure = environment.return_pressure() + var/total_moles = environment.total_moles() + + dat += "Air Pressure: [round(pressure,0.1)] kPa" + + if (total_moles) + var/o2_level = environment.oxygen/total_moles + var/n2_level = environment.nitrogen/total_moles + var/co2_level = environment.carbon_dioxide/total_moles + var/plasma_level = environment.toxins/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+plasma_level) + dat += "
    " + dat += "
  • Nitrogen: [round(n2_level*100)]%
    • " + dat += "
  • Oxygen: [round(o2_level*100)]%
    • " + dat += "
  • Carbon Dioxide: [round(co2_level*100)]%
    • " + dat += "
  • Plasma: [round(plasma_level*100)]%
    • " + dat += "
" + if(unknown_level > 0.01) + dat += "OTHER: [round(unknown_level)]%
" + + dat += "Temperature: [round(environment.temperature-T0C)]°C" + if(2) + dat += "

Anonymous Messenger:

"//Anonymous because the receiver will not know the sender's identity. + dat += "

Detected PDAs:

" + dat += "
    " + var/count = 0 + for (var/obj/item/device/pda/P in get_viewable_pdas()) + dat += "
  • [P]" + dat += "
    • " + count++ + dat += "
" + if (count == 0) + dat += "None detected.
" + if(4) + dat += {" +

Ninja Manual:

+
Who they are:
+ Space ninjas are a special type of ninja, specifically one of the space-faring type. The vast majority of space ninjas belong to the Spider Clan, a cult-like sect, which has existed for several hundred years. The Spider Clan practice a sort of augmentation of human flesh in order to achieve a more perfect state of being and follow Postmodern Space Bushido. They also kill people for money. Their leaders are chosen from the oldest of the grand-masters, people that have lived a lot longer than any mortal man should.
Being a sect of technology-loving fanatics, the Spider Clan have the very best to choose from in terms of hardware--cybernetic implants, exoskeleton rigs, hyper-capacity batteries, and you get the idea. Some believe that much of the Spider Clan equipment is based on reverse-engineered alien technology while others doubt such claims.
Whatever the case, their technology is absolutely superb. +
How they relate to other SS13 organizations:
+
    +
  • *Nanotrasen and the Syndicate are two sides of the same coin and that coin is valuable.
    • +
  • *The Space Wizard Federation is a problem, mainly because they are an extremely dangerous group of unpredictable individuals--not to mention the wizards hate technology and are in direct opposition of the Spider Clan. Best avoided or left well-enough alone. How to battle: wizards possess several powerful abilities to steer clear off. Blind in particular is a nasty spell--jaunt away if you are blinded and never approach a wizard in melee. Stealth may also work if the wizard is not wearing thermal scanners--don't count on this. Run away if you feel threatened and await a better opportunity.
    • +
  • *Changeling Hivemind: extremely dangerous and to be killed on sight. How to battle: they will likely try to absorb you. Adrenaline boost, then phase shift into them. If you get stung, use SpiderOS to inject counter-agents. Stealth may also work but detecting a changeling is the real battle.
    • +
  • *Xeno Hivemind: their skulls make interesting kitchen decorations and are challenging to best, especially in larger nests. How to battle: they can see through your stealth guise and energy stars will not work on them. Best killed with a Phase Shift or at range. If you happen on a projectile stun weapon, use it and then close in to melee.
    • +
+
The reason they (you) are here:
+ Space ninjas are renowned throughout the known controlled space as fearless spies, infiltrators, and assassins. They are sent on missions of varying nature by Nanotrasen, the Syndicate, and other shady organizations and people. To hire a space ninja means serious business. +
Their playstyle:
+ A mix of traitor, changeling, and wizard. Ninjas rely on energy, or electricity to be precise, to keep their suits running (when out of energy, a suit hibernates). Suits gain energy from objects or creatures that contain electrical charge. APCs, cell batteries, rechargers, SMES batteries, cyborgs, mechs, and exposed wires are currently supported. Through energy ninjas gain access to special powers--while all powers are tied to the ninja suit, the most useful of them are verb activated--to help them in their mission.
It is a constant struggle for a ninja to remain hidden long enough to recharge the suit and accomplish their objective; despite their arsenal of abilities, ninjas can die like any other. Unlike wizards, ninjas do not possess good crowd control and are typically forced to play more subdued in order to achieve their goals. Some of their abilities are specifically designed to confuse and disorient others.
With that said, it should be perfectly possible to completely flip the fuck out and rampage as a ninja. +
Their powers:
+ There are two primary types: Equipment and Abilties. Passive effect are always on. Active effect must be turned on and remain active only when there is energy to do so. Ability costs are listed next to them. + Equipment: cannot be tracked by AI (passive), faster speed (passive), stealth (active), vision switch (passive if toggled), voice masking (passive), SpiderOS (passive if toggled), energy drain (passive if toggled). +
    +
  • Voice masking generates a random name the ninja can use over the radio and in-person. Although, the former use is recommended.
    • +
  • Toggling vision cycles to one of the following: thermal, meson, or darkness vision. The starting mode allows one to scout the identity of those in view, revealing their role. Traitors, revolutionaries, wizards, and other such people will be made known to you.
    • +
  • Stealth, when activated, drains more battery charge and works similarly to a syndicate cloak. The cloak will deactivate when most Abilities are utilized.
    • +
  • On-board AI: The suit is able to download an AI much like an intellicard. Check with SpiderOS for details once downloaded.
    • +
  • SpiderOS is a specialized, PDA-like screen that allows for a small variety of functions, such as injecting healing chemicals directly from the suit. You are using it now, if that was not already obvious. You may also download AI modules directly to the OS.
    • +
+ Abilities: +
    +
  • *Phase Shift (2000E) and Phase Jaunt (1000E) are unique powers in that they can both be used for defense and offense. Jaunt launches the ninja forward facing up to 9 squares, somewhat randomly selecting the final destination. Shift can only be used on turf in view but is precise (cannot be used on walls). Any living mob in the area teleported to is instantly gibbed (mechs are damaged, huggers and other similar critters are killed). It is possible to teleport with a target, provided you grab them before teleporting.
    • +
  • *Energy Blade (500E) is a highly effective weapon. It is summoned directly to the ninja's hand and can also function as an EMAG for certain objects (doors/lockers/etc). You may also use it to cut through walls and disabled doors. Experiment! The blade will crit humans in two hits. This item cannot be placed in containers and when dropped or thrown disappears. Having an energy blade drains more power from the battery each tick.
    • +
  • *EM Pulse (2500E) is a highly useful ability that will create an electromagnetic shockwave around the ninja, disabling technology whenever possible. If used properly it can render a security force effectively useless. Of course, getting beat up with a toolbox is not accounted for.
    • +
  • *Energy Star (500E) is a ninja star made of green energy AND coated in poison. It works by picking a random living target within range and can be spammed to great effect in incapacitating foes. Just remember that the poison used is also used by the Xeno Hivemind (and will have no effect on them).
    • +
  • *Energy Net (2000E) is a non-lethal solution to incapacitating humanoids. The net is made of non-harmful phase energy and will halt movement as long as it remains in effect--it can be destroyed. If the net is not destroyed, after a certain time it will teleport the target to a holding facility for the Spider Clan and then vanish. You will be notified if the net fails or succeeds in capturing a target in this manner. Combine with energy stars or stripping to ensure success. Abduction never looked this leet.
    • +
  • *Adrenaline Boost (1 E. Boost/3) recovers the user from stun, weakness, and paralysis. Also injects 20 units of radium into the bloodstream.
    • +
  • *Smoke Bomb (1 Sm.Bomb/10) is a weak but potentially useful ability. It creates harmful smoke and can be used in tandem with other powers to confuse enemies.
    • +
  • *???: unleash the True Ultimate Power!
    • +

    IMPORTANT:

    +
      +
    • *Make sure to toggle Special Interaction from the Ninja Equipment menu to interact differently with certain objects.
      • +
    • *Your starting power cell can be replaced if you find one with higher maximum energy capacity by clicking on your suit with the higher capacity cell.
      • +
    • *Conserve your energy. Without it, you are very vulnerable.
      • +
    + That is all you will need to know. The rest will come with practice and talent. Good luck! +

    Master /N

    + "} + if(6) + dat += {" +

    Activate Abilities:

    + + "} + if(7) + dat += "

    Research Stored:

    " + if(t_disk) + dat += "Eject Disk
    " + dat += "
      " + if(istype(stored_research,/list))//If there is stored research. Should be but just in case. + for(var/datum/tech/current_data in stored_research) + dat += "
    • " + dat += "[current_data.name]: [current_data.level]" + if(t_disk)//If there is a disk inserted. We can either write or overwrite. + dat += " *Copy to Disk
      " + dat += "
      • " + dat += "
    " + dat += "" + + //Setting the can>resize etc to 0 remove them from the drag bar but still allows the window to be draggable. + display_to << browse(dat,"window=spideros;size=400x444;border=1;can_resize=1;can_close=0;can_minimize=0") + +//=======//SPIDEROS TOPIC PROC//=======// + +/obj/item/clothing/suit/space/space_ninja/Topic(href, href_list) + ..() + var/mob/living/carbon/human/U = affecting + var/display_to = U + + + if(!affecting||U.stat||!s_initialized)//Check to make sure the guy is wearing the suit after clicking and it's on. + U << "Your suit must be worn and active to use this function." + U << browse(null, "window=spideros")//Closes the window. + return + + switch(href_list["choice"]) + if("Close") + display_to << browse(null, "window=spideros") + return + if("Refresh")//Refresh, goes to the end of the proc. + if("Return")//Return + if(spideros<=9) + spideros=0 + else + spideros = round(spideros/10)//Best way to do this, flooring to nearest integer. + + if("Message") + var/obj/item/device/pda/P = locate(href_list["target"]) + var/t = input(U, "Please enter untraceable message.") as text + t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN) + if(!t||U.stat||U.wear_suit!=src||!s_initialized)//Wow, another one of these. Man... + display_to << browse(null, "window=spideros") + return + if(isnull(P)||P.toff)//So it doesn't freak out if the object no-longer exists. + display_to << "Error: unable to deliver message." + display_spideros() + return + P.tnote += "← From an unknown source:
    [t]
    " + if (!P.silent) + playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1) + P.audible_message("\icon[P] *[P.ttone]*", null, 3) + P.overlays.Cut() + P.overlays += image('icons/obj/pda.dmi', "pda-r") + + if("Inject") + if( (href_list["tag"]=="radium"? (reagents.get_reagent_amount("radium"))<=(a_boost*a_transfer) : !reagents.get_reagent_amount(href_list["tag"])) )//Special case for radium. If there are only a_boost*a_transfer radium units left. + display_to << "Error: the suit cannot perform this function. Out of [href_list["name"]]." + else + reagents.reaction(U, 2) + reagents.trans_id_to(U, href_list["tag"], href_list["tag"]=="nutriment"?5:a_transfer)//Nutriment is a special case since it's very potent. Shouldn't influence actual refill amounts or anything. + display_to << "Injecting..." + U << "You feel a tiny prick and a sudden rush of substance in to your veins." + + if("Trigger Ability") + var/ability_name = href_list["name"]+href_list["cost"]//Adds the name and cost to create the full proc name. + var/proc_arguments//What arguments to later pass to the proc, if any. + var/list/targets = list()//To later check for. + var/safety = 0//To later make sure we're triggering the proc when needed. + switch(href_list["name"])//Special case. + if("Phase Shift") + safety = 1 + for(var/turf/T in oview(5,loc)) + targets.Add(T) + if("Energy Net") + safety = 1 + for(var/mob/living/carbon/M in oview(5,loc)) + targets.Add(M) + if(targets.len)//Let's create an argument for the proc if needed. + proc_arguments = pick(targets) + safety = 0 + if(!safety) + U << "[href_list["name"]] suddenly triggered!" + call(src,ability_name)(proc_arguments) + + if("Eject Disk") + var/turf/T = get_turf(loc) + if(!U.get_active_hand()) + U.put_in_hands(t_disk) + t_disk.add_fingerprint(U) + t_disk = null + else + if(T) + t_disk.loc = T + t_disk = null + else + U << "ERROR: Could not eject disk." + + if("Copy to Disk") + var/datum/tech/current_data = locate(href_list["target"]) + U << "[current_data.name] successfully [(!t_disk.stored) ? "copied" : "overwritten"] to disk." + t_disk.stored = current_data + + + display_spideros()//Refreshes the screen by calling it again (which replaces current screen with new screen). + return diff --git a/code/modules/ninja/suit/eye.dm b/code/modules/ninja/suit/eye.dm new file mode 100644 index 00000000000..427a50a7497 --- /dev/null +++ b/code/modules/ninja/suit/eye.dm @@ -0,0 +1,107 @@ +/obj/item/clothing/glasses/hud/space_ninja + name = "vision enhancement implant" + desc = "A high-tech ocular implant designed for Spider Clan operatives." + icon_state = "cybereye-off" + item_state = "eyepatch" + flags = NODROP + + var/enabled = 0 + var/energyConsumption = 0 + var/antagHUDEnabled = 0 + var/mesonEnabled = 0 + var/materialEnabled = 0 + var/thermalEnabled = 0 + +/obj/item/clothing/glasses/hud/space_ninja/verb/modifyHUD(mob/user as mob) + set category = "Space Ninja - Equiptment" + set name = "Modify Vision" + + if(usr.mind.special_role != "Ninja") + usr << "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked." + return + + if(!enabled) // If the Ninja's suit is on and connected. + usr << "ERROR: No power supply detected, cannot activate optical implant." + return + + if(!user) // The user var is, so far as I can tell, required to refresh the window after each click. + user = usr + + /* + * Each vision type the Ninja enables will drain more from his suit's battery per tick. + * For instance, if the Ninja were to rn around with thermals and AntagHUD on he would be losing an additional 10 energy per tick. + * Current vision modes are: + * - Night + * - Meson (Turfs) + * - Material (Objects) + * - Thermal (Mobs) + * - Antag HUD + * + * -Dave + */ + var/dat = {" +
    Night Vision (2E) - [darkness_view ? "ENABLED" : "DISABLED"]
    + Meson Scanner (2E) - [mesonEnabled ? "ENABLED" : "DISABLED"]
    + Material Scanner (4E) - [materialEnabled ? "ENABLED" : "DISABLED"]
    + Thermal Scanner (4E) - [thermalEnabled ? "ENABLED" : "DISABLED"]
    + Threat Identification HUD (6E) - [antagHUDEnabled ? "ENABLED" : "DISABLED"]
    + "} + + var/datum/browser/popup = new(user, "SpiderOS", "SpiderOS Optical Interface", 310, 150) + popup.set_content(dat) + popup.open() + + +/obj/item/clothing/glasses/hud/space_ninja/Topic(href, href_list) + if(usr.stat != 0 || !enabled) + return 1 + + if(href_list["night"]) + darkness_view = (darkness_view ? 0 : 8) + see_darkness = (darkness_view ? 0 : 1) + energyConsumption += (darkness_view ? 2 : -2) + usr << "Light amplification [(darkness_view ? "ENABLED" : "DISABLED")]." + + else if(href_list["meson"]) + mesonEnabled = (mesonEnabled ? 0 : 1) + + if(mesonEnabled) + vision_flags |= SEE_TURFS + else + vision_flags &= ~SEE_TURFS + + energyConsumption += (mesonEnabled ? 2 : -2) + usr << "Meson scanning [(mesonEnabled ? "ENABLED" : "DISABLED")]." + + else if(href_list["material"]) + materialEnabled = (materialEnabled ? 0 : 1) + + if(materialEnabled) + vision_flags |= SEE_OBJS + else + vision_flags &= ~SEE_OBJS + + energyConsumption += (materialEnabled ? 4 : -4) + usr << "Material scanning [(materialEnabled ? "ENABLED" : "DISABLED")]." + + else if(href_list["thermal"]) + thermalEnabled = (thermalEnabled ? 0 : 1) + + if(thermalEnabled) + vision_flags |= SEE_MOBS + invisa_view = 2 + else + vision_flags &= ~SEE_MOBS + invisa_view = 0 + + energyConsumption += (thermalEnabled ? 4 : -4) + usr << "Thermal scanning [(thermalEnabled ? "ENABLED" : "DISABLED")]." + + else if(href_list["antagHUD"]) + antagHUDEnabled = (antagHUDEnabled ? 0 : 1) + energyConsumption += (antagHUDEnabled ? 6 : -6) + usr << "Threat identification HUD [(antagHUDEnabled ? "ENABLED" : "DISABLED")]." + + modifyHUD(usr) // Re-call the verb to get a fresh version of the window. + return + diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm new file mode 100644 index 00000000000..30d4ce5fa41 --- /dev/null +++ b/code/modules/ninja/suit/gloves.dm @@ -0,0 +1,14 @@ + + +/obj/item/clothing/gloves/space_ninja + desc = "These nano-enhanced gloves insulate from electricity and provide fire resistance." + name = "ninja gloves" + icon_state = "s-ninja" + item_state = "s-ninja" + siemens_coefficient = 0 + pickpocket = 1 + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE + transfer_prints = FALSE \ No newline at end of file diff --git a/code/modules/ninja/suit/head.dm b/code/modules/ninja/suit/head.dm new file mode 100644 index 00000000000..c3e921a97d9 --- /dev/null +++ b/code/modules/ninja/suit/head.dm @@ -0,0 +1,11 @@ + + +/obj/item/clothing/head/helmet/space/space_ninja + desc = "What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear." + name = "ninja hood" + icon_state = "s-ninja" + item_state = "s-ninja_hood" + armor = list(melee = 60, bullet = 60, laser = 45, energy = 15, bomb = 30, bio = 30, rad = 25) + unacidable = 1 + siemens_coefficient = 0.2 + blockTracking = 1 \ No newline at end of file diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm new file mode 100644 index 00000000000..af6727b2666 --- /dev/null +++ b/code/modules/ninja/suit/mask.dm @@ -0,0 +1,15 @@ + +/* + +Contents: +- The Ninja Space Mask + +*/ + +/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(norm)" + item_state = "s-ninja_mask" + unacidable = 1 + siemens_coefficient = 0.2 \ No newline at end of file diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_cost_check.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_empulse.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm new file mode 100644 index 00000000000..b41946e11f6 --- /dev/null +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm @@ -0,0 +1,23 @@ +/obj/item/weapon/gun/energy/shuriken + name = "energy shuriken" + desc = "A stunning shuriken made of energy." + icon_state = "shuriken" + item_state = null + icon = 'icons/obj/ninjaobjects.dmi' + fire_sound = 'sound/weapons/Genhit.ogg' + cell_type = "/obj/item/weapon/stock_parts/cell/infinite" + projectile_type = "/obj/item/projectile/energy/shuriken" + charge_cost = 0 + silenced = 1 + +/obj/item/weapon/gun/energy/shuriken/update_icon() + qdel(src) + return + +/obj/item/weapon/gun/energy/shuriken/dropped() + qdel(src) + return + +/obj/item/weapon/gun/energy/shuriken/proc/throw() + qdel(src) + return \ No newline at end of file diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_teleporting.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_teleporting.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_teleporting.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/suit/shoes.dm b/code/modules/ninja/suit/shoes.dm new file mode 100644 index 00000000000..c9750b262d1 --- /dev/null +++ b/code/modules/ninja/suit/shoes.dm @@ -0,0 +1,13 @@ + +/obj/item/clothing/shoes/space_ninja + name = "ninja shoes" + desc = "A pair of running shoes. Excellent for running and even better for smashing skulls." + icon_state = "s-ninja" + permeability_coefficient = 0.01 + flags = NOSLIP + armor = list(melee = 60, bullet = 60, laser = 45,energy = 15, bomb = 30, bio = 30, rad = 30) + siemens_coefficient = 0.2 + cold_protection = FEET + min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE + heat_protection = FEET + max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE \ No newline at end of file diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm new file mode 100644 index 00000000000..2550ce13eb0 --- /dev/null +++ b/code/modules/ninja/suit/suit.dm @@ -0,0 +1,98 @@ + +/* + +Contents: +- The Ninja Space Suit +- Ninja Space Suit Procs + +*/ + +/obj/item/clothing/suit/space/space_ninja + name = "ninja suit" + desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins." + icon_state = "s-ninja" + item_state = "s-ninja_suit" + allowed = list(/obj/item/weapon/gun, /obj/item/ammo_box, /obj/item/weapon/melee/baton, /obj/item/weapon/tank, /obj/item/weapon/stock_parts/cell) + slowdown = 0 + unacidable = 1 + armor = list(melee = 60, bullet = 60, laser = 45,energy = 15, bomb = 30, bio = 30, rad = 30) + siemens_coefficient = 0.2 + + var/suitActive = 0 + var/suitBusy = 0 + + var/obj/item/weapon/stock_parts/cell/suitCell + var/obj/item/clothing/head/helmet/space/space_ninja/suitHood + var/obj/item/clothing/gloves/space_ninja/suitGloves + var/obj/item/clothing/shoes/space_ninja/suitShoes + var/obj/item/clothing/mask/gas/voice/space_ninja/suitMask + var/obj/item/clothing/glasses/hud/space_ninja/suitGlasses + var/mob/living/carbon/human/suitOccupant + +/obj/item/clothing/suit/space/space_ninja/proc/toggle_suit_lock(mob/living/carbon/human/user) + if(!suitActive) + if(!istype(user.wear_suit, /obj/item/clothing/suit/space/space_ninja)) + user<< "ERROR: Unable to locate user.\nABORTING..." + return 0 + if(!istype(user.head, /obj/item/clothing/head/helmet/space/space_ninja)) + user<< "ERROR: Unable to locate hood.\nABORTING..." + return 0 + if(!istype(user.gloves, /obj/item/clothing/gloves/space_ninja)) + user<< "ERROR: Unable to locate gloves.\nABORTING..." + return 0 + if(!istype(user.shoes, /obj/item/clothing/shoes/space_ninja)) + user<< "ERROR: Unable to locate foot gear.\nABORTING..." + return 0 + if(!istype(user.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)) + user<< "ERROR: Unable to locate mask.\nABORTING..." + return 0 + if(!istype(user.glasses, /obj/item/clothing/glasses/hud/space_ninja)) + user<< "WARNING: Unable to locate eye gear, vision enhancement unavailable.\nProceeding..." + else + suitGlasses = user.glasses + suitGlasses.enabled = 1 + suitGlasses.icon_state = "cybereye-green" + + suitHood = user.head + suitMask = user.wear_mask + suitGloves = user.gloves + suitShoes = user.shoes + suitOccupant = user + + flags |= NODROP + suitHood.flags |= NODROP + suitMask.flags |= NODROP + suitGloves.flags |= NODROP + suitGloves.pickpocket = 1 + suitShoes.flags |= NODROP + suitShoes.slowdown = -2 + + icon_state = (user.gender == MALE ? "s-ninjan" : "s-ninjanf") + suitGloves.icon_state = "s-ninjan" + suitGloves.item_state = "s-ninjan" + + return 1 + + else + flags &= ~NODROP + suitHood.flags &= ~NODROP + suitMask.flags &= ~NODROP + if(suitGlasses) + suitGlasses.enabled = 0 + suitGlasses.icon_state = "cybereye-off" + suitGloves.flags &= ~NODROP + suitGloves.pickpocket = 0 + suitShoes.flags &= ~NODROP + suitShoes.slowdown = -1 + icon_state = "s-ninja" + suitGloves.icon_state = "s-ninja" + suitGloves.item_state = "s-ninja" + + suitHood = null + suitMask = null + suitGlasses = null + suitGloves = null + suitShoes = null + suitOccupant = null + + return 1 \ No newline at end of file diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm new file mode 100644 index 00000000000..7d785b44229 --- /dev/null +++ b/code/modules/ninja/suit/suit_attackby.dm @@ -0,0 +1,24 @@ + + +/obj/item/clothing/suit/space/space_ninja/attackby(obj/item/I, mob/U, params) + if(U==suitOccupant)//Safety, in case you try doing this without wearing the suit/being the person with the suit. + if(istype(I, /obj/item/weapon/stock_parts/cell)) + var/obj/item/weapon/stock_parts/cell/CELL + if(CELL.maxcharge > cell.maxcharge && suitGloves) + U << "Higher maximum capacity detected.\nUpgrading..." + if (n_gloves && n_gloves.candrain && do_after(U,s_delay)) + U.drop_item() + CELL.loc = src + CELL.charge = min(CELL.charge+cell.charge, CELL.maxcharge) + var/obj/item/weapon/stock_parts/cell/old_cell = cell + old_cell.charge = 0 + U.put_in_hands(old_cell) + old_cell.add_fingerprint(U) + old_cell.corrupt() + old_cell.updateicon() + cell = CELL + U << "Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%" + else + U << "Procedure interrupted. Protocol terminated." + return + ..() \ No newline at end of file diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm new file mode 100644 index 00000000000..683747d14ed --- /dev/null +++ b/code/modules/ninja/suit/suit_initialisation.dm @@ -0,0 +1,84 @@ + +//Verbs link to procs because verb-like procs have a bug which prevents their use if the arguments are not readily referenced. +//^ Old coder words may be false these days, Not taking the risk for now. + +/obj/item/clothing/suit/space/space_ninja/verb/toggle_suit() + set category = "Space Ninja - Equiptment" + set name = "Toggle Suit" + + if(usr.mind.special_role == "Ninja") + if(suitBusy) + usr << "ERROR: Suit systems busy, cannot initiate [suitActive ? "de-activation" : "activation"] protocals at this time." + return + + suitBusy = 1 + + if(suitActive && (alert("Confirm suit systems shutdown? This cannot be halted once it has started.", "Confirm Shutdown", "Yes", "No") == "Yes")) + usr << "Now de-initializing..." + + sleep(15) + usr << "Logging off, [usr.real_name]. Shutting down SpiderOS." + + sleep(10) + usr<< "Primary system status: OFFLINE.\nBackup system status: OFFLINE." + + sleep(5) + usr<< "VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE." + //TODO: Shut down any active abilities + + sleep(10) + usr<< "Disconnecting neural-net interface... Success." + usr.hud_used.instantiate() + usr.regenerate_icons() + + sleep(5) + usr<< "Disengaging neural-net interface... Success." + + sleep(10) + usr<< "Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED." + //TODO: Grant verbs + toggle_suit_lock(usr) + usr.regenerate_icons() + suitBusy = 0 + suitActive = 0 + + else if(!suitActive) // Activate the suit. + usr << "Now initializing..." + + sleep(15) + usr<< "Now establishing neural-net interface..." + if(usr.mind.special_role != "Ninja") + usr << "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked." + return + + sleep(10) + usr<< "Neural-net established. Now monitoring brainwave pattern. \nBrainwave pattern GREEN, proceeding." + + sleep(10) + usr<< "Securing external locking mechanism..." + if(!toggle_suit_lock(usr)) + return + + sleep(5) + usr<< "Suit secured, extending neural-net interface..." + usr.hud_used.human_hud('icons/mob/screen1_NinjaHUD.dmi',"#ffffff",255) + usr.regenerate_icons() + + sleep(10) + usr<< "VOID-shift device status: ONLINE.\nCLOAK-tech device status:ONLINE" + + sleep(5) + usr<< "Primary system status: ONLINE.\nBackup system status: ONLINE.\nCurrent energy capacity: [suitCell.charge]/[suitCell.maxcharge]." + + sleep(10) + usr<< "All systems operational. Welcome to SpiderOS, [usr.real_name]." + //TODO: Grant ninja verbs here. + suitBusy = 0 + suitActive = 1 + + else + suitBusy = 0 + usr << "NOTICE: Suit de-activation protocals aborted." + else + usr << "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked." + return \ No newline at end of file diff --git a/code/modules/ninja/suit/suit_process.dm b/code/modules/ninja/suit/suit_process.dm new file mode 100644 index 00000000000..0ffdd02fcbc --- /dev/null +++ b/code/modules/ninja/suit/suit_process.dm @@ -0,0 +1 @@ +// TODO \ No newline at end of file diff --git a/code/modules/ninja/suit/suit_verbs_handlers.dm b/code/modules/ninja/suit/suit_verbs_handlers.dm new file mode 100644 index 00000000000..70b786d12ed --- /dev/null +++ b/code/modules/ninja/suit/suit_verbs_handlers.dm @@ -0,0 +1 @@ +// TODO diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 60043e07933..082d5062dd3 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -69,6 +69,14 @@ weaken = 5 range = 7 +/obj/item/projectile/energy/shuriken + name = "shuriken" + icon_state = "toxin" + damage = 10 + damage_type = TOX + nodamage = 0 + weaken = 5 + stutter = 5 /obj/item/projectile/energy/bolt name = "bolt" diff --git a/icons/mob/in-hand/swords.dmi b/icons/mob/in-hand/swords.dmi index a4e8243c2e7..f7bdd0ae1b0 100644 Binary files a/icons/mob/in-hand/swords.dmi and b/icons/mob/in-hand/swords.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 5a2601f5283..9a0e4ade843 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/paradise.dme b/paradise.dme index 21a34c8006a..0eff860a2a0 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1425,6 +1425,14 @@ #include "code\modules\nano\nanomapgen.dm" #include "code\modules\nano\nanoui.dm" #include "code\modules\nano\modules\crew_monitor.dm" +#include "code\modules\ninja\energy_katana.dm" +#include "code\modules\ninja\suit\eye.dm" +#include "code\modules\ninja\suit\gloves.dm" +#include "code\modules\ninja\suit\head.dm" +#include "code\modules\ninja\suit\mask.dm" +#include "code\modules\ninja\suit\shoes.dm" +#include "code\modules\ninja\suit\suit.dm" +#include "code\modules\ninja\suit\suit_initialisation.dm" #include "code\modules\organs\blood.dm" #include "code\modules\organs\organ.dm" #include "code\modules\organs\organ_external.dm"