Commit Graph

5022 Commits

Author SHA1 Message Date
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
Anewbe cf79159b31 Merge pull request #4967 from Atermonera/umbreload
Adds umbrellas to loadout, for 3 points
2018-02-27 14:48:04 -06:00
Woodratt dd7bfd6c43 Wilderness Overhaul
- Heavy rework of the wilderness, minor adjustments to mining and outpost z-levels. To get to the wilderness you now have to travel through the mine z-level to do so, follow the green flagged path through the mine.
  - Shuttles can now land at a site near the entrance to the wilderness. Removal of the mine shuttle landing pad to move it to the wilderness.
  - New addition of warning sign, thanks to Schnayy.
  - Bugfixes for Heist shuttle not going back to raider post, light overlays on shuttle areas, and certain shuttles not leaving behind floor tiles when they should.
2018-02-26 20:10:46 -08:00
atermonera 48c6161c4d Adds umbrellas to loadout, for 3 points 2018-02-26 12:39:56 -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
atermonera 5c53196915 Updates changelog 2018-02-25 19:00:11 -08: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
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
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 1421a2c68c Added changelog
They probably wanna know what the new stuph iz
2018-02-24 15:26:06 -06: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
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
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 8eb72ead35 Robolimbs require repair at 30 composite damage 2018-02-24 02:37:09 -06:00
Leshana 30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-02-23 21:55:42 -05: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
atermonera 27c40c37cc Changelog update: 2/22/12018 2018-02-22 20:19:40 -08:00
atermonera b9e4165d44 Changelog 2018-02-22 20:15:01 -08:00
Atermonera 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
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 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 364c0253dc Tweak Tesla Grounding Rods
Grounding rods that are anchored can be struck two turfs farther away than unanchored.  This makes it possible to leapfrog towards a tesla because an unanchored one can be protected in the "shadow" of the anchored one.
2018-02-22 15:32:31 -05:00
Anewbe e5dd88cd30 Fixes Changelog 2018-02-22 00:03:54 -06:00
Anewbe 8c5dc66a13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-21 23:33:17 -06:00
Anewbe 01ae959020 Merge pull request #4865 from Atermonera/umbrella
Adds umbrellas
2018-02-21 23:06:44 -06:00
BillyBangles 5486edf567 Adds various cabin-related things. (#4888)
* adds fireplace, makes bonfire generate heat

kinda, anyways

* adds sifwood tiles, fixes old blue carpets

old blue carpets are now known as "teal carpets." they still come in the
carpet crate from cargo.

* lets you dig up tree stumps with shovels

* changelogs in the house

* adds a delay to digging up stumps

digging up stumps is easier said than done
2018-02-21 15:45:01 -06:00
atermonera 64f09b0070 Changelog update 2018-02-21 00:39:51 -08:00
Leshana 5817e3da7b Makes electrochromatic glass buildable and programmable in game. (#4883)
- Reinforced glass windows can be upgraded to electrochromatic by hitting them with a cable coil.  The window must not be unpried from its frame to upgrade it (but it can remain anchored).
- Windows can be linked with a tint button by using a multitool on the button to buffer it, then using it on the window to set the ID.  The window must be completely unanchored to edit its id.
- Window tint buttons can have thier ID set *once* with a multtool.
- Inspired by Baystation12/Baystation12#20508
- Also adds a "full tile" polarized window type for use by mappers.
2018-02-21 00:33:49 -08:00
Anewbe 07c970e6e5 Merge pull request #4894 from Woodratt/02202018_vaultpoi
New Cave PoIs
2018-02-21 02:02:28 -06:00
PrismaticGynoid 726d04d8a1 Succumb changes
Succumb now works on sufficiently-injured mobs that are unable to take oxyloss damage, like prometheans, FBPs, and dionaea. You're also now given a notification if you try to succumb when you're not injured enough for it.
2018-02-20 20:13:44 -08:00
Anewbe 67261d40f3 Adds planetside gun permits (#4879) 2018-02-20 12:37:03 -08:00
Anewbe 25a1f47a30 Headset sprites, planetside headset functionality (#4869) 2018-02-20 12:36:22 -08:00
Woodratt dad162659a New Cave PoIs
- Addition of 6 new potential PoIs for the cave z-level.
2018-02-20 00:59:30 -08:00
Mechoid 39e737f2a3 Merge pull request #4846 from Anewbe/wetslime.nt
Prometheans are bothered by water
2018-02-19 20:28:26 -08:00
Arokha Sieyes 5967bb6dc5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-6.dmm
2018-02-18 00:25:36 -06:00
atermonera 4197a0c117 Adds umbrellas sprites courtesy of schnayy 2018-02-17 13:30:50 -08:00
Anewbe 84fdf3369f Changelog 2018-02-17 15:26:11 -06:00
Anewbe 077b73a446 Suit coolers don't magically shut off in mild fires (#4820) 2018-02-17 11:19:21 -08:00
atermonera 60559da6ab Changelog update 2018-02-17 10:57:52 -08:00
Leshana 7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
2018-02-17 00:35:29 -05:00
Anewbe ab9f296adb Merge pull request #4837 from Schnayy/giftitems
Gift items + Cargo crate
2018-02-16 12:52:59 -06:00
Anewbe b7711fa490 Prometheans are bothered by water 2018-02-15 19:11:54 -06:00
PrismaticGynoid 3e8109e8c6 Department ponchos for all
Removes the job restrictions on the department ponchos, making them able to be taken from the loadout by any job, just like the department jackets.
2018-02-15 16:26:55 -08:00
BillyBangles f5dfbff1bd Build igloos and snowmen (#4811)
* adds packed snow brick material

* makes snow walls spawnable for mapping

* adds snowmen

craft them with snow. duh.

* snow spider triggers arachnophobia

also changelog.
2018-02-15 14:25:51 -06:00
Anewbe 7e2df51283 Changes mine code, adds random mine spawners (#4817) 2018-02-15 12:19:58 -08: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
Anewbe 51d425b1b8 THE MINI FIST-PUNCH UPDATE (#4804)
* VARIOUS FISTICUFFS RELATED CODE CHANGES
2018-02-12 23:17:35 -08:00
Mechoid dcf7b73320 Merge pull request #4796 from Anewbe/charger_radiation
Cyborg charger lessens FBP radiation.
2018-02-12 20:22:53 -08:00