This repository has been archived by the owner on Mar 10, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 16
Adds base TGS integration and hooks #2
Open
MCterra10
wants to merge
3
commits into
Project-Wildflower:master
Choose a base branch
from
MCterra10:tgs
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Terra <[email protected]>
can we even test merge properly lol |
At the moment, we can do so manually with some pain and suffering. After this PR, it should be nice and simple. I'll give this a thorough review and testing when I have the time. |
…wer into tgs # Conflicts: # baystation12.dme
Signed-off-by: Terra <[email protected]>
francinum
pushed a commit
to francinum/Wildflower
that referenced
this pull request
Sep 24, 2021
voxtime forgot this Adds Vox settings to suit cycler/RIG (Project-Wildflower#2) Adds setup for Vox voidsuit item sprites (Project-Wildflower#3) final touchups NOW its final fixes part 1 updates take 2
That0nePerson
referenced
this pull request
in That0nePerson/Wildflower
Feb 18, 2022
commit d6aceec Merge: 58bf005 7479494 Author: Gallyus <[email protected]> Date: Thu Oct 7 20:52:37 2021 -0400 Merge pull request Project-Wildflower#40 from francinum/1072021upstream 1072021upstream commit 7479494 Merge: 58bf005 58d4340 Author: Francinum <[email protected]> Date: Thu Oct 7 20:43:08 2021 -0400 Merge branch 'dev' of github.com:Baystation12/Baystation12 into 1072021upstream commit 58d4340 Author: Bay12Bot <[email protected]> Date: Thu Oct 7 22:01:01 2021 +0000 Automatic changelog generation commit b511b08 Author: Bay12Bot <[email protected]> Date: Thu Oct 7 19:17:14 2021 +0200 Automatic changelog generation for PR #31249 [ci skip] commit 65c099a Merge: 5e10373 e40966e Author: Sierra Brown <[email protected]> Date: Thu Oct 7 10:16:40 2021 -0700 Merge pull request #31249 from juxtaposed9930/armour_2 Finishes the armor PR commit 5e10373 Author: Bay12Bot <[email protected]> Date: Thu Oct 7 01:10:56 2021 +0000 Automatic changelog generation commit e40966e Author: Jocelynn <[email protected]> Date: Wed Oct 6 20:50:10 2021 -0400 Finishes the armor PR commit 8d09fe9 Author: Bay12Bot <[email protected]> Date: Wed Oct 6 18:10:16 2021 +0000 Automatic changelog generation commit 92c737b Author: Bay12Bot <[email protected]> Date: Wed Oct 6 20:06:44 2021 +0200 Automatic changelog generation for PR #31244 [ci skip] commit 4182dab Merge: 0f4b4bd cae4936 Author: Sierra Brown <[email protected]> Date: Wed Oct 6 11:06:08 2021 -0700 Merge pull request #31244 from juxtaposed9930/armour All body armour now has a two second equip delay commit 0f4b4bd Author: Bay12Bot <[email protected]> Date: Wed Oct 6 12:42:56 2021 +0200 Automatic changelog generation for PR #31248 [ci skip] commit df60b15 Merge: dbb8558 0b39272 Author: Spookerton <[email protected]> Date: Wed Oct 6 11:42:16 2021 +0100 Merge pull request #31248 from MuckerMayhem/whoopsie Fix Set Round Length default time not being in minutes commit dbb8558 Author: Bay12Bot <[email protected]> Date: Wed Oct 6 01:09:07 2021 +0000 Automatic changelog generation commit 0b39272 Author: Mucker <[email protected]> Date: Tue Oct 5 16:15:09 2021 -0700 correct an input message forgot to divide the value here by 600 to get it in minutes commit 6900d02 Author: Bay12Bot <[email protected]> Date: Tue Oct 5 17:21:11 2021 +0000 Automatic changelog generation commit 01cc0fe Author: Bay12Bot <[email protected]> Date: Tue Oct 5 19:07:12 2021 +0200 Automatic changelog generation for PR #31242 [ci skip] commit 47c4893 Merge: 8ce5d53 b882dd5 Author: Sierra Brown <[email protected]> Date: Tue Oct 5 10:06:37 2021 -0700 Merge pull request #31242 from CrimsonShrike/AnimeMechClimb Adds exosuit jump climbing commit cae4936 Author: Jocelynn <[email protected]> Date: Mon Oct 4 22:01:21 2021 -0400 All body armor now has a two second equip delay commit 8ce5d53 Author: Bay12Bot <[email protected]> Date: Tue Oct 5 03:58:29 2021 +0200 Automatic changelog generation for PR #31201 [ci skip] commit e6aef4a Merge: 2155cc8 5ff8ae7 Author: Sierra Brown <[email protected]> Date: Mon Oct 4 18:58:02 2021 -0700 Merge pull request #31201 from Spookerton/spkrtn/cng/visiting-the-tailor Space suits have a wear delay commit 2155cc8 Author: Bay12Bot <[email protected]> Date: Tue Oct 5 01:08:33 2021 +0000 Automatic changelog generation commit b882dd5 Author: CrimsonShrike <[email protected]> Date: Mon Oct 4 14:16:22 2021 +0100 Adds exosuit jump climbing commit 5954e04 Author: Bay12Bot <[email protected]> Date: Mon Oct 4 01:13:29 2021 +0000 Automatic changelog generation commit fa4c553 Author: Bay12Bot <[email protected]> Date: Sun Oct 3 15:01:23 2021 +0000 Automatic changelog generation commit 90c1c0c Author: Bay12Bot <[email protected]> Date: Sun Oct 3 17:00:03 2021 +0200 Automatic changelog generation for PR #31234 [ci skip] commit c644a28 Author: Bay12Bot <[email protected]> Date: Sun Oct 3 17:00:00 2021 +0200 Automatic changelog generation for PR #31235 [ci skip] commit 37dacb7 Author: Bay12Bot <[email protected]> Date: Sun Oct 3 16:59:46 2021 +0200 Automatic changelog generation for PR #31218 [ci skip] commit d497f8a Merge: 09c4e2d 2276a31 Author: Sierra Brown <[email protected]> Date: Sun Oct 3 07:59:31 2021 -0700 Merge pull request #31235 from MuckerMayhem/fantastic-buttons Add 'set round length' and 'toggle continue vote' buttons commit 09c4e2d Merge: 8c2ddd9 56a8c8d Author: Sierra Brown <[email protected]> Date: Sun Oct 3 07:59:21 2021 -0700 Merge pull request #31234 from MuckerMayhem/ai-buildmode-fix Fix overlapping button mapping in ai buildmode commit 8c2ddd9 Merge: e2fbb2b 9a2ec93 Author: Sierra Brown <[email protected]> Date: Sun Oct 3 07:59:11 2021 -0700 Merge pull request #31218 from juxtaposed9930/BadRoboNoCandy Removes robotics surgery kit + nanoblood commit e2fbb2b Merge: 44e275f 865b1a7 Author: Sierra Brown <[email protected]> Date: Sat Oct 2 09:53:01 2021 -0700 Merge pull request #31215 from Spookerton/spkrtn/cng/accessory-housekeeping accessory housekeeping commit 44e275f Merge: efe0827 01bc7aa Author: Sierra Brown <[email protected]> Date: Sat Oct 2 09:52:40 2021 -0700 Merge pull request #31231 from Spookerton/spkrtn/fix/custom-jackets lazy add custom icon state to fix custom jackets commit efe0827 Merge: bbeefa5 b4b2528 Author: Sierra Brown <[email protected]> Date: Sat Oct 2 09:47:48 2021 -0700 Merge pull request #31233 from juxtaposed9930/metemore Sets meteor to require one person commit 2276a31 Author: Mucker <[email protected]> Date: Fri Oct 1 18:36:53 2021 -0700 add 'set round length' and 'toggle continue vote' buttons commit 56a8c8d Author: Mucker <[email protected]> Date: Fri Oct 1 16:32:26 2021 -0700 fix overlapping button mapping in ai buildmode commit b4b2528 Author: Jocelynn <[email protected]> Date: Fri Oct 1 19:28:35 2021 -0400 Sets meteor to require one person commit bbeefa5 Author: Bay12Bot <[email protected]> Date: Fri Oct 1 01:12:39 2021 +0000 Automatic changelog generation commit bc02ef8 Author: Bay12Bot <[email protected]> Date: Fri Oct 1 02:49:01 2021 +0200 Automatic changelog generation for PR #31232 [ci skip] commit 59cace1 Merge: 832944c b5749c1 Author: Sierra Brown <[email protected]> Date: Thu Sep 30 17:48:29 2021 -0700 Merge pull request #31232 from MuckerMayhem/blue-trash-bag Fix a typo in the trashbag of holding recipe commit 832944c Author: Bay12Bot <[email protected]> Date: Thu Sep 30 14:37:05 2021 +0200 Automatic changelog generation for PR #31227 [ci skip] commit 25b213f Merge: b4f9984 e2e9bfb Author: Spookerton <[email protected]> Date: Thu Sep 30 13:36:33 2021 +0100 Merge pull request #31227 from SealCure/gnash Make dehydrated carp work properly commit b4f9984 Merge: 3b626ee 8cf840f Author: Spookerton <[email protected]> Date: Thu Sep 30 13:34:35 2021 +0100 Merge pull request #31212 from MuckerMayhem/exoplanet-events Separate exo events from station events commit 3b626ee Merge: 6d38e3e ab71068 Author: Spookerton <[email protected]> Date: Thu Sep 30 13:33:01 2021 +0100 Merge pull request #31226 from SierraKomodo/simplify-standardized-health Purge health extension commit b5749c1 Author: Mucker <[email protected]> Date: Wed Sep 29 23:31:29 2021 -0700 fix a typo in the trashbag of holding recipe commit 6d38e3e Author: Bay12Bot <[email protected]> Date: Thu Sep 30 01:14:14 2021 +0000 Automatic changelog generation commit 01bc7aa Author: spookerton <[email protected]> Date: Thu Sep 30 02:13:44 2021 +0100 lazy add custom icon state to fix custom jackets commit 1edd36e Merge: 2e41f94 b723022 Author: Spookerton <[email protected]> Date: Wed Sep 29 21:45:40 2021 +0100 Merge pull request #31229 from Spookerton/spkrtn/fix/subsystems undo changes to subsystems commit b723022 Author: spookerton <[email protected]> Date: Wed Sep 29 21:15:32 2021 +0100 undo changes to subsystems re: 44a9e18 - update SSatoms 66d50d1 - update SScircuit, SScircuit_component f295b7a - update SSchemistry 06f25d5 - update SSantags 33bb449 - update SSalarm fedc30f - update SSao 56441d7 - update SSai, SSaifast e2bfa44 - update SSProcessing, SS/fire signature Needs some additional work and leaving it live while I figure out how this is making the MC panic is no good commit 9a2ec93 Author: Jocelynn <[email protected]> Date: Sun Sep 26 17:13:24 2021 -0400 Removes robotics surgery kit + nanoblood commit 2e41f94 Author: Bay12Bot <[email protected]> Date: Wed Sep 29 16:51:58 2021 +0200 Automatic changelog generation for PR #31222 [ci skip] commit 9d59af2 Merge: e44237a e2590c6 Author: Sierra Brown <[email protected]> Date: Wed Sep 29 07:51:26 2021 -0700 Merge pull request #31222 from juxtaposed9930/firelaser Incendiary Laser Stuff commit e44237a Author: Bay12Bot <[email protected]> Date: Wed Sep 29 16:15:13 2021 +0200 Automatic changelog generation for PR #31223 [ci skip] commit b3b9551 Merge: fc28996 4efac6c Author: Spookerton <[email protected]> Date: Wed Sep 29 15:14:36 2021 +0100 Merge pull request #31223 from juxtaposed9930/fucknuts Adds a cryocomputer to the merc base commit e2e9bfb Author: SealCure <[email protected]> Date: Tue Sep 28 20:41:07 2021 +0100 Repath dehydrated carp commit ab71068 Author: Sierra Brown <[email protected]> Date: Tue Sep 28 10:22:56 2021 -0700 Purge health extension commit fc28996 Merge: 355f779 44a9e18 Author: Sierra Brown <[email protected]> Date: Tue Sep 28 10:33:39 2021 -0700 Merge pull request #31225 from Spookerton/spkrtn/sys/controller-perf controller performance tweaks commit e2590c6 Author: Jocelynn <[email protected]> Date: Mon Sep 27 21:14:33 2021 -0400 Incendiary Laser Stuff commit 44a9e18 Author: spookerton <[email protected]> Date: Tue Sep 28 15:31:52 2021 +0100 update SSatoms improves loop behaviors makes members static commit 66d50d1 Author: spookerton <[email protected]> Date: Tue Sep 28 14:59:59 2021 +0100 update SScircuit, SScircuit_component improves initialize behaviors improves fire behaviors members are static made data signature stuff much less needlessly costly commit f295b7a Author: spookerton <[email protected]> Date: Tue Sep 28 14:25:23 2021 +0100 update SSchemistry improves fire loop behavior makes members static renames members for readability adds runlevel_lobby to settle chemistry before roundstart commit 06f25d5 Author: spookerton <[email protected]> Date: Tue Sep 28 14:23:41 2021 +0100 update SSantags improves initialize behavior adds a static reference to antag_types for VV convenience commit 33bb449 Author: spookerton <[email protected]> Date: Tue Sep 28 14:22:46 2021 +0100 update SSalarm improves fire loop behavior makes members static renames members for readability commit fedc30f Author: spookerton <[email protected]> Date: Tue Sep 28 14:21:44 2021 +0100 update SSao improves fire loop behavior makes members static commit 56441d7 Author: spookerton <[email protected]> Date: Tue Sep 28 14:20:33 2021 +0100 update SSai, SSaifast improves fire loop behavior makes members static commit e2bfa44 Author: spookerton <[email protected]> Date: Tue Sep 28 14:18:47 2021 +0100 update SSProcessing, SS/fire signature clarifies purpose of no_mc_tick, adds it to base SS signature improves processing subsystem fire loop behavior commit 4efac6c Author: Jocelynn <[email protected]> Date: Mon Sep 27 21:35:40 2021 -0400 dipnuggets commit 355f779 Author: Bay12Bot <[email protected]> Date: Tue Sep 28 01:07:56 2021 +0000 Automatic changelog generation commit 865b1a7 Author: spookerton <[email protected]> Date: Sat Sep 25 22:16:27 2021 +0100 move accessory.dm, split to (mostly) file per item + non-exhaustive cleanup & fixes commit c7e34e5 Author: spookerton <[email protected]> Date: Sat Sep 25 19:05:05 2021 +0100 squash accessory boolean vars into accessory_flags commit 76d134e Author: spookerton <[email protected]> Date: Wed Aug 26 16:44:56 2020 +0100 accessory/var/has_suit => parent commit 58074a5 Author: Bay12Bot <[email protected]> Date: Mon Sep 27 14:42:59 2021 +0200 Automatic changelog generation for PR #31217 [ci skip] commit 9845eee Merge: 5b19be1 88f95f6 Author: Spookerton <[email protected]> Date: Mon Sep 27 13:42:51 2021 +0100 Merge pull request #31214 from Spookerton/spkrtn/sys/clamp-my-versions Move Clamp from macros to version, use clamp >512 commit 5b19be1 Merge: 5e7bc37 5548d43 Author: Spookerton <[email protected]> Date: Mon Sep 27 13:42:23 2021 +0100 Merge pull request #31217 from juxtaposed9930/what Removes Solgov utes parent object from random spawn list commit 5548d43 Author: Jocelynn <[email protected]> Date: Sun Sep 26 17:01:28 2021 -0400 Random Solgov now spawns EC utes instead of parent utes commit 5e7bc37 Merge: e8d6bde e3ca4f5 Author: Spookerton <[email protected]> Date: Sun Sep 26 16:50:03 2021 +0100 Merge pull request #31211 from Spookerton/spkrtn/sys/mixed-signals Reduce << & >> count, add semantic defines for flags & shifting commit e8d6bde Author: Bay12Bot <[email protected]> Date: Sun Sep 26 01:09:28 2021 +0000 Automatic changelog generation commit 88f95f6 Author: spookerton <[email protected]> Date: Sat Sep 25 16:56:18 2021 +0100 move Clamp from macros to version, use clamp >512 commit 8051a3c Author: Bay12Bot <[email protected]> Date: Sat Sep 25 14:32:57 2021 +0200 Automatic changelog generation for PR #31209 [ci skip] commit e657322 Merge: b8e2495 6a14fa8 Author: Spookerton <[email protected]> Date: Sat Sep 25 13:32:22 2021 +0100 Merge pull request #31209 from SierraKomodo/borg-hypo-selector Use input instead of chat for borg hypospray selection commit b8e2495 Author: Bay12Bot <[email protected]> Date: Sat Sep 25 14:31:51 2021 +0200 Automatic changelog generation for PR #31213 [ci skip] commit 769d6ca Merge: e6bece4 c8bf3b3 Author: Spookerton <[email protected]> Date: Sat Sep 25 13:31:15 2021 +0100 Merge pull request #31213 from Ryan180602/secmap Remove Brig Headset/Remove 2/3 Labelers in Sec commit c8bf3b3 Author: Ryan <[email protected]> Date: Sat Sep 25 08:17:42 2021 +0530 Remove Brig Headset/Remove 2/3 Labelers in Sec screwdriver commit e3ca4f5 Author: spookerton <[email protected]> Date: Fri Sep 24 20:32:24 2021 +0100 use SHIFT* for remaining shifts + update tests commit f6d1d10 Author: spookerton <[email protected]> Date: Fri Sep 24 20:31:55 2021 +0100 use FLAG for flags, corrections along the way add SHIFTR, SHIFTL, use SHIFTL for FLAG fix PASSEMOTES/LEAPING conflict correct a << output to to_target SOUND_STOPPED is a FLAG instead of datum member commit a782716 Author: spookerton <[email protected]> Date: Fri Sep 24 20:26:23 2021 +0100 collect bit/field defines into macros + related swaps BIT* for *_BIT defines, gets rid of BIT* also adds FLAG as a (1<<N) semantic define commit 8cf840f Author: Mucker <[email protected]> Date: Fri Sep 24 12:25:43 2021 -0700 separate exoplanet events from station events commit 58bf005 Merge: c7aa8bd e9b380a Author: Gallyus <[email protected]> Date: Fri Sep 24 15:22:29 2021 -0400 Merge pull request Project-Wildflower#39 from francinum/mfinncmwkrngjvucmseng Another Upstream Pull commit e6bece4 Author: Bay12Bot <[email protected]> Date: Fri Sep 24 19:19:55 2021 +0000 Automatic changelog generation commit 5ff8ae7 Author: spookerton <[email protected]> Date: Fri Sep 24 20:08:16 2021 +0100 adding item equip delay, some do_after fixes fixes do_after posting a bad message when halting for user unique constraint fixes do_after failing to check hand swapping when starting on the right hand refactors mob equipping to use a flags field instead of individual vars adds item/var/equip_delay, item/var/equip_delay_flags, item/proc/equip_delay_before, item/proc/equip_delay_after - uses equip_delay to do_after in equip_to_slot_if_possible when flags do not skip it - equip_delay_flags are passed to do_after as flags - equip_delay_before/after are virtual behavior functions items implementing equip_delay can override for messages etc uses equip_delay for space suits, excluding hard/rig commit d1fa37c Author: Bay12Bot <[email protected]> Date: Fri Sep 24 21:03:28 2021 +0200 Automatic changelog generation for PR #31206 [ci skip] commit f99a0db Merge: 32d0fb2 0409b96 Author: Spookerton <[email protected]> Date: Fri Sep 24 20:02:50 2021 +0100 Merge pull request #31206 from SierraKomodo/area-lighting Area lighting commit 32d0fb2 Author: Bay12Bot <[email protected]> Date: Fri Sep 24 21:02:41 2021 +0200 Automatic changelog generation for PR #31210 [ci skip] commit 68f82cd Merge: 03ada4c 865ce5c Author: Spookerton <[email protected]> Date: Fri Sep 24 20:02:05 2021 +0100 Merge pull request #31210 from SierraKomodo/ssd-messages SSD examine messages now clarify SSD status and are pink commit 03ada4c Author: Bay12Bot <[email protected]> Date: Fri Sep 24 21:01:32 2021 +0200 Automatic changelog generation for PR #31200 [ci skip] commit 6d56789 Merge: 4a4f34e 0f3bde0 Author: Sierra Brown <[email protected]> Date: Fri Sep 24 12:00:55 2021 -0700 Merge pull request #31200 from Spookerton/spkrtn/fix/from-the-heart fix some augment bugs after 31185 commit 865ce5c Author: Sierra Brown <[email protected]> Date: Thu Sep 23 21:38:19 2021 -0700 Use pink text for SSD examine messages commit e9b380a Merge: c7aa8bd 4a4f34e Author: Francinum <[email protected]> Date: Fri Sep 24 13:42:54 2021 -0400 Merge branch 'dev' of github.com:Baystation12/Baystation12 into mfinncmwkrngjvucmseng commit a28c026 Author: Sierra Brown <[email protected]> Date: Thu Sep 23 21:33:34 2021 -0700 SSD examine messages now clarify SSD status commit 6a14fa8 Author: Sierra Brown <[email protected]> Date: Thu Sep 23 19:32:57 2021 -0700 Use input instead of chat for borg hypospray selection commit 4a4f34e Author: Bay12Bot <[email protected]> Date: Fri Sep 24 01:08:42 2021 +0000 Automatic changelog generation commit 0409b96 Author: Sierra Brown <[email protected]> Date: Wed Sep 22 16:42:58 2021 -0700 Allow areas to define lighting tones commit 8294120 Author: Sierra Brown <[email protected]> Date: Wed Sep 22 14:28:36 2021 -0700 Document & cleanup lights commit 32efbf9 Author: Sierra Brown <[email protected]> Date: Wed Sep 22 13:38:42 2021 -0700 Add lighting color defines commit 54c4fb6 Author: Bay12Bot <[email protected]> Date: Thu Sep 23 20:01:27 2021 +0200 Automatic changelog generation for PR #31204 [ci skip] commit 89b335e Merge: 0f651a6 7331679 Author: Sierra Brown <[email protected]> Date: Thu Sep 23 11:00:51 2021 -0700 Merge pull request #31204 from CrimsonShrike/Atmoshielding Atmoshielding commit 0f651a6 Merge: c2d9651 874cedd Author: Spookerton <[email protected]> Date: Thu Sep 23 15:54:45 2021 +0100 Merge pull request #31131 from SierraKomodo/ic-standardized-health Apply standardized health to items commit c2d9651 Author: Bay12Bot <[email protected]> Date: Thu Sep 23 16:48:30 2021 +0200 Automatic changelog generation for PR #31193 [ci skip] commit b1e1d6b Author: Bay12Bot <[email protected]> Date: Thu Sep 23 16:48:11 2021 +0200 Automatic changelog generation for PR #31205 [ci skip] commit d534a28 Merge: 9656b1e c09a708 Author: Spookerton <[email protected]> Date: Thu Sep 23 15:47:57 2021 +0100 Merge pull request #31193 from SomeAngryMiner/mercdonalds Mercenary suit sprite update (And an engineering HCM) commit 9656b1e Merge: 13a4a96 42e0076 Author: Spookerton <[email protected]> Date: Thu Sep 23 15:47:36 2021 +0100 Merge pull request #31205 from juxtaposed9930/secsaybye Makes security processing more private commit 13a4a96 Author: Bay12Bot <[email protected]> Date: Thu Sep 23 16:13:15 2021 +0200 Automatic changelog generation for PR #31203 [ci skip] commit 8a487a1 Merge: 255f7b6 cf8ef35 Author: Spookerton <[email protected]> Date: Thu Sep 23 15:12:39 2021 +0100 Merge pull request #31203 from CrimsonShrike/RespiteFromSpriting New mech equipment sprites commit 874cedd Author: Sierra Brown <[email protected]> Date: Fri Aug 27 12:41:23 2021 -0700 Apply standardized health to items commit 42e0076 Author: Jocelynn <[email protected]> Date: Wed Sep 22 22:28:05 2021 -0400 Makes security processing more private commit c09a708 Author: PumpkinSoup <[email protected]> Date: Fri Sep 17 03:56:46 2021 -0300 Ah shit, here we go again voxtime forgot this Adds Vox settings to suit cycler/RIG (#2) Adds setup for Vox voidsuit item sprites (#3) final touchups NOW its final fixes part 1 updates take 2 commit 7331679 Author: CrimsonShrike <[email protected]> Date: Sat May 15 20:55:28 2021 +0100 Exosuit airshields and atmos fixes commit cf8ef35 Author: CrimsonShrike <[email protected]> Date: Tue Sep 21 19:05:30 2021 +0100 New mech equipment sprites pt1 commit 0f3bde0 Author: spookerton <[email protected]> Date: Tue Sep 21 17:06:00 2021 +0100 augment fixes fix loadout augments always installing in chest fix concealed wrist blades not being concealed fix augment implanter not failing when dropped commit 255f7b6 Author: Bay12Bot <[email protected]> Date: Wed Sep 22 01:08:44 2021 +0000 Automatic changelog generation commit a4282dd Author: Bay12Bot <[email protected]> Date: Wed Sep 22 00:57:56 2021 +0200 Automatic changelog generation for PR #31195 [ci skip] commit 157b553 Merge: 70ba1f0 ca238ed Author: Spookerton <[email protected]> Date: Tue Sep 21 23:57:18 2021 +0100 Merge pull request #31195 from Domic2/Domic4 Fixes the ITV Vulcan thrusters connecting to the gantry commit 70ba1f0 Author: Bay12Bot <[email protected]> Date: Tue Sep 21 01:08:25 2021 +0000 Automatic changelog generation commit 8c01345 Author: Bay12Bot <[email protected]> Date: Mon Sep 20 15:53:58 2021 +0200 Automatic changelog generation for PR #31197 [ci skip] commit 1a50f21 Merge: 69036d6 9725e10 Author: Spookerton <[email protected]> Date: Mon Sep 20 14:53:21 2021 +0100 Merge pull request #31197 from juxtaposed9930/nomoreglovetheft Removes EC Duty gloves from fleet uniform vendor commit 9725e10 Author: Jocelynn <[email protected]> Date: Sun Sep 19 17:07:03 2021 -0400 Removes EC Duty gloves from fleet uniform vendor commit 69036d6 Author: Bay12Bot <[email protected]> Date: Sun Sep 19 01:32:57 2021 +0000 Automatic changelog generation commit 7d295bd Author: Bay12Bot <[email protected]> Date: Sun Sep 19 03:29:37 2021 +0200 Automatic changelog generation for PR #31180 [ci skip] commit 35d525b Merge: e1baa0d 6acc717 Author: Sierra Brown <[email protected]> Date: Sat Sep 18 18:29:04 2021 -0700 Merge pull request #31180 from MuckerMayhem/mob-ai-adjustments Mob AI adjustments commit ca238ed Author: Domic2 <[email protected]> Date: Sat Sep 18 23:06:33 2021 +0200 Fixes the ITV Vulcan thrusters connecting to the gantry commit e1baa0d Merge: 98e4565 74405e5 Author: Spookerton <[email protected]> Date: Sat Sep 18 14:17:00 2021 +0100 Merge pull request #31192 from SierraKomodo/better-remove-hydrobase Untick hydrobase because the 'do not spawn' flag doesn't work commit 98e4565 Author: Bay12Bot <[email protected]> Date: Fri Sep 17 00:01:29 2021 +0000 Automatic changelog generation commit 85386c4 Author: Bay12Bot <[email protected]> Date: Fri Sep 17 01:59:51 2021 +0200 Automatic changelog generation for PR #31191 [ci skip] commit d938d40 Author: Bay12Bot <[email protected]> Date: Fri Sep 17 01:59:48 2021 +0200 Automatic changelog generation for PR #31185 [ci skip] commit af01139 Merge: 8507d3c 5d2dbd2 Author: Sierra Brown <[email protected]> Date: Thu Sep 16 16:59:20 2021 -0700 Merge pull request #31191 from juxtaposed9930/unatsayno Nobody on the Torch knows you worship Poppy commit 8507d3c Merge: a5439ba f780e27 Author: Sierra Brown <[email protected]> Date: Thu Sep 16 16:59:10 2021 -0700 Merge pull request #31185 from Spookerton/spkrtn/cng/augment-this augment tweaks and fixes commit 6acc717 Author: Mucker <[email protected]> Date: Tue Sep 14 17:14:19 2021 -0700 nerf mob AI call for help mechanic commit 8cc163b Author: Mucker <[email protected]> Date: Tue Sep 14 17:14:08 2021 -0700 tweak mob attack attack 'aim' AI attacks now check for hits based on direction. If a target is adjacent to the mob and in the direction it is facing, then it will count as a hit. commit 74405e5 Author: Sierra Brown <[email protected]> Date: Tue Sep 14 16:12:01 2021 -0700 Untick hydrobase because the 'do not spawn' flag doesn't work commit 5d2dbd2 Author: Jocelynn <[email protected]> Date: Tue Sep 14 16:30:22 2021 -0400 Adds "unstated" religion to humans and unathi commit a5439ba Author: Bay12Bot <[email protected]> Date: Tue Sep 14 01:09:48 2021 +0000 Automatic changelog generation commit f62bc32 Author: Bay12Bot <[email protected]> Date: Mon Sep 13 22:35:37 2021 +0000 Automatic changelog generation commit 6d54588 Author: Bay12Bot <[email protected]> Date: Tue Sep 14 00:34:08 2021 +0200 Automatic changelog generation for PR #31186 [ci skip] commit 3e5aefb Author: Bay12Bot <[email protected]> Date: Tue Sep 14 00:33:41 2021 +0200 Automatic changelog generation for PR #31187 [ci skip] commit 229fdff Merge: 3e0157a f3e6ed2 Author: Sierra Brown <[email protected]> Date: Mon Sep 13 15:33:27 2021 -0700 Merge pull request #31186 from Domic2/Domic2 Fixes wall frames spawning with the wrong materials commit 3e0157a Merge: 4254dda 1898c14 Author: Sierra Brown <[email protected]> Date: Mon Sep 13 15:33:01 2021 -0700 Merge pull request #31187 from Domic2/Domic Firedoor W/E sprite slightly improved commit f780e27 Author: spookerton <[email protected]> Date: Mon Sep 13 19:11:32 2021 +0100 pacify tests & post fixes tests (goto 1 -> 5), (<< 122 -> 123) add scannable back to some things that lost it update defines, vars, for prepended dmdoc comments string tweaks augment discovery description from implanter to organ add partial codex entry, lacking install info & unavailable for instances because codex crusty commit 1898c14 Author: Domic2 <[email protected]> Date: Tue Sep 14 00:04:42 2021 +0200 Firedoor sprite tweak commit f3e6ed2 Author: Domic2 <[email protected]> Date: Mon Sep 13 23:08:22 2021 +0200 Fixes wall frames spawning with the wrong materials commit 4254dda Author: Bay12Bot <[email protected]> Date: Mon Sep 13 18:37:25 2021 +0000 Automatic changelog generation commit 7282e23 Author: Bay12Bot <[email protected]> Date: Mon Sep 13 20:35:28 2021 +0200 Automatic changelog generation for PR #30932 [ci skip] commit 9dcff92 Merge: 7b36e98 188f3f2 Author: Sierra Brown <[email protected]> Date: Mon Sep 13 11:34:56 2021 -0700 Merge pull request #30932 from Spookerton/spkrtn/cng/subtle-traces-of-gender adjusts behavior of forensic fibers stuff commit 7b36e98 Author: Bay12Bot <[email protected]> Date: Mon Sep 13 20:34:12 2021 +0200 Automatic changelog generation for PR #31184 [ci skip] commit 01e8f47 Merge: 933e675 f00fb29 Author: Sierra Brown <[email protected]> Date: Mon Sep 13 11:33:41 2021 -0700 Merge pull request #31184 from juxtaposed9930/hairtweaks Hair Tweaks commit 5bebd69 Author: spookerton <[email protected]> Date: Mon Sep 13 18:49:02 2021 +0100 de-cruft fluff augment paths also puts stuff in categories, corrects categories, names, etc users will need to reselect augments due to total change of structure people can select huds they don't (start with) the access to use commit eb2ee0d Author: spookerton <[email protected]> Date: Mon Sep 13 18:28:25 2021 +0100 cbm -> augment autodoc + rewrite behavior for doll commit 31bf6ed Author: spookerton <[email protected]> Date: Mon Sep 13 16:40:40 2021 +0100 collapse equip and simple augment into item augment commit fbff4c7 Author: spookerton <[email protected]> Date: Mon Sep 13 15:58:11 2021 +0100 simple augments retract on removal commit 630e46e Author: spookerton <[email protected]> Date: Sun Sep 12 23:42:31 2021 +0100 augments respect the target doll adds ORGAN_CONFIGURE which allows organs to change themselves according to the initial state of replace/transplant and decide if the surgery should continue. augments use slot flags instead of bp strings and configure their target parent and tag according to the user's doll target. adds GROIN and FOOT augment slots for completeness. commit 3507620 Author: spookerton <[email protected]> Date: Sun Sep 12 14:58:35 2021 +0100 initial cleanup of augment bits gentle refactors & overall style pass moved "known" and "discoverable" onto flags adjusted flag names for organs, added (unused) crystaline flag massaged style & behavior of augment & cbm examine commit 933e675 Author: Bay12Bot <[email protected]> Date: Mon Sep 13 15:23:58 2021 +0200 Automatic changelog generation for PR #31174 [ci skip] commit f51f9e5 Author: Bay12Bot <[email protected]> Date: Mon Sep 13 15:23:44 2021 +0200 Automatic changelog generation for PR #31173 [ci skip] commit 8ec6f9a Merge: 0c33c63 9e35a3e Author: Spookerton <[email protected]> Date: Mon Sep 13 14:23:28 2021 +0100 Merge pull request #31178 from Domic2/Domic2 Fixes ghosts causing runtimes when trying to climb railings commit 0c33c63 Author: Bay12Bot <[email protected]> Date: Mon Sep 13 15:23:14 2021 +0200 Automatic changelog generation for PR #31169 [ci skip] commit d982d04 Author: Bay12Bot <[email protected]> Date: Mon Sep 13 15:23:07 2021 +0200 Automatic changelog generation for PR #31179 [ci skip] commit b8eaf06 Merge: 0ea00b3 2e88ab7 Author: Spookerton <[email protected]> Date: Mon Sep 13 14:23:01 2021 +0100 Merge pull request #31174 from SierraKomodo/blob-expansion-tweaks Blob expansion tweaks & fixes commit 0ea00b3 Merge: 84e14a6 935bb10 Author: Spookerton <[email protected]> Date: Mon Sep 13 14:22:52 2021 +0100 Merge pull request #31173 from SierraKomodo/fix-blob-not-growing Fixes blob cores not growing commit 84e14a6 Merge: 6149ec4 c87ad4e Author: Spookerton <[email protected]> Date: Mon Sep 13 14:22:42 2021 +0100 Merge pull request #31169 from SierraKomodo/talking-atoms-standardized Use `audible_message()` for talking atoms commit 6149ec4 Merge: 6766847 b4db7a5 Author: Spookerton <[email protected]> Date: Mon Sep 13 14:22:32 2021 +0100 Merge pull request #31179 from SierraKomodo/exploding-spider-delay Exploding spider delay commit f00fb29 Author: Jocelynn <[email protected]> Date: Mon Sep 13 08:36:36 2021 -0400 Hair Tweaks commit 6766847 Author: Bay12Bot <[email protected]> Date: Mon Sep 13 01:08:22 2021 +0000 Automatic changelog generation commit 188f3f2 Author: spookerton <[email protected]> Date: Thu Jul 8 18:34:14 2021 +0100 add clothing_flags, adjusts fibers behavior commit b4db7a5 Author: Sierra Brown <[email protected]> Date: Sun Sep 12 12:57:53 2021 -0700 Delete exploding spider's body on detonation commit 7e549c8 Author: Sierra Brown <[email protected]> Date: Sun Sep 12 12:57:43 2021 -0700 Increase exploding spider delay commit 9e35a3e Author: Domic2 <[email protected]> Date: Sun Sep 12 21:23:20 2021 +0200 Fixes ghost-climbing-railing runtime commit 8fa25d6 Author: Bay12Bot <[email protected]> Date: Sun Sep 12 21:10:32 2021 +0200 Automatic changelog generation for PR #31172 [ci skip] commit a768307 Merge: d3ef047 5d60926 Author: Sierra Brown <[email protected]> Date: Sun Sep 12 12:10:15 2021 -0700 Merge pull request #31161 from juxtaposed9930/newnathi No :pawnty:'s were used in the creation of these lizords commit d3ef047 Author: Bay12Bot <[email protected]> Date: Sun Sep 12 21:10:06 2021 +0200 Automatic changelog generation for PR #31171 [ci skip] commit 5dabf8b Merge: 61c41d5 380c9e4 Author: Sierra Brown <[email protected]> Date: Sun Sep 12 12:09:57 2021 -0700 Merge pull request #31172 from Tennessee116/torch/holyshitremovetheecifitmeansremovingthesegodawfuluniforms Remove dress shoes from EC service uniform vending commit 61c41d5 Merge: 73c45f6 92c57d0 Author: Sierra Brown <[email protected]> Date: Sun Sep 12 12:09:33 2021 -0700 Merge pull request #31171 from MuckerMayhem/lizard-fixing Fix lizards having no ai commit 5d60926 Author: Jocelynn <[email protected]> Date: Sat Sep 11 19:36:51 2021 -0400 New Unathi Sprites, courtesy of the Pawnster commit 73c45f6 Author: Bay12Bot <[email protected]> Date: Sun Sep 12 01:08:21 2021 +0000 Automatic changelog generation commit ae6e702 Author: Bay12Bot <[email protected]> Date: Sun Sep 12 01:13:55 2021 +0200 Automatic changelog generation for PR #31170 [ci skip] commit aaae3c9 Merge: 9154f77 649bf1a Author: Sierra Brown <[email protected]> Date: Sat Sep 11 16:13:22 2021 -0700 Merge pull request #31170 from Tennessee116/mattoidartery Fix name of carotid artery commit 2e88ab7 Author: Sierra Brown <[email protected]> Date: Sat Sep 11 16:05:03 2021 -0700 Blob expansion tweaks & fixes commit 935bb10 Author: Sierra Brown <[email protected]> Date: Sat Sep 11 15:40:26 2021 -0700 Fixes blob cores not growing commit 380c9e4 Author: Tennessee116 <[email protected]> Date: Sat Sep 11 16:44:21 2021 -0500 Remove dress shoes from EC service uniform vending commit 92c57d0 Author: Cole Houlihan <[email protected]> Date: Sat Sep 11 14:04:40 2021 -0700 fix lizards having no ai, rename passive subtype commit 649bf1a Author: Tennessee116 <[email protected]> Date: Sat Sep 11 14:52:41 2021 -0500 Fix name of carotid artery commit 9154f77 Author: Bay12Bot <[email protected]> Date: Sat Sep 11 18:11:21 2021 +0000 Automatic changelog generation commit f1d0bed Author: Bay12Bot <[email protected]> Date: Sat Sep 11 20:09:30 2021 +0200 Automatic changelog generation for PR #31157 [ci skip] commit 2eac8b9 Merge: 378e7e0 3f35e6c Author: Sierra Brown <[email protected]> Date: Sat Sep 11 11:08:51 2021 -0700 Merge pull request #31157 from MuckerMayhem/spider-nerfing Nerf spiderling spawn counts commit c87ad4e Author: Sierra Brown <[email protected]> Date: Sat Sep 11 09:55:47 2021 -0700 Use `audible_message()` for talking atoms commit 378e7e0 Author: Bay12Bot <[email protected]> Date: Sat Sep 11 01:05:00 2021 +0000 Automatic changelog generation commit 3f35e6c Author: Cole Houlihan <[email protected]> Date: Wed Sep 8 22:49:41 2021 -0700 nerf spiderling spawn counts
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please for god sake do some testmerges with this