shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ports commit "fixes space vines" by AnturK (#12254)

Browse Source 
* Update spacevine.dm

* Update spacevine.dm
This commit is contained in:
Trilbyspaceclone
2020-05-14 15:07:32 +02:00
committed by GitHub
parent 99425bbd88
commit f0cf2f8cfa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/spacevine.dm
+3 -3
View File
@@ -22,7 +22,8 @@
if(turfs.len) //Pick a turf to spawn at if we can if(turfs.len) //Pick a turf to spawn at if we can
var/turf/T = pick(turfs) var/turf/T = pick(turfs)
new /datum/spacevine_controller(T, pick(subtypesof(/datum/spacevine_mutation)), rand(30,100), rand(5,10), src) //spawn a controller at turf with randomized stats and a single random mutation new /datum/spacevine_controller(T, list(pick(subtypesof(/datum/spacevine_mutation))), rand(30,100), rand(5,10), src) //spawn a controller at turf with randomized stats and a single random mutation
/datum/spacevine_mutation /datum/spacevine_mutation
@@ -416,7 +417,6 @@
if(muts && muts.len) if(muts && muts.len)
for(var/datum/spacevine_mutation/M in muts) for(var/datum/spacevine_mutation/M in muts)
M.add_mutation_to_vinepiece(SV) M.add_mutation_to_vinepiece(SV)
return
if(parent) if(parent)
SV.mutations |= parent.mutations SV.mutations |= parent.mutations
var/parentcolor = parent.atom_colours[FIXED_COLOUR_PRIORITY] var/parentcolor = parent.atom_colours[FIXED_COLOUR_PRIORITY]
@@ -541,4 +541,4 @@
var/mob/living/M = A var/mob/living/M = A
if(("vines" in M.faction) || ("plants" in M.faction)) if(("vines" in M.faction) || ("plants" in M.faction))
return TRUE return TRUE
return FALSE return FALSE