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

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Browse Source 
Conflicts:
	baystation12.dme
	code/modules/events/event_manager.dm
	code/modules/events/ion_storm.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-02-11 02:56:07 +10:00
parent f29c19e52c f13fc01dbf
commit eb02fb3636
3 changed files with 7 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
baystation12.dme
View File

@@ -5,50 +5,6 @@
// END_INTERNALS // END_INTERNALS
// BEGIN_FILE_DIR // BEGIN_FILE_DIR
#define FILE_DIR . #define FILE_DIR .
#define FILE_DIR "code"
#define FILE_DIR "code/TriDimension"
#define FILE_DIR "code/WorkInProgress"
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle"
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
#define FILE_DIR "code/WorkInProgress/Susan"
#define FILE_DIR "html"
#define FILE_DIR "icons"
#define FILE_DIR "icons/48x48"
#define FILE_DIR "icons/effects"
#define FILE_DIR "icons/mecha"
#define FILE_DIR "icons/misc"
#define FILE_DIR "icons/mob"
#define FILE_DIR "icons/mob/human_races"
#define FILE_DIR "icons/obj"
#define FILE_DIR "icons/obj/assemblies"
#define FILE_DIR "icons/obj/atmospherics"
#define FILE_DIR "icons/obj/clothing"
#define FILE_DIR "icons/obj/doors"
#define FILE_DIR "icons/obj/flora"
#define FILE_DIR "icons/obj/machines"
#define FILE_DIR "icons/obj/pipes"
#define FILE_DIR "icons/pda_icons"
#define FILE_DIR "icons/spideros_icons"
#define FILE_DIR "icons/Testing"
#define FILE_DIR "icons/turf"
#define FILE_DIR "icons/vending_icons"
#define FILE_DIR "sound"
#define FILE_DIR "sound/AI"
#define FILE_DIR "sound/ambience"
#define FILE_DIR "sound/effects"
#define FILE_DIR "sound/effects/wind"
#define FILE_DIR "sound/hallucinations"
#define FILE_DIR "sound/items"
#define FILE_DIR "sound/machines"
#define FILE_DIR "sound/mecha"
#define FILE_DIR "sound/misc"
#define FILE_DIR "sound/music"
#define FILE_DIR "sound/piano"
#define FILE_DIR "sound/violin"
#define FILE_DIR "sound/voice"
#define FILE_DIR "sound/weapons"
// END_FILE_DIR // END_FILE_DIR
// BEGIN_PREFERENCES // BEGIN_PREFERENCES
@@ -776,10 +732,10 @@
#include "code\modules\customitems\item_defines.dm" #include "code\modules\customitems\item_defines.dm"
#include "code\modules\customitems\item_spawning.dm" #include "code\modules\customitems\item_spawning.dm"
#include "code\modules\destilery\main.dm" #include "code\modules\destilery\main.dm"
#include "code\modules\DetectiveWork\detective_work.dm" #include "code\modules\detectivework\detective_work.dm"
#include "code\modules\DetectiveWork\evidence.dm" #include "code\modules\detectivework\evidence.dm"
#include "code\modules\DetectiveWork\footprints_and_rag.dm" #include "code\modules\detectivework\footprints_and_rag.dm"
#include "code\modules\DetectiveWork\scanner.dm" #include "code\modules\detectivework\scanner.dm"
#include "code\modules\events\alien_infestation.dm" #include "code\modules\events\alien_infestation.dm"
#include "code\modules\events\blob.dm" #include "code\modules\events\blob.dm"
#include "code\modules\events\brand_intelligence.dm" #include "code\modules\events\brand_intelligence.dm"
@@ -793,8 +749,7 @@
#include "code\modules\events\event_manager.dm" #include "code\modules\events\event_manager.dm"
#include "code\modules\events\grid_check.dm" #include "code\modules\events\grid_check.dm"
#include "code\modules\events\ion_storm.dm" #include "code\modules\events\ion_storm.dm"
#include "code\modules\events\meteors.dm" #include "code\modules\events\meteors.dm"#include "code\modules\events\prison_break.dm"
#include "code\modules\events\prison_break.dm"
#include "code\modules\events\radiation_storm.dm" #include "code\modules\events\radiation_storm.dm"
#include "code\modules\events\space_ninja.dm" #include "code\modules\events\space_ninja.dm"
#include "code\modules\events\spacevine.dm" #include "code\modules\events\spacevine.dm"

1
code/modules/events/event_manager.dm
View File

@@ -1,4 +1,5 @@
var/list/allEvents = typesof(/datum/event) - /datum/event var/list/allEvents = typesof(/datum/event) - /datum/event
var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event
//var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event - /datum/event/spider_infestation - /datum/event/alien_infestation //var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event - /datum/event/spider_infestation - /datum/event/alien_infestation
var/eventTimeLower = 15000 //15 minutes var/eventTimeLower = 15000 //15 minutes

2
code/modules/research/xenoarchaeology/artifact_misc.dm
View File

@@ -4,7 +4,7 @@
desc = "A sealed bio suit capable of resisting exotic alien energies and low pressure environments." desc = "A sealed bio suit capable of resisting exotic alien energies and low pressure environments."
icon_state = "engspace_suit" icon_state = "engspace_suit"
item_state = "engspace_suit" item_state = "engspace_suit"
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/pickaxe/hand_pick) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen)
/obj/item/clothing/head/bio_hood/anomaly /obj/item/clothing/head/bio_hood/anomaly
name = "Anomaly Hood" name = "Anomaly Hood"