Player poll"
+ output +="
"
+ output += "
Question: [pollquestion]"
+ output += "
Poll runs from [pollstarttime] until [pollendtime]"
+
+ var/voted = 0
+ while(voted_query.NextRow())
+ voted = 1
+
+ var/optiontext = voted_query.item[1]
+ var/rating = voted_query.item[2]
+
+ output += "
[optiontext] - [rating]"
+
+ if(!voted) //Only make this a form if we have not voted yet
+ output += "
"
+
+ src << browse(output,"window=playerpoll;size=500x500")
return
/mob/new_player/proc/vote_on_poll(var/pollid = -1, var/optionid = -1)
@@ -364,4 +435,74 @@
insert_query.Execute()
usr << "\blue Feedback logging successful."
+ usr << browse(null,"window=playerpoll")
+
+
+/mob/new_player/proc/vote_on_numval_poll(var/pollid = -1, var/optionid = -1, var/rating = null)
+ if(pollid == -1 || optionid == -1)
+ return
+
+ if(!isnum(pollid) || !isnum(optionid))
+ return
+
+ var/user = sqlfdbklogin
+ var/pass = sqlfdbkpass
+ var/db = sqlfdbkdb
+ var/address = sqladdress
+ var/port = sqlport
+
+ var/DBConnection/dbcon = new()
+ dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
+ if(dbcon.IsConnected())
+
+ var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM erro_poll_question WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
+ select_query.Execute()
+
+ var/validpoll = 0
+
+ while(select_query.NextRow())
+ if(select_query.item[4] != "NUMVAL")
+ return
+ validpoll = 1
+ break
+
+ if(!validpoll)
+ usr << "\red Poll is not valid."
+ return
+
+ var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM erro_poll_option WHERE id = [optionid] AND pollid = [pollid]")
+ select_query2.Execute()
+
+ var/validoption = 0
+
+ while(select_query2.NextRow())
+ validoption = 1
+ break
+
+ if(!validoption)
+ usr << "\red Poll option is not valid."
+ return
+
+ var/alreadyvoted = 0
+
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM erro_poll_vote WHERE optionid = [optionid] AND ckey = '[usr.ckey]'")
+ voted_query.Execute()
+
+ while(voted_query.NextRow())
+ alreadyvoted = 1
+ break
+
+ if(alreadyvoted)
+ usr << "\red You already voted in this poll."
+ return
+
+ var/adminrank = "Player"
+ if(usr && usr.client && usr.client.holder)
+ adminrank = usr.client.holder.rank
+
+
+ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])")
+ insert_query.Execute()
+
+ usr << "\blue Vote successful."
usr << browse(null,"window=playerpoll")
\ No newline at end of file
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 44cce58062..20df82c211 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -17,9 +17,9 @@
update_icon()
/obj/item/weapon/clipboard/MouseDrop(obj/over_object as obj) //Quick clipboard fix. -Agouri
- if(ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
+ if(ishuman(usr))
var/mob/M = usr
- if (!(istype(over_object, /obj/screen) ))
+ if(!(istype(over_object, /obj/screen) ))
return ..()
if(!M.restrained() && !M.stat)
@@ -31,7 +31,7 @@
M.u_equip(src)
M.put_in_l_hand(src)
- src.add_fingerprint(usr)
+ add_fingerprint(usr)
return
/obj/item/weapon/clipboard/update_icon()
@@ -58,7 +58,7 @@
/obj/item/weapon/clipboard/attack_self(mob/user as mob)
var/dat = "
Clipboard"
- if (haspen)
+ if(haspen)
dat += "
Remove Pen
"
else
dat += "
Add Pen
"
@@ -79,10 +79,10 @@
/obj/item/weapon/clipboard/Topic(href, href_list)
..()
- if ((usr.stat || usr.restrained()))
+ if((usr.stat || usr.restrained()))
return
- if (usr.contents.Find(src))
+ if(usr.contents.Find(src))
if(href_list["pen"])
if(haspen)
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index 4c96a4c003..247616958e 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -2,22 +2,16 @@
name = "filing cabinet"
desc = "A large cabinet with drawers."
icon = 'icons/obj/bureaucracy.dmi'
- icon_state = "filing_cabinet0"
- var/icon_closed = "filing_cabinet0"
- var/icon_open = "filing_cabinet1"
+ icon_state = "filingcabinet"
density = 1
anchored = 1
/obj/structure/filingcabinet/chestdrawer
name = "chest drawer"
icon_state = "chestdrawer"
- icon_closed = "chestdrawer"
- icon_open = "chestdrawer-open"
-/obj/structure/filingcabinet/filingcabinet
- icon_state = "filingcabinet"
- icon_closed = "filingcabinet"
- icon_open = "filingcabinet-open"
+/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unecessary map issues, but please don't name stuff like this in future -Pete
+ icon_state = "tallcabinet"
/obj/structure/filingcabinet/initialize()
for(var/obj/item/I in loc)
@@ -29,9 +23,9 @@
user << "
You put [P] in [src]."
user.drop_item()
P.loc = src
- icon_state = icon_open
+ icon_state = "[initial(icon_state)]-open"
sleep(5)
- icon_state = icon_closed
+ icon_state = initial(icon_state)
updateUsrDialog()
else if(istype(P, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -65,8 +59,7 @@
if(P && in_range(src, usr))
usr.put_in_hands(P)
updateUsrDialog()
- icon_state = icon_open
+ icon_state = "[initial(icon_state)]-open"
sleep(5)
- icon_state = icon_closed
-
+ icon_state = initial(icon_state)
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 76dc4777d6..abb23f3d55 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -36,7 +36,7 @@
update_icon()
else if(istype(W, /obj/item/weapon/pen))
var/n_name = copytext(sanitize(input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text),1,MAX_NAME_LEN)
- if ((loc == usr && usr.stat == 0))
+ if((loc == usr && usr.stat == 0))
name = "folder[(n_name ? text("- '[n_name]'") : null)]"
return
@@ -54,10 +54,10 @@
/obj/item/weapon/folder/Topic(href, href_list)
..()
- if ((usr.stat || usr.restrained()))
+ if((usr.stat || usr.restrained()))
return
- if (usr.contents.Find(src))
+ if(usr.contents.Find(src))
if(href_list["remove"])
var/obj/item/P = locate(href_list["remove"])
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index 1bc908e345..8ae7517cb6 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -10,7 +10,7 @@
/obj/item/weapon/hand_labeler/afterattack(atom/A, mob/user as mob)
if(!mode) //if it's off, give up.
return
- if(A==loc) // if placing the labeller into something (e.g. backpack)
+ if(A == loc) // if placing the labeller into something (e.g. backpack)
return // don't set a label
if(!labels_left)
@@ -29,22 +29,21 @@
user << "
You can't label cyborgs."
return
- for(var/mob/M in viewers())
- if ((M.client && !( M.blinded )))
- M << "\blue [user] labels [A] as [label]."
+ user.visible_message("
[user] labels [A] as [label].", \
+ "
You label [A] as [label].")
A.name = "[A.name] ([label])"
-/obj/item/weapon/hand_labeler/attack_self()
+/obj/item/weapon/hand_labeler/attack_self(mob/user as mob)
mode = !mode
icon_state = "labeler[mode]"
if(mode)
- usr << "
You turn on \the [src]."
+ user << "
You turn on \the [src]."
//Now let them chose the text.
- var/str = copytext(reject_bad_text(input(usr,"Label text?","Set label","")),1,MAX_NAME_LEN)
+ var/str = copytext(reject_bad_text(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
- usr << "
Invalid text."
+ user << "
Invalid text."
return
label = str
- usr << "
You set the text to '[str]'."
+ user << "
You set the text to '[str]'."
else
- usr << "
You turn off \the [src]."
\ No newline at end of file
+ user << "
You turn off \the [src]."
\ No newline at end of file
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 0956239e14..16fa20c5de 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -5,18 +5,18 @@
icon_state = "paper"
throwforce = 0
w_class = 1.0
- throw_speed = 3
- throw_range = 15
+ throw_range = 1
+ throw_speed = 1
layer = 4
pressure_resistance = 1
slot_flags = SLOT_HEAD
body_parts_covered = HEAD
attack_verb = list("")
- var/info //What's actually written on the paper.
- var/info_links //A different version of the paper which includes html links at fields and EOF
- var/stamps //The (text for the) stamps on the paper.
- var/fields //Amount of user created fields
+ var/info //What's actually written on the paper.
+ var/info_links //A different version of the paper which includes html links at fields and EOF
+ var/stamps //The (text for the) stamps on the paper.
+ var/fields //Amount of user created fields
var/list/stamped
var/rigged = 0
var/spam_flag = 0
@@ -29,25 +29,25 @@
/obj/item/weapon/paper/New()
..()
- src.pixel_y = rand(-8, 8)
- src.pixel_x = rand(-9, 9)
+ pixel_y = rand(-8, 8)
+ pixel_x = rand(-9, 9)
spawn(2)
- if(src.info)
- src.overlays += "paper_words"
+ update_icon()
updateinfolinks()
return
/obj/item/weapon/paper/update_icon()
- if(src.info)
- src.overlays += "paper_words"
- return
+ if(info)
+ icon_state = "paper_words"
+ return
+ icon_state = "paper"
/obj/item/weapon/paper/examine()
set src in oview(1)
// ..() //We don't want them to see the dumb "this is a paper" thing every time.
- // I didn't like the idea that people can read tiny pieces of paper from across the room.
- // Now you need to be next to the paper in order to read it.
+// I didn't like the idea that people can read tiny pieces of paper from across the room.
+// Now you need to be next to the paper in order to read it.
if(in_range(usr, src))
if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/dead/observer) || istype(usr, /mob/living/silicon)))
usr << browse("
[name][stars(info)][stamps]", "window=[name]")
@@ -64,12 +64,12 @@
set category = "Object"
set src in usr
- if ((CLUMSY in usr.mutations) && prob(50))
+ if((CLUMSY in usr.mutations) && prob(50))
usr << "
You cut yourself on the paper."
return
var/n_name = input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text
n_name = copytext(n_name, 1, 32)
- if ((loc == usr && usr.stat == 0))
+ if((loc == usr && usr.stat == 0))
name = "paper[(n_name ? text("- '[n_name]'") : null)]"
add_fingerprint(usr)
return
@@ -79,18 +79,18 @@
if(rigged && (Holiday == "April Fool's Day"))
if(spam_flag == 0)
spam_flag = 1
- playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
+ playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
spawn(20)
spam_flag = 0
return
/obj/item/weapon/paper/attack_ai(var/mob/living/silicon/ai/user as mob)
var/dist
- if (istype(user) && user.current) //is AI
+ if(istype(user) && user.current) //is AI
dist = get_dist(src, user.current)
else //cyborg or AI not seeing through a camera
dist = get_dist(src, user)
- if (dist < 2)
+ if(dist < 2)
usr << browse("
[name][info][stamps]", "window=[name]")
onclose(usr, "[name]")
else
@@ -142,12 +142,15 @@
addtofield(i, "
write", 1)
info_links = info_links + "
write"
+
/obj/item/weapon/paper/proc/clearpaper()
info = null
stamps = null
stamped = list()
overlays = null
updateinfolinks()
+ update_icon()
+
/obj/item/weapon/paper/proc/parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob, var/iscrayon = 0)
// t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
@@ -187,7 +190,7 @@
// t = dd_replacetext(t, "#", "") // Junk converted to nothing!
- //Count the fields
+//Count the fields
var/laststart = 1
while(1)
var/i = findtext(t, "
", laststart)
@@ -220,9 +223,10 @@
\[hr\] : Adds a horizontal rule.