BongaTheProto
d08cb554e9
Merge branch 'master' into pr/660
2023-02-13 14:09:17 -05:00
BongaTheProto
bb3bdf047f
Merge pull request #738 from WoolyAypa/dullahan
...
dull han fixxe
2023-02-12 01:09:24 -05: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
WoolyAypa
8ebd985f4b
fixar
2023-02-07 22:21:21 -03:00
WoolyAypa
524525c5f5
dull han
2023-02-07 12:03:17 -03:00
BongaTheProto
8a53e33271
Merge branch 'master' into pr/660
2023-01-28 22:11:29 -05:00
BongaTheProto
620380e188
Merge remote-tracking branch 'upstream/master'
2023-01-21 13:15:29 -05:00
SandPoot
54192d4d0d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-20 21:35:34 -03:00
BongaTheProto
2fa8d53b55
Merge remote-tracking branch 'upstream/master'
2023-01-20 13:18:03 -05:00
FelixRuin
58090d704f
Monophobia vore and blind fix ( #289 )
2023-01-19 21:54:08 -03:00
Lin
bd6a170299
Merge pull request #15943 from SandPoot/silicon-stuff
...
Update some silicon stuff
2023-01-18 17:52:06 -07:00
BongaTheProto
21c3abdfb7
Merge remote-tracking branch 'upstream/master'
2023-01-18 04:20:45 -05:00
SandPoot
e76ed6a1ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-17 22:26:56 -03:00
SandPoot
0ebcf0b72f
stuff
2023-01-16 18:16:32 -03:00
Lin
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 Teakettle
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
BongaTheProto
86a005b590
Merge remote-tracking branch 'upstream/master'
2023-01-11 12:51:40 -05:00
SandPoot
03304ba2c8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-10 22:50:16 -03:00
Timothy Teakettle
c8fc27fc9c
Merge pull request #15930 from SandPoot/reskinning
...
Update to reskinning
2023-01-11 01:00:35 +00:00
SandPoot
3b8d102fac
puts pda in the system to remove shitcode
2023-01-10 20:02:12 -03:00
SandPoot
cf51a4dce9
dusting off
2023-01-10 18:32:49 -03:00
SandPoot
6bbd44afe7
element time
2023-01-10 18:08:17 -03:00
BongaTheProto
ab9d691f1a
Merge remote-tracking branch 'upstream/master'
2023-01-09 16:59:38 -05:00
SandPoot
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
Jerry Wester
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
SandPoot
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
silicons
35497b250f
Merge pull request #15914 from Hatterhat/conveyor-sorter
...
[good to go] conveyor sorters, conveyor switch tool interacts, also makes mechs not explode on sale
2023-01-07 14:09:55 -08:00
silicons
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
SandPoot
ad479f738e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-07 16:45:16 -03:00
SandPoot
42d4abc164
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-07 16:44:44 -03:00
SandPoot
183eaf8a68
come on, the signal positions!
2023-01-07 16:34:23 -03:00
SandPoot
c3d6816780
Merge pull request #15577 from Putnam3145/bring-beauty-back
...
Adds beauty back
2023-01-07 15:58:46 -03: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
Hatterhat
34eaf93a01
sorters! one-way setting! brazen code borrowing!
2022-12-29 20:18:34 -06:00
SandPoot
d337852c68
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-28 16:56:04 -03:00
Neyusha
580bd31e12
Stowaways Role
2022-12-27 11:45:20 +03:00
silicons
0712bb4c79
Merge pull request #15897 from LeDrascol/auto-lumi-eyes
...
Automatically implant High Luminosity Eyes
2022-12-21 12:38:13 -08:00
Hatterhat
f0a154106e
no more titanium req
2022-12-19 08:33:59 -06:00
Jerry Wester
5987f3ba13
revert holocall.dm
2022-12-17 18:21:23 -07:00
Jerry Wester
13f8559190
add springlock module
2022-12-17 16:54:41 -07: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
SandPoot
011dd2e817
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-16 16:47:19 -03:00
Lin
7d0c3df2ad
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
...
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
Jerry Wester
32a5d02434
Merge branch 'master' into modsuits
2022-12-13 19:18:24 -07:00
