Commit Graph

4057 Commits

Author SHA1 Message Date
SandPoot
b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00
SandPoot
b36da8f5d7 Revert "Revert "[DNM] Updates firemanning, throwing stuff""
This reverts commit def4b38a46.
2023-10-12 14:34:02 -03:00
BlueWildrose
def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
BlueWildrose
aff43910af Merge pull request #16007 from SandPoot/throwing-updat
[DNM] Updates firemanning, throwing stuff
2023-10-11 13:51:54 -06:00
SandPoot
6cd2cfcd01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-config 2023-10-05 21:25:29 -03:00
SandPoot
a105852042 the stuff
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
2023-10-05 21:15:11 -03:00
SandPoot
c3735c05ac Merge branch 'master' into throwing-updat 2023-10-04 15:15:15 -03:00
SandPoot
5a90dabd3c stuff 2023-10-03 23:22:57 -03:00
SandPoot
8c0a4131ac why did i check for empty hand again? 2023-10-03 14:29:17 -03:00
Lin
c45ef33afa Merge pull request #16000 from SandPoot/priority_announce
Randomizing station names trait no longer hides announcements
2023-09-16 13:03:44 -04:00
silicons
98c0f38de3 Merge pull request #15999 from SandPoot/do_after
Implements timed_action_flags for do_after-like procs
2023-09-14 17:59:55 -07:00
SandPoot
a82a99c5e7 never meant to be hidden 2023-09-14 18:01:28 -03:00
SandPoot
3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
SandPoot
07219e311a final tg sync 2023-09-08 21:17:01 -03:00
silicons
c317c8b8fc Merge pull request #15993 from SandPoot/station-name
New Station Trait: Randomizing Station Name
2023-07-30 10:49:51 -07:00
SandPoot
bfe07112ff i hate keyed_list, i'm not keeping it in 2023-07-28 13:53:09 -03:00
SandPoot
6896a2e481 what was it again? 2023-07-27 21:09:41 -03:00
SandPoot
9421423ed5 Merge branch 'master' into changeling-update 2023-07-26 22:22:14 -03:00
SandPoot
11aa13e4e8 part 1 - 41928 2023-07-26 21:45:43 -03:00
SandPoot
19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
Lin
3c3f609541 Merge pull request #15989 from SandPoot/screentip-update
Update screentips
2023-07-19 15:53:38 -05:00
SandPoot
e062316915 sync-ish 2023-07-19 13:48:07 -03:00
Jerry Wester
93efbde5a9 point of locking your modsuit i mean really why 2023-05-01 00:21:39 -05:00
Jerry Wester
7deb853f48 mod wires can be learned, same exp as robot 2023-05-01 00:20:48 -05:00
Jerry Wester
d170da0bba GPS now working :) 2023-05-01 00:20:36 -05:00
KrissKr0ss
66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
silicons
6efd3098d4 Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
2023-03-04 23:36:36 -08:00
SandPoot
d287fc25ca poosh 2023-02-21 01:55:49 -03:00
SandPoot
c1e8039c11 source 2023-02-09 03:00:56 -03:00
SandPoot
78c28a40c7 sneaky hint about reskinning 2023-02-09 02:54:31 -03:00
SandPoot
d29ce2328c some extra touches 2023-02-09 02:25:34 -03:00
SandPoot
4491abc2d7 updates to most recent version and puts intent hints! 2023-02-09 02:20:02 -03:00
SandPoot
1b1154260c correct everything and some intention based checks 2023-02-08 02:17:57 -03:00
SandPoot
ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
zerothebigboy
8dd5986788 okay 2023-01-30 00:06:49 -05:00
zerothebigboy
091d9ec00f good 2023-01-30 00:01:22 -05:00
Lin
bd6a170299 Merge pull request #15943 from SandPoot/silicon-stuff
Update some silicon stuff
2023-01-18 17:52:06 -07: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
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
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07: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