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/transform_procs.dm
+19 -22
View File
@@ -126,7 +126,7 @@
if (tr_flags & TR_DEFAULTMSG)
O << "<B>You are now a monkey.</B>"
to_chat(O, "<B>You are now a monkey.</B>")
for(var/A in loc.vars)
if(loc.vars[A] == src)
@@ -276,7 +276,7 @@
O.a_intent = INTENT_HELP
if (tr_flags & TR_DEFAULTMSG)
O << "<B>You are now a human.</B>"
to_chat(O, "<B>You are now a human.</B>")
. = O
@@ -286,11 +286,6 @@
qdel(src)
/mob/new_player/AIize()
spawning = 1
return ..()
/mob/living/carbon/human/AIize()
if (notransform)
return
@@ -311,7 +306,7 @@
invisibility = INVISIBILITY_MAXIMUM
return ..()
/mob/proc/AIize()
/mob/proc/AIize(transfer_after = TRUE)
if(client)
stopLobbySound()
@@ -329,18 +324,19 @@
continue
loc_landmark = tripai.loc
if(!loc_landmark)
src << "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone."
to_chat(src, "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone.")
for(var/obj/effect/landmark/start/sloc in landmarks_list)
if (sloc.name == "AI")
loc_landmark = sloc.loc
if(!transfer_after)
mind.active = FALSE
. = new /mob/living/silicon/ai(loc_landmark, null, src)
qdel(src)
return
//human -> robot
/mob/living/carbon/human/proc/Robotize(delete_items = 0)
/mob/living/carbon/human/proc/Robotize(delete_items = 0, transfer_after = TRUE)
if (notransform)
return
for(var/obj/item/W in src)
@@ -367,12 +363,13 @@
R.gender = gender
R.invisibility = 0
if(mind) //TODO
if(!transfer_after)
mind.active = FALSE
mind.transfer_to(R)
if(mind.special_role)
R.mind.store_memory("In case you look at this after being borged, the objectives are only here until I find a way to make them not show up for you, as I can't simply delete them without screwing up round-end reporting. --NeoFite")
else
else if(transfer_after)
R.key = key
if (config.rename_cyborg)
@@ -420,7 +417,7 @@
new_xeno.a_intent = INTENT_HARM
new_xeno.key = key
new_xeno << "<B>You are now an alien.</B>"
to_chat(new_xeno, "<B>You are now an alien.</B>")
. = new_xeno
qdel(src)
@@ -452,7 +449,7 @@
new_slime.a_intent = INTENT_HARM
new_slime.key = key
new_slime << "<B>You are now a slime. Skreee!</B>"
to_chat(new_slime, "<B>You are now a slime. Skreee!</B>")
. = new_slime
qdel(src)
@@ -483,7 +480,7 @@
new_corgi.a_intent = INTENT_HARM
new_corgi.key = key
new_corgi << "<B>You are now a Corgi. Yap Yap!</B>"
to_chat(new_corgi, "<B>You are now a Corgi. Yap Yap!</B>")
. = new_corgi
qdel(src)
@@ -493,7 +490,7 @@
var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in mobtypes
if(!safe_animal(mobpath))
usr << "<span class='danger'>Sorry but this mob type is currently unavailable.</span>"
to_chat(usr, "<span class='danger'>Sorry but this mob type is currently unavailable.</span>")
return
if(notransform)
@@ -516,7 +513,7 @@
new_mob.a_intent = INTENT_HARM
new_mob << "You suddenly feel more... animalistic."
to_chat(new_mob, "You suddenly feel more... animalistic.")
. = new_mob
qdel(src)
@@ -526,14 +523,14 @@
var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in mobtypes
if(!safe_animal(mobpath))
usr << "<span class='danger'>Sorry but this mob type is currently unavailable.</span>"
to_chat(usr, "<span class='danger'>Sorry but this mob type is currently unavailable.</span>")
return
var/mob/new_mob = new mobpath(src.loc)
new_mob.key = key
new_mob.a_intent = INTENT_HARM
new_mob << "You feel more... animalistic"
to_chat(new_mob, "You feel more... animalistic")
. = new_mob
qdel(src)