Commit Graph

5336 Commits

Author SHA1 Message Date
Youtubeboy139
64247a1e0e Arcade Machine Tweaks 2021-02-28 22:50:07 -05:00
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
atermonera
e6eba2cb0c Hybridizes PDC systems, Bay turrets deal damage to meteors 2021-02-22 17:54:35 -09:00
atermonera
d325d45fac Revert "Adds Point Defense turrets."
This reverts commit 8fa749fbe5.
2021-02-22 14:04:08 -09: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
Cerebulon
d0b71c8c52 Lobby Improvements (#7856)
* Lobby Improvements

* HTML Tags + more recent article while I'm in here bc this may take a day or two 2 merge

* Removed to_world + fixed header
2021-02-21 12:32:38 -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
66b0338be2 Ports TGUI Security Stuff (#7902) 2021-02-19 22:18:09 -09:00
Schnayy
604417247d Merge pull request #7866 from Woodratt/WR_shuttersnsprites
New Shutters and Sprite replacements
2021-02-12 17:30:45 -06:00
Woodratt
064bbc1ace New Shutters and Sprite replacements
- Ported shutters from World
- Replaced request console, lightswitch, and newscaster sprites, (from Virgo)
2021-02-12 14:31:09 -08:00
Cerebulon
cc92440ca9 medical record bluescreen 2021-02-01 01:11:30 +00:00
Cerebulon
541dd85456 TGUI Fixes, including aghost interaction. (#7843)
* Filth + Graffiti Fixes

* TGUI fixes

* fixed the rebase graffiti thing AGAIN

* javascript indents

* rebuild zzzzz
2021-01-27 19:47:09 -09: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
ShadowLarkens
983e7b8fc9 Merge remote-tracking branch 'upstream/master' into tgui_engineering 2020-12-24 04:50:24 -08:00
Atermonera
94757e782e Revert "Experimental: adds workflow to autoupdate changelog" 2020-12-21 22:28:56 -09:00
Atermonera
4f46b72258 Merge pull request #7797 from Atermonera/autochangelog
Experimental: adds workflow to autoupdate changelog
2020-12-21 22:25:26 -09:00
atermonera
184082c4b9 Experimental: adds workflow to autoupdate changelog 2020-12-21 23:16:43 -09:00
Hatterhat
f1cd1d537c cyborg charger hardsuit functionality (#7785)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2020-12-21 20:10:19 -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
Mechoid
2018d76cae Department and Round Goals (#7369)
* Baseline work for Department Goals. Implements round-end stats, based in 3 categories of roughly-more-interesting to less interesting.

* Active Goal Separation.

* Map.

* Actually does the second half of this in this PR instead of a different one.
2020-12-11 15:16:47 -09:00
Atermonera
997b440093 Merge pull request #7765 from Mechoid/PointDefense
Adds Point Defense turrets.
2020-12-07 16:03:31 -09:00
Verkister
5d041b9dcc Fixes dismantled machines deleting inserted IDs (#7776)
* Fixes dismantled machines deleting inserted IDs

Machines no longer delete people's ID cards whenever they attempt the most obvious route of getting their card back from an unpowered machine.

* Update machinery.dm
2020-12-05 03:13:34 -08:00
Mechoid
09ec6d43a0 Matter Matters (#7756)
* Begins work on maintaining equivalent exchange.

* Oopsie woopsie I made a fucky wucky.
2020-12-01 23:28:13 -08:00
Mechoid
6aec973a5b Adds the point defense turret to cargo. 2020-11-24 04:13:40 -08:00
Mechoid
8fa749fbe5 Adds Point Defense turrets. 2020-11-24 03:36:59 -08:00
Mechoid
68b370be8a Fresh Meat, Leatherworking (#7629)
* Make Butchering more modular. Don't tell the demon lords.

* No guts no glory. That was far more work than expected to get organs to just process and work for butchering holy shit.

* Chitin and hides oh my.

* squeak. ..Why did this not fire on local?

* Squelch.

* Seven cubed livers, for the doctors in their sterile halls.

* Changeling

* Prep for Datums

* Fix Broken Broken Guns

* Redundancy

* F l a g s
2020-11-07 12:06:35 -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
SubberTheFabulous
2526303dcf adds VR thunderdome to CentComm area (#7715)
* Adds a VR Thunderdome

* Adds VR Thunderdome Vendors

* Adds VR Area

* Adds VR Thunderdome Area

* Adds VR Thunderdome area

This time without upsetting Travis, I guess.

* Adds VR Thunderdome Area

This time for sure, probably, I hope.
2020-10-16 23:06:53 -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
cadyn
fa4a942faf Fix suit cycler checks (#7679) 2020-09-23 22:56:37 -07:00
Meghan-Rossi
4cd1f55467 Fix duplicate results from analyzing some objects (#7660) 2020-09-20 04:17:40 -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
ShadowLarkens
73c29e319d Return FALSE 2020-09-18 21:16:18 -07:00
Atermonera
ccdeaa1018 Enforces adjacency on wall rechargers (#7664) 2020-09-18 20:31:46 -07:00
Atermonera
810bffd7c2 Allows non-shell borgs to use static camera consoles. (#7662) 2020-09-18 20:28:49 -07:00
Atermonera
106ac35467 Merge pull request #7597 from Rykka-Stormheart/shep-dev-airlock-sound-prefs
Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors
2020-09-16 16:39:09 -07:00
cadyn
f3e34699f1 Cycler made more rugged and options for no cosmetic changes added to all cyclers. (#7640)
* No changes option added to all cyclers, sprite check added.

Added an option for no cosmetic changes to all suit cyclers, and added a check to make sure the sprite exists before fitting it.

* Typo fix
2020-09-11 00:18:46 -07:00
Cyantime
14b2b92084 Stop trying to heat space (#7613) 2020-09-05 07:20:36 -07:00
ShadowLarkens
44f65e2602 TGUI Medical Conversion 2020-09-04 16:25:32 -07:00
Cyantime
9359f5b4f6 Fix doppler array iconstates (#7581) 2020-08-29 23:51:36 -07:00
Rykka
43f6c24a4c Removes VOREStation Additions 2020-08-29 03:21:40 -04:00
Rykka
734d863aff Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors
Self-explanatory.

Adds toggle to go back to the old-school SS13 legacy airlock sounds, including the glass windoor airlock sounds, and a toggle to disable the per-department door sounds, which some found jarring/unrealistic.

If Per-Department sounds are disabled, the department doors will use the default sounds except for open/close except for glass airlocks, which use cmd3o/c, and maintenance, which uses hall1o/c, following maintainer-requested behavior for these doors.
PR with changes from staff: https://github.com/PolarisSS13/Polaris/pull/7595

This also relocates the following sounds to be inside machines/door for more consistency:
- airlock.ogg
- airlockclose.ogg
- airlockforced.ogg
- airlock_creaking.ogg
- boltsup.ogg
- boltsdown.ogg
- blastdoorclose.ogg
- blastdooropen.ogg
- windowdoor.ogg 

Demonstration Here (recorded before the change to make department doors use maintainer-chosen audio if department was disabled): https://giant.gfycat.com/WhichUniformBrahmancow.webm
2020-08-29 03:17:31 -04:00
Rykka Stormheart
e2cff9b3fa Adds Door Volume Channel (#7592)
Adds Door Channel Volume preference for doors, that applies to open/close/bolts sounds.

This should prevent complaints of "Doors are too loud" - adjust the volume channel to your personal preference.
2020-08-29 00:10:42 -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