mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +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:
@@ -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