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

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/pai/pai.dm
+5 -4
View File
@@ -55,7 +55,7 @@
var/canholo = TRUE
var/obj/item/weapon/card/id/access_card = null
var/chassis = "repairbot"
var/list/possible_chassis = list("cat", "mouse", "monkey", "corgi", "fox", "repairbot", "rabbit", "wolf")
var/list/possible_chassis = list("cat", "mouse", "monkey", "corgi", "fox", "repairbot", "rabbit")
var/emitterhealth = 20
var/emittermaxhealth = 20
@@ -70,7 +70,7 @@
canmove = FALSE
var/silent = 0
var/hit_slowdown = 0
var/light_power = 5
var/brightness_power = 5
var/slowdown = 0
/mob/living/silicon/pai/movement_delay()
@@ -81,7 +81,8 @@
pai_list -= src
..()
/mob/living/silicon/pai/New(var/obj/item/device/paicard/P)
/mob/living/silicon/pai/Initialize()
var/obj/item/device/paicard/P = loc
START_PROCESSING(SSfastprocess, src)
pai_list += src
make_laws()
@@ -212,7 +213,7 @@
/mob/living/silicon/pai/examine(mob/user)
..()
user << "A personal AI in holochassis mode. Its master ID string seems to be [master]."
to_chat(user, "A personal AI in holochassis mode. Its master ID string seems to be [master].")
/mob/living/silicon/pai/Life()
if(stat == DEAD)
code/modules/mob/living/silicon/pai/pai_defense.dm
+3 -3
View File
@@ -48,10 +48,10 @@
. = ..(Proj)
/mob/living/silicon/pai/stripPanelUnequip(obj/item/what, mob/who, where) //prevents stripping
src << "<span class='warning'>Your holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.</span>"
to_chat(src, "<span class='warning'>Your holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.</span>")
/mob/living/silicon/pai/stripPanelEquip(obj/item/what, mob/who, where) //prevents stripping
src << "<span class='warning'>Your holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.</span>"
to_chat(src, "<span class='warning'>Your holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.</span>")
/mob/living/silicon/pai/IgniteMob(var/mob/living/silicon/pai/P)
return FALSE //No we're not flammable
@@ -60,7 +60,7 @@
emitterhealth = Clamp((emitterhealth - amount), -50, emittermaxhealth)
if(emitterhealth < 0)
fold_in(force = TRUE)
src << "<span class='userdanger'>The impact degrades your holochassis!</span>"
to_chat(src, "<span class='userdanger'>The impact degrades your holochassis!</span>")
hit_slowdown += amount
return amount
code/modules/mob/living/silicon/pai/pai_shell.dm
+11 -11
View File
@@ -1,11 +1,11 @@
/mob/living/silicon/pai/proc/fold_out(force = FALSE)
if(emitterhealth < 0)
src << "<span class='warning'>Your holochassis emitters are still too unstable! Please wait for automatic repair.</span>"
to_chat(src, "<span class='warning'>Your holochassis emitters are still too unstable! Please wait for automatic repair.</span>")
return FALSE
if(!canholo && !force)
src << "<span class='warning'>Your master or another force has disabled your holochassis emitters!</span>"
to_chat(src, "<span class='warning'>Your master or another force has disabled your holochassis emitters!</span>")
return FALSE
if(holoform)
@@ -13,7 +13,7 @@
return
if(emittersemicd)
src << "<span class='warning'>Error: Holochassis emitters recycling. Please try again later.</span>"
to_chat(src, "<span class='warning'>Error: Holochassis emitters recycling. Please try again later.</span>")
return FALSE
emittersemicd = TRUE
@@ -27,14 +27,14 @@
if(istype(card.loc, /mob/living))
var/mob/living/L = card.loc
if(!L.temporarilyRemoveItemFromInventory(card))
src << "<span class='warning'>Error: Unable to expand to mobile form. Chassis is restrained by some device or person.</span>"
to_chat(src, "<span class='warning'>Error: Unable to expand to mobile form. Chassis is restrained by some device or person.</span>")
return FALSE
forceMove(get_turf(card))
card.forceMove(src)
if(client)
client.perspective = EYE_PERSPECTIVE
client.eye = src
SetLuminosity(0)
set_light(0)
icon_state = "[chassis]"
visible_message("<span class='boldnotice'>[src] folds out its holochassis emitter and forms a holoshell around itself!</span>")
holoform = TRUE
@@ -62,7 +62,7 @@
forceMove(card)
canmove = FALSE
density = FALSE
SetLuminosity(0)
set_light(0)
holoform = FALSE
if(resting)
lay_down()
@@ -75,7 +75,7 @@
icon_state = "[chassis]"
if(resting)
icon_state = "[chassis]_rest"
src << "<span class='boldnotice'>You switch your holochassis projection composite to [chassis]</span>"
to_chat(src, "<span class='boldnotice'>You switch your holochassis projection composite to [chassis]</span>")
/mob/living/silicon/pai/lay_down()
..()
@@ -94,11 +94,11 @@
/mob/living/silicon/pai/proc/toggle_integrated_light()
if(!luminosity)
SetLuminosity(light_power)
src << "<span class='notice'>You enable your integrated light.</span>"
set_light(brightness_power)
to_chat(src, "<span class='notice'>You enable your integrated light.</span>")
else
SetLuminosity(0)
src << "<span class='notice'>You disable your integrated light.</span>"
set_light(0)
to_chat(src, "<span class='notice'>You disable your integrated light.</span>")
/mob/living/silicon/pai/movement_delay()
. = ..()
code/modules/mob/living/silicon/pai/say.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/mob/living/silicon/pai/say(msg)
if(silent)
src << "<span class='warning'>Communication circuits remain unitialized.</span>"
to_chat(src, "<span class='warning'>Communication circuits remain unitialized.</span>")
else
..(msg)
code/modules/mob/living/silicon/pai/software.dm
+9 -9
View File
@@ -200,7 +200,7 @@
M = M.loc
count++
if(count >= 6)
src << "You are not being carried by anyone!"
to_chat(src, "You are not being carried by anyone!")
return 0
spawn CheckDNA(M, src)
@@ -376,15 +376,15 @@
"<span class='notice'>You press your thumb against [P].</span>",\
"<span class='notice'>[P] makes a sharp clicking sound as it extracts DNA material from [M].</span>")
if(!M.has_dna())
P << "<b>No DNA detected</b>"
to_chat(P, "<b>No DNA detected</b>")
return
P << "<font color = red><h3>[M]'s UE string : [M.dna.unique_enzymes]</h3></font>"
to_chat(P, "<font color = red><h3>[M]'s UE string : [M.dna.unique_enzymes]</h3></font>")
if(M.dna.unique_enzymes == P.master_dna)
P << "<b>DNA is a match to stored Master DNA.</b>"
to_chat(P, "<b>DNA is a match to stored Master DNA.</b>")
else
P << "<b>DNA does not match stored Master DNA.</b>"
to_chat(P, "<b>DNA does not match stored Master DNA.</b>")
else
P << "[M] does not seem like [M.p_they()] [M.p_are()] going to provide a DNA sample willingly."
to_chat(P, "[M] does not seem like [M.p_they()] [M.p_are()] going to provide a DNA sample willingly.")
// -=-=-=-= Software =-=-=-=-=- //
@@ -565,7 +565,7 @@
dat += "<font color=#55FF55>Connected</font> <br>"
if(!istype(machine, /obj/machinery/camera))
src << "DERP"
to_chat(src, "DERP")
return dat
// Door Jack
@@ -601,9 +601,9 @@
var/turf/T = get_turf(src.loc)
for(var/mob/living/silicon/ai/AI in player_list)
if(T.loc)
AI << "<font color = red><b>Network Alert: Brute-force encryption crack in progress in [T.loc].</b></font>"
to_chat(AI, "<font color = red><b>Network Alert: Brute-force encryption crack in progress in [T.loc].</b></font>")
else
AI << "<font color = red><b>Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location.</b></font>"
to_chat(AI, "<font color = red><b>Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location.</b></font>")
while(src.hackprogress < 100)
if(src.cable && src.cable.machine && istype(src.cable.machine, /obj/machinery/door) && src.cable.machine == src.hackdoor && get_dist(src, src.hackdoor) <= 1)
hackprogress += rand(1, 10)