Commit Graph

16123 Commits

Author SHA1 Message Date
Kyep
782edee8a7 Makes reserach notes part of awaymission DM file 2017-07-10 03:16:56 -07:00
MarcellusPye
2f2da1e63b Add Vulpkanin emotes to *help
Because @Allfd forgot to in merge #7110.
2017-06-25 12:06:25 +12:00
Fox McCloud
cda06eeb07 Merge pull request #7110 from Allfd/no-human-vulp
Vulpkanin emotes
2017-06-24 02:07:38 -04:00
tigercat2000
93da786d0e Merge pull request #7584 from SamHPurp/slapping-electric-boogaloo
Applies a 2s cooldown to slapping
2017-06-23 19:16:44 -07:00
Crazy Lemon
a66a31ee83 Merge pull request #7589 from Vivalas/master
Fixes weird offset with beds when buckled.
2017-06-23 09:26:39 -07:00
Fox McCloud
19a932ddfa Merge pull request #7551 from Kyep/ga_smitebless
Changes Smite/Bless to require R_EVENT permissions
2017-06-23 01:08:52 -04:00
tigercat2000
3e379b8f36 Merge pull request #7460 from Crazylemon64/soullink_port
Soullink port + Cloning tweak
2017-06-22 16:30:42 -07:00
Fox McCloud
e83814d8f0 Merge pull request #7519 from tigercat2000/its_just_like_one_of_those_japanese_animes_TENTACLESSSSSSS
Combat Tentacles
2017-06-21 09:40:25 -04:00
Vivalas
84e3ce1b9a Integrates offset better 2017-06-20 17:30:42 -05:00
Sam
4817c841b0 Fixes 7564 2017-06-20 03:51:21 +01:00
Fox McCloud
3e065e730e Merge pull request #7554 from SamHPurp/more-qdel-nulls
Uses more QDEL_NULLs
2017-06-19 21:14:39 -04:00
tigercat2000
5549aa7ddc Merge pull request #7574 from Fox-McCloud/radiation-fixes
Radiation Fixes and Refactor
2017-06-19 17:58:18 -07:00
tigercat2000
4c07d792cd Combat Tentacles
New Changeling evolution, combat tentacles! 2 points, 10 chems per
tentacle formed.
2017-06-19 11:00:36 -07:00
Sam
ab8d5d8ff5 here we goooooooooo again 2017-06-19 13:54:41 +01:00
Sam
050b676536 more unnecessary code, also QDEL_LIST_ASSOC_VAL is cool 2017-06-19 12:34:31 +01:00
Fox-McCloud
2633e74192 Radiation Fixes and Refactor 2017-06-17 20:49:13 -04:00
Sam
1c996491dd Removes more unnecessary code
And revert of something that is just adding an unnecessary check by
doing the QDEL_NULL
2017-06-17 09:27:56 +01:00
Fox McCloud
d4217998a3 Merge pull request #7445 from MarcellusPye/Emote-Help-Fix
Emote help fix
2017-06-16 16:50:02 -04:00
Fox McCloud
39f363338a Merge pull request #7521 from Kyep/job_priority_system
Ports Job Priority System
2017-06-16 16:42:28 -04:00
tigercat2000
22bf113c89 Merge pull request #7528 from Fox-McCloud/fixes-speeds
Fixes speeds
2017-06-16 13:40:23 -07:00
tigercat2000
15984bbbaa Merge pull request #7531 from Fox-McCloud/spiderbot-refactor
Spiderbot Rework
2017-06-16 13:32:11 -07:00
Fox McCloud
06b4719961 Merge pull request #7529 from Aurorablade/ChaplainClothes
More Chaplain Clothes
2017-06-16 16:10:32 -04:00
alexkar598
07fac42712 Fixes issue 7505 (Rename Spagetti to Spaghetti) (#7516)
* rename spagetti to spaghetti

* Rename Spagetti to Spaghetti in the dmi file too

* trying to fix my things should learn to use git proporly one day

* commit
2017-06-16 16:08:02 -04:00
Fox McCloud
27cf06040d Merge pull request #7549 from Aurorablade/FloofyTail
Makes Jays old fluff tail public
2017-06-16 16:06:56 -04:00
Fox McCloud
c6076a7814 Merge pull request #7550 from SamHPurp/misc-fixes
Misc fixes
2017-06-16 15:51:16 -04:00
tigercat2000
fa0a5248ec Fix languages with apostrophes being unable to be made default 2017-06-16 05:10:52 -07:00
Sam
e6000d5e2b Fixes siemens_coefficient oversight 2017-06-15 01:57:50 +01:00
Sam
d0dde4f3d7 Uses more QDEL_NULLs 2017-06-15 00:49:00 +01:00
Kyep
0d87ef1591 PP, too 2017-06-14 04:12:00 -07:00
Kyep
ec3e3417ef Changes Smite/Bless to require game admin permissions 2017-06-14 04:03:40 -07:00
Sam
0560c5aa25 Additonal tweaks 2017-06-14 09:06:03 +01:00
Sam
767c156c61 More description pedentry 2017-06-14 08:43:50 +01:00
Sam
cf2162720d Typos, including fixes Soylent Viridians typo 2017-06-14 08:13:26 +01:00
Sam
86d8d288fa Fixes more typos and missing full stops in descs... 2017-06-14 08:06:31 +01:00
Sam
fca8a46c49 Fixes errant improper capitalised references 2017-06-14 08:00:18 +01:00
Aurorablade
719a7e1e67 lfoofytail 2017-06-14 02:56:13 -04:00
Sam
4d7cb2247e Fixes typos and gender pronouns 2017-06-14 06:20:05 +01:00
Sam
f971653760 Fixes duplicated 'the' on slip messages 2017-06-14 05:44:41 +01:00
Aurorablade
ef227542e0 typofix 2017-06-11 21:03:21 -04:00
MarcellusPye
536ddad052 Hear formatting fix (#7469)
* Initial Attempt

* Fixed ending formatting

* Make it work

Screw byond strings

* Switches from camelcase to lowercase

* Uses strip_html_properly
2017-06-11 03:17:32 -04:00
Fox-McCloud
4dd13f0074 tweak 2017-06-11 03:12:44 -04:00
Fox-McCloud
70bf8076c3 Spiderbot Rework 2017-06-11 02:58:50 -04:00
Aurorablade
9b0db44f47 fix 2017-06-10 22:36:49 -04:00
Fox-McCloud
ae5ac9c247 Fixes a few more Simple Mob Speeds 2017-06-10 17:46:06 -04:00
Kyep
5e5c1c4238 Makes pri jobs green in the latejoin list 2017-06-10 13:47:16 -07:00
Fox McCloud
da958cbe0b Merge pull request #7449 from SamHPurp/Intent-defines
Uses more intent defines
2017-06-10 15:09:17 -04:00
Citinited
c31b0fcadf Merge branch 'master' into bad-karma 2017-06-10 19:16:13 +01:00
Citinited
cc7c4869b9 Actually fixes karma upon end-round shuttle 2017-06-10 18:59:45 +01:00
Aurorablade
c371c2bee2 inital commi 2017-06-10 13:13:28 -04:00
Kyep
16acae3106 Ports Job Priority System
This system allows the HoP to set up to 3 jobs as 'priority' jobs via
the ID console.
Priority jobs are highlighted in green to everyone who is late-joining.

This allows the HoP to actively encourage late-arriving crew to take
jobs the station needs, avoiding departments/roles being critically
short-handed.

![](https://preview.ibb.co/esEEDF/job_priority_example.png)

🆑 Kyep
add: HoPs can now set jobs as 'priority'. Priority jobs are highlighted
on the latejoin screen. This allows HoPs to proactively broadcast that
they need more people to fill those jobs - and reduces the chance of
critical crew shortages.
/🆑
2017-06-10 03:15:02 -07:00