Commit Graph

2750 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
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
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
Mechoid
4a6a1dbf5c Fixes Tacknife oversight. Fixes comments regarding knives. 2018-01-18 14:20:55 -08: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
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
10aabd98da POLARIS: 3000% human/update_icons() improvement
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -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
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
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
Arokha Sieyes
ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -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
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
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
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
Anewbe
2b2a5dc565 Merge pull request #4503 from Neerti/1/1/2018_bonfires
Adds Bonfires
2018-01-05 13:36:19 -05:00
Neerti
42a421e8e1 Adds Bonfires 2018-01-05 02:35:19 -05:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.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-04 22:44:04 -05:00
Neerti
250fe6e2ff Fixes Exploit with Power Tools 2018-01-04 03:08:56 -05:00
Neerti
58a8e6a066 Merge pull request #4499 from Neerti/1/3/2018_why
Fixes Exploit with Power Tools
2018-01-03 15:50:02 -05:00
Neerti
5a0a04d2dd Fixes Exploit with Power Tools 2018-01-03 15:40:43 -05:00
Anewbe
d1422641bf Merge pull request #4475 from Neerti/12/31/2017
Adds Visual Cleavage
2018-01-02 20:04:50 -05:00
Anewbe
2f84a7dc95 Merge pull request #4489 from VOREStation/qdel-hints-gen5
Additional Destroy proc fixes
2018-01-02 20:04:02 -05:00
Anewbe
7ec8c9614f Merge pull request #4479 from Neerti/1/1/2018_handtele_fix
Removes Hardcoded Z-check on Handteles
2018-01-02 20:01:09 -05:00
Leshana
cc3397c4fa Fixes "was unable to be GC'd" when deleting tanks. 2018-01-02 13:13:49 -05:00
Neerti
27ff2bd736 Removes Hardcoded Z-check on Handteles
Instead they use the using_map datum to see if the person using a hand-tele is on an admin level.
2018-01-01 06:41:17 -05:00
Neerti
bde9ae6f7e Adds Visual Cleavage
Axes executing a cleaving attack now has a visual effect to show the tiles that can potentially get hit.
Gives hatchets and the energy axe the ability to cleave.
2017-12-31 05:53:39 -05:00
Leshana
064f2fe9ca Additional types which need Destroy to return qdel hints (and other Destroy fixes) 2017-12-30 16:02:27 -05:00
Verkister
7e99f11fe6 Fixes unfoldable boxes.
-Apparently storage proc for this thing was changed to return 1 regardless if the item had the quick empty verb or not, which in turn triggered the very first nope of the box specific code.
-Boxes can be quick emptied but lack the actual verb apparently?
2017-12-29 13:28:44 +02:00
Arokha Sieyes
d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2017-12-26 23:07:58 -05:00
Woodratt
ed9395e58f SC Stupid Sized Map Update
Or how Woodrat spent too long on something that was supposed to be simple.

- Addition of a Explorer Radio Channel and headsets.
- Explorers and Search and Rescue job slots added
- Adjustments to the pilot job including getting rid of the flatcap
- Map fixes, adjustments, (including signs pointing to cryo) planetside side map additions splitting up of the wilderness into two area sections
- Disabled lighting on the arrivals shuttle area once it is docked with the station, should help with the whole issue of lighting bugging out and having dark space
- Fixed EMS jacket missing icons
- Fixed Research signs being missing for some reason, addition of directional signs for cryo
- Addition of a Search and Rescue Winter coat
- Probably a dozen other small bug fixes I forgot, and bug additions

Tested, seems fine. At least in short tests.
2017-12-24 07:04:34 -08:00
mistyLuminescence
c986d57c34 Med Pill Blue Pill (#4404)
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
2017-12-23 14:45:24 -08:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Anewbe
ebdf9b191b Merge pull request #4425 from MisterLayne/energy_spear_fixed
Energy Spear
2017-12-11 00:47:05 -06:00
MisterLayne
0e5a097534 Second time is the charm. 2017-12-09 09:38:03 -05:00
Neerti
791754b2de Merge pull request #4382 from Anewbe/parachute
Adds parachutes
2017-12-08 20:17:51 -05:00