Commit Graph
14016 Commits
Author SHA1 Message Date
AnewbeandAtermonera c13c1c6ad0 Adjusts PoIs (#4954)
* Adjusts PoIs
2018-03-01 11:57:18 -08:00
AnewbeandGitHub ee9061e80f Merge pull request #4982 from Cyantime/tinypda
Fixes two minor PDA cart issues.
2018-03-01 11:09:26 -06:00
AnewbeandGitHub dda4b68e4d Merge pull request #4981 from VOREStation/pol-radio-drama
Adds 'Intercom Convo' verb
2018-03-01 10:32:30 -06:00
BelsimaandAnewbe 085f88cdc9 GORILLA - The Revival (#4957)
* GORILLA

* is this absolute

* less indentation

* Minor balance adjustments

* Mech update
2018-02-28 22:33:56 -06:00
AnewbeandGitHub 36540182df Merge pull request #4965 from Belsima/techy
Adds illegal and other tech to some implants.
2018-02-28 14:17:17 -06:00
BillyBanglesandAnewbe 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
AnewbeandGitHub 2bcad10584 Merge pull request #4974 from VOREStation/pol-plushsshhhshsh
Ports Plenty Pretty Paradise Plushes
2018-02-28 11:19:55 -06:00
MechoidandAnewbe 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
AtermoneraandGitHub dfe41e3250 Made a <br> into a <brr> 2018-02-27 21:42:41 -08:00
Cyantime ec5f2543d7 Fixes two minor PDA cart issues. 2018-02-27 22:45:09 -05:00
Arokha Sieyes 7aa5ca479a Adds 'Intercom Convo' verb
Allows an admin to 'schedule' up to 20 messages to play on the radio.
2018-02-27 21:17:47 -05:00
BillyBanglesandAtermonera 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
AtermoneraandGitHub d345a60ad7 Merge pull request #4960 from Nerezza/Shutter-tape
Makes tape appliable to hazard shutters just like airlocks
2018-02-27 17:45:11 -08:00
Arokha Sieyes 1afa7a10f5 Further toy tweaks 2018-02-27 16:00:32 -05:00
Arokha Sieyes 6d165a5059 Belsima toy word changes 2018-02-27 16:00:32 -05:00
Arokha Sieyes 63fd767102 Rebased deconflicted plush additions 2018-02-27 16:00:16 -05:00
BelsimaandAnewbe 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
AnewbeandGitHub cf79159b31 Merge pull request #4967 from Atermonera/umbreload
Adds umbrellas to loadout, for 3 points
2018-02-27 14:48:04 -06:00
SchnayyandAnewbe 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
elgeonmbandAnewbe 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
AtermoneraandGitHub 56b54aba73 Merge pull request #4948 from Nerezza/Tilematic
Adds TG-style floor tile swapping
2018-02-26 12:12:26 -08:00
AnewbeandGitHub d1aa9affe4 Merge pull request #4953 from Schnayy/trinketbox
Trinket box
2018-02-26 10:04:14 -06:00
BelsimaandGitHub 59e07f941e Implant Tech 2018-02-26 09:23:18 -05:00
Nerezza 413e832825 Makes tape appliable to hazard shutters just like airlocks
Clicking hazard shutters with tape will tape them up like airlocks, instead of opening them (if you have the access to).
2018-02-25 14:46:32 -06:00
AnewbeandGitHub 5cd5eaaad8 Merge pull request #4949 from Nerezza/Floor-fixes
Flooring fixes
2018-02-25 12:39:33 -06:00
AnewbeandGitHub 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
AtermoneraandGitHub 8315c0b92f Merge pull request #4938 from Anewbe/bombs_again
Further Package Bomb adjustments
2018-02-24 22:55:40 -08: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 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
BillyBanglesandAnewbe 475d250d6a adds slippery ice tiles (#4935) 2018-02-24 11:04:58 -06:00
AnewbeandGitHub 2553edc2a0 Merge pull request #4932 from VOREStation/pol-box2
Small tweak to survival boxes
2018-02-24 11:02:07 -06:00
SchnayyandAnewbe 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
AnewbeandGitHub 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
AnewbeandGitHub b58b4fcfde Merge pull request #4928 from VOREStation/pol-join-order
Create humans ON their spawn points
2018-02-23 13:18:28 -06:00
AnewbeandGitHub 328a7c54df Merge pull request #4926 from VOREStation/vplk-gas-turbine
Make gas turbine constructable and operational
2018-02-23 13:16:56 -06:00
AnewbeandGitHub a3ce499607 Merge pull request #4924 from VOREStation/vplk-atmos-trinary
Eliminate duplicate code in trinary atmos components
2018-02-23 13:16:37 -06:00
BillyBanglesandAnewbe 8f8f692ea0 Makes a dark ritual even darker (#4923)
* makes a dark ritual even darker

* makes the dark ritual maybe not THAT dark

* tweaks rune icon
2018-02-23 13:16:26 -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
AtermoneraandGitHub 0f2ef45d71 Merge pull request #4922 from Anewbe/flashbang_stun
Should actually fix the flashbang thing, hopefully without a billion extra commits
2018-02-22 20:11:02 -08:00
AtermoneraandAnewbe 4e9a1a0fba Unobfuscates GPS locations (#4910)
* Makes GPS units more useful, adds helper to give more useful dir strings

* Re-obfuscates PoI gps locations

They keep adir direction though, so finding them should generally be easier

* Re-obfuscates PoI gps locations
2018-02-22 22:10:18 -06:00
AtermoneraandGitHub 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
AnewbeandGitHub ac43a54254 Merge pull request #4918 from Mechoid/Mob_Spawners
Adds a few random mob spawners.
2018-02-22 20:26:01 -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
AtermoneraandAnewbe 410aca398e Adds halogen counter tool, adds gas scanner to analyzers (#4903)
* Adds halogen counter tool, adds gas scanner to analyzers

* Appeases travis

* Missed a tag
2018-02-22 15:01:25 -06: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