Commit Graph

14283 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
SunnyDaise
10490fa5b4 Food and Drink: Additions and Bugfixes (#4598)
* Food and Drink
2018-01-21 22:18:33 -08:00
Leshana
3ccd8efb39 Revert accidental commit of a WIP file.
This reverts part of commit 62e58702f7.
2018-01-21 21:01:30 -05:00
Arokha Sieyes
ba5b0c662f Merge pull request #2809 from VOREStation/vplk-multi-engine
Dynamic Engine Loading
2018-01-21 17:48:45 -05:00
Arokha Sieyes
6e07301c03 Merge pull request #2806 from VOREStation/aro-entopics2
Entopic Framework + AR Features
2018-01-21 17:43:36 -05:00
Arokha Sieyes
1558cd47df 3 Fixes (#4600)
* POLARIS: Do this lazily

* POLARIS: Speed up visible_message and audible_message

* POLARIS: Destroy this list rather than cutting it, for future safety
2018-01-21 16:17:04 -06:00
Anewbe
18e83bc73f Merge pull request #4575 from Neerti/1/17/2018_meteors2
Meteors No Longer Hurt Floors
2018-01-21 16:10:07 -06:00
Leshana
71b3ef47a9 Add checks to allow Tesla to fully dissipate once it runs out of energy. 2018-01-21 16:19:13 -05:00
Leshana
62e58702f7 VOREStation Tweaks to the Tesla engine
* Let you order the Tesla generator from cargo in case you need another one.
* Make the energy ball dissipate very fast if it escapes from confinement, limiting the number of machines it can blow up.
* Reduce devastation on machine destruction so areas are messed up but not just reduced to space.
2018-01-21 16:19:13 -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
Arokha Sieyes
b7f1c41581 POLARIS: Speed up visible_message and audible_message 2018-01-20 22:08:37 -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
Atermonera
17accf2e28 Band-aids three runtimes (#4591)
* Runtime in dna_modifier.dm,330: Cannot read null.occupant

* Runtime in Chemistry-Reagents.dm,47: Cannot execute null.remove reagent().

* Runtime in blood.dm,182: Division by zero

* Compiled with the right map this time
2018-01-20 13:28:51 -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
eed9f1d6ff Compensated for addition of Planetary Department to PDAs. 2018-01-19 21:09:02 -05: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
8c2d1208e0 Merge pull request #4585 from Woodratt/01182018_SouthernCross_MapFixv6
Southern Cross Bugfixes and additions
2018-01-19 15:37:52 -06:00
Leshana
db0ba60f64 Implements the Tesla engine and supporting features (#4539)
* Adds "typecache" utility functions. A fast way to filter lists by type.

Ported from TG

* Ports the "orbit" feature and subsystem from TG

* Adds a feature that allows mobs and objs to "orbit" around some atom.  They literally are moved around in circles.  See the `orbit` proc in orbit.dm.
* Adds a subsystem that processes the actual movement of orbiting items.

* Adds utility methods for common machinery behavior.

* Adds default_unfasten_wrench which handles the standard anchor/unanchor behavior of wrenches being used on machines.  Together with the other default_x_tool machinery procs we can eliminate having that code duplicated in dozens of places!
* Adds is_wire_tool proc to easily detect when a machine is hit with a tool that should open its wires UI (if it has one).

Based on ideas from Paradise, with improvements for us.

* Implements the Tesla Engine

Ported from a mixture of TG and Paradise code and assets: Edison's Bane

Includes the tesla energy ball itself, the generator that makes it, tesla coils, grounding rods, the circuits and frames to build them.

* Switch dusting to zapping on impact and spin better

Ported /tg SpinAnimation which supports more than triangles.
2018-01-19 14:56:08 -06: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
Woodratt
d1f8e875a8 Southern Cross Bugfixes and additions
- Multiple fixes for map errors, and removal of christmas decor
- Addition of a gym station side, deck one
- nav beacons and beepsky added
- overhaul of the centcomm z to look more like the Northern Star
2018-01-18 20:01:01 -08: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
Anewbe
6d4e310659 Merge pull request #4570 from Belsima/master
Buffs the mop bucket by the same amount as the janicart.
2018-01-18 16:40:03 -06:00
Mechoid
4a6a1dbf5c Fixes Tacknife oversight. Fixes comments regarding knives. 2018-01-18 14:20:55 -08:00
Arokha Sieyes
dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
Atermonera
7a6b0fd750 Cleans up PDA Manifest template (#4540)
* Cleans up PDA Manifest template, adds Planetside and Silicon sections

* Cleanups up some testing code

* A rogue space-indented line

* Hides empty manifest categories
2018-01-18 11:33:09 -06:00
Neerti
eb28aea2c3 Meteors No Longer Hurt Floors 2018-01-17 20:57:17 -05: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
Belsima
a0d4549d2e Buffs the mop bucket by the same amount as the janicart. 2018-01-17 19:20:07 -05:00
Arokha Sieyes
508ea0d6a3 Merge pull request #2775 from VOREStation/syncomatic
Polaris Sync
2018-01-17 18:36:35 -05:00
Cameron653
788d5a68d6 Makes janicarts hold more water (#4558)
* Makes janicarts hold more water

So you don't have to run back to grab some more water every 20 seconds while cleaning up dirt.

* Update janicart.dm
2018-01-17 17:29:49 -06:00
Arokha Sieyes
c0e4109cb2 Merge pull request #2767 from VOREStation/arovplk-tether-dedep
Fix dependencies on tether map in main codebase
2018-01-17 18:07:43 -05: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
Leshana
fe431c8e46 Trims back wilderness code that was dependent on tether map.
* Reverted random.dm back to Polaris as there is no need for the VOREStation customs.
* Fixed /obj/random/outside_mob so it will actually work (You can't set vars on a type!)
* Removed all wilderness code outside of the tether map.  It was only setting life_disabled on mobs spawning there. We can do that with a subsystem or by dynamic maploading instead.
2018-01-17 15:23:22 -05: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
Leshana
afd37c32db POLARIS: Fix regular mobs seeing when ghosts point at things.
* Fixed it by adding a facility by which code can check if a mob can logically see things present on another plane.
2018-01-16 20:04:57 -05:00
Arokha Sieyes
0a037f0fe0 Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10
Polaris Sync 2018 01 10
2018-01-16 02:46:25 -05: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
Leshana
5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10
# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm
2018-01-15 13:27:39 -05:00
Anewbe
d33e5a1304 Merge pull request #4542 from Stevenator1/MagnetsHowDoTheyWork
Fix uses of TECH_MAGNETS to TECH_MAGNET
2018-01-15 11:15:27 -06:00
Anewbe
829cd092c8 Merge pull request #4534 from Neerti/1/14/2018_autopilot_and_other_shuttle_stuff
Web Shuttle Update
2018-01-15 11:15:02 -06:00