Commit Graph

537 Commits

Author SHA1 Message Date
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
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
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
Marina Gryphon
bb4ff8a507 Fixes a bug with packing parachutes. 2018-01-29 22:44:53 -06:00
Arokha Sieyes
f2fef6f410 Planes Framework (#4545)
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
Spades
b441ccd6e3 9mm pistol updates (#4480)
* These aren't supposed to be here!!

* Adds new Security pistol and large capacity magazines

* Removes new pistol from Security spawns

* Removed references of Beretta because it's not one
2018-01-14 14:45:15 -06:00
Mechoid
ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Verkister
7e99f11fe6 Fixes unfoldable boxes.
-Apparently storage proc for this thing was changed to return 1 regardless if the item had the quick empty verb or not, which in turn triggered the very first nope of the box specific code.
-Boxes can be quick emptied but lack the actual verb apparently?
2017-12-29 13:28:44 +02:00
Woodratt
ed9395e58f SC Stupid Sized Map Update
Or how Woodrat spent too long on something that was supposed to be simple.

- Addition of a Explorer Radio Channel and headsets.
- Explorers and Search and Rescue job slots added
- Adjustments to the pilot job including getting rid of the flatcap
- Map fixes, adjustments, (including signs pointing to cryo) planetside side map additions splitting up of the wilderness into two area sections
- Disabled lighting on the arrivals shuttle area once it is docked with the station, should help with the whole issue of lighting bugging out and having dark space
- Fixed EMS jacket missing icons
- Fixed Research signs being missing for some reason, addition of directional signs for cryo
- Addition of a Search and Rescue Winter coat
- Probably a dozen other small bug fixes I forgot, and bug additions

Tested, seems fine. At least in short tests.
2017-12-24 07:04:34 -08:00
mistyLuminescence
c986d57c34 Med Pill Blue Pill (#4404)
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
2017-12-23 14:45:24 -08:00
Neerti
791754b2de Merge pull request #4382 from Anewbe/parachute
Adds parachutes
2017-12-08 20:17:51 -05:00
Belsima
8d3ceab287 grammar never ends (#4421)
* Update Sleeper.dm

* Update robot_fabricator.dm

* Update requests_console.dm

* Update vr_console.dm

* Update teleporter.dm

* Update records_scanner.dm

* Update mercrenegade.dm

* Update clown_items.dm

* Update firstaid.dm

* Update teleporter.dm

* capitalization fixes

* Update clown_items.dm
2017-12-08 15:30:34 -06:00
Anewbe
573d3a1bbd Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute
# Conflicts:
#	icons/obj/storage.dmi
2017-12-07 17:59:13 -06:00
mistyLuminescence
4b102b7870 Adds food bags! (#4389) 2017-12-07 17:49:59 -06:00
mistyLuminescence
0d458b204e Adds the advanced health analyzer (#4326)
* WIP - advanced health analyzer

* Adds the advanced health analyzer.

* Updates radiation levels

* Fixes travis and removes snark

* Fixes a bug that wasn't my fault (for real)

* Adds tiers.

* Phasic sounds cooler

* Fixes sprites
2017-12-03 17:36:51 -06:00
Anewbe
132168bc81 Further parachute functionality 2017-12-01 22:11:38 -06:00
Anewbe
c2a8afb7c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute
# Conflicts:
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
2017-12-01 18:47:06 -06:00
Anewbe
085c33e39a Adds parachutes 2017-12-01 18:37:30 -06:00
mistyLuminescence
4d44d47a59 Mobile Camera Pods (#4330)
* Adds tactical cameras!

* Adds MCP crate

* Destroy the tac-cams!

* Updates description

* Removes MCP box from Armory

* we can't actually get MCPs any more
2017-12-01 16:00:49 -06:00
Neerti
7497aef295 work 2017-11-26 12:08:05 -05:00
Anewbe
1fb2e32e2f Merge pull request #4297 from Neerti/11/18/2017_make_syndie_toolboxes_special_again
Makes Syndie Toolboxes Special Again
2017-11-19 17:25:44 -06:00
Belsima
594625cf81 Adds force to a pair of items that were lacking for some reason, and standardizes light replacer file. (#4280)
* Adds force to lamps.

* Standardization.

* Standardizes a few things.

* Grammar that I missed.

* Some more missed grammar.
2017-11-19 02:52:56 -06:00
Neerti
4263a9b70b Makes Syndie Toolboxes Special Again
The syndie toolboxes have been split into two versions, one with the old contents pre-powertools and one with the current powertools. Both are in the uplink, however only the regular tool version of the syndie toolbox can be found in maint now. This is to make power tools less commom, as there are several spots where syndie toolboxes are guaranteed to spawn at,  and it made the CE's tools less special.
2017-11-18 08:06:38 -05:00
Anewbe
7a36a8cfb6 Merge pull request #4118 from mistyLuminescence/cryostorage
Reworks cryopod storage
2017-10-22 19:03:07 -05:00
mistyLuminescence
ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01:00
Mechoid
920e823a46 Fuel-Rod Gun, Minor fixes related. (#4103)
* A whole load of things.

* Fixes the SM Rod's travel distance.
2017-10-19 15:07:52 -05:00
Ansari
768dc2d7c0 Port over Chemistry bag from Paradise (#4067)
* Add in chemistry bag from Paradise, based on /tg/ bag. Add it to biogenerator. Add it to wardrobe.

* Make itemsize large so it cannot be put in backpack. Slowdown = 1.
2017-10-15 15:04:56 -05:00
Anewbe
ccd90031fa Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci
Science Dufflebag
2017-10-06 10:51:05 -05:00
MisterLayne
8aed98be14 Adds science dufflebag 2017-10-05 16:26:56 -04:00