Commit Graph

156 Commits

Author SHA1 Message Date
Dip
c0e6f28077 found the issue 2020-10-08 16:37:43 -03:00
Dahlular
2d3ed9da8a Merge pull request #563 from ArchieBeepBoop/actualpool
POOL
2020-10-07 19:37:44 -06:00
Dahlular
12bf86ed76 Merge pull request #561 from ArchieBeepBoop/patch
Eldritch Affairs Patch
2020-10-07 19:34:19 -06:00
Ghom
779cc787a3 Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL
2020-10-07 18:40:10 -03:00
Dip
aea562bbe9 Eldritch Affairs Patch 2020-10-07 05:50:53 -03:00
Dip
aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
Dip
e7fcbd07cb monkeys holding monkeys 2020-10-05 09:57:07 -03:00
Lin
51d2913161 more refactor 2020-10-05 09:52:18 -03:00
kevinz000
399daa1b20 Merge pull request #11117 from Citadel-Station-13/Ghommie-patch-1 2020-10-05 09:49:17 -03:00
kevinz000
75349d9119 Merge pull request #11040 from Ghommie/Ghommie-cit573
Further mob holder fixes.
2020-10-05 09:45:09 -03:00
QuoteFox
631090cf04 Dynamic glidespeed
ported from yogstation
2020-10-05 03:58:10 +01:00
QuoteFox
5e298aac96 Merge pull request #549 from ArchieBeepBoop/moveforce
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-05 02:59:39 +01:00
Dahlular
811db42beb Revert "Mob_holder and examine microopt" 2020-10-04 10:59:45 -06:00
Dahlular
eb81411d66 Merge pull request #545 from ArchieBeepBoop/mobholders
Mob_holder and examine microopt
2020-10-04 03:11:32 -06:00
Dahlular
278cfd549a Merge pull request #535 from ArchieBeepBoop/maptweaks
Map Tweaks + New Ghost Role
2020-10-04 03:10:17 -06:00
kevinz000
b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
Dip
09e5f1464f perf opt 2020-10-03 01:14:42 -03:00
Dahlular
76f9c30103 Merge pull request #543 from ArchieBeepBoop/mobholders
Ghost_Role_Eligibility Updates & LL Mob Spawn Updates
2020-10-02 18:37:24 -06:00
Dip
5c552abe6e Ghost_Role_Eligibility Updates & LL Mob Spawn Updates 2020-10-02 21:33:03 -03:00
Dahlular
de98ccfa83 Merge pull request #539 from ArchieBeepBoop/mobholders
Enter the Elements System
2020-10-02 17:00:15 -06:00
Dip
fbbdfdfeb4 a 2020-10-02 19:49:58 -03:00
Dip
461cd2b042 getting micro to work again 2020-10-02 19:46:12 -03:00
Dip
4d39d175c4 partially enable micro holding 2020-10-02 14:40:10 -03:00
Dip
2580196fc1 area blacklist 2020-10-02 03:18:23 -03:00
Dip
0c9bc3e9d7 src fix 2020-10-02 02:22:47 -03:00
kevinz000
f318dbe1b2 Merge pull request #10881 from Ghommie/Ghommie-cit552 2020-10-02 02:14:44 -03:00
Lin
730307bc05 Merge pull request #10874 from Citadel-Station-13/Ghommie-patch-6
Fixes the petting element.
2020-10-02 01:18:00 -03:00
Lin
0fc4cbeff5 Merge pull request #10047 from Ghommie/Ghommie-cit425
Turns dog/cat petting into an element datum.
2020-10-02 01:17:25 -03:00
kevinz000
014bc3e026 Merge pull request #10046 from Ghommie/Ghommie-cit424
Ports flag for bespoke elements.
2020-10-02 00:51:46 -03:00
Lin
ac25b449f7 Merge pull request #9856 from Ghommie/Ghommie-cit367 2020-10-02 00:49:56 -03:00
Ghom
20c30a15d1 Merge pull request #10597 from Putnam3145/player-panel-can-reenter
Ghost role eligibility activation in player panel
2020-10-01 23:13:20 -03:00
Ghom
b433eab324 Merge pull request #10350 from Putnam3145 2020-10-01 23:04:52 -03:00
kevinz000
4714bd9012 initial element 2020-10-01 22:36:19 -03:00
Archie
7a5ef569b6 Radiation Shutters + Micro Opts + Engine Weight 2020-09-30 03:51:53 -03:00
Dip
97060b267a Map Tweaks + New Duo Hermit Ghost Role 2020-09-29 05:08:01 -03:00
QuoteFox
fb53009ce0 Merge pull request #532 from TotallyNotADog/fixMusician
removes quirk shitcode
2020-09-29 02:41:46 +01:00
Dip
3cd86a33c6 Radiation Update Port 2020-09-28 22:18:29 -03:00
Unknown
1127553e87 removes quirk shitcode 2020-09-28 19:48:04 -05:00
Ghom
d17d5a1ed0 Merge pull request #10744 from r4d6/Moar-Engines
Moar engines!
2020-09-27 14:36:04 -03:00
Putnam3145
c983e3662b a 2020-09-27 14:33:13 -03:00
Dip
6ca9ab451b stupid typo 2020-09-27 01:47:49 -03:00
QuoteFox
cfd822170f Merge pull request #502 from ArchieBeepBoop/hunter2
Cursed Blood Trait (fixed)
2020-09-27 05:35:43 +01:00
Dip
caa288de49 fixes medical record formatting 2020-09-27 00:57:41 -03:00
Lin
09cbc115b6 Medical and security records 2020-09-26 21:23:20 -03:00
QuoteFox
bf62c2fa78 Merge pull request #515 from ArchieBeepBoop/lavahermit2
Properly Airtight Lavaland Hermit + low cost
2020-09-26 23:04:44 +01:00
Dip
5a1930e213 properly airtight hermit + low cost 2020-09-26 14:07:03 -03:00
Dip
d9b37ab1d1 radiation affects mobs again 2020-09-25 16:04:27 -03:00
Dip
bf11aa68dc fix 2020-09-25 11:00:36 -03:00
Dahlular
a6648fa822 Revert "Cursed Blood Trait" 2020-09-25 06:23:51 -06:00
Dahlular
99065c9f92 Merge pull request #494 from ArchieBeepBoop/hunter
Cursed Blood Trait
2020-09-25 06:11:24 -06:00