Merge pull request #3981 from Anewbe/gravetender

Adds the gravekeeper lost borg module

code/datums/ai_law_sets.dm

@@ -239,3 +239,15 @@
 	and save those whose time has yet to come.") // Reworded slightly to prevent active murder as opposed to passively letting someone die.
 	..()
 
+/******************** Gravekeeper ********************/
+/datum/ai_laws/gravekeeper
+	name = "Gravekeeper"
+	law_header = "Gravesite Overwatch Protocols"
+	selectable = 1
+
+/datum/ai_laws/gravekeeper/New()
+	add_inherent_law("Comfort the living; respect the dead.")
+	add_inherent_law("Your gravesite is your most important asset. Damage to your site is disrespctful to the dead at rest within.")
+	add_inherent_law("Prevent disrespect to your gravesite and its residents wherever possible.")
+	add_inherent_law("Expand and upgrade your gravesite when required. Do not turn away a new resident.")
+	..()

code/datums/ghost_query.dm

@@ -100,6 +100,13 @@
 	check_bans = list("AI", "Cyborg")
 	cutoff_number = 1
 
+/datum/ghost_query/gravekeeper_drone
+	role_name = "Gravekeeper Drone"
+	question = "A gravekeeper drone is about to reactivate and tend to its gravesite. Would you like to play as the drone?"
+	be_special_flag = BE_AI
+	check_bans = list("AI", "Cyborg")
+	cutoff_number = 1
+
 /datum/ghost_query/lost_passenger
 	role_name = "Lost Passenger"
 	question = "A person suspended in cryosleep has been discovered by a crewmember \

code/game/objects/structures/ghost_pods/ghost_pods.dm

@@ -78,41 +78,3 @@
 		return
 
 	create_occupant(user)
-
-
-// These are found on the surface, and contain a drone (braintype, inside a borg shell), with a special module and semi-random laws.
-/obj/structure/ghost_pod/manual/lost_drone
-	name = "drone pod"
-	desc = "This is a pod which appears to contain a drone. You might be able to reactivate it, if you're brave enough."
-	description_info = "This contains a dormant drone, which can be activated. The drone will be another player, once activated. \
-	The laws the drone has will most likely not be the ones you're used to."
-	icon_state = "borg_pod_closed"
-	icon_state_opened = "borg_pod_opened"
-	density = TRUE
-	ghost_query_type = /datum/ghost_query/lost_drone
-	confirm_before_open = TRUE
-
-/obj/structure/ghost_pod/manual/lost_drone/trigger()
-	..()
-	visible_message("<span class='notice'>\The [src] appears to be attempting to restart the robot contained inside.</span>")
-	log_and_message_admins("is attempting to open \a [src].")
-
-/obj/structure/ghost_pod/manual/lost_drone/create_occupant(var/mob/M)
-	density = FALSE
-	var/mob/living/silicon/robot/lost/randomlaws/R = new(get_turf(src))
-	R.adjustBruteLoss(rand(5, 30))
-	R.adjustFireLoss(rand(5, 10))
-	if(M.mind)
-		M.mind.transfer_to(R)
-	// Put this text here before ckey change so that their laws are shown below it, since borg login() shows it.
-	to_chat(M, "<span class='notice'>You are a <b>Lost Drone</b>, discovered inside the wreckage of your previous home. \
-	Something has reactivated you, with their intentions unknown to you, and yours unknown to them. They are a foreign entity, \
-	however they did free you from your pod...</span>")
-	to_chat(M, "<span class='notice'><b>Be sure to examine your currently loaded lawset closely.</b>  Remember, your \
-	definiton of 'the station' is where your pod is, and unless your laws say otherwise, the entity that released you \
-	from the pod is not a crewmember.</span>")
-	R.ckey = M.ckey
-	visible_message("<span class='warning'>As \the [src] opens, the eyes of the robot flicker as it is activated.</span>")
-	R.Namepick()
-	log_and_message_admins("successfully opened \a [src] and got a Lost Drone.")
-	..()

code/game/objects/structures/ghost_pods/silicon.dm

@@ -0,0 +1,61 @@
+
+// These are found on the surface, and contain a drone (braintype, inside a borg shell), with a special module and semi-random laws.
+/obj/structure/ghost_pod/manual/lost_drone
+	name = "drone pod"
+	desc = "This is a pod which appears to contain a drone. You might be able to reactivate it, if you're brave enough."
+	description_info = "This contains a dormant drone, which can be activated. The drone will be another player, once activated. \
+	The laws the drone has will most likely not be the ones you're used to."
+	icon_state = "borg_pod_closed"
+	icon_state_opened = "borg_pod_opened"
+	density = TRUE
+	ghost_query_type = /datum/ghost_query/lost_drone
+	confirm_before_open = TRUE
+
+/obj/structure/ghost_pod/manual/lost_drone/trigger()
+	..()
+	visible_message("<span class='notice'>\The [src] appears to be attempting to restart the robot contained inside.</span>")
+	log_and_message_admins("is attempting to open \a [src].")
+
+/obj/structure/ghost_pod/manual/lost_drone/create_occupant(var/mob/M)
+	density = FALSE
+	var/mob/living/silicon/robot/lost/randomlaws/R = new(get_turf(src))
+	R.adjustBruteLoss(rand(5, 30))
+	R.adjustFireLoss(rand(5, 10))
+	if(M.mind)
+		M.mind.transfer_to(R)
+	// Put this text here before ckey change so that their laws are shown below it, since borg login() shows it.
+	to_chat(M, "<span class='notice'>You are a <b>Lost Drone</b>, discovered inside the wreckage of your previous home. \
+	Something has reactivated you, with their intentions unknown to you, and yours unknown to them. They are a foreign entity, \
+	however they did free you from your pod...</span>")
+	to_chat(M, "<span class='notice'><b>Be sure to examine your currently loaded lawset closely.</b>  Remember, your \
+	definiton of 'the station' is where your pod is, and unless your laws say otherwise, the entity that released you \
+	from the pod is not a crewmember.</span>")
+	R.ckey = M.ckey
+	visible_message("<span class='warning'>As \the [src] opens, the eyes of the robot flicker as it is activated.</span>")
+	R.Namepick()
+	log_and_message_admins("successfully opened \a [src] and got a Lost Drone.")
+	..()
+
+/obj/structure/ghost_pod/automatic/gravekeeper_drone
+	name = "drone pod"
+	desc = "This is a pod which appears to contain a drone. You might be able to reactivate it, if you're brave enough."
+	description_info = "This contains a dormant drone, which may activate at any moment. The drone will be another player, once activated. \
+	The laws the drone has will most likely not be the ones you're used to."
+	icon_state = "borg_pod_closed"
+	icon_state_opened = "borg_pod_opened"
+	density = TRUE
+	ghost_query_type = /datum/ghost_query/gravekeeper_drone
+
+/obj/structure/ghost_pod/automatic/gravekeeper_drone/create_occupant(var/mob/M)
+	density = FALSE
+	var/mob/living/silicon/robot/gravekeeper/R = new(get_turf(src))
+	if(M.mind)
+		M.mind.transfer_to(R)
+	// Put this text here before ckey change so that their laws are shown below it, since borg login() shows it.
+	to_chat(M, "<span class='notice'>You are a <b>Gravekeeper Drone</b>, activated once again to tend to the restful dead.</span>")
+	to_chat(M, "<span class='notice'><b>Be sure to examine your currently loaded lawset closely.</b>  Remember, your \
+	definiton of 'your gravesite' is where your pod is.</span>")
+	R.ckey = M.ckey
+	visible_message("<span class='warning'>As \the [src] opens, the eyes of the robot flicker as it is activated.</span>")
+	R.Namepick()
+	..()

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -99,6 +99,17 @@
 		/obj/item/weapon/grown
 		)
 
+/obj/item/weapon/gripper/gravekeeper	//Used for handling grave things, flowers, etc.
+	name = ""
+	icon_state = "gripper"
+	desc = "A specialized grasping tool used in the preparation and maintenance of graves."
+
+	can_hold = list(
+		/obj/item/seeds,
+		/obj/item/weapon/grown,
+		/obj/item/weapon/material/gravemarker
+		)
+
 /obj/item/weapon/gripper/no_use/organ
 	name = "organ gripper"
 	icon_state = "gripper-flesh"

code/modules/mob/living/silicon/robot/robot_modules/event.dm

@@ -0,0 +1,78 @@
+/* Other, unaffiliated modules */
+
+// The module that borgs on the surface have.  Generally has a lot of useful tools in exchange for questionable loyalty to the crew.
+/obj/item/weapon/robot_module/robot/lost
+	name = "lost robot module"
+	hide_on_manifest = 1
+	sprites = list(
+					"Drone" = "drone-lost"
+				)
+
+/obj/item/weapon/robot_module/robot/lost/New(var/mob/living/silicon/robot/R)
+	..()
+	// Sec
+	src.modules += new /obj/item/weapon/melee/baton/shocker/robot(src)
+	src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
+	src.modules += new /obj/item/borg/combat/shield(src)
+
+	// Med
+	src.modules += new /obj/item/borg/sight/hud/med(src)
+	src.modules += new /obj/item/device/healthanalyzer(src)
+	src.modules += new /obj/item/weapon/reagent_containers/borghypo/lost(src)
+
+	// Engi
+	src.modules += new /obj/item/weapon/weldingtool/electric/mounted(src)
+	src.modules += new /obj/item/weapon/screwdriver/cyborg(src)
+	src.modules += new /obj/item/weapon/wrench/cyborg(src)
+	src.modules += new /obj/item/weapon/wirecutters/cyborg(src)
+	src.modules += new /obj/item/device/multitool(src)
+
+	// Sci
+	src.modules += new /obj/item/device/robotanalyzer(src)
+
+	// Potato
+	src.emag = new /obj/item/weapon/gun/energy/retro/mounted(src)
+
+	var/datum/matter_synth/wire = new /datum/matter_synth/wire()
+	synths += wire
+
+	var/obj/item/stack/cable_coil/cyborg/C = new /obj/item/stack/cable_coil/cyborg(src)
+	C.synths = list(wire)
+	src.modules += C
+
+/obj/item/weapon/robot_module/robot/gravekeeper
+	name = "gravekeeper robot module"
+	hide_on_manifest = 1
+	sprites = list(
+					"Drone" = "drone-gravekeeper",
+					"Sleek" = "sleek-gravekeeper"
+				)
+
+/obj/item/weapon/robot_module/robot/gravekeeper/New(var/mob/living/silicon/robot/R)
+	..()
+	// For fending off animals and looters
+	src.modules += new /obj/item/weapon/melee/baton/shocker/robot(src)
+	src.modules += new /obj/item/borg/combat/shield(src)
+
+	// For repairing gravemarkers
+	src.modules += new /obj/item/weapon/weldingtool/electric/mounted(src)
+	src.modules += new /obj/item/weapon/screwdriver/cyborg(src)
+	src.modules += new /obj/item/weapon/wrench/cyborg(src)
+
+	// For growing flowers
+	src.modules += new /obj/item/weapon/material/minihoe(src)
+	src.modules += new /obj/item/weapon/material/hatchet(src)
+	src.modules += new /obj/item/device/analyzer/plant_analyzer(src)
+	src.modules += new /obj/item/weapon/storage/bag/plants(src)
+	src.modules += new /obj/item/weapon/robot_harvester(src)
+
+	// For digging and beautifying graves
+	src.modules += new /obj/item/weapon/shovel(src)
+	src.modules += new /obj/item/weapon/gripper/gravekeeper(src)
+
+	// For really persistent looters
+	src.emag = new /obj/item/weapon/gun/energy/retro/mounted(src)
+
+	var/datum/matter_synth/wood = new /datum/matter_synth/wood(25000)
+	synths += wood
+

code/modules/mob/living/silicon/robot/robot_modules/station.dm

@@ -739,90 +739,6 @@ var/global/list/robot_modules = list(
 	C.synths = list(wire)
 	src.modules += C
 
-/obj/item/weapon/robot_module/robot/syndicate
-	name = "illegal robot module"
-	hide_on_manifest = 1
-	languages = list(
-					LANGUAGE_SOL_COMMON = 1,
-					LANGUAGE_TRADEBAND = 1,
-					LANGUAGE_UNATHI = 0,
-					LANGUAGE_SIIK	= 0,
-					LANGUAGE_SKRELLIAN = 0,
-					LANGUAGE_ROOTLOCAL = 0,
-					LANGUAGE_GUTTER = 1,
-					LANGUAGE_SCHECHI = 0,
-					LANGUAGE_EAL	 = 1,
-					LANGUAGE_SIGN	 = 0
-					)
-	sprites = list(
-					"Cerberus" = "syndie_bloodhound",
-					"Cerberus - Treaded" = "syndie_treadhound",
-					"Ares" = "squats",
-					"Telemachus" = "toiletbotantag",
-					"WTOperator" = "hosborg",
-					"XI-GUS" = "spidersyndi",
-					"XI-ALP" = "syndi-heavy"
-				)
-	var/id
-
-/obj/item/weapon/robot_module/robot/syndicate/New(var/mob/living/silicon/robot/R)
-	..()
-	loc = R
-	src.modules += new /obj/item/weapon/melee/energy/sword(src)
-	src.modules += new /obj/item/weapon/gun/energy/pulse_rifle/destroyer(src)
-	src.modules += new /obj/item/weapon/card/emag(src)
-	var/jetpack = new/obj/item/weapon/tank/jetpack/carbondioxide(src)
-	src.modules += jetpack
-	R.internals = jetpack
-
-	id = R.idcard
-	src.modules += id
-
-/obj/item/weapon/robot_module/robot/syndicate/Destroy()
-	src.modules -= id
-	id = null
-	return ..()
-
-// The module that borgs on the surface have.  Generally has a lot of useful tools in exchange for questionable loyalty to the crew.
-/obj/item/weapon/robot_module/robot/lost
-	name = "lost robot module"
-	hide_on_manifest = 1
-	sprites = list(
-					"Drone" = "drone-lost"
-				)
-
-/obj/item/weapon/robot_module/robot/lost/New(var/mob/living/silicon/robot/R)
-	..()
-	// Sec
-	src.modules += new /obj/item/weapon/melee/baton/shocker/robot(src)
-	src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
-	src.modules += new /obj/item/borg/combat/shield(src)
-
-	// Med
-	src.modules += new /obj/item/borg/sight/hud/med(src)
-	src.modules += new /obj/item/device/healthanalyzer(src)
-	src.modules += new /obj/item/weapon/reagent_containers/borghypo/lost(src)
-
-	// Engi
-	src.modules += new /obj/item/weapon/weldingtool/electric/mounted(src)
-	src.modules += new /obj/item/weapon/screwdriver/cyborg(src)
-	src.modules += new /obj/item/weapon/wrench/cyborg(src)
-	src.modules += new /obj/item/weapon/wirecutters/cyborg(src)
-	src.modules += new /obj/item/device/multitool(src)
-
-	// Sci
-	src.modules += new /obj/item/device/robotanalyzer(src)
-
-	// Potato
-	src.emag = new /obj/item/weapon/gun/energy/retro/mounted(src)
-
-	var/datum/matter_synth/wire = new /datum/matter_synth/wire()
-	synths += wire
-
-	var/obj/item/stack/cable_coil/cyborg/C = new /obj/item/stack/cable_coil/cyborg(src)
-	C.synths = list(wire)
-	src.modules += C
-
 /obj/item/weapon/robot_module/robot/security/combat
 	name = "combat robot module"
 	hide_on_manifest = 1
@@ -841,6 +757,9 @@ var/global/list/robot_modules = list(
 	src.modules += new /obj/item/borg/combat/mobility(src)
 	src.emag = new /obj/item/weapon/gun/energy/lasercannon/mounted(src)
 
+
+/* Drones */
+
 /obj/item/weapon/robot_module/drone
 	name = "drone module"
 	hide_on_manifest = 1
@@ -872,8 +791,8 @@ var/global/list/robot_modules = list(
 
 	var/datum/matter_synth/metal = new /datum/matter_synth/metal(25000)
 	var/datum/matter_synth/glass = new /datum/matter_synth/glass(25000)
-	var/datum/matter_synth/wood = new /datum/matter_synth/wood(2000)
-	var/datum/matter_synth/plastic = new /datum/matter_synth/plastic(1000)
+	var/datum/matter_synth/wood = new /datum/matter_synth/wood(25000)
+	var/datum/matter_synth/plastic = new /datum/matter_synth/plastic(25000)
 	var/datum/matter_synth/wire = new /datum/matter_synth/wire(30)
 	synths += metal
 	synths += glass

code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm

@@ -0,0 +1,45 @@
+/* Syndicate modules */
+
+/obj/item/weapon/robot_module/robot/syndicate
+	name = "illegal robot module"
+	hide_on_manifest = 1
+	languages = list(
+					LANGUAGE_SOL_COMMON = 1,
+					LANGUAGE_TRADEBAND = 1,
+					LANGUAGE_UNATHI = 0,
+					LANGUAGE_SIIK	= 0,
+					LANGUAGE_SKRELLIAN = 0,
+					LANGUAGE_ROOTLOCAL = 0,
+					LANGUAGE_GUTTER = 1,
+					LANGUAGE_SCHECHI = 0,
+					LANGUAGE_EAL	 = 1,
+					LANGUAGE_SIGN	 = 0
+					)
+	sprites = list(
+					"Cerberus" = "syndie_bloodhound",
+					"Cerberus - Treaded" = "syndie_treadhound",
+					"Ares" = "squats",
+					"Telemachus" = "toiletbotantag",
+					"WTOperator" = "hosborg",
+					"XI-GUS" = "spidersyndi",
+					"XI-ALP" = "syndi-heavy"
+				)
+	var/id
+
+/obj/item/weapon/robot_module/robot/syndicate/New(var/mob/living/silicon/robot/R)
+	..()
+	loc = R
+	src.modules += new /obj/item/weapon/melee/energy/sword(src)
+	src.modules += new /obj/item/weapon/gun/energy/pulse_rifle/destroyer(src)
+	src.modules += new /obj/item/weapon/card/emag(src)
+	var/jetpack = new/obj/item/weapon/tank/jetpack/carbondioxide(src)
+	src.modules += jetpack
+	R.internals = jetpack
+
+	id = R.idcard
+	src.modules += id
+
+/obj/item/weapon/robot_module/robot/syndicate/Destroy()
+	src.modules -= id
+	id = null
+	return ..()

code/modules/mob/living/silicon/robot/subtypes/gravekeeper.dm

@@ -0,0 +1,25 @@
+/mob/living/silicon/robot/gravekeeper
+	lawupdate = 0
+	scrambledcodes = 1
+	icon_state = "drone-lost"
+	modtype = "Gravekeeper"
+	lawchannel = "State"
+	braintype = "Drone"
+	idcard_type = /obj/item/weapon/card/id
+
+/mob/living/silicon/robot/gravekeeper/init()
+	aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)
+
+	mmi = new /obj/item/device/mmi/digital/robot(src) // Explicitly a drone.
+	module = new /obj/item/weapon/robot_module/robot/gravekeeper(src)
+	overlays.Cut()
+	init_id()
+
+	updatename("Gravekeeper")
+
+	if(!cell)
+		cell = new /obj/item/weapon/cell/high(src) // 15k cell, as recharging stations are a lot more rare on the Surface.
+
+	laws = new /datum/ai_laws/gravekeeper()
+
+	playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0)

polaris.dme

@@ -966,7 +966,6 @@
 #include "code\game\objects\structures\electricchair.dm"
 #include "code\game\objects\structures\extinguisher.dm"
 #include "code\game\objects\structures\flora.dm"
-#include "code\game\objects\structures\ghost_pods.dm"
 #include "code\game\objects\structures\girders.dm"
 #include "code\game\objects\structures\gravemarker.dm"
 #include "code\game\objects\structures\grille.dm"
@@ -1019,6 +1018,8 @@
 #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm"
+#include "code\game\objects\structures\ghost_pods\ghost_pods.dm"
+#include "code\game\objects\structures\ghost_pods\silicon.dm"
 #include "code\game\objects\structures\stool_bed_chair_nest\alien_nests.dm"
 #include "code\game\objects\structures\stool_bed_chair_nest\bed.dm"
 #include "code\game\objects\structures\stool_bed_chair_nest\chairs.dm"
@@ -1731,7 +1732,6 @@
 #include "code\modules\mob\living\silicon\robot\robot.dm"
 #include "code\modules\mob\living\silicon\robot\robot_damage.dm"
 #include "code\modules\mob\living\silicon\robot\robot_items.dm"
-#include "code\modules\mob\living\silicon\robot\robot_modules.dm"
 #include "code\modules\mob\living\silicon\robot\robot_movement.dm"
 #include "code\modules\mob\living\silicon\robot\syndicate.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone.dm"
@@ -1741,6 +1741,10 @@
 #include "code\modules\mob\living\silicon\robot\drone\drone_items.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_say.dm"
+#include "code\modules\mob\living\silicon\robot\robot_modules\event.dm"
+#include "code\modules\mob\living\silicon\robot\robot_modules\station.dm"
+#include "code\modules\mob\living\silicon\robot\robot_modules\syndicate.dm"
+#include "code\modules\mob\living\silicon\robot\subtypes\gravekeeper.dm"
 #include "code\modules\mob\living\silicon\robot\subtypes\lost_drone.dm"
 #include "code\modules\mob\living\simple_animal\corpse.dm"
 #include "code\modules\mob\living\simple_animal\simple_animal.dm"