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
Belsima
ff35fe9f56
Adds the disabled mech tools. ( #4445 )
...
* Adds the disabled mech tools.
2017-12-29 21:44:04 -08: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
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
MisterLayne
05954a278a
K.
2017-12-06 16:14:55 -05:00
mistyLuminescence
0d458b204e
Adds the advanced health analyzer ( #4326 )
...
* WIP - advanced health analyzer
* Adds the advanced health analyzer.
* Updates radiation levels
* Fixes travis and removes snark
* Fixes a bug that wasn't my fault (for real)
* Adds tiers.
* Phasic sounds cooler
* Fixes sprites
2017-12-03 17:36:51 -06:00
Neerti
8fedfa205f
Merge pull request #4357 from Cyantime/communicator
...
Allows communicators to be made by RnD, shows ghosts communicator IMs
2017-11-27 20:19:59 -05:00
mistyLuminescence
e4ff301c01
Advanced Roller Bed ( #4319 )
...
* Adds the advanced rollerbed to R&D
* default surgery rate
* finally
2017-11-27 16:40:52 -06:00
Cyantime
209b354fd4
Allows communicators to be made by RnD, shows ghosts communicator IMs
2017-11-27 00:33:49 -05:00
Anewbe
0da9a42517
Adjusts ProsFab and MechFab design menus
2017-11-19 04:25:36 -06:00
killer653
11c195debb
Polaris Sync
2017-11-04 13:37:13 -04:00
Anewbe
966749b5f4
Merge pull request #4168 from Neerti/10/27/2017_lag_fix
...
Proto/Autolathe lag fix
2017-10-28 02:13:12 -05:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Neerti
e935df9702
Proto/Autolathe lag fix
...
Makes the two machines concatenate a lot less and not make BYOND's super secret string tree cry, hopefully.
2017-10-27 04:00:44 -04:00
MisterLayne
436eaa1efb
Adds language module.
2017-10-26 15:43:25 -04:00
Mechoid
920e823a46
Fuel-Rod Gun, Minor fixes related. ( #4103 )
...
* A whole load of things.
* Fixes the SM Rod's travel distance.
2017-10-19 15:07:52 -05:00
Anewbe
4a6cf66183
Merge pull request #4087 from Mechoid/Efficient_Me_Fabricators
...
Fixes SCIENCE-fabs, Changes Mech-fab Sprite.
2017-10-16 23:01:43 -05:00
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
Neerti
7b5f8bddd1
Merge pull request #4081 from Cameron653/512_FILTER_FIX
...
BYOND 512 Compiling Errors Fix
2017-10-16 18:47:47 -04:00
Mechoid
b43201aa79
Fixes the circuit printer and protolathe's material cost check as well. Updates this local to match Master.
2017-10-16 13:12:08 -07:00
killer653
0080539924
More fixes
2017-10-15 19:54:50 -04:00
Mechoid
a9e9236d7f
Prosthetic Organ Expansion
2017-10-15 15:12:51 -07:00
Mechoid
56ec5ec94c
Adds three flame-themed illegal Mech weapons and more. ( #4058 )
...
* Adds three flame-themed illegal Mech weapons. Allows anything using apply_effects to be incendiary and ignite/apply firestacks. Also absolute-paths the spilled fuel effects.
* Removes world << because I'm a good coder honest.
* Why does Git do this for no reason.
2017-10-13 23:32:52 -05:00
MisterLayne
392aa1d8bc
Makes the new T-Ray Scanners available
2017-10-11 17:11:49 -04:00
Cameron Lennox
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
Cyantime
36e78b48f1
Adds plasma research outpost.
2017-09-29 02:28:43 -04:00
Anewbe
caa4fecd8b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bone_fixer
...
# Conflicts:
# icons/obj/abductor.dmi
2017-09-25 20:35:19 -05:00
Neerti
20ea71934c
Merge pull request #3919 from Anewbe/tech_shifting
...
Shifts around a few Tech Levels.
2017-09-24 00:09:02 -04:00
Anewbe
168837c243
Merge pull request #3917 from PrismaticGynoid/printabledronebrains
...
Makes drone brains printable.
2017-09-23 20:50:25 -05:00
Anewbe
3cd1e62616
Adjusts slime tool tech requirements
2017-09-23 15:48:01 -05:00
PrismaticGynoid
b2ab0166d6
Makes drone brains printable.
...
Positronic brains are already printable, so why not electronic brains? Requires a bit less research to make than posibrains, and uses no phoron or diamonds.
2017-09-22 19:01:18 -07:00
PrismaticGynoid
957f742642
Makes all synthetic brains radio-enabled.
...
Mostly because the old radio-enabled MMIs were almost never used. Changes all MMIs and their subtypes (posi and drone brains) to have a radio inside of them, which can only be used when the brain is outside of a body. This radio can be used to talk over the common channel, in case you get left on a table somewhere by an absent-minded roboticist. However, the radio can also be disabled, in case an antag has you and doesn't want to to scream for help.
Since this makes the old radio-enabled MMIs obsolete, they're no longer printable(although it's still defined in the code so I don't have to touch the map file). Also fixes a telecomms runtime with brains talking over the radio.
2017-09-22 18:49:37 -07:00
Anewbe
b47b1ce1f1
Adds the bone clamp, and some alien surgery tools
2017-09-22 20:45:00 -05:00
killer653
2755d3ddb1
HOTFIX
2017-09-21 20:26:48 -04:00
Belsima
69b09d859b
Xenoarch adjustments.
2017-09-18 11:15:14 -04:00
Cyantime
68056dd5f2
Deconflict
2017-09-16 19:00:30 -04:00
Cyantime
49a62057c3
Constructability.
2017-09-15 21:52:35 -04:00
killer653
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
Anewbe
7cc1506901
Merge pull request #3810 from Mechoid/Dart_Gun_2_Dart_Harder
...
Fixes the Dartgun, makes a Research-Produceable variant.
2017-09-11 17:38:19 -04:00
Mechoid
2a5311e063
Fixes the Dartgun, makes a Research-Produceable variant.
2017-09-09 21:25:30 -07:00
Neerti
8f00965cc2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
...
# Conflicts fixed:
# code/modules/admin/topic.dm
# code/modules/admin/verbs/debug.dm
# code/modules/admin/view_variables/helpers.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/transform_procs.dm
# maps/northern_star/polaris-1.dmm
# polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2
work
2017-09-04 21:52:47 -04:00
killer653
cafac8efae
Polaris Sync
2017-08-28 20:52:11 -04:00
Andrew
4c133ba95d
Adds More Ways to Obtain Power Tools
...
- Added the hand drill and jaws of life to the protolathe
- Removed titanium from the hand drill and jaws of life
- Syndicate toolbox now comes with power tools
2017-08-25 20:15:09 -05:00
Anewbe
0bc3bcb722
Merge pull request #3686 from Nalarac/Robot
...
Fixes Oversight with Scrambled Equipment Module
2017-08-13 23:16:48 -04:00
Cameron653
585ea77260
Update designs_vr.dm
2017-08-12 19:49:12 -04:00
Cameron653
b824a53541
Update designs.dm
2017-08-08 20:46:53 -04:00
Andrew
50de47d5c0
Fixes Oversight with Scrambled Equipment Module
...
I had assumed the prosthetics fabricator took the name of the items for
its lists, but that wasn't the case.
2017-08-07 14:33:40 -05:00
killer653
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
