diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 45ad2ccbf98..5f52016dd92 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -507,7 +507,7 @@ var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage /obj/item/device/hacktool - name = "hacktool" + name = "modifed door debugger" icon_state = "hacktool" flags = FPRINT | TABLEPASS | CONDUCT var/in_use = 0 diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 9ca0c34afb8..78fab7ed58c 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -529,8 +529,8 @@ item_state = "syringe_kit" /obj/item/weapon/storage/toolbox/syndicate - name = "suspicious looking toolbox" - desc = "You have no idea what this is." + name = "red and black toolbox" + desc = "An oddly coloured toolbox." icon_state = "syndicate" item_state = "toolbox_syndi" origin_tech = "combat=1;syndicate=1" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 3482044d573..9d8446c0669 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -720,7 +720,7 @@ /obj/item/weapon/card/id/syndicate name = "agent card" - desc = "Shhhhh." +// desc = "Shhhhh." access = list(access_maint_tunnels) origin_tech = "syndicate=3" @@ -1840,7 +1840,7 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove /obj/item/weapon/plastique name = "plastic explosives" - desc = "Used to put holes in specific areas without too much extra hole." + desc = "Used to put holes in specific areas without too much extra hole. Does not work on people." gender = PLURAL icon = 'assemblies.dmi' icon_state = "plastic-explosive0" diff --git a/code/game/gamemodes/factions.dm b/code/game/gamemodes/factions.dm index 35822d680e9..baf70a53ad2 100644 --- a/code/game/gamemodes/factions.dm +++ b/code/game/gamemodes/factions.dm @@ -145,7 +145,7 @@ Devices and Tools; /obj/item/clothing/glasses/thermal:3:Thermal Imaging Glasses; /obj/item/device/encryptionkey/binary:3:Binary Translator Key; /obj/item/weapon/aiModule/syndicate:7:Hacked AI Upload Module; -/obj/item/weapon/plastique:2:C-4 (Destroys walls); +/obj/item/weapon/plastique:2:C-4 (Destroys walls, not people); /obj/item/device/powersink:5:Powersink (DANGER!); /obj/item/device/radio/beacon/syndicate:7:Singularity Beacon (DANGER!); /obj/item/weapon/circuitboard/teleporter:20:Teleporter Circuit Board; diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index fa1f19fa2e5..a6a3c1c0d11 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -59,7 +59,7 @@ Devices and Tools; /obj/item/weapon/storage/syndie_kit/space:3:Space Suit; /obj/item/clothing/glasses/thermal:3:Thermal Imaging Glasses; /obj/item/weapon/aiModule/syndicate:7:Hacked AI Upload Module; -/obj/item/weapon/plastique:2:C-4 (Destroys walls); +/obj/item/weapon/plastique:2:C-4 (Destroys walls, not people); /obj/item/weapon/syndie/c4explosive:4:Low Power Explosive Charge, with Detonator; /obj/item/device/powersink:5:Powersink (DANGER!); /obj/item/device/radio/beacon/syndicate:7:Singularity Beacon (DANGER!); diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm index 85fcfe08d44..b715f080d42 100644 --- a/code/game/objects/devices/PDA/cart.dm +++ b/code/game/objects/devices/PDA/cart.dm @@ -182,7 +182,7 @@ access_status_display = 1 syndicate - name = "Detomatix Cartridge" + name = "modified signaler cartridge" icon_state = "cart" access_remote_door = 1 remote_door_id = "syndicate" //Make sure this matches the syndicate shuttle's shield/door id!! diff --git a/code/game/objects/devices/chameleonproj.dm b/code/game/objects/devices/chameleonproj.dm index c8e7ff754c0..884dce76839 100644 --- a/code/game/objects/devices/chameleonproj.dm +++ b/code/game/objects/devices/chameleonproj.dm @@ -40,7 +40,7 @@ return /obj/item/device/chameleon - name = "chameleon-projector" + name = "small device" icon_state = "shield0" flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY slot_flags = SLOT_BELT diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index d0463e41d72..cd6b29491a4 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -389,7 +389,7 @@ ZIPPO var/lit = 0 /obj/item/weapon/lighter/zippo - name = "Zippo lighter" + name = "\improper Zippo lighter" desc = "The zippo." icon_state = "zippo" item_state = "zippo" diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 662e143920e..6ad3f7eda1c 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -28,6 +28,8 @@ message_admins("ATTACK: [user] ([user.ckey]) planted [src] on [target] ([target:ckey]).") log_attack(" [user.real_name] ([user.ckey]) tried planting [name] on [target:real_name] ([target:ckey])") target.overlays += image('assemblies.dmi', "plastic-explosive2") + log_admin("[user] ([user.ckey]) has planted a [src].") + message_admins("[user] ([user.ckey]) planted a [src].") user << "Bomb has been planted. Timer counting down from [timer]." spawn(timer*10) if(target) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 96a2c4f9b4c..d07152f7e8a 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -66,7 +66,7 @@ /obj/item/weapon/implanter/explosive - name = "implanter-explosive" + name = "implanter (E)" /obj/item/weapon/implanter/explosive/New() imp = new /obj/item/weapon/implant/explosive( src ) @@ -75,7 +75,7 @@ return /obj/item/weapon/implanter/compressed - name = "implanter-compressed" + name = "implanter (C)" icon_state = "cimplanter0" /obj/item/weapon/implanter/compressed/New() diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 6055252d56b..2a936622766 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -9,8 +9,8 @@ /obj/item/weapon/syndie/c4explosive icon_state = "c-4small_0" item_state = "c-4small" - name = "mysterious package" - desc = "A mysterious package." + name = "normal-sized package" + desc = "A small wrapped package." w_class = 3 var/power = 1 /*Size of the explosion.*/ @@ -27,9 +27,9 @@ var/K = rand(1,2000) K = md5(num2text(K)+name) K = copytext(K,1,7) - src.desc += "\n You see [K] engraved on \the [src]" + src.desc += "\n You see [K] engraved on \the [src]." var/obj/item/weapon/syndie/c4detonator/detonator = new(src.loc) - detonator.desc += "\n You see [K] engraved on \the [src]" + detonator.desc += "\n You see [K] engraved on the lighter." detonator.bomb = src /obj/item/weapon/syndie/c4explosive/proc/detonate() @@ -53,8 +53,8 @@ /obj/item/weapon/syndie/c4detonator icon_state = "c-4detonator_0" item_state = "c-4detonator" - name = "lighter" /*Sneaky, thanks Dreyfus.*/ - desc = "A disposable lighter, it's quite heavy." + name = "\improper Zippo lighter" /*Sneaky, thanks Dreyfus.*/ + desc = "The zippo." w_class = 1 var/obj/item/weapon/syndie/c4explosive/bomb diff --git a/code/game/objects/storage/uplink_kits.dm b/code/game/objects/storage/uplink_kits.dm index b7b053135ec..10e9c4078eb 100644 --- a/code/game/objects/storage/uplink_kits.dm +++ b/code/game/objects/storage/uplink_kits.dm @@ -1,11 +1,11 @@ /obj/item/weapon/storage/syndie_kit - name = "Box" - desc = "A sleek, sturdy box" - icon_state = "box_of_doom" + name = "box" + desc = "It's just an ordinary box." + icon_state = "box" item_state = "syringe_kit" /obj/item/weapon/storage/syndie_kit/imp_freedom - name = "Freedom Implant (with injector)" + name = "box (FI)" /obj/item/weapon/storage/syndie_kit/imp_freedom/New() var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src) @@ -15,7 +15,7 @@ return /obj/item/weapon/storage/syndie_kit/imp_compress - name = "Compressed Matter Implant (with injector)" + name = "box (CMI)" /obj/item/weapon/storage/syndie_kit/imp_compress/New() new /obj/item/weapon/implanter/compressed(src) @@ -23,18 +23,18 @@ return /obj/item/weapon/storage/syndie_kit/imp_explosive - name = "Explosive Implant (with injector)" + name = "box (EI)" /obj/item/weapon/storage/syndie_kit/imp_explosive/New() var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src) O.imp = new /obj/item/weapon/implant/explosive(O) - O.name = "(BIO-HAZARD) BIO-detpack" +// O.name = "(BIO-HAZARD) BIO-detpack" O.update() ..() return /obj/item/weapon/storage/syndie_kit/imp_uplink - name = "Uplink Implant (with injector)" + name = "box (UI)" /obj/item/weapon/storage/syndie_kit/imp_uplink/New() var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src) @@ -44,7 +44,7 @@ return /obj/item/weapon/storage/syndie_kit/space - name = "Space Suit and Helmet" + name = "box (SS)" /obj/item/weapon/storage/syndie_kit/space/New() new /obj/item/clothing/suit/space/syndicate(src) diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 618e04722e2..a14bf65ebe5 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -69,7 +69,7 @@ /obj/item/weapon/gun/energy/crossbow name = "mini energy-crossbow" - desc = "A weapon favored by many of the syndicates stealth specialists." + desc = "A crossbow that doesn't seem to have space for bolts." icon_state = "crossbow" w_class = 2.0 item_state = "crossbow" diff --git a/icons/obj/syndieweapons.dmi b/icons/obj/syndieweapons.dmi index 36aa13a90f0..bccb01e17f1 100644 Binary files a/icons/obj/syndieweapons.dmi and b/icons/obj/syndieweapons.dmi differ