cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #175 from alex-gh/fixes_and_cherrypicks

Browse Source 
Fixes, cherrypicks and improvements
This commit is contained in:
ZomgPonies
2014-03-24 08:31:51 -04:00
parent d65f57913e 2b5dbab3b2
commit 01b7f673c2
13 changed files with 117 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/event_dynamic.dm
+4 -4
View File
@@ -44,9 +44,9 @@ var/global/list/possibleEvents = list()
//see:
// Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events.dm
// Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events_Mundane.dm
possibleEvents[/datum/event/economic_event] = 200
possibleEvents[/datum/event/trivial_news] = 300
possibleEvents[/datum/event/mundane_news] = 200
possibleEvents[/datum/event/economic_event] = 150
possibleEvents[/datum/event/trivial_news] = 200
possibleEvents[/datum/event/mundane_news] = 150
possibleEvents[/datum/event/mass_hallucination] = 200
possibleEvents[/datum/event/falsealarm] = 300
@@ -88,7 +88,7 @@ var/global/list/possibleEvents = list()
possibleEvents[/datum/event/anomaly/anomaly_bluespace] = 50 + 25 * active_with_role["Engineer"]
possibleEvents[/datum/event/anomaly/anomaly_flux] = 50 + 50 * active_with_role["Engineer"]
possibleEvents[/datum/event/viral_infection] = 25 + active_with_role["Medical"] * 100
possibleEvents[/datum/event/viral_infection] = 25 + active_with_role["Medical"] * 50
if(active_with_role["Medical"] > 0)
possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 50
possibleEvents[/datum/event/spontaneous_appendicitis] = active_with_role["Medical"] * 150
code/modules/mob/living/simple_animal/hostile/hostile.dm
+3 -1
View File
@@ -274,6 +274,8 @@
for(var/atom/A in T)
if(!A.Adjacent(src))
continue
if(istype(A, /obj/structure/window) || istype(A, /obj/structure/closet) || istype(A, /obj/structure/table) || istype(A, /obj/structure/grille) || istype(A, /obj/structure/rack))
if(istype(A, /obj/structure/window) || istype(A, /obj/structure/closet) || \
istype(A, /obj/structure/table) || istype(A, /obj/structure/grille) || \
istype(A, /obj/structure/rack) || istype(A, /obj/machinery/door/window))
A.attack_animal(src)
return
code/modules/reagents/Chemistry-Reagents.dm
+28
View File
@@ -2016,6 +2016,34 @@ datum
if( (prob(10) && method==TOUCH) || method==INGEST)
M.contract_disease(new /datum/disease/xeno_transformation(0),1)
spore
name = "Blob Spores"
id = "spore"
description = "Spores of some blob creature thingy."
reagent_state = LIQUID
color = "#CE760A" // rgb: 206, 118, 10
var/client/blob_client = null
var/blob_point_rate = 3
on_mob_life(var/mob/living/M)
if(!M) M = holder.my_atom
if (holder.has_reagent("plantbgone",45))
holder.del_reagent("spore")
if (prob(1))
M << "\red Your mouth tastes funny."
if (prob(1) && prob(25))
if(iscarbon(M))
var/mob/living/carbon/C = M
if(directory[ckey(C.key)])
blob_client = directory[ckey(C.key)]
C.gib()
if(blob_client)
var/obj/effect/blob/core/core = new(get_turf(C), 200, blob_client, blob_point_rate)
if(core.overmind && core.overmind.mind)
core.overmind.mind.name = C.name
return
//foam precursor
fluorosurfactant