cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01: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
code/defines/obj/hydro.dm
+21 -21
View File
@@ -465,7 +465,7 @@
maturation = 7
production = 1
yield = 5
potency = -1
potency = 1
oneharvest = 1
growthstages = 3
plant_type = 2
@@ -483,7 +483,7 @@
maturation = 15
production = 1
yield = 5
potency = -1
potency = 1
oneharvest = 1
growthstages = 3
plant_type = 2
@@ -555,7 +555,7 @@
maturation = 6
production = 6
yield = 4
potency = 8
potency = 10
oneharvest = 0
growthstages = 5
plant_type = 1
@@ -573,7 +573,7 @@
maturation = 8
production = 6
yield = 2
potency = 20
potency = 10
oneharvest = 0
growthstages = 5
plant_type = 1
@@ -608,7 +608,7 @@
maturation = 7
production = 1
yield = -1
potency = -1
potency = 1
oneharvest = 1
growthstages = 4
plant_type = 1
@@ -626,7 +626,7 @@
maturation = 6
production = 1
yield = 2
potency = -1
potency = 1
oneharvest = 1
growthstages = 3
plant_type = 1
@@ -644,7 +644,7 @@
maturation = 10
production = 1
yield = -1
potency = -1
potency = 1
oneharvest = 1
growthstages = 3
plant_type = 2
@@ -1255,7 +1255,7 @@
icon_state = "chilipepper"
New()
..()
reagents.add_reagent("nutriment", round((potency / 20), 1))
reagents.add_reagent("nutriment", 1+round((potency / 25), 1))
reagents.add_reagent("capsaicin", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1281,7 +1281,7 @@
icon_state = "soybeans"
New()
..()
reagents.add_reagent("nutriment", round((potency / 20), 1))
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato
@@ -1363,7 +1363,7 @@
icon_state = "wheat"
New()
..()
reagents.add_reagent("nutriment", round((potency / 20), 1))
reagents.add_reagent("nutriment", 1+round((potency / 25), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
@@ -1374,7 +1374,7 @@
potency = 20
New()
..()
reagents.add_reagent("nutriment", round((potency / 20), 1))
reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("frostoil", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1391,7 +1391,7 @@
potency = 10
New()
..()
reagents.add_reagent("nutriment", round((potency / 10), 1))
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
reagents.add_reagent("imidazoline", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1403,7 +1403,7 @@
potency = 10
New()
..()
reagents.add_reagent("nutriment", round((potency / 20), 1))
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("amatoxin", 3+round(potency / 3, 1))
reagents.add_reagent("psilocybin", 1+round(potency / 25, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1422,7 +1422,7 @@
potency = 35
New()
..()
reagents.add_reagent("nutriment", round((potency / 20), 1))
reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("amatoxin", 13+round(potency / 3, 1))
reagents.add_reagent("psilocybin", 1+round(potency / 25, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1441,7 +1441,7 @@
potency = 15
New()
..()
reagents.add_reagent("nutriment", round((potency / 20), 1))
reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("psilocybin", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1495,7 +1495,7 @@
icon_state = "chanterelle"
New()
..()
reagents.add_reagent("nutriment",round((potency / 20), 1))
reagents.add_reagent("nutriment",1+round((potency / 25), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom
@@ -1561,7 +1561,7 @@
var/maturation = 7
var/production = 7
var/yield = 2
var/potency = -1
var/potency = 1
var/plant_type = 0
New()
var/datum/reagents/R = new/datum/reagents(50)
@@ -1647,9 +1647,9 @@
seed = "/obj/item/seeds/nettleseed"
New()
..()
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("acid", round(potency, 1))
force = round((15*potency/50), 1)
force = round((5+potency/5), 1)
/obj/item/weapon/grown/deathnettle // -- Skie
desc = "The \red glowing \black nettle incites \red<B>rage</B>\black in you just from looking at it!"
@@ -1668,9 +1668,9 @@
origin_tech = "combat=3"
New()
..()
reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("pacid", round(potency, 1))
force = round((15*potency/25), 1)
force = round((5+potency/2.5), 1)
// *************************************
// Pestkiller defines for hydroponics
code/game/gamemodes/blob/theblob.dm
+7
View File
@@ -40,6 +40,13 @@
processing_objects.Remove(src)
..()
//copy pasta from turf code, so flamers work on blob without having to pixelhunt
//might need an else for the ..()
DblClick()
if((usr.hand && istype(usr.l_hand, /obj/item/weapon/flamethrower)) || (!usr.hand && istype(usr.r_hand, /obj/item/weapon/flamethrower)))
var/turf/location = get_turf_loc(src)
location.DblClick()
return ..()
CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if((air_group && blobtype != "Shield") || (height==0)) return 1
code/game/gamemodes/changeling/changeling.dm
+1
View File
@@ -201,6 +201,7 @@
var/sting_range = 1
var/changelingID = "none"
var/mob/living/host = null
var/geneticdamage = 0.0
/datum/changeling/New()
..()
code/game/gamemodes/changeling/changeling_powers.dm
+8 -1
View File
@@ -193,12 +193,19 @@
usr << "\red We don't have enough stored chemicals to do that!"
return
if(usr.changeling.geneticdamage != 0)
usr << "Our genes are still mending themselves! We cannot transform!"
return
usr.changeling.chem_charges--
usr.remove_changeling_powers()
usr.visible_message(text("\red <B>[usr] transforms!</B>"))
usr.changeling.geneticdamage = 30
usr << "Our genes cry out!"
var/list/implants = list() //Try to preserve implants.
for(var/obj/item/weapon/W in usr)
if (istype(W, /obj/item/weapon/implant))
@@ -383,7 +390,7 @@
//usr.health = 100
//usr.updatehealth()
var/mob/living/M = src
M.heal_overall_damage(1000, 1000)
M.heal_overall_damage(M.getBruteLoss(), M.getFireLoss())
usr.reagents.clear_reagents()
usr.lying = 0
usr.canmove = 1
code/game/magic/library.dm
+2 -2
View File
@@ -77,7 +77,7 @@
var/list/catbooks = new()
// get books in category
for(var/datum/archived_book/B in books)
if(category && !findtext(category, B.category))
if(!category || (category != B.category))
continue;
catbooks += B
world << "cat [category]: [B.title]"
@@ -435,7 +435,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
continue;
if(title && !findtext(title, book.title))
continue;
if(category && !findtext(category, book.category))
if(!category || (category != "Any" && category != book.category))
continue;
dat += "<tr><td>[book.author]</td><td>[book.title]</td><td>[book.category]</td><td>[book.id]</td></tr>"
dat += "</table><BR>"
code/game/objects/items/weapons/hydroponics.dm
+6
View File
@@ -58,6 +58,12 @@ Deathnettle
sleep(4)
del(D)
if((src.reagents.has_reagent("pacid")) || (src.reagents.has_reagent("lube"))) // Messages admins if someone sprays polyacid or space lube from a Plant-B-Gone bottle.
message_admins("[key_name_admin(user)] fired Polyacid/Space lube from a PlantBGone bottle.") // Polymorph
log_game("[key_name(user)] fired Polyacid/Space lube from a PlantBGone bottle.")
return
/obj/item/weapon/plantbgone/examine()
code/game/objects/items/weapons/mops_cleaners.dm
+13
View File
@@ -84,6 +84,13 @@ MOP
spawn(600)
src.reagents.add_reagent(refill, 10)
if((src.reagents.has_reagent("pacid")) || (src.reagents.has_reagent("lube"))) // Messages admins if someone sprays polyacid or space lube from a Cleaner bottle.
message_admins("[key_name_admin(user)] fired Polyacid/Space lube from a Cleaner bottle.") // Polymorph
log_game("[key_name(user)] fired Polyacid/Space lube from a Cleaner bottle.")
return
/obj/item/weapon/cleaner/examine()
@@ -176,6 +183,12 @@ MOP
spawn(600)
src.reagents.add_reagent(refill, 10)
if((src.reagents.has_reagent("pacid")) || (src.reagents.has_reagent("lube"))) // Messages admins if someone sprays polyacid or space lube from a Chem Sprayer.
message_admins("[key_name_admin(user)] fired Polyacid/Space lube from a Chem Sprayer.") // Polymorph
log_game("[key_name(user)] fired Polyacid/Space lube from a Chem Sprayer.")
return
//Pepper spray, set up to make the 2 different types
code/modules/admin/admin.dm
+17 -3
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>
code/modules/admin/admin_verbs.dm
+1 -1
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
code/modules/food/food.dm
+10
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"
code/modules/mob/living/carbon/brain/life.dm
+13 -3
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()
code/modules/mob/living/carbon/human/human.dm
+1
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))
code/modules/mob/living/carbon/human/human_damage.dm
+1 -1
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
code/modules/mob/living/carbon/human/life.dm
+6 -1
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
code/modules/mob/living/carbon/monkey/life.dm
+9 -2
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
code/modules/mob/living/carbon/monkey/monkey.dm
+1
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()
code/modules/mob/living/damage_procs.dm
+2 -2
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()
code/modules/mob/living/say.dm
+2 -3
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