diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 1cb3367216a..a488e424c35 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -390,21 +390,6 @@
icon_state = "wood_tableparts"
flags = null
-/obj/item/weapon/wire
- desc = "This is just a simple piece of regular insulated wire."
- name = "wire"
- icon = 'icons/obj/power.dmi'
- icon_state = "item_wire"
- var/amount = 1.0
- var/laying = 0.0
- var/old_lay = null
- m_amt = 40
- attack_verb = list("whipped", "lashed", "disciplined", "tickled")
-
- suicide_act(mob/user)
- viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide."
- return (OXYLOSS)
-
/obj/item/weapon/module
icon = 'icons/obj/module.dmi'
icon_state = "std_module"
diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm
index ffcb6770224..fba0d7e2559 100644
--- a/code/game/objects/effects/decals/contraband.dm
+++ b/code/game/objects/effects/decals/contraband.dm
@@ -18,7 +18,7 @@
var/obj/structure/sign/poster/resulting_poster = null //The poster that will be created is initialised and stored through contraband/poster's constructor
-/obj/item/weapon/contraband/poster/New(turf/loc, var/given_serial = 0)
+/obj/item/weapon/contraband/poster/New(turf/loc, given_serial = 0)
if(given_serial == 0)
serial_number = rand(1, NUM_OF_POSTER_DESIGNS)
resulting_poster = new(serial_number)
@@ -74,8 +74,7 @@ obj/structure/sign/poster
var/ruined = 0
-obj/structure/sign/poster/New(var/serial)
-
+obj/structure/sign/poster/New(serial)
serial_number = serial
if(serial_number == loc)
@@ -119,8 +118,8 @@ obj/structure/sign/poster/New(var/serial)
desc = "Why are you still here?"
..()
-obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/wirecutters))
+obj/structure/sign/poster/attackby(obj/item/I, mob/user)
+ if(istype(I, /obj/item/weapon/wirecutters))
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
if(ruined)
user << "You remove the remnants of the poster."
@@ -131,7 +130,7 @@ obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
return
-/obj/structure/sign/poster/attack_hand(mob/user as mob)
+/obj/structure/sign/poster/attack_hand(mob/user)
if(ruined)
return
var/temp_loc = user.loc
@@ -149,15 +148,15 @@ obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
if("No")
return
-/obj/structure/sign/poster/proc/roll_and_drop(turf/loc)
+/obj/structure/sign/poster/proc/roll_and_drop(turf/location)
var/obj/item/weapon/contraband/poster/P = new(src, serial_number)
P.resulting_poster = src
- P.loc = loc
+ P.loc = location
loc = P
//seperated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby()
-/turf/simulated/wall/proc/place_poster(var/obj/item/weapon/contraband/poster/P, var/mob/user)
+/turf/simulated/wall/proc/place_poster(obj/item/weapon/contraband/poster/P, mob/user)
if(!P.resulting_poster) return
var/stuff_on_wall = 0
@@ -170,7 +169,7 @@ obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
user << "The wall is far too cluttered to place a poster!"
return
- user << "You start placing the poster on the wall..." //Looks like it's uncluttered enough. Place the poster.
+ user << "You start placing the poster on the wall..." //Looks like it's uncluttered enough. Place the poster.
//declaring D because otherwise if P gets 'deconstructed' we lose our reference to P.resulting_poster
var/obj/structure/sign/poster/D = P.resulting_poster
@@ -184,7 +183,7 @@ obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
sleep(17)
if(!D) return
- if(istype(src,/turf/simulated/wall) && user && user.loc == temp_loc)//Let's check if everything is still there
+ if(istype(src,/turf/simulated/wall) && user && user.loc == temp_loc) //Let's check if everything is still there
user << "You place the poster!"
else
D.roll_and_drop(temp_loc)
diff --git a/code/game/objects/items/weapons/wires.dm b/code/game/objects/items/weapons/wires.dm
deleted file mode 100644
index 92a76310ab0..00000000000
--- a/code/game/objects/items/weapons/wires.dm
+++ /dev/null
@@ -1,20 +0,0 @@
-// WIRES
-
-/obj/item/weapon/wire/proc/update()
- if (src.amount > 1)
- src.icon_state = "spool_wire"
- src.desc = text("This is just spool of regular insulated wire. It consists of about [] unit\s of wire.", src.amount)
- else
- src.icon_state = "item_wire"
- src.desc = "This is just a simple piece of regular insulated wire."
- return
-
-/obj/item/weapon/wire/attack_self(mob/user as mob)
- if (src.laying)
- src.laying = 0
- user << "\blue You're done laying wire!"
- else
- user << "\blue You are not using this to lay wire..."
- return
-
-
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 656893ee76b..abbc13a8b2a 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -6,20 +6,6 @@
var/datum/controller/supply_shuttle/supply_shuttle = new()
-var/list/mechtoys = list(
- /obj/item/toy/prize/ripley,
- /obj/item/toy/prize/fireripley,
- /obj/item/toy/prize/deathripley,
- /obj/item/toy/prize/gygax,
- /obj/item/toy/prize/durand,
- /obj/item/toy/prize/honk,
- /obj/item/toy/prize/marauder,
- /obj/item/toy/prize/seraph,
- /obj/item/toy/prize/mauler,
- /obj/item/toy/prize/odysseus,
- /obj/item/toy/prize/phazon
-)
-
/area/supply/station //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS.
name = "supply shuttle"
icon_state = "shuttle3"
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 373f645a84b..671739ea9bf 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1879,18 +1879,19 @@
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","LO")
message_admins("[key_name_admin(usr)] has broke a lot of lights", 1)
- E = new /datum/round_event/electrical_storm{lightsoutAmount=2}()
+ E = new /datum/round_event/electrical_storm{lightsoutAmount = 2}()
if("blackout")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","BO")
message_admins("[key_name_admin(usr)] broke all lights", 1)
- E = new /datum/round_event/electrical_storm{lightsoutAmount=0}()
+ for(var/obj/machinery/light/L in world)
+ L.broken()
if("whiteout")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","WO")
+ message_admins("[key_name_admin(usr)] fixed all lights", 1)
for(var/obj/machinery/light/L in world)
L.fix()
- message_admins("[key_name_admin(usr)] fixed all lights", 1)
if("friendai")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","FA")
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 92114f629fb..9b2a51b1144 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -139,7 +139,7 @@
var/obj/item/weapon/cable_coil/CC = new/obj/item/weapon/cable_coil(user.loc)
CC.amount = 1
- CC.updateicon()
+ CC.update_icon()
overlays = list()
string_attached = null
user << "\blue You detach the string from the coin."
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 29ec9a5354e..4f272a1925a 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -238,9 +238,9 @@
color = param_color
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
- updateicon()
+ update_icon()
-/obj/item/weapon/cable_coil/proc/updateicon()
+/obj/item/weapon/cable_coil/update_icon()
if (!color)
color = pick("red", "yellow", "blue", "green")
if(amount == 1)
@@ -287,7 +287,7 @@
src.amount--
new/obj/item/weapon/cable_coil(user.loc, 1,color)
user << "You cut a piece off the cable coil."
- src.updateicon()
+ src.update_icon()
return
else if( istype(W, /obj/item/weapon/cable_coil) )
@@ -299,26 +299,30 @@
if( (C.amount + src.amount <= MAXCOIL) )
C.amount += src.amount
user << "You join the cable coils together."
- C.updateicon()
+ C.update_icon()
del(src)
return
else
user << "You transfer [MAXCOIL - src.amount ] length\s of cable from one coil to the other."
src.amount -= (MAXCOIL-C.amount)
- src.updateicon()
+ src.update_icon()
C.amount = MAXCOIL
- C.updateicon()
+ C.update_icon()
return
/obj/item/weapon/cable_coil/proc/use(var/used)
if(src.amount < used)
return 0
else if (src.amount == used)
+ //handle mob icon update
+ if(ismob(loc))
+ var/mob/M = loc
+ M.drop_item(src)
del(src)
else
amount -= used
- updateicon()
+ update_icon()
return 1
// called when cable_coil is clicked on a turf/simulated/floor
@@ -571,7 +575,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
src.amount = rand(1,2)
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
- updateicon()
+ update_icon()
/obj/item/weapon/cable_coil/yellow
color = "yellow"