Commit Graph

568 Commits

Author SHA1 Message Date
Neerti
cd2a538526 Merge pull request #5207 from Novacat/bluespace_duffle
Dufflebag of Holding
2018-05-02 22:41:27 -04:00
Atermonera
b75b3c539e Merge pull request #5226 from Lorwp/drillmeta
Destroys Drill meta 2: Electric Boogaloo
2018-05-01 12:38:19 -07:00
Lorwp
1120e53d36 Destroys Drill meta
Makes screwdriver hand drills not fit in places a normal screwdriver can
2018-04-28 20:05:19 +10:00
Arokha Sieyes
1d0aeb95bd Increase zealousness of Portable Freezer item whitelist 2018-04-27 20:16:57 -04:00
Unknown
906db88b6a Dufflebag of Holding
Adds a dufflebag of holding, essentially a bag of holding reskin that functions exactly identical
2018-04-24 02:09:39 -04:00
Heroman3003
32daa7a0d2 Fixed sheet snatcher spawning stacks with wrong looking icon 2018-04-12 21:55:24 +10:00
Atermonera
b63acc083d Merge pull request #5143 from VOREStation/fix-usr
Reverted use of 'usr' back to 'user' from commit 05fd53e
2018-04-04 17:35:33 -07:00
Atermonera
a059ed0de3 Merge pull request #5133 from Cameron653/patch-1
Syndicate Dufflebag Tweak
2018-04-02 23:51:21 -07:00
Leshana
1f4bdc4389 Reverted use of 'usr' back to 'user' from commit 05fd53ebcc 2018-04-01 22:03:10 -04:00
Mechoid
739bbd6e2b Merge pull request #5073 from mistyLuminescence/wallets
Wallet Expansion!
2018-04-01 15:01:05 -07:00
Cameron653
4a1ef0dbd6 Makes syndie dufflebags hint that they let you move faster 2018-03-31 11:02:01 -04:00
mistyLuminescence
dfc0dd48bc Removes vials 2018-03-30 02:12:58 +01:00
Atermonera
6adbe5537e Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear
Adds permanent markers
2018-03-28 11:49:10 -07:00
Arokha Sieyes
29eb468ef5 POLARIS: Fixes #5282 (VS) - Allow use of pens to label pill bottles, like glass bottles 2018-03-25 17:05:20 -04:00
Cameron653
59844c5553 Xenoarch Multitool & Xenoarch Excavation Drill (#5058)
* Xenoarch Multitool & Xenoarch Excavation Drill

* Makes the tool work better

* Cuts down on lines & left comments

* change to m
2018-03-22 09:50:50 -07:00
Billy Bangles
d953a58413 travis pls
why must we argue so
2018-03-19 21:23:48 -04:00
Billy Bangles
05fd53ebcc adds permanent markers
also tweaks paint recipe to use ink instead of crayons.
2018-03-19 20:20:31 -04:00
mistyLuminescence
8769f4605a trims list 2018-03-18 03:20:36 +00:00
mistyLuminescence
70f7ef7d6f Wallet expansion! 2018-03-17 21:10:23 +00:00
Anewbe
d36e67d90d Merge pull request #5064 from VOREStation/vs-port-3142
[PORT] Improved playsound and drop_location() from /tg
2018-03-17 15:01:07 -05:00
Atermonera
4fa4173e29 Merge pull request #5049 from Anewbe/quickdraw_items
Ports quickdraw storage items from VIRGO
2018-03-16 11:37:58 -07:00
Anewbe
5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00
Arokha Sieyes
6158cd1d26 POLARIS: Use drop_location() for things 2018-03-13 19:23:46 -04:00
Anewbe
a8cc2df4ad Ports quickdraw storage items from VIRGO 2018-03-11 16:56:17 -05:00
Arokha Sieyes
306a484b48 U_I Phase 2.4: Storage cleanup 2018-03-08 19:34:00 -05:00
Arokha Sieyes
3be602dece U_I Phase 1.3: Previews are broken, so that's a thing 2018-03-08 19:31:55 -05:00
Arokha Sieyes
2f433c9ea9 U_I Phase 1.2: Something is broken somewhere 2018-03-08 19:31:54 -05:00
Arokha Sieyes
94c2110f27 U_I Phase 1.1: Fix phase 1 bugs
Softsuits making your clothes disappear, PDAs in ID slot making you double
2018-03-08 19:31:54 -05:00
Arokha Sieyes
aa9ec19118 U_I Phase 1.0: First consolidation pass 2018-03-08 19:31:43 -05:00
BillyBangles
6ff1f1b165 fixes #4992 (#4995)
i'm good at this i swear
2018-03-02 18:24:51 -08:00
BillyBangles
2ab9bfe79b Turns the station into 420-station 13. (#4971)
* adds rolling paper and joints

F O U R T W E N T Y   B L A Z E   I T

* adds joint sprites

(they're pretty bad though)

* adds rolling paper box, adds papers to cig vendors

* c h a n g e l o g

smoke
weed
every
day
2018-02-28 14:16:42 -06:00
Anewbe
d1aa9affe4 Merge pull request #4953 from Schnayy/trinketbox
Trinket box
2018-02-26 10:04:14 -06:00
Anewbe
a42d7ecdb4 Merge pull request #4944 from VOREStation/pol-matweak
Tweak weird MA override
2018-02-25 12:38:58 -06:00
Schnayy
460202cb6e Puts the trinket box back in after I had to comment it out in the gift vendor pr from conflict.
https://user-images.githubusercontent.com/26665154/36401962-a75e2e54-15a0-11e8-8be3-b8271d2c6ee7.png

Also fixes a minor bug of the heartbox held sprites being in the wrong location and thus having no held sprites.
2018-02-25 01:57:03 -06:00
Arokha Sieyes
542bb57d0d POLARIS: Tweak weird MA override
Not sure when this is used, but Leshana had a good suggestion for preventing it interfering with things.
2018-02-24 13:13:10 -05:00
Anewbe
2553edc2a0 Merge pull request #4932 from VOREStation/pol-box2
Small tweak to survival boxes
2018-02-24 11:02:07 -06:00
Schnayy
8ccf0f7532 AlliCo Hallmark Goods (#4887)
* Adds the gift vendor, AlliCo Hallmark Goods, ran the name by Elgeon beforehand. Is a delightfully gaudy vending machine placed in the locker rooms. The coffee machine was removed and the sweatmax moved to take it's place so the gift vendor is next to the laptop and cigarette vendors. Prices were based off of the SweatMax vendor.

Before: https://i.gyazo.com/0d6758fc8a469fea6e340b5937b95f82.png
After: https://i.gyazo.com/ab21b6ff7ed012786d475b71f1ec180e.png

Vendor will normally dispense:
- Heart box chocolates
- Bouquets
- Cheaper fake bouquets
- Each of the 4 cards previously added.
- All the therapy dolls.

Will dispense the following with a coin:
- All small plushies
- Newly added trinket box.

Will dispense the following when hacked:
- Gilthari Luxury Champagne
- Plans to add a handbuzzer in the future but not right now.

Items & Reagents added:

- Champagne. Is not a mixable reagent, listed as a child of wine.
- Gilthari Luxury Champagne. Contains said reagent.
- Trinket box. Think an engagement ring box, except it can also hold coins and medals. May be toggled open/closed, when opened it's description will say what's inside. Can only hold one item. Thanks to Mechoid for helping me code this mess. https://i.gyazo.com/7a16faada015ef0795a4db2ec6429e68.png
- Also goes in and fixes a small bug with the heart box saying it contains donuts when it does, in fact, not contain donuts.

Side note, mapping things in is scary!!!

* In the process of fixing the map merger nonsense w/ mechoid's help.

* We're almost there lads.

* If this doesn't work I'll cry.

* Changes name to AlliCo Baubles and Confectioneries, fixes conflict (hopefully), and adds friendship bracelets to vendor.

* REVERTING ITEMS.DMI. Attempting to fix conflict.

* Recommitting items.dmi

* One last attempt to fix the conflict before I make some bigger changes to get this through.

* Removed conflicting file and committed out calls on the sprite. Will readd in separate PR.

* now with 20% less silly
2018-02-24 11:01:23 -06:00
Arokha Sieyes
9e20ead03a Small tweak to survival boxes
Synths start with a unique empty type rather than just an unnamed cardboard box, and don't get a tank or the comprehensive supplies (the only useful thing would be the glowstick, but there are a billion of those).
2018-02-23 11:51:11 -05:00
Leshana
1c7a9c6837 Fixes VOREStation/VOREStation#3075 - Boxes of Chocolates say they contain donuts. 2018-02-22 15:25:33 -05:00
Anewbe
21592606b7 Merge pull request #4898 from Mechoid/Mining_Optimization
Mining Bag / Box Speedification
2018-02-21 16:15:16 -06:00
Arokha Sieyes
3fdafb7194 Rename medical scanners and update map 2018-02-20 19:25:31 -05:00
Mechoid
d3cc476eb0 Un-fub comments. 2018-02-20 13:57:51 -08:00
Mechoid
8a3dcc5cc1 Makes Mining Satchels brute-force their way out of lagging, minerborg prodding. 2018-02-20 12:58:13 -08:00
Arokha Sieyes
3178b95b6c POLARIS: Moves most boxes to use starts_with 2018-02-18 13:29:21 -06:00
Anewbe
16295de3cf Merge pull request #4829 from VOREStation/pol-ghostbox
Lets animals and ghosts look in boxes/backpacks/whatever
2018-02-17 10:06:06 -06:00
Anewbe
329a65be08 Merge pull request #4838 from VOREStation/pol-emerboxes
Port Bay's survival boxes
2018-02-17 10:05:39 -06:00
Aronai Sieyes
81f946c724 Merge branch 'master' into pol-ghostbox 2018-02-16 22:22:35 -06:00
Arokha Sieyes
f4d0ec3fb8 Port Bay's survival boxes
Includes some tweaks to items that usually come in the boxes to make them more similar to the Bay implementation.
2018-02-16 19:21:15 -06:00
Anewbe
ab9f296adb Merge pull request #4837 from Schnayy/giftitems
Gift items + Cargo crate
2018-02-16 12:52:59 -06:00
Schnayy
02447e5c19 The largest PR I've probably actually done. Adds the following:
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.

Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
2018-02-15 03:33:23 -06:00