76e7ffc80d
push
2024-01-06 17:36:02 -03:00
c660811fe8
Merge pull request #16027 from DeltaFire15/modsuit-updates
...
Some modsuit updates
2024-01-01 21:08:56 -05:00
ce1d757159
Merge pull request #16016 from SandPoot/throwing-update
...
[TESTMERGE] Updates firemanning, throwing stuff
2023-12-28 22:44:59 -05:00
b9a422ee2d
throw at mobs laying down
2023-12-18 14:07:25 -03:00
27bdd4b732
aiModule > ai_module
2023-12-17 23:20:43 -03:00
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
3e45c18ab4
Merge pull request #16038 from SandPoot/fix-lava+borgs
...
Deals with lava plus a lot of borg stuff
2023-12-12 19:25:13 -05:00
e457f40328
maptext
2023-12-11 17:43:24 -03:00
c36105ef88
holy hell
2023-12-07 23:08:17 -03:00
7fad042e9e
suitlinking
...
active modsuits count as viable for Synthetic suitlinking
2023-11-13 14:49:23 +01:00
b7c7c24f63
rename icons files
2023-11-01 13:51:19 -05:00
b36da8f5d7
Revert "Revert "[DNM] Updates firemanning, throwing stuff""
...
This reverts commit def4b38a46
2023-10-12 14:34:02 -03:00
def4b38a46
Revert "[DNM] Updates firemanning, throwing stuff"
2023-10-11 13:52:03 -06:00
aff43910af
Merge pull request #16007 from SandPoot/throwing-updat
...
[DNM] Updates firemanning, throwing stuff
2023-10-11 13:51:54 -06:00
de4168bc0e
Merge pull request #16011 from SandPoot/not-again--
...
Fixes piggyback riding
2023-10-09 15:36:52 -04:00
c5ba21994d
If i had a nickel for every time incapacitated() had some issue, i would have...
2023-10-08 12:49:40 -03:00
c3735c05ac
Merge branch 'master' into throwing-updat
2023-10-04 15:15:15 -03:00
5a90dabd3c
stuff
2023-10-03 23:22:57 -03:00
a034a96fc2
part 2
2023-10-02 13:54:40 -03:00
39aab0dc82
go
2023-09-19 15:16:37 -03:00
3c7e79d384
do after update
2023-09-09 15:39:49 -03:00
11aa13e4e8
part 1 - 41928
2023-07-26 21:45:43 -03:00
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
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
d287fc25ca
poosh
2023-02-21 01:55:49 -03:00
71de9c13e3
Merge pull request #15962 from SandPoot/contextual-screentips
...
Contextual screentips -- Screentips now show you what items/objects can do
2023-02-15 23:04:54 +00:00
390dcbcea0
Merge pull request #15966 from SandPoot/accessory-equip
...
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
2023-02-09 21:39:05 +00:00
d29ce2328c
some extra touches
2023-02-09 02:25:34 -03:00
4491abc2d7
updates to most recent version and puts intent hints!
2023-02-09 02:20:02 -03:00
1b1154260c
correct everything and some intention based checks
2023-02-08 02:17:57 -03:00
5052f836e7
the stuff
2023-02-06 19:54:54 -03:00
ed06e686e1
pushies.
2023-01-31 16:40:17 -03:00
091d9ec00f
good
2023-01-30 00:01:22 -05:00
469ac02274
Merge pull request #15950 from SandPoot/trigger-events-tgui
...
Event menu rewrite
2023-01-29 13:46:39 -08:00
54641ce201
send
2023-01-23 20:44:28 -03:00
bd6a170299
Merge pull request #15943 from SandPoot/silicon-stuff
...
Update some silicon stuff
2023-01-18 17:52:06 -07:00
0ebcf0b72f
stuff
2023-01-16 18:16:32 -03:00
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
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
5ee1e5414f
Merge pull request #15895 from Linzolle/claw
...
fixes species not using the claw animation for unarmed attacks
2022-12-24 18:42:09 -03:00
b52e7a5657
ion jetpack module
2022-12-14 23:36:47 -07:00
7d0c3df2ad
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
...
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
32a5d02434
Merge branch 'master' into modsuits
2022-12-13 19:18:24 -07:00
2eee8e4339
Merge pull request #15888 from DeltaFire15/revenge-of-the-blacklist
...
Roundstart species with a quirk blacklist balance points
2022-12-12 19:13:32 -07:00
7205781c47
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
...
Solves some harddels
2022-12-12 19:11:49 -07:00
a0cbb52479
slash -> claw
2022-12-12 19:10:50 -07:00
a4631070a8
revert some changes
2022-12-11 20:32:42 -07:00
99ad8cc1a5
pai panel, force deactivation, and rad protection
2022-12-11 20:32:39 -07:00
f7ac3c7624
beeg commit
2022-12-11 20:32:35 -07:00
b538ad721b
modsuits part 2
2022-12-11 20:30:58 -07:00
SandPoot