Commit Graph

3270 Commits

Author SHA1 Message Date
Hawk_v3
838f5e9418 Merge remote-tracking branch 'upstream/master' 2020-01-06 00:47:53 +00:00
Heroman
e05fdf6258 Fixes clamp issues 2020-01-06 08:37:27 +10:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
lbnesquik
377723bcf4 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-30 09:09:51 +01:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Heroman
572112d28b Fixes AI not being able to resist out of nets 2019-12-29 08:33:10 +10:00
Repede
2af9f4ee44 Merge branch 'master' into master 2019-12-26 20:40:10 -05:00
lbnesquik
562df07602 Move the lance sprite to weapons_vr.dmi. 2019-12-26 07:25:49 +01:00
lbnesquik
eace084579 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-26 07:25:05 +01:00
lbnesquik
ae398259ea Introduce more taur clothes.
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
2019-12-25 20:40:21 +01:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Shadow
c59e362fb5 Adds Change Tags 2019-12-22 21:14:09 -06:00
Shadow
d4e45ee3b1 Adds the Booze Borg 2019-12-22 20:02:36 -06:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Meghan-Rossi
ef7dfaa6cc Resolve conflicts, fix compile errors 2019-12-19 18:44:47 +00:00
Shadow
0d8ab20599 A Slash! 2019-12-16 16:11:28 -06:00
Atermonera
ef75d1c2a0 Clean up dead code obsoleted by outfit system 2019-12-16 00:51:16 -05:00
Shadow
71b7b93c21 untested™️ 2019-12-15 17:06:43 -06:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Unknown
f42cd78de3 Fixes Elven Weapons 2019-12-06 19:14:35 -05:00
Unknown
192dd12e7f Attempts to fix Gladius 2019-12-06 18:59:35 -05:00
Unknown
d8392dfe8b More updates 2019-12-06 18:24:18 -05:00
Unknown
5499e3272f Miscellaneous fixes
- Fixes holodeck eswords
- Fixes toy swords not showing the blade
- Temporarily disables vent sounds

Fixes #6265
2019-12-06 17:10:13 -05:00
Anewbe
12d5118ecc Merge pull request #6550 from listerla/grammar-time
Fixes two typos (rengeration and Extranneous)
2019-11-29 19:49:14 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Hawk_v3
bafec81a0a Merge Upstream 2019-11-22 23:40:13 +00:00
Unknown
a788cad3d9 Nerfs Chemistry Bag Toting
Chemistry bags can no longer be carried around in the belt slot, considering the number of chems they can carry they are probably a bit too large for that.
2019-11-17 15:55:19 -05:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Meghan-Rossi
f8c214ea67 Fix box of service keys being called "box of command keys" 2019-11-12 08:55:43 +00:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
lolman360
31995aba35 Sharpening kits. (#6501)
* one

* rtwo

* image

* Update material_weapons.dm
2019-11-04 21:44:30 -05:00
lolman360
ae859c49e9 [READY] Recolourable energy weapons. (#6507) 2019-11-01 12:38:06 -04:00
Anewbe
d7c0195212 Merge pull request #6500 from KasparoVy/you_tracking_implanted_the_floor
Loadout Implants Properly go in Mob, not on Floor
2019-10-29 20:34:36 -04:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Hawk_v3
c95a447b71 Merge remote-tracking branch 'upstream/master' 2019-10-27 17:58:34 +00:00
Cerebulon
6385a2f662 ERT Rangers Costumes (#6493)
* Sprites

* and code fuckit
2019-10-25 15:07:49 -04:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Novacat
173fd85764 Merge pull request #6086 from Verkister/werespecies
Adds werebeast event species
2019-10-21 21:02:53 -04:00
Novacat
f70fffc474 Merge pull request #6082 from VOREStation/upstream-merge-6465
[MIRROR] Medical Expansion
2019-10-21 20:12:18 -04:00
Atermonera
524520cb8b Shards only do damage if you hit things with them (#6478) 2019-10-20 17:55:27 -04:00
Verkister
47d56f13d1 Adds werebeast event species
-Adds new customizable carbonspecies for werebeast shenanigans.
-Stats-wise somewhat faster, tougher, and hungrier compared to base humans. Also darksight.
-Added whatever the code needed to make it possible to have taller carbonspecies.
-As a side effect, the forementioned also makes it possible to do long necked species and more.
-The werebeast can use the tail, hair, ear, and markings customization. This will be messy on tails that rely heavily on human silhouette. The hair and ear customization is fully functional using unedited human assets with a coded offset.
-The hair/ears offset is a modifiable var for the species specific head organ subtype, and can be used by other species that use custom headtypes.
-The werebeast has a set of markings as well, restricted to the species. face, belly, socks, and nose.

Currently the werebeast ready clothing is limited to:
-Back: basic backpack, basic satchel, leather satchel, basic courier bag, and basic duffle.
-Belt: toolbelt and security belt.
-Eyes: most sunglasses and sunglass huds, welding goggles, regular and 3d glasses, plain, meson, and science goggles.
-Feet: black and brown basic shoes, galoshes, jackboots, and toeless jackboots.
-Hands: latex/white, nitrile, yellow/insulated, black, and fingerless gloves.
-Head: the entire selection of vanilla headgear.
-Suit: labcoat, regular and white hazard vest, and 4 flavors of varsity jackets.
-Uniform: white pants, white shorts, white, orange, yellow, black, grey, robo, engie, and janitor jumpsuits, swept and nurse skirt.
Everything else will likely not show up at all, but more can be added whenever needed.
2019-10-20 18:45:29 +03:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Repede
e7a5341f2d Adds f13 (Mauser) brand cigarettes to game vending machines. 2019-10-17 19:09:57 -04:00
Hawk_v3
2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Hawk_v3
5e4a914604 WIki Link Standardisation
All the links should point to our wiki now. All that's left is for it to be filled out.
2019-10-03 22:21:37 +01:00
Hawk_v3
b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Unknown
10f290106c Ports pan-slavic from Baystation 2019-09-18 15:57:30 -04:00