mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 03:25:49 +01:00
Changed a lot of things, too lazy to recall them atm. Attempted a shotgun-on-back fix, but didn't work.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@305 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -1155,6 +1155,15 @@ var/showadminmessages = 1
|
||||
else
|
||||
alert("You cannot perform this action. You must be of a higher administrative rank!")
|
||||
return
|
||||
if("dorf")
|
||||
if (src.rank in list("Shit Guy","Coder", "Host"))
|
||||
for(var/mob/living/carbon/human/B in world)
|
||||
B.face_icon_state = "facial_longbeard"
|
||||
B.update_face()
|
||||
message_admins("[key_name_admin(usr)] activated dorf mode")
|
||||
else
|
||||
alert("You cannot perform this action. You must be of a higher administrative rank!")
|
||||
return
|
||||
if (usr)
|
||||
log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]")
|
||||
if (ok)
|
||||
@@ -1486,7 +1495,8 @@ var/showadminmessages = 1
|
||||
<A href='?src=\ref[src];secretsfun=cleanexcrement'>Remove all urine/poo from station</A><BR>
|
||||
<A href='?src=\ref[src];secretsfun=retardify'>Make all players retarded</A><BR>
|
||||
<A href='?src=\ref[src];secretsfun=fakeguns'>Make all items look like guns</A><BR>
|
||||
<A href='?src=\ref[src];secretsfun=schoolgirl'>Japanese Animes Mode</A><BR><BR>"}
|
||||
<A href='?src=\ref[src];secretsfun=schoolgirl'>Japanese Animes Mode</A><BR>
|
||||
<A href='?src=\ref[src];secretsfun=dorf'>Dorf Mode</A><BR><BR>"}
|
||||
//<A href='?src=\ref[src];secretsfun=shockwave'>Station Shockwave</A><BR>
|
||||
|
||||
if(lvl >= 5)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/client/proc/play_sound(S as sound)
|
||||
set category = "Special Verbs"
|
||||
set category = "Fun"
|
||||
set name = "Play Global Sound"
|
||||
|
||||
//if(Debug2)
|
||||
@@ -14,13 +14,17 @@
|
||||
if(src.holder.rank == "Host" || src.holder.rank == "Coder" || src.holder.rank == "Shit Guy")
|
||||
log_admin("[key_name(src)] played sound [S]")
|
||||
message_admins("[key_name_admin(src)] played sound [S]", 1)
|
||||
world << uploaded_sound
|
||||
for(var/mob/M in world)
|
||||
if(M.midis)
|
||||
M << uploaded_sound
|
||||
else
|
||||
if(usr.client.canplaysound)
|
||||
usr.client.canplaysound = 0
|
||||
log_admin("[key_name(src)] played sound [S]")
|
||||
message_admins("[key_name_admin(src)] played sound [S]", 1)
|
||||
world << uploaded_sound
|
||||
for(var/mob/M in world)
|
||||
if(M.midis)
|
||||
M << uploaded_sound
|
||||
else
|
||||
usr << "You already used up your jukebox monies this round!"
|
||||
del(uploaded_sound)
|
||||
@@ -36,7 +40,9 @@
|
||||
set category = "Fun"
|
||||
set name = "Cuban Pete Time"
|
||||
|
||||
world << 'cubanpetetime.ogg'
|
||||
for(var/mob/M in world)
|
||||
if(M.midis)
|
||||
M << 'cubanpetetime.ogg'
|
||||
|
||||
for(var/mob/living/carbon/human/CP in world)
|
||||
if(CP.real_name=="Cuban Pete" && CP.key!="Rosham")
|
||||
|
||||
@@ -165,7 +165,7 @@
|
||||
|
||||
|
||||
/client/proc/cmd_admin_add_random_ai_law()
|
||||
set category = "Admin"
|
||||
set category = "Fun"
|
||||
set name = "Add Random AI Law"
|
||||
if(!src.authenticated || !src.holder)
|
||||
src << "Only administrators may use this command."
|
||||
@@ -229,7 +229,7 @@
|
||||
|
||||
|
||||
/client/proc/cmd_admin_add_freeform_ai_law()
|
||||
set category = "Admin"
|
||||
set category = "Fun"
|
||||
set name = "Add Custom AI law"
|
||||
if(!src.authenticated || !src.holder)
|
||||
src << "Only administrators may use this command."
|
||||
@@ -361,7 +361,7 @@
|
||||
|
||||
/client/proc/cmd_admin_gib_self()
|
||||
set name = "Gibself"
|
||||
set category = "Special Verbs"
|
||||
set category = "Fun"
|
||||
if (istype(src.mob, /mob/dead/observer)) // so they don't spam gibs everywhere
|
||||
return
|
||||
else
|
||||
|
||||
@@ -63,7 +63,7 @@ to clean it up, or just beat the shit out of it (which takes ages).
|
||||
src << "\blue Your icons have been generated!"
|
||||
|
||||
update_clothing()
|
||||
spawn(1200) grow() // Grow after 120 seconds -- TLE
|
||||
// spawn(1200) grow() Grow after 120 seconds -- TLE Commented out because life.dm has better version -- Urist
|
||||
..()
|
||||
|
||||
|
||||
@@ -544,11 +544,11 @@ to clean it up, or just beat the shit out of it (which takes ages).
|
||||
src.stat = 0
|
||||
|
||||
|
||||
|
||||
/* Commented out because it's duplicated in life.dm
|
||||
/mob/living/carbon/alien/larva/proc/grow() // Larvae can grow into full fledged Xenos if they survive long enough -- TLE
|
||||
if(src.icon_state == "larva_l" && !src.canmove) // This is a shit death check. It is made of shit and death. Fix later.
|
||||
return
|
||||
else
|
||||
var/mob/living/carbon/alien/humanoid/A = new(src.loc)
|
||||
A.key = src.key
|
||||
del(src)
|
||||
del(src) */
|
||||
@@ -97,8 +97,9 @@
|
||||
spawn(10)
|
||||
del(src)
|
||||
return
|
||||
//grow!!
|
||||
src.amount_grown++
|
||||
//grow!! but not if metroid or dead
|
||||
if(!istype(src,/mob/living/carbon/alien/larva/metroid) && src.health>-100)
|
||||
src.amount_grown++
|
||||
|
||||
if (src.radiation)
|
||||
if (src.radiation > 100)
|
||||
|
||||
@@ -5,6 +5,7 @@ datum/preferences
|
||||
var/b_type = "A+"
|
||||
|
||||
var/be_syndicate
|
||||
var/midis = 1
|
||||
var/be_random_name = 0
|
||||
var/underwear = 1
|
||||
|
||||
@@ -154,6 +155,7 @@ datum/preferences
|
||||
|
||||
dat += "<br>"
|
||||
dat += "<b>UI Style:</b> <a href=\"byond://?src=\ref[user];preferences=1;UI=input\"><b>[src.UI == 'screen1.dmi' ? "New" : "Old"]</b></a><br>"
|
||||
dat += "<b>Play admin midis:</b> <a href=\"byond://?src=\ref[user];preferences=1;midis=input\"><b>[src.midis == 1 ? "Yes" : "No"]</b></a><br>"
|
||||
|
||||
dat += "<hr><b>Occupation Choices</b><br>"
|
||||
if (destructive.Find(src.occupation1))
|
||||
@@ -498,6 +500,12 @@ datum/preferences
|
||||
else
|
||||
src.UI = 'screen1.dmi'
|
||||
|
||||
if (link_tags["midis"])
|
||||
if (src.midis)
|
||||
src.midis = 0
|
||||
else
|
||||
src.midis = 1
|
||||
|
||||
if (link_tags["underwear"])
|
||||
if(!IsGuestKey(user.key))
|
||||
if (src.underwear == 1)
|
||||
@@ -544,6 +552,7 @@ datum/preferences
|
||||
s_tone = 0.0
|
||||
b_type = "A+"
|
||||
UI = 'screen1_old.dmi'
|
||||
midis = 1
|
||||
|
||||
|
||||
src.ShowChoices(user)
|
||||
@@ -576,6 +585,7 @@ datum/preferences
|
||||
character.f_style = f_style
|
||||
|
||||
character.UI = UI
|
||||
character.midis = midis
|
||||
|
||||
switch(h_style)
|
||||
if("Short Hair")
|
||||
|
||||
Reference in New Issue
Block a user