* Frontier Cowboys now receive a level action rifle
* Icon and sounds for the Lever Action
* CL
* Attribution
* Added updated sprites by suethecake
* Ensure internal consistency
* after dark
* FIXES
* breakin
* butt
* Update code/game/objects/items/devices/floor_painter.dm
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
* Update code/game/objects/items/devices/floor_painter.dm
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
* Update code/game/objects/structures/lattice.dm
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
* testing 1
* a
* FUCK THIS PRESET!!!
* allah
* OTEMACHI
* tis' done
* Project Exorcism : Sneed's Snairs (Formerly Chuck's)
* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm
* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm
* Update stools.dm
* Update code/game/objects/structures/stool_bed_chair_nest/stools.dm
* Update code/game/objects/structures/stool_bed_chair_nest/stools.dm
* Update stools.dm
* Update chairs.dm
* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm
* inhand fixes
* airlocks (matt has cooked)
fuck
* my cody plays the mamba
* fuck
* fixes layering issue
* airlocks and everything else Please fucking kill me
* underlays
* unfuck blending
* finished replacing old ass shit
* your ass is geass
* conflicts die now
* public fat'wa
* progress on walls and windows
* more mapping
* baltimore accents be like
* minor progress
* monitors
* fire alarms and apc adjustments
* apcs pixel adjustments, final airlock look
* also grilles
* shuttle wall start plus shuttle windows
* starting consoles
* table outlines
* I love broke ass sprites
* fixing the stupid ass exterior walls
* light fuckery
* terminal directionals, external airlocks, table fixes, blahblahblah
* fix 1
* fix 2
* some more fixes
* fix chairs
* basic untested railings and updating colors from atteria
* bridge and some fixes
* removing some artifacts on the new walls
* breaking wood tables and adding 4 wall materials
* fix
* compile & wood fixes
* make the horizon compile again
* railings, firedoors, ATMs, intercomms and tables again
* mapping begins also some tweaks to map view of icons
* full tile steel walls
* i sure hope nothing bad happens
* airlock updates (untested)
* reverts most wall machinery
* skull
* wall coloring
* makes the tg wood chill out
* work on airlocks
* hull consistency
* cause you live forever in the lights you make
* whoops can't show that in a christian manga
* terminals should be on walls and everything's hunky dory now
also i changed the wood stuff as per atteria's suggestion
* fixing airlocks
* fixes
* window resprite, coloring adjustments
* scc hull resprite
* new grilles, frame edits, and borosilicate
* greyscale wood palette improvement
* shuttle windows
* window frame fix
* apc update
* refit and reshaded fire alarms
* mapping icon fixes
* table fixes
* map fixes, platforms and stairs
* updates cutter, new walls and terminals
* mapping fixes
* fix preview
* preview fix stone
* stairs
* initial work for the map
* railing and windowpane fuckery
* new external airlocks
* a
* fix the maps in preparation
* wall object pixel offsets
* air alarms D1
* extinguisher cabinets
* APC DESTROYED MISSION ACCOMPLISHED GOOD WORK
* deck 3: floor decals, APCs, air alarms, fire extinguisher cabinets
* deck 3: fireaxe cabinet
* /shuttle_landmark/distress/blue, move base_turf from map to obj def
* intercom presets
* formatting
* deck 1: floor decals
* deck 2: named area fix (LMAO), signs to use single quotes
* deck 2: floor decals, APCs, air alarms, fire extinguisher cabinets, fireaxe cabinets
* Platforms and stairs!
* grates and bugfixes
* Angled ship walls + grate color fix
* corrects apc anim overlay
* deck 2 and away site fixes
# Conflicts:
# maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
* deck 2 missing grate
* warning stripes
* railings and ledges
* windows and fixtures
* windoorsagain
* airlocks pt1
* windows de-seamed and transparent
* airlocks and pixel offsets
* fixes for airlocks
* more airlock fixes
* presets for ringer, request console and newscaster
* 132
* asfsaf
* kitchen tiling
* thicker freezer tile bevels
* More angled walls
* New shutters and blast doors
* directional corrections
* ops railing fixes
* updated window map things and shutters
* value changes and blast door changes
* Ledges and platforms galore (D2/D3)
* all decks: fix door dirs
* all decks: newscasters, intercoms, requests consoles, ringer consoles
* helm light blue decals to dark blue
* supermatter door dir fix
* fix directional presets (dirs/offsets): newscaster, intercom, requests console, ringer console
* firedoor changes
* deck 3: overlapping wall mountables fixes
* map changes
* airlock changes
* map tweaks
* airlock & stair icons
* various mapping modifications
* Double airlocks + fixing denied states + fixing airlocks on all levels
* Rebase
* directional terminals buttons and lights again, platform tweaks
terminal north facing sprites, atm/food terminal directionals
proper door control and lightswitch directionals (presets still need to be set up, mapping)
re-adds new light tube sprites, again
new sprites for floor lights and the other stuff that got added
adjusted platforms to be recolorable, added light and dark versions, fixed some shading
* missing ERT outfit thingy fix
* floor lights fixed
* deck 3: various small fixes
* deck 1: various small fixes
* deck 2: various small fixes
* fixes
* d2 fixes & multitile door fix
* d2 fixes, remove unused airlock files, button icon fixes, window icon fixes
* make it actually compile, oops!
* make it actually compile, pt2
* CE office camera
* pew pew pew
* pew pew pew 2
* fixes
* deck 3: buttons fixes
* deck 3: button and other fixes
* deck 3: fixes and stuff
* D1 fixes & skrell airlocks
* minor D2 tweaks
* a lot of airlock-related fixes, glass tables, paint sprayer fixes, decal fixes, changelog
* maintenance hatch sprites
* fixing double doors
* flips multi-tiles, fixes multi-tiles, adds desk windoors
* new plastic flaps
* deck 2: a few buttons
* side + middle doors
* created paths for 3-tiles doors
* apply to map the 3 tiles airlocks
* some fixes, windoor alpha
* remove this random ass potted plant
* more map fixes
* holodeck disposal pipe fix
* secure airlock sprites
no code or obj definitions yet
* vault airlock
* vault door fixes
* scc window alpha
* adjusts double door glass, firedoor open state
* adjusts construction states for doors
* remove some defunct icons and fix anims
* assembly stuff
* pharma fixes
* vault door dir
* firedoor smart generation moved to its own proc
* lift doors, d1 fixes
* firedoor smart generation: adjacent wall check
* firedoor smart generation: adjacent firedoor check
* all decks: missing firedoor and other fixes
* deck 2: weird maint stairs fix
* oops
* diona airlock fix
* the shuttle wall gigadeath
* fixes
* some fixes for leftover map item paths, and double lattices
* new diona walls
* more fixes
* and more
* deck 1: fix out of bounds keys
* deck 3: fix out of bounds keys
* runtime 3: duplicate APCs fix
* all decks: make all 3 tile wide doors glass
---------
Co-authored-by: Wezzy <wowzewow@gmail.com>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
Co-authored-by: kyres1 <noodle.buster31@gmail.com>
Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: atteria <tarkona@protonmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
Co-authored-by: naut <nautilussplat@gmail.com>
Co-authored-by: naut <55491249+nauticall@users.noreply.github.com>
* You see me rollin' 2 - Deja Vu Edition - More Roller Bed Tweaks
* Done.
* Not done. Awaiting second pass of sprites.
* Colour feedback
* NT Colours
Final design, as chosen by the medical discord
* Update bed.dm
* Maybe CI Won't Fail This Time?
* Learn to read
* Update code/game/objects/structures/stool_bed_chair_nest/bed.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
---------
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Fixes chameleon projector issues
* Update html/changelogs/doxxmedearly-champroj_fix.yml
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
* Condense Database Migrations (#17103)
* Condense Database Migrations
Condenses the Database Migrations into a new initial schema.
Also adds some instructions to the Database Readme for existing setups.
* Update readme/delete changed migrations since pr creation
* Reworks a bit how the previous migrations are handled and updates the instructions accordingly
* Expand the readme with baseline/migrate
---------
Co-authored-by: Werner <Arrow768@users.noreply.github.com>
* Revert "Condense Database Migrations (#17103)"
This reverts commit 3657cb0537.
---------
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
Co-authored-by: Werner <Arrow768@users.noreply.github.com>
* add new scc ert hardsuits
* changelog
* modifies the .dme
* restricts hardsuits to human only
* edit the changelog
* edit the changelog, part 2
* change dmi paths and hardsuit names
* Your unbeatable smile wrecks the media
We wanna know your secret, so mysterious
* Even the things she lacks end up in her area
Such a perfect liar, you are
* Miss ingenious, godly idol!
(You're my savior, you're my saving grace)
* So, what'd you eat today?
What's your favorite book?
* And if you wanna go to play, where are you gonna go?
I haven't eaten at all
* That's a secret
No matter what you ask
* She's elusive, evasive
* So nonchalant
Yet still shining bright;
* Her secret: out of sight, as if visible, has the taste of honey
There is none, none, none of this
* And also none, none, none of that
What type of guy do you like?
* Who is your partner?
Come on, answer me
* "I don't understand what falling in love with someone else is like" (Hey! Hey!)
I cannot tell what is true from what is a lie (Hey! Hey! Hey! Hey!)
* And yet again, someone falls for such words (Hey! Hey! Hey! Hey!)
Gently lulled into love
* Drawing everyone's eyes
You are the perfect, ultimate idol
* Never to appear again
A reincarnation of Venus
* With that smile, with that "I love you"
You captivate everyone
* Even if those eyes, those words, are false
They make up a perfect love (Ai)
* Yeah, yeah, that girl stands out, exceptional
We were extras from the beginning
* BS that acted as adornments for the star's leading role
Everything we've accomplished is thanks to her — no!
* How impudent
How could envy and jealousy not exist?
* examine
* This isn't some made-up drama for appearances
So I cannot forgive
* You're not perfect, I cannot forgive you
I cannot forgive myself
* I cannot accept any version of you other than the one stronger than everyone else
* Everybody trusts and worships
The very strongest, most invincible idol
* Weaknesses and whatnot are not to be found
Carrying the morning star within
* Showing any weakness is no good, no good (Hey! Hey!)
Don't let them see anything that they don't want to know (Hey! Hey! Hey! Hey!)
* Anything but being one-of-a-kind is a definite no, no (Hey! Hey! Hey! Hey!)
That is the real love (Hey!)
* can commune fixes
* can commune rename
* fix is psi blocked
* fixes agian
* My signature smile that fires up the media
The only secret that I shall keep is this:
* My career was built upon fake "I love you"s
This is love, in my own way
* Even the flowing sweats are beautiful Aqua
These eyelids that hid the Ruby within
* Sing, dance, flutter, I am Maria —
Right, lying is the most exquisite form of love
* I have never been loved by anyone
Nor have I loved anyone else
* That such lies of mine will become true someday
I trust in it
* Someday, surely, I will have it all in hand
I am such a greedy idol
* Because I wish to love everybody properly in a life-sized way
I shall lie today as well (Hey! Hey! Hey! Hey!)
* a
* b
* c
* d
* And yet, still, (Hey! Hey!)
I have been unable to tell you, and you, alone (Hey! Hey! Hey! Hey!)
* jesus christ
* Update code/controllers/subsystems/processing/psi.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/controllers/subsystems/processing/psi.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/controllers/subsystems/processing/psi.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/game/gamemodes/technomancer/spell_objs.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/mob/living/carbon/human/human.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/mob/living/carbon/human/human_helpers.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/organs/organ_external.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/assay.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/command.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/emotional_suggestion.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/grip.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/grip.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/mend.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/mend.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/mend.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/psi_search.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/shockwave.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/shockwave.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/singularity.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/time_stop.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/events/mini_spasm.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* cl update
---------
Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Your unbeatable smile wrecks the media
We wanna know your secret, so mysterious
* Even the things she lacks end up in her area
Such a perfect liar, you are
* Miss ingenious, godly idol!
(You're my savior, you're my saving grace)
* So, what'd you eat today?
What's your favorite book?
* And if you wanna go to play, where are you gonna go?
I haven't eaten at all
* That's a secret
No matter what you ask
* She's elusive, evasive
* So nonchalant
Yet still shining bright;
* Her secret: out of sight, as if visible, has the taste of honey
There is none, none, none of this
* And also none, none, none of that
What type of guy do you like?
* Who is your partner?
Come on, answer me
* "I don't understand what falling in love with someone else is like" (Hey! Hey!)
I cannot tell what is true from what is a lie (Hey! Hey! Hey! Hey!)
* And yet again, someone falls for such words (Hey! Hey! Hey! Hey!)
Gently lulled into love
* Drawing everyone's eyes
You are the perfect, ultimate idol
* Never to appear again
A reincarnation of Venus
* With that smile, with that "I love you"
You captivate everyone
* Even if those eyes, those words, are false
They make up a perfect love (Ai)
* Yeah, yeah, that girl stands out, exceptional
We were extras from the beginning
* BS that acted as adornments for the star's leading role
Everything we've accomplished is thanks to her — no!
* How impudent
How could envy and jealousy not exist?
* examine
* This isn't some made-up drama for appearances
So I cannot forgive
* You're not perfect, I cannot forgive you
I cannot forgive myself
* I cannot accept any version of you other than the one stronger than everyone else
* Everybody trusts and worships
The very strongest, most invincible idol
* Weaknesses and whatnot are not to be found
Carrying the morning star within
* Showing any weakness is no good, no good (Hey! Hey!)
Don't let them see anything that they don't want to know (Hey! Hey! Hey! Hey!)
* Anything but being one-of-a-kind is a definite no, no (Hey! Hey! Hey! Hey!)
That is the real love (Hey!)
* can commune fixes
* can commune rename
* fix is psi blocked
* fixes agian
* My signature smile that fires up the media
The only secret that I shall keep is this:
* My career was built upon fake "I love you"s
This is love, in my own way
* Even the flowing sweats are beautiful Aqua
These eyelids that hid the Ruby within
* Sing, dance, flutter, I am Maria —
Right, lying is the most exquisite form of love
* I have never been loved by anyone
Nor have I loved anyone else
* That such lies of mine will become true someday
I trust in it
* Someday, surely, I will have it all in hand
I am such a greedy idol
* Because I wish to love everybody properly in a life-sized way
I shall lie today as well (Hey! Hey! Hey! Hey!)
* a
* b
* c
* d
* And yet, still, (Hey! Hey!)
I have been unable to tell you, and you, alone (Hey! Hey! Hey! Hey!)
* jesus christ
* Update code/controllers/subsystems/processing/psi.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/controllers/subsystems/processing/psi.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/controllers/subsystems/processing/psi.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/game/gamemodes/technomancer/spell_objs.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/mob/living/carbon/human/human.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/mob/living/carbon/human/human_helpers.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/organs/organ_external.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/assay.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/command.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/emotional_suggestion.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/grip.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/grip.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/mend.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/mend.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/mend.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/psi_search.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/shockwave.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/shockwave.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/singularity.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/abilities/time_stop.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/events/mini_spasm.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/psionics/interface/ui_hub.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* cl update
---------
Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* init
* map work
* mappin
* map
* random/tool(box)/icon_state fix
* mappin
* a
* b
* aa
* trashbin filled
* boozeomat/abandoned
* foodheater/abandoned
* areas
* map
* areas etc
* a
* a
* a
* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
* light
* a
* b
* a?
* aaaaaaaa
* changelog
* broken light, off lamp
* madness
* a
* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
* a
* uhhh
* I am becoming insane
* hangars, how do they work?
* lattices
* light/spot/weak begone
* game note
---------
Co-authored-by: DreamySkrell <>
* if you can read this shut up about it
* please
* please?
* fine. i'll do it myself
* Revert "fine. i'll do it myself"
This reverts commit 9682843336.
* please please
* i thought computers were supposed to be smart
* finishing touches
* it's never really the last change
* fixes missing witchfinder book
* yangechog
* edictjustments
