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

zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz

Browse Source
This commit is contained in:
Aurorablade
2015-12-15 03:08:16 -05:00
parent 76eaf85c11
commit c3f662a6dc
15 changed files with 46 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mind.dm
+5 -3
View File
@@ -628,10 +628,10 @@
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
log_admin("[key_name(usr)] has given [key_name(current)] a loyalty implant")
message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] a loyalty implant")
@@ -891,7 +891,7 @@
ticker.mode.vampires -= src
special_role = null
current.remove_vampire_powers()
ticker.mode.update_vampire_icons_removed(current)
ticker.mode.update_vampire_icons_removed(src)
if(vampire) qdel(vampire)
current << "<FONT color='red' size = 3><B>You grow weak and lose your powers! You are no longer a vampire and are stuck in your current form!</B></FONT>"
log_admin("[key_name(usr)] has de-vampired [key_name(current)]")
@@ -900,7 +900,7 @@
if(!(src in ticker.mode.vampires))
ticker.mode.vampires += src
ticker.mode.grant_vampire_powers(current)
ticker.mode.update_vampire_icons_added(current)
ticker.mode.update_vampire_icons_added(src)
special_role = "Vampire"
current << "<B><font color='red'>Your powers are awoken. Your lust for blood grows... You are a Vampire!</font></B>"
log_admin("[key_name(usr)] has vampired [key_name(current)]")
@@ -991,6 +991,7 @@
var/mob/living/silicon/ai/A = current
A.set_zeroth_law("")
A.show_laws()
ticker.mode.update_traitor_icons_removed(src)
if("traitor")
@@ -1004,6 +1005,7 @@
var/mob/living/silicon/A = current
call(/datum/game_mode/proc/add_law_zero)(A)
A.show_laws()
ticker.mode.update_traitor_icons_added(src)
if("autoobjectives")
ticker.mode.forge_traitor_objectives(src)
code/game/gamemodes/cult/cult.dm
+2 -5
View File
@@ -211,9 +211,6 @@
M << "<FONT size = 3>[cult_mind.current] looks like they just reverted to their old faith!</FONT>"
//reset_cult_icons_for_spirit(currentSpirit)
/datum/game_mode/proc/reset_cult_icons_for_cultist(var/datum/mind/target)
if(target.current)
if(target.current.client)
@@ -314,7 +311,7 @@
var/datum/atom_hud/antag/culthud = huds[ANTAG_HUD_CULT]
culthud.join_hud(cult_mind.current)
set_antag_hud(cult_mind, "hudcultist")
set_antag_hud(cult_mind.current, "hudcultist")
/datum/game_mode/proc/update_cult_icons_removed(datum/mind/cult_mind)
@@ -325,7 +322,7 @@
// remove_cult_icon_from_spirit(currentSpirit,cult_mind)
var/datum/atom_hud/antag/culthud = huds[ANTAG_HUD_CULT]
culthud.leave_hud(cult_mind.current)
set_antag_hud(cult_mind, null)
set_antag_hud(cult_mind.current, null)
/datum/game_mode/cult/proc/get_unconvertables()
code/game/gamemodes/nations/nations.dm
+2 -2
View File
@@ -266,9 +266,9 @@ datum/game_mode/nations
/datum/game_mode/proc/update_nations_icons_added(datum/mind/nations_mind,var/naticon)
var/datum/atom_hud/antag/nations_hud = huds[GAME_HUD_NATIONS]
nations_hud.join_hud(nations_mind)
set_nations_hud(nations_mind,naticon)
set_nations_hud(nations_mind.current,naticon)
/datum/game_mode/proc/update_nations_icons_removed(datum/mind/nations_mind)
var/datum/atom_hud/antag/nations_hud = huds[GAME_HUD_NATIONS]
nations_hud.leave_hud(nations_mind)
set_nations_hud(nations_mind, null)
set_nations_hud(nations_mind.current, null)
code/game/gamemodes/traitor/traitor.dm
+7 -24
View File
@@ -171,7 +171,6 @@
/datum/game_mode/proc/greet_traitor(var/datum/mind/traitor)
traitor.current << "<B><font size=3 color=red>You are the traitor.</font></B>"
var/obj_count = 1
set_antag_hud(traitor, "hudsyndicate")
for(var/datum/objective/objective in traitor.objectives)
traitor.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
obj_count++
@@ -341,25 +340,17 @@
var/ref = "\ref[traitor_mind]"
if(ref in implanter)
if(traitor_mind.current)
if(traitor_mind.current.client)
var/I = image('icons/mob/mob.dmi', loc = traitor_mind.current, icon_state = "greytide_head")
traitor_mind.current.client.images += I
set_antag_hud(traitor_mind.current, "hudsyndicate")
for(var/headref in implanter)
for(var/datum/mind/t_mind in implanter[headref])
var/datum/mind/head = locate(headref)
if(head)
if(head.current)
if(head.current.client)
var/I = image('icons/mob/mob.dmi', loc = t_mind.current, icon_state = "greytide")
head.current.client.images += I
set_antag_hud(head.current, "hudsyndicate")
if(t_mind.current)
if(t_mind.current.client)
var/I = image('icons/mob/mob.dmi', loc = head.current, icon_state = "greytide_head")
t_mind.current.client.images += I
if(t_mind.current)
if(t_mind.current.client)
var/I = image('icons/mob/mob.dmi', loc = t_mind.current, icon_state = "greytide")
t_mind.current.client.images += I
set_antag_hud(t_mind.current, "hudsyndicate")
/datum/game_mode/proc/update_traitor_icons_removed(datum/mind/traitor_mind)
for(var/headref in implanter)
@@ -367,23 +358,15 @@
for(var/datum/mind/t_mind in implanter[headref])
if(t_mind.current)
if(t_mind.current.client)
for(var/image/I in t_mind.current.client.images)
if((I.icon_state == "greytide" || I.icon_state == "greytide_head") && I.loc == traitor_mind.current)
//log_to_dd("deleting [traitor_mind] overlay")
qdel(I)
set_antag_hud(t_mind.current, null)
if(head)
//log_to_dd("found [head.name]")
if(head.current)
if(head.current.client)
for(var/image/I in head.current.client.images)
if((I.icon_state == "greytide" || I.icon_state == "greytide_head") && I.loc == traitor_mind.current)
//log_to_dd("deleting [traitor_mind] overlay")
qdel(I)
if(traitor_mind.current)
set_antag_hud(head.current, null)
if(traitor_mind.current.client)
for(var/image/I in traitor_mind.current.client.images)
if(I.icon_state == "greytide" || I.icon_state == "greytide_head")
qdel(I)
set_antag_hud(traitor_mind.current, null)
/datum/game_mode/proc/remove_traitor_mind(datum/mind/traitor_mind, datum/mind/head)
//var/list/removal
code/game/gamemodes/vampire/vampire.dm
+2 -2
View File
@@ -381,12 +381,12 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
/datum/game_mode/proc/update_vampire_icons_added(datum/mind/vampire_mind)
// var/datum/atom_hud/antag/vamp_hud = huds[ANTAG_HUD_VAMPIRE]
// vamp_hud.join_hud(vampire_mind)
set_antag_hud(vampire_mind, ((vampire_mind in vampires) ? "hudvampire" : "hudvampirethrall"))
set_antag_hud(vampire_mind.current, ((vampire_mind in vampires) ? "hudvampire" : "hudvampirethrall"))
/datum/game_mode/proc/update_vampire_icons_removed(datum/mind/vampire_mind)
// var/datum/atom_hud/antag/vampire_hud = huds[ANTAG_HUD_VAMPIRE]
// vampire_hud.leave_hud(vampire_mind)
set_antag_hud(vampire_mind, null)
set_antag_hud(vampire_mind.current, null)
/datum/game_mode/proc/remove_vampire_mind(datum/mind/vampire_mind, datum/mind/head)
//var/list/removal
code/game/jobs/job/security.dm
+7 -7
View File
@@ -43,10 +43,10 @@
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
return 1
@@ -90,10 +90,10 @@
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
return 1
@@ -146,10 +146,10 @@
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
H.dna.SetSEState(SOBERBLOCK,1)
H.mutations += SOBER
@@ -194,10 +194,10 @@
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
return 1
/datum/job/brigdoc
@@ -221,7 +221,7 @@
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/security/brigphys(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/suit/storage/fr_jacket(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/clothing/glasses/hud/health_advanced, slot_glasses)
H.equip_or_collect(new /obj/item/clothing/glasses/hud/health/health_advanced, slot_glasses)
H.equip_or_collect(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/medical(H), slot_wear_pda)
H.equip_or_collect(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
@@ -233,10 +233,10 @@
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
return 1
/datum/job/pilot
@@ -274,8 +274,8 @@
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
return 1
code/game/jobs/job/supervisor.dm
+6 -6
View File
@@ -38,11 +38,11 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
captain_announcement.Announce("All hands, captain [H.real_name] on deck!")
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
callHook("captain_spawned", list("captain" = H))
return 1
@@ -137,10 +137,10 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
return 1
/datum/job/blueshield
@@ -173,7 +173,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/clothing/gloves/combat(H), slot_gloves)
H.equip_or_collect(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
H.equip_or_collect(new /obj/item/clothing/glasses/hud/health_advanced, slot_glasses)
H.equip_or_collect(new /obj/item/clothing/glasses/hud/health/health_advanced, slot_glasses)
H.equip_or_collect(new /obj/item/clothing/under/rank/blueshield(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/suit/armor/vest/blueshield(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store)
@@ -185,10 +185,10 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
return 1
/datum/job/judge
@@ -229,10 +229,10 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
return 1
//var/global/lawyer = 0//Checks for another lawyer //This changed clothes on 2nd lawyer, both IA get the same dreds.
@@ -272,8 +272,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
H.sec_hud_set_implants()
var/obj/item/organ/external/affected = H.organs_by_name["head"]
affected.implants += L
L.part = affected
H.sec_hud_set_implants()
return 1
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+1 -1
View File
@@ -248,7 +248,7 @@
new /obj/item/weapon/restraints/handcuffs(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/glasses/hud/health_advanced
new /obj/item/clothing/glasses/hud/health/health_advanced
new /obj/item/clothing/head/beret/centcom/officer(src)
new /obj/item/clothing/suit/armor/vest/blueshield(src)
new /obj/item/clothing/suit/storage/blueshield(src)
code/game/response_team.dm
+1 -1
View File
@@ -475,7 +475,7 @@ var/send_emergency_team
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex/nitrile(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/ert/medical(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health_advanced(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/health_advanced(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/weapon/defibrillator/compact/loaded(M), slot_belt)
code/modules/clothing/glasses/glasses.dm
+1 -2
View File
@@ -10,7 +10,6 @@
var/prescription = 0
var/prescription_upgradable = 0
var/see_darkness = 1
var/HUDType = null
/obj/item/clothing/glasses/New()
. = ..()
@@ -235,7 +234,7 @@
darkness_view = 1
flash_protect = 1
tint = 1
HUDType = DATA_HUD_SECURITY_BASIC
//HUDType = DATA_HUD_SECURITY_BASIC
prescription_upgradable = 1
species_fit = list("Vox")
sprite_sheets = list(
code/modules/clothing/glasses/hud.dm
+11 -1
View File
@@ -3,7 +3,7 @@
desc = "A heads-up display that provides important info in (almost) real time."
flags = null //doesn't protect eyes because it's a monocle, duh
origin_tech = "magnets=3;biotech=2"
HUDType = null //Hudtype is defined on glasses.dm
var/HUDType = null //Hudtype is defined on glasses.dm
prescription_upgradable = 1
var/list/icon/current = list() //the current hud icons
@@ -29,8 +29,18 @@
icon_state = "healthhud"
HUDType = DATA_HUD_MEDICAL_ADVANCED
///DELETE ME AFTER MAP FREEZE!!!!!!!!///
/obj/item/clothing/glasses/hud/health_advanced
name = "\improper Advanced Health Scanner HUD"
/obj/item/clothing/glasses/hud/health_advanced/New()
new /obj/item/clothing/glasses/hud/health/health_advanced (loc)
qdel(src)
/////!!!!!1111!!!!!!!!/////////////////
/obj/item/clothing/glasses/hud/health/health_advanced
name = "\improper Advanced Health Scanner HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status. Includes anti-flash filter."
icon_state = "advmedhud"
flash_protect = 1
code/modules/mob/living/carbon/human/examine.dm
+1 -1
View File
@@ -488,7 +488,7 @@
if("security")
return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/hud/security/sunglasses)
if("medical")
return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health_advanced)
return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health/health_advanced)
else
return 0
else if(istype(M, /mob/living/silicon))
code/modules/mob/living/carbon/human/human.dm
-1
View File
@@ -37,7 +37,6 @@
var/mob/M = src
faction |= "\ref[M]" //what
prepare_data_huds()
// Set up DNA.
if(!delay_ready_dna && dna)
dna.ready_dna(src)
code/modules/mob/living/carbon/human/human_damage.dm
-2
View File
@@ -22,8 +22,6 @@
if(B)
if((health >= (config.health_threshold_dead / 100 * 75)) && stat == DEAD)
update_revive()
med_hud_set_health()
med_hud_set_status()
if(stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
update_revive()
med_hud_set_health()
code/modules/mob/living/carbon/human/species/monkey.dm
-8
View File
@@ -33,14 +33,6 @@
flags = IS_RESTRICTED
/mob/living/carbon/human/monkey/prepare_data_huds()
//Prepare our med HUD...
..()
//...and display it.
for(var/datum/atom_hud/data/human/medical/hud in huds)
hud.add_to_hud(src)
/datum/species/monkey/handle_npc(var/mob/living/carbon/human/H)
if(H.stat != CONSCIOUS)
return