diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 99bf63bd18..b93e418a5c 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1468,23 +1468,6 @@ var/cigarcount = 6 flags = ONBELT | TABLEPASS */ - -/obj/item/weapon/mousetrap - name = "mousetrap" - desc = "A handy little spring-loaded trap for catching pesty rodents." - icon = 'icons/obj/weapons.dmi' - icon_state = "mousetrap" - item_state = "mousetrap" - w_class = 1 - force = null - throwforce = null - var/armed = 0 - origin_tech = "combat=1" - -/obj/item/weapon/mousetrap/armed - icon_state = "mousetraparmed" - armed = 1 - /obj/item/weapon/pai_cable desc = "A flexible coated cable with a universal jack on one end." name = "data cable" diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 2dbce333dd..54c71382fb 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -361,7 +361,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar name = "Mousetrap Mortar" icon_state = "mecha_mousetrapmrtr" - projectile = /obj/item/weapon/mousetrap + projectile = /obj/item/device/assembly/mousetrap fire_sound = 'sound/items/bikehorn.ogg' projectiles = 15 missile_speed = 1.5 @@ -379,8 +379,8 @@ action(target) if(!action_checks(target)) return set_ready_state(0) - var/obj/item/weapon/mousetrap/M = new projectile(chassis.loc) - M.armed = 1 + var/obj/item/device/assembly/mousetrap/M = new projectile(chassis.loc) + M.secured = 1 playsound(chassis, fire_sound, 60, 1) M.throw_at(target, missile_range, missile_speed) projectiles-- diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index ce3d7fe028..f21f65cb8f 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -341,6 +341,10 @@ /obj/item/proc/on_enter_storage(obj/item/weapon/storage/S as obj) return +// called when "found" in pockets and storage items. Returns 1 if the search should end. +/obj/item/proc/on_found(mob/finder as mob) + return + // called after an item is placed in an equipment slot // user is mob that equipped it // slot uses the slot_X defines found in setup.dm diff --git a/code/game/objects/items/weapons/mousetraps.dm b/code/game/objects/items/weapons/mousetraps.dm deleted file mode 100644 index 4906f886a2..0000000000 --- a/code/game/objects/items/weapons/mousetraps.dm +++ /dev/null @@ -1,94 +0,0 @@ -/obj/item/weapon/mousetrap/examine() - set src in oview(12) - ..() - if(armed) - usr << "\red It looks like it's armed." - -/obj/item/weapon/mousetrap/proc/triggered(mob/target as mob, var/type = "feet") - if(!armed) - return - var/datum/organ/external/affecting = null - if(ishuman(target)) - var/mob/living/carbon/human/H = target - switch(type) - if("feet") - if(!H.shoes) - affecting = H.get_organ(pick("l_leg", "r_leg")) - H.Weaken(3) - if("l_hand", "r_hand") - if(!H.gloves) - affecting = H.get_organ(type) - H.Stun(3) - if(affecting) - if(affecting.take_damage(1, 0)) - H.UpdateDamageIcon() - H.updatehealth() - else if(ismouse(target)) - var/mob/living/simple_animal/mouse/M = target - src.visible_message("\red SPLAT!") - M.splat() - playsound(target.loc, 'sound/effects/snap.ogg', 50, 1) - icon_state = "mousetrap" - armed = 0 -/* - else if (ismouse(target)) - target.adjustBruteLoss(100) -*/ - -/obj/item/weapon/mousetrap/attack_self(mob/living/user as mob) - if(!armed) - icon_state = "mousetraparmed" - user << "\blue You arm the mousetrap." - else - icon_state = "mousetrap" - if(( (user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))) - var/which_hand = "l_hand" - if(!user.hand) - which_hand = "r_hand" - src.triggered(user, which_hand) - user << "\red You accidentally trigger the mousetrap!" - for(var/mob/O in viewers(user, null)) - if(O == user) - continue - O.show_message("\red [user] accidentally sets off the mousetrap, breaking their fingers.", 1) - return - user << "\blue You disarm the mousetrap." - armed = !armed - playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) - -/obj/item/weapon/mousetrap/attack_hand(mob/living/user as mob) - if(armed) - if(( (user.getBrainLoss() >= 60 || CLUMSY in user.mutations)) && prob(50)) - var/which_hand = "l_hand" - if(!user.hand) - which_hand = "r_hand" - src.triggered(user, which_hand) - user << "\red You accidentally trigger the mousetrap!" - for(var/mob/O in viewers(user, null)) - if(O == user) - continue - O.show_message("\red [user] accidentally sets off the mousetrap, breaking their fingers.", 1) - return - ..() - -/obj/item/weapon/mousetrap/HasEntered(AM as mob|obj) - if(armed) - if(ishuman(AM)) - var/mob/living/carbon/H = AM - if(H.m_intent == "run") - src.triggered(H) - H << "\red You accidentally step on the mousetrap!" - for(var/mob/O in viewers(H, null)) - if(O == H) - continue - O.show_message("\red [H] accidentally steps on the mousetrap.", 1) - if(ismouse(AM)) - triggered(AM) - ..() - -/obj/item/weapon/mousetrap/hitby(A as mob|obj) - if(!armed) - return ..() - for(var/mob/O in viewers(src, null)) - O.show_message("\red The mousetrap is triggered by [A].", 1) - src.triggered(null) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 59edfd3ebb..b0f68b3fcf 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -31,18 +31,12 @@ return L /obj/item/weapon/storage/proc/show_to(mob/user as mob) + if(user.s_active != src) + for(var/obj/item/I in src) + if(I.on_found(user)) + return if(user.s_active) user.s_active.hide_from(user) - for(var/obj/item/weapon/mousetrap/MT in src) - if(MT.armed) - for(var/mob/O in viewers(user, null)) - if(O == user) - user.show_message(text("\red You reach into the [src.name], but there was a live mousetrap in there!"), 1) - else - user.show_message(text("\red [user] reaches into the [src.name] and sets off a hidden mousetrap!"), 1) - user.drop_from_inventory(MT) - MT.triggered(user, user.hand ? "l_hand" : "r_hand") - return user.client.screen -= src.boxes user.client.screen -= src.closer user.client.screen -= src.contents @@ -499,12 +493,12 @@ return /obj/item/weapon/storage/mousetraps/New() - new /obj/item/weapon/mousetrap( src ) - new /obj/item/weapon/mousetrap( src ) - new /obj/item/weapon/mousetrap( src ) - new /obj/item/weapon/mousetrap( src ) - new /obj/item/weapon/mousetrap( src ) - new /obj/item/weapon/mousetrap( src ) + new /obj/item/device/assembly/mousetrap( src ) + new /obj/item/device/assembly/mousetrap( src ) + new /obj/item/device/assembly/mousetrap( src ) + new /obj/item/device/assembly/mousetrap( src ) + new /obj/item/device/assembly/mousetrap( src ) + new /obj/item/device/assembly/mousetrap( src ) ..() return diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 030e9402d5..4605a4aa31 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -62,11 +62,11 @@ update_icon() overlays = null if(a_left) - overlays += "[initial(a_left.icon_state)]_left" //the initial() is probably unnecessary, but you just know - for(var/O in a_left.attached_overlays) //someone is gonna fuck around with the icon_state in the future + overlays += "[a_left.icon_state]_left" + for(var/O in a_left.attached_overlays) overlays += "[O]_l" if(a_right) - src.overlays += "[initial(a_right.icon_state)]_right" + src.overlays += "[a_right.icon_state]_right" for(var/O in a_right.attached_overlays) overlays += "[O]_r" if(master) @@ -98,7 +98,26 @@ a_right.HasProximity(AM) if(special_assembly) special_assembly.HasProximity(AM) - return + + + HasEntered(atom/movable/AM as mob|obj) + if(a_left) + a_left.HasEntered(AM) + if(a_right) + a_right.HasEntered(AM) + if(special_assembly) + special_assembly.HasEntered(AM) + + + on_found(mob/finder as mob) + if(a_left) + a_left.on_found(finder) + if(a_right) + a_right.on_found(finder) + if(special_assembly) + if(istype(special_assembly, /obj/item)) + var/obj/item/S = special_assembly + S.on_found(finder) Move() diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 2259e24472..eaf47f9626 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -7,9 +7,6 @@ w_amt = 10 origin_tech = "magnets=1" - secured = 1 - - activate() if(!..()) return 0//Cooldown check var/turf/location = get_turf(loc) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm new file mode 100644 index 0000000000..4d2c8fa53b --- /dev/null +++ b/code/modules/assembly/mousetrap.dm @@ -0,0 +1,115 @@ +/obj/item/device/assembly/mousetrap + name = "mousetrap" + desc = "A handy little spring-loaded trap for catching pesty rodents." + icon_state = "mousetrap" + m_amt = 100 + w_amt = 10 + origin_tech = "combat=1" + var/armed = 0 + + + examine() + ..() + if(armed) + usr << "It looks like it's armed." + + update_icon() + if(armed) + icon_state = "mousetraparmed" + else + icon_state = "mousetrap" + if(holder) + holder.update_icon() + + proc/triggered(mob/target as mob, var/type = "feet") + if(!armed) + return + var/datum/organ/external/affecting = null + if(ishuman(target)) + var/mob/living/carbon/human/H = target + switch(type) + if("feet") + if(!H.shoes) + affecting = H.get_organ(pick("l_leg", "r_leg")) + H.Weaken(3) + if("l_hand", "r_hand") + if(!H.gloves) + affecting = H.get_organ(type) + H.Stun(3) + if(affecting) + if(affecting.take_damage(1, 0)) + H.UpdateDamageIcon() + H.updatehealth() + else if(ismouse(target)) + var/mob/living/simple_animal/mouse/M = target + visible_message("\red SPLAT!") + M.splat() + playsound(target.loc, 'sound/effects/snap.ogg', 50, 1) + armed = 0 + update_icon() + pulse(0) + + + attack_self(mob/living/user as mob) + if(!armed) + user << "You arm [src]." + else + if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))) + var/which_hand = "l_hand" + if(!user.hand) + which_hand = "r_hand" + triggered(user, which_hand) + user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ + "You accidentally trigger [src]!") + return + user << "You disarm [src]." + armed = !armed + update_icon() + playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) + + + attack_hand(mob/living/user as mob) + if(armed) + if(((user.getBrainLoss() >= 60 || CLUMSY in user.mutations)) && prob(50)) + var/which_hand = "l_hand" + if(!user.hand) + which_hand = "r_hand" + triggered(user, which_hand) + user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ + "You accidentally trigger [src]!") + return + ..() + + + HasEntered(AM as mob|obj) + if(armed) + if(ishuman(AM)) + var/mob/living/carbon/H = AM + if(H.m_intent == "run") + triggered(H) + H.visible_message("[H] accidentally steps on [src].", \ + "You accidentally step on [src]") + if(ismouse(AM)) + triggered(AM) + ..() + + + on_found(mob/finder as mob) + if(armed) + finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \ + "You accidentally trigger [src]!") + triggered(finder, finder.hand ? "l_hand" : "r_hand") + return 1 //end the search! + return 0 + + + hitby(A as mob|obj) + if(!armed) + return ..() + visible_message("[src] is triggered by [A].") + triggered(null) + + +/obj/item/device/assembly/mousetrap/armed + icon_state = "mousetraparmed" + armed = 1 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index aea090fb68..e2329ce232 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -84,6 +84,10 @@ var/const/MAX_ACTIVE_TIME = 400 HasProximity(target) return +/obj/item/clothing/mask/facehugger/on_found(mob/finder as mob) + Attach(finder) + return 1 + /obj/item/clothing/mask/facehugger/dropped() ..() GoActive() diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 2f5bac9e1b..0d43d90ba5 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -362,6 +362,9 @@ if("legcuff") message = "\red [source] is trying to unlegcuff [target]!" if("uniform") + for(var/obj/item/I in list(target.l_store, target.r_store)) + if(I.on_found(source)) + return if(target.w_uniform && !target.w_uniform.canremove) message = "\red [source] fails to take off \a [target.w_uniform] from [target]'s body!" else @@ -369,19 +372,8 @@ if("s_store") message = "\red [source] is trying to take off \a [target.s_store] from [target]'s suit!" if("pockets") - for(var/obj/item/weapon/mousetrap/MT in list(target.l_store, target.r_store)) - if(MT.armed) - for(var/mob/O in viewers(target, null)) - if(O == source) - O.show_message("\red You reach into the [target]'s pockets, but there was a live mousetrap in there!", 1) - else - O.show_message("\red [source] reaches into [target]'s pockets and sets off a hidden mousetrap!", 1) - target.u_equip(MT) - if (target.client) - target.client.screen -= MT - MT.loc = source.loc - MT.triggered(source, source.hand ? "l_hand" : "r_hand") - MT.layer = OBJ_LAYER + for(var/obj/item/I in list(target.l_store, target.r_store)) + if(I.on_found(source)) return message = "\red [source] is trying to empty [target]'s pockets." if("CPR") diff --git a/html/changelog.html b/html/changelog.html index 9bbfcfd1bb..d7e2a6187c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -48,6 +48,15 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +
+

27 October 2012

+

Petethegoat updated:

+ +
+

27 October 2012

Petethegoat updated:

@@ -56,7 +65,10 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • Added a camera and hand labeler to art storage.
  • Added a medical records cabinet to the Detective's office.
  • Added a safe to the vault. Who'll be the first to crack it?
    • -
  • The CE has a new pet...
    • + +

    Nodrak updated:

    +
    diff --git a/icons/obj/assemblies/new_assemblies.dmi b/icons/obj/assemblies/new_assemblies.dmi index e9fdcf8a1f..8b0ea26ed2 100644 Binary files a/icons/obj/assemblies/new_assemblies.dmi and b/icons/obj/assemblies/new_assemblies.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 96ae4aa289..e643075182 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index a164e2cf0f..84eaa5071f 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -7122,7 +7122,7 @@ "cGX" = (/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/turf/unsimulated/floor{icon_state = "asteroid"; name = "dust"},/area/planet/clown) "cGY" = (/turf/unsimulated/floor{icon_state = "asteroid"; name = "dust"},/area/planet/clown) "cGZ" = (/obj/item/weapon/bananapeel,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) -"cHa" = (/obj/item/weapon/mousetrap/armed,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) +"cHa" = (/obj/item/device/assembly/mousetrap/armed,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) "cHb" = (/obj/item/weapon/ore/clown,/turf/unsimulated/floor{icon_state = "asteroid"; name = "dust"},/area/planet/clown) "cHc" = (/obj/effect/decal/remains/human,/turf/unsimulated/floor{icon_state = "asteroid"; name = "dust"},/area/planet/clown) "cHd" = (/obj/item/weapon/pickaxe,/turf/unsimulated/floor{icon_state = "asteroid"; name = "dust"},/area/planet/clown) diff --git a/tgstation.dme b/tgstation.dme index f01d39367b..00619875da 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -577,7 +577,6 @@ #include "code\game\mecha\equipment\weapons\weapons.dm" #include "code\game\mecha\medical\medical.dm" #include "code\game\mecha\medical\odysseus.dm" -#include "code\game\mecha\working\firefighter.dm" #include "code\game\mecha\working\ripley.dm" #include "code\game\mecha\working\working.dm" #include "code\game\objects\empulse.dm" @@ -678,7 +677,6 @@ #include "code\game\objects\items\weapons\kitchen.dm" #include "code\game\objects\items\weapons\manuals.dm" #include "code\game\objects\items\weapons\mop.dm" -#include "code\game\objects\items\weapons\mousetraps.dm" #include "code\game\objects\items\weapons\paint.dm" #include "code\game\objects\items\weapons\paiwire.dm" #include "code\game\objects\items\weapons\photography.dm" @@ -854,6 +852,7 @@ #include "code\modules\assembly\holder.dm" #include "code\modules\assembly\igniter.dm" #include "code\modules\assembly\infrared.dm" +#include "code\modules\assembly\mousetrap.dm" #include "code\modules\assembly\proximity.dm" #include "code\modules\assembly\shock_kit.dm" #include "code\modules\assembly\signaler.dm"