cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflicts solving

Browse Source
This commit is contained in:
Menshin
2014-11-04 20:24:52 +01:00
parent 26f70fd9aa d88e1684ca
commit b77e2fc46a
587 changed files with 18446 additions and 13726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper.dm
+10 -4
View File
@@ -7,14 +7,14 @@
/obj/item/weapon/paper
name = "paper"
gender = PLURAL
gender = NEUTER
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper"
throwforce = 0
w_class = 1.0
throw_range = 1
throw_speed = 1
layer = 4
layer = 3
pressure_resistance = 1
slot_flags = SLOT_HEAD
body_parts_covered = HEAD
@@ -66,6 +66,8 @@
set category = "Object"
set src in usr
if(usr.stat || !usr.canmove || usr.restrained())
return
if((CLUMSY in usr.mutations) && prob(25))
usr << "<span class='warning'>You cut yourself on the paper! Ahhhh! Ahhhhh!</span>"
usr.damageoverlaytemp = 9001
@@ -272,8 +274,12 @@
clown = 1
if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links]<HR>[stamps]</BODY></HTML>", "window=[name]")
return
if(user.IsAdvancedToolUser())
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links]<HR>[stamps]</BODY></HTML>", "window=[name]")
return
else
user << "<span class='notice'>You don't know how to read or write.</span>"
return
else if(istype(P, /obj/item/weapon/stamp))
if(!in_range(src, usr) && loc != user && !istype(loc, /obj/item/weapon/clipboard) && loc.loc != user && user.get_active_hand() != P)
code/modules/paperwork/paperbin.dm
+1 -1
View File
@@ -14,7 +14,7 @@
/obj/item/weapon/paper_bin/MouseDrop(atom/over_object)
var/mob/M = usr
if(M.restrained() || M.stat)
if(M.restrained() || M.stat || !Adjacent(M))
return
if(over_object == M)
code/modules/paperwork/photocopier.dm
+2 -1
View File
@@ -123,8 +123,9 @@
var/icon/temp_img
if(ishuman(ass) && (ass.get_item_by_slot(slot_w_uniform) || ass.get_item_by_slot(slot_wear_suit)))
usr << "<span class='notice'>You feel kind of silly copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "their"] clothes on.</span>"
break
else if(toner >= 5 && !busy && check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on.
if(isalien(ass) || istype(ass,/mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro.
if(isalienadult(ass) || istype(ass,/mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro.
temp_img = icon("icons/ass/assalien.png")
else if(ishuman(ass)) //Suit checks are in check_ass
if(ass.gender == MALE)
code/modules/paperwork/photography.dm
+3 -3
View File
@@ -73,7 +73,7 @@
var/n_name = copytext(sanitize(input(usr, "What would you like to label the photo?", "Photo Labelling", null) as text), 1, MAX_NAME_LEN)
//loc.loc check is for making possible renaming photos in clipboards
if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == 0)
if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == 0 && usr.canmove && !usr.restrained())
name = "photo[(n_name ? text("- '[n_name]'") : null)]"
add_fingerprint(usr)
@@ -186,7 +186,7 @@
res.Blend(img, blendMode2iconMode(A.blend_mode), offX, offY)
if(istype(A, /obj/item/blueprints))
if(istype(A, /obj/item/areaeditor/blueprints))
blueprints = 1
for(var/turf/T in turfs)
@@ -426,4 +426,4 @@ obj/item/device/camera/siliconcam/robot_camera/proc/borgprint()
p.pixel_y = rand(-10, 10)
C.toner -= 20 //Cyborgs are very ineffeicient at printing an image
visible_message("[C.name] spits out a photograph from a narrow slot on it's chassis.")
usr << "You print a photograph."
usr << "You print a photograph."