Rewrote blackholes (gravitational anomalies) and wormholes to try and optimise them a little. If you have any concerns about how I've done so just give me a shout and I'll either rework them or revert my changes back. Wormholes especially seem a bit faster on my laptop. Smoke has temporarily been removed from the blackhole event until I get time to investigate why the hell effect_systems are using so much memory ( spark effects were using 40% of my processor a second ago D: ). To compensate this I made them a new sprite.

Commented out the authentication system. It was the remnants of the old goon authentication stuff (or maybe even older) and wasn't actually used in our code at all (at least not in any useful way, it was merely called and short-circuited to 1, so all those if(authenticated) were totally pointless. This has removed 3 unused variables from every client, a bunch of unused variables from the config and two empty text files!

Committed (as a config option) a feature requested by Apoc station. It causes a 'reply to' window to popup when an admin PMs a non-admin player. It's meant to grab their attention so they can't say "I didn't see your PM". It defaults to off. To turn it on just uncomment the #POPUP_ADMIN_PM line in config/config.txt

Fixed a derp in isday where it was fetching the month instead of the day.

Removed medal references from Gib()

Removed the medal_hub global variables because they aren't used in any way shape or form.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3444 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-04-12 21:54:51 +00:00
parent bf52ba01d4
commit 04f0a79866
52 changed files with 315 additions and 319 deletions
+1 -1
View File
@@ -202,7 +202,7 @@
set desc = "Ghost into blobthing."
set hidden = 1
if(!authenticated || !holder)
if(!holder)
src << "Only administrators may use this command."
return
var/input = input(src, "Please specify which key will be turned into a bloby.", "Key", "")
@@ -90,7 +90,7 @@
flick("flash", flash)
if (stat == 2 && client)
gib(1)
gib()
return
else if (stat == 2 && !client)
@@ -105,7 +105,7 @@
switch (severity)
if (1.0)
b_loss += 500
gib(1)
gib()
return
if (2.0)
@@ -78,7 +78,7 @@
flick("flash", flash)
if (stat == 2 && client)
gib(1)
gib()
return
else if (stat == 2 && !client)
@@ -91,7 +91,7 @@
switch (severity)
if (1.0)
b_loss += 500
gib(1)
gib()
return
if (2.0)
+2 -2
View File
@@ -35,7 +35,7 @@
if(prob(src.getBruteLoss() - 50))
src.gib()
/mob/living/carbon/gib(give_medal)
/mob/living/carbon/gib()
for(var/mob/M in src)
if(M in src.stomach_contents)
src.stomach_contents.Remove(M)
@@ -43,7 +43,7 @@
for(var/mob/N in viewers(src, null))
if(N.client)
N.show_message(text("\red <B>[M] bursts out of [src]!</B>"), 2)
. = ..(give_medal)
. = ..()
/mob/living/carbon/attack_hand(mob/M as mob)
if(!istype(M, /mob/living/carbon)) return
@@ -247,7 +247,7 @@
// /obj/item/clothing/head/bomb_hood(src)
if (stat == 2 && client)
gib(1)
gib()
return
else if (stat == 2 && !client)
@@ -262,7 +262,7 @@
if (1.0)
b_loss += 500
if (!prob(getarmor(null, "bomb")))
gib(1)
gib()
return
else
var/atom/target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src)))
@@ -540,7 +540,7 @@
/mob/living/carbon/monkey/ex_act(severity)
flick("flash", flash)
if (stat == 2 && client)
gib(1)
gib()
return
if (stat == 2 && !client)
@@ -573,7 +573,7 @@
if (prob(50))
Paralyse(10)
if (stat == DEAD && client)
gib(1)
gib()
return
if (stat == DEAD && !client)
gibs(loc, viruses)
@@ -304,7 +304,7 @@
src << "\red <B>Killswitch Activated"
killswitch = 0
spawn(5)
gib(src)
gib()
process_locks()
if(weapon_lock)
@@ -236,7 +236,7 @@
flick("flash", flash)
if (stat == 2 && client)
gib(1)
gib()
return
else if (stat == 2 && !client)
@@ -248,7 +248,7 @@
if (stat != 2)
adjustBruteLoss(100)
adjustFireLoss(100)
gib(1)
gib()
return
if(2.0)
if (stat != 2)
@@ -291,7 +291,6 @@
if(prob(20))
usr << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
now_pushing = 0
//unlock_medal("That's No Moon, That's A Gourmand!", 1)
return
if(tmob.nopush)
now_pushing = 0
@@ -1056,7 +1055,7 @@ Frequency:
return
/mob/living/silicon/robot/proc/self_destruct()
gib(1)
gib()
return
/mob/living/silicon/robot/proc/UnlinkSelf()
+3 -3
View File
@@ -710,14 +710,14 @@
if (join_motd)
src << "<div class=\"motd\">[join_motd]</div>"
authorize()
// authorize() //old gooncode
if(admins.Find(ckey))
holder = new /obj/admins(src)
holder.rank = admins[ckey]
update_admins(admins[ckey])
if(ticker && ticker.mode && ticker.mode.name =="sandbox" && authenticated)
if(ticker && ticker.mode && ticker.mode.name =="sandbox")
mob.CanBuild()
/client/Del()
@@ -746,7 +746,7 @@
for(var/mob/M in viewers())
M.see(message)
//This is the proc for gibbing a mob. Cannot gib ghosts. Removed the medal reference,
//This is the proc for gibbing a mob. Cannot gib ghosts.
//added different sort of gibs and animations. N
/mob/proc/gib()
-10
View File
@@ -178,10 +178,6 @@
return 1
if(href_list["ready"])
if (!client.authenticated)
src << "You are not authorized to enter the game."
return
if(!ready)
ready = 1
else
@@ -192,9 +188,6 @@
new_player_panel_proc()
if(href_list["observe"])
if (!client.authenticated)
src << "You are not authorized to enter the game."
return
if(alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No") == "Yes")
var/mob/dead/observer/observer = new()
@@ -222,9 +215,6 @@
LateChoices()
if(href_list["SelectedJob"])
if(!client.authenticated)
src << "You are not authorized to enter the game."
return
if(!enter_allowed)
usr << "\blue There is an administrative lock on entering the game!"