normal

chris-poop · Jul 19, 2024 · abb1047 · abb1047
1 parent bc86aec
commit abb1047
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 3,224 deletions.
diff --git a/...f44d9a7-aab3-4ae5-914b-ca21e9f1c5a9.vsidx → ...3bf01fb-c0d1-4ddf-b68b-4275c687edd6.vsidx b/...f44d9a7-aab3-4ae5-914b-ca21e9f1c5a9.vsidx → ...3bf01fb-c0d1-4ddf-b68b-4275c687edd6.vsidx
diff --git a/...18f903b-6229-43f8-85d7-4e217695c7eb.vsidx → ...9bfad77-5d2b-4a59-bea4-6b8825297358.vsidx b/...18f903b-6229-43f8-85d7-4e217695c7eb.vsidx → ...9bfad77-5d2b-4a59-bea4-6b8825297358.vsidx
diff --git a/...31faa96-82dc-4571-a7b0-ab288af2ac44.vsidx → ...ef022b0-3377-45e3-bfbc-709f8294e0e3.vsidx b/...31faa96-82dc-4571-a7b0-ab288af2ac44.vsidx → ...ef022b0-3377-45e3-bfbc-709f8294e0e3.vsidx
diff --git a/...bc967a5-c17f-4a6b-aceb-8288065fa697.vsidx → ...b855213-9173-48f9-a29a-e78d2d571ce7.vsidx b/...bc967a5-c17f-4a6b-aceb-8288065fa697.vsidx → ...b855213-9173-48f9-a29a-e78d2d571ce7.vsidx
diff --git a/.vs/Rouge-Survival/FileContentIndex/66310ae6-083b-44f2-b847-dc577faca04c.vsidx b/.vs/Rouge-Survival/FileContentIndex/66310ae6-083b-44f2-b847-dc577faca04c.vsidx
diff --git a/...09a4c20-1550-4d12-bd34-4a0fead6723a.vsidx → ...ffd4c4f-a974-4e45-a67e-41e18452f7a5.vsidx b/...09a4c20-1550-4d12-bd34-4a0fead6723a.vsidx → ...ffd4c4f-a974-4e45-a67e-41e18452f7a5.vsidx
diff --git a/.vs/Rouge-Survival/FileContentIndex/b6ac59a7-61cf-446d-81d2-7248b6df606d.vsidx b/.vs/Rouge-Survival/FileContentIndex/b6ac59a7-61cf-446d-81d2-7248b6df606d.vsidx
diff --git a/.vs/Rouge-Survival/v17/.wsuo b/.vs/Rouge-Survival/v17/.wsuo
diff --git a/.vs/Rouge-Survival/v17/workspaceFileList.bin b/.vs/Rouge-Survival/v17/workspaceFileList.bin
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/_maps/map_files/blackstone/blackstone.dmm b/_maps/map_files/blackstone/blackstone.dmm
diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm
@@ -8,11 +8,11 @@ SUBSYSTEM_DEF(nightshift)
 	var/current_tod = null
 
 	var/nightshift_active = FALSE
-	var/nightshift_start_time = 720000	//4pm	//702000=7:30 PM, station time
-	var/nightshift_end_time = 144000	//10am	//270000=7:30 AM, station time
-	var/nightshift_dawn_start = 144000		//198000=530am
-	var/nightshift_day_start = 288000		//270000=730am
-	var/nightshift_dusk_start = 576000		//630000=530pm
+	var/nightshift_start_time = 576000	//4pm	//702000=7:30 PM, station time
+	var/nightshift_end_time = 360000	//10am	//270000=7:30 AM, station time
+	var/nightshift_dawn_start = 288000		//198000=530am
+	var/nightshift_day_start = 360000		//270000=730am
+	var/nightshift_dusk_start = 504000		//630000=530pm
 
 	//1hr = 36000
 	//30m = 18000

diff --git a/code/controllers/subsystem/ticker.dm b/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 = 999999999 MINUTES
+	var/time_until_vote = 999999 MINUTES
 	var/last_vote_time = null
 	var/autovote = TRUE
 	var/firstvote = TRUE

diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi
diff --git a/rougesurvivalfiles/rougeplants.dm b/rougesurvivalfiles/rougeplants.dm
@@ -2,16 +2,12 @@
 	name = "skin seeds"
 	desc = "Looks alive"
 	icon_state = "seed"
-	species = "hide"
+	species = "weed"
 	plantname = "Hide Plant"
 	product = /obj/item/natural/hide
 	production = 1
-	yield = 1
+	yield = 2
 	potency = 1
-	delonharvest = FALSE
-	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
-	icon_grow = "bungotree-grow"
-	icon_dead = "bungotree-dead"
 
 
 /datum/crafting_recipe/roguetown/hideplantseeds
@@ -40,16 +36,12 @@
 	name = "Iron Pellets"
 	desc = "Feels Heavy"
 	icon_state = "seed"
-	species = "banana"
+	species = "weed"
 	plantname = "Iron Stalks"
 	product = /obj/item/rogueore/iron
 	production = 1
-	yield = 1
+	yield = 2
 	potency = 1
-	delonharvest = FALSE
-	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
-	icon_grow = "mimana-grow"
-	icon_dead = "banana-dead"
 
 
 /datum/crafting_recipe/roguetown/ironplantseeds
@@ -66,16 +58,12 @@
 	name = "Tree Seeds"
 	desc = "You can hear the Tiny Seeds screaming, they beg to be buried"
 	icon_state = "seed"
-	species = "tree"
+	species = "weed"
 	plantname = "Tiny Tree"
 	product = /obj/item/grown/log/tree/small
 	production = 1
-	yield = 3
+	yield = 2
 	potency = 1
-	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
-	icon_grow = "cherry-grow"
-	icon_dead = "cherry-dead"
-
 
 
 /datum/crafting_recipe/roguetown/treeseeds

diff --git a/rougesurvivalfiles/rougesupply.dm b/rougesurvivalfiles/rougesupply.dm