Skip to content

Commit

Permalink
Psyphoza - Species Addition (#9501)
Browse files Browse the repository at this point in the history
* timers / cooldowns - 4 12 22

* Cache limit - 4 12 22

* Audio features & removal of restrictions - 5 12 22

* blind improvements - 5 12 22

* blind directional features - 5 12 22

* psyphoza blind improvements - 5 12 22

* blind xray & icon QOL - 5 12 22

* fix psychic directions - 5 12 22

* S'more QOL - 5 12 22

* hard dels - 6 12 22

* Guchi icons - 6 12 22

* swap over to planes - 7 12 22

* Fix pixel shifting - 7 12 22

* fix blind icons & sense cut & rearrange files - 7 12 22

* obscure names again - 7 12 22

sweaty hands :(

* Species TK - 7 12 22

* Fix icon displacement - 7 12 22

* no  helmets - 7 12 22

* Custom species stuff - 7 12 22

* species organs - 8 12 22

* mass rebrand to fungus - 8 12 22

* Fix TK & Blind issues - 8 12 22

* Actually fix issues - 9 12 22

* Handle hardsuit issues - 9 12 22

* overlay improvements - 10 12 22

* Fix cap rendering - 11 12 22

* More layer adjustments - 11 12 22

* More secretive icons - 11 12 22

* Clean up blind_sense removal & addition - 12 12 22

* Linter - 12 12 22

* Custom screams - 12 12 22

* Update psyphoza sound scheme & fix error in emote code - 12 12 22 fix

* Better offsets - 12 12 22

* Sprite tweaks & cap - 12 12 22

* visual adjustments - 13 12 22

* Update config - 13 12 22

* Fuck - 13 12 22

* Update psyphoza_caps.dmi

* Random names - 17 122 22

* Update psyphoza.dm

* Update psyphoza.dm

* Fix blind icons & psychic layering - 18 12 22

* Fix naming, blacklisting & eye overlay - 18 12 22

* Update blind_sense.dm

* Fix  SOME sense dir updating - 18 12 22

All the ones that matter

* Update psyphoza.dm

* SM & Eyes - 18 12 22

* Fix in-hand icons - 18 12 22

* I hope people don't abuse this - 5 1 23

Behave god damn you

* TEST COMMIT - 5 1 23

Commit for testing, removes species TK

* Balance & Flavour - 11 1 23

* Fixes & QOL - 12 1 23

* Features & Silicon languages - 12 1 23

* Update psyphoza.dm

* Collaborative spores - 12 1 23

* Update psyphoza.dm

* linter

* Review changes - 15 1 23

Co-Authored-By: Archanial <[email protected]>

* Review changes 2 - 15 1 23

Co-Authored-By: Archanial <[email protected]>

* Update code/modules/food_and_drinks/food/snacks/meat.dm

Co-authored-by: Archanial <[email protected]>

* Update psyphoza.dm

Co-Authored-By: Archanial <[email protected]>

* Update psyphoza.dm

Co-Authored-By: Archanial <[email protected]>

* Sprite improvements - 17 1 23

* Update layers.dm

* Update psyphoza.dm

* Fix planes - 20 1 23

* Deposit colouring - 26 1 23

* Update psyphoza.dm

* deposit improvements - 27 1 23

* Sprite adjustments - Sorry Pigeon - 27 1 23

feed them

* Update psyphoza.dm

* Fixes - 28 1 23

* feedback fixes - 29 1 23

* Update psyphoza.dm

* Eep deebly - 9 2 23

* Fixes - 22 2 23

- Fixes seeing ghosts and other invisible objects
- Fix blind people slamming into walls
- Adds auto option to psychic sense
- Adds keybind for psychic sense
- Fix blind sense not removing
- Fix not being able to click blind sense icons

* Some review changes - 25 2 23

* OWNER DOESNT HAVE LOG GAME

Javlar

* Update stomach.dm

* species generic action - 27 2 23

* review - 14 3 23

Co-Authored-By: itsmeow <[email protected]>

* new standards - 14 3 23

Co-Authored-By: itsmeow <[email protected]>

* Update psyphoza.dm

* Update psyphoza.dm

* Update stomach.dm

* remove shitty powah - 24 7 23

The psyphoza already has enough benefits.

* Update stomach.dm

* Update psyphoza.dm

* fix blind sense - 24 7 23

okay then

* Update blind_sense.dm

* naming update - 27 723

* Update psyphoza.dm

* Update psyphoza.dm

* Update life.dm

* no mono - 29 7 23

* part 1 - 30 7 23

* color

* Update blind_sense.dm

* Update psyphoza.dm

* remove annoying shit - 30 7 23

* mutation - 31 7 23

* review

* Update code/datums/mutations/actions.dm

Co-authored-by: Penwin <[email protected]>

* Update code/datums/mutations/actions.dm

Co-authored-by: Penwin <[email protected]>

* Update telekinesis.dm

* e

* e

* e

* Update psyphoza.dm

* e

* wall highlight improvements - 9 8 23

* fix sense - 10 8 23

* fix sense, again - 11 8 23

* fix blind sense overlays - 11 8 23

* e

* TM stuff

* Update psyphoza.dm

* mo fo u - 12 8 23

* mo fo u  2- 12 8 23

* bye overlays - 12 8 23

* better sizing - 12 8 23

* masking - 12 8 23

* regret - 12 8 23

* adjust radius - 12 8 23

* fix blind colouring - 12 8 23

* Update psyphoza.dm

* Update psyphoza.dm

* textures - 12 8 23

* review - 13 8 23

* fix eye blur - 13 8 23

* Update psyphoza.dm

* icons - 13 8 23

* fix eye blur - 13 8 23

* Update psyphoza.dm

* icons - 14 8 23

* Update psyphoza.dm

* Update _closed.dm

* Update effects.dmi

* planes - 10 9 23

* fixes 0.5 - 11 9 23

* fixes 0.5 + 0.5 - 11 9 23

* sprites - 11 9 23

* Update telekinesis.dm

* mut - 12 9 23

* mut - 12 9 23

* Update layers.dm

* fixes - 12 9 23

* mutation toxin - 12 9 23

* mutation stuff - 13 9 23

* Legally blind - 13 9 23

* language improvements & other - 15 9 23

* LORE - 15 9 23

* Update effects.dm

* Sprite changes - 17 9 23

* Fix right click - 25 9 23

* Improve psychic masking - 25 9 23

* masking - 25 9 23

* fixes - 25 9 23

* Prototype detective work - 26 9 23

* Update atoms.dm

* fixes - 27 9 23

* Update psyphoza.dm

* mouse fixes - 28 9 23

* more fixes - 28 9 23

* Soul glimmer changes - 2 10 23

* Update psyphoza.dm

* emot chat - 2 10 23

* qol - 2 10 23

* Update blind_sense.dm

* review - 3 10 23

* clean - 3 10 23

* Fix missing blindsense icons - 3 10 23

* Fix blindsense crusting - 3 10 23

* Update blind_sense.dm

* oh fuck - 3 10 23

* review - 4 10 23

* fixes - 6 10 23

* fixes - 6 10 23

* Update dummy.dm

* eye review - 7 10 23

Sorry, the hot air balloon is blurry. You need glasses.

* blindness fixes - 9 10 23

* review - 10 10 23

* Update eyes.dm

* Fix lichdom & add features - 11 10 23

* format - 11 10 23

* Better tagging & blind sense code - 11 10 23

Thanks Dakae for the better HTML tag remover

Co-Authored-By: HowToLoLu <[email protected]>

* Update actions.dm

* Update blind_sense.dm

* Update blind_sense.dm

* Update typing.dm

* Update typing.dm

* Revert "Update typing.dm"

This reverts commit 4f67182.

* Update say.dm

* Fix typing indicator - 16 10 23

* Update soul_glimmer.dm

* Update typing.dm

* Fix blindsense - 18 10 23

* Update psyphoza.dm

* Update psyphoza.dm

* Update blind_sense.dm

* blindness fixes - 20 10 23

* Fix prefs - 22 10 23

* Update eyes.dm

* Empty-Commit

* Update monkey.dm

* Update code/_onclick/telekinesis.dm

Co-authored-by: Tsar-Salat <[email protected]>

* fix double dels - 6 11 23

* fix eyes - 7 11 23

* More sensible sense - 8 11 23

Possible I might need to revert this :(

* Blind message improvements - 8 11 23

* food icons - 10 11 23

* Better plane placement - 11 11 23

* bump colors - 16 11 23

* Update soul_glimmer.dm

* lore - 117 11 23

* Empty-Commit

* Empty-Commit

* Update 96x96.dmi

* Update 96x96.dmi

* Update code/modules/client/preferences/entries/character/species_features/psyphoza.dm

Co-authored-by: itsmeow <[email protected]>

* Update 96x96.dmi

* e

* Update 96x96.dmi

* Update 96x96.dmi

* e

* Update psychic.dmi

* bookmark - 2 12 23

* Update psychic.dmi

* Update psychic.dmi

* Epilepsy Warning - 4 12 23

* database - 4 12 23

* Update database_changelog.txt

* Review - 4 12 23

* e

* Paper reader - 4 12 23

They don't even deserve the fucking right to read

* Update paper_reader.dm

* Update paper_reader.dm

* Update paper_reader.dm

* Squash DMI size - 14 12 23

---------

Co-authored-by: Archanial <[email protected]>
Co-authored-by: itsmeow <[email protected]>
Co-authored-by: Penwin <[email protected]>
Co-authored-by: itsmeow <[email protected]>
Co-authored-by: HowToLoLu <[email protected]>
Co-authored-by: Tsar-Salat <[email protected]>
  • Loading branch information
7 people authored Dec 15, 2023
1 parent a34c2d6 commit e5f3f0b
Show file tree
Hide file tree
Showing 99 changed files with 1,454 additions and 53 deletions.
1 change: 1 addition & 0 deletions SQL/beestation_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ CREATE TABLE IF NOT EXISTS `SS13_characters` (
`feature_mcolor` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_human_tail` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_human_ears` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_psyphoza_cap` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`helmet_style` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`preferred_ai_core_display` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`preferred_security_department` VARCHAR(32) COLLATE 'utf8mb4_general_ci',
Expand Down
15 changes: 12 additions & 3 deletions SQL/database_changelog.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.

The latest database version is 7.0; The query to update the schema revision table is:
The latest database version is 7.1; The query to update the schema revision table is:

INSERT INTO `schema_revision` (`major`, `minor`) VALUES (7, 0);
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (7, 1);
or
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 0);
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 1);

In any query remember to add a prefix to the table names if you use one.

-----------------------------------------------------

-----------------------------------------------------

Version 7.1, 4 December 2023, by DrDuckedGoose
Psyphoza - Species Addition

ALTER TABLE `SS13_characters` ADD COLUMN IF NOT EXISTS `feature_psyphoza_cap` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_human_ears`;

-----------------------------------------------------

-----------------------------------------------------

Version 7.0, 24 July 2023, by itsmeow
Datumized preferences (TGUI Prefs)

Expand Down
7 changes: 7 additions & 0 deletions beestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@
#include "code\_globalvars\misc.dm"
#include "code\_globalvars\regexes.dm"
#include "code\_globalvars\religion.dm"
#include "code\_globalvars\soul_glimmer.dm"
#include "code\_globalvars\traits.dm"
#include "code\_globalvars\xenoartifact.dm"
#include "code\_globalvars\lists\achievements.dm"
Expand Down Expand Up @@ -597,6 +598,7 @@
#include "code\datums\components\area_sound_manager.dm"
#include "code\datums\components\armor_plate.dm"
#include "code\datums\components\beetlejuice.dm"
#include "code\datums\components\blind_sense.dm"
#include "code\datums\components\buffer.dm"
#include "code\datums\components\butchering.dm"
#include "code\datums\components\caltrop.dm"
Expand Down Expand Up @@ -2302,6 +2304,7 @@
#include "code\modules\client\preferences\entries\character\species_features\moth.dm"
#include "code\modules\client\preferences\entries\character\species_features\mutants.dm"
#include "code\modules\client\preferences\entries\character\species_features\plasmaman.dm"
#include "code\modules\client\preferences\entries\character\species_features\psyphoza.dm"
#include "code\modules\client\preferences\entries\player\admin.dm"
#include "code\modules\client\preferences\entries\player\ambient_occlusion.dm"
#include "code\modules\client\preferences\entries\player\auto_fit_viewport.dm"
Expand Down Expand Up @@ -2794,6 +2797,7 @@
#include "code\modules\language\ratvarian.dm"
#include "code\modules\language\shadowtongue.dm"
#include "code\modules\language\slime.dm"
#include "code\modules\language\sonus.dm"
#include "code\modules\language\swarmer.dm"
#include "code\modules\language\sylvan.dm"
#include "code\modules\language\terrum.dm"
Expand Down Expand Up @@ -3023,6 +3027,7 @@
#include "code\modules\mob\living\carbon\human\species_types\oozelings.dm"
#include "code\modules\mob\living\carbon\human\species_types\plasmamen.dm"
#include "code\modules\mob\living\carbon\human\species_types\podpeople.dm"
#include "code\modules\mob\living\carbon\human\species_types\psyphoza.dm"
#include "code\modules\mob\living\carbon\human\species_types\pumpkin_man.dm"
#include "code\modules\mob\living\carbon\human\species_types\shadowpeople.dm"
#include "code\modules\mob\living\carbon\human\species_types\skeletons.dm"
Expand Down Expand Up @@ -3330,6 +3335,7 @@
#include "code\modules\paperwork\paper.dm"
#include "code\modules\paperwork\paper_cutter.dm"
#include "code\modules\paperwork\paper_premade.dm"
#include "code\modules\paperwork\paper_reader.dm"
#include "code\modules\paperwork\paperbin.dm"
#include "code\modules\paperwork\paperplane.dm"
#include "code\modules\paperwork\pen.dm"
Expand Down Expand Up @@ -3920,6 +3926,7 @@
#include "code\modules\surgery\bodyparts\species_parts\moth_bodyparts.dm"
#include "code\modules\surgery\bodyparts\species_parts\oozeling_bodyparts.dm"
#include "code\modules\surgery\bodyparts\species_parts\plasmaman_bodyparts.dm"
#include "code\modules\surgery\bodyparts\species_parts\psyphoza_bodyparts.dm"
#include "code\modules\surgery\organs\appendix.dm"
#include "code\modules\surgery\organs\augments_arms.dm"
#include "code\modules\surgery\organs\augments_chest.dm"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/DNA.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
#define OVERLOAD /datum/mutation/overload
#define ACIDOOZE /datum/mutation/acidooze
#define MEDIEVAL /datum/mutation/medieval
#define SPORES /datum/mutation/spores

#define UI_CHANGED "ui changed"
#define UE_CHANGED "ue changed"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/dcs/signals/signals_global.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#define COMSIG_GLOB_LIVING_SAY_SPECIAL "!say_special" //! global living say plug - use sparingly: (mob/speaker , message)
#define COMSIG_GLOB_CARBON_THROW_THING "!throw_thing" //! a person somewhere has thrown something : (mob/living/carbon/carbon_thrower, target)
#define COMSIG_GLOB_SECURITY_ALERT_CHANGE "!alert_change" //! security level was changed : (new_alert)
#define COMSIG_GLOB_SOUND_PLAYED "!sound_played" //! a sound was played : (sound_player, sound_file)
/// called by datum/cinematic/play() : (datum/cinematic/new_cinematic)
#define COMSIG_GLOB_PLAY_CINEMATIC "!play_cinematic"
#define COMPONENT_GLOB_BLOCK_CINEMATIC 1
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isipc(A) (is_species(A, /datum/species/ipc))
#define isapid(A) (is_species(A, /datum/species/apid))
#define isandroid(A) (is_species(A, /datum/species/android))
#define ispsyphoza(A) (is_species(A, /datum/species/psyphoza))

//more carbon mobs
#define ismonkey(A) (istype(A, /mob/living/carbon/monkey))
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/keybinding.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,6 @@
#define COMSIG_KB_SILICON_UNEQUIPMODULE_DOWN "keybinding_silicon_unequipmodule_down"
#define COMSIG_KB_SILION_UNDEPLOY_DOWN "keybinding_silicon_undeploy_down"
#define COMSIG_KB_SILICON_RECONNECT_DOWN "keybinding_silicon_reconnect_down"

//Species Specific
#define COMSIG_SPECIES_ACTION_PRIMARY "keybinding_species_action_primary"
19 changes: 17 additions & 2 deletions code/__DEFINES/layers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#define FLOOR_PLANE -7
#define GAME_PLANE -4
#define GAME_PLANE_RENDER_TARGET "GAME_PLANE_RENDER_TARGET"

#define SPACE_LAYER 1.8
//#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define
Expand Down Expand Up @@ -136,9 +137,9 @@
#define CAMERA_STATIC_PLANE 200

///Popup Chat Messages
#define RUNECHAT_PLANE 250
#define RUNECHAT_PLANE 650
/// Plane for balloon text (text that fades up)
#define BALLOON_CHAT_PLANE 31
#define BALLOON_CHAT_PLANE 651

///--------------- FULLSCREEN IMAGES ------------
#define FULLSCREEN_PLANE 500
Expand All @@ -149,6 +150,15 @@
#define CRIT_LAYER 5
#define CURSE_LAYER 6

///--------------- PSYCHIC & BLIND IMAGES ------------
//Plane for highlighting objects - most soul glimmers
#define PSYCHIC_PLANE 550
#define PSYCHIC_PLANE_RENDER_TARGET "*PSYCHIC_PLANE_RENDER_TARGET"
//Plane for not-highlighting objects - most hiding cult stuff
#define ANTI_PSYCHIC_PLANE 551
#define ANTI_PSYCHIC_PLANE_RENDER_TARGET "*ANTI_PSYCHIC_PLANE_RENDER_TARGET"
//Plane for blind stuff
#define BLIND_FEATURE_PLANE 552

//-------------------- Rendering ---------------------
#define RENDER_PLANE_GAME 990
Expand All @@ -158,7 +168,12 @@
//-------------------- HUD ---------------------
//HUD layer defines
#define HUD_PLANE 1000
#define HUD_LAYER 25
#define HUD_RENDER_TARGET "HUD_PLANE"

#define ABOVE_HUD_PLANE 1100
#define ABOVE_HUD_RENDER_TARGET "ABOVE_HUD_PLANE"

///1000 is an unimportant number, it's just to normalize copied layers
#define RADIAL_LAYER 1000

Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,6 @@

//Used in visible_message_flags, audible_message_flags and message_mods
#define CHATMESSAGE_EMOTE "emotemessage"

///How far away blind people can see visible messages from
#define BLIND_TEXT_DIST 2
2 changes: 2 additions & 0 deletions code/__DEFINES/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#define SPECIES_SNAILPERSON "snail"
#define SPECIES_SUPERSOLDIER "supersoldier"
#define SPECIES_VAMPIRE "vampire"
#define SPECIES_PSYPHOZA "psyphoza"

//Defines for Golem Species IDs
#define SPECIES_GOLEM_ADAMANTINE "adamantine_golem"
Expand Down Expand Up @@ -71,6 +72,7 @@
#define FLAG_FLY (1<<9)
#define FLAG_DEBUG_SPECIES (1<<10)
#define FLAG_MONKEY (1<<11)
#define FLAG_PSYPHOZA (1<<12)

// Defines for used in creating "perks" for the species preference pages.
/// A key that designates UI icon displayed on the perk.
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* make sure you add an update to the schema_version stable in the db changelog
*/
#define DB_MINOR_VERSION 0
#define DB_MINOR_VERSION 1


//! ## Timing subsystem
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -458,3 +458,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_SUIT_SENSORS "suit_sensors"
///Mob is tracked by nanites, and on glob suit sensors list
#define TRAIT_NANITE_SENSORS "nanite_sensors"

/// Trait for psyphoza, flag for examine logic
#define TRAIT_PSYCHIC_SENSE "psychic_sense"
1 change: 1 addition & 0 deletions code/__HELPERS/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_antenna, GLOB.apid_antenna_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_stripes, GLOB.apid_stripes_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_headstripes, GLOB.apid_headstripes_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/psyphoza_cap, GLOB.psyphoza_cap_list)

//Species
for(var/spath in subtypesof(/datum/species))
Expand Down
5 changes: 4 additions & 1 deletion code/__HELPERS/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_stripes, GLOB.apid_stripes_list)
if(!GLOB.apid_headstripes_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/apid_headstripes, GLOB.apid_headstripes_list)
if(!GLOB.psyphoza_cap_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/psyphoza_cap, GLOB.psyphoza_cap_list)
//For now we will always return none for tail_human and ears.
return(
list(
Expand Down Expand Up @@ -125,7 +127,8 @@
"apid_antenna" = pick(GLOB.apid_antenna_list),
"apid_stripes" = pick(GLOB.apid_stripes_list),
"apid_headstripes" = pick(GLOB.apid_headstripes_list),
"body_model" = gender == MALE ? MALE : gender == FEMALE ? FEMALE : pick(MALE, FEMALE)
"body_model" = gender == MALE ? MALE : gender == FEMALE ? FEMALE : pick(MALE, FEMALE),
"psyphoza_cap" = pick(GLOB.psyphoza_cap_list)
)
)

Expand Down
11 changes: 11 additions & 0 deletions code/__HELPERS/text.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,17 @@
/proc/adminscrub(t,limit=MAX_MESSAGE_LEN)
return copytext((html_encode(strip_html_simple(t))),1,limit)

//Modified proc from strip_html_simple, guts the inbetween of <>
/proc/strip_html_tags(t,limit=100)
var/index_one = findtext_char(t, "<")
var/index_two
while(index_one)
index_two = findtext_char(t, ">")
if(index_one >= index_two)
break
t = splicetext_char(t, index_one, index_two + 1, "") // I hope this + 1 works?
index_one = findtext_char(t, "<")
return t

//Returns null if there is any bad text in the string
/proc/reject_bad_text(text, max_length = 512, ascii_only = TRUE, alphanumeric_only = FALSE, underscore_allowed = TRUE)
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/flavor_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ GLOBAL_LIST_EMPTY(insect_type_list)
GLOBAL_LIST_EMPTY(apid_antenna_list)
GLOBAL_LIST_EMPTY(apid_stripes_list)
GLOBAL_LIST_EMPTY(apid_headstripes_list)
GLOBAL_LIST_EMPTY(psyphoza_cap_list)

GLOBAL_LIST_INIT(color_list_ethereal, list(
"Cyan" = "00ffff",
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/maintenance_loot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,5 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/wrench = 4,
/obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1,
/obj/item/xenoartifact/maint = 1,
/obj/item/paper_reader = 1,
))
2 changes: 2 additions & 0 deletions code/_globalvars/lists/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ GLOBAL_LIST_INIT(megacarp_first_names, world.file2list("strings/names/megacarp1.
GLOBAL_LIST_INIT(megacarp_last_names, world.file2list("strings/names/megacarp2.txt"))
GLOBAL_LIST_INIT(oozeling_first_names, world.file2list("strings/names/ooze_first.txt"))
GLOBAL_LIST_INIT(oozeling_last_names, world.file2list("strings/names/ooze_last.txt"))
GLOBAL_LIST_INIT(psyphoza_first_names, world.file2list("strings/names/psyphoza_first.txt"))
GLOBAL_LIST_INIT(psyphoza_last_names, world.file2list("strings/names/psyphoza_last.txt"))

GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt"))
GLOBAL_LIST_INIT(ing_verbs, world.file2list("strings/names/ing_verbs.txt"))
Expand Down
17 changes: 17 additions & 0 deletions code/_globalvars/soul_glimmer.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
Colours and assignments for psychic sense
colour
color
:trolled:
*/

//ALL the psychic soul colours
GLOBAL_LIST_INIT(SOUL_GLIMMER_COLORS, list("Azure" = "#0091ff", "Vermilion" = "#ff3a1c", "Sage" = "#1fff5e", "Teal" = "#00ffe5", "Terracotta" = "#ffa600", "Champagne" = "#ff009d"))

//Low pop colours
#define SOUL_GLIMMER_LOWER_POP 10
GLOBAL_LIST_INIT(SOUL_GLIMMER_COLORS_LOW, list("Azure" = "#0091ff", "Vermilion" = "#ff3a1c", "Sage" = "#1fff5e"))
//mid pop colours
#define SOUL_GLIMMER_MID_POP 20
GLOBAL_LIST_INIT(SOUL_GLIMMER_COLORS_MID, list("Teal" = "#00ffe5", "Terracotta" = "#ffa600", "Champagne" = "#ff009d"))

58 changes: 58 additions & 0 deletions code/_onclick/hud/fullscreen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@

/atom/movable/screen/fullscreen/blind
icon_state = "blackimageoverlay"
render_target = "blind_fullscreen_overlay"
layer = BLIND_LAYER
plane = FULLSCREEN_PLANE

Expand Down Expand Up @@ -199,3 +200,60 @@
plane = LIGHTING_PLANE
blend_mode = BLEND_ADD
show_when_dead = TRUE

/atom/movable/screen/fullscreen/blind_context_disable
name = "???"
icon_state = "blackimageoverlay"
layer = BLIND_LAYER+1
mouse_opacity = MOUSE_OPACITY_ICON
alpha = 1
can_throw_target = TRUE
///Who we're disabling from right clicking - handled elsewhere
var/client/owner
var/mob/mob_owner
///How close can the mosue be before we disable it - extra check
var/context_distance = 3 //tiles

/atom/movable/screen/fullscreen/blind_context_disable/Initialize(mapload)
. = ..()
var/icon/mask = icon('icons/mob/psychic.dmi', "click_mask")
add_filter("click_mask", 1, alpha_mask_filter(icon = mask, flags = MASK_INVERSE))

/atom/movable/screen/fullscreen/blind_context_disable/Destroy()
owner?.show_popup_menus = TRUE
owner = null
mob_owner = null
return ..()

//disable & enable context menu
/atom/movable/screen/fullscreen/blind_context_disable/MouseEntered(location, control, params)
//try and get owner from mob
owner = owner || mob_owner?.client
if(!owner)
return
owner?.show_popup_menus = FALSE
return ..()

/atom/movable/screen/fullscreen/blind_context_disable/MouseExited(location, control, params)
if(!owner)
return
owner?.show_popup_menus = TRUE
loc = null
return ..()

//Set the loc to the turf we're technically clicking - fix for shooting 'n throwing
/atom/movable/screen/fullscreen/blind_context_disable/proc/handle_loc(params)
var/list/l_params = params2list(params)
//Get mouse position in the icon
var/xx = text2num(l_params["icon-x"])
var/yy = text2num(l_params["icon-y"])
//Calculate which tile coordinate that lies in from the middle of 480x80
xx = round((xx - 240) / 32) + mob_owner.x
yy = round((yy - 240) / 32) + mob_owner.y
//Get turf at that location
loc = locate(xx, yy, mob_owner?.z || 1)

/atom/movable/screen/fullscreen/blind_context_disable/Click(location, control, params)
handle_loc(params)
. = ..()
loc = null
2 changes: 2 additions & 0 deletions code/_onclick/hud/map_popups.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
* But for now, this works.
*/
var/del_on_map_removal = TRUE
///Can we throw things at this
var/can_throw_target = FALSE

/**
* A screen object, which acts as a container for turfs and other things
Expand Down
Loading

0 comments on commit e5f3f0b

Please sign in to comment.