Commit Graph
222 Commits
Author SHA1 Message Date
ariaworld 708ad3d128 Revert "modularize"
Demodularizes Photography Album Persistence.

This reverts commit 7ebdfba5c9.
2023-10-24 21:59:22 +02:00
BongaTheProto acf7f84756 Update good.dm 2023-02-08 18:42:28 -05:00
BongaTheProto 9e6d04e757 fix photographer 2023-02-08 18:30:09 -05:00
BongaTheProto 21c3abdfb7 Merge remote-tracking branch 'upstream/master' 2023-01-18 04:20:45 -05:00
LinandGitHub a00bb99936 Merge pull request #15934 from LeDrascol/update-lumi-eyes
Minor improvements to High Luminosity Eyes
2023-01-15 15:34:21 -07:00
Timothy TeakettleandGitHub 35d01aa0f4 Merge pull request #15918 from LeDrascol/port-heirloom-update
[PORT] Non-global heirloom definitions
2023-01-12 23:39:41 +00:00
Darius aa1b82f0b1 Convert Colorist from quirk to loadout item
Removes the Colorist quirk, and adds Hair Dye Spray to the loadout under backpack items.
2023-01-11 14:23:14 -05:00
Darius 045eb4a8c9 Add quirk removal code for High Luminosity Eyes
Restores the character's default eyes when removing the High Luminosity Eyes quirk. Ensures that the character has eyes, and that those eyes are luminescent.
2023-01-11 13:41:21 -05:00
Darius d6ddb68c6f Minor updates to High Luminosity Eyes flavor text
This commit does the following:
- Fixes minor typos
- Increases the amount of information presented
- Adjusts flavor text to be more specific
2023-01-11 13:39:00 -05:00
Darius d90fa375e1 Move heirloom lists to relevant files
Port of the current TG heirloom system.

Heirlooms are now stored in job_types and species_types instead of a global list. Items used as heirlooms match their modern TG counterparts when possible.

Also fixes the ancient first aid kit, which is used for a heirloom.
2023-01-04 13:57:54 -05:00
BongaTheProto 8034d9fb22 Merge remote-tracking branch 'upstream/master' 2022-12-31 14:31:12 -05:00
Darius dd61704960 Automatically implant High Luminosity Eyes
Prevents the need for an auto-surgeon by automatically replacing the character's eyes on spawn.
2022-12-17 10:12:58 -05:00
BongaTheProto a04476b38d Merge remote-tracking branch 'upstream/master' 2022-12-16 20:39:53 -05:00
LinandGitHub 7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
BongaTheProto fb66dc2035 Merge remote-tracking branch 'upstream/master' 2022-08-23 20:30:19 -05:00
siliconsandGitHub ad289629a7 Update _quirk.dm 2022-08-20 12:30:32 -07:00
Timothy Teakettle b05f6e221d MIGRATIONS DELETIONS AND QUIRKS OH MY 2022-08-05 18:06:49 +01:00
BongaTheProto ec12aeaabf Merge remote-tracking branch 'upstream/master' 2022-06-05 02:00:30 -05:00
deathride58andGitHub ca879a83f5 Merge pull request #15651 from timothyteakettle/oof-ouch-my-bones!
adds paper skin and glass bones quirks
2022-06-05 00:26:55 -04:00
BongaTheProtoandGitHub 8f55fb3ca0 Merge branch 'Sandstorm-Station:master' into master 2022-06-01 05:56:13 -07:00
Timothy Teakettle 411a5c63ee paper skin, glass bones 2022-05-29 20:04:49 +01:00
Timothy Teakettle 9ceb1394d8 missing line from previous commit 2022-05-28 21:14:10 +01:00
Timothy Teakettle ea173b01e0 swap nyctophobia and lightless for tg code versions 2022-05-28 21:13:54 +01:00
Timothy Teakettle 3f260298e7 adds processing_quirk to control if a quirk should start processing or not 2022-05-28 21:05:51 +01:00
BongaTheProto 0a97a66551 Merge remote-tracking branch 'upstream/master' 2022-05-13 01:20:04 -05:00
LinandGitHub a899b5db81 Merge pull request #15607 from Putnam3145/auxmos-1
Updates auxmos to 1.0 (plus other atmos stuff with it)
2022-05-13 05:45:33 +00:00
BongaTheProto 783ae63c30 Merge remote-tracking branch 'upstream/master' 2022-05-02 19:47:29 -05:00
Putnam3145 a7408beb4c Updated auxmos to 1.0 2022-04-28 21:07:51 -07:00
Timothy Teakettle ac4a41243a add salt quirk 2022-04-27 14:58:54 +01:00
BongaTheProto 54aec9bd98 Merge remote-tracking branch 'upstream/master' 2022-02-27 14:38:06 -05:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
BongaTheProto c0420c2c61 safety check
probably too late for this but better late than never, I guess
2022-02-22 15:07:51 -05:00
James 4367ca5403 Runtime: Quirks which get their spawn text late 2022-02-04 11:50:45 +00:00
keronshb 47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
timothyteakettle 39c09a60b8 initial commit 2021-07-13 23:45:31 +01:00
DeltaFireandGitHub b105a3c831 Merge pull request #14347 from timothyteakettle/language-tab
the speech panel pr
2021-03-16 20:31:58 +01:00
HeroWithYay 5ee6f23841 Safty isn't a word and even if it was this wouldn't be how you use it in a sentence. 2021-03-14 03:39:31 +13:00
Timothy Teakettle fa765ec4c3 nope 2021-03-01 20:58:21 +00:00
Putnam cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
LinandGitHub 98736a7a37 Merge pull request #14207 from TyrianTyrell/master
Multilingual fix? (Has since been tested.)
2021-02-13 16:41:10 -06:00
TyrianTyrellandGitHub a4bb96f614 Update good.dm 2021-02-12 07:02:14 -05:00
TyrianTyrellandGitHub 5769cc106b Update good.dm 2021-02-10 13:56:56 -05:00
TyrianTyrellandGitHub e5fea58776 Update good.dm 2021-02-08 07:32:22 -05:00
siliconsandGitHub 86066450f3 Merge pull request #14179 from TyrianTyrell/master
Signed language (Requested changes complete)
2021-02-06 11:42:24 -07:00
TyrianTyrellandGitHub fb592b70a1 Update negative.dm 2021-02-04 15:10:12 -05:00
TyrianTyrellandGitHub 44366a4a2e Currently removing phobia picking 2021-02-04 15:04:17 -05:00
TyrianTyrellandGitHub 678d0c950f Update negative.dm 2021-02-01 05:48:34 -05:00
TyrianTyrellandGitHub 9bda74c58d Update good.dm 2021-02-01 05:34:45 -05:00
siliconsandGitHub 085540af3c Update negative.dm 2021-01-17 15:21:31 -07:00