Commit Graph

17342 Commits

Author SHA1 Message Date
Seigaseiga
bc23ffc408 Adds 'gaslamp' alien mob sprites and open-to-be-tweaked-in-future gaslamp.dm 2017-07-07 03:43:26 +01:00
Spades
728a1bc266 Merge pull request #1821 from Cameron653/RUNTIME_DEVOURS_ALL
Brings back Runtime specific gurgles and emotes.
2017-07-06 11:59:41 -04:00
Spades
3b19f146da Merge pull request #1820 from Cameron653/PAI_SPRITE_FIX
Fixes a few sprite issues caused by pAI vore.
2017-07-06 11:59:35 -04:00
Cameron653
1f4cb41d45 Forgot a ) 2017-07-06 10:41:51 -04:00
Cameron653
69db98c164 Gives runtime more specific gurgles and emotes 2017-07-06 10:20:39 -04:00
Cameron653
5f31c11b80 Fixes a few sprite issues caused by pAI vore. 2017-07-06 09:15:40 -04:00
Verkister
70fcaa30e2 Update otie.dm 2017-07-06 03:19:54 +03:00
Spades
8da3c77983 Merge pull request #1812 from Cameron653/master
pAI vore and pAI fat sprites.
2017-07-05 19:10:13 -04:00
Spades
566773950e Merge pull request #1810 from VOREStation/gateway-stoof
Exploration Update
2017-07-05 18:31:45 -04:00
Spades
a4de72cbde Merge pull request #1801 from Cyantime/nocarpo
Replaces carpotoxin in koi with normal toxins
2017-07-05 18:30:14 -04:00
killer653
c4a2caba2e Duplicate of #1799 2017-07-05 12:07:21 -04:00
Spades
d47b9d5df1 Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof
# Conflicts:
#	code/modules/mob/living/simple_animal/vore/otie.dm
#	icons/mob/vore64x32.dmi
2017-07-05 11:33:24 -04:00
Spades
d2fe5da1cd New icons for outside otie. 2017-07-05 11:31:46 -04:00
Spades
f13aa4c60f Merge pull request #1800 from Verkister/master
Taur and borgo feature shieet!
2017-07-05 11:30:24 -04:00
killer653
060e9a6a4a pAI vore 2017-07-05 00:10:58 -04:00
Spades
781226fcfc Update goose.dm 2017-07-04 20:14:52 -04:00
Spades
357e8491c0 Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof 2017-07-04 20:04:19 -04:00
Spades
0540593119 Final additions and fixes 2017-07-04 20:01:38 -04:00
Verkister
33e57a3728 stuff 2017-07-05 00:14:11 +03:00
Verkister
c318e8d1cb missed a tab 2017-07-04 22:43:24 +03:00
Verkister
24602cb18f reverts 2017-07-04 22:41:58 +03:00
RezRaz
96fec7a66a Add files via upload 2017-07-04 14:14:58 -05:00
Spades
0ece205fc3 Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof 2017-07-04 13:15:00 -04:00
Verkister
6245643e95 Forgot Kendrick. 2017-07-04 14:58:55 +03:00
Verkister
d60948d2db Otie tweaks.
-Tamed oties should no longer attack station pets and bots.
2017-07-04 14:54:27 +03:00
Spades
4367bc2da7 sleepy commit 2017-07-04 06:38:32 -04:00
Spades
627dbb9566 Fixes various otie problems 2017-07-04 02:38:44 -04:00
Cyantime
5c6bb120a6 Fix missing pike icon 2017-07-03 19:11:14 -04:00
Cyantime
cd42f35874 removes koi fillet, replaces koipotoxin with generic toxin 2017-07-03 15:17:01 -04:00
Cyantime
03f85a6d10 Replaces carptoxin in koi with non-useful equivalent 2017-07-03 14:40:03 -04:00
Verkister
7333ea008f Taur and borgo feature shieet!
-Added a counter for janihound to keep track of how much crap it's ate.
-Lowered janigut capacity to 25 items.
-Made mice edible for the borgo.
-Gave a gentle touch to the wolftaur sprites. (more types later?)
-Added a saddlebag version that fits itself for every quadtaur.
-Added a robust combat aesthetic saddlebag as a childtype to the forementioned.
2017-07-03 21:05:17 +03:00
killer653
c97ded0da9 Adds in Icowom's custom items
Resolves #1695
2017-07-02 03:21:48 -04:00
Spades
87fa10e48e Merge pull request #1794 from Cyantime/koi
Improves koi
2017-07-02 02:29:57 -04:00
Spades
08704251b2 Merge pull request #1793 from VOREStation/guns
Dakka Dakka
2017-07-02 02:29:46 -04:00
Spades
7aa6ab1ff8 Merge pull request #1788 from Cyantime/transferrefactor
Splits some things into seperate procs
2017-07-02 02:20:39 -04:00
Spades
36f32b1ab6 Merge pull request #1756 from Verkister/cargoandborgo
Cargo and borgo stuffs. [change check a whole week overdue!]
2017-07-02 02:20:25 -04:00
Spades
2f9c8b48b4 Merge remote-tracking branch 'refs/remotes/origin/master' into guns 2017-07-02 00:30:23 -04:00
Cyantime
1a7e8a9878 koi upgrades 2017-07-01 15:07:07 -04:00
Spades
3db35eb684 Dakka Dakka
- Removed gun_vr judge, Polaris has one now.
- Removed vorestation m44 mags, Polaris has those now.
- Removed detective's .44 magnum because NO YOU CANNOT HAVE A FUCKING
MAGNUM
- Corrected inconsistent naming of .44 speedloaders
- Corrected inconsistent naming of .357 speedloaders
- Fixed broken calibers for .357 stuff to be consistent with upcoming
Polaris sync.
2017-06-30 22:42:08 -04:00
Leshana
1507a0330c Fixes ammo paths changed by PolarisSS13/Polaris/pull/3541 in VOREStation custom code. 2017-06-30 22:34:15 -04:00
Leshana
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00
Cameron653
1a9546f8ab Merge pull request #1740 from Cameron653/master
Adds Rosey's fluffy tails
2017-06-29 19:09:34 -04:00
Leshana
844d81b8be Merge pull request #1763 from VOREStation/ss-lighting
Converts the lighting process controller to a StonedMC subsystem
2017-06-28 22:50:59 -04:00
Cyantime
ba114dcf7a transfer&taste procs 2017-06-27 16:23:00 -04:00
Andrew
3a089ab8a6 Merge branch 'master' into master 2017-06-25 18:10:33 -05:00
Anewbe
2dd8f33ecd Merge pull request #3543 from Neerti/6/24/2017_aooc_for_nonadmins
Adds AOOC functionality for antags.
2017-06-25 16:34:15 -05:00
Anewbe
b3f294efd2 Merge pull request #3523 from Yoshax/whythehellisthislikethisandwhydidnobodymentionitbefore
Nerfs the siemens on most hardsuits
2017-06-25 16:30:06 -05:00
Anewbe
81e7d9ce42 Merge pull request #3513 from Belsima/snowsuit
Adds snowsuits.
2017-06-25 16:27:43 -05:00
Anewbe
a5f0569a2d Merge pull request #3541 from SpadesNeil/AcesFixesThingses
More Munition Caliber Naming Fixes
2017-06-25 13:14:18 -05:00
Neerti
795fcd6306 Fixes Inability to use Say/LOOC/Other Things
A null entry somehow got into ```player_list```, which caused an important proc called ```get_mobs_and_objs_in_view_fast()``` to fail.  The cause appeared to be a brain mob failing to qdel, then failing to ```logout()```, leaving a null entry in ```player_list```.
```get_mobs_and_objs_in_view_fast()``` now makes sure every entry it iterates over exists, and this should fix the qdel issue as well.
2017-06-24 18:18:10 -04:00