Commit Graph

439 Commits

Author SHA1 Message Date
timothyteakettle 47424be1c0 tail fix 2020-08-18 00:46:05 +01:00
Timothy Teakettle f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
silicons 4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
silicons 8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons b56742beb5 Merge branch 'pr-13110' 2020-08-16 18:40:23 -07:00
silicons 428bb936aa Merge pull request #13037 from timothyteakettle/freedom-in-customisation
turns 304 lines of snowflake code into 24 lines
2020-08-16 18:35:05 -07:00
timothyteakettle a9caceb001 insect fluff! 2020-08-14 02:27:54 +01:00
timothyteakettle 1f240b883f holy shit 2020-08-11 03:37:04 +01:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Timothy Teakettle 033fe553e8 cease your shitcode 2020-08-10 21:41:06 +01:00
Timothy Teakettle ce0a5b7016 only horns is unlocked now 2020-08-08 15:26:25 +01:00
Putnam 9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
silicons 3640a33ff6 e 2020-08-06 23:22:53 -07:00
silicons bcfc601c7a sigh 2020-08-06 23:11:09 -07:00
silicons 8edb374a20 sigh 2020-08-06 23:09:02 -07:00
Timothy Teakettle f2c1b25119 yes 2020-08-05 15:50:25 +01:00
Timothy Teakettle 5297700340 snowflake coders are bad 2020-08-05 14:11:40 +01:00
Timothy Teakettle 7c8f03a81f new defines 2020-08-01 18:29:27 +01:00
Timothy Teakettle 31963b32a4 subcategories cool 2020-07-29 17:14:07 +01:00
timothyteakettle c15d0de20d subcategories work 2020-07-29 03:57:16 +01:00
silicons 04df84d1e0 Merge pull request #12776 from timothyteakettle/snail-shells
snail shell backpack
2020-07-17 17:07:46 -07:00
Timothy Teakettle 0a4a0fadb3 snails 2020-07-14 20:59:25 +01:00
Timothy Teakettle 55af5f8ea2 give me my snails 2020-07-14 20:26:31 +01:00
Artur a304ed7f49 Canister and paper updates
should fix papah exploits, though some runtiming is occuring
2020-07-04 16:14:42 +03:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Timothy Teakettle 87be9f7e2e add ipc tongue to options 2020-06-24 21:55:10 +01:00
Timothy Teakettle 97dbd9cedf better customization 2020-06-24 21:44:48 +01:00
Artur c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Ghom e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing
asset cache + better minimaps
2020-06-19 23:09:09 +02:00
kevinz000 118ac1a775 Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
2020-06-17 20:10:04 -07:00
Timothy Teakettle 2229db2214 Merge branch 'master' into embed-changes 2020-06-17 16:40:34 +01:00
Artur 92a60d6e68 Makes it actually work 2020-06-17 17:37:03 +03:00
SmArtKar 170a38a3a7 Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/

* Recipes fix
2020-06-16 16:22:56 -07:00
Timothy Teakettle eba1e8f301 fixes the merge conflicts 2020-06-15 23:29:49 +01:00
Artur ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Timothy Teakettle 7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Timothy Teakettle d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
kevinz000 8162303bad Merge remote-tracking branch 'citadel/master' into pp_fix 2020-06-13 12:03:01 -07:00
kevinz000 180b7d31d9 sigh 2020-06-13 09:24:22 -07:00
Lin bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
Timothy Teakettle 38bf529f3c a tonne of fixes 2020-06-11 20:18:36 +01:00
Timothy Teakettle 4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Timothy Teakettle 95b8cd3956 first port 2020-06-10 20:33:01 +01:00
Timothy Teakettle 14c9ab2ff1 ports tgs regal rats (#12479)
* port regal rats

* fix missing line

* royal rat goes after humans too

* okay dont let them attack people

* let them attack people but at less damage

* remove header
2020-06-09 03:28:00 -07:00
Letter N 151df41d1c asset cache + better minimaps 2020-05-31 16:15:09 +08:00
Artur 19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
kevinz000 65bb3bbb91 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-29 19:13:22 -07:00
KathrinBailey ff51c9d2db Improvised Weapons Update: Part 1 (#12226)
* Improvised Weapons Part 1: Shotgun & Rifle

Adds new sprites for ammo, the improvised rifle, the improvised shotgun. Adds a hand saw. Adds things to the crafting menu. Adds things to the autolathe menu.

* PR not yet ready - just cleaning issues.

Just trying to remark some of the issues resolved so I can see where I'm at a bit easier.

* Reverting changes to shotgun ammo names in the autolathe.

No point calling it 12G when there's no 20G anymore.

* Weapon weight + sprite improvements.

Makes sprites for gun parts bulkier with a low alpha pixel outline to make them easier to click on. They also look a bit closer to what their final product will be.

* oops forgot the "

* Revert "Merge branch 'master' into Improvised-Part-1"

This reverts commit 1e43d228d1bc35b0582244ed0bd91934573b3cdd, reversing
changes made to 207e9fccd4e8cffbe9ed26401a6f516fc44245dd.

* Revert "Revert "Merge branch 'master' into Improvised-Part-1""

This reverts commit 22d421d010c4a4c5c5e26f49fe6bffcf6198df42.

* My Github or environment isn't flipping out. no more.

Derp. Also projectile damage modifier fixed. I can actually compile without hundreds of errors.

* Made small weapon parts have w_class small.

I was testing it out and seeing the trigger assembly take so much space in my inventory seemed really odd.

* Duplicate definition refused.

Hurrdurr I suck.
Glad I gave this a quick look-voer.
Shotgun description edited to reflect the 0.8x damage modifier.

* Resolved tools.dmi merge conflict.

Just took the dmi from master and put the new sprites on at the end.

* DNM - Trying to see why usptream tools.dmi with my stuff added on the end is conflicting.

* Please don't conflict
2020-05-28 23:24:42 -07:00
kevinz000 433bd1af79 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-27 18:11:15 -07:00
Ghom 968426fd48 Combat mode component. (#12338)
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
2020-05-27 18:00:32 -07:00