diff --git a/_maps/map_files/MiniStation/uplink_item.dm b/_maps/map_files/MiniStation/uplink_item.dm index 8d6d1a3a154..7816f01cf7a 100644 --- a/_maps/map_files/MiniStation/uplink_item.dm +++ b/_maps/map_files/MiniStation/uplink_item.dm @@ -24,7 +24,7 @@ ..() cost = 5 -/datum/uplink_item/device_tools/plastic_explosives/New() +/datum/uplink_item/device_tools/c4/New() ..() item = null // Disabled diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index fa6d850888e..729929193ad 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -368,11 +368,11 @@ var/list/uplink_items = list() item = /obj/item/weapon/aiModule/syndicate cost = 7 -/datum/uplink_item/device_tools/plastic_explosives +/datum/uplink_item/device_tools/c4 name = "Composition C-4" desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls or connect a signaler to its wiring to make it remotely detonable. \ It has a modifiable timer with a minimum setting of 10 seconds." - item = /obj/item/weapon/plastique + item = /obj/item/weapon/c4 cost = 1 /datum/uplink_item/device_tools/powersink diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index 5ba362ba2fd..7a43c1bde8d 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -17,16 +17,16 @@ var/const/WIRE_EXPLODE = 1 if(!mended) explode() -/datum/wires/explosive/plastic - holder_type = /obj/item/weapon/plastique +/datum/wires/explosive/c4 + holder_type = /obj/item/weapon/c4 -/datum/wires/explosive/plastic/CanUse(var/mob/living/L) - var/obj/item/weapon/plastique/P = holder +/datum/wires/explosive/c4/CanUse(var/mob/living/L) + var/obj/item/weapon/c4/P = holder if(P.open_panel) return 1 return 0 -/datum/wires/explosive/plastic/explode() - var/obj/item/weapon/plastique/P = holder +/datum/wires/explosive/c4/explode() + var/obj/item/weapon/c4/P = holder P.explode(get_turf(P)) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 0059be158c8..6d7cb64a37f 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -1,7 +1,7 @@ -//In this file: Plastic explosives (C4) and Syndicate Bombs +//In this file: C4 and Syndicate Bombs -/obj/item/weapon/plastique - name = "plastic explosives" +/obj/item/weapon/c4 + name = "C-4" desc = "Used to put holes in specific areas without too much extra hole." gender = PLURAL icon = 'icons/obj/assemblies.dmi' @@ -10,20 +10,20 @@ flags = NOBLUDGEON w_class = 2.0 origin_tech = "syndicate=2" - var/datum/wires/explosive/plastic/wires = null + var/datum/wires/explosive/c4/wires = null var/timer = 10 var/atom/target = null var/open_panel = 0 var/image_overlay = null -/obj/item/weapon/plastique/New() +/obj/item/weapon/c4/New() wires = new(src) image_overlay = image('icons/obj/assemblies.dmi', "plastic-explosive2") ..() -/obj/item/weapon/plastique/suicide_act(var/mob/user) +/obj/item/weapon/c4/suicide_act(var/mob/user) . = BRUTELOSS - user.visible_message("[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!") + user.visible_message("[user] activates the [src.name] and holds it above his head! It looks like \he's going out with a bang!") var/message_say = "FOR NO RAISIN!" if(user.mind) if(user.mind.special_role) @@ -36,11 +36,11 @@ message_say = "FOR NARSIE!" user.say(message_say) target = user - message_admins("[key_name(user, user.client)](?) suicided with C4 at ([x],[y],[z] - JMP)",0,1) + message_admins("[key_name(user, user.client)](?) suicided with [src.name] at ([x],[y],[z] - JMP)",0,1) explode(get_turf(user)) return . -/obj/item/weapon/plastique/attackby(var/obj/item/I, var/mob/user) +/obj/item/weapon/c4/attackby(var/obj/item/I, var/mob/user) if(istype(I, /obj/item/weapon/screwdriver)) open_panel = !open_panel user << "You [open_panel ? "open" : "close"] the wire panel." @@ -49,14 +49,14 @@ else ..() -/obj/item/weapon/plastique/attack_self(mob/user as mob) +/obj/item/weapon/c4/attack_self(mob/user as mob) var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num if(user.get_active_hand() == src) newtime = Clamp(newtime, 10, 60000) timer = newtime user << "Timer set for [timer] seconds." -/obj/item/weapon/plastique/afterattack(atom/movable/target, mob/user, flag) +/obj/item/weapon/c4/afterattack(atom/movable/target, mob/user, flag) if (!flag) return if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/)) @@ -71,19 +71,19 @@ if (ismob(target)) add_logs(user, target, "planted [name] on") user.visible_message("[user.name] finished planting an explosive on [target.name]!") - message_admins("[key_name(user, user.client)](?) planted C4 on [key_name(target)](?) with [timer] second fuse",0,1) - log_game("[key_name(user)] planted C4 on [key_name(target)] with [timer] second fuse") + message_admins("[key_name(user, user.client)](?) planted [src.name] on [key_name(target)](?) with [timer] second fuse",0,1) + log_game("[key_name(user)] planted [src.name] on [key_name(target)] with [timer] second fuse") else - message_admins("[key_name(user, user.client)](?) planted C4 on [target.name] at ([target.x],[target.y],[target.z] - JMP) with [timer] second fuse",0,1) - log_game("[key_name(user)] planted C4 on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse") + message_admins("[key_name(user, user.client)](?) planted [src.name] on [target.name] at ([target.x],[target.y],[target.z] - JMP) with [timer] second fuse",0,1) + log_game("[key_name(user)] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse") target.overlays += image_overlay user << "Bomb has been planted. Timer counting down from [timer]." spawn(timer*10) explode(get_turf(target)) -/obj/item/weapon/plastique/proc/explode(var/location) +/obj/item/weapon/c4/proc/explode(var/location) if(!target) target = get_atom_on_turf(src) if(!target) @@ -101,5 +101,5 @@ target.overlays -= image_overlay qdel(src) -/obj/item/weapon/plastique/attack(mob/M as mob, mob/user as mob, def_zone) +/obj/item/weapon/c4/attack(mob/M as mob, mob/user as mob, def_zone) return diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index b8664ed01e6..54474aac5a5 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -36,7 +36,7 @@ new /obj/item/weapon/gun/projectile/revolver(src) new /obj/item/ammo_box/a357(src) new /obj/item/weapon/card/emag(src) - new /obj/item/weapon/plastique(src) + new /obj/item/weapon/c4(src) return if("murder") diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 91cf7d75fb6..aeb432a3e66 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -836,7 +836,7 @@ var/global/list/g_fancy_list_of_safe_types = null sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow sec_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/mateba sec_briefcase.contents += new /obj/item/ammo_box/a357 - sec_briefcase.contents += new /obj/item/weapon/plastique + sec_briefcase.contents += new /obj/item/weapon/c4 M.equip_to_slot_or_del(sec_briefcase, slot_l_hand) var/obj/item/device/pda/heads/pda = new(M) @@ -1116,7 +1116,7 @@ var/global/list/g_fancy_list_of_safe_types = null M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(M), slot_in_backpack) M.equip_to_slot_or_del(new /obj/item/device/flashlight(M), slot_in_backpack) - M.equip_to_slot_or_del(new /obj/item/weapon/plastique(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/weapon/c4(M), slot_in_backpack) M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(M), slot_l_store) M.equip_to_slot_or_del(new /obj/item/weapon/shield/energy(M), slot_r_store) diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm index 746d1010d0f..cb58098d54f 100644 --- a/code/modules/events/ninja.dm +++ b/code/modules/events/ninja.dm @@ -376,8 +376,8 @@ ________________________________________________________________________________ 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/clothing/glasses/night(src), slot_glasses) equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_belt) - equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_r_store) - equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_l_store) + equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_r_store) + equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_l_store) equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(src), slot_s_store) equip_to_slot_or_del(new /obj/item/weapon/tank/jetpack/carbondioxide(src), slot_back) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 32692b64771..3f884fcac54 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -344,7 +344,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite /obj/item/clothing/mask/gas/voice, /obj/item/clothing/glasses/thermal,\ /obj/item/device/chameleon, /obj/item/weapon/card/emag,\ /obj/item/weapon/storage/toolbox/syndicate, /obj/item/weapon/aiModule,\ - /obj/item/device/radio/headset/syndicate, /obj/item/weapon/plastique,\ + /obj/item/device/radio/headset/syndicate, /obj/item/weapon/c4,\ /obj/item/device/powersink, /obj/item/weapon/storage/box/syndie_kit,\ /obj/item/toy/syndicateballoon, /obj/item/weapon/gun/energy/laser/captain,\ /obj/item/weapon/hand_tele, /obj/item/weapon/rcd, /obj/item/weapon/tank/jetpack,\ diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 9ad3606dcb7..71ab8197d12 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -127,7 +127,7 @@ if(!item_to_add) usr.visible_message("[usr] pets [src]","You rest your hand on [src]'s back for a moment.") return - if(istype(item_to_add,/obj/item/weapon/plastique)) // last thing he ever wears, I guess + if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess item_to_add.afterattack(src,usr,1) return @@ -169,7 +169,7 @@ //Many hats added, Some will probably be removed, just want to see which ones are popular. /mob/living/simple_animal/corgi/proc/place_on_head(obj/item/item_to_add) - if(istype(item_to_add,/obj/item/weapon/plastique)) // last thing he ever wears, I guess + if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess item_to_add.afterattack(src,usr,1) return diff --git a/code/unused/specops.dm b/code/unused/specops.dm index bc620d37421..5843b1e9771 100644 --- a/code/unused/specops.dm +++ b/code/unused/specops.dm @@ -145,7 +145,7 @@ var/global/sent_strike_team = 0 equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(src), slot_in_backpack) equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_in_backpack) if (!leader_selected) - equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_in_backpack) + equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_in_backpack) else equip_to_slot_or_del(new /obj/item/weapon/pinpointer(src), slot_in_backpack) equip_to_slot_or_del(new /obj/item/weapon/disk/nuclear(src), slot_in_backpack)