cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source 
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
This commit is contained in:
Mloc-Argent
2014-09-10 22:14:37 +01:00
parent 0167be6920 fcd2231d23
commit 712e209ab6
48 changed files with 5832 additions and 5753 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper.dm
+3 -3
View File
@@ -277,11 +277,11 @@
\[hr\] : Adds a horizontal rule.
</BODY></HTML>"}, "window=paper_help")
/obj/item/weapon/paper/proc/burnpaper(obj/item/weapon/lighter/P, mob/user)
/obj/item/weapon/paper/proc/burnpaper(obj/item/weapon/flame/P, mob/user)
var/class = "<span class='warning'>"
if(P.lit && !user.restrained())
if(istype(P, /obj/item/weapon/lighter/zippo))
if(istype(P, /obj/item/weapon/flame/lighter/zippo))
class = "<span class='rose'>"
user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \
@@ -445,7 +445,7 @@
user << "<span class='notice'>You stamp the paper with your rubber stamp.</span>"
else if(istype(P, /obj/item/weapon/lighter))
else if(istype(P, /obj/item/weapon/flame))
burnpaper(P, user)
add_fingerprint(user)
code/modules/paperwork/paper_bundle.dm
+3 -3
View File
@@ -44,7 +44,7 @@
user << "<span class='notice'>You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>"
user.drop_from_inventory(W)
W.loc = src
else if(istype(W, /obj/item/weapon/lighter))
else if(istype(W, /obj/item/weapon/flame/lighter))
burnpaper(W, user)
else if(istype(W, /obj/item/weapon/paper_bundle))
user.drop_from_inventory(W)
@@ -69,11 +69,11 @@
return
/obj/item/weapon/paper_bundle/proc/burnpaper(obj/item/weapon/lighter/P, mob/user)
/obj/item/weapon/paper_bundle/proc/burnpaper(obj/item/weapon/flame/lighter/P, mob/user)
var/class = "<span class='warning'>"
if(P.lit && !user.restrained())
if(istype(P, /obj/item/weapon/lighter/zippo))
if(istype(P, /obj/item/weapon/flame/lighter/zippo))
class = "<span class='rose'>"
user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \