Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

добиваем 096 #37

Merged
merged 4 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions code/modules/SCP/SCPs/SCP-096.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -167,6 +167,7 @@
// AI procs

///Handles 096 AI
/*
/mob/living/scp096/proc/handle_AI()
switch(current_state)
if(STATE_096_IDLE)
Expand Down Expand Up @@ -235,7 +236,7 @@
if(STATE_096_STAGGERED)
if(world.time > stagger_counter)
current_state = STATE_096_CHASING

*/
//Overrides

/mob/living/scp096/Life()
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions mod_celadon/SCP096/_SCP096.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/datum/modpack/SCP096
/// A string name for the modpack. Used for looking up other modpacks in init.
name = "Name"
/// A string desc for the modpack. Can be used for modpack verb list as description.
desc = "Description"
/// A string with authors of this modpack.
author = "Voiko"

/datum/modpack/SCP096/pre_initialize()
. = ..()

/datum/modpack/SCP096/initialize()
. = ..()

/datum/modpack/SCP096/post_initialize()
. = ..()
6 changes: 6 additions & 0 deletions mod_celadon/SCP096/_SCP096.dme
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#include "_SCP096.dm"

#include "code/_macros.dm"
#include "code/SCP096.dm"
#include "code/SCP096_OBJ.dm"
#include "code/keybinds.dm"
11 changes: 11 additions & 0 deletions mod_celadon/SCP096/code/SCP096.dm
Original file line number Diff line number Diff line change
@@ -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()
13 changes: 13 additions & 0 deletions mod_celadon/SCP096/code/SCP096_OBJ.dm
Original file line number Diff line number Diff line change
@@ -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."))

2 changes: 2 additions & 0 deletions mod_celadon/SCP096/code/_macros.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#define CATEGORY_SCP "SCP"
#define isscp096(A) istype(A, /mob/living/scp096)
4 changes: 4 additions & 0 deletions mod_celadon/SCP096/code/keybinds.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/mob/living/scp096/verb/stop_screaming()
set name = "Stop scream"
set category = "IC"
stop_scream()
13 changes: 13 additions & 0 deletions mod_celadon/_components/code/_components.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
face_direction(A)
return

/mob/living/scp096/CtrlShiftClickOn(atom/A)
stop_scream()
return
// Моргания на кнопку V | => code/modules/keybindings/human.dm

/datum/keybinding/human/cause_blink
Expand All @@ -16,3 +19,13 @@
var/mob/living/carbon/human/H = user.mob
H.cause_blink()
return TRUE

/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.")
3 changes: 2 additions & 1 deletion mod_celadon/mod_celadon.dme
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#include "_modpack.dm"
#include "_modpacks.dm"


// #include "example/_example.dme"

// --- MAINTENANCE --- //

#include "_components/__components.dme"
#include "SCP096/_SCP096.dme"

// --- ICONS --- //

Expand Down
Loading