Commit Graph

17075 Commits

Author SHA1 Message Date
Mechoid
5dc7189cf7 Various Loot Pile and Dungeon objects Stage Uno (#4975)
* Loot Piles

* Mecha Loot Piles, Random Tool Spawners

* Fix Random Spawners, don't use Fiftyspawners
Fix Fiftyspawners
2018-02-28 11:18:44 -06:00
Anewbe
33766df3d4 Fixes a runtime in hail code (#4973) 2018-02-27 17:46:08 -08:00
BillyBangles
f49b1a9ad2 Adds ice puzzle POIs (#4963)
* adds slippery ice tiles

* adds ice puzzle POIs

also bedrock (impassable) rock, and ice crystals (which use placeholder
graphics for now)
2018-02-27 17:45:47 -08:00
Belsima
a578eeeb85 plushie love (#4964)
* plushie love

* Kiss2

* good god why

* you can make severed heads kiss now :)

* [I] first

* [I] first2

* comma

* comma
2018-02-27 14:49:06 -06:00
Anewbe
cf79159b31 Merge pull request #4967 from Atermonera/umbreload
Adds umbrellas to loadout, for 3 points
2018-02-27 14:48:04 -06:00
Schnayy
36236e1883 Sivian Western Sprite Pack (#4970)
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.

* Adds 2 cowboy boots and a stick horse. yeehaw.

* Attempting to squash conflict that was caused by one of my OWN prs. For shame.

* attempting to fix conflict ft. anewbe
2018-02-27 14:24:20 -06:00
elgeonmb
8c9c99f817 Adds new languages (#4961)
* langs

* humanity first

* humanity first but for real this time

* i know how to spell good

* grumbles
2018-02-26 21:21:50 -06:00
atermonera
48c6161c4d Adds umbrellas to loadout, for 3 points 2018-02-26 12:39:56 -08:00
Atermonera
519754c2e8 Merge pull request #4959 from Screemonster/itsmostlywater
Makes drinking bleach bad for you
2018-02-26 12:16:13 -08:00
Atermonera
eaaec93df2 Merge pull request #4955 from Anewbe/prommie_water_fix
Fixes a bug in Promethean water ingestion
2018-02-26 12:15:51 -08:00
Atermonera
56b54aba73 Merge pull request #4948 from Nerezza/Tilematic
Adds TG-style floor tile swapping
2018-02-26 12:12:26 -08:00
Neerti
355aaec3d2 Merge pull request #4950 from Anewbe/yet_another_fix
Should be able to attach accessories by clicking the target item again
2018-02-25 14:11:43 -05:00
Screemonster
b8b173b044 Makes drinking bleach bad for you 2018-02-25 18:51:18 +00:00
Anewbe
5cd5eaaad8 Merge pull request #4949 from Nerezza/Floor-fixes
Flooring fixes
2018-02-25 12:39:33 -06:00
Anewbe
a42d7ecdb4 Merge pull request #4944 from VOREStation/pol-matweak
Tweak weird MA override
2018-02-25 12:38:58 -06:00
Anewbe
fb5564b504 Merge pull request #4946 from VOREStation/pol-fbpbat
FBP backup battery cells for survival purposes
2018-02-25 11:27:54 -06:00
Schnayy
643ba39d73 Prommie Cohesion Suits (#4937)
* Adds prommie cohesion suits. Still need tesh sprites + loadout.

* adds the tesh sprites + loadout option.

* Renammed cohesion suits & icon files.

* Almost forgot to adjust the bird file names. There we go.

* Removed redundant line
2018-02-25 11:26:02 -06:00
Anewbe
387f977f45 Copy paste is bad, kids 2018-02-25 02:44:32 -06:00
Anewbe
0b8dfae30b Null checks and tears 2018-02-25 02:25:06 -06:00
Atermonera
3c7c5da848 Merge pull request #4941 from Mechoid/Turret_Fangs
Turrets Target through Girders, Airlock assemblies, and other unanchored structures.
2018-02-24 22:54:39 -08:00
Atermonera
61ca538e06 Merge pull request #4929 from Anewbe/splints
Splints no longer perfectly prevent negative effects from broken bones
2018-02-24 22:52:25 -08:00
Anewbe
bbd870e502 More accessory runtimes and bugfixes 2018-02-24 18:38:11 -06:00
Anewbe
7b87cd61a6 Should be able to attach accessories by clicking the target item again 2018-02-24 17:39:16 -06:00
Nerezza
c7fdd099b6 Flooring fixes
Firstly it fixes a long-standing bugs with constructable flooring not actually populating on server startup, but instead through a proc that's only called on existing floor tiles.

Second it changes sif wood tiles into a child of wood tiles now that the reason for carpet colors not working is known & fixed.
2018-02-24 15:31:10 -06:00
Nerezza
1f7054b6d0 Adds TG-style floor tile swapping
Hold the tool for pulling a floor tile in your offhand and use a stack of floor tiles (ie, carpet) on the target floor.

This respects the different tools and their effects. Replacing wooden tiles should be done with a screwdriver, not a crowbar.
2018-02-24 13:59:51 -06:00
Arokha Sieyes
1168439878 POLARIS: FBP backup battery cells for survival purposes
Usable with <= 100 nutrition, adds 100 nutrition.
2018-02-24 14:25:29 -05: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
74a4e993ee Merge pull request #4939 from Anewbe/accessories
Should fix an accessories oversight
2018-02-24 11:29:50 -06:00
BillyBangles
475d250d6a adds slippery ice tiles (#4935) 2018-02-24 11:04:58 -06:00
elgeonmb
4e9aaf230c adds new article, adds old article we forgot to add (#4934)
* adds new article, adds old article we forgot to add

* pesky typo
2018-02-24 11:03:39 -06:00
Anewbe
5b0aac2a91 Merge pull request #4933 from VOREStation/vplk-macro-qol
Create client preference for if hotkey mode is enabled by default on login
2018-02-24 11:03:03 -06: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
12015d7f5a Merge pull request #4915 from MisterLayne/slimebaton_dropper
Slimebots drop the right baton.
2018-02-23 23:44:50 -06:00
Mechoid
9cd4bde3d1 Test Projectiles can pass through things other projectiles are capable of, and unanchored structures. 2018-02-23 21:27:41 -08:00
Anewbe
99312f323d Should fix an accessories oversight 2018-02-23 22:22:53 -06:00
Anewbe
63667c4a02 Merge pull request #4927 from VOREStation/pol-gun
Fix mode_name on guns always being null
2018-02-23 13:18:36 -06:00
Anewbe
b58b4fcfde Merge pull request #4928 from VOREStation/pol-join-order
Create humans ON their spawn points
2018-02-23 13:18:28 -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
Leshana
1d11b0d6e1 Create client preference for if hotkey mode is enabled by default on login or not.
* Adds preference setting for wether hotkeys should default to enabled or disabled.
* Fixes bug for CTRL+NUMPAD8 using old verb name for toggling head.
2018-02-23 14:16:53 -05:00
Anewbe
849ef9a8d6 Merge pull request #4925 from VOREStation/vplk-tesla-grounding
Tweak Tesla Grounding Rods
2018-02-23 13:16:46 -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
Atermonera
7f12366cc8 Merge pull request #4862 from Anewbe/steals_more_armor
Adds/steals more armor code, inventory changes
2018-02-22 18:55:01 -08:00
Atermonera
4a0acb27f1 Merge pull request #4909 from Anewbe/two_handed_guns
Ports more two-handed gun sprites from Bay
2018-02-22 18:27:23 -08:00
Anewbe
d7b7a1be00 Merge pull request #4919 from AbbieFland/pai-communicator
Fixed pAI communicator buttons.
2018-02-22 20:26:50 -06:00
Atermonera
9993031500 Merge pull request #4917 from Anewbe/surgery_oversight
Corrects an oversight with surgery and defibs
2018-02-22 18:25:04 -08:00
Anewbe
af62498e28 Progress 2018-02-22 19:49:30 -06:00
Anewbe
0c75b3e634 Merge pull request #4916 from VOREStation/pol-hudfix
Critters Can Crawl Carrying Client Constructs
2018-02-22 19:19:28 -06:00
Arokha Sieyes
1720cd54f3 Create humans ON their spawn points
Instead of moving them there later.
2018-02-22 20:14:39 -05:00
Arokha Sieyes
3680b0382a POLARIS: Fix mode_name on guns always being null 2018-02-22 20:03:54 -05:00