Commit Graph

517 Commits

Author SHA1 Message Date
AffectedArc07
590abafc0e Speeds up prefs menu by 10x. Not hyperbole. (#20034) 2022-12-29 16:07:34 +01:00
warriorstar-orion
a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
ElorgRHG
638e49001f Handholes alternative solution, less issues version™ (#19724)
* Alternate solution to handholes

* Markings handling

* Respecting missing hands

* Fixes handholes for ID photos/records, removes gloves from images in them for code simplification and consistency sake

* hand not hands
2022-12-17 17:09:32 +00:00
Christasmurf
db6b994911 Bomber jacket loadout changes - Job subtypes and adds engi/atmos to loadout options (#19723)
* loadout options

* bomber job subtype changes

* display name consistency

* spacing aaaaaaa
2022-11-24 22:46:01 +01:00
McRamon
56b8b1ece4 Hawaiian loadout (#19685)
* does this work?

* maybe this will work?

* fix

* dots of consistency

* removal of what was asked to be removed
2022-11-18 20:40:09 +00:00
S34N
667dd5d4ac 515 Compatibility (#19636)
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
2022-11-08 23:08:40 +00:00
ElorgRHG
890d4755fe Paradise's soul removal part two of many: security jumpsuits (#19333)
* A small rejuvenation of security jumpsuits

* sec formal rolling fix

* New Vox security sprites

* adjusts the warden's formal suit obj a bit

* Different style of corp skirt

* Vox adjusted to new skirts

* New sec shirt skirt

* Grey sprites

* Drask sprites

* New sec shirt and sec shirt skirt sprites

sec shirt skirt my beloved

* Merge remote-tracking branch 'upstream/master' into riots-in-the-streets-security-jumpsuit-resprite
2022-10-26 00:07:36 +01:00
ElorgRHG
12c4aa5590 Removes the need to make handholes for jumpsuit sprites (#19058)
* Handholes were kinda cringe

* A mildly overengineered solution

* Deconflict

* Lobby gloves fix
2022-10-21 12:35:04 +01:00
Henri215
4c0c0d84fd [GBP: No update] Expands the usage of some bodyflags (#19392)
* forgot to include bodyflag in these places

* small adjustment
2022-10-19 17:44:49 -05:00
ElorgRHG
e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
Henri215
98f4520a43 bald expansion and added shave bodyflag (#19117) 2022-09-25 17:44:27 +01:00
Vi3trice
7a3f2ed506 Port TG pointing to inventory thought bubble, and expand valid pointing targets (#19072)
* Well that actually works

* Update atoms_movable.dm

* Now you can point at things inside of things.
2022-09-25 17:29:51 +01:00
Henri215
4b1bae4de4 "None" and "Slime Jelly" blood types added for the appropriate species (#19045)
* none and slime jelly blood types

* random b_type instead of A+ only
2022-09-25 17:25:58 +01:00
AffectedArc07
34927f05ab Wryn removal v2 (#19112)
* Removes Wryn

* and the sprites

* Fixes

Co-authored-by: Fox McCloud <Fox-McCloud@users.noreply.github.com>
2022-09-24 12:53:34 +01:00
ElorgRHG
e4e06f2759 Paradise's soul removal part one of many: Captain's drip and resprite (#18891)
* The sprites and stuff

* Vox re-add

* Why did I do this

* Last tweaks

* Pixel differences

* I have decided that captains need a beret

* I have decided that Ian needs drip too

* This exists sadly

* I forgor the gloves 💀

* CONFLICTSSSSSS

* "empty" commit

* White tunic

I don't get the appeal still

* bluE

* Painful

This will most likely get closed anyway so whatever

* OLD TUNICCCCCCCCC

* Conflicts

* Loadout captain's berets

* More conflicts, yay
2022-09-17 11:13:58 +01:00
Christasmurf
8a47325d33 Cargo/Mining bomber jackets, minor tweaks to allowed items in cargo wintercoats (#18914)
* cargo and mining bombers and stuff

* changes requested

* reorder loadout
2022-09-07 13:37:15 +01:00
Ordosian
9cf1e7e5a6 Large Plasma Tank (#18840)
* Large Plasma Tank

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species/plasmaman.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Ordosian <Ordosian@gmail.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-08-25 17:42:17 +01:00
AffectedArc07
8ec53aca7a Server regions (#18867) 2022-08-21 21:27:23 +01:00
AffectedArc07
34ed47ae74 Refactors stack traces, tiny bit of cleanup (#18773) 2022-08-14 02:11:40 +01:00
roarbark
3f28b9fb25 turns hover over tooltips for inventory items into a preference (#18570)
* turns hover over tooltips into a preference

this allows people to toggle the tooltip boxes that appear when hovering over items

* adds up the bitflags in preferences.dm

oops

* coding late at night be like

fixes the bitflag, a variable location and the define name

* better wording and removes a var

cooler code
2022-07-31 21:36:32 +01:00
Qwertytoforty
daca998981 [TM READY] Ports lavaland elites from TG. (#18448)
* startup, expect like 50 unneeded icons, not bug free™️

* Hope works. Cloak works. Buffs for AI controlled. Faction fix.

* map speed buffs, fixes resummon health decay

* Adds roles. Adds Mirror walk. Nerfs revival, especialy for non antag summoned.

* I am denser than bluespace ore

* x2 antag cooldown, update desc for cloak

* removes 66% burn damage resist from elites

* honestly just knock that down

* herald not speaking right, fuckup with max hp fix

* Thanks hal!

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* changes, changes, and more changes, oh my!

* Update code/datums/status_effects/buffs.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* GC stuff

* oh, and just one more thing

* no gibtonite gaming

* Huston we have a FUCKING PROBLEM

* oopsy doopsy

* but just one more thing (again, gc stuff)

* Lets all elites speak their mind

* NO LAVA

* grab ghost, legion charge red.

* dust the dusting from the code

* no mirror cargo shuttle crossing

* need to stop making small changes, x2 broodmother

* herald no longer crashes the MC

* Lower broodmother cooldown, herald down 5 brute and , legionare gets more smoke and thermals, pandora gets chasers

* remove extra brackets, x 2 on aoe squares

* pandora now respects factions

* fixes teleporting to tumor if reactivated by someone else. Herald has light, boost elites make message

* requested changes

* mirroring a wanted change

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-30 20:22:28 +01:00
AffectedArc07
f0b36ddc59 Changelog improvements (#18498)
* Changelog improvements

* Farie tweaks

* Fix

* Improvements
2022-07-30 16:15:05 +01:00
S34N
fe1d30fd2f Character-based rebindable custom emotes (#18506)
* 1

* 2

* 3

* make it (mostly) work

* character-based emotes

* bump SQL version

* where did you go little s

* no more raw json

* partial AA review

* makes it not coded as stupidly

* donor exclusive emotes 4-7

* ship it

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Update code/datums/keybindings/emote.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* spacings

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-30 12:14:02 +01:00
AffectedArc07
0c0b201668 Reworks anon dchat mode into full anon mode (#18282)
* Reworks anon dchat mode

* Update code/modules/client/preference/preferences_toggles.dm
2022-07-14 16:52:49 +01:00
S34N
3f95392c82 Lets go rebind things (#18166)
* SSinput Rewrite, Custom Keybindings

* hmm yes, safety

* azerty begone

* address AA and SteelSlayer

* Address the old man

* what

* CI dbconfig too

* Address TM issues

Unicode support
Better numpad support
Fix no perms message
Fix modifier screwing movement

* pre-TM tweak, nitfix

* pre TM change 2

* Display others

* MERGE ME

* unduplicates your rows

* reverts some changes, makes this work for now (not TM safe)

* fixes direction facing, removes hotkey help item

* weird keys

* TM commit revert later

* fixed asay/msay keybind

* adds ALL the emotes

* flip and spin

* makes old people happy

* and fixes admins not being able to msay

* lets borgs stow modules

* saves prefs when someone changes a keybind

* reverts skin changes and manually applies
HEAVEN HELP YOU IF YOU USE THE DM SKIN EDITOR IT BREAKS EVERYTHING

* tidies menu, unduplicates rest

* sql file pls come back

* Update SQL/updates/40-41.sql

* why did you not throw an error?!

* inits keybinds if your prefs somehow fail, i guess

* restores these spaces, i guess

* fixes local testing, i guess

* emote cooldown returns (oops)

* movement lock improvements

* Pageup does Swap Hands

* LOOC

* whisper for living mobs

* oops

* fix dsay

* fix IPC silicon emote hotkeys

* category name

* backspace only clears if input is focused

* Makes TAB and BACKSPACE rebindable

* charlie review

* define move

* yeet

* Lewcc review

* brings back legacy mode

* restores legacy mode

* tell legacy mode what is going on

* Update code/controllers/subsystem/input.dm

* Update code/controllers/subsystem/input.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* safeties!

* legacy mode is a pref now

* undo TM changes

* null prefs safeties

* Revert "legacy mode is a pref now"

This reverts commit b45af65139.

* revert this too thanks

Co-authored-by: mochi <shenesis@gmail.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-13 21:34:41 +01:00
AffectedArc07
3c00a1f061 Removes cortical borers. No, I am not sorry. (#18161)
* Removes cortical borers. No, I am not sorry.

* Icon purge
2022-07-01 23:25:01 +01:00
Vi3trice
8753e22a8e Rework toy card decks into standard decks (#17925)
* Go fish

* Keep forgetting about the map

* Forgot about the sprites for the double deck

* Cleaned things up

* Fix icon conflict

* Update cards.dm

* Improper tweaks

* Update cards.dm

* Axing the popup from the toy version entirely, that was a little jank

* Meta remap was merged

* Huh. \improper was the issue.

* Update cards.dm

* Few changes and a fix

* More changes

* Update cards.dm

* Update cards.dm

* Update cards.dm

* Merge branch 'master' into go-fish

* Update cards.dm
2022-06-27 22:38:15 +01:00
Kugamo
8d7631dd49 Fire alarm sounds (#17992)
* STOP DROP AND ROLL BABY!

* bruh

* roasty toasty

* Choose Your Voluuume!!!!

* :U 👌 🆘

* SteelSlayer Suggestion

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-06-22 09:51:32 +01:00
AffectedArc07
7d5a7ad85d Adds colourblind mode and a colour matrix editor (#17933)
* Colourblind mode + Matrix editor

* increase that

* Protanopia filter

* Tritanopia filter

* The SQL part

* Refactor

* you saw nothing
2022-06-10 17:52:28 -06:00
BrickTheHooman
4239b71037 Adds a nian plushie (#17914)
* add nian plush

* comply with pr review suggestions

* changes pt 2
2022-06-07 11:37:05 +01:00
AffectedArc07
e0758794a6 Removes shadowlings. Does not add anything else to compensate. (#17467) 2022-05-13 22:09:30 +09:00
AffectedArc07
747097d7c3 Removes karma jobs framework (#17646) 2022-05-03 12:26:56 +01:00
GuiltyNeko
856eec713f Removes unused latejoin spawners (#17623)
* Bye bye latejoin spawners

* Empty lists

* All done
2022-04-30 16:14:07 +01:00
Charlie
a81aa191f9 Sets the default FPS to 63 (#17564)
* default FPS to 63

* SQL updates

* smallint(4)
2022-04-05 14:18:12 +01:00
AffectedArc07
cf63dda631 Refactors job EXP to allow for multiple departments in restrictions (#17442) 2022-02-25 10:42:15 +01:00
S34N
a5bc67cd43 Invasion of the moffs (#17000)
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
2022-02-23 20:37:37 +01:00
S34N
d273e9db9a Ghost "Toggle Darkness" value is now remembered (#17206) 2022-01-11 23:20:53 +01:00
AffectedArc07
1c8a28425a Removes heist mode & associated code (#17256) 2022-01-11 11:36:57 +01:00
S34N
3050a36b11 Ensures saved screentip prefs load properly (#17282) 2021-12-30 12:41:39 +01:00
S34N
8359b71824 Ports TG statusbar changes & screentips (#16505) 2021-12-29 15:16:50 +01:00
AffectedArc07
2d5736a61c Removes brig phys, adds another officer slot to compensate (#17180) 2021-12-06 15:00:43 +01:00
AffectedArc07
01044ab481 Ban refactor part 1/3 - Removes appearance bans (#17125) 2021-11-18 14:24:50 +01:00
Fox McCloud
55a6c23bc7 Removes civilian: Return of the Assistant King (#17103)
* Removes Civilian

* other alt-titles as well

* further resolution

* forgot these

* TGUI

* hud icon
2021-11-16 19:49:08 +01:00
AffectedArc07
ab92435be0 Karma refactor (#17070)
* Karma refactor

* This too

* Fixes recursion

* Fixes bugs

* Fixes bad usr

* Update code/modules/karma/karma_holder.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Logic tweak

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-11-15 13:52:56 +01:00
Fox McCloud
5e41a1e1d1 Ensure Alt Title Sanity (#17104) 2021-11-15 12:38:09 +01:00
Fox McCloud
8061afa550 Merge pull request #16172 from dearmochi/hair-gradients
[READY] Port hair gradient customization
2021-11-11 15:40:21 -05:00
SweetBlueSylveon
2fdcbf8551 Grey Plushie Get! (#16991)
* Adds a Grey Plushie

Adds a grey plushie to the game, putting it as a loadout option, and adding a new sprite.

* Adds water interaction

Adds a water_act to the plushie. The plushie will now changed to "grey_singed" when touching water.
Upon touching water the plushie will scream and go "AAAAAH!" which then puts all text and audio interactions onto a 300 cooldown.
The plushie can also be hugged to make it go "Ow..." if its icon is set to singed. This is on the same cooldown as vox screams.

* Minor fixes

Fixes minor syntax and redundancy problem in the code.

* Updated sprite

Adds new sprites for grey_plushie and grey_singed.

* Converts Cooldown and spawn system to timer.

Changes the cooldown and spawn system to a timer and callback system.

* Update code/game/objects/items/toys.dm

Adds early return.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Update code/game/objects/items/toys.dm

Simplifies code, corrects mistakes.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Complicated

-Splits the cooldown variable and proc into two, one for hugging one for screaming.
-Adds more BOOLEAN
-Properly implements Timer and Callback system.
-Adds early returns.

* Revert "Complicated"

reverts dme changes.

* Adds an if statement

Adds an if statement so that the server is not setting the icon and description every time the plushie gets wet.

* Minor correction

Fixes the order of the if statement and changes its type.

* Reverts test change

Last commit had testing changes I failed to revert before pushing.

* Changes the sprite.

-New, smaller icons.
-Slightly heavier shading.
(Can be undone and edited further, I still have the other sprites)

* Another sprite update

-I learned to use HSL.

* Small bugfix

Last code update I wrapped the screaming proc into the "don't set the icon and description if it's already singed" by accident. Swapping them around fixed it, and it will now be able to yell from water every 30 seconds again.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-11-06 17:34:17 +01:00
mochi
c7046c0756 Merge branch 'master' into hair-gradients 2021-10-27 13:33:12 +02:00
SabreML
1db94b18f1 White runechat toggle fix (#16949) 2021-10-15 14:10:04 +01:00
SabreML
bc739c353d Loadout DB Storage Refactor (#16453)
* `display_name` -> Typepaths V1

* Loadout display name capitalisation

#15857

* Review 1, plus json fixes

* (Hopefully) final tweaks

* Styling nitpicks

* Extra tweaks because why not

It never caused a runtime, but the `?.` is just in case.

* Deconflicting

* Warning comment

* Whoops

Typing faster than my brain
2021-10-09 19:35:15 +01:00