Commit Graph

4303 Commits

Author SHA1 Message Date
Arokha Sieyes 9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018
# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
2018-01-22 12:10:19 -05:00
Anewbe 215bbb89e7 Merge pull request #4595 from Mechoid/Gas_Tank_Extension
Chainsaw tweaks. Take two.
2018-01-21 00:40:26 -06:00
Leshana 805897eafb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20 2018-01-21 00:23:00 -05:00
Anewbe e5b424e9a8 Merge pull request #4588 from VOREStation/vplk-tesla-book
Added operating manual book for Tesla
2018-01-20 20:01:38 -06:00
Cyantime 84c3154b2b Merge branch 'master' into hypo 2018-01-20 01:39:16 -05:00
Mechoid ebc03cceac Tweaks chainsaws. Again. 2018-01-19 21:11:48 -08:00
mistyLuminescence a190ec5725 Allows modkits to be created for any item. (#4450)
* Adds modular modkits
* Adds explorer suit functionality to voidsuit modkits.
2018-01-19 18:11:28 -08:00
Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-01-19 17:52:25 -05:00
Leshana 488c88b348 Added operating manual book for Tesla 2018-01-19 17:26:45 -05:00
Anewbe 674cc18554 Merge pull request #4582 from Mechoid/Tacknives_Angry_Again
Fixes Tacknife oversight. Fixes comments regarding knives.
2018-01-18 22:23:58 -06:00
Cyantime 09eb4054a5 Removes hypospray/vr and vial/vr 2018-01-18 19:01:26 -05:00
Spades 8e42db3e7f More guns for the gun box
- NT Mk98 (re)added.
- P92X added.
2018-01-18 18:53:43 -05:00
Anewbe a7cb2ff3ad Merge pull request #4566 from Mechoid/Make_Spears_Less_Murder
Drops the spear damage modifier from 0.75 to 0.5.
2018-01-18 16:40:16 -06:00
Mechoid 4a6a1dbf5c Fixes Tacknife oversight. Fixes comments regarding knives. 2018-01-18 14:20:55 -08:00
BillyBangles c44af58716 Adds communicator watch (take 2) (#4406)
* adds communicator watch

* adds commwatch to a loadout selection list

* adds changelog

just in case
2018-01-17 19:33:32 -06:00
Arokha Sieyes ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Mechoid 55845cb248 Drops the spear damage modifier from 0.75 to 0.5. 2018-01-17 13:41:05 -08:00
Neerti 5b54f4c875 Surface Map Work (#4557)
* Tweaks Surface, POI system

* More Stuff

* Travis Appeasement

* Fixes invisible banner.
2018-01-17 13:46:19 -06:00
Arokha Sieyes f2fef6f410 Planes Framework (#4545)
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
Arokha Sieyes 2b8063418a Merge pull request #2758 from VOREStation/aro-updateicons
3000% human/update_icons() speed improvement
2018-01-16 02:44:30 -05:00
Arokha Sieyes 10aabd98da POLARIS: 3000% human/update_icons() improvement
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
atermonera edcd9f5d73 Fixes runtime in uplink.dm 2018-01-15 16:35:04 -08:00
Stevenator1 cd59a2e928 Fix uses of TECH_MAGNETS to TECH_MAGNET 2018-01-15 03:27:26 -05:00
Anewbe 2dd4597480 Merge pull request #4537 from Cerebulon/tesharitankfix
Fixed teshari sprites for back-slot air tank items.
2018-01-15 01:31:15 -06:00
Mechoid d8d769ac33 Chainsaw fix and cleanup (#4538)
* Fixes/Cleans up chainsaws.

* Further Chainsaw Updoots
2018-01-15 01:31:04 -06:00
Arokha Sieyes eb6c482794 Shamelessly steal Polaris' Southern Cross jobs
They're whitelist only for now, good for events and adminbuse.
2018-01-14 21:49:19 -05:00
Cerebulon d7f4193618 fixed teshari sprites for back-slot air tank items.
Sprites existed but code was missing.
2018-01-15 02:24:46 +00:00
Anewbe cb22407e7c Merge pull request #4535 from Cameron653/patch-2
Fixes a typo causing deconstructor to cry
2018-01-14 15:32:04 -06:00
Neerti 96d3d361d0 Adds Boats, Ports /TG/ Buckling (#4527)
* Adds Boats, Ports /TG/ Buckling

* Travis Appeasement

* Changelog
2018-01-14 14:58:15 -06:00
Neerti 3715fa1f12 Ports /TG/'s Marker Beacons (#4529)
Ports an item stack that can be used to mark trails, useful for explorers, miners, and anyone else who doesn't want to get lost or wants to make the room more colorful.
2018-01-14 14:48:39 -06:00
Spades b441ccd6e3 9mm pistol updates (#4480)
* These aren't supposed to be here!!

* Adds new Security pistol and large capacity magazines

* Removes new pistol from Security spawns

* Removed references of Beretta because it's not one
2018-01-14 14:45:15 -06:00
Cameron653 f8ef84d896 Fixes a typo causing deconstructor to cry 2018-01-14 14:49:58 -05:00
Arokha Sieyes 60c07e348b Merge pull request #2742 from VOREStation/aro-hudwork
Plaaaaaaanessssssss
2018-01-14 13:08:35 -05:00
Neerti cd298b1575 Merge pull request #4526 from Mechoid/Now_Those_Are_Knoifes
Knife refactor and minor changes regarding.
2018-01-14 01:33:39 -05:00
Arokha Sieyes 9a56c27c9f Merge pull request #2711 from VOREStation/aro-nifrep
Advanced NIF Repair Tool
2018-01-14 00:58:18 -05:00
Arokha Sieyes ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
Arokha Sieyes 8dae4a6f04 Merge pull request #2725 from VOREStation/aro-bacon
Refactor Digestion
2018-01-14 00:07:54 -05:00
Arokha Sieyes ec7ebd1650 Merge pull request #2714 from Verkister/forbiddentaurs
Enables 2 compatibility lacking fluff taur types.
2018-01-13 23:41:34 -05:00
Atermonera 30352e1c9b "Communicators have a flashlight" (#4523) 2018-01-13 21:49:58 -06:00
Mechoid ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Mechoid 5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
atermonera b7f7f6868a Revert "Communicators have a flashlight"
This reverts commit 3db1efc5aa.
2018-01-12 15:24:15 -08:00
atermonera 3db1efc5aa Communicators have a flashlight 2018-01-12 15:19:02 -08:00
Arokha Sieyes 449dcbb0b7 Refactor Digestion 2018-01-10 02:06:13 -05:00
Spades 3e754620b6 Some security firearm changes 2018-01-09 20:40:51 -05:00
Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
2018-01-09 14:40:09 -05:00
Verkister 3aec405ba9 Adds saddlebag compatibility 2018-01-09 14:18:08 +02:00
Arokha Sieyes ea6ecca731 Advanced NIF Repair Tool
Creatable at the protolathe. Requires the same tech levels as the NIF, but no exotic materials.

It's a device that accepts nanopaste, and programs the nanite swarms into NIF repair swarms, which are a liquid reagent ingame. It has a 60u storage capacity, and needs to be emptied into any container.
From there, it can be injected via syringe, made into pills, or drank (though the latter two reduce effectiveness by 50%). Each unit nanopaste makes 15u repair nanites, so a full repair from 0% to 100% of a normal NIF requires 7 nanopaste converted to reagents (100u).
2018-01-08 17:14:56 -05:00
Leshana 224fe42e77 Prepare Atmospherics Machinery for SSatoms (#4501)
* to_chat() replacement.

* Revert calling target.init_dir() before connecting.

* This change was added in https://github.com/PolarisSS13/Polaris/pull/3775 to counteract `dir` not being set prior to New() for dynamically loaded maps.  The root cause was /atom/New() not calling _preloader.load().  Undoing the change now that /atom/New() is fixed.
* The addition of the init_dir() proc itself however, is useful, because there ARE other times some atmos machinery will want to re-initialize its dir, specifically whenever it is rotated.
* init_dir() must be called in the constructor of all atmospherics machines capable of connecting to another.   Since it has to happen for ALL machines, lets move that call to /obj/machinery/atmospherics/New()

* Rename /obj/machinery/atmospherics initialize() to atmos_init()

* These days `initialize()` is used to handle general object initialization that is moved outside of New().  The node connection discovery of atmos machinery needs to happen after all that, and so needs to be in a separate proc.
* Make sure to actually call atmos_init during system startup.
2018-01-06 10:52:56 -06:00
Neerti e23c002eb5 Merge pull request #4493 from Atermonera/Weatherapp
Weatherapp Update
2018-01-06 09:18:49 -05:00