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

Merge pull request #7271 from Segrain/dev-freeze

Browse Source 
Dev-freeze fixes.
This commit is contained in:
Ccomp5950
2014-12-08 20:40:02 -05:00
parent 17476b5e3d 7f1b5f0603
commit 4d615fc294
5 changed files with 26 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/contraband.dm
+3 -2
View File
@@ -35,14 +35,15 @@ obj/structure/sign/poster
var/ruined = 0
obj/structure/sign/poster/New(var/serial)
serial_number = serial
var/designtype
if (poster_type)
designtype = text2path(poster_type)
else
if(serial_number == loc)
serial_number = rand(1, poster_designs.len) //This is for the mappers that want individual posters without having to use rolled posters.
serial_number = rand(1, poster_designs.len) //This is for the mappers that want individual posters without having to use rolled posters.
designtype = poster_designs[serial_number]
var/datum/poster/design=new designtype()
name += " - [design.name]"
desc += " [design.desc]"
code/game/objects/items/devices/PDA/PDA.dm
+2 -2
View File
@@ -1048,10 +1048,10 @@ var/global/list/obj/item/device/pda/PDAs = list()
// Do nothing
/obj/item/device/pda/proc/new_message_from_pda(var/obj/item/device/pda/sending_device, var/message)
new_message(sending_device.name, sending_device.owner, sending_device.ownjob, message)
new_message(sending_device, sending_device.owner, sending_device.ownjob, message)
/obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message)
var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[src]'>Reply</a>)"
var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[sending_unit]'>Reply</a>)"
new_info(news_silent, newstone, reception_message)
log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]")