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

Merge pull request #11984 from Markolie/ruinsport

Browse Source 
Netherworld portal fix and butler pick time increase
This commit is contained in:
Fox McCloud
2019-08-14 20:02:29 -04:00
committed by GitHub
parent cfee1cbd17 709163ee8c
commit b3423eac2f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/mission_code/academy.dm
+1 -1
View File
@@ -193,7 +193,7 @@
servant_mind.objectives += O
servant_mind.transfer_to(H)
var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the servant of [user.real_name]?", ROLE_WIZARD, poll_time = 50)
var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the servant of [user.real_name]?", ROLE_WIZARD, poll_time = 300)
if(LAZYLEN(candidates))
var/mob/dead/observer/C = pick(candidates)
message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Dice Servant")
code/modules/mob/living/simple_animal/hostile/netherworld.dm
+6 -4
View File
@@ -69,6 +69,7 @@
desc = null //see examine()
icon_state = "nether"
health = 50
maxHealth = 50
spawn_time = 600 //1 minute
max_mobs = 15
icon = 'icons/mob/nest.dmi'
@@ -76,9 +77,9 @@
mob_types = list(/mob/living/simple_animal/hostile/netherworld/migo, /mob/living/simple_animal/hostile/netherworld, /mob/living/simple_animal/hostile/netherworld/blankbody)
faction = list("nether")
/mob/living/simple_animal/hostile/spawner/nether/Initialize()
.=..()
START_PROCESSING(SSprocessing, src)
/mob/living/simple_animal/hostile/spawner/nether/death()
. = ..()
qdel(src)
/mob/living/simple_animal/hostile/spawner/nether/examine(mob/user)
..()
@@ -96,7 +97,8 @@
"<span class='userdanger'>Touching the portal, you are quickly pulled through into a world of unimaginable horror!</span>")
contents.Add(user)
/mob/living/simple_animal/hostile/spawner/nether/process()
/mob/living/simple_animal/hostile/spawner/nether/Life()
. = ..()
for(var/mob/living/M in contents)
if(M)
playsound(src, 'sound/magic/demon_consume.ogg', 50, 1)