Commit Graph

8960 Commits

Author SHA1 Message Date
Darlantan e9abd9894d Comments out virgo staff posters 2020-09-06 03:18:26 -04:00
Razgriz 0c713aa549 Merge pull request #530 from Darlantanis/ConfettiCannon
Confetti cannon
2020-09-05 10:58:08 -07:00
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
Nadyr 35fa371286 Merge pull request #513 from cadyn/liquid-bellyfix
Many bugfixes!
2020-09-05 06:17:03 -04:00
Sym 0dec16535d Adding CHOMPedit to edited lines and files, with brief descriptions.
Can't believe I didn't think of doing this already.
2020-08-29 02:28:30 -04:00
cadyn 9101e37e6f Big woopsie-dasies fixed 2020-08-28 13:06:58 -07:00
cadyn 860615c70c Upstream oopsie-fixes 2020-08-28 13:00:42 -07:00
Sym 20bcadbec6 Fixing Xenomorph lifecycle + changes
Time to get swifty.
2020-08-28 12:29:06 -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
Razgriz f284ac97b3 Update wardrobe.dm 2020-08-07 01:05:37 -07:00
Razgriz 5ff365f532 Forensics gloves 2020-08-06 21:03:15 -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
Killian e52e932eea Update closets_yw.dm 2020-08-04 11:29:31 +01: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
Novacat b67d52dce5 Merge pull request #8573 from VOREStation/upstream-merge-7404
[MIRROR] Fuel spills no longer persistent
2020-08-02 02:08:59 -04:00
Atermonera 2e93636b24 Merge pull request #7404 from Cerebulon/fuelbgone
Fuel spills no longer persistent
2020-08-02 00:23:52 -04:00
Mechoid 78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
Cyantime 2b82bb0fdb Fixes egg icons, probably 2020-08-01 02:03:02 -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
Novacat 2ccb99611e Update medical_stand_vr.dm 2020-07-31 17:01:26 -04:00
Unknown 54d0193353 Fixes Stand 2020-07-31 16:54:33 -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
Unknown f4398a4f89 Reverts vorestation edit to large crate
Fixes invisible crates.
2020-07-29 20:32:44 -04:00
izac112 c6075d1216 Voreupdate (small) 2020-07-30 00:17:26 +02:00
Rykka 061cedca00 Fix Travis, Fix Tortillas/Flatbread sharing recipe/ingredients. 2020-07-28 12:30:46 -04:00
ShadowLarkens 4f2bb7bc34 Fix ghosts being unable to interact with TGUI by default 2020-07-28 01:16:00 -07: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 77d6c2b33e Update largecrate.dm 2020-07-21 22:31:40 -04:00