Commit Graph

31399 Commits

Author SHA1 Message Date
ShizCalev 00a40810fc Unfucks gun belt icons (#51542) 2020-06-10 23:01:24 +02:00
ATH1909 9c2ce4b25b venus human traps now have thermal and x-ray vision (#51512)
* Update venus_human_trap.dm

* Update venus_human_trap.dm

* Update venus_human_trap.dm

* Update venus_human_trap.dm
2020-06-10 15:22:01 +02:00
Jared-Fogle f195419162 Most likely fix #51559 (#51562) 2020-06-10 08:27:29 -03:00
ShizCalev c4147e17c7 Fixes a snowflake heart check from the defib hud fix. 2020-06-09 21:09:51 -04:00
Jordan Brown 495ab46854 Merge pull request #51419 from Rohesie/vars
More variable declarations moved to their object definition 4
2020-06-09 20:59:05 -04:00
NopemanMcHalt b8c4d29376 bababooey (#51466)
* bababooey

* It's not AK47 but its for everyone now

* Update emote.dm

* bababooey II
2020-06-09 20:55:01 -04:00
Jordan Brown 99aac80d37 Merge pull request #51478 from Jared-Fogle/better-defib-hud
Defibrilator and Defibrilator HUD bug fixes
2020-06-09 20:51:22 -04:00
ATH1909 14cbe4d2ae Corrects a formula in a comment (#51518) 2020-06-09 20:47:36 -04:00
Bobbahbrown ead5e1d9e1 VROOOOM (#51546) 2020-06-09 20:45:16 -04:00
Tlaltecuhtli 3249114856 sex-sex-sex-sex-sex-sex-sex- (#51430) 2020-06-09 22:13:03 +02:00
Timberpoes 6150830394 More flexible system for innate/roundstart skills. (#51441)
* Added skeleton crew roundstart experience

* Skill exp defines changed to constants

* Comment tweaks

* Logic tweak

* Lazylists for the lazylist Gods
2020-06-09 22:12:22 +02:00
AnturK b8722c6c83 Datums and lists used as keys in assoc lists are now linked in vv. (#51451)
* Datums and lists used as keys in assoc lists are now linked in vv.

* Ok, uniform interface for lists.
2020-06-10 00:26:30 +12:00
Ryll Ryll 0fc4a42db3 Lets you tip over medbots (you monster) (#51409)
About The Pull Request

dreamseeker_2020-06-01_03-34-53.png

A while ago I read a book about people and robots and emotions, Alone Together by Sherry Turkle, and there's one passage that talks about people's reactions to robots simulating distress, specifically with how Furbies cry when you hold them upside down.

    A person is asked to invert three creatures: a Barbie doll, a Furby, and a biological gerbil. [Freedom] Baird's question is simple: "How long can you hold the object upside down before your emotions make you turn it back?"

    People are surprised by how upset they get in this theater of distress. And then they get upset that they are upset. They often try to reassure themselves, saying things like, “Chill, chill, it’s only a toy!” They are experiencing something new: you can feel bad about yourself for how you behave with a computer program. Adults come to the upside-down test knowing two things: the Furby is a machine and they are not torturers. By the end, with a whimpering Furby in tow, they are on new ethical terrain.

Ethics memes aside, the idea off people being caught off guard at their guilt for causing harm to inanimate objects is really funny to me, and feels extra relevant to SS13. Considering people already regularly get in fights and maim each other over harming station pets, I picture this being a great source of arguments and fights ICly over what torturing a cute lil' medbot says about you.

tl;dr this PR lets you tip over medbots which prevents them from moving or healing, and they'll slowly get more and more distressed and desperate asking for help from people around them. After a few minutes, if no one helps right them, they'll manage to right themselves up and snitch on whoever tipped them over to medical so the psychologist can keep an eye on them.

dreamseeker_2020-06-01_03-48-25.png
Why It's Good For The Game

Gives the psychologist more ammo to call people crazy, gives bored assistants another way to seek attention, provides source of minor IC conflict
Changelog

🆑 Ryll/Shaps
add: You can now tip over medbots!
/🆑

I'd like to get voicelines for these as well, but I wasn't sure of a good TTS generator, and also wanted to see if people think this is worth doing before devoting too much time to it.
2020-06-10 00:23:39 +12:00
moo 6552594e96 Medbots Now Only Heal Brute UNLESS They Are Made With Special Medkit (#51394)
About The Pull Request

Medbots now only heal brute unless they are built with a special medkit. Thanks to tlal for the simpler alternative.

Brute kits heal 10% more brute than normal medbots.

Advanced kits can be used to build pre-nerf variants of the medbots (they heal all damage types). What they heal each iteration is random though (if you could be treated for brute/tox, you may get tox healed first).

This is specific to the craftable medbots, derelict medbots and beserk medbots will heal "normally" (see above since order has been randomized).
Why It's Good For The Game

Makes the bots hyperspecified to a function which is in line with how other bots function without having to revamp how people use the medbot.
Changelog

🆑 Cobby
balance: craftable medbots now only heal brute unless they are built with specialized medkits.
balance: medbots built with the brute medkit heal 10% more
balance: medbots built with the advance medkit heal all damage types
/🆑
2020-06-10 00:19:46 +12:00
GoldenAlpharex aecebb4d64 Identification Console PR (#51374)
About The Pull Request

It simply adds a new Modular Console Preset to the existing ones, fully outfitted to replace the current Identification Console in the Head of Personnel's Office and in the Bridge, and in most of the maps' Customs desks. Note that it doesn't replace them, it's just an asset right now so we can replace them with another PR, at the pace the map maintainers feel confident with. It has the ID Card Modification, Job Manager and Crew Manifest softwares on it by default, alongside the regular Chat Client.
The new Modular Console Preset can be found under /obj/machinery/modular_computer/console/preset/id, for all your map editing needs.
I'm planning to see if I can't make changes to the Departmental Consoles later on as well, so we basically can get rid of a console in every Head of Staff's office (except the HoP because there's only one), but that will require some additional coding to make it so it's not straight up some Identification Consoles that people with All-Access could use to print even more All-Access cards.
Why It's Good For The Game

I've basically just implemented something that I feel was meant to be implemented a while ago through the use of TGUI and Modular Computers, but never actually got done. The console doesn't have the glitches of the current Identification console, when you remove your ID after logging in and it just goes to a page saying that the address couldn't be found. The UI is much simpler, looks a lot better and is just overall an improvement.

Here's what the new UI looks like, for those of you that don't feel like checking out the PR in-game to know what it looks like:
image
image
Changelog

🆑
add: New Modular Console Preset added: /obj/machinery/modular_computer/console/preset/id
/🆑
2020-06-10 00:18:41 +12:00
Kelenius d9ef3ebbfa Fix and nerf hygienebots (#51307)
About The Pull Request

This is a three-part PR:

    Firstly, it fixes bugs for hygienebot construction. There were two present that mostly cancelled each other out: first, temporarilyRemoveItemFromInventory expects that the item passed to it will be deleted shortly after. It removes the item from mob's hands but keeps loc in the mob. Hygienebots are using a stack in their construction, so the assumption was not correct. The tubing stack appeared deleted (it was actually hidden). Second, do_after was written wrongly and would allow people to build hygienebots without consuming any tubing, if not for the first bug removing it. Their sprites were also moved to other bots.
    Secondly, I added a proximity sensor into construction. I know bots are powered by magic and coder tears, but building it out of two metal sheets, a hole, and a tube is ridiculous even for those standards. Also literally every single bot uses proximity sensors. This change will make them less spammable, because I've seen upwards of 10 being build for the funzies.
    Thirdly, I nerfed the hygienebots themselves. First, they no longer start slipping everything in their path when they're chasing someone for 5 seconds. This is stupid, no other bot is as disruptive as that, it doesn't make sense to give them slipping everything in their path as a part of normal operation. Combined with hygienebot spam, this was just shitty all-around. They still slip the tile they clean, but no more than that. Second, I made them less spammy; instead of a flat 60% chance to yell at people, it slowly increases to that number. I removed the vasectomy line (WTF?). Finally, they will now drop their target if it gets too far; previously they'd chase it forever.

Fixes #50159
#50191 - not fully fixed
Fixes #50339
Why It's Good For The Game

It requires about 0.7 brain cells and autolathe access to make slipper go brr, and there's no abundance of greyshirts in bloody shoes running around and turning station's hallways into a mass slip'n'slide.
Changelog

🆑
fix: Hygienebot construction has been fixed.
balance: Hygienebots now require a proximity sensor between welding and tubing.
balance: Hygienebots no longer slip their path while chasing someone.
balance: Hygienebots are less spammy.
/🆑
2020-06-10 00:17:50 +12:00
tmtmtl30 b6963e3d56 removes deprecated game_mode proc check_win() (#51392)
* aaaaaaaaaaa

you ever notice how people sometimes put song lyrics in their discord statuses? what's the deal with that?

* phew

i mean let's all admit nobody would have noticed anyway

* turns out i didn't really change this proc at all

there wasn't much to fix

* fuck

oops
2020-06-09 06:37:47 +02:00
EOBGames 961513f59c Codename: Jeu Tarot- Tarot Cards, for games and divination, risen like a phoenix (#51318)
About The Pull Request

Re-PR of #51027 due to a git hiccup.
Adds tarot cards, for business and pleasure. The tarot deck consists of 78 cards, split into 56 Minor Arcana cards (each suit consists of 10 number cards, and 4 face cards) and 22 Major Arcana cards. The deck has new art:
minorarcana
majorarcana
Special thanks to Fikou for deciding which jobs should correspond to each of the Major Arcana.
Why It's Good For The Game

It's a fun distraction from the dull humdrum of station life, and opens up some good RP opportunities.
Changelog

cl Inept
add: The Nanotrasen Entertainment Division has released a new product: Tarot cards! They're available from the Fun vendor for all your divination needs.
/cl
2020-06-09 15:57:23 +12:00
IndieanaJones 8688d844c7 [READY] Lavaland Elite Buffs and QoL Changes (#51139)
* Update Every File in the Elites Folder

* Prevent Lavaland Elites from Taking Bleed Damage (Because it's stupid)

* Increase the Power of Hope from 5 to 10

* Goddamit Travis

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>

* Update to comply with autodoc requirements

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update legionnaire.dm with requested changes

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Last Fixes and a Final Change

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-06-09 00:07:35 +02:00
AnturK 70cc742966 Removes pointless processing status effects from mining mobs. (#51481)
* Removes pointless processing status effects from mining mobs.

* Status effects are bad mkay.
2020-06-08 22:16:58 +08:00
Trigg 31502772be update_static_data now passes user to push_data() (#51485)
update_static_data now passes user to push_data().

I'm pretty sure no UIs currently use user in ui_static_data for... Anything. So that's why no one noticed this before. Well, better to pass it than not.
2020-06-08 20:39:50 +12:00
Tad Hardesty 829e95896e Replace BSQL with rust-g, paramaterize all queries (#51255)
cl
refactor: BSQL has been replaced with rust-g, improving SQL reliability and safety.
/cl

Queries were parameterized as much as possible. Careful code read by someone else also versed in SQL would be a good idea. Things seemed fine spot-testing roundstart, library, bans, and polls, but more stress-testing may be useful.

Also updates rust-g to v0.4.5:

    Improved Linux .so detection
    Perlin noise functions

Also updates Travis script to bionic.
2020-06-08 16:00:07 +12:00
TheChosenEvilOne 1318b269a2 Some cleanup (#51315)
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-06-07 14:33:57 +02:00
Jared-Fogle 2a52fb48fd Don't check plasmamen for hearts, don't check brains for HARS 2020-06-07 00:02:57 -07:00
Jared-Fogle d6b6a6d7ec Set medical HUD status on login and logout 2020-06-06 15:22:56 -07:00
Jared-Fogle ca18f4e9c4 Fix defib nanite and husk text 2020-06-06 15:02:04 -07:00
LemonInTheDark ea950bcf44 Fixes canister pain (#51074)
* fixes dumb canister shit

* Thanks anturk

* That good?

* moves the base icon state to the object def
2020-06-06 11:30:43 +02:00
Jared-Fogle f2d295c623 Replace TRUE with DEFIB_POSSIBLE 2020-06-06 02:24:02 -07:00
Jared-Fogle cc409ed6c5 Fix defib hud being inconsistent, refactor can_defib 2020-06-06 01:37:15 -07:00
Kaffe-work 4e9ad98cb6 Changeling on changeling absorb fix (#51444)
* adds changeling vars

needed due to changeling that absorbs a changeling that absorbs a changeling getting more chems

* Update changeling.dm

changes reset_properties() to reflect things that sohuldn't reset to baseline - this is not pretty

* fix spell error

* spelling error

* add some comment on why change was done

This really speaks for itself in my opinion
2020-06-05 23:50:37 +02:00
Ryll Ryll 569e89abd0 Minor circle hand fixes (#51276)
* love being "the circle game" person now

* most useless flag ever
2020-06-05 17:23:31 -03:00
nemvar 6931d4f934 Fixes turf atmos getting deleted. (#51453)
* Fixes turf atmos getting deleted.

* Moves the gas transfer procs to the gas mixture.

* Fixes emp act to behave like before

* Fixes tanks exploding
2020-06-05 19:22:36 +02:00
LemonInTheDark eab31fd4d5 Adds some card unit tests, cleans up some comments (#51434)
* Adds unit tests, some more checks, and improves some comments

* sweep sweep sweep?

* Braindamage
2020-06-05 18:46:58 +08:00
AnturK 22e619dcf1 Fixes sensors runtime. (#51445) 2020-06-05 18:44:52 +08:00
nemvar 7014a40523 Documents browserOutput.dm (#51439) 2020-06-05 18:43:43 +08:00
MrDoomBringer 7c08960f9a illustrious (#51418) 2020-06-05 03:41:21 +02:00
Fikou 92517beff0 replaces plasma in bluespace beaker with plastic (#51437)
* replaces diamonds in bluespace beaker with plastic

* ok cobert c chemicals
2020-06-04 22:46:50 +02:00
Jordan Brown efe101b052 DMAPI 5.2.2 (#51100)
* Update DMAPI to v5.1.0

* Add more event handlers

* Patch

* DMAPI 5.2.0

* DMAPI 5.2.1

* Add missing trailing new line

* Fix the version we print after updates

* 5.2.2
2020-06-04 18:13:37 +02:00
ArcaneMusic a5f38624ab Fixes Pest/Weed Killer so that they don't act like hypertoxins, adds organic weedkiller to compensate. (#51293)
* Initial Commit.

* Fineeeeeee, added sanity check.

* Alright, nerfed according to corn on the cobby
2020-06-04 10:45:41 -04:00
Ryll Ryll afdce632bc Adds coupons to cargo, turns small crates into goodies (#51216)
* Adds coupons

* fixes invalid var

* fixes old var name

* test

* does this please you travis?

* is that a prize, or....

* adjusts odds

* fikou owes me $10

* neatens code per review

* corrects bouncy

* corrects some errors

* redisables price gouging on goodies
2020-06-03 21:40:39 +02:00
AnturK 74ea449566 Fixes Get-Current-Logs (#51376) 2020-06-03 21:35:03 +02:00
necromanceranne ffcf609a36 Fixes neckgrabs being only escapable if RNGesus comes down and saves you from your fate (#51427)
* Fixes grabs being impossible to escape, at the expense of making it easier to escape a grab. Damage inflicted by resisting increased to compensate.

* Upped the time between resists a bit
2020-06-03 21:33:36 +02:00
Fikou 6245b51884 atmos jumpsuits now have the same protections as engi jumpsuit (#51243)
* fix (maybe)

* atmos jumpsuits now have the same protections as engi jumpsuit

* gosh i hate plasmem

* hhhnnn

* fuck
2020-06-03 09:58:41 -04:00
skoglol 13a6293508 Removes some dead code (#51426) 2020-06-03 15:58:53 +08:00
ATH1909 2f7913ceba replaces the mulebot 16 second hardstun with an 8 second knockdown (#51277)
* F

* Update mulebot.dm
2020-06-02 21:30:09 -04:00
EOBGames 22ed61f2e9 [READY] Codename: Blue Eyes White Jumpsuit, the TG TCG, Part 1, Reborn (#51252)
* here goes nothing

no really this is basically nothing

* dme is less dumb

* aaaaa string files

* Card backend (#3)

* Adds card backend and hotloading

This is a combination of 2 commits.

OH SHIT THE SM IS ON FIRE

WE DONE LADS

* Woop

* Best we'll get

* fixed file system, courtesy of potato

* updated tools (thanks potato), now up to 40 cards

* Adds rarity (#4)

* Adds rarity

* just to be sure

* Adds it to cards

* Didn't read templates WHAT A NERD AMAROIGHT

* Commets

* Woop you'd think I'd know my own system

* There we go

* Fuck you EOF (#5)

* Makes rarity not suck (#6)

* Fuck you EOF

* Makes rarity not suck

* Auto stash before merge of "blueeyedwhitejumpsuit" and "origin/blueeyedwhitejumpsuit"

* Makes rarity work as expected, thanks dogman (#7)

* smolcards

* Adds datum cards (#8)

* Datum cards

* Some docs and a little bit of cleanup

* fuck

* problems be had

* Fuck (#9)

* fucko bungo RELASE ME FROM THIS HELL GIT

* datum FUCKING AHHHHHHHHHHH

* packs and games

* boomer mood (#10)

* Card debugging (#11)

* Adds debug vars

* that's a bit better

* shit

* unfucks rarity

* scales sorted

* That should do it

* Parity

* fun fact

* series 1 json

* and so it is done

* Don't need this, I'm dumb.

MacRo-Op???@?#?@??!#?!@

* BRAINDAMAGE

* resin redux, smaller cards

* shut up shut up shut up IT'S ASSUMED TYPE OK? *it's not all that bad*

* double rarity TABLELS, fixed the silly linter

* flippers and rarities

* guaranteed rarity, rarity tables

* fuck it let's ask

* resinfront

* 2560 core set

* fixes flippers

* template icon, extra variable juice

* ADDS SPEED (#12)

* FUCK FUCK FUCK SHIT I BROKE IT AGAIN

* Kills my dreams in the NAME OF SPEED

* and some cleanup

* Minor changes, some qol (#13)

* couple small changes, moved the datum procs around to make things cleaner, made some comments autodocced

* Let's be more clear,

* and a woooop

* Removing ids, carpel tunnel edittion (#14)

* Subsystem

* Carpel tunnel completed

* woop

* curator is no longer equipment

* I'm not dumb you're dumb (#15)

* minor rarity tweak

ladies and gents, it's finished

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-06-01 22:50:07 -03:00
L 4e5306f754 More defines moves 2020-06-01 20:18:44 -03:00
Rohesie b73e2c4b0e Adds a knockedout trait, begins refactoring mobility 2.0 (#51348)
* ko

* change request
2020-06-02 00:14:49 +02:00
TemporalOroboros 2438ef86fe Firesuits and Radsuits fit the big tanks now (#51395)
Changed the allowed suit storage items for firesuits and radsuits to allow any internals tank.
2020-06-01 03:13:46 +02:00
BeeSting12 b0a17333f3 fixes grammar (#51387) 2020-06-01 03:04:12 +02:00