Commit Graph

14834 Commits

Author SHA1 Message Date
Aronai Sieyes
2935ec1ac8 Merge pull request #3149 from VOREStation/aro-sync
Polaris Sync
2018-02-27 21:48:52 -05:00
Aronai Sieyes
dcc02e5090 Merge pull request #3153 from VOREStation/aro-convo
Adds 'Intercom Convo' verb
2018-02-27 21:48:39 -05:00
Aronai Sieyes
0f4185ceec Merge branch 'master' into aro-bellies 2018-02-27 21:39:53 -05:00
Arokha Sieyes
3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -05:00
Arokha Sieyes
43065846a4 Adds 'Intercom Convo' verb
Allows an admin to 'schedule' up to 20 messages to play on the radio.
2018-02-27 21:24:22 -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
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
Atermonera
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
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
Arokha Sieyes
f04c58f202 VS: Rewrites basically all of how bellies work
And cleans up a ton of stuff.
2018-02-27 13:29:45 -05:00
Arokha Sieyes
7b3c9ae8e9 POLARIS: Gibber tweaks 2018-02-27 13:29:40 -05:00
Arokha Sieyes
9128b2c68d POLARIS: Stub drop_location()
No specific implementations for Polaris yet, copy some and use this commit too.
2018-02-27 13:29:39 -05:00
Arokha Sieyes
f87fcd37f1 POLARIS: Port's /tg/'s current sound.dm, plus pref
It's mostly the same, just a little more efficient. I added a 'preferences' var to pass a datum and decide whether or not to play the sound for that client based on some preference.
2018-02-27 13:29:39 -05: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
Arokha Sieyes
5bf8dd9caa Remove combat medkit from station spawns
It's pretty damn powerful for something you can just randomly find in several spots on the station.
2018-02-26 15:26:27 -05:00
Atermonera
56b54aba73 Merge pull request #4948 from Nerezza/Tilematic
Adds TG-style floor tile swapping
2018-02-26 12:12:26 -08:00
Anewbe
d1aa9affe4 Merge pull request #4953 from Schnayy/trinketbox
Trinket box
2018-02-26 10:04:14 -06:00
Belsima
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
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
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
Leshana
00f8ae5cd8 Convert turfs to use add_overlays(), eliminating the turf_overlay_holder!
- Converted as much as I could find about turf overlays to use add_overlay().
- This should be enough to stop BYOND from crashing, so we can eliminate the turf_overlay_holder hack.
- This also lets us remove the anti-corruption hacks from walls and open space.
- ZAS gas overlays can use priority overlays, so this also fixes the gas-goes-away-when-crowbarring-plating issue.
- Stuff like that
2018-02-25 02:02:57 -05:00
Atermonera
8315c0b92f Merge pull request #4938 from Anewbe/bombs_again
Further Package Bomb adjustments
2018-02-24 22:55:40 -08:00
Leshana
07f89c26b7 Convert fire alarms to use add_overlay() A good first test. 2018-02-25 01:00:15 -05:00
Aronai Sieyes
325d05317a Merge pull request #3126 from VOREStation/exp-ss-overlays
Port SSoverlays
2018-02-24 19:36:36 -05:00
Aronai Sieyes
e1cb261d94 Merge pull request #3122 from VOREStation/aro-joinbug
Fix oversight in not-late-join jobs without spawnpoints on the map
2018-02-24 19:27:53 -05:00
Leshana
f2f630fa89 Ported the core of the overlays management subsystem from /tg
- Added SSoverlays subsystem for compiling overlay lists and applying them to atoms in a controlled anti-lag subsystem.
- Added vars and procs to atom which should eventually replace all direct interaction with BYOND's /atom/overlays var outside the subsystem.
- Added OVERLAY_QUEUED flag to var/atom/flags bitfield.
- Added small framework for subsystem performance tracking. So far used only by SSoverlays
- Added admin debug command "Display overlay Log" to see performance stats mid-round.
2018-02-24 17:40:35 -05:00
Arokha Sieyes
7fbe6d05a1 POLARIS: Make cryopods check area first, then range
The bug referenced hasn't existed for quite a while. We'll keep the range check as a fallback, though.
2018-02-24 16:57:53 -05: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
Arokha Sieyes
aee772bb15 POLARIS: Fix oversight in not-late-join jobs without spawnpoints on the map
They spawn in space. That's fine, right?
2018-02-24 15:22:23 -05: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
Aronai Sieyes
f29484f8da Merge pull request #3117 from VOREStation/aro-fbpcells
Adds a synth backup cell to synth survival box, plus goggles
2018-02-24 14:43:48 -05:00
Aronai Sieyes
f6d65ec0b8 Merge pull request #3114 from VOREStation/aro-matweak
Tweak MA constructor
2018-02-24 14:43:26 -05:00
Arokha Sieyes
19cffffdc3 VS: Synth goggles in survival box 2018-02-24 14:14:35 -05:00
Aronai Sieyes
cb390b0295 Merge pull request #3115 from VOREStation/aro-timemap
Maps in timeclocks
2018-02-24 14:04:29 -05:00
Leshana
4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24
# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm
2018-02-24 13:19:10 -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
Arokha Sieyes
243ce6ddca Maps in timeclocks 2018-02-24 12:05:15 -05:00
BillyBangles
475d250d6a adds slippery ice tiles (#4935) 2018-02-24 11:04:58 -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
Arokha Sieyes
9bc7510e26 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 11:44:57 -05:00
Anewbe
d92fb517cd Merge pull request #4936 from VOREStation/vplk-sundry-fixes-feb
Sundry Bugfixes - Feburary
2018-02-23 23:53:03 -06:00