here we go again (#2456)

This commit is contained in:
LetterJay
2017-08-24 19:24:25 -07:00
committed by kevinz000
parent c7ed043fd5
commit 188193eb61
1107 changed files with 25420 additions and 25417 deletions
+18 -18
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/papercutter
/obj/item/papercutter
name = "paper cutter"
desc = "Standard office equipment. Precisely cuts paper using a large blade."
icon = 'icons/obj/bureaucracy.dmi'
@@ -6,19 +6,19 @@
force = 5
throwforce = 5
w_class = WEIGHT_CLASS_NORMAL
var/obj/item/weapon/paper/storedpaper = null
var/obj/item/weapon/hatchet/cutterblade/storedcutter = null
var/obj/item/paper/storedpaper = null
var/obj/item/hatchet/cutterblade/storedcutter = null
var/cuttersecured = TRUE
pass_flags = PASSTABLE
/obj/item/weapon/papercutter/New()
/obj/item/papercutter/New()
..()
storedcutter = new /obj/item/weapon/hatchet/cutterblade(src)
storedcutter = new /obj/item/hatchet/cutterblade(src)
update_icon()
/obj/item/weapon/papercutter/suicide_act(mob/user)
/obj/item/papercutter/suicide_act(mob/user)
if(storedcutter)
user.visible_message("<span class='suicide'>[user] is beheading [user.p_them()]self with [src.name]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
if(iscarbon(user))
@@ -34,7 +34,7 @@
return (BRUTELOSS)
/obj/item/weapon/papercutter/update_icon()
/obj/item/papercutter/update_icon()
..()
cut_overlays()
icon_state = (storedcutter ? "[initial(icon_state)]-cutter" : "[initial(icon_state)]")
@@ -42,8 +42,8 @@
add_overlay("paper")
/obj/item/weapon/papercutter/attackby(obj/item/P, mob/user, params)
if(istype(P, /obj/item/weapon/paper) && !storedpaper)
/obj/item/papercutter/attackby(obj/item/P, mob/user, params)
if(istype(P, /obj/item/paper) && !storedpaper)
if(!user.drop_item())
return
playsound(loc, "pageturn", 60, 1)
@@ -52,7 +52,7 @@
storedpaper = P
update_icon()
return
if(istype(P, /obj/item/weapon/hatchet/cutterblade) && !storedcutter)
if(istype(P, /obj/item/hatchet/cutterblade) && !storedcutter)
if(!user.drop_item())
return
to_chat(user, "<span class='notice'>You replace [src]'s [P].</span>")
@@ -60,7 +60,7 @@
storedcutter = P
update_icon()
return
if(istype(P, /obj/item/weapon/screwdriver) && storedcutter)
if(istype(P, /obj/item/screwdriver) && storedcutter)
playsound(src, P.usesound, 50, 1)
to_chat(user, "<span class='notice'>[storedcutter] has been [cuttersecured ? "unsecured" : "secured"].</span>")
cuttersecured = !cuttersecured
@@ -68,7 +68,7 @@
..()
/obj/item/weapon/papercutter/attack_hand(mob/user)
/obj/item/papercutter/attack_hand(mob/user)
add_fingerprint(user)
if(!storedcutter)
to_chat(user, "<span class='notice'>The cutting blade is gone! You can't use [src] now.</span>")
@@ -85,12 +85,12 @@
to_chat(user, "<span class='notice'>You neatly cut [storedpaper].</span>")
storedpaper = null
qdel(storedpaper)
new /obj/item/weapon/paperslip(get_turf(src))
new /obj/item/weapon/paperslip(get_turf(src))
new /obj/item/paperslip(get_turf(src))
new /obj/item/paperslip(get_turf(src))
update_icon()
/obj/item/weapon/papercutter/MouseDrop(atom/over_object)
/obj/item/papercutter/MouseDrop(atom/over_object)
var/mob/M = usr
if(M.incapacitated() || !Adjacent(M))
return
@@ -104,7 +104,7 @@
add_fingerprint(M)
/obj/item/weapon/paperslip
/obj/item/paperslip
name = "paper slip"
desc = "A little slip of paper left over after a larger piece was cut. Whoa."
icon_state = "paperslip"
@@ -112,13 +112,13 @@
resistance_flags = FLAMMABLE
max_integrity = 50
/obj/item/weapon/paperslip/New()
/obj/item/paperslip/New()
..()
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
/obj/item/weapon/hatchet/cutterblade
/obj/item/hatchet/cutterblade
name = "paper cutter"
desc = "The blade of a paper cutter. Most likely removed for polishing or sharpening."
icon = 'icons/obj/bureaucracy.dmi'