Commit Graph

8284 Commits

Author SHA1 Message Date
Shadow
0d8ab20599 A Slash! 2019-12-16 16:11:28 -06:00
Shadow
71b7b93c21 untested™️ 2019-12-15 17:06:43 -06: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
Hawk_v3
bafec81a0a Merge Upstream 2019-11-22 23:40:13 +00:00
Novacat
f5b3fedc9c Merge pull request #6203 from Novacat/nova-ert
Nerfs Chemistry Bag Toting
2019-11-21 21:08:52 -05:00
Heroman3003
f348d1152a Fixes runtime with alien weeds (#6530) 2019-11-21 03:11:52 -05:00
Atermonera
ec3167e4ce Merge pull request #6525 from TheFurryFeline/TFF-Let_The_Plushies_Live!
Mouse Plushie Sprite Change
2019-11-19 14:28:32 -05:00
Repede
d97f049b1c Adds Strix Hades plushie as a selection, ingame plush. 2019-11-17 21:20:27 -05: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
Novacat
af52f4e7c3 Merge pull request #6094 from Novacat/nova-pathfinder
Rarer events, more event variety
2019-11-08 13:32:45 -05:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Novacat
d3b07d3fb7 Merge pull request #6164 from VOREStation/upstream-merge-6501
[MIRROR] Sharpening kits.
2019-11-04 22:49:12 -05:00
lolman360
31995aba35 Sharpening kits. (#6501)
* one

* rtwo

* image

* Update material_weapons.dm
2019-11-04 21:44:30 -05:00
Mechoid
e1fa847bc2 Xenowork Prep For Future (#6491)
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
2019-11-04 21:38:02 -05:00
Verkister
91c8018a59 Merge branch 'master' into littlefunfixes 2019-11-01 20:52:20 +02:00
lolman360
ae859c49e9 [READY] Recolourable energy weapons. (#6507) 2019-11-01 12:38:06 -04:00
Verkister
ec71920801 More stuff.
-Gives the mob radio a much easier way of implementation. (Just take the item and boop the mob with it to do the entire setup. Booping a radio enabled mob with another will eject the mob's current radio without replacing it so you'll need to boop the emptied mob again to apply the new radio)
-Adds some additional stability to the borg sleeper clean cycle.
-Fixes unequipped sleeperbellies never ceasing to process and update, which had been causing runtime spam and such when undeploying an occupied sleeperbelly.
-Tweaks the gurgle gainz received from digested body parts.
-Earlyports a fix for unconscious borgs never dying.
2019-10-31 15:39:51 +02:00
Verkister
e28722b64d A bunch of little fixes and event features.
-Adds simplemob radio. A "headset" that can be used and listened on by simplemobs. Adminspawn the item, shove it into your mob's contents, and link a reference to the item into the mob's mob_radio var. Additional keys can be added same way as regular headsets before "implanting" into the mob.
-Adds leap/pounce verb for simplemobs. Essentially a copy of how the dogborg pounce works.
-Couple fixes to borg/animal pounces. (makes the pounce "animation" reset to default_y instead of hardcoded crap. Also disables spin on simplemobs when pouncing. Unfun maybe, but that var can always be toggled ingame to get the sick ninja moves)
-Adds adminbus switch to enable abuse mode on trasheater. (only skips the whitelist, blacklist still applies)
-Fixes a bunch of icon updates on the vorecode. Humanmobs no longer get forced canary runtiming mob icon updates, and the existing mob icon updates are no longer simplemob exclusive (and thus broken for pAIs and such)
-Earlyports a fix for mobs wandering off when grabbed.
-Earlyports a fix for adding verbs to mobs via varedit. (Was utterly broken for anything that wasn't STRICTLY a root type of human, robot, or AI. Also now works for simplemobs as well.)
2019-10-31 14:27:18 +02: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
Atermonera
b068af1c38 Merge pull request #6502 from parasitoide/gibs4
Stops referencing nonexistent gib4 sprite
2019-10-29 17:25:40 -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
Unknown
0e4c548375 Merge remote-tracking branch 'VOREStation/master' into nova-pathfinder 2019-10-23 20:20:02 -04:00