Commit Graph

6620 Commits

Author SHA1 Message Date
Spades
bdf5ce72f8 Merge pull request #2132 from Ketrai/master
adds new event... solargrubs
2017-09-13 16:09:19 -04:00
Spades
3a89fa8f4e Merge pull request #2157 from Cameron653/TRASH_PILE_ADJ
Trash pile adjustments
2017-09-13 16:08:14 -04:00
killer653
794c1c2b67 Removes 2 useless items. Fixes indents on one. 2017-09-12 18:59:43 -04:00
Cyantime
6ee2ec7c81 Fixes mouse spawners 2017-09-12 18:14:15 -04:00
Spades
4f7c6bb4ac Fixes #2138 2017-09-09 23:04:25 -04:00
Spades
8e3ada6721 Revert "Removes silly railing layering" 2017-09-09 22:44:12 -04:00
Ketrai
3da219cf8e grublarba 2017-09-09 22:38:54 +02:00
Ketrai
d595871114 derp 2017-09-09 22:38:15 +02:00
Ketrai
a8d8f35ae6 grubs make larva 2017-09-09 22:25:33 +02:00
Spades
6eb472f31d Revert "Adds a new event - Solargrubs!" 2017-09-09 12:24:37 -04:00
Spades
6038c0a81f Merge pull request #2108 from Ketrai/master
Adds a new event - Solargrubs!
2017-09-09 12:24:26 -04:00
Spades
8773cc389a Removes silly railing layering 2017-09-08 21:27:31 -04:00
Ketrai
0c8a2796ff adds spider_vr.dm
tiny bit of code to do everything they have to do.
2017-09-06 10:45:43 +02:00
Ketrai
c62245353b delete grub_vr.dm
making spider_vr.dm instead
2017-09-06 10:44:53 +02:00
Ketrai
d32c6f07a9 undoes the edit
Cutting down the code confuses the hell out of the event, it refuses to spawn the grub larva otherwise.
2017-09-05 21:56:28 +02:00
Ketrai
ad3cabfca8 cuts down inherited code
This should cut down code that was inherited from effects/spider
2017-09-05 21:16:45 +02:00
Ketrai
31959bef22 travis random crash
UGH
2017-09-05 18:17:30 +02:00
Ketrai
03196646a9 adds solargrub to predator crate
coz whynot, we got carp in there
2017-09-05 16:15:03 +02:00
Ketrai
46279ff41e adds an effect file for grubs
So they can grow similar to spiderlings
2017-09-05 16:06:26 +02:00
Spades
a55d4c5e4c Imperial Military Update
Adds Imperial stuff for our space elf romans.
2017-09-02 04:07:25 -04:00
Funce
87a68e40d8 Emagging lift doors should no longer be a thing 2017-08-30 13:54:45 +12:00
killer653
923e6a9677 Fixes compile errors. 2017-08-28 21:04:53 -04:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Spades
4eeabfc657 TRAVIS STOP 2017-08-27 02:23:39 -04:00
Spades
229431bd4d Oh sure you compile fine but Travis cries 2017-08-27 01:49:41 -04:00
MagmaRam
e370d56656 Merge pull request #3710 from SpadesNeil/window-change
Weak attacks no longer can damage windows
2017-08-26 13:55:36 -06:00
Spades
df37726669 Merge remote-tracking branch 'refs/remotes/origin/master' into oties-and-wild-removed 2017-08-26 15:51:47 -04:00
Spades
18ffeefafd Removies oties and outdoors area 2017-08-26 15:51:37 -04:00
Belsima
5268f21321 Adds more click sounds to the game. 2017-08-23 03:16:21 -04:00
Ketrai
4546f5cc9a Updated contraband crate
Added the contraband you can get from trash piles, re-added phazon pieces.
2017-08-22 23:00:43 +02:00
Ketrai
20250d76e1 Updated stolen supplies
Removes the majority of phazon pieces. (getting the full set has an extremely tiny number of succeeding, and you can't get the circuit board anyways. I kept one so people know it still exists.) Adds high tier contraband you can find in trash piles to give an alternative way to obtain these. Hopefully encourages more people to mine to get points and resources for science. If you feel this isn't balanced enough, can always increase the probability of getting cosmetic or lesser items to dilute the pool.
2017-08-22 13:13:57 +02:00
MagmaRam
499f29354a Merge pull request #3716 from Belsima/zipper
MORE ZIPPOS
2017-08-21 13:27:12 -06:00
Cyantime
007dc9c5d9 Reduces mice per pile from 2 to 1. 2017-08-20 21:42:00 -04:00
Cyantime
70a03f1155 No one saw that. 2017-08-16 19:20:57 -04:00
Belsima
efac0c7e7b fuck i didnt even code the zippos in 2017-08-15 23:59:14 -04:00
Cyantime
0df74e92fe Quik Fixes 2017-08-15 22:19:13 -04:00
Cyantime
499862bca6 Configurable mob spawners, re-implementation of trash mouse spawning. 2017-08-15 22:09:53 -04:00
Spades
8bbd131899 Better spot to do this in 2017-08-14 23:25:53 -04:00
Spades
60ead7642d Revert "Trash piles can now spawn mice" 2017-08-14 23:07:08 -04:00
Anewbe
ad4b439e96 Merge pull request #3680 from Neerti/8/4/2017_arrivals
Makes Arrivals Shuttle Great
2017-08-14 21:59:18 -04:00
Anewbe
d55f8b64d5 Merge pull request #3692 from PrismaticGynoid/wheelchairs
Better Wheelchairs
2017-08-14 21:57:27 -04:00
Spades
eaf2ec867d Actually let's make it 5. 2017-08-14 17:46:11 -04:00
Spades
2206b23305 If force is less than 10, an item can't damage windows. 2017-08-14 17:42:43 -04:00
Cyantime
8502ceaee6 Trash piles can spawn mice 2017-08-13 19:15:04 -04:00
Cyantime
9637c6a0eb TF refactor 2017-08-12 20:53:52 -04:00
PrismaticGynoid
1f1f537e1c Better Wheelchairs
Wheelchairs can now be collapsed by click-dragging them to you, much like rollerbeds. You can then pick them up. They are, however, too large to stuff into a backpack.
These new collapsible wheelchairs are now available in the loadout, under utility, for 4 points. They're also color-customizable now. No more plain white wheelchairs available only by missing feet.
The loadout wheelchairs will spawn with you buckled into them, just like how it works when you spawn without feet, except that the loadout wheelchairs can be more colors than just white.
2017-08-09 00:48:13 -07:00
Spades
9b8cc501bd Merge pull request #1955 from Verkister/blehh2sparkbooger
Another small saddlebag fix.
2017-08-09 00:54:01 -04:00
Verkister
c72893c0f7 Noticed a case thing and i ain't taking chances this late.
-I'm already asleep it's not even me typing this shit right now.
2017-08-09 02:19:17 +03:00
Verkister
1b3732f11f Another small saddlebag fix.
-Figured out why saddlebags weren't showing up on subtype taurs.
-Something something spaghrtti and now the iconstate sets accordingly to the main type name instead of subtype name.
-I really need to sleep this is my last second awake tonight and hopefully this works?
2017-08-09 02:12:12 +03:00
JOAN-RIG\Joan Risu
02e8dc62bd Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2017-08-08 14:56:29 -07:00