Commit Graph

13570 Commits

Author SHA1 Message Date
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
Anewbe
e365fc5a3f Merge pull request #3726 from Woodratt/WR_Floortile_stuff
Woodrat breaks everything with floor decals
2017-08-27 15:13:20 -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
Woodratt
10c8586db0 Rough port of
a8c9bb786a

Unsure if I even did it correctly, but seems to function in the brief tests done, no compile errors.

In preparation of porting the massive number of floor decals for the new map.
2017-08-21 14:44:25 -07: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
Neerti
ca2ee612d8 Merge pull request #3687 from SpadesNeil/stop-making-devs-cry
Changes /turf/space/transit icons in map editor
2017-08-17 11:59:17 -04:00
Neerti
8e8b666b46 Merge pull request #3712 from Belsima/biogen
Adds more items to the biogenerator.
2017-08-17 11:58:22 -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
Belsima
dc3b04b3ce Adds more items to the biogenerator. 2017-08-15 22:54:23 -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
Neerti
0210414388 Changes some arrival messages so traitors buying fake records fit with the new shuttle arrival message. 2017-08-14 21:46:27 -04:00
Anewbe
19476a81cd Merge pull request #3688 from SpadesNeil/assault-carbine
Assault rifle tweaks and fixes
2017-08-14 21:32:47 -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
Spades
e0db8feb50 Merge pull request #1996 from Cameron653/SPIDER_RACE
Spider race & modifications!
2017-08-14 00:31:39 -04:00
Anewbe
5f5cfabed5 Merge pull request #3685 from Mechoid/Gripper_Salvation_MK1
Gripper Fixes and Updates
2017-08-13 23:38:22 -04:00
Cyantime
8502ceaee6 Trash piles can spawn mice 2017-08-13 19:15:04 -04:00
Verkister
5ff61bea4c Merge branch 'master' of https://github.com/VOREStation/VOREStation into spriteshit
# Conflicts:
#	code/game/dna/dna2.dm
#	code/game/dna/dna2_helpers.dm
2017-08-13 15:21:22 +03:00
Verkister
22e6bcb520 Enables dual coloring for ears.
-Ya know how a bunch of the ear options have that untouchable bright white inner part?
-You can touch it now :D
-Also renames the ear color vars for better compatibility and consistency.(red/g/b_ear > r/g/b_ears etc)
2017-08-13 15:20:11 +03:00
killer653
63c496e79c FIXES 2017-08-12 23:49:24 -04:00
killer653
dc828eaab0 Spiders! 2017-08-12 23:02:38 -04:00
Cyantime
9637c6a0eb TF refactor 2017-08-12 20:53:52 -04:00
Verkister
da358da075 updoots 2017-08-11 20:13:01 +03:00
Verkister
979d9e5a35 Merge branch 'master' of https://github.com/VOREStation/VOREStation into blehh2sparkbooger
# Conflicts:
#	code/game/dna/dna2.dm
2017-08-11 20:07:36 +03:00
Verkister
27fd245b9f Attempt to fix dual/ear color DNA issues.
-Mostly slipped lines between already existing vorestation edits in these files.
-Should probably fix the DNA related issues with dual color tails and ear colors.
-Such as resleeving breaking the forementioned on characters.
-Basically just added ear and secondary tail color definitions to the DNA codes.
-Untested though as I have no idea how to even test this in solo.
2017-08-11 20:03:06 +03:00
killer653
a2f346df0f Makes wings their own seperate entity on char setup 2017-08-10 07:12:22 -04:00
PrismaticGynoid
b5ccfbd328 Also allows people to take their wheelchairs with them instead of leaving them behind, and fixes a runtime with wheelchair users who are missing hands or arms. 2017-08-09 21:27:28 -07: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
killer653
8e42ab0ca1 Merge remote-tracking branch 'PolarisSS13/master' into POL_SYNC 2017-08-08 16:10:47 -04:00