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

Slime update

Browse Source 
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/say.dm
	code/modules/mob/transform_procs.dm
	code/modules/reagents/Chemistry-Recipes.dm
	maps/tgstation2.dmm
This commit is contained in:
Kelenius
2014-07-15 00:50:41 -04:00
committed by ZomgPonies
parent 9ed850c40f
commit c54b9e3626
34 changed files with 912 additions and 1056 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents.dm
+1 -1
View File
@@ -309,7 +309,7 @@ datum
T.wet_overlay = null
for(var/mob/living/carbon/slime/M in T)
M.adjustToxLoss(rand(15,20))
M.apply_water()
var/hotspot = (locate(/obj/fire) in T)
if(hotspot && !istype(T, /turf/space))
code/modules/reagents/Chemistry-Recipes.dm
+6 -6
View File
@@ -1271,10 +1271,11 @@ datum
required_container = /obj/item/slime_extract/yellow
required_other = 1
on_reaction(var/datum/reagents/holder)
for(var/mob/O in viewers(get_turf_loc(holder.my_atom), null))
O.show_message(text("\red The slime begins to emit a soft light."), 1)
var/obj/item/slime_extract/yellow/Y = holder
Y.luminosity = 6
for(var/mob/O in viewers(get_turf(holder.my_atom), null))
O.show_message(text("\red The contents of the slime core harden and begin to emit a warm, bright light."), 1)
var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime
F.loc = get_turf(holder.my_atom)
//Purple
slimepsteroid
@@ -1335,8 +1336,7 @@ datum
required_container = /obj/item/slime_extract/red
required_other = 1
on_reaction(var/datum/reagents/holder)
for(var/mob/living/carbon/slime/slime in viewers(get_turf_loc(holder.my_atom), null))
slime.tame = 0
for(var/mob/living/carbon/slime/slime in viewers(get_turf(holder.my_atom), null))
slime.rabid = 1
for(var/mob/O in viewers(get_turf_loc(holder.my_atom), null))
O.show_message(text("\red The [slime] is driven into a frenzy!."), 1)