cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes.

Browse Source
This commit is contained in:
ZomgPonies
2013-09-27 02:41:41 -04:00
parent e81596ff2f
commit 853d490660
29 changed files with 9547 additions and 9360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/permissionverbs/permissionedit.dm
+9 -4
View File
@@ -12,8 +12,8 @@
<html>
<head>
<title>Permissions Panel</title>
<script type='text/javascript' src='html/search.js'></script>
<link rel='stylesheet' type='text/css' href='html/panels.css'>
<script type='text/javascript' src='search.js'></script>
<link rel='stylesheet' type='text/css' href='panels.css'>
</head>
<body onload='selectTextField();updateSearch();'>
<div id='main'><table id='searchable' cellspacing='0'>
@@ -29,12 +29,17 @@
var/rank = D.rank ? D.rank : "*none*"
var/rights = rights2text(D.rights," ")
if(!rights) rights = "*none*"
output += {"<tr>
<td style='text-align:right;'>[adm_ckey] <a class='small' href='?src=\ref[src];editrights=remove;ckey=[adm_ckey]'>\[-\]</a></td>
<td><a href='?src=\ref[src];editrights=rank;ckey=[adm_ckey]'>[rank]</a></td>
<td><a class='small' href='?src=\ref[src];editrights=permissions;ckey=[adm_ckey]'>[rights]</a></font></td>
</tr>"}
output += "<tr>"
/*output += "<tr>"
output += "<td style='text-align:right;'>[adm_ckey] <a class='small' href='?src=\ref[src];editrights=remove;ckey=[adm_ckey]'>\[-\]</a></td>"
output += "<td><a href='?src=\ref[src];editrights=rank;ckey=[adm_ckey]'>[rank]</a></td>"
output += "<td><a class='small' href='?src=\ref[src];editrights=permissions;ckey=[adm_ckey]'>[rights]</a></font></td>"
output += "</tr>"
output += "</tr>"*/
output += {"
</table></div>
code/modules/events/organ_failure.dm
+3 -3
View File
@@ -20,10 +20,10 @@ datum/event/organ_failure/start()
while(severity > 0 && candidates.len)
var/mob/living/carbon/human/C = candidates[1]
if(!C) continue
// Bruise one of their organs
var/O = pick(C.internal_organs)
var/datum/organ/internal/I = C.internal_organs[O]
var/datum/organ/internal/I = C.internal_organs[pick(C.internal_organs)]
if(!I) continue
I.damage = I.min_bruised_damage
candidates.Remove(C)
severity--
code/modules/mob/living/carbon/alien/humanoid/queen.dm
+1 -1
View File
@@ -24,7 +24,7 @@
real_name = src.name
verbs.Add(/mob/living/carbon/alien/humanoid/proc/corrosive_acid,/mob/living/carbon/alien/humanoid/proc/neurotoxin,/mob/living/carbon/alien/humanoid/proc/resin)
verbs -= /mob/living/carbon/alien/verb/ventcrawl
verbs -= /mob/living/carbon/alien/verb/alien_ventcrawl
..()
code/modules/mob/living/carbon/alien/powers.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/mob/living/carbon/alien/verb/ventcrawl() // -- TLE
set name = "Crawl through vent"
/mob/living/carbon/alien/verb/alien_ventcrawl() // -- TLE
set name = "Crawl through vent(Alien)"
set desc = "Enter an air vent and crawl through the pipe system."
set category = "Alien"
handle_ventcrawl()
code/modules/mob/living/carbon/human/human.dm
+4 -3
View File
@@ -391,9 +391,10 @@
/mob/living/carbon/human/show_inv(mob/user as mob)
var/obj/item/clothing/gloves/G
var/pickpocket = 0
if(user:gloves)
G = user:gloves
pickpocket = G.pickpocket
if(ishuman(user))
if(user:gloves)
G = user:gloves
pickpocket = G.pickpocket
user.set_machine(src)
var/dat = {"
<B><HR><FONT size=3>[name]</FONT></B>
code/modules/mob/living/carbon/human/life.dm
+5
View File
@@ -1380,6 +1380,11 @@
for (var/ID in M.virus2)
var/datum/disease2/disease/V = virus2[ID]
infect_virus2(src,V)
for(var/obj/effect/decal/cleanable/poop/P in view(1,src))
if(P.virus2.len && get_infection_chance(src))
for (var/ID in P.virus2)
var/datum/disease2/disease/V = virus2[ID]
infect_virus2(src,V)
for (var/ID in virus2)
var/datum/disease2/disease/V = virus2[ID]
code/modules/mob/living/carbon/monkey/life.dm
+5
View File
@@ -180,6 +180,11 @@
for (var/ID in M.virus2)
var/datum/disease2/disease/V = virus2[ID]
infect_virus2(src,V)
for(var/obj/effect/decal/cleanable/poop/P in view(1,src))
if(P.virus2.len && get_infection_chance(src))
for (var/ID in P.virus2)
var/datum/disease2/disease/V = virus2[ID]
infect_virus2(src,V)
for (var/ID in virus2)
var/datum/disease2/disease/V = virus2[ID]
code/modules/mob/living/carbon/species.dm
+10
View File
@@ -122,3 +122,13 @@
heat_level_3 = 4000
flags = WHITELISTED | NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT | RAD_ABSORB
/datum/species/skellington // /vg/
name = "Skellington"
icobase = 'icons/mob/human_races/r_skeleton.dmi'
deform = 'icons/mob/human_races/r_skeleton.dmi' // TODO: Need deform.
language = "Clatter"
attack_verb = "punch"
flags = WHITELISTED | HAS_LIPS | HAS_TAIL | NO_EAT | NO_BREATHE | NON_GENDERED
code/modules/projectiles/gun.dm
+3 -3
View File
@@ -201,15 +201,15 @@
mouthshoot = 0
return
if (load_into_chamber())
if (src.load_into_chamber())
//Point blank shooting if on harm intent or target we were targeting.
if(user.a_intent == "hurt")
user.visible_message("\red <b> \The [user] fires \the [src] point blank at [M]!</b>")
in_chamber.damage *= 1.3
Fire(M,user)
src.Fire(M,user,0,0,1)
return
else if(target && M in target)
Fire(M,user) ///Otherwise, shoot!
src.Fire(M,user,0,0,1) ///Otherwise, shoot!
return
else
return ..() //Pistolwhippin'
code/modules/projectiles/guns/projectile/shotgun.dm
+2 -2
View File
@@ -80,8 +80,8 @@
return
load_into_chamber()
// if(in_chamber)
// return 1 {R}
if(in_chamber)
return 1
if(!loaded.len)
return 0
code/modules/projectiles/projectile/energy.dm
+1 -1
View File
@@ -24,7 +24,7 @@
/obj/item/projectile/energy/declone
name = "declone"
icon_state = "declone"
nodamage = 1
damage = 40
damage_type = CLONE
irradiate = 40
code/modules/research/designs.dm
+2 -2
View File
@@ -1379,7 +1379,7 @@ datum/design/decloner
name = "Decloner"
desc = "Your opponent will bubble into a messy pile of goop."
id = "decloner"
req_tech = list("combat" = 8, "materials" = 7, "biotech" = 5, "powerstorage" = 6)
req_tech = list("combat" = 6, "materials" = 7, "biotech" = 5, "powerstorage" = 6)
build_type = PROTOLATHE
materials = list("$gold" = 5000,"$uranium" = 10000, "mutagen" = 40)
build_path = "/obj/item/weapon/gun/energy/decloner"
@@ -1393,7 +1393,7 @@ datum/design/chemsprayer
build_type = PROTOLATHE
materials = list("$metal" = 5000, "$glass" = 1000)
reliability_base = 100
build_path = "/obj/item/weapon/chemsprayer"
build_path = "/obj/item/weapon/reagent_containers/spray/chemsprayer"
datum/design/rapidsyringe
name = "Rapid Syringe Gun"
code/modules/research/research.dm
+5 -5
View File
@@ -183,7 +183,7 @@ datum/tech/materials
name = "Materials Research"
desc = "Development of new and improved materials."
id = "materials"
max_level=6
max_level=7
datum/tech/engineering
name = "Engineering Research"
@@ -195,7 +195,7 @@ datum/tech/plasmatech
name = "Plasma Research"
desc = "Research into the mysterious substance colloqually known as 'plasma'."
id = "plasmatech"
max_level=3
max_level=4
datum/tech/powerstorage
name = "Power Manipulation Technology"
@@ -207,13 +207,13 @@ datum/tech/bluespace
name = "'Blue-space' Research"
desc = "Research into the sub-reality known as 'blue-space'"
id = "bluespace"
max_level=10
max_level=4
datum/tech/biotech
name = "Biological Technology"
desc = "Research into the deeper mysteries of life and organic substances."
id = "biotech"
max_level=7
max_level=5
datum/tech/combat
name = "Combat Systems Research"
@@ -231,7 +231,7 @@ datum/tech/programming
name = "Data Theory Research"
desc = "The development of new computer and artificial intelligence and data storage systems."
id = "programming"
max_level=4
max_level=5
datum/tech/syndicate
name = "Illegal Technologies Research"
code/modules/surgery/generic.dm
+2
View File
@@ -30,6 +30,8 @@
max_duration = 110
can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if (!ishuman(target))
return 0
var/datum/organ/external/affected = target.get_organ(target_zone)
return ..() && affected.open == 0 && target_zone != "mouth"
code/modules/surgery/implant.dm
+2
View File
@@ -106,6 +106,8 @@
max_duration = 100
can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if (!ishuman(target))
return 0
var/datum/organ/external/affected = target.get_organ(target_zone)
var/can_fit = !affected.hidden && affected.cavity && tool.w_class <= get_max_wclass(affected)
return ..() && can_fit
code/modules/surgery/ribcage.dm
+4 -2
View File
@@ -19,8 +19,8 @@
max_duration = 70
can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if (!istype(target))
return
if (!ishuman(target))
return 0
var/datum/organ/external/affected = target.get_organ(target_zone)
return ..() && target.op_stage.ribcage == 0 && affected.open >= 2
@@ -197,6 +197,8 @@
max_duration = 90
can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if (!ishuman(target))
return 0
var/is_chest_organ_damaged = 0
var/datum/organ/external/chest/chest = target.get_organ("chest")
for(var/datum/organ/internal/I in chest.internal_organs) if(I.damage > 0)
code/modules/virus2/helpers.dm
+2
View File
@@ -63,6 +63,8 @@ proc/airborne_can_reach(turf/source, turf/target)
var/datum/disease2/disease/D = disease.getcopy()
D.minormutate()
M.virus2["[D.uniqueID]"] = D
else
message_admins("Virus2 [disease.uniqueID] could not transmit")
//Infects mob M with random lesser disease, if he doesn't have one
/proc/infect_mob_random_lesser(var/mob/living/carbon/M)