cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes merge conflict

Browse Source
This commit is contained in:
Kyep
2018-06-06 16:32:31 -07:00
parent 7ca6981413 dd6b879546
commit 4d4eb16a3a
671 changed files with 8684 additions and 8646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/filingcabinet.dm
+2 -1
View File
@@ -30,7 +30,8 @@
icon_state = "tallcabinet"
/obj/structure/filingcabinet/initialize()
/obj/structure/filingcabinet/Initialize()
..()
for(var/obj/item/I in loc)
if(istype(I, /obj/item/paper) || istype(I, /obj/item/folder) || istype(I, /obj/item/photo))
I.loc = src
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -379,7 +379,7 @@
if(is_hot(P))
if((CLUMSY in user.mutations) && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
"<span class='userdanger'>You miss the paper and accidentally light yourself on fire!</span>")
user.unEquip(P)
user.adjust_fire_stacks(1)
code/modules/paperwork/paper_bundle.dm
+2 -2
View File
@@ -79,8 +79,8 @@
if(istype(P, /obj/item/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!", \
"[class]You hold \the [P] up to \the [src], burning it slowly.")
user.visible_message("[class][user] holds [P] up to [src], it looks like [user.p_theyre()] trying to burn it!", \
"[class]You hold [P] up to [src], burning it slowly.")
spawn(20)
if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit)
code/modules/paperwork/paperplane.dm
+2 -2
View File
@@ -33,7 +33,7 @@
/obj/item/paperplane/suicide_act(mob/living/user)
user.Stun(10)
user.visible_message("<span class='suicide'>[user] jams [name] in \his nose. It looks like \he's trying to commit suicide!</span>")
user.visible_message("<span class='suicide'>[user] jams [name] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!</span>")
user.EyeBlurry(6)
var/obj/item/organ/internal/eyes/E = user.get_int_organ(/obj/item/organ/internal/eyes)
if(E)
@@ -73,7 +73,7 @@
else if(is_hot(P))
if(user.disabilities & CLUMSY && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")
user.unEquip(P)
user.adjust_fire_stacks(1)
code/modules/paperwork/pen.dm
+1 -1
View File
@@ -25,7 +25,7 @@
pressure_resistance = 2
/obj/item/pen/suicide_act(mob/user)
to_chat(viewers(user), "<span class='suicide'>[user] starts scribbling numbers over \himself with the [src.name]! It looks like \he's trying to commit sudoku.</span>")
to_chat(viewers(user), "<span class='suicide'>[user] starts scribbling numbers over [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit sudoku.</span>")
return (BRUTELOSS)
/obj/item/pen/blue
code/modules/paperwork/photocopier.dm
+4 -4
View File
@@ -316,11 +316,11 @@
return
src.add_fingerprint(user)
if(target == user && !user.incapacitated())
visible_message("<span class='warning'>[usr] jumps onto the photocopier!</span>")
visible_message("<span class='warning'>[usr] jumps onto [src]!</span>")
else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
if(target.anchored) return
if(!ishuman(user)) return
visible_message("<span class='warning'>[usr] drags [target.name] onto the photocopier!</span>")
visible_message("<span class='warning'>[usr] drags [target.name] onto [src]!</span>")
target.forceMove(get_turf(src))
ass = target
if(copyitem)
@@ -344,9 +344,9 @@
/obj/machinery/photocopier/emag_act(user as mob)
if(!emagged)
emagged = 1
to_chat(user, "<span class='notice'>You overload the photocopier's laser printing mechanism.</span>")
to_chat(user, "<span class='notice'>You overload [src]'s laser printing mechanism.</span>")
else
to_chat(user, "<span class='notice'>The photocopier's laser printing mechanism is already overloaded!</span>")
to_chat(user, "<span class='notice'>[src]'s laser printing mechanism is already overloaded!</span>")
/obj/item/toner
name = "toner cartridge"
code/modules/paperwork/photography.dm
+2 -2
View File
@@ -56,8 +56,8 @@
if(istype(P, /obj/item/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!", \
"[class]You hold \the [P] up to \the [src], burning it slowly.")
user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like [user.p_theyre()] trying to burn it!", \
"[class]You hold [P] up to [src], burning it slowly.")
spawn(20)
if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit)
code/modules/paperwork/stamps.dm
+1 -1
View File
@@ -14,7 +14,7 @@
attack_verb = list("stamped")
/obj/item/stamp/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] stamps 'VOID' on \his forehead, then promptly falls over, dead.</span>")
user.visible_message("<span class='suicide'>[user] stamps 'VOID' on [user.p_their()] forehead, then promptly falls over, dead.</span>")
return (OXYLOSS)
/obj/item/stamp/qm