Merge pull request #11220 from caelaislinn/new_xenoarch_sprites

Replaces xenoarch gun sprites with CC licenced alternatives from OpenGameArt.org
This commit is contained in:
PsiOmegaDelta
2015-11-03 11:14:03 +01:00
2 changed files with 14 additions and 17 deletions

View File

@@ -82,37 +82,34 @@ var/list/valid_secondary_effect_types = list(\
if(prob(75)) if(prob(75))
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
icon_num = rand(0,11) icon_num = rand(0,13)
icon_state = "ano[icon_num]0" icon_state = "ano[icon_num]0"
if(icon_num == 7 || icon_num == 8) if(icon_num == 7 || icon_num == 8)
name = "large crystal" name = "large alien crystal"
desc = pick("It shines faintly as it catches the light.",\ desc = pick("It shines faintly as it catches the light.",\
"It appears to have a faint inner glow.",\ "It appears to have a faint inner glow.",\
"It seems to draw you inward as you look it at.",\ "It seems to draw you inward as you look it at.",\
"Something twinkles faintly as you look at it.",\ "Something twinkles faintly as you look at it.",\
"It's mesmerizing to behold.") "It's mesmerizing to behold.")
if(prob(50)) if(prob(75))
my_effect.trigger = TRIGGER_ENERGY my_effect.trigger = TRIGGER_ENERGY
else if(icon_num == 9) else if(icon_num == 1 || icon_num == 6)
desc = "There appears to be some kind of environmental scanner on it."
if(prob(75))
my_effect.trigger = rand(5,8)
else if(icon_num == 9 || icon_num == 11 || icon_num == 13)
name = "alien computer" name = "alien computer"
desc = "It is covered in strange markings."
if(prob(75)) if(prob(75))
my_effect.trigger = TRIGGER_TOUCH my_effect.trigger = TRIGGER_TOUCH
else if(icon_num == 10) else if(icon_num == 2 || icon_num == 3 || icon_num == 4)
desc = "A large alien device, there appear to be some kind of vents in the side." desc = "A large alien device, there appear to be vents in the side."
if(prob(50)) if(prob(75))
my_effect.trigger = rand(6,12) my_effect.trigger = rand(7,12)
else if(icon_num == 11) else if(icon_num == 10 || icon_num == 12)
name = "sealed alien pod" name = "sealed alien pod"
desc = "A strange alien device." if(prob(75))
if(prob(25))
my_effect.trigger = rand(1,4) my_effect.trigger = rand(1,4)
#define TRIGGER_PHORON 9
#define TRIGGER_OXY 10
#define TRIGGER_CO2 11
#define TRIGGER_NITRO 12
/obj/machinery/artifact/process() /obj/machinery/artifact/process()
var/turf/L = loc var/turf/L = loc

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 69 KiB