Commit Graph

16348 Commits

Author SHA1 Message Date
shazbot194
c9c3cf3527 Adds in the Jolly Jug
Due to my master exploding, I had to remake a couple of my PRs. This
pull adds in the Jolly Jug, the clown version of nothing. The clown
spawns with it and has a backup in their locker, just like the mime, in
addition it spawns with 100u of banana juice.
2017-07-05 17:36:30 -08:00
Fox-McCloud
6bc9c95042 target acquired: terminate 2017-07-05 17:04:02 -04:00
Fox-McCloud
641af24a2d Removes a bunch fo Spawns in Life 2017-07-05 16:32:22 -04:00
Fox-McCloud
b6a5ffd8ff Makes ListTargets Much Faster 2017-07-04 23:04:20 -04:00
Fox-McCloud
40e5123e42 Darts no longer proc reaction 2017-07-04 21:04:56 -04:00
Fox-McCloud
42cf53a30f Merge remote-tracking branch 'upstream/master' into instruments 2017-07-04 17:42:24 -04:00
Fox-McCloud
354cc6a987 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-04 17:17:09 -04: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
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
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
Fox-McCloud
0b8e61e2cc Instruments Refactor and Electric Guitars 2017-07-02 03:52:42 -04:00
Kyep
6fa2bf5f2d Now applies to syndiemobs, russians & angels, too 2017-07-01 23:59:25 -07:00
fludd12
58520a69a9 Fixes two things 2017-07-02 01:30:25 -04:00
Kyep
67c64852cd Fixes being able to sentience potion pirates 2017-07-01 21:02:39 -07: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
Fox-McCloud
666fff6e4a useless bullet removal 2017-07-01 20:38:58 -04:00
Fox-McCloud
e1cc7e1431 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-01 20:17:16 -04:00
Fox-McCloud
05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04: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
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
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
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
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
Fox-McCloud
12ffb7e160 Fixes IPC Heads 2017-06-28 22:35:15 -04:00
Fox-McCloud
c210145f1d to_chat 2017-06-28 17:48:51 -04:00
Fox McCloud
9f27dd1068 Merge pull request #7580 from Aurorablade/ITSALIVE
Re-Open sentience event
2017-06-28 17:37:59 -04:00