Fox-McCloud
42cf53a30f
Merge remote-tracking branch 'upstream/master' into instruments
2017-07-04 17:42:24 -04:00
MarcellusPye
1a2db2b146
Initial Change
2017-07-05 08:12:08 +12:00
Crazy Lemon
eab996d107
Merge pull request #7678 from Fox-McCloud/misc-fixes
...
Icon Fixes
2017-07-04 13:01:23 -07: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
fef7abc867
Merge pull request #7672 from Fox-McCloud/syndicate-bomb-refactor
...
Refactors Syndicate Bombs and Adds Chemical Bombs
2017-07-04 11:53:55 -07:00
tigercat2000
c2b3b1adaa
Merge pull request #7682 from Fox-McCloud/radio-jammer
...
Adds Radio Jammers
2017-07-04 11:33:40 -07:00
tigercat2000
2f26479672
Merge pull request #7687 from Kyep/ert_magboots
...
Gives Red/Gamma ERTs magboots
2017-07-04 11:16:38 -07:00
Crazy Lemon
4b0d5c9a17
Merge pull request #7674 from Citinited/liquid-dispenser-hotkeys
...
Hotkeys for liquid dispensers!
2017-07-04 11:15:15 -07:00
Crazy Lemon
b8d5d530b4
Merge pull request #7690 from Aurorablade/VeryImportentMedicalGear
...
Adds in an importent piece of medical gear
2017-07-04 11:08:56 -07:00
Crazy Lemon
c69a8c4f70
Merge pull request #7677 from Aurorablade/TeleportFix
...
Hand Tele bug fix
2017-07-03 14:08:43 -07:00
Fox-McCloud
0b8e61e2cc
Instruments Refactor and Electric Guitars
2017-07-02 03:52:42 -04:00
Aurorablade
97252cd2f8
MEdicalgear
2017-07-01 22:55:40 -04:00
Kyep
ae409eb3d6
Tweaks boots
2017-07-01 17:40:22 -07:00
Kyep
5cc9570f33
Gives Red/Gamma ERTs magboots
2017-07-01 16:10:39 -07: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
8e9eae8341
other "radios"
2017-07-01 00:14:36 -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
Fox-McCloud
426c39ef3f
Icon Fixes
2017-06-30 03:21:12 -04:00
Aurorablade
70b1a0c826
bugfix
2017-06-30 03:16:12 -04:00
Citinited
c9e561fde2
AIs and cyborgs now have hotkeys to more easily activate liquid dispensers
...
Ctrl-click = toggle on
Alt-click = dispense liquid if on
2017-06-30 04:12:24 +01:00
Fox-McCloud
5bc6e36756
helpers
2017-06-29 20:14:29 -04:00
Fox-McCloud
d3b04e2638
oops
2017-06-29 20:10:13 -04:00
Fox-McCloud
b664f73a68
chemical bombs
2017-06-29 20:02:27 -04:00
Fox-McCloud
bcda610cc0
Refactors Syndicate Bombs
2017-06-29 18:10:58 -04:00
Kluys
04b02435fb
Bob ross painting
...
While trying to fix my github accidentally closed https://github.com/ParadiseSS13/Paradise/pull/7629 from the shell.
Redid the entire PR.
Changes remained the same
🆑 Kluys
Add: Bob ross painting in the captains office called "calming painting".
Also changes around the entertainment monitor and light switch to accomodate.
Fix: Clown painting was named "\improper mech painting"
/ 🆑
2017-06-29 21:28:04 +02:00
Vivalas
afce15fe3d
Sechud t w e a k
2017-06-29 14:17:02 -05: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
tigercat2000
2c935a9a31
Merge pull request #6940 from Citinited/pipe-dreams-travis-woo
...
Adds the Rapid Pipe Dispenser (RPD)
2017-06-27 13:32:59 -07:00
Fox McCloud
738e529208
Merge pull request #7634 from Aurorablade/Victorian
...
Phantasmic Dreams Victorian Clothing
2017-06-27 16:31:23 -04:00
Crazy Lemon
2679b234e6
Merge pull request #7159 from FlattestGuitar/soul-stone-electric-boooogllgsdglgl
...
Makes Chaplain soulstones opt-in 👻
2017-06-27 12:57:12 -07:00
Fox McCloud
260385b1f6
Merge pull request #7543 from Kyep/gamma_pod
...
Updates Gamma Ship
2017-06-27 15:28:41 -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
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
46dcfe3190
Merge pull request #7619 from SamHPurp/buff-barbers
...
QOL improvement for antag barbers
2017-06-27 11:27:40 -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
9561a4a645
Merge pull request #7627 from Kyep/job_priority_v2
...
Allows head jobs to be prioritized
2017-06-26 10:17:09 -07: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
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
Citinited
8931a06936
Crazylemon changes
2017-06-24 08:08:55 +01: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
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
