cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 07:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Someone thought it would be a great idea to comment out the ability to wake up, you will once again sometimes wake up after medbay hits you with sleepytox.

Browse Source 
Ghosts no longer hear emotes from across the map.
You can once again examine yourself.
Buildmode is back in because it is a very useful and great tool.
It is also an ADMIN TOOL and will cause runtimes like most of the other admin tools if you use it like shit.
Removed more erp bullshit

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3417 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2012-04-09 07:09:07 +00:00
parent 454b4b4b6d
commit 4331dca438
15 changed files with 18 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+5 -6
View File
@@ -214,7 +214,7 @@
//verbs += /client/proc/cmd_admin_gib --Merged with view variables
//verbs += /proc/togglebuildmode --Merged with view variables
//verbs += /client/proc/cmd_modify_object_variables --Merged with view variables
//verbs += /client/proc/togglebuildmodeself --removed due to runtimes
verbs += /client/proc/togglebuildmodeself
else return
//Game Admin
@@ -411,7 +411,7 @@
//verbs -= /client/proc/cmd_admin_prison --Merged with player panel
//verbs -= /obj/admins/proc/unprison --Merged with player panel
//verbs -= /client/proc/cmd_switch_radio --removed because tcommsat is staying
//verbs -= /client/proc/togglebuildmodeself --removed due to runtimes
verbs -= /client/proc/togglebuildmodeself
verbs -= /client/proc/kill_airgroup
return
@@ -610,14 +610,13 @@
for (var/mob/V in hearers(O))
V.show_message(message, 2)
////I'm removing buildmode because it's shitty and runtimes a lot. -Pete
/*
/client/proc/togglebuildmodeself()
set name = "Toggle Build Mode Self"
set category = "Special Verbs"
if(src.mob)
togglebuildmode(src.mob)
*/
/client/proc/toggleadminhelpsound()
set name = "Toggle Adminhelp Sound"
@@ -764,7 +763,7 @@
//verbs += /client/proc/cmd_modify_object_variables --merged with view vairiables
verbs += /client/proc/Jump
verbs += /client/proc/jumptoturf
// verbs += /client/proc/togglebuildmodeself
verbs += /client/proc/togglebuildmodeself
verbs += /client/proc/dsay
verbs += /client/proc/admin_play
code/modules/admin/new/admin_verbs.dm
+4 -5
View File
@@ -413,7 +413,7 @@
//verbs -= /client/proc/cmd_admin_prison --Merged with player panel
//verbs -= /obj/admins/proc/unprison --Merged with player panel
//verbs -= /client/proc/cmd_switch_radio --removed because tcommsat is staying
//verbs -= /client/proc/togglebuildmodeself --removed due to runtimes
verbs -= /client/proc/togglebuildmodeself
return
@@ -611,14 +611,13 @@
for (var/mob/V in hearers(O))
V.show_message(message, 2)
////I'm removing buildmode because it's shitty and runtimes a lot. -Pete
/*
/client/proc/togglebuildmodeself()
set name = "Toggle Build Mode Self"
set category = "Special Verbs"
if(src.mob)
togglebuildmode(src.mob)
*/
/client/proc/toggleadminhelpsound()
set name = "Toggle Adminhelp Sound"
@@ -765,7 +764,7 @@
//verbs += /client/proc/cmd_modify_object_variables --merged with view vairiables
verbs += /client/proc/Jump
verbs += /client/proc/jumptoturf
// verbs += /client/proc/togglebuildmodeself
verbs += /client/proc/togglebuildmodeself
verbs += /client/proc/dsay
verbs += /client/proc/admin_play
code/modules/mob/living/carbon/human/emote.dm
+2 -1
View File
@@ -467,6 +467,7 @@
if (message)
log_emote("[name]/[key] : [message]")
/* Hearing gasp and such every five seconds is not good emotes were not global for a reason.
for(var/mob/M in world)
if (!M.client)
continue //skip monkeys and leavers
@@ -474,7 +475,7 @@
continue
if(M.stat == 2 && M.client.ghost_ears && !(M in viewers(src,null)))
M.show_message(message)
*/
if (m_type & 1)
for (var/mob/O in viewers(src, null))
code/modules/mob/living/carbon/human/examine.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/mob/living/carbon/human/examine()
set src in oview()
set src in view()
if(!usr || !src) return
if(((usr.sdisabilities & 1) || usr.blinded || usr.stat) && !(istype(usr,/mob/dead/observer/)))
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -719,7 +719,7 @@
if(paralysis <= 0)
Paralyse(2)
if (prob(10) && health && !hal_crit) spawn(0) emote("snore")
//sleeping--
sleeping--
if(resting)
if(weakened <= 0)
code/modules/mob/living/carbon/human/poop.dm
-1
View File
@@ -1 +0,0 @@
//APRIL FOOLS!! :3
code/modules/mob/mob.dm
+1 -25
View File
@@ -1145,28 +1145,4 @@ note dizziness decrements automatically in the mob's Life() proc.
for(var/file in args)
src << browse_rsc(file)
return 1
return 0
/mob/living/verb/Examine_OOC()
set name = "Examine Meta-Info (OOC)"
set category = "OOC"
set src in view()
if(config.allow_Metadata)
usr << "[src]'s Metainfo:"
if(src.storedpreferences)
usr << "[src]'s OOC Notes: [src.storedpreferences.ERP_Notes]"
else
usr << "[src] does not have any stored infomation!"
else
usr << "OOC Metadata is not supported by this server!"
return
return 0
code/modules/mob/mob_defines.dm
-3
View File
@@ -271,7 +271,4 @@ the mob is also allowed to move without any sort of restriction. For instance, i
var/digitalcamo = 0 // Can they be tracked by the AI?
// Note: Some mob ERP defines are located in mob_ERP.dm
var/datum/preferences/storedpreferences = null
code/modules/mob/new_player/preferences.dm
-24
View File
@@ -114,11 +114,6 @@ datum/preferences
job_engsec_low = 0
// Naughty.
ERP_Notes = ""
New()
hair_style = new/datum/sprite_accessory/hair/short
facial_hair_style = new/datum/sprite_accessory/facial_hair/shaved
@@ -145,11 +140,6 @@ datum/preferences
dat += "<b>Play admin midis:</b> <a href=\"byond://?src=\ref[user];preferences=1;midis=input\"><b>[midis == 1 ? "Yes" : "No"]</b></a><br>"
dat += "<b>Ghost ears:</b> <a href=\"byond://?src=\ref[user];preferences=1;ghost_ears=input\"><b>[ghost_ears == 0 ? "Nearest Creatures" : "All Speech"]</b></a><br>"
if(config.allow_Metadata)
dat += "<b>OOC Notes/ERP Preferences:</b> <a href='byond://?src=\ref[user];preferences=1;OOC=input'> Edit </a><br>"
if((user.client) && (user.client.holder) && (user.client.holder.rank) && (user.client.holder.level >= 5))
dat += "<hr><b>OOC</b><br>"
dat += "<a href='byond://?src=\ref[user];preferences=1;ooccolor=input'>Change colour</a> <font face=\"fixedsys\" size=\"3\" color=\"[ooccolor]\"><table style='display:inline;' bgcolor=\"[ooccolor]\"><tr><td>__</td></tr></table></font>"
@@ -430,20 +420,6 @@ datum/preferences
age = rand (20, 45)
if(link_tags["OOC"])
var/tempnote = ""
tempnote = input(user, "Please enter your OOC/ERP Notes!:", "Erp notes" , ERP_Notes) as text
var/list/bad_characters = list("_", "\"", "<", ">", ";", "\[", "\]", "{", "}", "|", "\\","0","1","2","3","4","5","6","7","8","9")
for(var/c in bad_characters)
tempnote = dd_replacetext(tempnote, c, "")
if(length(tempnote) >= 255)
alert("That name is too long. (255 character max, please)")
return
ERP_Notes = tempnote
return
if(link_tags["b_type"])
switch(link_tags["b_type"])
if("input")
code/modules/mob/new_player/savefile.dm
-7
View File
@@ -60,8 +60,6 @@ datum/preferences/proc/savefile_save(mob/user)
F["ooccolor"] << src.ooccolor
F["lastchangelog"] << src.lastchangelog
F["ERP_Notes"] << src.ERP_Notes
return 1
// loads the savefile corresponding to the mob's ckey
@@ -127,11 +125,6 @@ datum/preferences/proc/savefile_load(mob/user)
F["job_engsec_med"] >> src.job_engsec_med
F["job_engsec_low"] >> src.job_engsec_low
F["ERP_Notes"] >> src.ERP_Notes
if(isnull(ERP_Notes))
ERP_Notes = ""
//NOTE: Conversion things go inside this if statement
//When updating the save file remember to add 1 to BOTH the savefile constants
//Also take the old conversion things that no longer apply out of this if