Fox McCloud
e6a71ce580
Merge pull request #7135 from IK3I/Don't-Let-Your-Memes-Be-Dreams
...
Fixes #7124 and Adds more Xenomorph emotes
2017-04-22 23:53:56 -04:00
Fox McCloud
61e94d0a03
Merge pull request #7141 from tigercat2000/karma_disable
...
Add config option to completely disable karma
2017-04-22 23:47:03 -04:00
Fox McCloud
6905b75e45
Merge pull request #7148 from Tayyyyyyy/spacepod_verbs
...
Prevent incapacitated people from using space pod verbs
2017-04-22 23:30:38 -04:00
Tayyyyyyy
8d512e7554
Inline incapacitated check
2017-04-22 22:05:53 -05:00
Tayyyyyyy
53bff427f7
Prevent incapacitated people from using space pod verbs
2017-04-21 23:37:44 -05:00
Tigercat2000
a7506f0aa6
Add config option to completely disable karma
2017-04-21 17:06:43 -07:00
Fox McCloud
ba332730a8
Merge pull request #7140 from Crazylemon64/module_capitalization_fix
...
Fixes capitalization of the VR module path
2017-04-21 17:23:21 -04:00
IK3I
66b3b8bafb
Kills the dream
...
Also makes noise emitting emotes actually use the sounds they're
associated with and adds a cd to the sound emitting emotes.
2017-04-21 15:59:59 -05:00
Crazylemon64
0acb3e051f
Fixes capitalization of the VR module path
2017-04-21 13:50:28 -07:00
Fox McCloud
3387e4977f
Merge pull request #6596 from monster860/make_paradise_great_again
...
Player Polls Revamp
2017-04-21 16:40:25 -04:00
Crazy Lemon
27a27782fb
Merge pull request #7060 from alexkar598/alexkar598-patch-1
...
underwater fix
2017-04-21 12:20:30 -07:00
Crazy Lemon
fc1e84f042
Merge branch 'master' into make_paradise_great_again
2017-04-21 11:32:47 -07:00
Crazy Lemon
327f89c890
Merge pull request #6950 from Fox-McCloud/tesla-tweaks
...
Tesla Update
2017-04-21 09:52:23 -07:00
Crazy Lemon
67f72b2791
Merge pull request #7109 from Lady-Luck/syndibundles
...
Syndicate Bundle Adjustments
2017-04-21 09:25:38 -07:00
Crazy Lemon
fd5bbad4b1
Merge pull request #7055 from Twinmold93/deep-fry-me
...
Lethal Kitchen
2017-04-21 08:41:39 -07:00
Crazy Lemon
4b5e0343f2
Merge pull request #7133 from Anticept/master
...
Default Alternate Job Preferences Adjustment
2017-04-21 08:39:02 -07:00
Crazy Lemon
e7abc43dd8
Merge pull request #7122 from Spacemanspark/hoodie-of
...
Permits hoodies to carry flashlights
2017-04-20 21:23:21 -07:00
Twinmold
f016c46806
Past-TENSIFY the Logs
...
Bad joke. GG tiger.
2017-04-20 22:43:56 -05:00
IK3I
55e9de4954
Fixes an oversight for potential abuse
2017-04-20 21:04:11 -05:00
IK3I
9f7245fdf1
Fixes an oversight for potential abuse
2017-04-20 18:53:55 -05:00
IK3I
bd4458bc86
Fixes #7124 and improves on it
...
Adds an emote CD for flipping
Adds a new emote for all the flips!
2017-04-20 18:04:30 -05:00
CoreyLee Hassell
4691cd9f32
Default Alternate Job Preferences Adjustment
...
This changes the default alt job setting to return players to the lobby
if their job preferences are unavailable.
Reasoning:
- Random jobs should be an opt in, not an opt out, feature
- Typically,
new players can overlook this option or misunderstand what it means, and
end up in roles they may not have prepared themselves for.
- Being assigned a job that a person absolutely does NOT want means its
far less likely they will even do their job. We can only hope they cryo
in such cases. I'd rather just address one potential source of issues.
Potential cons:
- Might slightly reduce filling the less desireable jobs, but I think
the pros far outweight the cons.
This has NO effect on existing players, unless the admins decide to run
an SQL query. This ONLY affects new players.
🆑
Tweak: Default Alternate Job Preference changed to "Return to Lobby".
Only affects new players.
/🆑
2017-04-20 00:58:44 -04:00
Mark van Alphen
d786a78e2e
Merge branch 'master' into findnreplace
2017-04-19 20:41:05 +02:00
Fox McCloud
52068755d2
Merge pull request #7117 from IK3I/Chaplain-Fix
...
Adds Equip call for Chaplain's Bible
2017-04-19 05:57:42 -04:00
Fox McCloud
e8624b07f0
Merge pull request #7127 from Xantholne/CMOSkirtFix
...
Fixes Missing CMO Skirt
2017-04-19 05:20:48 -04:00
Tom Heeren
2f7f2af5eb
Re-adds the ability to carry oxygen tanks on your hoodie.
...
Oops.
2017-04-19 00:37:46 -05:00
Xantholne
56f4b1ca7a
Fixes missing CMO Skirt path
2017-04-18 23:35:55 -06:00
Crazy Lemon
18ffff09f4
Merge pull request #7026 from warior4356/Virtual-Avatars
...
VR Phase #1
2017-04-18 21:25:35 -07:00
Warior4356
acb31233e0
qdel added to console and return to roundstart
2017-04-18 02:22:51 -07:00
Tom Heeren
0451546231
Permits hoodies to carry flashlights
2017-04-17 22:12:19 -05:00
Crazy Lemon
35261c8e58
Merge pull request #7119 from Krausus/TheyreBiggerOnTheInside
...
Fixes missing storage limitations on matchboxes
2017-04-17 20:01:23 -07:00
Warior4356
d695d4e82a
Status Proc changes.
2017-04-17 17:52:39 -07:00
Fox McCloud
fa09b058d4
Merge pull request #7114 from KasparoVy/gemk-fix
...
GEMK Injector Fix
2017-04-17 03:11:54 -04:00
Krausus
4572ad6af4
Fixes matchboxes lacking storage limitations
2017-04-16 22:53:03 -04:00
Kyep
1d3de58510
Removes Obj & Turf reactions from Plasma Dust
...
🆑 Kyep
rscdel: Plasma dust no longer creates plasma gas on objects or turfs
during reactions.
/🆑
2017-04-16 18:24:03 -07:00
KasparoVy
dfeee91420
GEMK Injector Fix
...
I forgot to include this in the PR I wrote that added the 6 new UI
blocks. Woops!
Anyway, this fixes the GEMK injector.
This also fixes a bug where injecting yourself with a UI that affects
eye colour (i.e. GEMK) wouldn't actually change your eye colour unless
you injected yourself twice (to proc UpdateAppearance a second time,
when really all you needed was update_eyes to be called).
2017-04-16 19:56:19 -04:00
Fox McCloud
84885f1efa
Merge pull request #7007 from uraniummeltdown/glass
...
Heat Proofing Glass Airlocks
2017-04-16 17:55:10 -04:00
Fox McCloud
071b187268
Merge pull request #7097 from KasparoVy/sechaircol_genefix
...
Adds Secondary (Facial) Hair Colours to Genome
2017-04-16 17:50:07 -04:00
Fox McCloud
db18224eb0
Merge pull request #7090 from ZomgPonies/superheroes2
...
Superheroes update
2017-04-16 17:48:52 -04:00
Fox McCloud
ecba9d432f
Merge pull request #7099 from FlattestGuitar/floofpocalypse
...
Fluffpocalypse 🎉
2017-04-16 17:47:39 -04:00
Lady-Luck
b9274b6654
Reverts removal of the uplink implant to the implant bundle, instead just removes EMP and Microbomb.
2017-04-16 14:57:31 -05:00
Crazy Lemon
8aa8aeaa20
Merge pull request #7105 from KasparoVy/scream_at
...
Adds Targeting to Some Emotes, Cleans up Emotes Backend
2017-04-16 11:29:48 -07:00
Mieszko Jędrzejczak
22a753957d
Conflicts!
2017-04-16 19:21:20 +02:00
Crazy Lemon
c04e0634f8
Merge pull request #6867 from FalseIncarnate/potato
...
Collaborators are no longer clueless about Syndicate
2017-04-16 10:12:15 -07:00
Warior4356
78af5f62b9
Forgot to save
2017-04-15 22:38:28 -07:00
Lady-Luck
e767fdab8a
Changes the two red energy swords into a red double-bladed energy sword (reverted from commit 46d4c5b9c7)
2017-04-15 17:05:22 -05:00
Lady-Luck
46d4c5b9c7
Changes the two red energy swords into a red double-bladed energy sword
2017-04-15 16:19:01 -05:00
Lady-Luck
0d1179a54a
Adjusts syndicate bundles, adds Allies Cocktail object for bond bundle
2017-04-15 16:01:09 -05:00
IK3I
ce0adc54d9
Adds Equip call for Chaplain's Bible
2017-04-15 15:07:46 -05:00
FlattestGuitar
8978f1e530
Fluffpocalypse
2017-04-15 22:05:15 +02:00
