cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1159 from Kelenius/playingWithTravis

Browse Source 
Attempts to port bay's travis update attempts
This commit is contained in:
Datraen
2016-03-26 13:18:55 -04:00
parent 9a01ca6ae3 e883863f4b
commit 357fd67a65
29 changed files with 257 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
View File

@@ -26,7 +26,7 @@ var/list/valid_primary_effect_types = list(\
/datum/artifact_effect/forcefield,\
/datum/artifact_effect/gasoxy,\
/datum/artifact_effect/gasplasma,\
/* /datum/artifact_effect/gassleeping,\*/
// /datum/artifact_effect/gassleeping,\
/datum/artifact_effect/heal,\
/datum/artifact_effect/hurt,\
/datum/artifact_effect/emp,\
@@ -45,7 +45,7 @@ var/list/valid_secondary_effect_types = list(\
/datum/artifact_effect/gasnitro,\
/datum/artifact_effect/gasoxy,\
/datum/artifact_effect/gasphoron,\
/* /datum/artifact_effect/gassleeping,\*/
// /datum/artifact_effect/gassleeping,\
/datum/artifact_effect/goodfeeling,\
/datum/artifact_effect/heal,\
/datum/artifact_effect/hurt,\

4
code/modules/research/xenoarchaeology/finds/finds_misc.dm
View File

@@ -13,8 +13,8 @@
//large finds
/*
/obj/machinery/syndicate_beacon
/obj/machinery/wish_granter
obj/machinery/syndicate_beacon
obj/machinery/wish_granter
if(18)
item_type = "jagged green crystal"
additional_desc = pick("It shines faintly as it catches the light.","It appears to have a faint inner glow.","It seems to draw you inward as you look it at.","Something twinkles faintly as you look at it.","It's mesmerizing to behold.")