Commit Graph

27126 Commits

Author SHA1 Message Date
Anewbe
e507cf8106 Merge pull request #4581 from Cyantime/patch-1
Changes vial max transfer amount to 30
2018-01-18 22:21:43 -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
Neerti
c960d733f4 Merge pull request #4567 from VOREStation/vplk-wikisearch
Allow greater customisation of wiki links
2018-01-18 19:47:10 -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
Anewbe
3b69c3a85d Merge pull request #4572 from VOREStation/pol-rigboot
RIG Boot sequence
2018-01-18 16:39:53 -06:00
Cyantime
cf1cf1e602 Changes vial max transfer amount to 30 2018-01-18 17:22:40 -05:00
Mechoid
4a6a1dbf5c Fixes Tacknife oversight. Fixes comments regarding knives. 2018-01-18 14:20:55 -08:00
Billy Bangles
1ef0a7c3d4 adds 4 new spooky masks 2018-01-18 16:52:24 -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
80a3f1e6c3 Merge pull request #4577 from VOREStation/pol-2spoop
Don't show ghost huds on people who've died okay
2018-01-17 23:27:21 -05:00
Anewbe
8b451f555b Merge pull request #4574 from Neerti/1/17/2018_human_icon_fix
Fixes Runtime with Deleting Humans
2018-01-17 22:02:47 -06:00
Arokha Sieyes
71d8672d58 POLARIS: Don't show ghost huds on people who've died okay 2018-01-17 23:02:11 -05:00
Neerti
2b1e7f7509 Merge pull request #4576 from VOREStation/pol-sanity
Sanity check in plane_holder
2018-01-17 22:46:27 -05:00
Arokha Sieyes
b67d43d237 POLARIS: Sanity check in plane_holder
This was related to a bug we encountered. The bug doesn't affect you, but it makes sense to give this sanity check here too.
2018-01-17 21:18:50 -05:00
Neerti
eb28aea2c3 Meteors No Longer Hurt Floors 2018-01-17 20:57:17 -05:00
Neerti
a05b7772c1 Fixes Runtime with Deleting Humans
Humans who got deleted would also delete their clothes, which would then make the human update their icons to not have the clothes anymore, but the human is still being deleted and a specific list was nulled, making lots of non-cat runtimes appear everywhere.

The solution is to make human icon code stop giving a damn if the human is being deleted, I was told.
This might make cryo a bit less noticeable lag-wise but I'm not too sure.
2018-01-17 20:43:52 -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
Anewbe
dc9243e784 Merge pull request #4546 from VOREStation/pol-planes-matscan
Return of material scanner overlay
2018-01-17 19:30:20 -06:00
Anewbe
b6bc743a95 Merge pull request #4563 from SunnyDaise/Icons-and-Small-Code
Adds Apple Juice.
2018-01-17 19:29:57 -06:00
Arokha Sieyes
043608d807 POLARIS: Remove the need for borgs to have HUD items in their module inventory 2018-01-17 19:34:56 -05:00
Arokha Sieyes
a9c03b478d POLARIS: RIG Boot sequence
For fun! No mechanics changed, just looks neat.
2018-01-17 19:31:41 -05:00
Belsima
a0d4549d2e Buffs the mop bucket by the same amount as the janicart. 2018-01-17 19:20:07 -05:00
Anewbe
750752cdd5 Merge pull request #4560 from Atermonera/locket_desc
Locket desc was too long
2018-01-17 17:30:06 -06: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
9c86e3b5d7 Upstream merge of material scanner overlay 2018-01-17 17:44:46 -05:00
Arokha Sieyes
ccfe9c4f7e Tweak to fix two issues
Fix mysterious 'fuel blob' icon. There's an unnamed state in effects.dmi that I named but didn't include that in the PR to here before. And there's a better way to do update_transform and here it is.
2018-01-17 17:30:12 -05:00
Leshana
6bc422ff5e Ported VOREStation/VOREStation#461 - Allow greater customisation of wiki links 2018-01-17 16:46:48 -05:00
Mechoid
55845cb248 Drops the spear damage modifier from 0.75 to 0.5. 2018-01-17 13:41:05 -08:00
Anewbe
6fb1b66ced Merge pull request #4564 from Neerti/1/17/2018_blob_fix
Fixes Blob Tasering
2018-01-17 14:17:40 -06:00
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
Neerti
d2f3ca0a74 Fixes Blob Tasering
Blobs are no longer harmed by tasers or other strange weapons that don't damage structures.
2018-01-17 14:19:40 -05:00
SunnyDaise
a0bd8f6915 Adds Apple Juice. 2018-01-17 07:29:40 +00: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
atermonera
7f43737a53 Locket desc was too long 2018-01-16 18:48:32 -08: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