cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-04 14:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes and more PRs

Browse Source
This commit is contained in:
Ghommie
2020-01-18 23:01:00 +01:00
parent 3ee855ab77
commit 072eca6ec0
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/traits.dm
View File

@@ -173,6 +173,7 @@
#define TRAIT_AUTO_CATCH_ITEM "auto_catch_item" #define TRAIT_AUTO_CATCH_ITEM "auto_catch_item"
#define TRAIT_CLOWN_MENTALITY "clown_mentality" // The future is now, clownman. #define TRAIT_CLOWN_MENTALITY "clown_mentality" // The future is now, clownman.
#define TRAIT_FREESPRINT "free_sprinting" #define TRAIT_FREESPRINT "free_sprinting"
#define TRAIT_NO_TELEPORT "no-teleport" //you just can't
#define TRAIT_NO_ALCOHOL "alcohol_intolerance" #define TRAIT_NO_ALCOHOL "alcohol_intolerance"
// common trait sources // common trait sources
@@ -234,4 +235,5 @@
#define NUKEOP_ANTAGONIST "nukeop-antagonist" #define NUKEOP_ANTAGONIST "nukeop-antagonist"
#define MADE_UNCLONEABLE "made-uncloneable" #define MADE_UNCLONEABLE "made-uncloneable"
#define NUKEOP_TRAIT "nuke-op" #define NUKEOP_TRAIT "nuke-op"
#define MEGAFAUNA_TRAIT "megafauna"
#define DEATHSQUAD_TRAIT "deathsquad" #define DEATHSQUAD_TRAIT "deathsquad"

2
code/datums/helper_datums/teleport.dm
View File

@@ -66,7 +66,7 @@
var/area/A = get_area(curturf) var/area/A = get_area(curturf)
var/area/B = get_area(destturf) var/area/B = get_area(destturf)
if(!forced && (A.noteleport || B.noteleport)) if(!forced && (HAS_TRAIT(teleatom, TRAIT_NO_TELEPORT) || A.noteleport || B.noteleport))
return FALSE return FALSE
if(SEND_SIGNAL(destturf, COMSIG_ATOM_INTERCEPT_TELEPORT, channel, curturf, destturf)) if(SEND_SIGNAL(destturf, COMSIG_ATOM_INTERCEPT_TELEPORT, channel, curturf, destturf))

11
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -16,7 +16,7 @@
name = "AI" name = "AI"
icon = 'icons/mob/ai.dmi' icon = 'icons/mob/ai.dmi'
icon_state = "ai" icon_state = "ai"
move_resist = MOVE_FORCE_VERY_STRONG move_resist = MOVE_FORCE_OVERPOWERING
density = TRUE density = TRUE
canmove = FALSE canmove = FALSE
status_flags = CANSTUN|CANPUSH status_flags = CANSTUN|CANPUSH
@@ -101,6 +101,7 @@
new/obj/structure/AIcore/deactivated(loc) //New empty terminal. new/obj/structure/AIcore/deactivated(loc) //New empty terminal.
return INITIALIZE_HINT_QDEL //Delete AI. return INITIALIZE_HINT_QDEL //Delete AI.
ADD_TRAIT(src, TRAIT_NO_TELEPORT, src)
if(L && istype(L, /datum/ai_laws)) if(L && istype(L, /datum/ai_laws))
laws = L laws = L
laws.associate(src) laws.associate(src)
@@ -312,11 +313,13 @@
if(incapacitated()) if(incapacitated())
return return
var/is_anchored = FALSE var/is_anchored = FALSE
if(move_resist == MOVE_FORCE_VERY_STRONG) if(move_resist == MOVE_FORCE_OVERPOWERING)
move_resist = MOVE_FORCE_VERY_STRONG move_resist = MOVE_FORCE_NORMAL
else else
is_anchored = TRUE is_anchored = TRUE
move_resist = MOVE_FORCE_NORMAL move_resist = MOVE_FORCE_OVERPOWERING
REMOVE_TRAIT(src, TRAIT_NO_TELEPORT, src)
ADD_TRAIT(src, TRAIT_NO_TELEPORT, src)
to_chat(src, "<b>You are now [is_anchored ? "" : "un"]anchored.</b>") to_chat(src, "<b>You are now [is_anchored ? "" : "un"]anchored.</b>")
// the message in the [] will change depending whether or not the AI is anchored // the message in the [] will change depending whether or not the AI is anchored

1
code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
View File

@@ -39,6 +39,7 @@
/mob/living/simple_animal/hostile/megafauna/Initialize(mapload) /mob/living/simple_animal/hostile/megafauna/Initialize(mapload)
. = ..() . = ..()
apply_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING) apply_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
ADD_TRAIT(src, TRAIT_NO_TELEPORT, MEGAFAUNA_TRAIT)
/mob/living/simple_animal/hostile/megafauna/Destroy() /mob/living/simple_animal/hostile/megafauna/Destroy()
QDEL_NULL(internal) QDEL_NULL(internal)