Commit Graph

2671 Commits

Author SHA1 Message Date
atermonera
48c6161c4d Adds umbrellas to loadout, for 3 points 2018-02-26 12:39:56 -08: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
Atermonera
8315c0b92f Merge pull request #4938 from Anewbe/bombs_again
Further Package Bomb adjustments
2018-02-24 22:55:40 -08: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
Anewbe
d92fb517cd Merge pull request #4936 from VOREStation/vplk-sundry-fixes-feb
Sundry Bugfixes - Feburary
2018-02-23 23:53:03 -06:00
Anewbe
4f6074f2ae Further Package Bomb adjustments 2018-02-23 20:48:30 -06:00
Anewbe
328a7c54df Merge pull request #4926 from VOREStation/vplk-gas-turbine
Make gas turbine constructable and operational
2018-02-23 13:16:56 -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
a1bfd1fb46 Make gas turbine constructable and operational
* Make gas turbine constructable, as well as modernizing its code. Borrowed some from /tg
* Converted the gas turbine control computer to nano ui.
2018-02-22 15:43:38 -05:00
Leshana
32c177b66f Stop candles from messaging the universe when they light. 2018-02-22 15:25:39 -05:00
Leshana
581bee4909 Fix runtime when clicking RCD on almost anything.
- get_base_turf_by_area() must only be called on turfs!
2018-02-22 15:25:33 -05:00
Leshana
1c7a9c6837 Fixes VOREStation/VOREStation#3075 - Boxes of Chocolates say they contain donuts. 2018-02-22 15:25:33 -05:00
Anewbe
51420a0aa7 Flashbangs no longer Stun() 2018-02-22 02:20:25 -06:00
Anewbe
01ae959020 Merge pull request #4865 from Atermonera/umbrella
Adds umbrellas
2018-02-21 23:06:44 -06:00
Anewbe
21592606b7 Merge pull request #4898 from Mechoid/Mining_Optimization
Mining Bag / Box Speedification
2018-02-21 16:15:16 -06:00
Anewbe
dfdafddaa9 Merge pull request #4897 from VOREStation/pol-analfix
Fix health analyzer names
2018-02-21 10:03:09 -06:00
Anewbe
a6653bf00a Merge pull request #4896 from VOREStation/pol-qdels
Fix several Destoy()s
2018-02-21 10:01:23 -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
0c0f09fe68 POLARIS: Fix several Destroy()s 2018-02-20 10:00:23 -05:00
Anewbe
14196a9404 Tones down package bombs 2018-02-19 15:45:21 -06:00
Arokha Sieyes
3178b95b6c POLARIS: Moves most boxes to use starts_with 2018-02-18 13:29:21 -06:00
atermonera
4197a0c117 Adds umbrellas sprites courtesy of schnayy 2018-02-17 13:30:50 -08: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
Arokha Sieyes
894b1b32c2 POLARIS: Lets animals and ghosts look in boxes 2018-02-15 02:04:11 -06:00
Arokha Sieyes
e248b89b7b POLARIS: Player-controlled SA QOL 2018-02-15 01:49:53 -06:00
Anewbe
51d425b1b8 THE MINI FIST-PUNCH UPDATE (#4804)
* VARIOUS FISTICUFFS RELATED CODE CHANGES
2018-02-12 23:17:35 -08:00
Anewbe
534a588a6a Gun changes (#4185)
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
2018-02-12 23:12:14 -08:00
BillyBangles
ef86caf177 Adds decorative bones and bone loot pile (#4800)
* adds various bones and bone loot pile

credit to schnayy for most of these sprites

* removes the crossbow bolt from the loot list
2018-02-12 22:13:47 -06:00
Cyantime
a2f3443828 SMES tweaks (#4793)
* SMES tweaks

* Replace some fireloss with electrocute_act
2018-02-12 20:39:58 -06:00
Mechoid
e28b66b700 Makes Tape work on Nerds, and people without eyes. (#4791) 2018-02-11 19:02:22 -08:00
Anewbe
1642848db7 Merge pull request #4754 from VOREStation/vplk-id-refactor
Fix IDs so they do not instantiate every job datum on New
2018-02-08 14:32:42 -06:00
BillyBangles
64b98e0dae Adds 2 new cave POIs (#4743)
* adds temple and ritual POIs

as well as ever-burning candles, a candleabra, and a neat red crystal that looks like supermatter but isn't

* fixes all cases of 'candelabra' spelling

i am a dunce

* fixes main map changes

i don't even know what i fuckin did to this thing??? ?? ??? ???

* removes unnecessary light() proc
2018-02-08 14:10:02 -06:00
Leshana
f741bba7cb Fix IDs so they do not instantiate every job datum on New
Every ID was instantiatating and deleting a copy of *every* job datum in its New().  Thats silly.  Switch to initialize so job_master is available.
2018-02-07 16:38:37 -05:00
Neerti
828b594701 Merge pull request #4716 from VOREStation/vplk-ss-atoms-shuttles
Atom Initializing and Shuttles Subsystem + CALLBACK
2018-02-05 23:39:47 -05:00
mistyLuminescence
d04faba6c4 Machetes now fit on belts (#4725)
* Knives and machetes now fit on belts

* just machetes
2018-02-05 22:29:37 -06:00
Leshana
5847319443 Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-05 15:50:13 -05:00
Anewbe
08e44f8a5a Merge pull request #4721 from mistyLuminescence/syndietoolbox
Fixes syndie powertool toolboxes
2018-02-05 01:57:02 -06:00
mistyLuminescence
da4bd82a5d Adds more med gear to R&D and Cargo (#4691)
* Adds more med gear to R&D and Cargo

* standardises + adds sprites

* Removes cargo crate
2018-02-04 22:18:36 -06:00
mistyLuminescence
79f774e591 Fixes syndie powertool toolboxes 2018-02-04 21:17:51 +00:00