05ae1b304a
Cid randomizer check no longer triggers if the user's cid changes once then changes back ( #36887 )
...
* Cid randomizer check no longer triggers if the user's cid changes once then changes back
Normally, we only check for the randomizer if their cid changed from their last allowed connection. In some edge cases, somebody's cid can be different from a one time glitch, then change back on the next connection.
We now detect such cases and allow the connection.
* Update client_procs.dm
* Update client_procs.dm
2018-04-02 08:26:55 -05:00
7de2934a26
Merge pull request #6210 from Citadel-Station-13/upstream-merge-36834
...
[MIRROR] Removes advanced darkness
2018-04-02 06:58:18 -05:00
66420d8504
Merge pull request #6116 from cebutris/moreminerloot
...
adds lavaknight corpses to legion drops
2018-04-02 05:47:30 -05:00
9045de2c90
Merge pull request #6204 from Citadel-Station-13/upstream-merge-36873
...
[MIRROR] Comms console fix - no more refreshing every 2 seconds while trying to purchase a shuttle.
2018-04-02 05:41:19 -05:00
af2cc17248
Merge pull request #6232 from Citadel-Station-13/upstream-merge-36886
...
[MIRROR] servant blockers no longer glitch out when deleted without force
2018-04-02 05:39:55 -05:00
daf2e6efa7
Merge pull request #6231 from Citadel-Station-13/upstream-merge-36721
...
[MIRROR] Fix crafting tools tooltips
2018-04-02 05:23:50 -05:00
242fd0556d
Merge pull request #6230 from Citadel-Station-13/upstream-merge-36875
...
[MIRROR] adds a sprite to the "show roundend report" button
2018-04-02 05:22:20 -05:00
91f9596eec
damnit ( #36886 )
2018-04-02 02:13:03 -05:00
dc7585fabf
[MIRROR] Moves quick equip hotkey up to /mob ( #6229 )
...
* Moves quick equip hotkey up to /mob
* Merge pull request #36869 from RandomMarine/e
Moves quick equip hotkey up to /mob
2018-04-02 01:36:42 -05:00
4c97bc84e7
Merge pull request #36721 from GrayRachnid/fix-crafting-tools
...
Fix crafting tools tooltips
2018-04-01 22:02:46 -05:00
b87addc531
adds a sprite to the "show roundend report" button ( #36875 )
...
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089 )
* bingo bongo i dont wanna leave the congo i REFUSE to go
* wjhon approval
2018-04-01 21:51:08 -05:00
a9c91b4d00
Merge pull request #6127 from Citadel-Station-13/upstream-merge-36689
...
[MIRROR] Hotfix for #36688 - Excludes non-carbon-based life from the disco machine's dance4 proc to fix pAI "resting/getting up" chat spam
2018-04-01 19:51:58 -05:00
022ac2e6c3
Merge pull request #6178 from Citadel-Station-13/shit
...
sanity
2018-04-01 19:51:39 -05:00
7682dd2a7f
Merge pull request #6188 from Citadel-Station-13/upstream-merge-36822
...
[MIRROR] Fixes monkey retaliation from beyond the grave
2018-04-01 19:51:17 -05:00
a5ec18d566
Merge pull request #6185 from Citadel-Station-13/upstream-merge-36816
...
[MIRROR] Fixes mutant bodypart assignments
2018-04-01 19:50:58 -05:00
dd579e35bc
Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548
...
[MIRROR] Added a new ability to sentient diseases
2018-04-01 19:50:43 -05:00
28e188cbbe
Merge pull request #6169 from Citadel-Station-13/upstream-merge-36722
...
[MIRROR] Fix 512-only code in recent conveyor belt fix
2018-04-01 19:49:55 -05:00
31bb211cb3
Update communications.dm
2018-04-01 19:48:15 -05:00
57ed2fcb70
Merge pull request #6215 from Citadel-Station-13/iconstate
...
icon state fix for TechDemon core
2018-04-01 17:48:13 -05:00
661f8b3468
Merge pull request #6217 from Citadel-Station-13/upstream-merge-36851
...
[MIRROR] Adds singular_name to BS polycrystals
2018-04-01 17:47:37 -05:00
b6873e9bd4
Merge pull request #6219 from Citadel-Station-13/upstream-merge-36857
...
[MIRROR] you can now walk through abductor table frames
2018-04-01 17:47:07 -05:00
982eef4158
Merge pull request #6227 from Citadel-Station-13/upstream-merge-36524
...
[MIRROR] Walls made entirely of wood!
2018-04-01 17:46:45 -05:00
7d1746a84a
Merge pull request #6226 from Citadel-Station-13/upstream-merge-36865
...
[MIRROR] adds a "the" to robo's supervisor in job description
2018-04-01 17:46:22 -05:00
2177a51a09
Merge pull request #6225 from Citadel-Station-13/upstream-merge-36856
...
[MIRROR] The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed
2018-04-01 17:46:03 -05:00
f5b2315531
Merge pull request #6223 from Citadel-Station-13/upstream-merge-36885
...
[MIRROR] Fixes revenants being unable to siphon after failing a siphon
2018-04-01 17:45:41 -05:00
a11f0c4eb7
Merge pull request #6222 from Citadel-Station-13/upstream-merge-36829
...
[MIRROR] [s]Minor Refactor of click code, anti-auto clicker protection
2018-04-01 17:45:21 -05:00
64705aaf07
Merge pull request #6221 from Citadel-Station-13/upstream-merge-36864
...
[MIRROR] Cleaned up tile pointer circuit and converted to absolute coordinates
2018-04-01 17:45:04 -05:00
954027e16d
Merge branch 'master' into upstream-merge-36722
2018-04-01 17:44:41 -05:00
6b50b35897
Merge pull request #6140 from Citadel-Station-13/upstream-merge-36743
...
[MIRROR] Fixes modular computer ui_interact runtime
2018-04-01 17:41:34 -05:00
9bb405d27c
Merge pull request #6147 from Citadel-Station-13/upstream-merge-36738
...
[MIRROR] Nutriment can get you fat again.
2018-04-01 17:40:38 -05:00
c4ac6e63f7
Update combat.dm
2018-04-01 17:39:41 -05:00
5c817dfd01
Update humans.dm
2018-04-01 17:39:26 -05:00
d63ff01364
Update components.dm
2018-04-01 17:38:50 -05:00
7826515aed
Walls made entirely of wood! ( #36524 )
...
* Buffs Lifebringers (And kind of botany.)
* Retools staff to use earthsblood as fuel, can now remove rock walls
* No more blessings!
* Dismantle the means of production.
2018-04-01 12:24:33 -05:00
4d0df4ab16
Merge pull request #36865 from factoryman942/master
...
adds a "the" to robo's supervisor in job description
2018-04-01 11:16:57 -05:00
9b8ca10da2
Merge pull request #36856 from iskyp/resin+egg
...
The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed
2018-04-01 11:11:38 -05:00
a18aec6fa5
Fixes revenants being unable to siphon after failing a siphon
2018-04-01 08:33:39 -05:00
ae61521e67
Merge pull request #36829 from MrStonedOne/onclick_rework
...
[s]Minor Refactor of click code, anti-auto clicker protection
2018-04-01 08:24:12 -05:00
cf3826f3bf
Merge pull request #36864 from robbym/master
...
Cleaned up tile pointer circuit and converted to absolute coordinates
2018-04-01 08:19:52 -05:00
7e639116f6
Merge pull request #36857 from iskyp/ayytableframes
...
you can now walk through abductor table frames
2018-04-01 07:33:14 -05:00
76a9540f80
Merge pull request #36851 from 81Denton/bs-polycrystal-name
...
Adds singular_name to BS polycrystals
2018-04-01 07:27:45 -05:00
70264c238b
icon state fix
2018-04-01 06:18:26 -05:00
f9d963a634
Update _lists.dm
2018-04-01 04:40:47 -05:00
88f328651f
Update food_reagents.dm
2018-04-01 04:39:21 -05:00
610a001ad5
Update computer_ui.dm
2018-04-01 04:37:57 -05:00
75a49c53c8
Fixes dogborg sitting ( #6112 )
2018-04-01 04:06:10 -05:00
17e92ca86b
Merge pull request #6152 from Citadel-Station-13/upstream-merge-36734
...
[MIRROR] Colossus projectile runtime removal
2018-04-01 01:03:46 -05:00
bd28b80a10
Merge pull request #6182 from Citadel-Station-13/upstream-merge-36838
...
[MIRROR] AIFixer no longer updates overlays on every process()
2018-04-01 01:03:33 -05:00
c19f285322
Merge pull request #6179 from Citadel-Station-13/upstream-merge-36807
...
[MIRROR] Fixes some edge cases with chameleon projectors and sleepers
2018-04-01 01:03:10 -05:00
24d4b310cd
Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147
...
[MIRROR] [READY] ~SPELL CARDS~, homing projectiles, and more!
2018-04-01 01:01:55 -05:00
Kyle Spier-Swenson