Commit Graph

3971 Commits

Author SHA1 Message Date
Archie 94d7f2eef0 Updates reactor code 2021-06-14 22:29:44 -03:00
Dahlular 1b04f72108 Merge pull request #1270 from ToonClyde/protogen-markings
protogen body marking V1
2021-06-14 18:32:59 -06:00
ToonClyde 492707bdd9 protogen body markings V1 2021-06-14 17:22:41 -07:00
Dahlular d5497e5dfb Merge pull request #1268 from ArchieBeepBoop/piping
Fixes some glaring issues with layenia pipes
2021-06-14 15:00:04 -06:00
Dahlular 27d1bd2fdd Merge pull request #1267 from ArchieBeepBoop/ohgodwhy
Unmodularize Space Kiwis and Banana Spiders
2021-06-14 14:59:42 -06:00
Archie 0ae4d30749 Fixes pipes 2021-06-14 04:43:29 -03:00
kevinz000 ec4430bc50 Demodularization, fixes missing icons 2021-06-14 03:57:25 -03:00
Archie 2d6d24f2aa bananae 2021-06-14 03:44:16 -03:00
Dahlular 71eb95164a Merge pull request #1266 from ArchieBeepBoop/eventchanges
Proper returns for the mimic event + microopt
2021-06-13 22:17:15 -06:00
Dahlular b87e873581 Merge pull request #1265 from ArchieBeepBoop/morerevchanges
Two more rev changes.
2021-06-13 22:16:54 -06:00
Archie 9fa3bca200 Microopt for mimics 2021-06-14 01:13:35 -03:00
Archie e7786b977f Merge remote-tracking branch 'upstream/master' into eventchanges 2021-06-14 01:09:36 -03:00
Archie 2a5a66c4d8 Proper returns for the mimic event 2021-06-14 01:08:00 -03:00
Archie efa78a3433 a 2021-06-14 00:43:41 -03:00
Archie 5a7af7c317 Specify? 2021-06-14 00:41:33 -03:00
Archie 4917acf373 Don't need to specify. 2021-06-14 00:41:04 -03:00
Archie 8073f77d69 Threshold, broadcast 2021-06-14 00:40:03 -03:00
Dahlular 9c791672ad Merge pull request #1264 from ArchieBeepBoop/mimicplayer
More mimic changes.
2021-06-13 19:40:35 -06:00
Archie bcd46f7181 Description, sound. 2021-06-13 22:00:26 -03:00
Archie 76f9185fff Ability to heal, sound changes. 2021-06-13 21:56:44 -03:00
Archie d94d60e0b7 Mimics get thermal vision. 2021-06-13 21:05:35 -03:00
Dahlular 8fbf6e4434 Merge pull request #1263 from ArchieBeepBoop/mimicplayer
Mimic Player Handling
2021-06-13 14:43:31 -06:00
Dahlular 1a989a45b4 Merge pull request #1262 from ArchieBeepBoop/ghostchanges
Allows anything that's not a human or silicon to ghost
2021-06-13 14:42:40 -06:00
Dahlular 67a464a197 Merge pull request #1261 from ArchieBeepBoop/well-then
Should increase this timer a bit more...
2021-06-13 14:42:09 -06:00
Dahlular 55a58d1bcc Merge pull request #1244 from quotefox/dependabot/pip/tools/mapmerge2/pillow-8.2.0
Bump pillow from 8.1.1 to 8.2.0 in /tools/mapmerge2
2021-06-13 14:41:12 -06:00
Dahlular c797db237e Merge pull request #1259 from ArchieBeepBoop/crystalline-changes2
Small Crystalline Tendril Tweaks
2021-06-13 14:40:41 -06:00
Dahlular 255ff340f7 Merge pull request #1258 from ArchieBeepBoop/blacklistchanges
Blacklists Dust events from Layenia
2021-06-13 14:40:18 -06:00
Dahlular 8f785eb246 Merge pull request #1255 from ArchieBeepBoop/inconsistencies
Fixes code inconsistencies, Icons, Diner
2021-06-13 14:40:00 -06:00
Archie 9443877663 Mimic Player handling 2021-06-13 17:14:36 -03:00
Archie 4d1b608e9c silicon 2021-06-13 01:55:13 -03:00
Archie 5f100df030 ghost changes 2021-06-13 01:51:40 -03:00
Archie ebb2283741 Well well well 2021-06-12 21:13:42 -03:00
Dahlular 3afc6055a4 Merge pull request #1260 from ArchieBeepBoop/moremimic
Hilariously overworked mimic spawn logic
2021-06-12 04:07:48 -06:00
Archie c29e3137d8 Chaos chaos chaos 2021-06-12 07:03:35 -03:00
Archie 1dddefd11b aaaa 2021-06-12 07:01:57 -03:00
Archie da0016adaf Even more hideous logic 2021-06-12 06:59:48 -03:00
Archie 452256926c That too. 2021-06-12 05:40:06 -03:00
Archie 7b52b7fb92 LUDICROUS logic 2021-06-12 05:37:38 -03:00
Archie 45bf663e5a Merge remote-tracking branch 'upstream/master' into moremimic 2021-06-12 04:43:54 -03:00
Archie e3d1f7a5e0 event test 2021-06-12 04:43:48 -03:00
Archie 955b406266 right! 2021-06-12 01:28:03 -03:00
Archie d57b624b6c Balancing + reorg 2021-06-12 00:52:53 -03:00
Archie 85d6d20dbf blacklists dust from layenia 2021-06-11 23:08:13 -03:00
Dahlular 8cb3860020 Merge pull request #1237 from ArchieBeepBoop/apathy
Apathy Minor Revamp / Death moodlet tweak
2021-06-11 18:57:21 -06:00
ArchieBeepBoop 0dea745d05 Comment 2021-06-11 21:55:51 -03:00
ArchieBeepBoop 6e495567ce Update hyperstation/code/datums/mood_events/events.dm
Co-authored-by: Dahlular <55758850+Dahlular@users.noreply.github.com>
2021-06-11 21:54:52 -03:00
Dahlular b27a9496bf Merge pull request #1257 from ArchieBeepBoop/revchangesagain
Some Revenant Changes
2021-06-11 18:25:43 -06:00
Dahlular ec70f33ab7 Merge pull request #1256 from ArchieBeepBoop/mimic
Mimic behavioral changes + Runtime Fix
2021-06-11 18:24:40 -06:00
Archie 8a3d26fa26 Some rev changes 2021-06-11 21:15:31 -03:00
Archie dd13eebde4 That too. 2021-06-11 21:02:48 -03:00