shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper_cutter.dm
+6 -6
View File
@@ -47,7 +47,7 @@
if(!user.drop_item())
return
playsound(loc, "pageturn", 60, 1)
user << "<span class='notice'>You place [P] in [src].</span>"
to_chat(user, "<span class='notice'>You place [P] in [src].</span>")
P.loc = src
storedpaper = P
update_icon()
@@ -55,14 +55,14 @@
if(istype(P, /obj/item/weapon/hatchet/cutterblade) && !storedcutter)
if(!user.drop_item())
return
user << "<span class='notice'>You replace [src]'s [P].</span>"
to_chat(user, "<span class='notice'>You replace [src]'s [P].</span>")
P.loc = src
storedcutter = P
update_icon()
return
if(istype(P, /obj/item/weapon/screwdriver) && storedcutter)
playsound(src, P.usesound, 50, 1)
user << "<span class='notice'>[storedcutter] has been [cuttersecured ? "unsecured" : "secured"].</span>"
to_chat(user, "<span class='notice'>[storedcutter] has been [cuttersecured ? "unsecured" : "secured"].</span>")
cuttersecured = !cuttersecured
return
..()
@@ -71,18 +71,18 @@
/obj/item/weapon/papercutter/attack_hand(mob/user)
add_fingerprint(user)
if(!storedcutter)
user << "<span class='notice'>The cutting blade is gone! You can't use [src] now.</span>"
to_chat(user, "<span class='notice'>The cutting blade is gone! You can't use [src] now.</span>")
return
if(!cuttersecured)
user << "<span class='notice'>You remove [src]'s [storedcutter].</span>"
to_chat(user, "<span class='notice'>You remove [src]'s [storedcutter].</span>")
user.put_in_hands(storedcutter)
storedcutter = null
update_icon()
if(storedpaper)
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1)
user << "<span class='notice'>You neatly cut [storedpaper].</span>"
to_chat(user, "<span class='notice'>You neatly cut [storedpaper].</span>")
storedpaper = null
qdel(storedpaper)
new /obj/item/weapon/paperslip(get_turf(src))