Commit Graph

899 Commits

Author SHA1 Message Date
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Spades
3ff9d441f9 Finishes fixing ammo inconsistencies 2017-05-27 04:39:49 -04:00
Anewbe
a2c4c91789 Starts support for species robolimbs 2017-05-04 20:50:16 -05:00
Leshana
12bc03157a Adds the Algae Oxygen Generator
* This device converts CO2 to O2 using power and "algae".  The extra carbon is a byproduct in the form of "graphite"
* This is intended for virgo3b, which has no oxygen in its atmosphere but enough CO2 for us to just extract it.
2017-05-03 01:54:55 -04:00
Arokha Sieyes
81eee0a9f1 Eris R&D Server Icons 2017-04-23 19:02:10 -04:00
Arokha Sieyes
9ed580c6b1 Eris Machines
Autolathe, Robotics machines, R&D machines
2017-04-23 18:30:39 -04:00
Arokha Sieyes
e236c33576 Merge pull request #1372 from VOREStation/aro-synthtails
Fix up a few synth issues
2017-04-10 20:29:21 -04:00
Arokha Sieyes
6d74e20e2a Fix up a few more things with synth printing
Species now 'suggested' by robolimb manufacturer, helps with getting the correct hairstyle choices for each synth, so Taj have access to Taj hair styles and whatnot in mirrors if they are using a Taj-based synth. Also adds a DSI Akula variant that Zalvine should touch up later hopefully.
2017-04-09 23:56:13 -04:00
Leshana
eef8480444 Adds the Body Designer for resleeving
* Adds Body Designer computer, which allows you to customize body designs similarly to character setup, but in game.
* Designs are savable to disks which can be loaded into the the resleeving controller console to print and resleeve into.
* Fixes line breaks on OOC notes in the resleeving computer.
* Added circuits so the body designer is constructable, and designs so the circuit is researchable.
* Added a proc for reverse lookup of size_multiplier -> scale name (0.25 -> Micro etc)
2017-04-09 16:23:35 -04:00
Arokha Sieyes
cdf9fd476c Adds the 'Hunter' Capture Gun
Dual mode stun-beam and net launcher, craftable in R&D. Would be legal for security to have on green since it's non-lethal. The stun beam has 10 shots like the taser, and the net launcher has 2 (uses the same energy). So basically 5 stun+1 net, or 2 nets, or 10 stuns.

Uses a new overlay system for updating it's icon rather than the "have one state for every possible combination" to prevent a huge mess of iconstates. Maybe Joan could look at this and use it sometime.
2017-04-02 19:25:27 -04:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe
88b0c6086e Antag Radio changes 2017-03-25 14:19:57 -05:00
Arokha Sieyes
2dbccc6016 Fix ported translator paths and map entries 2017-03-18 01:17:00 -04:00
Arokha Sieyes
805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Anewbe
f4dd443b01 Ports the translator 2017-03-10 21:46:57 -06:00
Arokha Sieyes
37fbc39ce6 Merge pull request #1146 from Screemonster/particlescience
adds particle guns to science and cargo
2017-03-10 18:07:29 -05:00
Arokha Sieyes
08b5d3a7b3 Merge pull request #1152 from VOREStation/aro-implanter
Replace backup implant boxes with special implanter
2017-03-09 23:26:54 -05:00
Arokha Sieyes
57f475392e Replace backup implant boxes with special implanter
Stores 4 inside the implanter, so medical people can just carry one with them if they want. Added more to the vendors to offset the smaller number per thing (7 per box vs 4 per implanter). The sprite is unique, and represents how many are left on the outside. Orange means just one left, flashing red means empty.

You can take the implants out if you want, swap them between implanters, etc. This one is self-cleaning, and can't cause infections, yay. So if you have to leave one in the lobby for people, now you don't have to feel bad about horrible cross-contamination?
2017-03-09 23:13:52 -05:00
Arokha Sieyes
0fd54d1449 Handheld Translator
Turn it on, keep it in hand or pocket, and it'll translate languages for you (not signlanguage...).
It doesn't bother displaying languages that you speak. I assume your character doesn't look down at the screen if they understood what was said (it's mostly just to prevent spam when only 1 in 4 people standing around talking is speaking another language).

There's one on a desk in the security locker room and one in the medical breakroom. I figure these two departments have the highest need of translations. R&D can make more. The design is fairly cheap.
2017-03-09 18:00:26 -05:00
Screemonster
87f940293a adds particle guns to science and cargo 2017-03-09 18:10:26 +00:00
Arokha Sieyes
97fcdd5cd7 Personal Translocator
Adds it to science. Has a high materials and research cost, and is considered ***contraband***, as it says in the description.

Also included in this PR is device_alt.dmi, a bunch of alternate device sprites which can be fun for stuff.
2017-03-08 18:01:35 -05:00
Arokha Sieyes
c7857a5bf3 Improves AR glasses, makes them available
Now you can start with them in loadout. They are no longer SUNglasses though, so they won't protect you from flashes.

There are several models, the loadout ones are the civilian ones.

- Civilian: Displays job ID icon based on the person's ID, and shows a health bar only if they are injured.
- Medical: Same as civlian, but displays advanced status (virus, borer, etc) along with backup implant status, and allows medical records access.
- Security: Same as civilian, but displays warrant and arrest status, and will automatically darken (electrochromic) in response to flashes, making the wearer immune, plus security records access.
- Engineering: Same as civilian, but will automatically darken to protect one's eyes during welding.
- Research: Same as civilian, but has a trendy goggle form factor for SCIENCE reasons.
- Omni: Has the combined features of all of the above. The only pair available spawns in the CD's office. (CC officers also)
2017-03-05 20:58:59 -05:00
Arokha Sieyes
1cb8406564 Remove duplicate shrinkray design
It has two designs in R&D for some reason. Removing the dupe.
2017-03-04 00:39:41 -05:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Leshana
12957f703b Added the Parts Lathe!
* The parts lathe can print tech level 1 stock parts (matter bins, capacitors) required to build basic unupgraded machines.
* This is a separate machine from the autolathe to ease any concern that the autolathe would become OP.
* ALSO, it can be hit with a circuit board and will conveniently display the parts required to build that board's machine.
* Added circuitboard and design for constructing a parts lathe.
2017-03-01 17:16:16 -05:00
Leshana
860a994818 Finally fixes the autolathe/protolate lid animations.
* Protolate lid no longer bounces back and forth througout the whole build cycle.
* Autolathe lid no longer closes, snaps open, and then -nothing- until item spawns.
* Instead, the lid closes, stays closed while the item builds, then opens again.
2017-02-24 21:30:57 -05:00
Arokha Sieyes
77ada345d7 Extra ways to get backup implants
Adds them to medical vendors (by the box) and producable by an autolathe (by the single)
2017-02-21 19:01:48 -05:00
Leshana
6262973afe Made resleeving machines constructable by adding circuits and designs. 2017-02-19 15:18:34 -05:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Spades
9b61d10a0a Merge pull request #837 from Cameron653/master
January Polaris Sync and various fixes
2017-01-19 00:39:08 -05:00
Arokha Sieyes
e4b6ace4d5 Further language implant fix
It just can't be a child of the other language implant at all.

Fixes #838
2017-01-16 15:33:01 -05:00
killer653
832418c7c9 Polaris sync 2017-01-15 18:12:15 -05:00
Anewbe
2d72e609d1 Moves languages to use more defines. Redoes Diona splitting 2017-01-14 22:47:12 -06:00
Arokha Sieyes
6cf76748eb Fix language/EAL implant.
Polaris added an item with the exact same path, hence the weird behavior of the EAL implant teaching you every language. Two items with the same path = weirdness. Should be better now.
2017-01-14 02:32:02 -05:00
Neerti
97ebf0924d Permanent Revolution Update 2017-01-04 04:41:30 -05:00
Anewbe
dc89eb5700 Merge pull request #2880 from Neerti/12/29/2016_circuit_autoresearch
Makes Circuits Make Their Own Research Designs
2016-12-31 10:11:41 -05:00
Anewbe
a3e1d14430 Merge pull request #2871 from Atermonera/sheet_loader
Sheet loader can fill protolathes and circuit imprinters
2016-12-30 22:13:38 -05:00
Neerti
cefd8029f7 Makes Circuits Make Their Own Research Designs
Circuits generate a research design datum when the game starts up instead of me having to manually define them every time I make a new circuit.  Hopefully this reduces missing circuits due to mistakes.  The circuit box also spawns specific circuits using a similar method for similar reasons.

Other things this does:
Splits the reagent related manipulation circuits to their own category, which cleans up a few repeated New()s.
2016-12-30 02:41:11 -05:00
MagmaRam
c04bc85731 Merge pull request #2870 from Neerti/12/21/2016_circuit_fixes
Arithmetic Circuit Additions and Fixes
2016-12-29 20:19:07 -06:00
killer653
9c359cb202 Polaris sync 2016-12-27 08:21:55 -05:00
Atermonera
0fa8a280cf Sheet loaders can feed protolathes and circuit imprinters 2016-12-21 16:47:26 -08:00
Neerti
c32e18ae8b Arithmetic Circuit Additions and Fixes
Subtraction, multiplication, and division should work properly.
Added sign, round, and exponent circuits.
2016-12-21 14:52:16 -05:00
MagmaRam
190a2bc70c Replaces [stack]/fifty atoms with atoms that spawn the normal stack
The stack/fifty objects were really buggy, this should fix all of that in one go.
2016-12-17 17:27:04 -06:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
ForFoxSake
db63646679 Fixes language ability checks. Adds EAL to more synthetics. 2016-11-25 02:44:06 +00:00
MagmaRam
0b3c9238ea Fifty stacks can now be added to the R&D machines. 2016-11-23 22:31:06 -06:00
Yoshax
804c67fc00 Removes crate, removes from vending, changes changelog 2016-11-20 20:30:19 +00:00
Arokha Sieyes
9730557674 Omnihud glasses 2016-10-22 18:14:27 -04:00
Arokha Sieyes
92833e335c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this.

# Conflicts:
#	code/datums/uplink/ammunition.dm
#	code/game/gamemodes/technomancer/spells/aura/fire_aura.dm
#	code/game/gamemodes/technomancer/spells/aura/frost_aura.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
#	code/game/gamemodes/technomancer/spells/projectile/overload.dm
#	code/game/gamemodes/technomancer/spells/projectile/projectile.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/science.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/flashlight.dm
#	code/game/objects/items/weapons/power_cells.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/client/preference_setup/loadout/loadout_shoes.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/clothing/spacesuits/void/station.dm
#	code/modules/integrated_electronics/assemblies.dm
#	code/modules/integrated_electronics/input_output.dm
#	code/modules/integrated_electronics/tools.dm
#	code/modules/mob/living/carbon/carbon_defense.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/organs/blood.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/dnalocking.dm
#	code/modules/projectiles/effects.dm
#	code/modules/projectiles/guns/energy.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/research/designs.dm
#	html/changelogs/.all_changelog.yml
#	html/changelogs/Anewbe - Beret.yml
#	html/changelogs/Anewbe - Tape Roll.yml
#	html/changelogs/MagmaRam-PR-2631.yml
#	html/changelogs/Redstryker - EMTVoidsuits.yml
#	icons/mob/head.dmi
#	icons/mob/items/lefthand_hats.dmi
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_hats.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/skrell/helmet.dmi
#	icons/mob/species/skrell/suit.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/mob/species/tajaran/suit.dmi
#	icons/mob/species/unathi/helmet.dmi
#	icons/mob/species/unathi/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/species/seromi/hats.dmi
#	icons/obj/clothing/species/seromi/suits.dmi
#	icons/obj/clothing/species/skrell/hats.dmi
#	icons/obj/clothing/species/skrell/suits.dmi
#	icons/obj/clothing/species/tajaran/hats.dmi
#	icons/obj/clothing/species/tajaran/suits.dmi
#	icons/obj/clothing/species/unathi/hats.dmi
#	icons/obj/clothing/species/unathi/suits.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/power.dmi
#	maps/RandomZLevels/stationCollision.dm
#	maps/polaris-1.dmm
#	maps/polaris-2.dmm
2016-10-20 21:24:07 -04:00