Commit Graph

7882 Commits

Author SHA1 Message Date
Rykka
a060680d94 Adds usage to Description, adds Changelog 2020-08-16 02:56:42 -04: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
listerla
c3f9b4061d The great Aurora shoe heist 2020-08-10 17:28:07 -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
Cerebulon
484c45b204 disables footprint persistence (#7415) 2020-08-06 21:09:30 -07:00
Atermonera
a158612b79 Merge pull request #7403 from dwinters99/mechtoy-and-arcade
Mechtoy and arcade
2020-08-06 11:44:27 -07:00
Atermonera
1fc6477d5e Merge pull request #7393 from Rykka-Stormheart/shep-dev-tg-alerts-updoot
Port lots of things that had to wait on alerts (Replaces Arokha's PR)
2020-08-06 11:38:16 -07:00
Atermonera
085c974646 Merge pull request #7390 from Cerebulon/schneemobs
Adds some surface mobs.
2020-08-06 11:20:45 -07:00
Atermonera
0abf36face Merge pull request #7378 from Neerti/portals
Think with Portals
2020-08-05 18:44:40 -07:00
Atermonera
c820021ad6 Merge pull request #7361 from ExabyteDiscord/Upstream-Dog-ChemistryThing
Overdose changes + General chem mods
2020-08-05 17:52:26 -07:00
Mechoid
282b42dbc1 Exosuit Modular Internals, The Squeakening (#7329)
* Begins work on internal exosuit components, similar to Borgs.

* Large volume of work on exosuit components, Durand is tweaked to be higher cost in time and resources, since it requires AP to damage, without ions or explosives.

* Component Sprites

* Actually implement component repair, I knew I missed something.

* Magic numbers, properly typed lists, and indentations oh my

* Changeling
2020-08-05 16:20:46 -07:00
Atermonera
92ea262ec5 Merge pull request #7404 from Cerebulon/fuelbgone
Fuel spills no longer persistent
2020-08-01 21:23:17 -07:00
Mechoid
4de1dd26b9 Fish tank (#7365)
* Fish can be put into special glass jars when they have water.

* Printable.

* Upkeep

* M a g i c n u m b e r s

* More numbers, changeling
2020-08-01 20:44:18 -07:00
Cerebulon
f20f85a123 Fuel spills no longer persistent 2020-07-31 19:33:10 +01:00
David Winters
df4fac62be Random mech toy
Unless I'm the blindest human on earth, there isn't one of these. So I made it.
2020-07-31 07:49:22 -04:00
Killian
8d731a153b blood mechanics tweaks (#7377) 2020-07-31 01:53:41 -07:00
ShadowLarkens
971a95bc0a TGUI 4.0 & Camera Console 2020-07-30 17:48:11 -07:00
Rykka
28a7698b9e Port lots of things that had to wait on alerts
Adds a HUD for observers
Adds a HUD for rigs and mechs
Adds up/down buttons for AI hud
Add more tg style alerts
Fix some bugs with the tg alerts
Improve icon_states usage by caching it
Redo how respawning works, add a button to ghost hud for it
2020-07-30 16:23:32 -04:00
Atermonera
55b2c8d6ef Merge pull request #7354 from Neerti/status_indicators
Implements Status Indicators
2020-07-30 12:29:46 -07:00
Atermonera
d0037676e1 Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
Aurora Cooking Port
2020-07-30 12:13:07 -07:00
Cerebulon
c55b759eb6 schnee mobs 2020-07-30 05:01:12 +01:00
Neerti
06f4f768a9 Corrects documentation as one flaw is gone now. 2020-07-26 18:49:36 -04:00
Neerti
222b0e4249 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into portals 2020-07-26 18:49:12 -04:00
Neerti
4cfb4e2524 Gets stuff ready for using portals on Sif to transfer between z-levels. 2020-07-26 18:21:09 -04:00
Neerti
88109119dc Finishes portals. 2020-07-26 12:36:44 -04:00
Cerebulon
03b7a0ea0d Persistent Trash/Dirt/Graffiti/Notices (#7337)
* Port Trash/Writing Persistence from World

* stuff beyond straight portin

* Fixed admin menu

* Config, cigbutts, blood exceptions, offices....

* mapped butts
2020-07-24 02:23:34 -07:00
Rykka
6ff4642233 Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:09:42 -04:00
Rykka
b367193908 Huge Bundle of Fixes, Update Cooking to current Aurora
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
2020-07-22 21:45:03 -04:00
Neerti
25e8f73c75 Implements basic portals. 2020-07-22 05:19:39 -04:00
Erik
f284d6a7b7 Overdose changes + General chem mods 2020-07-21 21:27:58 -07:00
Cerebulon
d7f25c36cb Flavour Enhancement: Crates (#7342)
* crates

* map changes

* rotation and dragging
2020-07-21 19:18:38 -07:00
Rykka
aae41604d7 Clean up commit history, bugfixes, etc. 2020-07-20 23:47:36 -04:00
Neerti
94062a21bf Implements status effect icons for various statuses. Cleans up various variable accesses to use setters instead. 2020-07-18 12:53:32 -04:00
Rykka
aaf223b256 Aurora Commit 2 2020-07-16 20:52:28 -04:00
Atermonera
3218936ed3 Merge pull request #7339 from Rykka-Stormheart/shep-dev-pda-fix
Fix Janicart PDA bug from Aro's Rewrite of Janicarts.
2020-07-15 11:36:42 -07:00
Cerebulon
4474f3f713 Flavour Enhancement: Guns (#7333)
* Flavour Lore: Guns

* New guns/sprites, crates, etc.

* couple o oversights fixed

* couple o oversights fixed

* final tweekz
2020-07-13 20:04:59 -07:00
Rykka
ebbfc92a95 Fix Janicart PDA bug from Aro's Rewrite of Janicarts.
Upstream port of https://github.com/VOREStation/VOREStation/pull/8404

Fixes create_NanoUI_values() crashing before it returns the data, thus crashing everything else, because reagents was `null`, as a result of Aro's redoing of the janitor carts to not have a bucket by default.
2020-07-13 20:57:06 -04:00
Kates
5d10e60c88 Add a random mech spawner (Not mapped in yet) (#7324)
* Add some work for random mechs
- Add a few variants of worn down, slightly busted mechs, this is specifically intended for mech bay later on.
- Add a random spawner with pretty much every mecho inside of it.
-

* Several mecho things:
- Add a comment to mecha.dm
- Add a forgotten comma
- Delete the vague attempt at a marauder cleared thing.
- Correctly change max health on the gygax

* Make it so the Marauder/old doesn't spawn with stuff

* Add a weaker list of mechs without phazon & marauder
2020-07-09 15:13:16 -07:00
Schnayy
9b5c2222a8 Merge pull request #6799 from Cerebulon/booksprites
New book sprites + inhands
2020-07-09 16:32:01 -05:00
Atermonera
8b3bdd0863 Merge pull request #7268 from VOREStation/Arokha/baylockers
Ports Bay's lockers/cabinets/crates/etc
2020-07-03 16:09:06 -07:00
Atermonera
97c1085ebf Merge pull request #7304 from KillianKirilenko/kk-bio
Offload Defibrillatability from NO_SCAN
2020-06-25 12:44:20 -07:00
Atermonera
d40af2f1e2 Merge pull request #7303 from BillyBangles/deep-blue-can-suck-my-toe
Adds chess pieces and chessboard holodeck program
2020-06-25 12:42:33 -07:00
Killian
5da912d679 offload defib from no_scan 2020-06-23 18:06:28 +01:00