cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 02:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/ParadiseSS13/Paradise into NodeArea

Browse Source
This commit is contained in:
Arkatos1
2019-08-12 16:37:36 +02:00
parent 370d087b2b 4ac4eac0ef
commit a0c6983017
604 changed files with 26931 additions and 8848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/gamemodes/blob/blob.dm
View File

@@ -14,7 +14,6 @@ var/list/blob_nodes = list()
required_enemies = 1
recommended_enemies = 1
restricted_jobs = list("Cyborg", "AI")
free_golems_disabled = TRUE
var/declared = 0
var/burst = 0
@@ -43,9 +42,11 @@ var/list/blob_nodes = list()
for(var/j = 0, j < cores_to_spawn, j++)
if(!possible_blobs.len)
break
var/datum/mind/blob = pick(possible_blobs)
infected_crew += blob
blob.special_role = SPECIAL_ROLE_BLOB
update_blob_icons_added(blob)
blob.restricted_roles = restricted_jobs
log_game("[key_name(blob)] has been selected as a Blob")
possible_blobs -= blob
@@ -67,8 +68,11 @@ var/list/blob_nodes = list()
var/datum/mind/blobmind = blob.mind
if(!istype(blobmind))
return 0
infected_crew += blobmind
blobmind.special_role = SPECIAL_ROLE_BLOB
update_blob_icons_added(blobmind)
log_game("[key_name(blob)] has been selected as a Blob")
greet_blob(blobmind)
to_chat(blob, "<span class='userdanger'>You feel very tired and bloated! You don't have long before you burst!</span>")
@@ -186,16 +190,21 @@ var/list/blob_nodes = list()
return ..()
/datum/game_mode/blob/proc/stage(var/stage)
switch(stage)
if(0)
send_intercept(1)
declared = 1
if(1)
event_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg')
if(2)
send_intercept(2)
return
/datum/game_mode/proc/update_blob_icons_added(datum/mind/mob_mind)
var/datum/atom_hud/antag/antaghud = huds[ANTAG_HUD_BLOB]
antaghud.join_hud(mob_mind.current)
set_antag_hud(mob_mind.current, "hudblob")
/datum/game_mode/proc/update_blob_icons_removed(datum/mind/mob_mind)
var/datum/atom_hud/antag/antaghud = huds[ANTAG_HUD_BLOB]
antaghud.leave_hud(mob_mind.current)
set_antag_hud(mob_mind.current, null)

2
code/game/gamemodes/blob/powers.dm
View File

@@ -389,7 +389,7 @@
set name = "Blob Broadcast"
set desc = "Speak with your blob spores and blobbernauts as your mouthpieces. This action is free."
var/speak_text = input(usr, "What would you like to say with your minions?", "Blob Broadcast", null) as text
var/speak_text = clean_input("What would you like to say with your minions?", "Blob Broadcast", null)
if(!speak_text)
return

2
code/game/gamemodes/blob/theblob.dm
View File

@@ -142,7 +142,7 @@
take_damage(Proj.damage, Proj.damage_type)
return 0
/obj/structure/blob/Crossed(var/mob/living/L)
/obj/structure/blob/Crossed(var/mob/living/L, oldloc)
..()
L.blob_act(src)