Commit Graph
4808 Commits
Author SHA1 Message Date
AtermoneraandGitHub 7428d47c83 Merge pull request #7508 from Rykka-Stormheart/shep-dev-persistence-patch
Persistence Patch
2020-08-20 19:31:12 -07:00
AtermoneraandGitHub 9580d9725c Merge pull request #7502 from Meghan-Rossi/ducttape
Fix duct tape on self
2020-08-20 19:23:18 -07:00
AtermoneraandGitHub 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
AtermoneraandGitHub 4a56ad2191 Merge pull request #7449 from Cerebulon/vendEnhance
Flavour Enhancement: Vending
2020-08-20 18:23:54 -07:00
MechoidandGitHub 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
AtermoneraandGitHub 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
Rykka 78ea8b236f Fix Travis errors, define mapload as Initialize() argument 2020-08-16 10:17:45 -04:00
Rykka 2ad7b475ec Persistence Patch
- Fixes Paper and font tags stacking across rounds, as shown in: ![](https://cdn.discordapp.com/attachments/187013248309002240/741937939382141000/164fdd3a37fb22f18dfa9b5c431ffc04.png)

- Fixes Persistence being always-on because of if("persistence_enabled") config.persistence_enabled = 1. As explained: 
> it's on by default, which means config.txt will be read and if it's not there it stays at 1. If it is there,it gets set to 1. There is no way to disable it

- Adds config options to enable/disable **Persistence for Maploaded objects**, as well as a verb to toggle such.
- Adds Persistence to config.

Currently IGNORE_MAPLOAD for Persistance is **Disabled.**
Maploaded objects/dirt/etc will be saved by persistence, preserving current behavior.

You will need to update config.txt with the following lines:
\## Uncomment this to DISABLE persistence 
\#PERSISTENCE_DISABLED 
 
\## Uncomment this to DISABLE maploaded trash/paper/etc from being saved by the persistence system. 
\#PERSISTENCE_IGNORE_MAPLOAD
2020-08-16 09:58:57 -04:00
Rykka 3cf157dcfd Relocates additional info to description_info 2020-08-16 03:01:08 -04:00
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
Greenjoe12345andGitHub 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
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
AtermoneraandGitHub a158612b79 Merge pull request #7403 from dwinters99/mechtoy-and-arcade
Mechtoy and arcade
2020-08-06 11:44:27 -07:00
AtermoneraandGitHub 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
AtermoneraandGitHub c820021ad6 Merge pull request #7361 from ExabyteDiscord/Upstream-Dog-ChemistryThing
Overdose changes + General chem mods
2020-08-05 17:52:26 -07:00
MechoidandGitHub 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
MechoidandGitHub 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
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
KillianandGitHub 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
AtermoneraandGitHub 55b2c8d6ef Merge pull request #7354 from Neerti/status_indicators
Implements Status Indicators
2020-07-30 12:29:46 -07:00
AtermoneraandGitHub d0037676e1 Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
Aurora Cooking Port
2020-07-30 12:13:07 -07:00
CerebulonandGitHub 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 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
Erik f284d6a7b7 Overdose changes + General chem mods 2020-07-21 21:27:58 -07: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
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
SchnayyandGitHub 9b5c2222a8 Merge pull request #6799 from Cerebulon/booksprites
New book sprites + inhands
2020-07-09 16:32:01 -05:00
AtermoneraandGitHub 8b3bdd0863 Merge pull request #7268 from VOREStation/Arokha/baylockers
Ports Bay's lockers/cabinets/crates/etc
2020-07-03 16:09:06 -07:00
AtermoneraandGitHub 97c1085ebf Merge pull request #7304 from KillianKirilenko/kk-bio
Offload Defibrillatability from NO_SCAN
2020-06-25 12:44:20 -07:00
AtermoneraandGitHub 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
Billy Bangles c498761907 Adds move descriptions to piece examine text
and that cheeky lil' changelog
2020-06-21 18:46:16 -04:00
AtermoneraandGitHub a481a0fbea Merge pull request #7297 from Greenjoe12345/wrist-PDA
Wrist-bound PDAs!
2020-06-21 13:40:17 -07:00
Billy Bangles d772fee47b Adds a set of chess pieces 2020-06-21 14:08:11 -04:00
Greenjoe12345 4c8bc9c4fe list thingy fixed? 2020-06-21 18:16:00 +01:00
Greenjoe12345 ba2a49999a adds wrist PDAs 2020-06-17 00:24:54 +01:00
Leshana bcefb98425 Stop sending PDA icons to clients, they have not been used since 2013. 2020-06-06 16:00:52 -04:00
BillyBanglesandGitHub cb8a366113 Adds marble floor tiles and crafting recipe (#7264)
* Adds marble floor tiles and crafting recipe

* swaps screwdriver removal for crowbar

* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit
2020-06-06 11:35:35 -07:00
AtermoneraandGitHub 1bcb649378 Merge pull request #7262 from lolman360/master
fixes hybrid crowbars
2020-06-04 19:25:35 -07:00
Aronai Sieyes 5cc996d82d Port Bay's lockers, crates, largecrates, wall lockers 2020-06-01 12:38:07 -04:00
AtermoneraandGitHub 58600b7c72 Merge pull request #7248 from VOREStation/Arokha/stacksploit
Fix medical stack exploit
2020-05-30 23:18:14 -07:00