Commit Graph

5174 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
Atermonera
6b462af3ee Merge pull request #6569 from TheFurryFeline/TFF-Bulbs_Recycling
Light Replacer QOL
2019-12-21 14:31:10 -05:00
Novacat
0432002af7 Merge pull request #6327 from VOREStation/upstream-merge-6558
[MIRROR] Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-19 15:46:59 -05: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
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Atermonera
ef75d1c2a0 Clean up dead code obsoleted by outfit system 2019-12-16 00:51:16 -05:00
Novacat
dba6980b8d Merge pull request #6322 from VOREStation/upstream-merge-6567
[MIRROR] EPv2 x Communicator fix.
2019-12-15 23:36:47 -05:00
Novacat
8b541d00e3 Update messaging.dm 2019-12-15 23:27:50 -05:00
Shadow
71b7b93c21 untested™️ 2019-12-15 17:06:43 -06:00
Atermonera
9ba1566211 EPv2 x Communicator fix. 2019-12-15 14:54:01 -05:00
Atermonera
838b6dce3e Merge pull request #6566 from Mechoid/MultitoolFix
Fix Multitool Modes
2019-12-15 14:52:47 -05:00
PrismaticGynoid
b22ec21911 Graffiti selection (#6562)
* Lets you choose what type of graffiti or rune to draw when vandalizing the floor with crayons or markers. No more drawing and erasing a dozen times to get the exact graffiti you want.

* Puts in Mechoid's suggestion
2019-12-13 20:37:14 -05:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Repede
3c9731879a Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 2019-12-09 17:15:36 -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
9435f5720d Misc Tweaks Pt. 2
- Slightly increases Centcom/Modified translocator energy costs
2019-12-06 18:44:16 -05:00
Unknown
d8392dfe8b More updates 2019-12-06 18:24:18 -05:00
Unknown
a3c48e6eca how did that get deleted 2019-12-06 17:18:05 -05:00
Unknown
062d8ec39c Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes 2019-12-06 17:10:23 -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
Novacat
e5c7d83aba Merge pull request #6222 from Novacat/nova-pathfinder
Centcom/Tether Ship Changes
2019-12-06 16:06:56 -05:00
Spades
f977f0988c Merge pull request #6267 from Verkister/yehaw
Some more simplemob QoL and fixes.
2019-12-06 10:54:40 -05:00
lolman360
e2b47484c8 Fixy-wixies the fucky-wucky I madey-wadey with toy swords. (#6526)
* one

* rtwo

* image

* Update material_weapons.dm

* Update toys.dm

* Revert "Update material_weapons.dm"

This reverts commit 1a37bb015a5e503a4c5f0433bc279f15514319a7.

* Revert "image"

This reverts commit 6496dd404d0eb740e158fbc94322f6944f508886.

* Revert "rtwo"

This reverts commit 3b7aacd6c830e52986f2a34abf5b5ccbfbb135f8.

* Revert "one"

This reverts commit 324d188058c0a824c0259e2d6b98f69e563846bd.

* Update toys.dm
2019-12-05 18:29:06 -05:00
Verkister
cee26ffa2e Some more simplemob QoL and fixes.
-Fixes mob radio headset. Now actually hearable and able to be properly put into the mob.
-Makes a bunch of voremobs start with darksight enabled.
-Makes at least the mountable mobs remove the redundant movement cooldown on player control presence.
-Makes some formerly mountable mobs mountable again. (deathclaw, dragon, hippo, horse, panther, rat)
-Snips some redundant the's out of the petting resposes. (No more player pets the the mob)
2019-12-01 12:51:18 +02:00
Novacat
c8b277096e Merge pull request #6261 from VOREStation/upstream-merge-6547
[MIRROR] Lamps, Lights, Lackluster!
2019-11-29 20:27:36 -05:00
Anewbe
068e132603 Merge pull request #6547 from TheFurryFeline/TFF-Lamps_Lights_Lackluster
Lamps, Lights, Lackluster!
2019-11-29 19:51:34 -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
Repede
9c61982751 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme
2019-11-29 19:13:53 -05:00
Unknown
200cb2f5af Enables all channels by default 2019-11-28 14:31:15 -05:00
Unknown
199fffc2d0 Refactors translocators a bit more 2019-11-28 14:22:56 -05:00
Anewbe
e7c7da7db1 Merge pull request #6536 from Nalarac/Capset
Captain and HoP Headsets Fully Enabled by Default
2019-11-28 14:15:11 -05:00
Unknown
aa25f5ebbd More Updates 2019-11-27 15:50:54 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
RadiantFlash7
2aac0c0171 Map Overhaul+instruments
new instruments added, Changed snowoverlay to snow floor decal,
Exploration ship jump submap done.
Plains finished, Just needs teleporters setup.
Tons of improvements to hallways.
Floor colors!
Remade engineering (again)
Disposals finalized,
2019-11-23 22:06:21 -05:00