Skip to content

Commit

Permalink
lots of changes from working hard at the mines
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-poop committed Jun 23, 2024
1 parent 8d0930b commit 3c91713
Show file tree
Hide file tree
Showing 21 changed files with 124 additions and 33 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified .vs/Rouge-Survival/v17/.wsuo
Binary file not shown.
4 changes: 1 addition & 3 deletions .vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"ExpandedNodes": [
"",
"\\rougesurvivalfiles",
"\\rougesurvivalfiles\\rougebackgrounds"
"\\rougesurvivalfiles"
],
"SelectedNode": "\\rougesurvivalfiles\\rougeplants.dm",
"PreviewInSolutionExplorer": false
}
Binary file modified .vs/slnx.sqlite
Binary file not shown.
12 changes: 6 additions & 6 deletions code/__HELPERS/time.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ GLOBAL_VAR_INIT(dayspassed, FALSE)
if(!GLOB.forecast)
switch(GLOB.tod)
if("dawn")
if(prob(12))
if(prob(1))
GLOB.forecast = "fog"
if(prob(13))
if(prob(1))
GLOB.forecast = "rain"
if("day")
if(prob(5))
if(prob(1))
GLOB.forecast = "rain"
if("dusk")
if(prob(13))
if(prob(1))
GLOB.forecast = "rain"
if("night")
if(prob(5))
if(prob(1))
GLOB.forecast = "fog"
if(prob(21))
if(prob(1))
GLOB.forecast = "rain"
if(GLOB.forecast == "rain")
var/foundnd
Expand Down
14 changes: 8 additions & 6 deletions code/game/area/roguetownareas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +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/carbon/human/species/skeleton/npc/ambush = 2,
/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 60)
/mob/living/carbon/human/species/skeleton/npc/ambush = 1,
/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 1,
/mob/living/simple_animal/hostile/rogue/haunt = 40)
first_time_text = "THE TIMID FOREST"
converted_type = /area/rogue/indoors/shelter/woods
/area/rogue/indoors/shelter/woods
Expand Down Expand Up @@ -248,8 +249,8 @@ 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/carbon/human/species/goblin/npc/ambush/cave = 20,
/mob/living/simple_animal/hostile/rogue/haunt = 30,
/mob/living/carbon/human/species/goblin/npc/ambush/cave = 10,
/mob/living/carbon/human/species/skeleton/npc/ambush = 10,
/mob/living/simple_animal/hostile/retaliate/rogue/minotaur = 5)
converted_type = /area/rogue/outdoors/caves
Expand All @@ -275,9 +276,10 @@ GLOBAL_LIST_INIT(roguetown_areas_typecache, typecacheof(/area/rogue/indoors/town
/turf/open/floor/rogue/dirt)
ambush_mobs = list(
/mob/living/carbon/human/species/skeleton/npc = 3,
/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 50,
/mob/living/simple_animal/hostile/retaliate/rogue/bigrat = 10,
/mob/living/carbon/human/species/goblin/npc/sea = 5,
/mob/living/simple_animal/hostile/retaliate/rogue/minotaur = 5)
/mob/living/simple_animal/hostile/retaliate/rogue/minotaur = 5,
/mob/living/simple_animal/hostile/rogue/haunt = 20)
converted_type = /area/rogue/outdoors/caves

/area/rogue/under/cavewet/bogcaves
Expand Down
3 changes: 3 additions & 0 deletions code/game/objects/items/rogueitems/natural/stones.dm
Original file line number Diff line number Diff line change
Expand Up @@ -344,3 +344,6 @@ GLOBAL_LIST_INIT(stone_personality_descs, list(

/obj/item/natural/rock/gem
mineralType = /obj/item/roguegem/random

/obj/item/natural/rock/silver
mineralType = /obj/item/rogueore/silver
13 changes: 10 additions & 3 deletions code/game/turfs/closed/minerals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -611,19 +611,19 @@
turf_type = /turf/open/floor/rogue/naturalstone
above_floor = /turf/open/floor/rogue/naturalstone
baseturfs = list(/turf/open/floor/rogue/naturalstone)
mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 5,/turf/closed/mineral/rogue/iron = 15,/turf/closed/mineral/rogue/coal = 25)
mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 2,/turf/closed/mineral/rogue/iron = 15,/turf/closed/mineral/rogue/coal = 25)
mineralChance = 23


/turf/closed/mineral/random/rogue/med
icon_state = "minrandmed"
mineralChance = 10
mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 5,/turf/closed/mineral/rogue/gold = 3,/turf/closed/mineral/rogue/iron = 33,/turf/closed/mineral/rogue/coal = 14, /turf/closed/mineral/rogue/gem = 1)
mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 2,/turf/closed/mineral/rogue/gold = 3,/turf/closed/mineral/rogue/iron = 33,/turf/closed/mineral/rogue/coal = 17, /turf/closed/mineral/rogue/gem = 1, /turf/closed/mineral/rogue/silver = 10)

/turf/closed/mineral/random/rogue/high
icon_state = "minrandhigh"
mineralChance = 33
mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 5,/turf/closed/mineral/rogue/gold = 9,/turf/closed/mineral/rogue/iron = 33,/turf/closed/mineral/rogue/coal = 19, /turf/closed/mineral/rogue/gem = 3)
mineralSpawnChanceList = list(/turf/closed/mineral/rogue/salt = 2,/turf/closed/mineral/rogue/gold = 9,/turf/closed/mineral/rogue/iron = 33,/turf/closed/mineral/rogue/coal = 19, /turf/closed/mineral/rogue/gem = 4, /turf/closed/mineral/rogue/silver = 15)


//begin actual mineral turfs
Expand Down Expand Up @@ -692,3 +692,10 @@
..()
to_chat(user, span_warning("TOO HARD!"))
turf_integrity = max_integrity

/turf/closed/mineral/rogue/silver
icon_state = "mingold"
mineralType = /obj/item/rogueore/silver
rockType = /obj/item/natural/rock/silver
spreadChance = 16
spread = 3
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
total_positions = -1
spawn_positions = -1
allowed_races = ALL_RACES_LIST_NAMES
tutorial = "Pilgrims begin far outside of the town and must reach it in order to ply their various trades. Sometimes, they build their own settlements and enjoy the terrible nature."
tutorial = "Pilgrims come from a strange land, some say a WIZARD has cursed them all. you can't leave, so it's best to try and SURVIVE."

outfit = null
outfit_female = null
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/npc/goblin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "goblin"

icon = 'icons/roguetown/mob/monster/goblins.dmi'
icon_state = "blank"
icon_state = "goblin_hell"
race = /datum/species/goblin
gender = MALE
bodyparts = list(/obj/item/bodypart/chest/goblin, /obj/item/bodypart/head/goblin, /obj/item/bodypart/l_arm/goblin,
Expand Down
4 changes: 1 addition & 3 deletions config/admins.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@
#Ranks will match to those with the same name in admin_ranks.txt, if a match isn't found the user won't be adminned.
#If SQL-based admin loading is enabled, admins listed here will always be loaded first and will override any duplicate entries in the database

Glennerbean = Host
emoats18 = Host
ChaoticAgent = Host
Chris poop= Host
Binary file modified icons/roguetown/misc/foliage.dmi
Binary file not shown.
30 changes: 30 additions & 0 deletions rougesurvivalfiles/monument.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/mob/living/carbon/human/proc/friend_seeker()
set name = "Seek Friends"
set category = "MONUMENT SYSTEM"

if(!mind.has_antag_datum(/datum/antagonist/zombie))
return FALSE
if(stat >= UNCONSCIOUS)
return FALSE
var/closest_dist
var/the_dir
for(var/mob/living/carbon/human/humie as anything in GLOB.human_list)
if(humie == src)
continue
if(humie.mob_biotypes & MOB_UNDEAD)
continue
if(humie.stat >= DEAD)
continue
var/total_distance = get_dist(src, humie)
if(!closest_dist)
closest_dist = total_distance
the_dir = get_dir(src, humie)
else
if(total_distance < closest_dist)
closest_dist = total_distance
the_dir = get_dir(src, humie)
if(!closest_dist)
to_chat(src, span_warning("I failed to smell anything..."))
return FALSE
to_chat(src, span_warning("[closest_dist] meters away, [dir2text(the_dir)]..."))
return TRUE
65 changes: 56 additions & 9 deletions rougesurvivalfiles/rougeitems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,61 @@
verbage = "...."
craftsound = null
skillcraft = null

/datum/crafting_recipe/roguetown/structure/merchantvend
name = "link To the Merchants Guild"
result = /obj/structure/roguemachine/merchantvend
reqs = list(/obj/item/grown/log/tree/small = 2,
/obj/item/underworld/coin = 1)
skillcraft = /datum/skill/craft/crafting
verbage_simple = "set up a"
verbage = "sets up a"
time = 2 SECONDS
craftdiff = 0
craftsound = null
skillcraft = null

/datum/crafting_recipe/roguetown/structure/merchantballoon
name = "link To the Balloon Trade-Metropolis"
result = /obj/item/roguemachine/merchant
reqs = list(/obj/item/underworld/coin = 1,
/obj/item/natural/cloth = 1)
skillcraft = /datum/skill/craft/crafting
verbage_simple = "set up a"
verbage = "sets up a"
time = 2 SECONDS
craftdiff = 0
craftsound = null
skillcraft = null

/datum/crafting_recipe/roguetown/Toll
name = "Create A Toll"
result = /obj/item/underworld/coin
reqs = list(/obj/item/roguestatue/silver = 2,
/obj/item/roguestatue/gold = 1, /obj/item/roguestatue/iron = 1)
time = 4 SECONDS
verbage = "Take A Hangnail, ripping down, applying the fresh skin to the Combination, Speaking the Sacred words, You"
craftsound = null
skillcraft = null



















/*
/datum/crafting_recipe/roguetown/turfs/dighole
name = "Dig A Hole"
Expand All @@ -25,12 +80,4 @@
*/

/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

8 changes: 7 additions & 1 deletion rougesurvivalfiles/rougeplants.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@


/datum/crafting_recipe/roguetown/ironplantseeds
name = "Pulverize, To Form Iron"
name = "Pulverize, Form Iron"
result = /obj/item/seeds/ironplant
reqs = list(/obj/item/reagent_containers/food/snacks/grown/apple = 40,
/obj/item/natural/chaff/wheat = 40)
Expand Down Expand Up @@ -75,3 +75,9 @@
craftsound = null
skillcraft = null


/obj/structure/flora/roguegrass/deadgrass
name = "Dead Grass"
desc = "Green, soft and Totally Dead."
icon = 'icons/roguetown/misc/foliage.dmi'
icon_state = "deadgrass"

0 comments on commit 3c91713

Please sign in to comment.