68 Commits
Author SHA1 Message Date
789db280cc [MIRROR] space cleanup (#10414)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-03-15 00:47:51 +01:00
9ab3767f72 [MIRROR] Adds bloodpacks for vampiric crew to loadout (#10225)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-02-25 12:41:12 +01:00
483bed3d5c [MIRROR] Adds Deluxe Bluespace Bracelet (#10037)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-02-01 21:24:45 +01:00
fecffcf15b [MIRROR] Update & Cleanup Loadouts (#9877)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-01-17 16:46:55 +01:00
82a2178c7a [MIRROR] Single language translators (#9221)
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-10-12 19:15:09 +02:00
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084)
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-09-30 21:36:41 +02:00
SharkmareandGitHub 706fe49eb2 Lower cost of TTS in Loadout
TTS is pure flavor since we all speak common, theres no reason for it to be more expensive
2023-06-21 12:19:09 +02:00
CaseyandCHOMPStation2 4dc1ab7659 Merge pull request #14416 from liache/patch-2
Adds Lanterns to Loadout Selection
2023-02-04 05:36:40 +00:00
CaseyandCHOMPStation2 3d5d4f1be8 Makes new pAI obtainable 2022-06-04 20:03:22 +00:00
Chompstation Bot 0fc8ba9656 Tool Time (Fixed) 2021-10-27 16:02:47 +00:00
Chompstation Bot 15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot a459be5696 [MIRROR] Adds some new wheelchair types 2021-03-09 16:29:51 +00:00
NovacatandChompstation Bot 955be2e5fe Merge pull request #9876 from VOREStation/upstream-merge-7953
[MIRROR] Fixed/generalized loadout implants.
2021-03-08 16:53:20 +00:00
Cadyn 07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
AtermoneraandVirgoBot f612958f0c Merge pull request #7603 from Greenjoe12345/customloadout
adds the ability to give loadout items a custom name/description
2020-09-04 22:31:18 -04:00
Killian 92e988d3c4 edit comments 2020-02-16 06:34:09 +00:00
Killian 76f4ffe0de traffic! 2020-02-16 05:28:11 +00:00
AnewbeandVirgoBot d7c0195212 Merge pull request #6500 from KasparoVy/you_tracking_implanted_the_floor
Loadout Implants Properly go in Mob, not on Floor
2019-10-29 20:34:36 -04:00
MechoidandVirgoBot 169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Unknown 9b4ad70da6 Enables Language Implants
On request from Dragor.

Removes the VOREStation edits commenting out EAL/Skrellian language implants.
2019-06-24 21:39:23 -04:00
NovacatandGitHub 8dd3039217 Update loadout_utility.dm 2019-05-09 13:43:15 -04:00
AtermoneraandVirgoBot 445923d699 Fixes bug with custom laptops/tablets 2019-05-09 13:05:54 -04:00
NeertiandVirgoBot 16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Arokha Sieyes adbb5b86a5 Fix merge conflicts 2018-07-21 11:34:54 -04:00
AnewbeandVirgoBot edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -04: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
PrismaticGynoidandAtermonera 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
Arokha Sieyes 6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	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-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
2018-04-25 17:23:33 -04:00
elgeonmbandAtermonera c12368b887 Adds new robot codex (#5178)
* adds new robot codex

* appeases ater
2018-04-20 10:30:06 -07:00
Arokha Sieyes 68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
AnewbeandAtermonera 524c9aa5db Removes translators from the loadout (#4942) 2018-03-01 12:00:37 -08:00
atermonera 48c6161c4d Adds umbrellas to loadout, for 3 points 2018-02-26 12:39:56 -08:00
Leshana 1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
2018-02-07 19:30:50 -05:00
Arokha Sieyes 686c601e24 Further translator tweaks 2018-02-04 13:56:25 -05:00
Arokha Sieyes d0fc288df8 Removes several ways to know every language
Removes translators from loadout (departments still have them spawn for dealing with their work), removes EAL implant from loadout, remove omni language implant from R&D.

(Also fixes bug with soulcatchers that keeps the brains from hearing borgs, so you can still know all the languages while in a soulcatcher. So if you want to understand everything, get a translator in your head :p)
2018-02-04 13:03:49 -05:00
Cameron653andAnewbe 9e52040d5a Loadout Text-To-Speech device. (#4697)
* TTS Device

* Makes it a proper /device

* boop

* to_chat and message change
2018-02-03 22:47:01 -06:00
Leshana 27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	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-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
2018-01-27 23:08:53 -05:00
elgeonmbandAnewbe 3d5740c909 adds an e-reader full of news to the loadout (#4619)
* adds an e-reader full of news to the loadout

* Political Almanac -> Pocket Newscaster
2018-01-25 18:18:35 -06:00
Arokha Sieyes 3140bcf8a2 Fix commlink being in loadout 2018-01-25 16:42:56 -05:00
Arokha Sieyes 9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018
# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
2018-01-22 12:10:19 -05:00
BillyBanglesandAtermonera bfeda4c28b properly names the communicator watch selector (#4601) 2018-01-20 21:32:44 -08:00
Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.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-19 17:52:25 -05:00
BillyBanglesandAnewbe 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
killer653 3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
BelsimaandAnewbe 2d3a306dea Loadout additions + fixes. (#4339)
* Loadout additions + fixes.

* Selection fix.
2017-11-27 19:21:49 -06:00
Cameron653andGitHub df89195c48 Makes tracking implant cost 0
For preds
2017-11-10 18:28:30 -05:00
killer653 1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Anewbe dea7346b94 Fixes the autologging items in antag records 2017-10-11 21:16:18 -05:00
killer653 fa1170c7e8 Should fix all the corp regs & codex issues 2017-10-09 23:42:08 -04:00
NeertiandGitHub 4b1eb3a19a Merge pull request #4017 from Anewbe/lawbook
Adds Neerti's Law Book
2017-10-05 12:56:23 -04:00