Commit Graph

5566 Commits

Author SHA1 Message Date
Darlantan 09768ea90c Confetti cannon
-Adds confetti cannon
-Adds grenade object needed to make the cannon work
-Makes the cannon printable at RnD
2020-09-05 07:15:49 -04:00
LunarFleet c33314eadf Kassc's death lego 2020-08-17 10:05:47 -04:00
Razgriz f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
Repede 1e4e534b9e Chainsaws - replaced New with Initialize so chainsaws can be mapped in 2020-08-05 20:15:04 -04:00
izac112 c85bf8104c Voreupdate (Small) 2020-08-05 17:45:22 +02:00
izac112 50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
lbnesquik fbacbad91d Tweaks to taur clothes, particularly saddles as well as tail tags.
- Remove capitalisation from back_vr.dmi
- Add a tag to most tails. This can be used for many things, but mostly to have an simpler check of the tail type. See backpack_vr.dm.
- Switch the backpack sprite selection to a switch()
2020-08-02 22:22:27 +02:00
Mechoid 78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
Cyantime c70900f3f1 Fixes ambiguity of pizza portal location 2020-07-31 23:11:38 -04:00
Novacat c3e3da72f5 Merge pull request #8550 from VOREStation/upstream-merge-7377
[MIRROR] Species Vars Extension Pt3: Blood!
2020-07-31 17:19:01 -04:00
Heroman 00917e8e8b Adds a very familiar plushie 2020-07-31 19:07:45 +10:00
Killian 84128e72ff blood mechanics tweaks (#7377) 2020-07-31 04:54:11 -04:00
Atermonera 65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04:00
Rykka 061cedca00 Fix Travis, Fix Tortillas/Flatbread sharing recipe/ingredients. 2020-07-28 12:30:46 -04:00
Rykka 831ba82b7a Merge branch 'master' into shep-dev-aurora-cooking-port 2020-07-28 04:04:39 -04:00
SplinterGP 9b4843da61 i think this is all the changes ? 2020-07-27 20:59:20 -03:00
Razgriz 21dd023384 Merge pull request #420 from LunarFleet/Lun-Unity
Unity Hound Module
2020-07-27 15:47:51 -07:00
LunarFleet 928f87486a Requested changes 2020-07-26 17:16:49 -04:00
Repede 5bc7f0bd72 'Reverts' a bunch of changes that we've made through the years and see if any of those could have been the cause for out of memory errors to start appearing, unchecks a bunch of unused things like mining rewards and coin-shop as well as some admin systems that are not checked on upstream.
Also readds vore monkeys
2020-07-26 12:48:22 -04:00
izac112 601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
ShadowLarkens c2618c0e66 Merge remote-tracking branch 'upstream/master' into tgui_wires
# Conflicts:
#	code/__defines/misc.dm
2020-07-24 17:06:18 -07:00
Cerebulon 8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Razgriz 5fe45fc4d6 Merge pull request #422 from Shadowfire117/goiaanddrinks
Casino updoot!
2020-07-23 13:34:00 -07:00
Shadowfire 7fc2c5e092 Casino updoot
New features:

New category of prizes; Pets! Anything from a tame chicken or goose all the way up to absolute unit Oties and Zorgoias!
New custom looking spawner grenades for casino mobs, dont flash and blind people, perfect for a party trick!
New casino security id card!
Zorgoias have a chance to show up in predator crate!
Two gorgeous new crowns, the crowns of the king goose and the queen goose, sprited by our lovely artist Kassc!

bug fixes and edits:
Renamed Jack's brew to Rush hour... What was I thinking calling it that?
fixed casino prize dispenser flashing 'price' instead of 'prize'
Fiddled with slot machine, hopefully not everyone will constantly get the platinum chip, might need more adjustments
Fixed wrong access requirements in casino bar
Put access restrictions on the windoors to the prize booth
sunglasses in casino recroom
Fixed casino wallets, now they can hold what normal can hold AND card decks, casino chips, casino manual and platinum chip!
Put a resleeving pod in the casino medbay, for easier resleeving during events!
Reworked access restrictions to casino security area, casino security uses 201 as their access number
2020-07-23 14:57:13 +02:00
LunarFleet f7dc711192 Missed a spot 2020-07-23 00:19:51 -04:00
Rykka 21f64e40fd Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:25:41 -04:00
LunarFleet 5daabf8c0c Unity Hound Parts 2020-07-22 23:10:51 -04:00
Rykka c27b2d2234 Huge Bundle of Fixes, Update Cooking to current Aurora
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
2020-07-22 22:14:04 -04:00
BlackMajor 717a5fa049 aughe 2020-07-23 13:57:39 +12:00
Rykka 886ab72289 Huge Bundle of Fixes, Update Cooking to current Aurora
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
2020-07-22 21:34:13 -04:00
ShadowLarkens 3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
Novacat 8b7d087259 Merge pull request #8437 from Tenryumi/dragon-stuff
Adds dragon-y language and "*gao" emote
2020-07-21 18:12:43 -04:00
Amy 51d2c98e33 Adds dragon language, gao emote w/ sound 2020-07-20 00:49:05 -05:00
ShadowLarkens 126cc6b5da Update asset_cache to modern /tg/, and make TGUI compatible with it. CDN support, etc. 2020-07-19 20:46:12 -07:00
Rykka ed573739ae Commit 2 2020-07-19 16:27:36 -04:00
ShadowLarkens 62b9315b5a TGUI Camera Console Part 3: Modular computers support 2020-07-16 16:19:49 -07:00
Rykka 9f935ff59d Second Half of Aurora Cooking Initial Port - All files added
Now onto the bugfixing nightmares!
2020-07-16 00:37:22 -04:00
izac112 0f05106e95 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-15 12:27:54 +02:00
izac112 896b000ae9 fixes bluespace radios 2020-07-14 17:01:00 +02:00
Rykka 9c66b2f269 Fix Janicart PDA bug from Aro's Rewrite of Janicarts.
Fixes https://github.com/VOREStation/VOREStation/issues/8387 that happened as a result of the janicart rewrite, and them no longer starting with buckets.

Polaris PR incoming ASAP.
2020-07-13 20:50:26 -04:00
izac112 1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Razgriz 6bb324fd55 fix comment compile error 2020-07-13 03:08:46 -07:00
Razgriz 02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Unknown 0cf3990f72 Translocator pref fix 2020-07-10 18:22:55 -04:00
Novacat 90483ba481 Merge pull request #8362 from KillianKirilenko/kk-balls
BALL!
2020-07-09 20:08:21 -04:00
Schnayy 99a977ee3d Merge pull request #6799 from Cerebulon/booksprites
New book sprites + inhands
2020-07-09 17:33:58 -04:00
Killian 721b456eea renamed them balls 2020-07-08 22:30:12 +01:00
izac112 3113cc8605 adds health analyzer back to regular medkits 2020-07-08 14:52:26 +02:00
Killian 0081e02688 Update balls.dm 2020-07-07 20:33:15 +01:00
Killian 68e0f2fd23 BALL! 2020-07-04 17:51:39 +01:00