Commit Graph

1343 Commits

Author SHA1 Message Date
mistyLuminescence e50b9d0cc0 Serenity (#6208)
* Serenity

* travis

* adminspawn

* I greatly appreciate all detailed and informative feedback provided. Per request, the Serenity is currently adminspawn-only; a new PR will be made in two weeks to add it to Robotics and resolve any issues encountered during the testing period.

* Comments out circuit for two-week testing period
2019-06-21 00:14:05 -04:00
Mechoid 07cceab5bc Fixes the Chargeblade's tech cost. (#6216)
* Fixes the Chargeblade's tech cost.

* Update illegal.dm
2019-06-16 21:17:26 -04:00
Neerti 5a3040a08d Merge pull request #6183 from Mechoid/FixPrecursotechOversights
Fixes some Precursotech oversights.
2019-05-31 22:18:00 -04:00
Atermonera 8e724ad32c Merge pull request #6133 from Heroman3003/cart-tweek
Minor PDA cartridge tweaks
2019-05-01 14:08:33 -04:00
Neerti 16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Novacat 6a287c7e1f Merge pull request #5085 from VOREStation/upstream-merge-6026
[MIRROR] Precursotech Janus
2019-04-18 02:19:31 -04:00
Mechoid fc43527ac7 Adds Robobags (#6059)
* Adds Robobags

* Finishes robobags

* FixFix
2019-04-18 01:40:39 -04:00
Atermonera b7e9934206 Precursotech Janus 2019-04-18 00:33:20 -04:00
Layla Crosse/Occula Drenn dde5133e03 Research QoL changes (#6042)
* Research QoL changes

* Reverts changes relating to blanket print times and Protolathe storage

* Actually changes the design print time.

Why do you hate me github.

* Fixes an enter key error caused by the editor.

* Actually does all of the things I needed to do like a smart person

Which apparently I am not.

* Fixes a newline

Because goddamn it the online editor hates me too.
2019-04-17 04:51:29 -04:00
Neerti f15c5bf29b Merge pull request #6095 from Heroman3003/unduping-synths
Fixes synthesisers inserting more materials than they had
2019-04-17 02:36:46 -04:00
Novacat f391ddad02 Merge pull request #5038 from VOREStation/upstream-merge-6028
[MIRROR] Precursotech Tools
2019-04-14 02:29:25 -04:00
Neerti 9c28b82c6c Merge pull request #6028 from Mechoid/Precursotech_Tools
Precursotech Tools
2019-04-14 02:20:07 -04:00
Neerti 94e6cc402b Merge pull request #6027 from Mechoid/Precursotech_Sword
Anomalotech Charge Sword
2019-04-14 01:21:05 -04:00
Neerti fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Novacat ab5710a015 Merge pull request #4881 from Heroman3003/borg-resization
Borgs are now in on fun of size-related features
2019-04-11 12:35:21 -04:00
Neerti 1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Unknown f653b21d41 Removes Phase weapons from R&D 2019-03-29 23:07:50 -04:00
Heroman 92956bc258 Added sizechanging module and size pref respect for borgs 2019-03-30 07:56:33 +10:00
Neerti fdeb9e3ac9 Merge pull request #6020 from Hatterhat/patch-1
protolathes actually ACTUALLY update properly
2019-03-29 08:43:21 -04:00
Spades a184e67c93 Changes (R&D made) Saber SMG to Advanced SMG 2019-03-28 18:22:23 -04:00
Novacat 01769ada6b Merge pull request #4686 from VOREStation/upstream-merge-5840
[MIRROR] protolathe screen updates mat cost with better manips
2019-03-27 18:01:11 -04:00
Novacat dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814
[MIRROR] [READY]Makes a bunch of processes subsystems instead
2019-03-27 17:46:31 -04:00
kevinz000 6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Neerti fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Atermonera 131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Anewbe dbc6e20b19 Merge pull request #5840 from Hatterhat/protolathe-qol
protolathe screen updates mat cost with better manips
2019-01-16 17:23:44 -05:00
Zap-zapper 3b2258ce38 size control implant 2018-12-08 17:12:33 +07:00
Atermonera dde25a46f0 Merge pull request #5648 from king5327/polarissciconfix
Prevents people from HREF exploiting around the R&D console lock.
2018-10-13 17:14:48 -04:00
Arokha Sieyes b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
2018-09-27 18:01:09 -04:00
Mechoid 0651206a51 Refactor cargo trains, they're just normal trains now. Adds the Quad, and re-enables/fixes the Space Bike! 2018-09-08 23:05:08 -07:00
Mechoid 509addffdf Adds a whole bunch of Exosuit weapons and other miscellaneous parts. 2018-08-23 20:14:56 -07:00
Zap-zapper b0a0a1e276 Protection from impersonation. Updated to 3700 2018-08-22 17:47:11 +07:00
Anewbe f1507ebfa2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-04 11:20:02 -05:00
Anewbe 7f84aeab9f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-02 22:35:14 -05:00
Anewbe 729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
atermonera ef6c5abf15 Refactors supply controller.
Supply consoles now run nanoUI
2018-07-31 19:11:02 -07:00
Kates fd0bfab228 Saber fix. (#5384)
* Saber fix.

* Saber fix 2: Electric boogaloo

* parenthèse

* "And another one"

* Actually fixes the indentation

* Balance revert
2018-07-11 00:49:32 -04:00
Kates 535cca9d0e Saber fix. (#5384)
* Saber fix.

* Saber fix 2: Electric boogaloo

* parenthèse

* "And another one"

* Actually fixes the indentation

* Balance revert
2018-07-10 23:49:11 -05:00
Sharkmare 5af4c44e78 Adding the Bioadaptive NIF to designs_vr.dm
Added the Bioadaptive NIF to the list of Designs using the sort code of the NIF repair tool and gave the NIF repair tool a new sortcode.
2018-06-19 14:59:23 +02:00
Anewbe 97c32f35f1 More Phase Guns 2018-06-17 13:35:54 -04:00
Anewbe 86901354fc More Phase Guns (#5276)
* Adds new Phase weapons

* Fixes a thing

* Puts phase weapons in cargo

* Moves research designs, adds phase weapons

* Comments out a duplicate design

* Corrects duplicate design ID

* Last commit on this PR, I swear
2018-06-17 10:35:03 -07:00
Anewbe 007bccc2ef Merge pull request #5318 from Heroman3003/xenoarch-multitool-fix
Fixed xenoarch multitool being unmakeable
2018-05-31 21:34:44 -04:00
Heroman3003 77a00e53d1 fixed xenoarch multitool being unmakeable 2018-05-31 13:01:40 +10:00
Arokha Sieyes 6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-05-25 13:23:47 -04:00
PrismaticGynoid eabfa03891 Laser pointers (#5257)
* Laser pointers

Adds laser pointers, ported from tg/oldaurora (but heavily modified). They can be found in the loadout, as well as made by science. Science can also upgrade them, which makes them occasionally useful for blinding people, too.

The bugfixes which make several of the features work properly will come in a separate commit.

* Three fixes

Cats now have resting sprites for all 4 directions, instead of just east. This was needed to make cats look like they're pouncing on the laser dot.

Cameras can now be EMPed more than once, and EMPs actually are able to disable them now. This was needed for the shining lasers into cameras feature.

Flash_eyes() now actually displays a flashing animation on your screen when you get flashed (except for silicons, who for some reason are excluded from this unless EMPed). This was needed for laser pointers to have a temporary "blinding" effect when shone into someone's eyes.

(removes errant debug message too, whoops)

* Nerf

Reduced chances of laser pointers doing anything useful on silicons.

Also, fixes a duplicated proc, oops.

* Requested changes

Minor changes as requested - 'cell' to 'diode', view() to viewers(), range() to viewers().

Stops buckled or dead cats from reacting to laser pointers. Zombie cats are fun, but no.

Also, does another small nerf to the effects on silicons.
2018-05-14 15:22:19 -07:00
Neerti cd2a538526 Merge pull request #5207 from Novacat/bluespace_duffle
Dufflebag of Holding
2018-05-02 22:41:27 -04:00
Arokha Sieyes 42abca3c31 Fix decloner design in protolathe
As reported in https://github.com/VOREStation/VOREStation/issues/3539, you can't put chemicals in a protolathe, so you shouldn't use chemicals as a requirement in protolathe recipes!
2018-04-30 17:41:04 -04:00
kcin2001 fea679888a Adds Micro mechs 2018-04-29 16:07:32 -07:00
Unknown 7ec154075c Research Fix 2018-04-24 08:16:43 -04:00
Unknown 906db88b6a Dufflebag of Holding
Adds a dufflebag of holding, essentially a bag of holding reskin that functions exactly identical
2018-04-24 02:09:39 -04:00