shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TG Sync 12/15/17

Browse Source 
s

s
This commit is contained in:
kevinz000
2017-12-15 06:27:57 -08:00
parent b6b0ab69e3
commit 253c819bc1
762 changed files with 13429 additions and 14872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/ai/ai.dm
+1 -1
View File
@@ -117,7 +117,7 @@
job = "AI"
eyeobj.ai = src
eyeobj.loc = src.loc
eyeobj.forceMove(src.loc)
rename_self("ai")
holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"default"))
code/modules/mob/living/silicon/ai/examine.dm
+24 -24
View File
@@ -1,26 +1,26 @@
/mob/living/silicon/ai/examine(mob/user)
/mob/living/silicon/ai/examine(mob/user)
var/msg = "<span class='info'>*---------*\nThis is [icon2html(src, user)] <EM>[src]</EM>!\n"
if (stat == DEAD)
msg += "<span class='deadsay'>It appears to be powered-down.</span>\n"
else
msg += "<span class='warning'>"
if (getBruteLoss())
if (getBruteLoss() < 30)
msg += "It looks slightly dented.\n"
else
msg += "<B>It looks severely dented!</B>\n"
if (getFireLoss())
if (getFireLoss() < 30)
msg += "It looks slightly charred.\n"
else
msg += "<B>Its casing is melted and heat-warped!</B>\n"
msg += "</span>"
if(deployed_shell)
msg += "The wireless networking light is blinking.\n"
else if (!shunted && !client)
msg += "[src]Core.exe has stopped responding! NTOS is searching for a solution to the problem...\n"
msg += "*---------*</span>"
to_chat(user, msg)
if (stat == DEAD)
msg += "<span class='deadsay'>It appears to be powered-down.</span>\n"
else
msg += "<span class='warning'>"
if (getBruteLoss())
if (getBruteLoss() < 30)
msg += "It looks slightly dented.\n"
else
msg += "<B>It looks severely dented!</B>\n"
if (getFireLoss())
if (getFireLoss() < 30)
msg += "It looks slightly charred.\n"
else
msg += "<B>Its casing is melted and heat-warped!</B>\n"
msg += "</span>"
if(deployed_shell)
msg += "The wireless networking light is blinking.\n"
else if (!shunted && !client)
msg += "[src]Core.exe has stopped responding! NTOS is searching for a solution to the problem...\n"
msg += "*---------*</span>"
to_chat(user, msg)
..()
code/modules/mob/living/silicon/ai/freelook/chunk.dm
+1 -1
View File
@@ -173,4 +173,4 @@
obscured += t.obscured
#undef UPDATE_BUFFER
#undef CHUNK_SIZE
#undef CHUNK_SIZE
code/modules/mob/living/silicon/death.dm
+11 -11
View File
@@ -1,13 +1,13 @@
/mob/living/silicon/spawn_gibs()
/mob/living/silicon/spawn_gibs()
new /obj/effect/gibspawner/robot(get_turf(src))
/mob/living/silicon/spawn_dust()
new /obj/effect/decal/remains/robot(loc)
/mob/living/silicon/death(gibbed)
if(!gibbed)
emote("deathgasp")
diag_hud_set_status()
diag_hud_set_health()
update_health_hud()
/mob/living/silicon/spawn_dust()
new /obj/effect/decal/remains/robot(loc)
/mob/living/silicon/death(gibbed)
if(!gibbed)
emote("deathgasp")
diag_hud_set_status()
diag_hud_set_health()
update_health_hud()
. = ..()
code/modules/mob/living/silicon/pai/pai.dm
+2 -2
View File
@@ -51,7 +51,7 @@
var/obj/machinery/door/hackdoor // The airlock being hacked
var/hackprogress = 0 // Possible values: 0 - 100, >= 100 means the hack is complete and will be reset upon next check
var/obj/item/radio/integrated/signal/sradio // AI's signaller
var/obj/item/integrated_signaler/signaler // AI's signaller
var/holoform = FALSE
var/canholo = TRUE
@@ -101,7 +101,7 @@
P.setPersonality(src)
forceMove(P)
card = P
sradio = new(src)
signaler = new(src)
if(!radio)
radio = new /obj/item/device/radio(src)
code/modules/mob/living/silicon/pai/software.dm
+10 -13
View File
@@ -169,23 +169,20 @@
if("signaller")
if(href_list["send"])
sradio.send_signal("ACTIVATE")
signaler.send_activation()
audible_message("[icon2html(src, world)] *beep* *beep*")
if(href_list["freq"])
var/new_frequency = (sradio.frequency + text2num(href_list["freq"]))
if(new_frequency < 1200 || new_frequency > 1600)
var/new_frequency = (signaler.frequency + text2num(href_list["freq"]))
if(new_frequency < MIN_FREE_FREQ || new_frequency > MAX_FREE_FREQ)
new_frequency = sanitize_frequency(new_frequency)
sradio.set_frequency(new_frequency)
signaler.set_frequency(new_frequency)
if(href_list["code"])
sradio.code += text2num(href_list["code"])
sradio.code = round(sradio.code)
sradio.code = min(100, sradio.code)
sradio.code = max(1, sradio.code)
signaler.code += text2num(href_list["code"])
signaler.code = round(signaler.code)
signaler.code = min(100, signaler.code)
signaler.code = max(1, signaler.code)
@@ -397,14 +394,14 @@
Frequency:
<A href='byond://?src=[REF(src)];software=signaller;freq=-10;'>-</A>
<A href='byond://?src=[REF(src)];software=signaller;freq=-2'>-</A>
[format_frequency(sradio.frequency)]
[format_frequency(signaler.frequency)]
<A href='byond://?src=[REF(src)];software=signaller;freq=2'>+</A>
<A href='byond://?src=[REF(src)];software=signaller;freq=10'>+</A><BR>
Code:
<A href='byond://?src=[REF(src)];software=signaller;code=-5'>-</A>
<A href='byond://?src=[REF(src)];software=signaller;code=-1'>-</A>
[sradio.code]
[signaler.code]
<A href='byond://?src=[REF(src)];software=signaller;code=1'>+</A>
<A href='byond://?src=[REF(src)];software=signaller;code=5'>+</A><BR>
code/modules/mob/living/silicon/robot/life.dm
+1
View File
@@ -50,6 +50,7 @@
if(!mind.special_role)
mind.special_role = "traitor"
SSticker.mode.traitors += mind
mind.add_antag_datum(/datum/antagonist/auto_custom) // ????
/mob/living/silicon/robot/update_health_hud()
code/modules/mob/living/silicon/robot/login.dm
+1
View File
@@ -1,3 +1,4 @@
/mob/living/silicon/robot/Login()
..()
regenerate_icons()
code/modules/mob/living/silicon/robot/robot.dm
+13 -13
View File
@@ -5,8 +5,6 @@
icon_state = "robot"
maxHealth = 100
health = 100
macro_default = "robot-default"
macro_hotkeys = "robot-hotkeys"
bubble_icon = "robot"
designation = "Default" //used for displaying the prefix & getting the current module of cyborg
has_limbs = 1
@@ -248,17 +246,6 @@
return //won't work if dead
robot_alerts()
//for borg hotkeys, here module refers to borg inv slot, not core module
/mob/living/silicon/robot/verb/cmd_toggle_module(module as num)
set name = "Toggle Module"
set hidden = 1
toggle_module(module)
/mob/living/silicon/robot/verb/cmd_unequip_module()
set name = "Unequip Module"
set hidden = 1
uneq_active()
/mob/living/silicon/robot/proc/robot_alerts()
var/dat = ""
for (var/cat in alarms)
@@ -537,6 +524,19 @@
toner = tonermax
qdel(W)
to_chat(user, "<span class='notice'>You fill the toner level of [src] to its max capacity.</span>")
else if(istype(W, /obj/item/device/flashlight))
if(!opened)
to_chat(user, "<span class='warning'>You need to open the panel to repair the headlamp!</span>")
if(lamp_cooldown <= world.time)
to_chat(user, "<span class='warning'>The headlamp is already functional!</span>")
else
if(!user.temporarilyRemoveItemFromInventory(W))
to_chat(user, "<span class='warning'>[W] seems to be stuck to your hand. You'll have to find a different light.</span>")
return
lamp_cooldown = 0
qdel(W)
to_chat(user, "<span class='notice'>You replace the headlamp bulbs.</span>")
else
return ..()
code/modules/mob/living/silicon/robot/robot_modules.dm
+2 -2
View File
@@ -33,8 +33,8 @@
var/ride_allow_incapacitated = FALSE
var/allow_riding = TRUE
/obj/item/robot_module/New()
..()
/obj/item/robot_module/Initialize()
. = ..()
for(var/i in basic_modules)
var/obj/item/I = new i(src)
basic_modules += I