cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixin stuff

Browse Source
This commit is contained in:
DeityLink
2015-11-02 14:27:01 +01:00
parent c5bf2c5834
commit 61839e93c8
9 changed files with 71 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__HELPERS/_macros.dm
View File

@@ -63,6 +63,8 @@
#define isobserver(A) istype(A, /mob/dead/observer)
#define isnewplayer(A) istype(A, /mob/new_player)
#define isovermind(A) istype(A, /mob/camera/blob)
#define isorgan(A) istype(A, /datum/organ/external)

8
code/game/gamemodes/gameticker.dm
View File

@@ -516,6 +516,14 @@ var/global/datum/controller/gameticker/ticker
ai_completions += {"<br><b><img src="logo_[tempstate].png"> [robo.name] (Played by: [robo.key]) [robo.stat!=2?"survived":"perished"] as a [isMoMMI(robo)?"MoMMI":"cyborg"] slaved to [robo.connected_ai]! Its laws were:</b>"}
ai_completions += "<br>[robo.write_laws()]"
for(var/mob/living/silicon/pai/pAI in mob_list)
var/icon/flat
flat = getFlatIcon(pAI)
end_icons += flat
var/tempstate = end_icons.len
ai_completions += {"<br><b><img src="logo_[tempstate].png"> [pAI.name] (Played by: [pAI.key]) [pAI.stat!=2?"survived":"perished"] as a pAI whose master was [pAI.master]! Its directives were:</b>"}
ai_completions += "<br>[pAI.write_directives()]"
mode.declare_completion()//To declare normal completion.
ai_completions += "<HR><BR><h2>Mode Result</h2>"

4
code/game/gamemodes/wizard/rightandwrong.dm
View File

@@ -20,7 +20,7 @@
for(var/datum/objective/OBJ in H.mind.objectives)
H << "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]"
obj_count++
var/randomizeguns = pick("taser","egun","laser","revolver","detective","smg","nuclear","deagle","gyrojet","pulse","silenced","cannon","doublebarrel","shotgun","combatshotgun","mateba","smg","uzi","crossbow","saw","hecate","osipr","gatling","bison","ricochet","spur", "nagant")
var/randomizeguns = pick("taser","egun","laser","revolver","detective","smg","nuclear","deagle","gyrojet","pulse","silenced","cannon","doublebarrel","shotgun","combatshotgun","mateba","smg","uzi","crossbow","saw","hecate","osipr","gatling","bison","ricochet","spur","nagant","beegun")
var/randomizemagic = pick("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge","wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying")
if(!summon_type)
switch (randomizeguns)
@@ -82,6 +82,8 @@
new /obj/item/device/modkit/spur_parts(get_turf(H))
if("nagant")
new /obj/item/weapon/gun/projectile/nagant(get_turf(H))
if("beegun")
new /obj/item/weapon/gun/gatling/beegun(get_turf(H))
else
switch (randomizemagic)
if("fireball")

40
code/game/objects/items/devices/paicard.dm
View File

@@ -130,26 +130,30 @@
/obj/item/device/paicard/proc/setEmotion(var/emotion)
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/obj/item/device/paicard/proc/setEmotion() called tick#: [world.time]")
if(pai)
var/face = "pai-happy"
src.overlays.len = 0
pai.overlays.len = 0
switch(emotion)
if(1) src.overlays += "pai-happy"
if(2) src.overlays += "pai-cat"
if(3) src.overlays += "pai-extremely-happy"
if(4) src.overlays += "pai-face"
if(5) src.overlays += "pai-laugh"
if(6) src.overlays += "pai-off"
if(7) src.overlays += "pai-sad"
if(8) src.overlays += "pai-angry"
if(9) src.overlays += "pai-what"
if(10) src.overlays += "pai-longface"
if(11) src.overlays += "pai-sick"
if(12) src.overlays += "pai-high"
if(13) src.overlays += "pai-love"
if(14) src.overlays += "pai-electric"
if(15) src.overlays += "pai-pissed"
if(16) src.overlays += "pai-nose"
if(17) src.overlays += "pai-kawaii"
if(18) src.overlays += "pai-cry"
if(1) face = "pai-happy"
if(2) face = "pai-cat"
if(3) face = "pai-extremely-happy"
if(4) face = "pai-face"
if(5) face = "pai-laugh"
if(6) face = "pai-off"
if(7) face = "pai-sad"
if(8) face = "pai-angry"
if(9) face = "pai-what"
if(10) face = "pai-longface"
if(11) face = "pai-sick"
if(12) face = "pai-high"
if(13) face = "pai-love"
if(14) face = "pai-electric"
if(15) face = "pai-pissed"
if(16) face = "pai-nose"
if(17) face = "pai-kawaii"
if(18) face = "pai-cry"
src.overlays.len += "[face]"
pai.overlays.len += "[face]"//we also update the mob's overlay so it appears properly on the scoreboard.
/obj/item/device/paicard/proc/alertUpdate()
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/obj/item/device/paicard/proc/alertUpdate() called tick#: [world.time]")

5
code/game/verbs/who.dm
View File

@@ -14,7 +14,8 @@
if (C.holder && C.holder.fakekey)
entry += " <i>(as [C.holder.fakekey])</i>"
entry += " - Playing as [C.mob.real_name]"
if(C.mob.real_name)
entry += " - Playing as [C.mob.real_name]"
switch (C.mob.stat)
if (UNCONSCIOUS)
@@ -28,6 +29,8 @@
entry += " - <font color='gray'>Observing</font>"
else
entry += " - <font color='black'><b>DEAD</b></font>"
else if (isnewplayer(C.mob))
entry += " - <i>Lobby</i>"
else
entry += " - <font color='black'><b>DEAD</b></font>"

8
code/modules/admin/admin.dm
View File

@@ -1325,12 +1325,16 @@ var/global/floorIsLava = 0
var/mob/living/silicon/robot/R = S
usr << "<b>CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independant)"]: laws:</b>"
else if (ispAI(S))
usr << "<b>pAI [key_name(S, usr)]'s laws:</b>"
var/mob/living/silicon/pai/pAI = S
usr << "<b>pAI [key_name(S, usr)]'s laws (master: [pAI.master] ):</b>"
else
usr << "<b>SOMETHING SILICON [key_name(S, usr)]'s laws:</b>"
if (S.laws == null)
if (S.laws == null && !ispAI(S))
usr << "[key_name(S, usr)]'s laws are null?? Contact a coder."
else if(ispAI(S))
var/mob/living/silicon/pai/pAI = S
pAI.show_directives(usr)
else
S.laws.show_laws(usr)
if(!ai_number)

10
code/modules/admin/verbs/antag_madness.dm
View File

@@ -441,9 +441,11 @@ client/proc/antag_madness(var/mob/M in mob_list)
M.equip_to_slot_or_del(new/obj/item/clothing/shoes/swat, slot_shoes)
M.equip_to_slot_or_del(new/obj/item/clothing/mask/gas/swat, slot_wear_mask)
M.equip_to_slot_or_del(new/obj/item/weapon/storage/backpack/security, slot_back)
M.equip_to_slot_or_del(new/obj/item/weapon/card/id/centcom, slot_wear_id)
var/obj/item/weapon/card/id/centcom/ID = new(M)
ID.icon_state = "deathsquad"
M.equip_to_slot_or_del(ID, slot_wear_id)
M.equip_to_slot_or_del(new/obj/item/clothing/head/helmet/space/rig/deathsquad, slot_head)
M.equip_to_slot_or_del(new/obj/item/clothing/suit/armor/swat, slot_wear_suit)
M.equip_to_slot_or_del(new/obj/item/clothing/suit/space/rig/deathsquad, slot_wear_suit)
M.equip_to_slot_or_del(new/obj/item/clothing/gloves/swat, slot_gloves)
M.equip_to_slot_or_del(new/obj/item/weapon/gun/energy/pulse_rifle/M1911, slot_belt)
M.equip_to_slot_or_del(new/obj/item/weapon/tank/emergency_oxygen/double, slot_s_store)
@@ -538,10 +540,10 @@ client/proc/antag_madness(var/mob/M in mob_list)
M.equip_to_slot_or_del(S, slot_r_hand)
var/obj/item/weapon/teleportation_scroll/T = new/obj/item/weapon/teleportation_scroll(M)
S.uses = 10
T.uses = 10
M.equip_to_slot_or_del(T, slot_l_store)
M << "You will find a list of available spells in your spell book. It many more spells than normal spellbooks."
M << "You will find a list of available spells in your spell book. It has many more spells than normal spellbooks."
M << "In your pockets you will find a teleport scroll.It has twice as many uses as normal teleport scrolls."
M.regenerate_icons()

6
code/modules/clothing/glasses/hud.dm
View File

@@ -16,7 +16,7 @@
/obj/item/clothing/glasses/hud/health
name = "Health Scanner HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
desc = "A heads-up display that scans the humanoid carbon lifeforms in view and provides accurate data about their health status."
icon_state = "healthhud"
/obj/item/clothing/glasses/hud/health/process_hud(var/mob/M)
@@ -26,7 +26,7 @@
/obj/item/clothing/glasses/hud/security
name = "Security HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
desc = "A heads-up display that scans the humanoid carbon lifeforms in view and provides accurate data about their ID status and security records."
icon_state = "securityhud"
/obj/item/clothing/glasses/hud/security/jensenshades
@@ -47,4 +47,4 @@
/obj/item/clothing/glasses/hud/security/process_hud(var/mob/M)
if(harm_labeled < min_harm_label)
process_sec_hud(M,1)
process_sec_hud(M,1)

17
code/modules/mob/living/silicon/pai/pai.dm
View File

@@ -90,6 +90,23 @@
usr << browse_rsc('html/paigrid.png') // Go ahead and cache the interface resources as early as possible
/mob/living/silicon/pai/proc/show_directives(var/who)
if (src.pai_law0)
who << "Prime Directive: [src.pai_law0]"
if (src.pai_laws)
who << "Additional Directives: [src.pai_laws]"
/mob/living/silicon/pai/proc/write_directives()
var/dat = ""
if (src.pai_law0)
dat += "Prime Directive: [src.pai_law0]"
if (src.pai_laws)
dat += "<br>Additional Directives: [src.pai_laws]"
return dat
// this function shows the information about being silenced as a pAI in the Status panel
/mob/living/silicon/pai/proc/show_silenced()
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/mob/living/silicon/pai/proc/show_silenced() called tick#: [world.time]")