FlattestGuitar
bda736fb7c
Merge branch 'master' into PAIN
2017-06-27 21:18:17 +02:00
tigercat2000
fb83d58607
Merge pull request #7436 from Alexshreds/emp
...
Radio EMP
2017-06-27 12:02:03 -07:00
tigercat2000
13a862be02
Merge pull request #7556 from SamHPurp/couple-more-random-variants
...
Adds random colours on cable cuffs & crayons, and the ability for flashes to start burnt out
2017-06-27 11:41:27 -07:00
tigercat2000
e238e5b7bc
Merge pull request #7565 from imsxz/removes-singualrity-beacon-from-surplus-crate
...
Removes singularity beacon from surplus crate
2017-06-27 11:37:50 -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
tigercat2000
46dcfe3190
Merge pull request #7619 from SamHPurp/buff-barbers
...
QOL improvement for antag barbers
2017-06-27 11:27:40 -07:00
tigercat2000
01826822dc
Merge pull request #7622 from SamHPurp/move-water-coolers
...
Enables Water Coolers to be movable
2017-06-27 11:26:26 -07: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
tigercat2000
9561a4a645
Merge pull request #7627 from Kyep/job_priority_v2
...
Allows head jobs to be prioritized
2017-06-26 10:17:09 -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
Kyep
6810e5f57e
Fixes #7635
2017-06-25 14:20:32 -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
Kyep
3487d34b3b
Splits blacklist
2017-06-24 01:55:58 -07:00
Sam
18709afd73
CMO can demote coroners
...
Looks like an issue with conflict resolution in the past that this got missed.
2017-06-24 07:32:19 +01:00
tigercat2000
4de7b36268
Merge pull request #7582 from Kyep/dust_implant_fix
...
Fixes dust implants
2017-06-23 23:31:15 -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
Crazy Lemon
a77da398c1
Merge pull request #7618 from Kyep/admin_telecomms
...
Allows admins to edit telecomms without having to spawn a mob
2017-06-23 09:24:44 -07:00
Sam
560975b638
pedantry
2017-06-23 15:47:37 +01:00
Sam
4eeb706462
makes water coolers movable
2017-06-23 13:22:11 +01:00
Sam
b69835e0e5
buffs scissors
2017-06-23 09:36:53 +01:00
Kyep
856499febf
Allows admins to edit telecomms without having to spawn a mob
2017-06-23 01:32:45 -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
Crazylemon64
4f402614ec
Absolute paths for TK
2017-06-22 23:24:36 -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
Crazy Lemon
13bceae762
Merge pull request #7590 from SamHPurp/RCD-multiple-airlocks
...
Fixes RCDs placing multiple airlocks on a single tile
2017-06-22 17:47:42 -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
tigercat2000
cfcbf534e8
Kill the stun
2017-06-21 06:16:26 -07:00
Fox McCloud
94ad151d19
Merge pull request #7588 from SamHPurp/loadout-names
...
Makes a loadout message public-friendly
2017-06-21 06:31:12 -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
Sam
89b48eaad3
Stops RCD from placing infinite airlocks on a single tile
2017-06-20 03:42:21 +01:00
Vivalas
88f32290fc
Fixes bed offset
2017-06-19 20:45:20 -05: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
Sam
7e1933ba1d
sanitises chat msg
2017-06-20 02:09:06 +01:00
tigercat2000
5549aa7ddc
Merge pull request #7574 from Fox-McCloud/radiation-fixes
...
Radiation Fixes and Refactor
2017-06-19 17:58:18 -07:00
FlattestGuitar
9d58e039a4
fixes hub entry
2017-06-19 21:51:12 +02:00
tigercat2000
a3d79e6ca1
Fix compile
2017-06-19 11:06:28 -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
050b676536
more unnecessary code, also QDEL_LIST_ASSOC_VAL is cool
2017-06-19 12:34:31 +01:00
