Commit Graph

7728 Commits

Author SHA1 Message Date
Fox-McCloud
42cf53a30f Merge remote-tracking branch 'upstream/master' into instruments 2017-07-04 17:42:24 -04:00
Fox-McCloud
549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Fox McCloud
352094ae21 Merge pull request #7669 from Vivalas/sec_hud
Tweaks SecHUDs
2017-07-04 14:56:43 -04:00
tigercat2000
c2b3b1adaa Merge pull request #7682 from Fox-McCloud/radio-jammer
Adds Radio Jammers
2017-07-04 11:33:40 -07:00
tigercat2000
1ae7f2930c Merge pull request #7689 from Fox-McCloud/thats-the-power-of-love
🎵 That's the Power of Love🎵
2017-07-04 11:15:32 -07:00
Crazy Lemon
a276d1a49a Merge pull request #7684 from Citinited/m-m-m-my-coroner
Adds a plasmaman suit for coroners, geneticists, and virologists
2017-07-04 11:11:35 -07:00
Fox-McCloud
0b8e61e2cc Instruments Refactor and Electric Guitars 2017-07-02 03:52:42 -04:00
fludd12
58520a69a9 Fixes two things 2017-07-02 01:30:25 -04:00
Fox-McCloud
4492b5ece3 That's the Power of Love~ 2017-07-01 22:07:44 -04:00
Citinited
8bc0eff40c Adds the virologist and geneticist plasmaman suits 2017-07-02 02:40:58 +01:00
Citinited
16dbf9012c Adds a plasmaman suit for coroners 2017-07-01 17:54:20 +01:00
Fox-McCloud
04b9394d34 last tweaks 2017-07-01 01:44:02 -04:00
Fox-McCloud
bf7b43ded5 Merge remote-tracking branch 'upstream/master' into embedding 2017-07-01 01:03:04 -04:00
Fox-McCloud
08c8ba569c Adds Radio Jammers 2017-06-30 18:20:21 -04:00
tigercat2000
96bd0b80e0 Merge pull request #6516 from fludd12/Grey-Rework
Grey Rework
2017-06-30 08:29:31 -07:00
fludd12
61ac035415 Fixes the last fixes of the last fixes
frick why
2017-06-30 01:00:06 -04:00
fludd12
b33750ece8 Fixes the last fixes 2017-06-29 17:24:57 -04:00
Vivalas
afce15fe3d Sechud t w e a k 2017-06-29 14:17:02 -05:00
fludd12
933d7e9780 Fixes the last things 2017-06-29 00:45:04 -04:00
Fox-McCloud
e8bbe783c6 arm augments 2017-06-28 17:01:34 -04:00
Fox-McCloud
585db8ba28 Breathing Tube Augment 2017-06-27 23:02:48 -04:00
Fox McCloud
6a893c6cd8 Merge pull request #7642 from ProperPants/Plasma-Viro-Suit
Gave plasmaman virologists a medical plasma suit
2017-06-27 15:31:21 -04:00
tigercat2000
add07e305c Merge pull request #7595 from Fox-McCloud/augmenting-and-selection
Adds in Limb Augmentation and Limb Company Selection
2017-06-27 12:28:16 -07:00
Fox McCloud
12a1e27f1f Merge pull request #7576 from SamHPurp/adds-door-vore
Alters the AI's chat message OPEN link
2017-06-27 14:30:54 -04:00
ProperPants
1b49324a1e Gave plasmaman virologists a medical plasma suit 2017-06-26 21:22:59 -04:00
Fox McCloud
30c59c3bd2 Merge pull request #7204 from Crazylemon64/tk_refactor
Tk refactor+Remote tool use
2017-06-26 16:55:04 -04:00
tigercat2000
53691bdd35 Merge pull request #7586 from SamHPurp/Coroners-have-a-stronger-stomach
Stops Coroners from barfing while doing autopsies...
2017-06-26 10:28:56 -07:00
tigercat2000
1efb389f06 Merge pull request #7639 from Kyep/priority_slots_fix
Fixes #7630 - job priority outlasting slots being filled
2017-06-26 10:21:15 -07:00
Sam
880c2d2a17 Fixes formatting issue 2017-06-26 18:15:23 +01:00
tigercat2000
da6eb3a90e Merge pull request #7631 from Kyep/drone_playtime
Adds 10h playtime requirement to drones
2017-06-26 09:57:48 -07:00
Kyep
2f01965808 Fixes #7630
🆑 Kyep
fix: Prioritized jobs now lose their priority status once all their
slots are filled. In the event someone with a formerly prioritized job
cryos, the HoP may want to re-prioritize the job.
/ 🆑

Fixes #7630
Prevents prioritized jobs, even after being filled, from being listed in
green on the new_player screen for the rest of the round.
2017-06-25 18:17:04 -07:00
MarcellusPye
2f2da1e63b Add Vulpkanin emotes to *help
Because @Allfd forgot to in merge #7110.
2017-06-25 12:06:25 +12:00
Kyep
410c365e52 Adds 10h playtime requirement to drones
Drones are essentially mini engineering borgs, with the ability to run
under objects, ventcrawl, ignore the AI and respawn themselves. Given
that we have playtime requirements for borgs, we really should have
playtime requirements for these too.
Also, this change was requested by Neca.

🆑 Kyep
add: Playing as a drone now requires 10h of playtime.
fix: Admin-ghosts can now interact with (ie: activate) the drone fab
without having to spawn in as engineer to do so.
/ 🆑
2017-06-24 15:40:25 -07: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
Crazylemon64
1a06d47a02 Fawkes 2017-06-22 23:25:00 -07:00
Crazylemon64
72841c9e70 Refactors TK to work a bit more consistently
Also allows remote stack manipulation shenanigans
2017-06-22 23:24:37 -07: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
Fox-McCloud
f41df2ae72 Adds in Limb Augmentation and Limb Company Selection 2017-06-20 05:28:35 -04: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
37835ca4ff nerfs ipecac 2017-06-19 18:10:16 +01:00
Sam
ab8d5d8ff5 here we goooooooooo again 2017-06-19 13:54:41 +01:00
Sam
b1a0f351d5 Changes the OPEN link to just O 2017-06-18 06:45:52 +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