mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
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.
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:
@@ -1,5 +1,3 @@
|
||||
//BUILD MODE SUCKS -Pete
|
||||
|
||||
/proc/togglebuildmode(mob/M as mob in world)
|
||||
set name = "Toggle Build Mode"
|
||||
set category = "Special Verbs"
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
var/traitor_scaling = 0 //if amount of traitors scales based on amount of players
|
||||
var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other
|
||||
var/Tensioner_Active = 0 // If the tensioner is running.
|
||||
var/allow_Metadata = 0 // Metadata is suported.
|
||||
|
||||
var/list/mode_names = list()
|
||||
var/list/modes = list() // allowed modes
|
||||
@@ -231,9 +230,6 @@
|
||||
if ("feature_object_spell_system")
|
||||
config.feature_object_spell_system = 1
|
||||
|
||||
if ("allow_metadata")
|
||||
config.allow_Metadata = 1
|
||||
|
||||
if ("traitor_scaling")
|
||||
config.traitor_scaling = 1
|
||||
|
||||
|
||||
@@ -482,8 +482,7 @@ client
|
||||
if(!src.holder)
|
||||
return
|
||||
src.cmd_admin_gib(MOB)
|
||||
////I'm removing buildmode because it's shitty and runtimes a lot. -Pete
|
||||
/*
|
||||
|
||||
else if (href_list["build_mode"])
|
||||
if(!href_list["build_mode"])
|
||||
return
|
||||
@@ -496,7 +495,7 @@ client
|
||||
return
|
||||
togglebuildmode(MOB)
|
||||
href_list["datumrefresh"] = href_list["build_mode"]
|
||||
*/
|
||||
|
||||
else if (href_list["delall"])
|
||||
if(!href_list["delall"])
|
||||
return
|
||||
|
||||
@@ -358,12 +358,10 @@
|
||||
/atom/Click(location,control,params)
|
||||
//world << "atom.Click() on [src] by [usr] : src.type is [src.type]"
|
||||
|
||||
////I'm removing buildmode because it's shitty and runtimes a lot. -Pete
|
||||
/*
|
||||
if(usr.client.buildmode)
|
||||
build_click(usr, usr.client.buildmode, location, control, params, src)
|
||||
return
|
||||
*/
|
||||
|
||||
if(using_new_click_proc) //TODO ERRORAGE (see message below)
|
||||
return DblClickNew()
|
||||
return DblClick(location, control, params)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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/)))
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
//APRIL FOOLS!! :3
|
||||
@@ -1146,27 +1146,3 @@ note dizziness decrements automatically in the mob's Life() proc.
|
||||
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
|
||||
@@ -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
|
||||
@@ -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")
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -178,7 +178,6 @@
|
||||
#define FILE_DIR "icons/vending_icons"
|
||||
#define FILE_DIR "interface"
|
||||
#define FILE_DIR "maps"
|
||||
#define FILE_DIR "maps/backup"
|
||||
#define FILE_DIR "sound"
|
||||
#define FILE_DIR "sound/AI"
|
||||
#define FILE_DIR "sound/ambience"
|
||||
@@ -1055,6 +1054,7 @@
|
||||
#include "code\modules\scripting\Scanner\Tokens.dm"
|
||||
#include "code\modules\security levels\keycard authentication.dm"
|
||||
#include "code\modules\security levels\security levels.dm"
|
||||
#include "code\WorkInProgress\buildmode.dm"
|
||||
#include "code\WorkInProgress\explosion_particles.dm"
|
||||
#include "code\WorkInProgress\BS12\uplink_kits.dm"
|
||||
#include "code\WorkInProgress\BS12\uplinks.dm"
|
||||
|
||||
Reference in New Issue
Block a user