diff --git a/code/game/objects/items/weapons/trashbag.dm b/code/game/objects/items/weapons/trashbag.dm index e9471f60f17..21c76f0cbdb 100644 --- a/code/game/objects/items/weapons/trashbag.dm +++ b/code/game/objects/items/weapons/trashbag.dm @@ -1,14 +1,14 @@ /obj/item/weapon/trashbag + name = "trash bag" + desc = "A heavy-duty, no fun allowed trash bag." icon = 'icons/obj/trash.dmi' icon_state = "trashbag0" item_state = "trashbag" - name = "Trash bag" - desc = "A heavy-duty, no fun allowed trash bag." - var/mode = 1; //0 = pick one at a time, 1 = pick all on tile - var/capacity = 25; //the number of trash it can carry. flags = FPRINT | TABLEPASS slot_flags = SLOT_BELT w_class = 2.0 + var/mode = 1; //0 = pick one at a time, 1 = pick all on tile + var/capacity = 25; //the number of trash it can carry. /obj/item/weapon/trashbag/update_icon() if(contents.len == 0) @@ -21,21 +21,20 @@ /obj/item/weapon/trashbag/attackby(obj/item/W as obj, mob/living/user as mob) ..() - if (contents.len < capacity) - if (istype(W, /obj/item)) - if (W.w_class <= 2) + if(contents.len < capacity) + if(istype(W, /obj/item)) + if(W.w_class <= 2) var/obj/item/O = W - src.contents += O + contents += O else - user << "\blue The bag is full!" + user << "[src] is full!" /obj/item/weapon/trashbag/attack_self(mob/living/user as mob) - if(contents.len > 0) - for(var/obj/item/I in src.contents) + for(var/obj/item/I in contents) I.loc = user.loc update_icon() - user << "\blue You drop all the trash onto the floor." + user << "You empty [src] onto [user.loc]." /obj/item/weapon/trashbag/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) if(istype(target, /obj/item)) @@ -43,23 +42,23 @@ if(W.w_class <= 2) if(mode == 1) if(contents.len < capacity) //slightly redundant, but it makes it prettier in the chatbox. -Pete - user << "\blue You pick up all the trash." + user << "You pick up all the trash." for(var/obj/item/O in get_turf(W)) if(istype(O, /obj/item/weapon/disk/nuclear)) continue //No nuke disks - Nodrak if(contents.len < capacity) if(O.w_class <= 2) contents += O; else - user << "\blue The bag is full!" + user << "[src] is full!" break else - user << "\blue The bag is full!" + user << "[src] is full!" else if(istype(W, /obj/item/weapon/disk/nuclear)) return //No nuke disks - Nodrak if(contents.len < capacity) contents += W; else - user << "\blue The bag is full!" + user << "[src] is full!" update_icon() return @@ -68,8 +67,7 @@ set category = "Object" mode = !mode - switch (mode) - if(1) - usr << "The bag now picks up all trash in a tile at once." - else - usr << "The bag now picks up one piece of trash at a time." \ No newline at end of file + if(mode == 1) + usr << "[src] now picks up all trash in a tile at once." + else + usr << "[src] now picks up one piece of trash at a time." \ No newline at end of file diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index d9a86a3b8a8..daf4689f6a7 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -43,6 +43,7 @@ proc/createRandomZlevel() world << "\red \b Loading away mission..." var/map = pick(potentialRandomZlevels) + world.log << "away mission loaded: [map]" var/file = file(map) if(isfile(file)) maploader.load_map(file) diff --git a/maps/RandomZLevels/stationCollision.dm b/maps/RandomZLevels/stationCollision.dm index df246c961cb..e9b85df1b7d 100644 --- a/maps/RandomZLevels/stationCollision.dm +++ b/maps/RandomZLevels/stationCollision.dm @@ -95,7 +95,7 @@ obj/item/weapon/gun/energy/laser/retro/sc_retro //Lasers /obj/item/weapon/gun/energy/laser/practice/sc_laser name = "Old laser" - desc = "A once potent weapon, years of dust have collected in the chamber and lens of this weapon, weakening the beam signifigantly." + desc = "A once potent weapon, years of dust have collected in the chamber and lens of this weapon, weakening the beam significantly." clumsy_check = 0 /*