diff --git a/_maps/RandomRuins/SpaceRuinsStation/roid8.dmm b/_maps/RandomRuins/SpaceRuinsStation/roid8.dmm index 43f016626d..41798aa629 100644 --- a/_maps/RandomRuins/SpaceRuinsStation/roid8.dmm +++ b/_maps/RandomRuins/SpaceRuinsStation/roid8.dmm @@ -25,7 +25,7 @@ "D" = ( /obj/structure/toilet/secret{ dir = 4; - secret_type = /obj/item/shared_storage/red + secret_type = /obj/item/gun/magic/wand/arcane }, /turf/open/floor/grass, /area/ruin/space) diff --git a/_maps/RandomRuins/SpaceRuinsStation/roid9.dmm b/_maps/RandomRuins/SpaceRuinsStation/roid9.dmm index a4b9c1773d..72752f86f1 100644 --- a/_maps/RandomRuins/SpaceRuinsStation/roid9.dmm +++ b/_maps/RandomRuins/SpaceRuinsStation/roid9.dmm @@ -18,9 +18,7 @@ "g" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/highsecurity{ - id_tag = DormRoid1 - }, +/obj/machinery/door/airlock/highsecurity, /turf/open/floor/plasteel, /area/ruin/space/has_grav) "h" = ( @@ -39,11 +37,6 @@ /area/ruin/space/has_grav) "m" = ( /obj/structure/table/wood, -/obj/machinery/button/door{ - id = DormRoid1; - pixel_x = -10; - pixel_y = 32 - }, /turf/open/floor/wood, /area/ruin/space/has_grav) "n" = ( @@ -163,6 +156,8 @@ "N" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, +/obj/item/clothing/gloves/color/yellow, +/obj/item/multitool, /turf/open/floor/plasteel, /area/ruin/space/has_grav) "O" = ( diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index 0d763aa5ad..43b2ba9744 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -18,7 +18,7 @@ area_type = /area protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer, - /area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison) + /area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison, /area/ruin, /area/space/nearstation) target_trait = ZTRAIT_STATION immunity_type = "rad" diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index 57bbd13cf7..4857369363 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -181,3 +181,21 @@ ..() explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) charges-- + +///////////////////////////////////// +//WAND OF ARCANE MISSILE +///////////////////////////////////// + +/obj/item/gun/magic/wand/arcane + name = "wand of arcane missile" + desc = "This wand fires off small bolts of concentrated magic energy, searing any victim." + ammo_type = /obj/item/ammo_casing/magic/arcane_barrage + fire_sound = 'sound/weapons/mmlbuster.ogg' + icon_state = "arcanewand" + max_charges = 20 //20, 10, 10, 7 + +/obj/item/gun/magic/wand/arcane/zap_self(mob/living/user) + ..() + charges-- + user.take_overall_damage(0,30) + to_chat(user, "You zap yourself. Why?") diff --git a/icons/obj/guns/magic.dmi b/icons/obj/guns/magic.dmi index 0a4152af64..9ff788bfb6 100644 Binary files a/icons/obj/guns/magic.dmi and b/icons/obj/guns/magic.dmi differ