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/game/objects/items/blueprints.dm
+20 -13
View File
@@ -127,7 +127,7 @@
showing = get_images(get_turf(user), viewing.view)
viewing.images |= showing
if(message)
user << message
to_chat(user, message)
/obj/item/areaeditor/blueprints/proc/clear_viewer(mob/user, message = "")
if(viewing)
@@ -135,7 +135,7 @@
viewing = null
showing.Cut()
if(message)
user << message
to_chat(user, message)
/obj/item/areaeditor/blueprints/dropped(mob/user)
..()
@@ -191,13 +191,13 @@
if(!istype(res,/list))
switch(res)
if(ROOM_ERR_SPACE)
creator << "<span class='warning'>The new area must be completely airtight.</span>"
to_chat(creator, "<span class='warning'>The new area must be completely airtight.</span>")
return
if(ROOM_ERR_TOOLARGE)
creator << "<span class='warning'>The new area is too large.</span>"
to_chat(creator, "<span class='warning'>The new area is too large.</span>")
return
else
creator << "<span class='warning'>Error! Please notify administration.</span>"
to_chat(creator, "<span class='warning'>Error! Please notify administration.</span>")
return
var/list/turfs = res
@@ -205,7 +205,7 @@
if(!str || !length(str)) //cancel
return
if(length(str) > 50)
creator << "<span class='warning'>The given name is too long. The area remains undefined.</span>"
to_chat(creator, "<span class='warning'>The given name is too long. The area remains undefined.</span>")
return
var/area/old = get_area(get_turf(creator))
var/old_gravity = old.has_gravity
@@ -218,13 +218,20 @@
turfs -= turfs[key]
turfs -= key
if(A)
A.contents += turfs
A.SetDynamicLighting()
A.set_dynamic_lighting()
for (var/turf/T in turfs)
var/area/old_area = T.loc
A.contents += T
T.change_area(old_area, T)
else
A = new
A.setup(str)
A.contents += turfs
A.SetDynamicLighting()
A.set_dynamic_lighting()
for (var/turf/T in turfs)
var/area/old_area = T.loc
A.contents += T
T.change_area(old_area, T)
A.has_gravity = old_gravity
for(var/area/RA in old.related)
@@ -233,7 +240,7 @@
var/obj/machinery/door/firedoor/FD = D
FD.CalculateAffectingAreas()
creator << "<span class='notice'>You have created a new area, named [str]. It is now weather proof, and constructing an APC will allow it to be powered.</span>"
to_chat(creator, "<span class='notice'>You have created a new area, named [str]. It is now weather proof, and constructing an APC will allow it to be powered.</span>")
return 1
/obj/item/areaeditor/proc/edit_area()
@@ -243,7 +250,7 @@
if(!str || !length(str) || str==prevname) //cancel
return
if(length(str) > 50)
usr << "<span class='warning'>The given name is too long. The area's name is unchanged.</span>"
to_chat(usr, "<span class='warning'>The given name is too long. The area's name is unchanged.</span>")
return
set_area_machinery_title(A,str,prevname)
for(var/area/RA in A.related)
@@ -252,7 +259,7 @@
for(var/D in RA.firedoors)
var/obj/machinery/door/firedoor/FD = D
FD.CalculateAffectingAreas()
usr << "<span class='notice'>You rename the '[prevname]' to '[str]'.</span>"
to_chat(usr, "<span class='notice'>You rename the '[prevname]' to '[str]'.</span>")
interact()
return 1