cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
This commit is contained in:
Repede
2020-02-22 12:38:04 -05:00
parent 7fc70caa43 5ab3654a44
commit 4cf7f71be6
905 changed files with 89234 additions and 7194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/paperwork/paper.dm
View File

@@ -138,7 +138,7 @@
if(in_range(user, src) || istype(user, /mob/observer/dead))
show_content(usr)
else
user << "<span class='notice'>You have to go closer if you want to read it.</span>"
to_chat(user, "<span class='notice'>You have to go closer if you want to read it.</span>")
return
/obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow=0)
@@ -155,7 +155,7 @@
set src in usr
if((CLUMSY in usr.mutations) && prob(50))
usr << "<span class='warning'>You cut yourself on the paper.</span>"
to_chat(usr, "<span class='warning'>You cut yourself on the paper.</span>")
return
var/n_name = sanitizeSafe(input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text, MAX_NAME_LEN)
@@ -398,7 +398,7 @@
qdel(src)
else
user << "<font color='red'>You must hold \the [P] steady to burn \the [src].</font>"
to_chat(user, "<font color='red'>You must hold \the [P] steady to burn \the [src].</font>")
/obj/item/weapon/paper/Topic(href, href_list)
@@ -411,7 +411,7 @@
//var/t = strip_html_simple(input(usr, "What text do you wish to add to " + (id=="end" ? "the end of the paper" : "field "+id) + "?", "[name]", null),8192) as message
if(free_space <= 0)
usr << "<span class='info'>There isn't enough space left on \the [src] to write anything.</span>"
to_chat(usr, "<span class='info'>There isn't enough space left on \the [src] to write anything.</span>")
return
var/t = sanitize(input("Enter what you want to write:", "Write", null, null) as message, MAX_PAPER_MESSAGE_LEN, extra = 0)
@@ -450,7 +450,7 @@
// check for exploits
for(var/bad in paper_blacklist)
if(findtext(t,bad))
usr << "<font color='blue'>You think to yourself, \"Hm.. this is only paper...\</font>""
to_chat(usr, "<font color='blue'>You think to yourself, \"Hm.. this is only paper...\</font>"")
log_admin("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].")
message_admins("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].")
return
@@ -464,7 +464,7 @@
if(fields > 50)//large amount of fields creates a heavy load on the server, see updateinfolinks() and addtofield()
usr << "<span class='warning'>Too many fields. Sorry, you can't do this.</span>"
to_chat(usr, "<span class='warning'>Too many fields. Sorry, you can't do this.</span>")
fields = last_fields_value
return
@@ -500,7 +500,7 @@
if (istype(P, /obj/item/weapon/paper/carbon))
var/obj/item/weapon/paper/carbon/C = P
if (!C.iscopy && !C.copied)
user << "<span class='notice'>Take off the carbon copy first.</span>"
to_chat(user, "<span class='notice'>Take off the carbon copy first.</span>")
add_fingerprint(user)
return
var/obj/item/weapon/paper_bundle/B = new(src.loc)
@@ -536,7 +536,7 @@
src.loc = get_turf(h_user)
if(h_user.client) h_user.client.screen -= src
h_user.put_in_hands(B)
user << "<span class='notice'>You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].</span>"
to_chat(user, "<span class='notice'>You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].</span>")
src.loc = B
P.loc = B
@@ -546,7 +546,7 @@
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>"
to_chat(usr, "<span class='warning'>\The [src] is too crumpled to write on.</span>")
return
var/obj/item/weapon/pen/robopen/RP = P
@@ -577,7 +577,7 @@
if(istype(P, /obj/item/weapon/stamp/clown))
if(!clown)
user << "<span class='notice'>You are totally unable to use the stamp. HONK!</span>"
to_chat(user, "<span class='notice'>You are totally unable to use the stamp. HONK!</span>")
return
if(!ico)
@@ -590,7 +590,7 @@
stamped += P.type
overlays += stampoverlay
user << "<span class='notice'>You stamp the paper with your rubber stamp.</span>"
to_chat(user, "<span class='notice'>You stamp the paper with your rubber stamp.</span>")
else if(istype(P, /obj/item/weapon/flame))
burnpaper(P, user)