kimfdbjk

nigar

code/controllers/subsystem/nightshift.dm

@@ -8,11 +8,11 @@ SUBSYSTEM_DEF(nightshift)
 	var/current_tod = null
 
 	var/nightshift_active = FALSE
-	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
+	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
 
 	//1hr = 36000
 	//30m = 18000

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 = 999999 MINUTES
+	var/time_until_vote = 999999999 MINUTES
 	var/last_vote_time = null
 	var/autovote = TRUE
 	var/firstvote = TRUE

rougesurvivalfiles/rougeplants.dm

@@ -2,12 +2,16 @@
 	name = "skin seeds"
 	desc = "Looks alive"
 	icon_state = "seed"
-	species = "weed"
+	species = "hide"
 	plantname = "Hide Plant"
 	product = /obj/item/natural/hide
 	production = 1
-	yield = 2
+	yield = 1
 	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
@@ -36,12 +40,16 @@
 	name = "Iron Pellets"
 	desc = "Feels Heavy"
 	icon_state = "seed"
-	species = "weed"
+	species = "banana"
 	plantname = "Iron Stalks"
 	product = /obj/item/rogueore/iron
 	production = 1
-	yield = 2
+	yield = 1
 	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
@@ -58,12 +66,16 @@
 	name = "Tree Seeds"
 	desc = "You can hear the Tiny Seeds screaming, they beg to be buried"
 	icon_state = "seed"
-	species = "weed"
+	species = "tree"
 	plantname = "Tiny Tree"
 	product = /obj/item/grown/log/tree/small
 	production = 1
-	yield = 2
+	yield = 3
 	potency = 1
+	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
+	icon_grow = "cherry-grow"
+	icon_dead = "cherry-dead"
+
 
 
 /datum/crafting_recipe/roguetown/treeseeds

rougesurvivalfiles/rougesupply.dm

@@ -0,0 +1,46 @@
+/datum/supply_pack/rogue/armor/plate/blkknight
+	name = "Black Plate"
+	cost = 666
+	contains = list(/obj/item/clothing/suit/roguetown/armor/plate/blkknight)
+
+/datum/supply_pack/rogue/armor/shoes/blkknight
+	name = "Black Steel Toe'd Boots"
+	cost = 333
+	contains = list(/obj/item/clothing/shoes/roguetown/boots/armor/blkknight)
+
+/datum/supply_pack/rogue/armor/platelegs/blk
+	name = "Blacken'd Steel Legs"
+	cost = 444
+	contains = list(/obj/item/clothing/under/roguetown/platelegs/blk)
+
+/datum/supply_pack/rogue/armor/heavy/blkknight
+	name = "Black Sun Helmet"
+	cost = 666
+	contains = list(/obj/item/clothing/head/roguetown/helmet/heavy/blkknight)
+
+/datum/supply_pack/rogue/seeds/hideplant
+	name = "Genetically Engineered Skin-Chia Pet"
+	cost = 50
+	contains = list(/obj/item/seeds/hideplant)
+
+/datum/supply_pack/rogue/seeds/treeseed
+	name = "Imported Tree Seeds from Finland"
+	cost = 30
+	contains = list(/obj/item/seeds/treeseeds)
+
+/datum/supply_pack/rogue/seeds/treeseed
+	name = "ToysRus Kid Mad Scientist at Home Iron Growth Kit"
+	cost = 75
+	contains = list(/obj/item/seeds/ironplant)
+
+
+
+
+
+
+
+
+
+
+
+