mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-11 10:22:13 +00:00
[Port] The Ocky Icky Phobia from tgstation/tgstation#57450 & tgstation/tgstation#80247
This commit is contained in:
@@ -39,7 +39,8 @@ SUBSYSTEM_DEF(traumas)
|
|||||||
"mimes" = strings(PHOBIA_FILE, "mimes"),
|
"mimes" = strings(PHOBIA_FILE, "mimes"),
|
||||||
"cats" = strings(PHOBIA_FILE, "cats"),
|
"cats" = strings(PHOBIA_FILE, "cats"),
|
||||||
"syndicate"= strings(PHOBIA_FILE, "syndicate"),
|
"syndicate"= strings(PHOBIA_FILE, "syndicate"),
|
||||||
"eye" = strings(PHOBIA_FILE, "eye")
|
"eye" = strings(PHOBIA_FILE, "eye"),
|
||||||
|
"ocky icky" = strings(PHOBIA_FILE, "ocky icky")
|
||||||
)
|
)
|
||||||
|
|
||||||
phobia_mobs = list("spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)),
|
phobia_mobs = list("spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)),
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
/datum/smite/bread/effect(client/user, mob/living/target)
|
/datum/smite/bread/effect(client/user, mob/living/target)
|
||||||
. = ..()
|
. = ..()
|
||||||
var/mutable_appearance/bread_appearance = mutable_appearance('icons/obj/food/burgerbread.dmi', "bread")
|
var/mutable_appearance/bread_appearance = mutable_appearance('icons/obj/food/burgerbread.dmi', "bread")
|
||||||
var/mutable_appearance/transform_scanline = mutable_appearance('icons/effects/effects.dmi', "transform_effect")
|
var/mutable_appearance/transform_scanline = mutable_appearance('modular_splurt/icons/effects/effects.dmi', "transform_effect")
|
||||||
target.transformation_animation(bread_appearance,time = BREADIFY_TIME, transform_overlay=transform_scanline, reset_after=TRUE)
|
target.transformation_animation(bread_appearance,time = BREADIFY_TIME, transform_overlay=transform_scanline, reset_after=TRUE)
|
||||||
addtimer(CALLBACK(GLOBAL_PROC, .proc/breadify, target), BREADIFY_TIME)
|
addtimer(CALLBACK(GLOBAL_PROC, .proc/breadify, target), BREADIFY_TIME)
|
||||||
|
|
||||||
|
|||||||
8
code/modules/admin/smites/phobia_ocky_icky.dm
Normal file
8
code/modules/admin/smites/phobia_ocky_icky.dm
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
/// "Immerses" the player, making them unable to use some OOC terms IC
|
||||||
|
/datum/smite/ocky_icky
|
||||||
|
name = "Ocky icky phobia"
|
||||||
|
|
||||||
|
/datum/smite/ocky_icky/effect(client/user, mob/living/target)
|
||||||
|
. = ..()
|
||||||
|
var/mob/living/carbon/ocker = target
|
||||||
|
ocker.gain_trauma(/datum/brain_trauma/mild/phobia/ocky_icky, TRAUMA_RESILIENCE_LOBOTOMY)
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
"brig",
|
"brig",
|
||||||
"gulag"
|
"gulag"
|
||||||
],
|
],
|
||||||
|
|
||||||
"conspiracies": [
|
"conspiracies": [
|
||||||
"central command",
|
"central command",
|
||||||
"command",
|
"command",
|
||||||
@@ -296,7 +296,7 @@
|
|||||||
"i'll catch you",
|
"i'll catch you",
|
||||||
"slip"
|
"slip"
|
||||||
],
|
],
|
||||||
|
|
||||||
"syndicate": [
|
"syndicate": [
|
||||||
"syndicate",
|
"syndicate",
|
||||||
"changeling",
|
"changeling",
|
||||||
@@ -315,7 +315,7 @@
|
|||||||
"enemy corporation",
|
"enemy corporation",
|
||||||
"agent"
|
"agent"
|
||||||
],
|
],
|
||||||
|
|
||||||
"anime": [
|
"anime": [
|
||||||
"anime",
|
"anime",
|
||||||
"manga",
|
"manga",
|
||||||
@@ -342,5 +342,59 @@
|
|||||||
"neet",
|
"neet",
|
||||||
"ora",
|
"ora",
|
||||||
"~"
|
"~"
|
||||||
|
],
|
||||||
|
"ocky icky": [
|
||||||
|
"admeme",
|
||||||
|
"admin",
|
||||||
|
"ahelp",
|
||||||
|
"amogus",
|
||||||
|
"antag",
|
||||||
|
"antagonist",
|
||||||
|
"ban",
|
||||||
|
"banned",
|
||||||
|
"chat",
|
||||||
|
"click",
|
||||||
|
"c*der",
|
||||||
|
"coder",
|
||||||
|
"coders",
|
||||||
|
"discord",
|
||||||
|
"erp",
|
||||||
|
"forum",
|
||||||
|
"ick ock",
|
||||||
|
"joever",
|
||||||
|
"k",
|
||||||
|
"kek",
|
||||||
|
"kys",
|
||||||
|
"leddit",
|
||||||
|
"lmao",
|
||||||
|
"lol",
|
||||||
|
"mapper",
|
||||||
|
"moderator",
|
||||||
|
"mods",
|
||||||
|
"muderbone",
|
||||||
|
"murderboning",
|
||||||
|
"ocky",
|
||||||
|
"ooc",
|
||||||
|
"owo",
|
||||||
|
"pwn",
|
||||||
|
"powergame",
|
||||||
|
"reddit",
|
||||||
|
"round",
|
||||||
|
"rule",
|
||||||
|
"rp",
|
||||||
|
"self antag",
|
||||||
|
"selfantag",
|
||||||
|
"sprite",
|
||||||
|
"spriter",
|
||||||
|
"splurt",
|
||||||
|
"sus",
|
||||||
|
"tide",
|
||||||
|
"u",
|
||||||
|
"ur",
|
||||||
|
"uwa",
|
||||||
|
"uwu",
|
||||||
|
"valid",
|
||||||
|
"y",
|
||||||
|
"5head"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1601,6 +1601,7 @@
|
|||||||
#include "code\modules\admin\smites\knot_shoes.dm"
|
#include "code\modules\admin\smites\knot_shoes.dm"
|
||||||
#include "code\modules\admin\smites\lightning.dm"
|
#include "code\modules\admin\smites\lightning.dm"
|
||||||
#include "code\modules\admin\smites\nugget.dm"
|
#include "code\modules\admin\smites\nugget.dm"
|
||||||
|
#include "code\modules\admin\smites\phobia_ocky_icky.dm"
|
||||||
#include "code\modules\admin\smites\pickle.dm"
|
#include "code\modules\admin\smites\pickle.dm"
|
||||||
#include "code\modules\admin\smites\pie.dm"
|
#include "code\modules\admin\smites\pie.dm"
|
||||||
#include "code\modules\admin\smites\puzzle.dm"
|
#include "code\modules\admin\smites\puzzle.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user