diff --git a/code/game/asteroid/asteroid.dm b/code/game/asteroid/asteroid.dm index 7da598b136d..15e7dabf676 100644 --- a/code/game/asteroid/asteroid.dm +++ b/code/game/asteroid/asteroid.dm @@ -152,7 +152,7 @@ var/global/list/space_surprises = list(/obj/item/clothing/mask/facehugger, /obj/item/weapon/rcd, /obj/item/weapon/rcd_ammo, /obj/item/weapon/spacecash, - ///obj/item/weapon/cloaking_device, + /obj/item/weapon/cloaking_device, // /obj/item/weapon/gun/energy/teleport_gun, /obj/item/weapon/rubber_chicken, /obj/item/weapon/melee/energy/sword/pirate diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 7b7461c1c5d..ca3bf59ca3c 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -139,8 +139,8 @@ datum/hSB continue if(istype(O, /obj/item/weapon/camera)) continue - /*if(istype(O, /obj/item/weapon/cloaking_device)) - continue*/ + if(istype(O, /obj/item/weapon/cloaking_device)) + continue if(istype(O, /obj/item/weapon/dummy)) continue if(istype(O, /obj/item/weapon/melee/energy/sword)) diff --git a/code/game/objects/devices/PDA/uplink.dm b/code/game/objects/devices/PDA/uplink.dm index 9c5b85fec9a..610fcfebe8d 100644 --- a/code/game/objects/devices/PDA/uplink.dm +++ b/code/game/objects/devices/PDA/uplink.dm @@ -52,7 +52,7 @@ menu_message += "Syndicate-made Space Suit (inludes a helmet) (3)
" menu_message += "
" menu_message += "Chameleon-projector (4)
" - //menu_message += "Cloaking Device (4)
" + menu_message += "Cloaking Device (4)
" menu_message += "Electromagnet Card (3)
" menu_message += "5 EMP Grenades (4)
" menu_message += "
" @@ -153,10 +153,10 @@ if (uses >= 4) uses -= 4 new /obj/item/device/chameleon(get_turf(hostpda)) - /*if("cloak") + if("cloak") if (uses >= 4) uses -= 4 - new /obj/item/weapon/cloaking_device(get_turf(hostpda))*/ + new /obj/item/weapon/cloaking_device(get_turf(hostpda)) if("sword") if (uses >= 4) uses -= 4 diff --git a/code/game/objects/devices/flash.dm b/code/game/objects/devices/flash.dm index 4bdbb257cd4..d0f47f0fd60 100644 --- a/code/game/objects/devices/flash.dm +++ b/code/game/objects/devices/flash.dm @@ -128,11 +128,11 @@ del(animation) for(var/mob/living/carbon/M in oviewers(3, null)) - /*if(prob(50)) + if(prob(50)) if (locate(/obj/item/weapon/cloaking_device, M)) for(var/obj/item/weapon/cloaking_device/S in M) S.active = 0 - S.icon_state = "shield0"*/ + S.icon_state = "shield0" var/safety = M:eyecheck() if(!safety) flick("flash", M.flash) diff --git a/code/game/objects/devices/shields.dm b/code/game/objects/devices/shields.dm index 92831280837..c48afdf548d 100644 --- a/code/game/objects/devices/shields.dm +++ b/code/game/objects/devices/shields.dm @@ -23,7 +23,7 @@ return */ -/* + /obj/item/weapon/cloaking_device name = "cloaking device" desc = "Use this to become invisible to the human eyesocket." @@ -53,5 +53,4 @@ /obj/item/weapon/cloaking_device/emp_act(severity) active = 0 icon_state = "shield0" - ..() -*/ \ No newline at end of file + ..() \ No newline at end of file diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm index b0cd080b330..28090a66ec6 100644 --- a/code/game/objects/items/weapons/grenades.dm +++ b/code/game/objects/items/weapons/grenades.dm @@ -151,10 +151,10 @@ FLASHBANG T.hotspot_expose(700,125) for(var/mob/living/carbon/M in viewers(T, null)) - /*if (locate(/obj/item/weapon/cloaking_device, M)) + if (locate(/obj/item/weapon/cloaking_device, M)) for(var/obj/item/weapon/cloaking_device/S in M) S.active = 0 - S.icon_state = "shield0"*/ + S.icon_state = "shield0" M << "\red BANG" diff --git a/code/game/objects/items/weapons/uplinks.dm b/code/game/objects/items/weapons/uplinks.dm index 92769f818dc..5c934f2066c 100644 --- a/code/game/objects/items/weapons/uplinks.dm +++ b/code/game/objects/items/weapons/uplinks.dm @@ -146,14 +146,14 @@ SYNDICATE UPLINK if (src.uses >= 7) src.uses -= 7 new /obj/item/weapon/aiModule/syndicate(get_turf(src)) - /*if("cloak") + if("cloak") if (src.uses >= 4) if (ticker.mode.config_tag!="nuclear" || \ (input(currentUser,"Spawning a cloak in nuke is generally regarded as entirely dumb, are you sure?") in list("Confirm", "Abort")) == "Confirm" \ ) if (src.uses >= 4) src.uses -= 4 - new /obj/item/weapon/cloaking_device(get_turf(src))*/ + new /obj/item/weapon/cloaking_device(get_turf(src)) if("sword") if (src.uses >= 4) src.uses -= 4 diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm index d87dfddc96d..6ff6344e955 100644 --- a/code/game/objects/storage/storage.dm +++ b/code/game/objects/storage/storage.dm @@ -286,7 +286,7 @@ if ("murder") new /obj/item/weapon/melee/energy/sword(src) - //new /obj/item/weapon/cloaking_device(src) + new /obj/item/weapon/cloaking_device(src) new /obj/item/weapon/card/emag(src) return diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index afbc987d7ea..6d455d3f9fe 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -431,7 +431,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_if_possible(new /obj/item/clothing/glasses/thermal/monocle(M), M.slot_glasses) M.equip_if_possible(new /obj/item/clothing/head/det_hat(M), M.slot_head) - //M.equip_if_possible(new /obj/item/weapon/cloaking_device(M), M.slot_r_store) + M.equip_if_possible(new /obj/item/weapon/cloaking_device(M), M.slot_r_store) M.equip_if_possible(new /obj/item/weapon/gun/projectile(M), M.slot_r_hand) M.equip_if_possible(new /obj/item/ammo_magazine/a357(M), M.slot_l_store) @@ -544,7 +544,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(M), M.slot_glasses) M.equip_if_possible(new /obj/item/clothing/suit/wcoat(M), M.slot_wear_suit) M.equip_if_possible(new /obj/item/weapon/melee/energy/sword(M), M.slot_l_store) - //M.equip_if_possible(new /obj/item/weapon/cloaking_device(M), M.slot_r_store) + M.equip_if_possible(new /obj/item/weapon/cloaking_device(M), M.slot_r_store) var/obj/item/weapon/secstorage/sbriefcase/sec_briefcase = new(M) for(var/obj/item/briefcase_item in sec_briefcase) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index e258cd0a0c0..30579f5ff41 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -431,10 +431,10 @@ var/shielded = 0 - /*for (var/obj/item/weapon/cloaking_device/S in src) + for (var/obj/item/weapon/cloaking_device/S in src) if (S.active) shielded = 2 - break*/ + break if (shielded == 2 || alien_invis) invisibility = 2 diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d8620e02ae9..3a9274450bd 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1055,10 +1055,10 @@ l_hand.screen_loc = ui_lhand var/shielded = 0 - /*for (var/obj/item/weapon/cloaking_device/S in src) + for (var/obj/item/weapon/cloaking_device/S in src) if (S.active) shielded = 2 - break*/ + break if(istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)&&wear_suit:s_active) shielded = 3 diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index d107302b8e6..a6f693641df 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -37,11 +37,11 @@ /mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone) - /*var/obj/item/weapon/cloaking_device/C = locate((/obj/item/weapon/cloaking_device) in src) + var/obj/item/weapon/cloaking_device/C = locate((/obj/item/weapon/cloaking_device) in src) if(C && C.active) C.attack_self(src)//Should shut it off src << "\blue Your [C.name] was disrupted!" - stunned = max(stunned, 2)*/ + stunned = max(stunned, 2) flash_weak_pain()