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/research/experimentor.dm
+14 -14
View File
@@ -120,20 +120,20 @@
if(!is_insertion_ready(user))
return
if(!checkCircumstances(O))
user << "<span class='warning'>The [O] is not yet valid for the [src] and must be completed!</span>"
to_chat(user, "<span class='warning'>The [O] is not yet valid for the [src] and must be completed!</span>")
return
if(!O.origin_tech)
user << "<span class='warning'>This doesn't seem to have a tech origin!</span>"
to_chat(user, "<span class='warning'>This doesn't seem to have a tech origin!</span>")
return
var/list/temp_tech = ConvertReqString2List(O.origin_tech)
if (temp_tech.len == 0)
user << "<span class='warning'>You cannot experiment on this item!</span>"
to_chat(user, "<span class='warning'>You cannot experiment on this item!</span>")
return
if(!user.drop_item())
return
loaded_item = O
O.loc = src
user << "<span class='notice'>You add the [O.name] to the machine.</span>"
to_chat(user, "<span class='notice'>You add the [O.name] to the machine.</span>")
flick("h_lathe_load", src)
@@ -484,7 +484,7 @@
if(globalMalf > 36 && globalMalf < 50)
visible_message("<span class='warning'>Experimentor draws the life essence of those nearby!</span>")
for(var/mob/living/m in view(4,src))
m << "<span class='danger'>You feel your flesh being torn from you, mists of blood drifting to [src]!</span>"
to_chat(m, "<span class='danger'>You feel your flesh being torn from you, mists of blood drifting to [src]!</span>")
m.apply_damage(50, BRUTE, "chest")
investigate_log("Experimentor has taken 50 brute a blood sacrifice from [m]", "experimentor")
if(globalMalf > 51 && globalMalf < 75)
@@ -528,15 +528,15 @@
src.updateUsrDialog()
else
if(recentlyExperimented)
usr << "<span class='warning'>[src] has been used too recently!</span>"
to_chat(usr, "<span class='warning'>[src] has been used too recently!</span>")
return
else if(!loaded_item)
updateUsrDialog() //Set the interface to unloaded mode
usr << "<span class='warning'>[src] is not currently loaded!</span>"
to_chat(usr, "<span class='warning'>[src] is not currently loaded!</span>")
return
else if(!process || process != loaded_item) //Interface exploit protection (such as hrefs or swapping items with interface set to old item)
updateUsrDialog() //Refresh interface to update interface hrefs
usr << "<span class='danger'>Interface failure detected in [src]. Please try again.</span>"
to_chat(usr, "<span class='danger'>Interface failure detected in [src]. Please try again.</span>")
return
var/dotype
if(text2num(scantype) == SCANTYPE_DISCOVER)
@@ -607,7 +607,7 @@
/obj/item/weapon/relic/attack_self(mob/user)
if(revealed)
if(cooldown)
user << "<span class='warning'>[src] does not react!</span>"
to_chat(user, "<span class='warning'>[src] does not react!</span>")
return
else if(src.loc == user)
cooldown = TRUE
@@ -615,7 +615,7 @@
spawn(cooldownMax)
cooldown = FALSE
else
user << "<span class='notice'>You aren't quite sure what to do with this yet.</span>"
to_chat(user, "<span class='notice'>You aren't quite sure what to do with this yet.</span>")
//////////////// RELIC PROCS /////////////////////////////
@@ -645,7 +645,7 @@
/obj/item/weapon/relic/proc/petSpray(mob/user)
var/message = "<span class='danger'>[src] begans to shake, and in the distance the sound of rampaging animals arises!</span>"
visible_message(message)
user << message
to_chat(user, message)
var/animals = rand(1,25)
var/counter
var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/dog/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/fox,/mob/living/simple_animal/hostile/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/dog/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
@@ -654,7 +654,7 @@
new mobType(get_turf(src))
warn_admins(user, "Mass Mob Spawn")
if(prob(60))
user << "<span class='warning'>[src] falls apart!</span>"
to_chat(user, "<span class='warning'>[src] falls apart!</span>")
qdel(src)
/obj/item/weapon/relic/proc/rapidDupe(mob/user)
@@ -679,7 +679,7 @@
warn_admins(user, "Rapid duplicator", 0)
/obj/item/weapon/relic/proc/explode(mob/user)
user << "<span class='danger'>[src] begins to heat up!</span>"
to_chat(user, "<span class='danger'>[src] begins to heat up!</span>")
spawn(rand(35,100))
if(src.loc == user)
visible_message("<span class='notice'>The [src]'s top opens, releasing a powerful blast!</span>")
@@ -688,7 +688,7 @@
qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!!
/obj/item/weapon/relic/proc/teleport(mob/user)
user << "<span class='notice'>The [src] begins to vibrate!</span>"
to_chat(user, "<span class='notice'>The [src] begins to vibrate!</span>")
spawn(rand(10,30))
var/turf/userturf = get_turf(user)
if(src.loc == user && userturf.z != ZLEVEL_CENTCOM) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!