-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.

r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds

[VGTG]

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
sieve32@gmail.com
2012-07-23 00:48:51 +00:00
parent 68558e91ee
commit 459c558898
410 changed files with 1366 additions and 1325 deletions
+1 -1
View File
@@ -2008,7 +2008,7 @@ var/global/BSACooldown = 0
for(var/obj/item/W in world)
if(istype(W, /obj/item/clothing) || istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/weapon/disk) || istype(W, /obj/item/weapon/tank))
continue
W.icon = 'gun.dmi'
W.icon = 'icons/obj/gun.dmi'
W.icon_state = "revolver"
W.item_state = "gun"
message_admins("[key_name_admin(usr)] made every item look like a gun")
+2 -2
View File
@@ -1,7 +1,7 @@
/proc/getbrokeninhands()
var/icon/IL = new('items_lefthand.dmi')
var/icon/IL = new('icons/mob/items_lefthand.dmi')
var/list/Lstates = IL.IconStates()
var/icon/IR = new('items_righthand.dmi')
var/icon/IR = new('icons/mob/items_righthand.dmi')
var/list/Rstates = IR.IconStates()
+1 -1
View File
@@ -795,7 +795,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
del(G)
S.energy = 1750
S.current_size = 7
S.icon = '224x224.dmi'
S.icon = 'icons/effects/224x224.dmi'
S.icon_state = "singularity_s7"
S.pixel_x = -96
S.pixel_y = -96
+2 -2
View File
@@ -23,7 +23,7 @@ var/camera_range_display_status = 0
var/intercom_range_display_status = 0
/obj/effect/debugging/camera_range
icon = '480x480.dmi'
icon = 'icons/480x480.dmi'
icon_state = "25percent"
New()
@@ -31,7 +31,7 @@ var/intercom_range_display_status = 0
src.pixel_y = -224
/obj/effect/debugging/marker
icon = 'areas.dmi'
icon = 'icons/turf/areas.dmi'
icon_state = "yellow"
/client/proc
+1 -1
View File
@@ -14,7 +14,7 @@
if (src.client.handle_spam_prevention(msg,MUTE_PRAY))
return
var/icon/cross = icon('storage.dmi',"bible")
var/icon/cross = icon('icons/obj/storage.dmi',"bible")
for (var/mob/M in world)
if (M.client && M.client.holder && M.client.seeprayers)