cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 14:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/VOREStation/master'

Browse Source
This commit is contained in:
Poojawa
2016-05-30 09:34:02 -05:00
parent 9db78484d0 6283dcdc86
commit ffda6862b1
11 changed files with 2316 additions and 2302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/secrets/random_events/gravity.dm
+4 -4
View File
@@ -23,9 +23,9 @@
feedback_add_details("admin_secrets_fun_used","Grav")
if(gravity_is_on)
log_admin("[key_name(user)] toggled gravity on.", 1)
message_admins("<span class='notice'>[key_name_admin(user)] toggled gravity on.", 1)
command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.</span>")
message_admins("<span class='notice'>[key_name_admin(user)] toggled gravity on.</span>", 1)
command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.")
else
log_admin("[key_name(user)] toggled gravity off.", 1)
message_admins("<span class='notice'>[key_name_admin(usr)] toggled gravity off.", 1)
command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.</span>")
message_admins("<span class='notice'>[key_name_admin(usr)] toggled gravity off.</span>", 1)
command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.")
code/modules/mob/living/carbon/human/examine.dm
+5
View File
@@ -369,6 +369,11 @@
if(print_flavor_text()) msg += "[print_flavor_text()]\n"
// VOREStation Start
if(config.allow_Metadata && client)
msg += "<span class = 'deptradio'>OOC Notes:</span> <a href='?src=\ref[src];ooc_notes=1'>\[View\]</a>\n"
// VOREStation End
msg += "*---------*</span>"
if (pose)
if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
code/modules/mob/living/carbon/human/human.dm
+5
View File
@@ -359,6 +359,11 @@
if(href_list["item"])
handle_strip(href_list["item"],usr)
// VOREStation Start
if(href_list["ooc_notes"])
src.Examine_OOC()
// VOREStation End
if (href_list["criminal"])
if(hasHUD(usr,"security"))
code/modules/vore/eating/belly_vr.dm
+2 -2
View File
@@ -372,6 +372,6 @@
M.show_message(struggle_outer_message, 2) // hearable
R << struggle_user_message
var/strsound = pick(struggle_sounds)
var/strpick = pick(struggle_sounds)
var/strsound = struggle_sounds[strpick]
playsound(R.loc, strsound, 50, 1)
R << strsound //Might be too loud. We'll see.