Merge pull request #37 from xhankaishi/dcp096-module

добиваем 096

code/modules/SCP/SCPs/SCP-096.dm

@@ -62,7 +62,7 @@
 		"????", //Name (Should not be the scp desg, more like what it can be described as to viewers)
 		SCP_EUCLID, //Obj Class
 		"096", //Numerical Designation
-		SCP_MEMETIC|SCP_DISABLED //096 is disabled until traits are ported in as that is neccesary for it to pathfind through doors.
+		SCP_MEMETIC //096 is disabled until traits are ported in as that is neccesary for it to pathfind through doors.
 	)
 
 	SCP.memeticFlags = MINSPECT|MPHOTO|MCAMERA
@@ -167,6 +167,7 @@
 // AI procs
 
 ///Handles 096 AI
+/*
 /mob/living/scp096/proc/handle_AI()
 	switch(current_state)
 		if(STATE_096_IDLE)
@@ -235,7 +236,7 @@
 		if(STATE_096_STAGGERED)
 			if(world.time > stagger_counter)
 				current_state = STATE_096_CHASING
-
+*/
 //Overrides
 
 /mob/living/scp096/Life()
@@ -268,7 +269,7 @@
 			oldViewers -= oldViewer
 
 	adjustBruteLoss(-10)
-	handle_AI()
+	//handle_AI()
 
 /mob/living/scp096/examine(mob/user, distance, infix, suffix)
 	if(user in GLOB.scramble_hud_users)
@@ -364,7 +365,7 @@
 /mob/living/scp096/movement_delay()
 	return -2
 
-#undef STATE_096_IDLE
+// #undef STATE_096_IDLE
 #undef STATE_096_SCREAMING
 #undef STATE_096_CHASING
 #undef STATE_096_SLAUGHTER

mod_celadon/SCP096/_SCP096.dm

@@ -0,0 +1,16 @@
+/datum/modpack/SCP096
+	/// A string name for the modpack. Used for looking up other modpacks in init.
+	name = "SCP096"
+	/// A string desc for the modpack. Can be used for modpack verb list as description.
+	desc = "-"
+	/// A string with authors of this modpack.
+	author = "XAH"
+
+/datum/modpack/SCP096/pre_initialize()
+	. = ..()
+
+/datum/modpack/SCP096/initialize()
+	. = ..()
+
+/datum/modpack/SCP096/post_initialize()
+	. = ..()

mod_celadon/SCP096/_SCP096.dme

@@ -0,0 +1,6 @@
+#include "_SCP096.dm"
+
+#include "code/_macros.dm"
+#include "code/SCP096.dm"
+#include "code/SCP096_OBJ.dm"
+#include "code/keybinds.dm"

mod_celadon/SCP096/code/SCP096.dm

@@ -0,0 +1,11 @@
+
+/mob/living/scp096/get_status_tab_items()
+    . = ..()
+    . += "Real Name: [target.real_name]"
+    . += "Job: [target.job]"
+
+/mob/living/scp096/proc/stop_scream()
+	current_state = STATE_096_IDLE
+	target = null
+	targets = null 	//Макросы прерываются в /mob/living/scp096, убрал прерывание одного макроса
+	update_icon()

mod_celadon/SCP096/code/SCP096_OBJ.dm

@@ -0,0 +1,13 @@
+/obj/item/photo/scp096/scp096_photo
+	name =  "???? photo"
+
+/obj/item/photo/scp096/scp096_photo/examine(mob/living/user)
+	. = ..()
+	if(!istype(user, /mob/living/scp096))
+		var/mob/living/scp096/scp_to_trigger = locate(/mob/living/scp096) in GLOB.SCP_list
+		if(get_dist(user, src) <= 1 && isliving(user)) // если нужна дистанция юзать get_dist()
+			scp_to_trigger.trigger(user)
+			to_chat(user, SPAN_DANGER("You catch [scp_to_trigger]"))
+		else
+			to_chat(user, SPAN_NOTICE("It is too far away."))
+

mod_celadon/SCP096/code/_macros.dm

@@ -0,0 +1,2 @@
+#define CATEGORY_SCP "SCP"
+#define isscp096(A) istype(A, /mob/living/scp096)

mod_celadon/SCP096/code/keybinds.dm

@@ -0,0 +1,4 @@
+/mob/living/scp096/verb/stop_screaming()
+	set name = "Stop scream"
+	set category = "IC"
+	stop_scream()

mod_celadon/_components/code/_components.dm

@@ -37,3 +37,13 @@
 		to_world("<span class=notice><b>[usr.key] Announces:</b><p style='text-indent: 50px'>[message]</p></span>")
 		log_admin("Announce: [key_name(usr)] : [message]")
 	SSstatistics.add_field_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/mob/living/scp096
+	var/seedarkness = 1
+
+/mob/living/scp096/verb/toggle_darkness()
+	set name = "Toggle Darkness"
+	set category = "IC"
+	seedarkness = !(seedarkness)
+	set_see_invisible(SEE_INVISIBLE_NOLIGHTING)
+	to_chat(src, "You [(seedarkness?"now":"no longer")] see darkness.")

mod_celadon/mod_celadon.dme

@@ -12,7 +12,7 @@
 
 // --- OBJECTS --- //
 #include "objects/_objects.dme"
-
+#include "_SCP096.dme"
 // --- MISC --- //