Commit Graph

3045 Commits

Author SHA1 Message Date
Mechoid 8dc04048ed Adds the Restraining Bolt. (#7820)
* Adds the Restraining Bolt.

* Malfunction.
2021-02-28 14:02:12 -09:00
Schnayy 031f8a7392 Merge pull request #7919 from Atermonera/point_defense_targeting
Hybridizes Point Defense Turrets with Bay's System
2021-02-26 09:04:43 -06:00
Aronai Sieyes 8b63a5a116 Merge pull request #7083 from VOREStation/vplk-pointdefense
Port Point Defense Batteries
# Conflicts:
#	code/_global_vars/lists/misc.dm
2021-02-22 14:00:43 -09:00
MistakeNot4892 b22a0568a3 Sideports a couple of init unit tests from Neb. (#7893)
* Sideports a couple of init unit tests from Neb.

* Trying to unfuck initialize logic.

* Removing del()s.

* Adjusting return values to Initialize().

* Moving some dangerous object logic from obj onto the two types that use it.

* Rolling back some init changes and commenting out initialized atom unit test.

* this comment formatting is a minor war crime

* Removed sleep() from signaler circuit Initialize().

* Additional Init fixes post-rebase.

* Uncomments subsystem test since that's passing.
2021-02-21 12:03:34 -09:00
Cerebulon 6d2b5e4764 Allows custom-selection of posters 2021-02-09 20:53:50 +00:00
Mechoid 1de8bc1c40 Industrial Expansion (#7811)
* Begins work on the Industrial expansion, ft hidden Lore

* Removed Painite, Quartz, and Void Opal from generation pending their eventual uses. Recipes modified to use them have been reverted of this use.

Fix Fix.

* Reset map to master.

* Add copper to Robotics, R&D, Engineering, and EVA.
2021-01-27 19:28:13 -09:00
Mechoid bd9f63a97a Gadgets & Gizmos (#7786)
* Adds various objects for explorers / antagonists.

* T A G S

* Mend
2021-01-14 21:53:39 -09:00
Atermonera 5b6631088b Merge pull request #7687 from ShadowLarkens/tgui_engineering
TGUI Engineering... and a bunch of other random things
2020-12-31 11:32:03 -08:00
Mechoid 063a2a30b8 Adds a Whip. (#7780)
* Adds material-based whips. The chain of command, as a whip-a-like, has reach 2.

* Adds the Whip to leather-crafting.

* Fix Inhands

* Don't test at night kids.

* Tweaktweak

* Map

* Span

* Don't spam more than one message on harm.

* Ranged Disarm now only occurs in logical context. (Aiming at arms or legs)
2020-12-27 16:55:08 -09:00
ShadowLarkens 983e7b8fc9 Merge remote-tracking branch 'upstream/master' into tgui_engineering 2020-12-24 04:50:24 -08:00
Hatterhat 8c790d91b4 A Thing About Digging Sand and Mineral Processor Speed (#7778)
* sand digging/mineral processor speed squashed

* typo moment + stacker also goes fast

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2020-12-21 18:34:40 -09:00
Hatterhat d695723e1b RPED QoL Tweak(s)/Unimplemented RPED Variant (#7784)
* this is incredibly scuffed

* this is a monumental W bossman

* parity with downstream

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2020-12-13 16:51:04 -08:00
Verkister 77123be953 Modular honks
Makes bikehorns use a sound variable instead of hardcoded sound for adminbus funtimes. Also makes them honk when stepped on.
2020-12-05 14:55:28 +02:00
Mechoid 576d0657ce Kaleidoscope 2: The Retabbening (#7697)
* Begins the Project

* Move things to where they belong, if viable.

* Merge and move those files.

* Finish filenames, fix Taj ears.

* Tweak to Ater's Requests

* The Great Mergening with 03_body.

* Per Requests

* Continue per request. Plot nefarious plans to make Saviks usable as battlemounts.

* Smarter Proc Use

* Tweaken
2020-11-19 10:04:09 -08:00
Shadow-Quill 236cdbb1f7 No more unnearsightedness! (#7753)
* No more unnearsightedness!

* Oops

* Oops pt 2
2020-11-04 10:24:48 -08:00
Atermonera 4cd38b493f Merge pull request #7454 from Schnayy/clawmachine
Adds AlliCo Grab-A-Gift
2020-10-29 21:47:31 -07:00
ShadowLarkens dad9020f9a TGUI Engineering... and a bunch of other random things 2020-10-21 13:02:19 -07:00
Meghan-Rossi 40865468a4 Fix most borosilicate shards disappearing instantly after being made (#7726)
*Fixed borosilicate glass not producing shards in most situations.
2020-10-17 03:05:33 -07:00
Meghan-Rossi 9611ae902e Makes wall-mounted machines layer above windows (#7708)
Makes wall-mounted machines layer above windows so that they are clickable if placed on windows
2020-10-16 23:01:39 -07:00
Schnayy f8e7f50883 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clawmachine
Pretend I know what I'm doing.
2020-10-09 19:55:28 -05:00
Meghan-Rossi 4cd1f55467 Fix duplicate results from analyzing some objects (#7660) 2020-09-20 04:17:40 -07:00
Cerebulon 0815a554c6 Tweaks to pickup/equip sounds. (#7651) 2020-09-20 03:56:41 -07:00
SubberTheFabulous 3b1fe3fabc Adds two new augments to Traitor uplink (#7642)
* Adds two new antag augments

* Adds two new antag augments

* Adds two new antag augments

* Adds two new antag augments

* Adds two new antag augments

* Adds two new antag augments

* Adds two new antag augments

* Adds two new antag augments

* Changelog

* Adds two new antag augments; Satisfies Travis

* Pleases Travis, except competently

* Adds two new antag augments; with less incompetence

* Adds two new antag augments; with less incompetence
2020-09-20 03:47:56 -07:00
ShadowLarkens 927c41c7a3 Convert /material to it's correct absolute path /datum/material (#7637) 2020-09-20 02:00:09 -07:00
Atermonera 6bd15bc200 Merge pull request #7625 from ShadowLarkens/tgui_med
TGUI Medical Conversion
2020-09-19 18:52:23 -07:00
Verkister 35cf68f36f Fixes explosion maths. (#7624)
Fixes a math error in TTV bomb calculations causing explosions to be up to 1000 times the size intended.
2020-09-05 08:05:01 -07:00
Heroman3003 cfc270e239 Adds board versions of a bunch of lawsets (#7611) 2020-09-05 07:19:16 -07:00
Cyantime 7522d5a1a5 Jetpack cleanup, don't use fuel when unneeded (#7604) 2020-09-05 06:26:14 -07:00
ShadowLarkens 44f65e2602 TGUI Medical Conversion 2020-09-04 16:25:32 -07:00
Cerebulon 811cd0b47e Vendor enhancement fixes (#7577)
* Vendor enhancement fixes

* skrellsnax trash, tuna name
2020-08-29 23:47:17 -07:00
Rykka 324cb1f12d Replace "Sleeping Agent" with Nitrous Oxide
This makes it identical to it's real-life counterpart, and brings some actual sprite improvements upstream from Virgo.

Earlyport of https://github.com/VOREStation/VOREStation/pull/8812 with an actual rename of the gas, ID, and sprite used.
2020-08-27 21:45:19 -04:00
Atermonera 6d4d5d6efd Merge pull request #7571 from listerla/nomoresitemanager
Colony Director -> Site Manager
2020-08-27 17:41:52 -07:00
listerla d56974cb92 Colony Director -> Site Manager 2020-08-25 20:12:29 -04:00
Rykka 0c7a7fd2b8 Massive Ambience and Sound Overhaul + Addition, Squashed Commit Edition 2020-08-21 06:53:05 -04:00
Atermonera a2c373c2b1 Merge pull request #7521 from Meghan-Rossi/metapint
Adds metamorphic pint glasses to RSF, autolathe, supply packs
2020-08-20 22:26:51 -07:00
Atermonera 9580d9725c Merge pull request #7502 from Meghan-Rossi/ducttape
Fix duct tape on self
2020-08-20 19:23:18 -07:00
Atermonera b2b2fd6698 Merge pull request #7469 from Rykka-Stormheart/shep-dev-toy-mech-battles!
Adds Mech Toy Battles!
2020-08-20 18:52:58 -07:00
Atermonera 4a56ad2191 Merge pull request #7449 from Cerebulon/vendEnhance
Flavour Enhancement: Vending
2020-08-20 18:23:54 -07:00
Mechoid 9ec10f97c8 Reagent Hoses (#7386)
* Starts work on basic reagent hose machinery.

* Continue Work, Add Spray Nozzle

* Tubing is craftable.

* Changeling

* Upkeep

* TRUE
2020-08-20 18:22:39 -07:00
Atermonera af81780ba7 Merge pull request #7397 from ShadowLarkens/tgui4.0-and-camera-console
TGUI 4.0 and camera console
2020-08-20 17:52:17 -07:00
Meghan-Rossi 369de519d4 Adds metamorphic pint glasses to RSF, autolathe, glass boxes, supplies
*The rapid service fabricator (found on service borgs) can now produce metamorphic pint glasses.
*The party supplies and bar supplies crates orderable from cargo now contain metamorphic pint glasses.
*The autolathe can now produce metamorphic pint and half-pint glasses.
*The autolathe can now produce all drinking glasses in batches of 5 or 10.
2020-08-19 19:52:56 +01:00
Meghan-Rossi 896870ae1b Fix duct tape on self
Fixes https://github.com/PolarisSS13/Polaris/issues/7501
Also slightly refactors duct tape code.
2020-08-14 23:02:34 +01:00
Rykka 98c07231e2 Rename toy/mech to toy/mecha to match mecha code. 2020-08-12 20:13:45 -04:00
Greenjoe12345 ed74e52130 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 11:16:42 -07:00
Rykka 13263b41a5 Adds Mech Toy Battles!
Adds a mech vs mech combat system for the toy mechs earned from arcades and found around the station. You can initiate combat with yourself by hitting a toy mech with another toy mech, or fight another player if you attack a player holding a mech with a mech.

Each mech has its own health stat and special ability that they'll use in combat against each other. How exciting!

Also slightly refactors toy locations and changes toy mechs from being JUST prizes to their own proper toy subtype!

Upstream of https://github.com/VOREStation/VOREStation/pull/8665
2020-08-12 04:38:30 -04:00
Schnayy a43cca9139 Adds AlliCo Grab-A-Gift 2020-08-10 07:32:17 -05:00
Cerebulon cbce774745 typos, lighters, trash 2020-08-10 01:27:30 +01:00
Cerebulon 3f8c0602ae ecig text 2020-08-09 05:33:57 +01:00
Cerebulon 0f146f3349 Flavour Enhancement: Vending 2020-08-09 05:05:43 +01:00
ShadowLarkens 7349c62356 Merge remote-tracking branch 'upstream/master' into tgui4.0-and-camera-console 2020-08-06 21:29:47 -07:00