cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

gg byond, gg

Browse Source 
fixed some more stuff from the dmi cull

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3877 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-06-20 16:08:13 +00:00
parent f321bcc914
commit 117e4b643e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/gamemodes/cult/cult_structures.dm
View File

@@ -25,12 +25,15 @@
desc = "A desk covered in arcane manuscripts and tomes in unknown languages. Looking at the text makes your skin crawl" desc = "A desk covered in arcane manuscripts and tomes in unknown languages. Looking at the text makes your skin crawl"
icon_state = "tomealtar" icon_state = "tomealtar"
//sprites for this no longer exist -Pete
//(they were stolen from another game anyway)
/*
/obj/structure/cult/pillar /obj/structure/cult/pillar
name = "Pillar" name = "Pillar"
desc = "This should not exist" desc = "This should not exist"
icon_state = "pillar" icon_state = "pillar"
icon = 'magic_pillar.dmi' icon = 'magic_pillar.dmi'
*/
/obj/effect/gateway /obj/effect/gateway
name = "gateway" name = "gateway"

6
code/modules/flufftext/Hallucination.dm
View File

@@ -54,8 +54,8 @@ mob/living/carbon/proc/handle_hallucinations()
halitem.icon_state = "revolver" halitem.icon_state = "revolver"
halitem.name = "Revolver" halitem.name = "Revolver"
if(2) //c4 if(2) //c4
halitem.icon = 'syndieweapons.dmi' halitem.icon = 'assemblies.dmi'
halitem.icon_state = "c4small_0" halitem.icon_state = "plastic-explosive0"
halitem.name = "Mysterious Package" halitem.name = "Mysterious Package"
if(prob(25)) if(prob(25))
halitem.icon_state = "c4small_1" halitem.icon_state = "c4small_1"
@@ -97,7 +97,7 @@ mob/living/carbon/proc/handle_hallucinations()
halimage = image('fire.dmi',target,"1",TURF_LAYER) halimage = image('fire.dmi',target,"1",TURF_LAYER)
if(3) if(3)
//src << "C4" //src << "C4"
halimage = image('syndieweapons.dmi',target,"c4small_1",OBJ_LAYER+0.01) halimage = image('assemblies.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01)
if(client) client.images += halimage if(client) client.images += halimage