back to nermal

.vs/VSWorkspaceState.json

@@ -0,0 +1,9 @@
+{
+  "ExpandedNodes": [
+    "",
+    "\\rougesurvivalfiles",
+    "\\rougesurvivalfiles\\rougebackgrounds"
+  ],
+  "SelectedNode": "\\rougesurvivalfiles\\rougeplants.dm",
+  "PreviewInSolutionExplorer": false
+}

code/__HELPERS/names.dm

@@ -49,12 +49,12 @@ GLOBAL_VAR(command_name)
 	GLOB.station_name = newname
 
 #ifdef ROGUEWORLD
-	world.name = "BLACKSTONE"
+	world.name = "ROUGE-SURVIVAL"
 #else
-	world.name = "BLACKSTONE"
+	world.name = "ROUGE-SURVIVAL"
 #endif
 #ifdef TESTSERVER
-	world.name = "BLACKSTONE (TESTING)"
+	world.name = "ROUGE-SURVIVAL (TESTING)"
 #endif
 
 

code/__HELPERS/roundend.dm

@@ -199,7 +199,7 @@
 
 	log_game("The round has ended.")
 
-	to_chat(world, "<BR><BR><BR><span class='reallybig'>So ends this tale of Blackstone.</span>")
+	to_chat(world, "<BR><BR><BR><span class='reallybig'>So ends this tale of ROUGE-SURVIVAL.</span>")
 	get_end_reason()
 
 	var/list/key_list = list()
@@ -296,7 +296,7 @@
 	SSblackbox.Seal()
 
 	sleep(10 SECONDS)
-	SSvote.initiate_vote("map", "Blackstone players")
+	SSvote.initiate_vote("map", "ROUGE-SURVIVAL players")
 	ready_for_reboot = TRUE
 	standard_reboot()
 

code/controllers/subsystem/ticker.dm

@@ -40,7 +40,7 @@ SUBSYSTEM_DEF(ticker)
 	//376000 day
 	var/gametime_offset = 288001		//Deciseconds to add to world.time for station time.
 	var/station_time_rate_multiplier = 50		//factor of station time progressal vs real time.
-	var/time_until_vote = 150 MINUTES
+	var/time_until_vote = 999999 MINUTES
 	var/last_vote_time = null
 	var/autovote = TRUE
 	var/firstvote = TRUE

code/game/area/roguetownareas.dm

@@ -149,10 +149,9 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
 				/turf/open/floor/rogue/dirt,
 				/turf/open/floor/rogue/grass)
 	ambush_mobs = list(
-				/mob/living/simple_animal/hostile/retaliate/rogue/wolf = 40,
-				/mob/living/carbon/human/species/skeleton/npc/ambush = 10,
-				/mob/living/carbon/human/species/goblin/npc/ambush = 30)
-	first_time_text = "THE MURDERWOOD"
+				/mob/living/carbon/human/species/skeleton/npc/ambush = 2,
+				/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 60)
+	first_time_text = "THE TIMID FOREST"
 	converted_type = /area/rogue/indoors/shelter/woods
 /area/rogue/indoors/shelter/woods
 	icon_state = "woods"
@@ -263,7 +262,7 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
 /area/rogue/under/cavewet
 	name = "cavewet"
 	icon_state = "cavewet"
-	first_time_text = "The Undersea"
+	first_time_text = "ROOTED CAVES"
 	ambientsounds = AMB_CAVEWATER
 	ambientnight = AMB_CAVEWATER
 	spookysounds = SPOOKY_CAVE
@@ -275,16 +274,17 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
 	ambush_types = list(
 				/turf/open/floor/rogue/dirt)
 	ambush_mobs = list(
-				/mob/living/carbon/human/species/skeleton/npc = 10,
-				/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 30,
-				/mob/living/carbon/human/species/goblin/npc/sea = 20)
+				/mob/living/carbon/human/species/skeleton/npc = 3,
+				/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 50,
+				/mob/living/carbon/human/species/goblin/npc/sea = 5,
+				/mob/living/simple_animal/hostile/retaliate/rogue/minotaur = 5)
 	converted_type = /area/rogue/outdoors/caves
 
 /area/rogue/under/cavewet/bogcaves
 
 /area/rogue/under/cave/spider
 	icon_state = "spider"
-	first_time_text = "ARAIGNÉE"
+	first_time_text = "MOUNT ZION"
 	ambush_mobs = list(
 				/mob/living/simple_animal/hostile/retaliate/rogue/spider = 100)
 	droning_sound = 'sound/music/area/spidercave.ogg'
@@ -315,7 +315,7 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
 /area/rogue/under/cavelava
 	name = "cavelava"
 	icon_state = "cavelava"
-	first_time_text = "MOUNT DECAPITATION"
+	first_time_text = "THE OLD FORT"
 	ambientsounds = AMB_CAVELAVA
 	ambientnight = AMB_CAVELAVA
 	spookysounds = SPOOKY_CAVE
@@ -324,10 +324,10 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
 	ambush_types = list(
 				/turf/open/floor/rogue/dirt)
 	ambush_mobs = list(
-				/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 30,
+				/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 10,
 				/mob/living/carbon/human/species/skeleton/npc = 10,
 				/mob/living/carbon/human/species/goblin/npc/hell = 20,
-				/mob/living/simple_animal/hostile/retaliate/rogue/minotaur = 5)
+				/mob/living/simple_animal/hostile/retaliate/rogue/minotaur = 20)
 	droning_sound = 'sound/music/area/decap.ogg'
 	droning_sound_dusk = null
 	droning_sound_night = null

code/game/objects/structures/fluff.dm

@@ -895,7 +895,7 @@
 						user.visible_message(span_info("[user] trains on [src]!"))
 						var/boon = user.mind.get_learning_boon(W.associated_skill)
 						var/amt2raise = L.STAINT/2
-						if(user.mind.get_skill_level(W.associated_skill) >= SKILL_LEVEL_APPRENTICE)
+						if(user.mind.get_skill_level(W.associated_skill) >= SKILL_LEVEL_JOURNEYMAN)
 							to_chat(user, span_warning("I've learned all I can from doing this, it's time for the real thing."))
 							amt2raise = 0
 						if(amt2raise > 0)

code/game/objects/structures/roguetown/rogueflora.dm

@@ -452,7 +452,7 @@
 
 /obj/structure/flora/shroomstump
 	name = "shroom stump"
-	desc = "It was a very happy shroom. Not anymore."
+	desc = "It was a very happy shroom. And an Evil Soul Killed it."
 	icon_state = "mush1stump"
 	opacity = 0
 	max_integrity = 100
@@ -461,7 +461,7 @@
 	density = TRUE
 	icon = 'icons/roguetown/misc/foliagetall.dmi'
 	layer = TABLE_LAYER
-	blade_dulling = DULLING_PICK
+	blade_dulling = DULLING_CUT
 	static_debris = null
 	debris = null
 	alpha = 255

code/game/world.dm

@@ -304,13 +304,13 @@ GLOBAL_VAR(restart_counter)
 
 /world/proc/update_status()
 	var/s = ""
-	s += "<center><a href=\"https://discord.gg/bx9c7ha5Qk\">"
+	s += "<center><a href=\"https://rroll.to/qAVdGg\">"
 #ifdef MATURESERVER
-	s += "<big><b>BLACKSTONE</b></big></a><br>"
-	s += "<b>Fantasy Computer Roleplaying Game</b></center><br>"
+	s += "<big><b>ROUGE-SURVIVAL</b></big></a><br>"
+	s += "<b>Explore, Mine, Fight, And Defeat The King Of The Mountain</b></center><br>"
 #else
-	s += "<big><b>BLACKSTONE</b></big></a><br>"
-	s += "<b>Fantasy Computer Survival Game</b></center><br>"
+	s += "<big><b>ROUGE-SURVIVAL</b></big></a><br>"
+	s += "<b>Explore, Mine, Fight, And Defeat The King Of The Mountain</b></center><br>"
 #endif
 //	s += "<img src=\"https://i.imgur.com/shj547T.jpg\"></a></center>"
 

code/modules/antagonists/roguetown/villain/choosename.dm

@@ -9,7 +9,7 @@
 			j.current_positions--
 		mob_timers["mirrortime"] = world.time
 		var/begin_time = world.time
-		var/new_name = input(src, "What should your [input] name be?", "BLACKSTONE")
+		var/new_name = input(src, "What should your [input] name be?", "ROUGE-SURVIVAL")
 		if(world.time > begin_time + 60 SECONDS)
 			to_chat(src, "<font color='red'>You waited too long.</font>")
 			return

code/modules/mob/dead/new_player/new_player.dm

@@ -279,7 +279,7 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/rp_prompt.txt"))
 	var/list/dat = list()
 	dat += GLOB.roleplay_readme
 	if(dat)
-		var/datum/browser/popup = new(src, "Primer", "BLACKSTONE", 460, 550)
+		var/datum/browser/popup = new(src, "Primer", "ROUGE-SURVIVAL", 460, 550)
 		popup.set_content(dat.Join())
 		popup.open()
 

code/world.dm

@@ -17,9 +17,9 @@
 	view = "15x15"
 	hub = "Exadv1.spacestation13"
 #ifdef ROGUEWORLD
-	name = "BLACKSTONE"
+	name = "ROUGE-SURVIVAL"
 #else
-	name = "BLACKSTONE"
+	name = "ROUGE-SURVIVAL"
 #endif
 	fps = 20
 #ifdef FIND_REF_NO_CHECK_TICK

config/config.txt

@@ -14,13 +14,13 @@ $include antag_rep.txt
 # There are various options which are hard-locked for security reasons.
 
 ## Server name: This appears at the top of the screen in-game and in the BYOND hub. Uncomment and replace 'tgstation' with the name of your choice.
-SERVERNAME Blackstone
+SERVERNAME ROUGE-SURVIVAL
 
 ## Server SQL name: This is the name used to identify the server to the SQL DB, distinct from SERVERNAME as it must be at most 32 characters.
 # SERVERSQLNAME tgstation
 
 ## Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead.
-STATIONNAME Blackstone
+STATIONNAME ROUGE-SURVIVAL
 
 ## Put on byond hub: Uncomment this to put your server on the byond hub.
 HUB
@@ -232,16 +232,16 @@ USEBLACKLIST
 # SERVER ss13.example.com:2506
 
 ## Discod address
-DISCORDURL https://discord.gg/bx9c7ha5Qk
+DISCORDURL https://rroll.to/qAVdGg
 
 ## Wiki address
-WIKIURL https://wiki.moviesfreepremium.xyz/blackstone
+WIKIURL https://rroll.to/qAVdGg
 
 ## Rules address
-RULESURL https://wiki.moviesfreepremium.xyz/blackstone/rules
+RULESURL https://rroll.to/qAVdGg
 
 ## Github address
-GITHUBURL https://github.com/Blackstone-SS13/BLACKSTONE
+GITHUBURL https://rroll.to/qAVdGg
 
 ## Round specific stats address
 ## Link to round specific parsed logs; IE statbus. It is appended with the RoundID automatically by ticker/Reboot()

config/motd.txt

@@ -1,3 +1,3 @@
 <!-- Most valid html will work in here, excluding images. -->
-Blackstone Discord Server: <a href="https://discord.gg/bx9c7ha5Qk">discord.gg/Blackstone</a>
-<center>* Unstable Playtest - Expect Restarts *</center>
+Current new features. Choose from specialized backgrounds rather then classes, each background starts with the tools to create everything in the game. Plantable Hide and Iron. New crafting recipes too, make a riddle of steel, or make new seeds from apples and wheat. full crafting recipes on the discord as well as changelog. running on a unqiue map, the mountain. coded by Chris poop, Ravein, Remis12, and countless stolen codebases. join the actual discord using this link https://discord.gg/D57nnyARhr
+<center>* ROUGE-SURVIVAL Unstable Playtest - Expect Retards *</center>

roguetown.dme

@@ -7,6 +7,7 @@
 // END_PREFERENCES
 // BEGIN_INCLUDE
 #include "_maps\_basemap.dm"
+#include "_maps\blackstone.dm"
 #include "_maps\templates\bog_shack_small.dm"
 #include "_maps\templates\sewers.dm"
 #include "_maps\templates\smalldungeons.dm"
@@ -2152,7 +2153,6 @@
 #include "code\modules\jobs\job_types\roguetown\adventurer\villager.dm"
 #include "code\modules\jobs\job_types\roguetown\adventurer\types\_advclass.dm"
 #include "code\modules\jobs\job_types\roguetown\adventurer\types\antag\bandit.dm"
-#include "code\modules\jobs\job_types\roguetown\adventurer\types\combat\donator\dwarfwarrior.dm"
 #include "code\modules\jobs\job_types\roguetown\adventurer\types\special\crusader.dm"
 #include "code\modules\jobs\job_types\roguetown\church\confessor.dm"
 #include "code\modules\jobs\job_types\roguetown\church\druid.dm"
@@ -3389,6 +3389,7 @@
 #include "interface\stylesheet.dm"
 #include "interface\skin.dmf"
 #include "rougesurvivalfiles\rougeitems.dm"
+#include "rougesurvivalfiles\rougemapGenerators.dm"
 #include "rougesurvivalfiles\rougeplants.dm"
 #include "rougesurvivalfiles\rougebackgrounds\dancer.dm"
 #include "rougesurvivalfiles\rougebackgrounds\dreamseeker.dm"

rougesurvivalfiles/rougeitems.dm

@@ -24,3 +24,13 @@
 		return TRUE
 
 */
+
+/datum/crafting_recipe/roguetown/merchantvend
+	name = "link To the Merchants Guild"
+	result = /obj/structure/roguemachine/merchantvend
+	reqs = list(/obj/item/grown/log/tree/small = 2,
+				/obj/item/natural/cloth = 1)
+	skillcraft = /datum/skill/craft/crafting
+	verbage_simple = "set up a"	
+	verbage = "sets up a"
+	craftdiff = 0