Commit Graph

26943 Commits

Author SHA1 Message Date
Anewbe
f5bf9fdd00 Merge pull request #4562 from VOREStation/pol-zshadowdel
zShadow qdel fix
2018-01-17 13:47:27 -06: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
e3d965c423 POLARIS: zshadow del fix 2018-01-17 02:18:50 -05:00
Anewbe
6864293599 Merge pull request #4559 from PolarisSS13/revert-4520-the_dream_never_dies
Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Switches us to the Southern Cross for testing"""""""""
2018-01-16 21:18:06 -06:00
Atermonera
775559357f Fixes runtime in seed_packets.dm (#4549)
* Fixes runtime in seed_packets.dm

* Moves sleeps to initialize()

* No more sleep
2018-01-16 21:07:38 -06:00
Anewbe
bfadcb8669 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Switches us to the Southern Cross for testing""""""""" 2018-01-16 17:35:43 -06:00
Anewbe
569191d3c1 Merge pull request #4548 from VOREStation/vplk-pipe-antiduplicate
Eliminate duplicate code in pipes hide & process procs.
2018-01-16 15:31:41 -06:00
Anewbe
3aef4a052b Merge pull request #4551 from Atermonera/shuttle_radio_announce
Shuttles can announce over radio too!
2018-01-16 15:26:57 -06:00
Anewbe
4306454637 Merge pull request #4552 from Verkister/patch-2
Removes redundant baton charging from sec borg.
2018-01-16 15:26:27 -06:00
Verkister
1899adef2c Removes redundant baton charging from sec borg.
The baton uses the borg's own cell.
2018-01-16 13:47:27 +02:00
atermonera
caf3735500 Shuttles can announce over radio too! 2018-01-15 17:00:03 -08:00
atermonera
edcd9f5d73 Fixes runtime in uplink.dm 2018-01-15 16:35:04 -08:00
Leshana
6310c1da78 Eliminate duplicate code in pipes hide & process procs.
* These procs were repeated verbatim on the different subtypes of /obj/machinery/atmospherics/pipe.  Consolidated them in the parent.
* Added little comment headers over the different types of pipes to make the file easier to read.
2018-01-15 14:26:19 -05:00
Anewbe
ca19076ff6 Merge pull request #4543 from Bromuzl/patch-1
Correcting typo 556  - -> 545
2018-01-15 11:15:38 -06: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
Bromuzl
6a66b3d773 Correcting typo 556 - -> 545
The 5.45 machine gun ammo boxes were being named 5.56 because oops.
2018-01-15 01:49:18 -08:00
Stevenator1
cd59a2e928 Fix uses of TECH_MAGNETS to TECH_MAGNET 2018-01-15 03:27:26 -05:00
Anewbe
c632c2604d Merge pull request #4533 from VOREStation/pol-mecha
Two interface QoL changes (closets and mechs)
2018-01-15 01:31:29 -06: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
Anewbe
14f0060f28 Merge pull request #4531 from VOREStation/vplk-beam-upgrade
Ports the Paradise rewrite of TG rewrite of the Beam() proc
2018-01-14 14:59:46 -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
PrismaticGynoid
10b2cc7eef Multiple loadout slots (#4530)
* Multiple loadout slots

Ported from Bay. Each character can have 3 (number can be overridden by config) loadout slots. This way, you can have different outfits for different situations without needing to have a separate character slot or edit your loadout every time.

Tested here, works as intended. The current loadout is set as slot 1, so you don't need to worry about remaking it. This also ports the to_file and from_file macros to make it work, I'm assuming they could later be used elsewhere as well.

* Log of Changing
2018-01-14 14:47:47 -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
Neerti
d0d6689263 Web Shuttle Update
Adds autopilot functionality for shuttle one and shuttle two. It can be enabled and disabled by the flight computer.
Autopilot is active by default on both shuttles. The shuttle waits for two minutes when it reaches the outpost or station, except for the first flight, where it waits for about ten minutes, which should be plenty of time for people to get on and for the pilot to turn it off if one exists.
Adds renaming feature to all shuttles.
Ports /tg/'s 'shuttle warning' effect, which adds a bunch of blue circles where a ship is about to land, which should prevent surprise shuttle crushes if paying attention.
Flight times for all routes are cut in half to act as the bonus for flying manually. Automatic flight takes twice as long, and so it will take the current amount of time.
Makes Ninja shuttle faster because Nippen steal.
Does some cleanup with temporary effects.
2018-01-14 14:03:58 -05:00
Neerti
20062a5fd2 Merge pull request #4528 from Atermonera/int_gps
Adds gps units to borgs
2018-01-14 11:53:09 -05:00
Arokha Sieyes
1f595cd59a Two interface QoL changes (closets and mechs) 2018-01-14 03:58:15 -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
Neerti
d28443826f Merge pull request #4525 from VOREStation/vplk-maploader
Fixes #4522 - Make maploader correctly read lists of numbers, paths, etc
2018-01-14 01:33:14 -05:00
Atermonera
30352e1c9b "Communicators have a flashlight" (#4523) 2018-01-13 21:49:58 -06:00
Leshana
0e6f2fcb09 Make Singulo Stable Again (#4521)
* Make Singulo Stable Again

* Prevents emitter beam effects from being pulled by singulo.  Now watch them hit the field gens.
* Prevent singulo from consuming the PA particle effects.  It already gets fed by impact, don't try to eat them.
* Improve the Setup Singularity debug verb to do more better setup (including PA)
* Fix the energy dissipation values so that singularity does not just keep on growing even when setup properly.

* Enhance singularity proc/eat()

* Use `var/simulated` as a more generic way to ignore lighting overlays etc
* Remove redundant code in the rest of the proc body.
* Slight optimization: avoiding typecheck in loop over return from orange()
2018-01-13 21:43:32 -06:00
Neerti
5eb8289312 Fixes Reactive Spines Blob Invincibility
Reactive Spines blob should be able to be damaged once more.
2018-01-13 22:12:58 -05:00
Leshana
7e4b5901ec Ports the Paradise rewrite of TG rewrite of the Beam() proc
* New proc is more efficient and also supports:
- Multiple simultaneous beams from the same source.
- Doesn't block the thread while the beam is on.
2018-01-13 18:34:33 -05:00
Mechoid
ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
atermonera
511f0a344b Adds gps units to borgs 2018-01-12 19:57:06 -08:00
Mechoid
5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Leshana
9d08175078 Fixes #4522 - Make maploader correctly read lists of numbers, paths, etc.
* For non-assoc lists every value was being read as a string.   For vars like "access_req" this is bad - it doesn't work.  Therefore we add support for lists of numbers.
* While I'm here, might as well add support for non-string keys of associative lists too, since that's required by things like vending machines.
2018-01-12 19:45:34 -05: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
Anewbe
4c17f28cd0 Merge pull request #4519 from Neerti/12/15/2017_berserking
Adds Berserk
2018-01-11 20:57:50 -06:00
Anewbe
470a11a564 Merge pull request #4516 from MisterLayne/tator_items
Adds energy spear and chainsaw to uplink.
2018-01-11 19:46:41 -06:00
Anewbe
a73f989db6 Rebegins the chain of map change PRs 2018-01-11 19:24:02 -06:00
Anewbe
738da41cc6 Merge pull request #4513 from Mechoid/Plastic-Printing
Research Machines can use Plastic and Osmium
2018-01-11 16:20:40 -06:00
Anewbe
0a6ffa6b11 Merge pull request #4508 from PrismaticGynoid/economicstatus
Replaces NT Relation with Economic Status
2018-01-11 11:59:48 -06:00