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
e93e4ef090
IPC arm recharger mechfab
2017-07-04 15:28:14 -04:00
Fox McCloud
2d6157dc12
Merge pull request #7653 from Kyep/gimmick_teams_v2
...
Gimmick Team improvements
2017-07-04 15:08:09 -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
Crazy Lemon
c34bb8c53f
Merge pull request #7681 from Birdtalon/traitoechem
...
Gives traitor medical chemists access to the poison bottle uplink item.
2017-07-04 11:18:08 -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
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
4b0d5c9a17
Merge pull request #7674 from Citinited/liquid-dispenser-hotkeys
...
Hotkeys for liquid dispensers!
2017-07-04 11:15:15 -07:00
Crazy Lemon
460f0704b6
Merge pull request #7675 from Ionward/GreySpriteMania
...
grey sprite overhaul
2017-07-04 11:13:41 -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
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
fludd12
58520a69a9
Fixes two things
2017-07-02 01:30:25 -04:00
Aurorablade
97252cd2f8
MEdicalgear
2017-07-01 22:55:40 -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
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
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
Ionward
5de53b72b4
fixes missing medical breathmask and syndihelm
...
ye boy
2017-06-30 21:31:15 -07: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
Birdtalon
7207de2d33
Re-ordered the list
2017-06-30 22:19:31 +01:00
Lee Brandon
706e552a92
Updated uplink_item.dm to allow medical chemist access to traitor poison bottle.
2017-06-30 21:12:23 +01:00
tigercat2000
96bd0b80e0
Merge pull request #6516 from fludd12/Grey-Rework
...
Grey Rework
2017-06-30 08:29:31 -07:00
Ionward
4f0b4f78e3
Grey Sprite Overhaul
...
[First time I've done this, bare with me]
Overhauled existing and added new sprites for Grey heads (helmets,
masks, and glasses), and enables more Grey sprites.
((is this how i update a pr oh god))
2017-06-30 02:28:41 -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
fludd12
61ac035415
Fixes the last fixes of the last fixes
...
frick why
2017-06-30 01:00:06 -04:00
Ionward
37a246e511
grey sprite overhaul
...
overhauled existing and added new sprites for grey heads (helmets,
masks, and glasses) [first time i've done this, bare with me]
2017-06-29 21:37:22 -07: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
fludd12
b33750ece8
Fixes the last fixes
2017-06-29 17:24:57 -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
fludd12
933d7e9780
Fixes the last things
2017-06-29 00:45:04 -04:00
tigercat2000
f910683028
Merge pull request #7663 from Fox-McCloud/limb-aug-open
...
Fixes Limb Augmentation Open Wound
2017-06-28 21:39:50 -07:00
Fox-McCloud
5ae7510038
Fixes Limb Augmentation Open Wound
2017-06-29 00:27:45 -04:00
tigercat2000
f297ecc757
Merge pull request #7659 from Fox-McCloud/ipc-head-fix
...
Fixes IPC Heads
2017-06-28 20:20:57 -07:00
