From 178cddcf9d01e124925e686a84729952902ef315 Mon Sep 17 00:00:00 2001
From: Enric Gabriel <43283559+SandPoot@users.noreply.github.com>
Date: Mon, 22 Jun 2020 16:48:34 -0300
Subject: [PATCH] some stuff from all around

---
 sandcode/code/datums/traits/neutral.dm        |  13 +++
 .../living/simple_animal/friendly/doges.dm    |  81 ++++++++++++++++++
 .../research/designs/machine_designs.dm       |   8 ++
 .../shuttle/spaceship_navigation_beacon.dm    |  69 +++++++++++++++
 sandcode/icons/mob/doges.dmi                  | Bin 0 -> 7864 bytes
 sandcode/icons/obj/machines/NavBeacon.dmi     | Bin 0 -> 2488 bytes
 tgstation.dme                                 |   1 +
 7 files changed, 172 insertions(+)
 create mode 100644 sandcode/code/datums/traits/neutral.dm
 create mode 100644 sandcode/code/modules/mob/living/simple_animal/friendly/doges.dm
 create mode 100644 sandcode/code/modules/shuttle/spaceship_navigation_beacon.dm
 create mode 100644 sandcode/icons/mob/doges.dmi
 create mode 100644 sandcode/icons/obj/machines/NavBeacon.dmi

diff --git a/sandcode/code/datums/traits/neutral.dm b/sandcode/code/datums/traits/neutral.dm
new file mode 100644
index 0000000000..415ec9aab1
--- /dev/null
+++ b/sandcode/code/datums/traits/neutral.dm
@@ -0,0 +1,13 @@
+/datum/quirk/hypnotic_stupor //straight from skyrat
+	name = "Hypnotic Stupor"
+	desc = "Your prone to episodes of extreme stupor that leaves you extremely suggestible."
+	value = 0
+	human_only = TRUE
+	gain_text = null // Handled by trauma.
+	lose_text = null
+	medical_record_text = "Patient has an untreatable condition with their brain, wiring them to be extreamly suggestible..."
+
+/datum/quirk/hypnotic_stupor/add()
+	var/datum/brain_trauma/severe/hypnotic_stupor/T = new()
+	var/mob/living/carbon/human/H = quirk_holder
+	H.gain_trauma(T, TRAUMA_RESILIENCE_ABSOLUTE)
diff --git a/sandcode/code/modules/mob/living/simple_animal/friendly/doges.dm b/sandcode/code/modules/mob/living/simple_animal/friendly/doges.dm
new file mode 100644
index 0000000000..adcb569265
--- /dev/null
+++ b/sandcode/code/modules/mob/living/simple_animal/friendly/doges.dm
@@ -0,0 +1,81 @@
+
+//Borrowed from Skyrat, this is not sandstorm original content
+
+//cheems, the true cargo pet
+//note: will probably add hat and fluff functionality later
+//note 2: will probably get a better sprite later
+//note 3: ignore note 2 the sprite is actually good now
+/mob/living/simple_animal/pet/dog/cheems
+	name = "\proper Cheems"
+	desc = "Cargo's overfed and slightly greasy disposal bin."
+	icon = 'sandcode/icons/mob/doges.dmi'
+	icon_state = "cheems"
+	icon_dead = "cheems_dead"
+	icon_living = "cheems"
+	speak = list("Borf!", "Boof!", "Bork!")
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/burger/cheese = 1, /obj/item/reagent_containers/food/snacks/meat/slab = 2, /obj/item/trash/syndi_cakes = 1)
+	faction = list("dog", "doge")
+	animal_species = /mob/living/simple_animal/pet/dog
+	gold_core_spawnable = FRIENDLY_SPAWN
+
+/mob/living/simple_animal/pet/dog/cheems/Move(atom/newloc, direct)
+	. = ..()
+	if(.)
+		for(var/obj/item/reagent_containers/food/snacks/burger/burbger in view(1, src))
+			visible_message("<span class='danger'><b>\The [src]</b> consumes the [burbger]!</span>")
+			qdel(burbger)
+			revive(full_heal = 1)
+
+/mob/living/simple_animal/pet/dog/cheems/attacked_by(obj/item/I, mob/living/user)
+	. = ..()
+	if(.)
+		if(istype(I, /obj/item/reagent_containers/food/snacks/burger))
+			qdel(I)
+			if(stat == DEAD)
+				visible_message("<b>\The [src]</b> stands right back up after nibbling the [I]!")
+			else 
+				visible_message("<b>\The [src]</b> swallows the [I] whole!")
+			revive(full_heal = 1)
+
+//cheemgularity
+/* disabled for now because error: maximum number of internal arrays exceeded (65535)
+/obj/singularity/proc/consume(atom/A)
+	var/gain = A.singularity_act(current_size, src)
+	src.energy += gain
+	if(istype(A, /obj/machinery/power/supermatter_crystal) && !consumedSupermatter)
+		desc = "[initial(desc)] It glows fiercely with inner fire."
+		name = "supermatter-charged [initial(name)]"
+		consumedSupermatter = 1
+		set_light(10)
+	if(istype(A, /mob/living/simple_animal/pet/dog/cheems))
+		new /obj/singularity/cheemgularity(get_turf(src))
+		qdel(src)
+
+/obj/singularity/cheemgularity
+	name = "cheemgularity"
+	desc = "Praise cheem."
+	icon = 'sandcode/icons/obj/singularity.dmi'
+	icon_state = "cheemgulo_s1"
+
+/obj/singularity/cheemgularity/expand(force_size)
+	..()
+	switch(force_size)
+		if(STAGE_ONE to STAGE_TWO)
+			icon = initial(icon)
+			icon_state = "cheemgulo_s1"
+		if(STAGE_TWO to STAGE_THREE)
+			icon = 'sandcode/icons/effects/96x96.dmi'
+			icon_state = "cheemgulo_s3"
+		if(STAGE_THREE to STAGE_FOUR)
+			icon = 'sandcode/icons/effects/160x160.dmi'
+			icon_state = "cheemgulo_s5"
+		if(STAGE_FOUR to STAGE_FIVE)
+			icon = 'sandcode/icons/effects/224x224.dmi'
+			icon_state = "cheemgulo_s7"
+		if(STAGE_FIVE to STAGE_SIX)
+			icon = 'sandcode/icons/effects/288x288.dmi'
+			icon_state = "cheemgulo_s9"
+		if(STAGE_SIX)
+			icon = 'sandcode/icons/effects/352x352.dmi'
+			icon_state = "cheemgulo_s11"
+*/
diff --git a/sandcode/code/modules/research/designs/machine_designs.dm b/sandcode/code/modules/research/designs/machine_designs.dm
index de22ade33c..a0b2b97f6b 100644
--- a/sandcode/code/modules/research/designs/machine_designs.dm
+++ b/sandcode/code/modules/research/designs/machine_designs.dm
@@ -31,3 +31,11 @@
 	build_path = /obj/item/circuitboard/machine/pacman/mclunky
 	category = list("initial", "Electronics")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/board/spaceship_navigation_beacon
+	name = "Machine Design (Bluespace Navigation Gigabeacon)"
+	desc = "The circuit board for a Bluespace Navigation Gigabeacon."
+	id = "spaceship_navigation_beacon"
+	build_path = /obj/item/circuitboard/machine/spaceship_navigation_beacon
+	category = list ("Teleportation Machinery")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
diff --git a/sandcode/code/modules/shuttle/spaceship_navigation_beacon.dm b/sandcode/code/modules/shuttle/spaceship_navigation_beacon.dm
new file mode 100644
index 0000000000..d21f971ea3
--- /dev/null
+++ b/sandcode/code/modules/shuttle/spaceship_navigation_beacon.dm
@@ -0,0 +1,69 @@
+/obj/item/circuitboard/machine/spaceship_navigation_beacon
+	name = "Bluespace Navigation Gigabeacon (Machine Board)"
+	build_path = /obj/machinery/spaceship_navigation_beacon
+	req_components = list()
+
+
+/obj/machinery/spaceship_navigation_beacon
+	name = "Bluespace Navigation Gigabeacon"
+	desc = "A device that creates a bluespace anchor that allow ships jump near to it."
+	icon = 'sandcode/icons/obj/machines/NavBeacon.dmi'
+	icon_state = "beacon-item"
+	use_power = IDLE_POWER_USE
+	idle_power_usage = 0
+	density = TRUE
+	circuit = /obj/item/circuitboard/machine/spaceship_navigation_beacon
+	light_power = 2
+
+	var/locked = FALSE //Locked beacons don't allow to jump to it.
+
+
+/obj/machinery/spaceship_navigation_beacon/Initialize()
+	. = ..()
+	SSshuttle.beacons |= src
+
+obj/machinery/spaceship_navigation_beacon/emp_act()
+	locked = TRUE
+
+/obj/machinery/spaceship_navigation_beacon/Destroy()
+	SSshuttle.beacons -= src
+	return ..()
+
+// update the icon_state
+/obj/machinery/spaceship_navigation_beacon/update_icon()
+	if(powered())
+		icon_state = "beacon-active"
+		set_light(1)
+	if(panel_open)
+		icon_state = "beacon-open"
+		set_light(0)
+	else
+		icon_state = "beacon-inactive"
+		set_light(0)
+
+/obj/machinery/spaceship_navigation_beacon/power_change()
+	. = ..()
+	update_icon()
+
+/obj/machinery/spaceship_navigation_beacon/multitool_act(mob/living/user, obj/item/multitool/I)
+	if(panel_open)
+		var/new_name = "Beacon_[input("Enter the custom name for this beacon", "It be Beacon ..your input..") as text]"
+		if(new_name && Adjacent(user))
+			name = new_name
+			to_chat(user, "<span class='notice'>You change beacon name to [name].</span>")
+	else
+		locked = !locked
+		to_chat(user, "<span class='notice'>You [locked ? "" : "un"]lock [src].</span>")
+	return TRUE
+
+/obj/machinery/spaceship_navigation_beacon/examine()
+	. = ..()
+	. += "<span class='[locked ? "warning" : "nicegreen"]'>Status: [locked ? "LOCKED" : "Stable"] </span>"
+
+/obj/machinery/spaceship_navigation_beacon/attackby(obj/item/W, mob/user, params)
+	if(default_deconstruction_screwdriver(user, "beacon-open", "beacon-active", W))
+		return
+	if(default_deconstruction_crowbar(W))
+		return
+
+	return ..()
diff --git a/sandcode/icons/mob/doges.dmi b/sandcode/icons/mob/doges.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..99f90f403ecdb9159bedff9289a476b630425f70
GIT binary patch
literal 7864
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
WV#vtF1(z)V0000<MNUMnLSTYhb`X64

literal 0
HcmV?d00001

diff --git a/sandcode/icons/obj/machines/NavBeacon.dmi b/sandcode/icons/obj/machines/NavBeacon.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..48624a135251d0b88f80591579dd74f9d5925354
GIT binary patch
literal 2488
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
azjj|gnqJ>(d}=0G#ekC?#+GX1m-sgX!I>BU

literal 0
HcmV?d00001

diff --git a/tgstation.dme b/tgstation.dme
index a489cb6340..92ad5491f2 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3478,6 +3478,7 @@
 #include "modular_citadel\code\modules\reagents\objects\items.dm"
 #include "sandcode\code\__DEFINES\traits.dm"
 #include "sandcode\code\datums\traits\negative.dm"
+#include "sandcode\code\datums\traits\neutral.dm"
 #include "sandcode\code\game\area\ship_area.dm"
 #include "sandcode\code\game\mecha\mech_fabricator.dm"
 #include "sandcode\code\game\objects\effects\contraband.dm"