cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 21:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
SkyMarshal
2011-12-25 08:48:06 -07:00
parent c6499583b4 67acc6d467
commit 9becacf956
19 changed files with 6065 additions and 5980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/admin/admin.dm
View File

@@ -1844,7 +1844,7 @@
if (!usr.client.holder)
return
var/dat = "<html><head><title>Player Menu</title></head>"
dat += "<body><table border=1 cellspacing=5><B><tr><th>Name</th><th>Real Name</th><th>Key</th><th>Options</th><th>Info</th><th>PM</th><th>Traitor?</th><th>Karma</th></tr></B>"
dat += "<body><table border=1 cellspacing=5><B><tr><th>Name</th><th>Real Name</th><th>Assigned Job</th><th>Key</th><th>Options</th><th>Info</th><th>PM</th><th>Traitor?</th><th>Karma</th></tr></B>"
//add <th>IP:</th> to this if wanting to add back in IP checking
//add <td>(IP: [M.lastKnownIP])</td> if you want to know their ip to the lists below
var/list/mobs = sortmobs()
@@ -1862,8 +1862,8 @@
if(!show_karma)
for(var/mob/M in mobs)
if(M.ckey)
dat += "<tr><td>[M.name]</td>"
if(istype(M, /mob/living/silicon/ai))
dat += "<tr><td>[M.name]</td>" // Adds current name
if(istype(M, /mob/living/silicon/ai)) // Adds current 'Real Name'
dat += "<td>AI</td>"
if(istype(M, /mob/living/silicon/robot))
dat += "<td>Cyborg</td>"
@@ -1879,6 +1879,20 @@
dat += "<td>Monkey</td>"
if(istype(M, /mob/living/carbon/alien))
dat += "<td>Alien</td>"
if(M.mind && M.mind.assigned_role) // Adds a column to Player Panel that shows their current job.
var/mob/living/carbon/human/H = M
if (H.wear_id)
var/obj/item/weapon/card/id/id = H.wear_id
if(M.mind.assigned_role == id.assignment) // Polymorph
dat += "<td>[M.mind.assigned_role]</td>"
else
dat += "<td>[M.mind.assigned_role] ([id.assignment])"
else
dat += "<td>[M.mind.assigned_role] (No ID)</td>"
else
dat += "<td>No Assigned Role</td>"
dat += {"<td>[M.client?"[M.client]":"No client"]</td>
<td align=center><A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>X</A></td>
<td align=center><A HREF='?src=\ref[src];player_info=[M.ckey]'>[player_has_info(M.ckey) ? "Info" : "N/A"] </A></td>

2
code/modules/admin/admin_verbs.dm
View File

@@ -762,7 +762,7 @@
/client/proc/editappear(mob/living/carbon/human/M as mob in world)
set name = "Edit Appearance"
set category = "Admin"
set category = "Fun"
if(!istype(M, /mob/living/carbon/human))
usr << "\red You can only do this to humans!"
return

10
code/modules/food/food.dm
View File

@@ -37,6 +37,16 @@
if(sattisfaction_text)
M.emote("[sattisfaction_text]")
del(src)
else
if(bitecount == 0 || prob(50))
M.emote("nibbles away at the [src]")
bitecount++
if(bitecount >= 5)
var/speak_emote = pick(M:speak_emote)
var/sattisfaction_text = pick("[speak_emote] for more!", "[speak_emote] from enjoyment.", "looks at the area where the [src] was")
if(sattisfaction_text)
M.emote("[sattisfaction_text]")
del(src)
/obj/item/weapon/reagent_containers/food/snacks/candy
name = "candy"

16
code/modules/mob/living/carbon/brain/life.dm
View File

@@ -116,9 +116,19 @@
handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
if(nodamage) return
var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
//adjustFireLoss(2.5*discomfort)
adjustFireLoss(5.0*discomfort)
if(exposed_temperature > bodytemperature)
var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
//adjustFireLoss(2.5*discomfort)
//adjustFireLoss(5.0*discomfort)
adjustFireLoss(20.0*discomfort)
else
var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
//adjustFireLoss(2.5*discomfort)
adjustFireLoss(5.0*discomfort)
handle_chemicals_in_body()

1
code/modules/mob/living/carbon/human/human.dm
View File

@@ -209,6 +209,7 @@
if (mind)
if (mind.special_role == "Changeling" && changeling)
stat("Chemical Storage", changeling.chem_charges)
stat("Genetic Damage Time", changeling.geneticdamage)
if (istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)&&wear_suit:s_initialized)
stat("Energy Charge", round(wear_suit:cell:charge/100))

2
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -15,7 +15,7 @@
adjustFireLoss(-getFireLoss())
for(var/datum/organ/external/O in organs)
if(istype(O, /datum/organ/external))
bruteloss += O.brute_dam
adjustBruteLoss(O.brute_dam)
adjustFireLoss(O.burn_dam)
return

7
code/modules/mob/living/carbon/human/life.dm
View File

@@ -575,8 +575,12 @@
handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
if(nodamage)
return
var/discomfort = min(abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
if(exposed_temperature > bodytemperature)
discomfort *= 4
if(mutantrace == "plant")
discomfort *= 3 //I don't like magic numbers. I'll make mutantraces a datum with vars sometime later. -- Urist
else
@@ -1034,7 +1038,8 @@
if (mind)
if (mind.special_role == "Changeling" && changeling)
changeling.chem_charges = between(0, (max((0.9 - (changeling.chem_charges / 50)), 0.1) + changeling.chem_charges), 50)
if ((changeling.geneticdamage > 0))
changeling.geneticdamage = changeling.geneticdamage-1
/*
// Commented out so hunger system won't be such shock

11
code/modules/mob/living/carbon/monkey/life.dm
View File

@@ -371,7 +371,12 @@
if(src.nodamage) return
var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
//adjustFireLoss(2.5*discomfort)
adjustFireLoss(5.0*discomfort)
if(exposed_temperature > bodytemperature)
adjustFireLoss(20.0*discomfort)
else
adjustFireLoss(5.0*discomfort)
handle_chemicals_in_body()
@@ -615,4 +620,6 @@
handle_changeling()
if (mind)
if (mind.special_role == "Changeling" && changeling)
changeling.chem_charges = between(0, (max((0.9 - (changeling.chem_charges / 50)), 0.1) + changeling.chem_charges), 50)
changeling.chem_charges = between(0, (max((0.9 - (changeling.chem_charges / 50)), 0.1) + changeling.chem_charges), 50)
if ((changeling.geneticdamage > 0))
changeling.geneticdamage = changeling.geneticdamage-1

1
code/modules/mob/living/carbon/monkey/monkey.dm
View File

@@ -396,6 +396,7 @@
if (client.statpanel == "Status")
if (mind.special_role == "Changeling" && changeling)
stat("Chemical Storage", changeling.chem_charges)
stat("Genetic Damage Time", changeling.geneticdamage)
return
/mob/living/carbon/monkey/update_clothing()

4
code/modules/mob/living/damage_procs.dm
View File

@@ -12,14 +12,14 @@
if(!damage || (blocked >= 2)) return 0
switch(damagetype)
if(BRUTE)
bruteloss += (damage/(blocked+1))
adjustBruteLoss(damage/(blocked+1))
if(BURN)
if(mutations & COLD_RESISTANCE) damage = 0
adjustFireLoss(damage/(blocked+1))
if(TOX)
adjustToxLoss(damage/(blocked+1))
if(OXY)
oxyloss += (damage/(blocked+1))
adjustOxyLoss(damage/(blocked+1))
if(CLONE)
cloneloss += (damage/(blocked+1))
UpdateDamageIcon()

5
code/modules/mob/living/say.dm
View File

@@ -31,6 +31,8 @@
if (!message)
return
log_say("[name]/[key] : [message]")
if (length(message) >= 1)
if (miming && copytext(message, 1, 2) != "*")
return
@@ -461,9 +463,6 @@
*/
log_say("[name]/[key] : [message]")
/obj/effect/speech_bubble
var/mob/parent