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

AND YOU GET A PARENT CALL AND YOU GET A PARENT CALL AND YOU

Browse Source
This commit is contained in:
Aurorablade
2017-01-09 02:31:44 -05:00
parent 0f9cc4fb99
commit c014e72979
12 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/autotraitor/autotraitor.dm
+1
View File
@@ -58,6 +58,7 @@
// if(!traitors.len)
// return 0
..()
return 1
code/game/gamemodes/blob/blob.dm
+1 -1
View File
@@ -51,7 +51,7 @@ var/list/blob_nodes = list()
if(!infected_crew.len)
return 0
..()
return 1
/datum/game_mode/blob/proc/get_blob_candidates()
code/game/gamemodes/changeling/changeling.dm
+1
View File
@@ -55,6 +55,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
changeling.restricted_roles = restricted_jobs
modePlayer += changelings
changeling.special_role = SPECIAL_ROLE_CHANGELING
..()
return 1
else
return 0
code/game/gamemodes/cult/cult.dm
+1
View File
@@ -99,6 +99,7 @@ var/global/list/all_cults = list()
cult += cultist
cultist.restricted_roles = restricted_jobs
cultist.special_role = SPECIAL_ROLE_CULTIST
..()
return (cult.len>0)
code/game/gamemodes/heist/heist.dm
+1
View File
@@ -53,6 +53,7 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
for(var/datum/mind/raider in raiders)
raider.assigned_role = "MODE"
raider.special_role = SPECIAL_ROLE_RAIDER
..()
return 1
/datum/game_mode/heist/pre_setup()
code/game/gamemodes/miniantags/abduction/abduction.dm
+4 -4
View File
@@ -42,7 +42,7 @@
for(var/i=1,i<=abductor_teams,i++)
if(!make_abductor_team(i))
return 0
..()
return 1
/datum/game_mode/abduction/proc/make_abductor_team(team_number,preset_agent=null,preset_scientist=null)
@@ -134,7 +134,7 @@
equip_scientist(H,team_number)
greet_scientist(scientist,team_number)
update_abductor_icons_added(scientist)
return ..()
//Used for create antag buttons
@@ -341,7 +341,7 @@
else
return 0
return 0
/datum/game_mode/proc/remove_abductor(datum/mind/abductor_mind)
if(abductor_mind in abductors)
ticker.mode.abductors -= abductor_mind
@@ -351,7 +351,7 @@
to_chat(abductor_mind.current, "<span class='userdanger'>You have been turned into a robot! You are no longer an abductor.</span>")
else
to_chat(abductor_mind.current, "<span class='userdanger'>You have been brainwashed! You are no longer an abductor.</span>")
ticker.mode.update_abductor_icons_added(abductor_mind)
ticker.mode.update_abductor_icons_added(abductor_mind)
/datum/game_mode/proc/update_abductor_icons_added(datum/mind/alien_mind)
var/datum/atom_hud/antag/hud = huds[ANTAG_HUD_ABDUCTOR]
code/game/gamemodes/nuclear/nuclear.dm
+5 -4
View File
@@ -55,6 +55,7 @@ proc/issyndicate(mob/living/M as mob)
/datum/game_mode/nuclear/pre_setup()
..()
return 1
/datum/game_mode/proc/remove_operative(datum/mind/operative_mind)
@@ -68,8 +69,8 @@ proc/issyndicate(mob/living/M as mob)
to_chat(operative_mind.current, "<span class='userdanger'>You have been turned into a robot! You are no longer a Syndicate operative.</span>")
else
to_chat(operative_mind.current, "<span class='userdanger'>You have been brainwashed! You are no longer a Syndicate operative.</span>")
ticker.mode.update_synd_icons_removed(operative_mind)
ticker.mode.update_synd_icons_removed(operative_mind)
////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////
@@ -161,8 +162,8 @@ proc/issyndicate(mob/living/M as mob)
head_organ.b_hair = color2B(hair_c)
M.change_eye_color(color2R(eye_c), color2G(eye_c), color2B(eye_c))
M.s_tone = skin_tone
head_organ.h_style = random_hair_style(M.gender, head_organ.species.name)
head_organ.f_style = random_facial_hair_style(M.gender, head_organ.species.name)
head_organ.h_style = random_hair_style(M.gender, head_organ.species.name)
head_organ.f_style = random_facial_hair_style(M.gender, head_organ.species.name)
M.body_accessory = null
M.regenerate_icons()
M.update_body()
code/game/gamemodes/shadowling/shadowling.dm
+1
View File
@@ -97,6 +97,7 @@ Made by Xhuis
shadow.special_role = SPECIAL_ROLE_SHADOWLING
shadow.restricted_roles = restricted_jobs
shadowlings--
..()
return 1
code/game/gamemodes/vampire/traitor_vamp.dm
+2 -1
View File
@@ -32,7 +32,8 @@
slaved.masters += vampire
vampire.som = slaved //we MIGT want to mindslave someone
vampire.restricted_roles = restricted_jobs
return ..()
..()
return 1
else
return 0
code/game/gamemodes/vampire/vampire.dm
+1
View File
@@ -59,6 +59,7 @@
slaved.masters += vampire
vampire.som = slaved //we MIGT want to mindslave someone
vampire.special_role = SPECIAL_ROLE_VAMPIRE
..()
return 1
else
return 0
code/game/gamemodes/wizard/wizard.dm
+4 -4
View File
@@ -38,7 +38,7 @@
/datum/game_mode/wizard/pre_setup()
for(var/datum/mind/wiz in wizards)
wiz.current.loc = pick(wizardstart)
..()
return 1
@@ -54,7 +54,7 @@
update_wiz_icons_added(wizard)
..()
/datum/game_mode/proc/remove_wizard(datum/mind/wizard_mind)
if(wizard_mind in wizards)
ticker.mode.wizards -= wizard_mind
@@ -66,8 +66,8 @@
to_chat(wizard_mind.current, "<span class='userdanger'>You have been turned into a robot! You can feel your magical powers fading away...</span>")
else
to_chat(wizard_mind.current, "<span class='userdanger'>You have been brainwashed! You are no longer a wizard.</span>")
ticker.mode.update_wiz_icons_removed(wizard_mind)
ticker.mode.update_wiz_icons_removed(wizard_mind)
/datum/game_mode/proc/update_wiz_icons_added(datum/mind/wiz_mind)
var/datum/atom_hud/antag/wizhud = huds[ANTAG_HUD_WIZ]
wizhud.join_hud(wiz_mind.current)
code/game/machinery/cryo.dm
+1 -1
View File
@@ -451,7 +451,7 @@
add_fingerprint(usr)
return
/obj/machinery/bodyscanner/narsie_act()
/obj/machinery/atmospherics/unary/cryo_cell/narsie_act()
go_out()
new /obj/effect/gibspawner/generic(get_turf(loc)) //I REPLACE YOUR TECHNOLOGY WITH FLESH!
color = "red"//force the icon to red