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

Merge branch 'master' of https://github.com/tgstation/-tg-station into notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed

Browse Source 
Conflicts:
	_maps/map_files/DiscStation/DiscStation.dmm
This commit is contained in:
Jordie0608
2015-10-23 01:01:02 +11:00
parent 1dee35a5f9 c7670dc627
commit 0d67f24e33
35 changed files with 1411 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/randomverbs.dm
+2 -2
View File
@@ -97,7 +97,7 @@
var/msg = input("Message:", text("Enter the text you wish to appear to everyone within view:")) as text
if (!msg)
return
for(var/mob/living/M in view(range,A))
for(var/mob/M in view(range,A))
M << msg
log_admin("LocalNarrate: [key_name(usr)] at ([get_area(A)]): [msg]")
@@ -909,4 +909,4 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits
<input type="submit" value="Save">
</form></body></html>
"}
usr << browse(dat, "window=dressup;size=550x600")
usr << browse(dat, "window=dressup;size=550x600")