cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-27 22:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates

Browse Source 
Cleaning files
Change Log
Changes to the cooler.
Added missing html tags in logs
This commit is contained in:
SoundScopes
2014-08-26 11:52:02 +01:00
parent 432f2ecb06
commit ef2c93bb73
10 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/aurora/bluespacetech.dm
+15
View File
@@ -60,6 +60,7 @@
bst.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(bst.back), slot_in_backpack)
bst.equip_to_slot_or_del(new /obj/item/device/t_scanner(bst.back), slot_in_backpack)
bst.equip_to_slot_or_del(new /obj/item/device/signaltool(bst.back), slot_in_backpack)
bst.equip_to_slot_or_del(new /obj/item/device/pda/captain/bst(bst.back), slot_in_backpack)
//Implant because access
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(bst)
@@ -260,5 +261,19 @@
else
..()
/obj/item/device/pda/captain/bst
hidden = 1
silent = 1
// ttone = "DO SOMETHING HERE"
attack_hand()
if(!usr)
return
if(!istype(usr, /mob/living/carbon/human/bst))
usr << "<span class='alert'>Your hand seems to go right through the pda. It's like it doesn't exist.</span>"
return
else
..()
/mob/living/carbon/human/bst/restrained()
return 0
code/modules/mob/living/carbon/carbon.dm
+2 -2
View File
@@ -204,8 +204,8 @@
src.sleeping = max(0,src.sleeping-5)
if(src.sleeping == 0)
src.resting = 0
M.visible_message("<span class='notice'>[M] shakes [src] trying to wake [t_him] up!", \
"<span class='notice'>You shake [src] trying to wake [t_him] up!")
M.visible_message("<span class='notice'>[M] shakes [src] trying to wake [t_him] up!</span>", \
"<span class='notice'>You shake [src] trying to wake [t_him] up!</span>")
else
M.visible_message("<span class='notice'>[M] hugs [src] to make [t_him] feel better!</span>", \
"<span class='notice'>You hug [src] to make [t_him] feel better!</span>")
code/modules/mob/living/carbon/human/human.dm
+3 -3
View File
@@ -891,13 +891,13 @@
if(!lastpuke)
lastpuke = 1
src << "<spawn class='warning'>You feel nauseous..."
src << "<spawn class='warning'>You feel nauseous...</spawn>"
spawn(150) //15 seconds until second warning
src << "<spawn class='warning'>You feel like you are about to throw up!"
src << "<spawn class='warning'>You feel like you are about to throw up!</spawn>"
spawn(100) //and you have 10 more for mad dash to the bucket
Stun(5)
src.visible_message("<spawn class='warning'>[src] throws up!","<spawn class='warning'>You throw up!")
src.visible_message("<spawn class='warning'>[src] throws up!","<spawn class='warning'>You throw up!</spawn>")
playsound(loc, 'sound/effects/splat.ogg', 50, 1)
var/turf/location = loc
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -196,7 +196,7 @@ emp_act
if(user == src) // Attacking yourself can't miss
target_zone = user.zone_sel.selecting
if(!target_zone)
visible_message("\red <B>[user] misses [src] with \the [I]!")
visible_message("\red <B>[user] misses [src] with \the [I]!</B>")
return 0
var/datum/organ/external/affecting = get_organ(target_zone)
code/modules/mob/login.dm
+2 -2
View File
@@ -17,10 +17,10 @@
spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!")
if(matches)
if(M.client)
message_admins("<font color='red'><B>Notice: </B><font color='blue'><A href='?src=\ref[usr];priv_msg=\ref[src]'>[key_name_admin(src)]</A> has the same [matches] as <A href='?src=\ref[usr];priv_msg=\ref[M]'>[key_name_admin(M)]</A>.</font>", 1)
message_admins("<font color='red'><B>Notice: </B></font><font color='blue'><A href='?src=\ref[usr];priv_msg=\ref[src]'>[key_name_admin(src)]</A> has the same [matches] as <A href='?src=\ref[usr];priv_msg=\ref[M]'>[key_name_admin(M)]</A>.</font>", 1)
log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)].")
else
message_admins("<font color='red'><B>Notice: </B><font color='blue'><A href='?src=\ref[usr];priv_msg=\ref[src]'>[key_name_admin(src)]</A> has the same [matches] as [key_name_admin(M)] (no longer logged in). </font>", 1)
message_admins("<font color='red'><B>Notice: </B></font><font color='blue'><A href='?src=\ref[usr];priv_msg=\ref[src]'>[key_name_admin(src)]</A> has the same [matches] as [key_name_admin(M)] (no longer logged in). </font>", 1)
log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).")
/mob/Login()