Commit Graph

3881 Commits

Author SHA1 Message Date
Null b61f478c97 Merge branch 'master' of https://github.com/tgstation/tgstation 2020-12-08 13:27:18 +01:00
Qustinnus 8737e8cb80 Small do-after refactor (#55172)
This is an alternative to the PR Ryll made, it does some things similar e.g. the default limit of 1 interaction per target for a person, however, it refactors do_afters to support overrides for max interaction counts and unique sources.

For example, stripping uses the item being stripped as the source, allowing you to strip multiple items, but not the same item multiple times.

I've also fixed most other edge-cases this could cause where balance would be affected, but feel free to point out any I might've missed, this'll probably require some longer-term testmerging.
2020-12-07 13:04:51 -08:00
Null 3ead4e17e5 Merge branch 'master' of https://github.com/tgstation/tgstation 2020-12-07 20:29:19 +01:00
Qustinnus f887155b27 Kills oldfood, Puts newfood on top. (#55160)
Slays the last of old-food, making new-food the new normal.

Co-authored-by: MrMelbert <kmelbert4@gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-12-04 00:11:47 -08:00
Yato 354f9023bc Remove cloaks from lockers 2020-12-02 21:10:50 -05:00
Null e3af9f461e Merge branch 'master' of https://github.com/tgstation/tgstation 2020-11-30 19:54:43 +01:00
TiviPlus 0eaab0bc54 Grep for space indentation (#54850)
#54604 atomizing
Since a lot of the space indents are in lists ill atomize those later
2020-11-30 12:48:40 -05:00
Null 5ffdb97070 Merge branch 'master' of https://github.com/tgstation/tgstation 2020-11-27 15:16:07 +01:00
LemonInTheDark aef7adfc3b Removes a source of ian harddels, keeps mcgruffs bed discription from getting overwritten at roundstart, moves the bed claiming feature to just the dogbed typepath, none of the subtypes, this applies to buckling too (#55158)
Removes a source of ian harddels, keeps mcgruff's bed description from getting overwritten at roundstart, moves the bed claiming feature to just the dogbed typepath, blacklisting subtypes. This applies to buckling too.

This means that a dogbed can only ever belong to one dog. Fuck you.
Remake of #54892, github doesn't like force pushes, not sure why
2020-11-26 21:10:01 -05:00
Null 4b40083cd4 Merge branch 'master' of https://github.com/tgstation/tgstation 2020-11-26 22:39:18 +01:00
Ghom 4c31b0e116 CanUseTopic() refactor. (#54747)
* CanUseTopic() refactor.

* Forgot about default_can_use_topic. Tested and working.

* Update bin.dm

* no-nonsense.
2020-11-25 13:12:12 +01:00
Null 107567004a Merge branch 'master' of https://github.com/tgstation/tgstation 2020-11-24 18:49:49 +01:00
Arkatos1 1633a13609 tgui: Safe (#55109)
This PR refactors safes and brings their UI from html to tgui based on the PR above.

Paradise has more features for safes than us, and these features were not ported along to accommodate feature freeze. Only our current safe features settings were refactored, for example number of tumblers stays 2, no extra safe information on examine and safe codes are not generated on paper for command.

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-11-24 18:07:08 +02:00
Null 828aa20236 Merge branch 'master' of https://github.com/tgstation/tgstation 2020-11-24 15:41:34 +01:00
ArcaneMusic 72aafb5f72 Makes it so living crate creatures can pass plastic flaps as god intended. (#55088) 2020-11-23 11:43:26 -08:00
Null bedf420f19 Merge branch 'master' of https://github.com/tgstation/tgstation 2020-11-23 13:08:55 +01:00
ArcaneMusic be611e4917 Salt the earth of these god damn gym lockers (#55081) 2020-11-22 20:06:09 -08:00
Null 82cc913ed5 Merge branch 'master' of https://github.com/tgstation/tgstation 2020-11-20 16:31:05 +01:00
tralezab 3c1f235e9f AIs can now select portraits as their display (#53994)
A new option has been added to the AI display radial menu alongside random, "Portrait"

It opens a small menu that lets you peruse all of the portraits and select one as your display.

This can let avid artists draw exactly what they want their AI to be like, and not-so-avid artists to bring tears to my eyes.
2020-11-20 05:37:08 +02:00
wesoda25 23197a58ab Makes ladders craftable (#54485) 2020-11-19 15:11:15 -08:00
Null e2f8f0d370 Merge branch 'master' of https://github.com/tgstation/tgstation 2020-11-18 12:50:43 +01:00
ArcaneMusic d8f5fcd9fd Food processors and microwaves now respect food trays (#54927)
Really it's a bandaid as it would be better to wait until the refactor is done, but it turned out to be a rather easy fix.
Food trays may now once again mass insert both new and old food into the microwaves and food processors.

Prevents any manual handing when cooking large quantities of food at once.
Also, you get the switch gathering mode button when being given the serving tray again.
2020-11-18 00:33:27 -08:00
Null 36d912882a Slobbermutt update 2020-11-16 20:17:50 +01:00
ArcaneMusic 816fe2e1e3 Arconomy: Amputating the Invisible Hand of Income. (#54161)
* Final Stage Capitalism.

* tweaks.

* Got overzelous in my fervor for blood

* well, this now has my full attention.

* Whoops missed a <<

* fixes issue because there were changes I missed

* Cobby: Departmental income is static.

* Whoops

* Various high cost premium prices and a few custom_prices have been adjusted to better suit the lack of income. Code cleanup on income so they're all in-line with cargo.

* First, this has been atomized out.

* UI is now fixed as god intended.

* Actually no, this is dynamic now. No more confusion.

* Conflicts fixed.

* Apply suggestions from code review

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>

* tgui recompile.

* Hopefully aquires that green checkmark.

* --fixes the spacing.

* var cleanup and departmental budget assignment cleanup.

* merge conflict fix

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-11-13 16:32:09 -05:00
ArcaneMusic 5338ad1696 Re-assesses 99% of vending prices through Arconomics to match player resources and round-length. (#54715)
* The Re-pricening

* Rewritten and adjusted for paycheck defines.

* I made the map changes finally.

* And the refills too.

* "OH YEAH REPLACING IT ALL WITH DEFINES AND SCALING IT THE EXCEL DOCUMENT WILL BE EASY, ARCANE!!!"

* And the premium ones too.

* Accidently spoiled a future pr due to dme bleedover
2020-11-13 16:17:22 -05:00
ATH1909 80882a53a8 fixes the flags of some shocks (#54906)
## About The Pull Request

The shocks from the shock touch mutation now ignore insulated gloves, because you're touching your victim's body, not giving them a handshake.

The shocks from punching charged energy fields (special holosigns from emagged cyborgs) now DON'T ignore insulated gloves, because you're literally punching them with your hand.

The shocks from running into charged energy fields now DON'T ignore insulated gloves, to be consistent with things like electrified doors.

The shocks from the on_mob_life() effect of liquid electricity now ignore insulated gloves, like the shocks from the on_mob_life() effect of teslium do (thanks for pointing this out, Angustmeta!).

## Why It's Good For The Game

Logical sense and consistency in what forms of protection shocks check for are good things, I think.
2020-11-13 13:23:23 -05:00
ArcaneMusic b343e94113 Pies are now refactored for new foods. (#54751)
Moves over pies to the newfood typepaths, as well as the few select pie slices.

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-11-10 12:34:09 -08:00
Ghom ede1358f78 Beauty component improvements. Two new fantasy component prefixes (#54622)
Title. Changed the component backend code slightly to allow a single component to hold the total score instead of spawning new components. This should fix cases, such as material stacks without the MATERIAL_NO_EFFECTS flag, where multiple set_costum_materials calls can be made and new beauty components spawned.
2020-11-10 15:08:32 -03:00
Ghom 76cd884ed5 Poker table dismantling now respects carpet subtypes (#54869) 2020-11-09 08:47:30 -03:00
TemporalOroboros edd6500d78 /obj/screen --> /atom/movable/screen (#54403)
Repaths screen objects to /atom/movable
2020-11-08 23:07:15 -03:00
Yenwodyah 62311ee1a8 Fix royal alien pixel offset, change getter to variable (#54706)
Fixed a bug where royal aliens would have their base pixel offset applied twice, making them off-center (https://i.imgur.com/BtspaM0.png)

Changed the mob/living procs get_standard_pixel_x_offset() and get_standard_pixel_y_offset() to variables (body_position_pixel_x_offset and body_position_pixel_y_offset), to match the contribution guidelines.

Also corrected a few random things that weren't using base pixels but should have been.
2020-11-09 12:26:31 +13:00
ArcaneMusic 977c67edf9 Adds a few walls and airlocks to the big derelict space ruin to keep atmos diffs down when entered. (#54749)
* Oh right the commit

* Removes snowflake pathing for alien resin window.

* Missed one.

* Actually this whole map is just a var-edit hell
2020-11-07 21:27:16 +01:00
Rohesie 71455dcb1c Non-human mobs can now benefit from held id cards and economy. (#54647)
* Non-human mobs can now benefit from held id cards and economy.

* Moved these getters toward the upper end.

* oui?
...
dump eet.

* .tee pump
      ...
     ?iuo
2020-11-07 01:28:05 -03:00
ArcaneDefence 529757d68c Adds record of toilet combat (#54836)
Logs a direct method of dealing damage to a person that wasn't logged previously
2020-11-06 22:56:30 -05:00
LemonInTheDark 1ff673db0d Fixes catwalks smoothing with lattices (#54829) 2020-11-06 22:46:08 -05:00
LemonInTheDark 0bfc602499 Merge pull request #54798 from Ghommie/Ghommie-tg38
You can now unbuckle others from the toolbox training machine with altclick. (Lemon: Cleans up some issues with remote toolbox removal too)
2020-11-06 12:16:43 -08:00
Ghommie a7d73e5d14 You can now unbuckle others from the training machine with altclick. 2020-11-04 18:55:00 +01:00
Qustinnus 6424b6136e Turns transparency for turfs into an element, and gives it to datum materials. (#54250) 2020-11-03 15:05:54 -08:00
Ghom 9597f2f97f Converting art component into element. (#54616)
* Only art is now an element. There have been some issues with beauty.

* Typo.

* Update art.dm

* Update art.dm

* Maintainer suggestions. Reversing order of switch(impress) for correct moodlets.

* Fixing some pre-existing oddities with art element.

* stating the right var.

* simplifying the component.

* Update art.dm

* lowercasing pronoun.
2020-11-03 19:00:50 +08:00
Ghommie ec50fbd5f5 Merge branch 'master' of https://github.com/tgstation/tgstation into Ghommie-tg27 2020-11-01 14:38:30 +01:00
Rohesie 2a695064d4 Fixes table stacking exploit (#54650)
Tables could be placed on top of each other, leading to stacking of glass tables, and infinite sin. This doesn't cover anything close to all of it, but it's a good patch for now.
2020-10-31 22:42:20 -07:00
EOBGames bbc9e40d22 Corrects the Chisel Description (#54711) 2020-10-31 21:35:27 -07:00
Krysonism 9ff7944101 [READY] decorations loot crate! +3 new fancy carpets! (#54612)
* base

* fixes

* crate

* Update code/game/turfs/open/floor/fancy_floor.dm

Co-authored-by: Fikou <piotrbryla@onet.pl>

* adds the crate to the pool.

* the crate is pretty rare, why not let it drop four items?

* Update lootdrop.dm

Newline phone edit

* ungoofed

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-10-30 22:12:34 +01:00
Ghommie a74714c2ab Moved these getters toward the upper end. 2020-10-29 16:02:13 +01:00
Rohesie c55bb1b6c8 Basepixels (#54652) 2020-10-28 20:31:13 -07:00
Kylerace 6e6084f537 Holodeck bedsheets no longer drop cloth when cut (#54548)
they now check if they have HOLOFLAG_1 and if they do they dont drop cloth
2020-10-27 03:53:12 -03:00
Timberpoes 840312474b Adds game logging to welding airlocks, firedoors and lockers (#54593) 2020-10-25 23:38:47 -04:00
81Denton b76f4b33b9 no more floating resin (#54558)
Co-authored-by: Denton <d@ent.on>
2020-10-26 01:15:40 +08:00
Time-Green e0fefcc07e [READY] Multilayer plumbing machinery (#54081)
* multilayer machinery!

* adds layer mode to plungers for changing plumbing layers

* minor fixes

* Adds more feedback to plunger layer mode and places proper checks for layer changing
2020-10-23 10:41:23 +02:00
Kylerace 86be8c0548 Makes dressers not drop wood when they have the NODECONSTRUCT flag (#54534) 2020-10-23 00:15:26 -03:00