mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
Changelog + scrambled paper
This commit is contained in:
@@ -38,13 +38,13 @@
|
|||||||
name = ("bookcase ([newname])")
|
name = ("bookcase ([newname])")
|
||||||
else if(istype(O,/obj/item/weapon/wrench))
|
else if(istype(O,/obj/item/weapon/wrench))
|
||||||
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
|
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
|
||||||
user << (anchored ? "<span class='notice'>You unfasten the [src] from the floor.</span>" : "<span class='notice'>You secure the [src] to the floor.</span>")
|
user << (anchored ? "<span class='notice'>You unfasten \the [src] from the floor.</span>" : "<span class='notice'>You secure \the [src] to the floor.</span>")
|
||||||
anchored = !anchored
|
anchored = !anchored
|
||||||
else if(istype(O,/obj/item/weapon/screwdriver))
|
else if(istype(O,/obj/item/weapon/screwdriver))
|
||||||
playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
|
playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
|
||||||
user << "<span class='notice'>You begin dismantling the [src].</span>"
|
user << "<span class='notice'>You begin dismantling \the [src].</span>"
|
||||||
if(do_after(user,25))
|
if(do_after(user,25))
|
||||||
user << "<span class='notice'>You dismantle the [src].</span>"
|
user << "<span class='notice'>You dismantle \the [src].</span>"
|
||||||
new /obj/item/stack/material/wood(get_turf(src), amount = 3)
|
new /obj/item/stack/material/wood(get_turf(src), amount = 3)
|
||||||
for(var/obj/item/weapon/book/b in contents)
|
for(var/obj/item/weapon/book/b in contents)
|
||||||
b.loc = (get_turf(src))
|
b.loc = (get_turf(src))
|
||||||
|
|||||||
@@ -389,9 +389,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
|
|||||||
if(isnum(orderid))
|
if(isnum(orderid))
|
||||||
var/nhref = "src=\ref[src];targetid=[orderid]"
|
var/nhref = "src=\ref[src];targetid=[orderid]"
|
||||||
spawn() src.Topic(nhref, params2list(nhref), src)
|
spawn() src.Topic(nhref, params2list(nhref), src)
|
||||||
if(href_list["sort"])
|
if(href_list["sort"] in list("author", "title", "category"))
|
||||||
if(href_list["sort"] != "author" && href_list["sort"] != "title" && href_list["sort"] != "category")
|
|
||||||
return
|
|
||||||
sortby = href_list["sort"]
|
sortby = href_list["sort"]
|
||||||
src.add_fingerprint(usr)
|
src.add_fingerprint(usr)
|
||||||
src.updateUsrDialog()
|
src.updateUsrDialog()
|
||||||
|
|||||||
@@ -107,6 +107,15 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
/obj/item/weapon/paper/attack_self(mob/living/user as mob)
|
/obj/item/weapon/paper/attack_self(mob/living/user as mob)
|
||||||
|
if(user.a_intent == I_HURT)
|
||||||
|
if(icon_state == "scrap")
|
||||||
|
user.show_message("<span class='warning'>\The [src] is already crumpled.</span>")
|
||||||
|
return
|
||||||
|
//crumple dat paper
|
||||||
|
info = stars(info,85)
|
||||||
|
user.visible_message("\The [user] crumples \the [src] into a ball!")
|
||||||
|
icon_state = "scrap"
|
||||||
|
return
|
||||||
user.examinate(src)
|
user.examinate(src)
|
||||||
if(rigged && (Holiday == "April Fool's Day"))
|
if(rigged && (Holiday == "April Fool's Day"))
|
||||||
if(spam_flag == 0)
|
if(spam_flag == 0)
|
||||||
@@ -442,6 +451,10 @@
|
|||||||
B.update_icon()
|
B.update_icon()
|
||||||
|
|
||||||
else if(istype(P, /obj/item/weapon/pen))
|
else if(istype(P, /obj/item/weapon/pen))
|
||||||
|
if(icon_state == "scrap")
|
||||||
|
usr << "<span class='warning'>\The [src] is too crumpled to write on.</span>"
|
||||||
|
return
|
||||||
|
|
||||||
var/obj/item/weapon/pen/robopen/RP = P
|
var/obj/item/weapon/pen/robopen/RP = P
|
||||||
if ( istype(RP) && RP.mode == 2 )
|
if ( istype(RP) && RP.mode == 2 )
|
||||||
RP.RenamePaper(user,src)
|
RP.RenamePaper(user,src)
|
||||||
|
|||||||
6
html/changelogs/TheWelp-dev.yml
Normal file
6
html/changelogs/TheWelp-dev.yml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
author: TheWelp
|
||||||
|
delete-after: True
|
||||||
|
changes:
|
||||||
|
- rscadd: "Bookcases are now movable/buildable/destroyable."
|
||||||
|
- rscadd: "Paper can now be crumpled by using in-hand while on hurt intent."
|
||||||
|
- rscadd: "Library Computer External Archive is now sortable."
|
||||||
Reference in New Issue
Block a user