cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/gamemodes/gameticker.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-01-08 23:08:52 +10:00
parent 2ad36df02a 8d1f1d8c00
commit 6aa245f716
6 changed files with 6 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
baystation12.dme
-45
View File
@@ -4,51 +4,6 @@
// BEGIN_INTERNALS
// END_INTERNALS
// BEGIN_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/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/vehicles"
#define FILE_DIR "icons/vending_icons"
#define FILE_DIR "maps"
#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/piano"
#define FILE_DIR "sound/violin"
#define FILE_DIR "sound/voice"
#define FILE_DIR "sound/weapons"
// END_FILE_DIR
// BEGIN_PREFERENCES
code/game/gamemodes/gameticker.dm
+3 -4
View File
@@ -37,10 +37,9 @@ var/global/datum/controller/gameticker/ticker
var/triai = 0//Global holder for Triumvirate
/datum/controller/gameticker/proc/pregame()
login_music = pick('sound/ambience/title1.ogg','sound/ambience/title2.ogg') // choose title music!
for(var/mob/new_player/M in mob_list)
if(M.client) M.client.playtitlemusic()
login_music = pick('sound/ambience/title1.ogg','sound/ambience/title2.ogg','sound/ambience/b12_combined_start.ogg') // choose title music!
/* for(var/mob/new_player/M in mob_list)
if(M.client) M.client.playtitlemusic()*/
do
pregame_timeleft = 180
world << "<B><FONT color='blue'>Welcome to the pre-game lobby!</FONT></B>"
code/modules/mining/mine_areas.dm
+1 -2
View File
@@ -2,16 +2,15 @@
/area/mine
icon_state = "mining"
music = 'sound/ambience/song_game.ogg'
/area/mine/explored
name = "Mine"
icon_state = "explored"
music = null
/area/mine/unexplored
name = "Mine"
icon_state = "unexplored"
music = null
/area/mine/lobby
name = "Mining station"
maps/tgstation.2.0.9.1.dmm
+2 -2
View File
@@ -7231,7 +7231,7 @@
"cJc" = (/obj/item/weapon/wrench,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin)
"cJd" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin)
"cJe" = (/turf/unsimulated/beach/sand,/area/beach)
"cJf" = (/obj/effect/signpost,/turf/unsimulated/beach/sand,/area/beach)
"cJf" = (/obj/structure/signpost,/turf/unsimulated/beach/sand,/area/beach)
"cJg" = (/obj/structure/closet,/turf/unsimulated/beach/sand,/area/beach)
"cJh" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin)
"cJi" = (/obj/effect/overlay/palmtree_l,/turf/unsimulated/beach/sand,/area/beach)
@@ -7340,7 +7340,7 @@
"cLh" = (/obj/structure/rack,/obj/item/weapon/kitchenknife/ritual,/turf/unsimulated/floor{icon_state = "chapel"},/area/wizard_station)
"cLi" = (/obj/item/weapon/reagent_containers/food/snacks/grown/banana,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
"cLj" = (/obj/structure/table/woodentable,/obj/item/weapon/stamp/clown,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
"cLk" = (/obj/effect/signpost,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
"cLk" = (/obj/structure/signpost,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
"cLl" = (/obj/effect/landmark{name = "Clown Land"},/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)
"cLm" = (/obj/item/weapon/shovel,/turf/unsimulated/floor{icon_state = "asteroid"; name = "dust"},/area/planet/clown)
"cLn" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/derelict/ship)
sound/ambience/b12_combined_start.ogg
BIN
View File
Binary file not shown.
sound/ambience/song_game.ogg
BIN
View File
Binary file not shown.