removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)
this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.
also applies materials to everything, with fixes, which can close#46299
* Adds attacktext2 and friendly2 messages for personal "you" messages in combat.
* Adds response_help2, response_disarm2 and response_harm2 -messages for interacting with simple animals. Also removes unnecessary, already inherited, ones.
* Small extra: Adds personal messages for gun firing.
* Adds personal messages to grabs and fixes shoe stealing messages.
* Fixes open someone else's internals valve pronoun.
* Replaces response_help --> response_help_continuous, response_help2 --> response_help_simple etc. Also adds autodoc to simple_animal.dm variables.
* shitload of new sounds
* dme fix
* file fixes
* more file fixes
* more file fixes
* volume tweaks + better pistol sounds
* more new sounds + no through walls suppressed
* better suppressed
* more work
* pistol handling sounds
* small tweaks
* Doubtful improvement
* Switches out all the magic numbers with defines
* Thanks travis for finally finding a real error
* properly resolves some left over conflict
* Reverts italics-span back to no color.
* Cleans up many extra spaces and indents.
* Adds 'hear' span class.
* Replaces all 'italics' used in heard messages with 'hear'.
About The Pull Request
Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls
This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE
I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game
Code usability
About The Pull Request
Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game
This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
About The Pull Request
It adds a shrink ray that has 5 shots, can be recharged, has unique (coder)sprites, and has a cool sound
Shoot a thing with the shrink ray to make it small. Anything can be shrunk except floors
Shrunken things grow back after a couple seconds, might adjust this
Small things will not block vision and can be walked over (this includes walls)
Small people won't fit into their clothes and will drop all their stuff (or rather, their stuff will drop off of them). They also can't move very fast, and take 2x damage while shrunk.
Preview video here
Why It's Good For The Game
It's really goddamn cool
Changelog
cl PKPenguin321, Fury McFlurry
add: A shrink ray for abductors that they can buy at their console for 2 experiment points. Anything can be shrunken, and shrunken things can be walked over/seen past (for example, you can shrink a wall and then walk around it). If a human is shrunk, they will drop all of their belongings, move slower, and take 2x damage.
imageadd: Shrink ray sprites by Fury McFlurry. Thank you!
/cl
I intend to add it as a thing abductors can purchase but am putting it up now for code review and if anybody has any other ideas on good thematically fitting places to put it.
* adds capitalism firing pin for late-stage capitalism
* purchase prompt so you can't bankrupt the captain with a rigged gun
* prompt spam check, cargo crates for pins, extra warning message for accepting payment but not having enough to pay out
* test stuff please ignore
* pay-per-shot system, alert instead of input, minor cleanup
* fuck off clown
* range check to prevent long-range purchasing
* adds "you" to some combat visible_messages.
* more you-messages and attack verbs to present tense.
* small fixes
* more additions and small fixes
* few message tweaks
* Fixes a typo and few other wordings.
About The Pull Request
Someone correctly pointed out to me that the other ones would need a free hand, and two hand component still isn't done yet. Whoever is working on it, get going for zero pay, and do it faster.
Since people did not like how THICC and BEEFY the inhands were as well, I made them a little shorter to make them look less like they're 7 ft long.
image
64xshottygun
This is what they're going to look like now, I'll bring back those two hand ones once the component is done eyes
for combat shotgun, regular shotgun, riot shotgun, and double barrel.
Changelog
cl
imageadd: New shotgun inhands
/cl
Closes#45601
Due to previous changes, projectiles need to be nodamage = FALSE to apply basic projectile status effects. Searched through code, no other projectiles appear to be broken.
* Brain damage works on organ damage procs, some defib reworks
* Heart and Lung damaging effects and failure, liver damage and failure moved to its organ again
* Cleans up reused global
* Organ damage procs on living and living/carbon
* Changes brain damage procs again
* SR heals all organs on revive, no decay for cybernetic implants, stomach damage and fail effects.
* Damage and failure effects for the appendix, ears, and some touchups on the stomach
* Committing changes so I don't lose them
* Organs now cease decaying in the proper containers
* Organ Fridges
* Reverts map changes
* Adds coronary bypass, lobectomy, trying to deal with organ_stat runtime
* Actually fixes merge conflict
* Smartfridge tweaks
* Think I figured out map merger
* Evidently not
* Still runtiming with glass shards even after I remove the map changes?
* Fixes runtime error with brain_item
* Runtime fix on living/carbon/life
* Cleaning up old PR code
* Brain damage fix, moves defines to actually be in _DEFINES, under DNA since that's where organ slots were
* Wrong math operation used
* Brains in MMIs no longer decay
* Removes redundant variable, and defibs no longer work on heart attacks caused by failing hearts
* Removes misleading comment
* init freezes organs in case organ crates are added, morgue corpses are frozen, removes adjustLiverLoss
* Removes random spaces, scanners check brain damage severity now
* Swaps numbers for defines, fixes brain surgery, rebalances coronary bypass bleed since that was insane last I tested it
* List change
* Runs off of an index instead of using cut
* Brains can be put into organ fridges
* Fixes minor type, hotfix for cloning problem
* Removes pointless check
* Demon hearts no longer decay
* Nightmare hearts no longer decay
* Removes istype() check on process, sets can_decompose instead
* Condenses organ damage report
* Removes organ failure messages
* Less organ damage spam, implements organ threshold messages instead
* Brain damage messages go to owner, not source
* Self-examine shows damaged organs
* Minor code cleanup, adds autodoc comments to the new procs
* Inverts standard organ vars to prevent random organs decaying, adds a few more autodoc comments.
* Merged the booleans into a set of flags
* Healthy living improves organ healing rates
* dunno why this didn't update
* my actions have consequences
* Sets ORGAN_SYNTHETIC for overlooked robotics organs
* Doubles heart decay time
* 3 minute heart decay
* Lobectomy/Coronary_Bypass heal more
* removes hivemind spells from the changes
* Woo shields
* reshuffle, adding a sound
* Re-organizing
* better defines for the signals I had
* new stuff
* fixes
* Replaced all instances of "defence" with defense"
and other small changes.
* oof
* spelling, and a forgotten check
* you, upgraded, improved, yes
* mostly fixes in this commit
* removes old_god from the dme
* russian shuttle improvements
* TODO: fix the hook gun
* shotgun finished, next commit shuttle
* bounty hunting shuttle
* back up to speed on the dmis
* readds poster 46 and adds the shuttle finally
* dmi fixes
* traps need fixing, work out whatever is happening with synths
* super final touches, see desc
map ports + proper spawners, pinpointer and traps functional. other misc changes
* removes verb stuff from non verb stuff
* review (see desc)
antimagic checks and it now the two objects move inside each other instead
* dmi conflicts
* PLUNGERS. BEGONE.
* Adds stat tracking to mess on station
* Checks for maint to make sure stats aren't counting maint trash which is irrelevant to the janitor
* adds mapload arg to init
* asdasd
* Changes PKM to use screwdriver to remove modules
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->
## About The Pull Request
Uses a screwdriver instead of the crowbar(????) to remove modules from it
<!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! -->
## Why It's Good For The Game
Its more intuitive and a lot more consistent with other upgrades and weapons, which use a screwdriver. Also the imagine of using a massive crowbar to pry out a module, whilst funny, isn't really ideal.
<!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->
## Changelog
🆑
tweak: PKM now uses screwdriver to remove modules
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
* Update kinetic_accelerator.dm
* Update kinetic_accelerator.dm
* Update kinetic_accelerator.dm
* Rrrrrreview
