Commit Graph
41889 Commits
Author SHA1 Message Date
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
AnewbeandGitHub 74a4e993ee Merge pull request #4939 from Anewbe/accessories
Should fix an accessories oversight
2018-02-24 11:29:50 -06:00
BillyBanglesandAnewbe 475d250d6a adds slippery ice tiles (#4935) 2018-02-24 11:04:58 -06:00
elgeonmbandAnewbe 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
AnewbeandGitHub 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
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 e56f12866f Merge pull request #4873 from SubberTheFabulous/cyberfix
Fixes CS sprites (again)
2018-02-24 11:00:09 -06:00
Aronai SieyesandGitHub a43acad170 Merge pull request #3082 from VOREStation/BEYONDMYLIFE_FLUFF_ITEMS
Adds BeyondMyLife's custom clothes
2018-02-24 11:16:36 -05:00
Aronai SieyesandGitHub 13dec153ff Merge pull request #3110 from VOREStation/Cameron653-patch-2
Removed unused fat genetics movement code
2018-02-24 11:16:18 -05:00
Aronai SieyesandGitHub 38d98ffa61 Merge pull request #3112 from VOREStation/polaris-sync-2018-02-23
Polaris Sync 2018-02-23
2018-02-24 11:16:03 -05:00
AnewbeandGitHub d92fb517cd Merge pull request #4936 from VOREStation/vplk-sundry-fixes-feb
Sundry Bugfixes - Feburary
2018-02-23 23:53:03 -06:00
AnewbeandGitHub 12015d7f5a Merge pull request #4915 from MisterLayne/slimebaton_dropper
Slimebots drop the right baton.
2018-02-23 23:44:50 -06:00
Anewbe 99312f323d Should fix an accessories oversight 2018-02-23 22:22:53 -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
LeshanaandGitHub 4457c2ffd2 Merge pull request #3111 from VOREStation/aro-say2
say() safety check on client
2018-02-23 18:06:59 -05:00
Arokha Sieyes fc3aca384a say() safety check on client
Spawn keeps it from destroying all say(), thankfully, but needs to be fixed.
2018-02-23 15:56:16 -05:00
killer653 641348c744 BeyondMyLife's custom fluff items 2018-02-23 15:10:35 -05:00
Cameron653andGitHub 9bf341d199 Removed unused fat genetics movement code
You can't get it in the game anyways w/o admin abuse. No reason to have an extra  if() check.
2018-02-23 14:18:36 -05:00
AnewbeandGitHub 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
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
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
AnewbeandGitHub 849ef9a8d6 Merge pull request #4925 from VOREStation/vplk-tesla-grounding
Tweak Tesla Grounding Rods
2018-02-23 13:16:46 -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
Aronai SieyesandGitHub 210c16590a Merge pull request #3107 from VOREStation/aro-kinscoop
SA's with hands can scoop mobs
2018-02-23 00:22:38 -05:00
Aronai SieyesandGitHub 72335bb82b Merge pull request #3105 from VOREStation/aro-zshadfix
Zshadows should be as invisible as their origin
2018-02-23 00:07:19 -05:00
AnewbeandGitHub 0f82f21913 Merge pull request #4930 from Atermonera/changelog7
Changelog update: 2/22/12018
2018-02-22 22:59:42 -06:00
Aronai SieyesandGitHub 4f5a5bde0b Merge pull request #3106 from VOREStation/aro-invistweak
Allow alteration of mob default see_invisible
2018-02-22 23:56:43 -05:00
Arokha Sieyes 08c0a64fec SA's with hands can scoop mobs 2018-02-22 23:48:15 -05:00
atermonera 27c40c37cc Changelog update: 2/22/12018 2018-02-22 20:19:40 -08:00
LeshanaandGitHub bff5e15ea0 Merge pull request #3103 from VOREStation/aro-gunfix
Fix mode_name on guns always being null
2018-02-22 23:14:33 -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
Aronai SieyesandGitHub 3f43f77cda Merge pull request #3084 from VOREStation/TASALD_REVOLVER
Changes Tasald's Revolver Sprite
2018-02-22 23:09:05 -05:00
Aronai SieyesandGitHub 88d66357ec Merge pull request #3100 from VOREStation/vplk-atmos-trinary-tvalves
Eliminated more duplicate code in trinary components: Rondo of T-Valves
2018-02-22 23:08:54 -05:00
Arokha Sieyes ef18bc7ff1 POLARIS: Allow alteration of mob default see_invisible 2018-02-22 23:01:16 -05:00
Arokha Sieyes 54ae568b37 POLARIS: zshadows should be as invisible as their origin 2018-02-22 22:36:39 -05: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
AtermoneraandGitHub 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
AnewbeandGitHub d7b7a1be00 Merge pull request #4919 from AbbieFland/pai-communicator
Fixed pAI communicator buttons.
2018-02-22 20:26:50 -06: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
AtermoneraandGitHub 9993031500 Merge pull request #4917 from Anewbe/surgery_oversight
Corrects an oversight with surgery and defibs
2018-02-22 18:25:04 -08:00
AnewbeandGitHub 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
Arokha Sieyes 9544074b50 POLARIS: Fix mode_name on guns always being null 2018-02-22 19:58:19 -05:00
Aronai SieyesandGitHub 2315541c22 Merge pull request #3096 from VOREStation/aro-imagecleanup
Improve two image cleanups
2018-02-22 19:35:42 -05:00