Commit Graph

48746 Commits

Author SHA1 Message Date
skoglol
b68abe7e6d Adds random character when antagonist preference (#46952)
About The Pull Request

Well known statics rejoice! You can now choose to have random name/body/age/gender whenever you roll roundstart antagonist.

Since player mobs are generated before antag datums are handed out, I added a list that collects minds chosen as antags during pre_setup() to keep track of this.

"Other" was also missing from the random gender, added it.

Wizard, clown op, nukeop, latejoin and midround antags are excempt.
Why It's Good For The Game

Some static namers get metagamed to the extreme when antagonists, this should help alleviate that while allowing them to keep static naming for the RP. Keep in mind all conversion, midround and latejoin antag rolls are excempt, this is not a guarantee someone is a non-antag.
Changelog

cl Skoglol
add: Random name/body/age/gender when roundstart antagonist preference added.
add: Random gender will now have a chance of picking "Other".
/cl
2019-10-13 17:00:17 +13:00
William Wallace
e7c573fc5a delete goliath_hide.dm (#46973)
About The Pull Request

This is a 1:1 duplicate object definition to the one @ https://github.com/tgstation/tgstation/blob/master/code/game/objects/items/stacks/sheets/leather.dm#L191-L201
Changelog

cl
code: removed duplicate goliath_hide definition
/cl
2019-10-13 16:58:41 +13:00
skoglol
d735e0bf36 Yet another debug outfit update (#46982)
About The Pull Request

Less uranium in the material box due to radiation. Suit helmet has had geiger sound reduced to 0, and a manual geiger counter added to the box. Also added a death wand for easier and cleaner killing.
2019-10-13 16:55:39 +13:00
James
a05d954b45 Split personalities can now communicate directly (#46875)
About The Pull Request

This PR allows people with the split personality trauma to communicate with the stranger and vice versa through an action button. I also considered adding an option for the active player to release control but I felt that would be breaking the spirit of brain traumas a bit much.
Why It's Good For The Game

Split personality has always been a situation where the second player's only real option is "How many times can I shout "I'm Gay"/WGW over radio and try and avoid surgery until I inevitably get removed?" Don't get me wrong, you can still do that, but I aim in this PR to give players another option to get some of that sweet RP in. The main argument I can see coming up against this change is that traumas are supposed to be negatives, but how I see it, this doesn't make Split Personality a positive trauma so much as it allows roleplay similar to how you can roleplay as a paraplegic war veteran or as an ex-security officer who developed a phobia following an 'incident'. I'm happy to add a cooldown to the action if it proves to be an issue.
Changelog

cl
add: Split personalities can now communicate with an action button
/cl
2019-10-13 16:54:12 +13:00
ArcaneMusic
4e75dc81f7 Adds BBQ sauce, and BBQ Ribs. (#46898)
About The Pull Request

With the end of summer rapidly passing us by, and the recent advent of the GRILL approaching, I felt like this was long overdue.
This introduces BBQ sauce, a new condiment created with 1 part ash, 1 part tomato juice, 1 part black pepper, and 3 parts saline glucose. You can add BBQ sauce like any other condiment, or you can use it to make the new BBQ ribs, made with BBQ sauce, 2 rods ("bones"), and 2 steaks.
BBQ and Ribs
(Left to right, Beaker with BBQ Sauce, BBQ Ribs, BBQ Sauce Packet, and the BBQ Sauce Condiment bottle.)
Why It's Good For The Game

Thought it'd be thematic and fun to go along with #46844 while opening up the possibility for other BBQ style recipes.
Changelog

cl
add: Added a new condiment, BBQ sauce.
add: Added a new recipe to make BBQ Ribs.
/cl
2019-10-13 16:51:47 +13:00
James
e61dd10593 Nitryl gas reaction now uses pluoxium as a catalyst (#46900)
About The Pull Request

Title
Why It's Good For The Game

Since the introduction of the n2o decomposition reaction it has been essentially impossible to get nitryl gas, because all the n2o you add as a catalyst burns away stopping the reaction. In this one line PR I swap out n2o for pluoxium, which makes nitryl slightly harder to get, but makes it actually possible to get more than single digit mole counts in the first place. If swapping n2o for pluoxium adds too much difficulty, the required temp could be dropped a bit to compensate.
Changelog

cl
tweak: The nitryl gas reaction now uses pluoxium as a catalyst
/cl
2019-10-13 16:51:20 +13:00
nemvar
62a02f09f1 Medanalyzers are now the tier 2 option for scanning people. (#46917)
About The Pull Request

Removes medical analyzers from medkits.
Removes the ability to print medical scanners from the autolathe.
Why It's Good For The Game

Medical analyzers are currently probably one of the common items in the game. Not only do mappers place them all over their maps but they are also in every medkits, which, funnily enough, are also fucking everywhere.

This leads me what I call the Cobb's Assortment of medical scanner quality:
Tier 1: Ghetto tier. Click your healthdoll, see if you burned for fingers on the kitchen plate.
Tier 2: Normal Analyzers. Somewhat restricted but still fairly common. Almost every department has one but you won't find on randomly in the hallways.
Tier 3: Advanced Analyzers: The shit medbay can print after research, nuff said.
Changelog

cl
balance: Removed health analyzers from medkits. Removed the ability to print health analyzers from autolathes.
/cl
2019-10-13 16:50:12 +13:00
moo
81becaf5d1 Cobbduceus: That girl is POISSSONNN (C2 Tox Chem changes) (#46823)
About The Pull Request & Why It's Good (Italics)

closes #46808
Seiver (NEW, replaces Fiziver)

Fiziver has been removed in favor of a new chem, Seiver.

Seiver is a chem that focuses on radiation purging or antitoxin depending on the temperature (the holder temp, not the air temperature). Colder temps will purge rads while hotter temps will clear up your sinuses toxin! Does heart damage relative to healing done.

Fiziver didn't see much use and I grew to dislike the overall damage mods. I think this is more interesting anyways since you have to play with chemtemp, something that adds a bit more depth to the chem. You may even need to add buffer chems that are cold to retain the high healing thresholds.
Multiver

Multiver is now geared heavily towards toxpurging. It now purges non-toxins less and stops purging medicines completely while you have at least 5 unique meds (including multiver) in you.

Multiver no longer self purges

Multiver's C2 mechanic is scaled down for each unique medicine (more unique meds makes it less bad for lungs!).

Multiver's toxhealing is lowered to 0.1 per unique medicine.

I wanted multiver to compete with syrinver since it wasn't used often but also not justify an arms race, so I decided to give them unique roles. Multiver is now more oriented for chem-purging while syrin is geared towards pure tox-healing so they should both find themselves in the smart doctor's arsenal.
Syriniver

Lowered the chem-purging for syriniver, with musiver having an even lower purging mechanic. They are also less selective, purging everything (syrin will not purge itself but musiv will).

see multiver
Changelog

cl Toxicby
add: Seiver, a chem favoring radpurging (cold temps) or antitoxin (hot temps) based on temperature (NOTE: NOT ATMOS TEMP)
del: Fiziver is now removed in favore of Seiver. Seiver uses old Fiziver recipe.
balance: Multiver is now geared towards chem-purging, and the unique-med mechanic is more rewarding than just amplifying the effects. Lowered toxin damage.
balance: Syriniver is now geared towards tox-healing. Lowered chem-purging and make it nondiscriminatory barring itself. Musiver has even lower chem-purging and is completely nondiscriminatory.
balance: 2 multiver bottles in the Medivend were replaced with syriniver since they now have more distinct functionalities.
/cl
2019-10-13 16:49:00 +13:00
4dplanner
27413bcf40 Shade fixes (#47031)
About The Pull Request

fixes #46572 (I think)
Why It's Good For The Game
Changelog

cl
fix: shades now heal properly upon re-entering a soulstone (previously they would temporarily heal, then take back all the damage next time they were hit)
fix: shades summoned from a soulstone are no longer invincible
/cl
2019-10-13 16:46:25 +13:00
Iamgoofball
95ab416ce0 [s] fixes href exploit to early join the game before roundstart (#47029)
fixes href exploit to early join the game before roundstart
2019-10-13 16:46:11 +13:00
Couls
ec1df6c7e7 fix some blindness issues (#47024)
About The Pull Request

fixes #47020 #47022
I didn't have a max set for the adjust_blindness proc which allowed it to go below zero which meant if you took eye healing chems it would actually make you blind forever, the issue with the wizard spell blinding you permanently was due to a check to see if duration was less than charge_max for genetic spells which was used for making mutate permanent, but also made the blindness spell permament
Why It's Good For The Game

Being blind forever can suck
Changelog

cl
fix: blindness spell now only blinds you temporarily
fix: drinking carrot juice no longer permanently blinds you
/cl
2019-10-13 16:45:47 +13:00
carlarctg
0d8160938f sawn off shottie has an inhand (#47019)
Changelog

cl
fix: sawn off shotgun has inhand
/cl
2019-10-13 16:45:06 +13:00
Arkatos1
b6aba70dfa Good music fix (#47014)
About The Pull Request

This PR fixes a bug where you could receive positive effects of hearing good music even if you did not hear any actual music due to being deaf, for example.

Fixes #43720
Why It's Good For The Game

Less bugs.
Changelog

cl Arkatos
fix: You will now only receive positive effects of hearing good music if you can actually hear the music.
/cl
2019-10-13 16:44:23 +13:00
Fox McCloud
8056e320bb Fixes a Few Pacifism Bugs (#47006)
Just fixes a few pacifism issues.

Currently you can hurt people by punching them with a mech.

You can also hurt people by throwing them into a wall or into another mob.

Both have been addressed; mechs lacked a check, and throwing mobs lacked a return.

cl Fox McCloud
fix: Fixes being able to mech-punch other mobs, as a pacifist
fix: Fixes being able to hurt people, as a pacifist, by throwing them into a wall or other mob
/cl
2019-10-13 16:43:58 +13:00
Qustinnus
0d46e6c441 You can no longer slip on fireman-carried clowns (#47000)
* trips

* yikes

* im braindead
2019-10-13 16:43:40 +13:00
Ghom
2821303c74 Stops non-alphanumeric graffiti decals from being named "letter". (#46979)
About The Pull Request

Does exactly what it says on the tin.
text2ascii accepts text strings with length higher than one character as first arg, so we need to check against that beforehand.
Why It's Good For The Game

Fixing a (likely unreported) mild issue with the game.
Changelog

cl
fix: non-alphanumeric graffiti decals will no longer display as "letter".
/cl
2019-10-13 16:42:35 +13:00
YPOQ
5b17c75909 Allows admins to spawn multiple bubblegums (#46951)
Fixes #45799

This check was added as a workaround for a bug in the lavaland generation code that could cause multiple bubblegums to spawn. Since the bug was fixed in #46457, this check can be removed.
2019-10-13 16:41:40 +13:00
James
fffb74bdcf [READY] Welders consume fuel when they destroy an object during attack (#46842)
About The Pull Request

Welders didn't actually consume fuel if their attack deleted an object. This was first noticed when welding space vines, in that the welder didn't consume any fuel to do so. Further testing showed that this was the case for any object that gets destroyed on hit, including APCs, Air Alarms, Girders etc.

Problem was that the code for actually consuming fuel after an attack is in the afterattack proc which doesn't actually get called if the target is QDELETED. PR moves that code to the attack proc, along with (regrettably) implementing attack_obj too. This feels hacky and reeks of duplicate code, so if anyone has a better option for how I could implement this fix I'm all ears.
Why It's Good For The Game

Fixes unintentional behavior
Changelog

cl
fix: Welders now consume fuel when they destroy an object
/cl
2019-10-13 16:41:14 +13:00
Fox McCloud
dfb8438cd7 Fixes AI Swarmers Doing Nothing (#46939)
About The Pull Request

AI swarmers are supposed to go after nearly everything in sight, including turfs, but this behavior is broken; I wouldn't be all surprised if other mobs targeting behavior is also broken.

In an attempt to make bees perform better, ListTargets behavior was changed here: #31250

While it does, supposedly, perform better, it also breaks swarmers---andddd I suspect other mobs, as well, as this effectively means anything that's not a mob or an object (primarily turfs).

Either case, this reverts ListTargets back to what it originally was, restoring intended behavior.

That said, since bees are so problematic, they use the current ListTargets behavior to only search for objects and mobs.

fixes: #46938
Changelog

cl Fox McCloud
fix: Fixes AI swarmers just sitting in their base doing nothing
/cl
2019-10-13 16:39:57 +13:00
Arkatos1
5e47463792 Silicon PDA fix (#46922)
About The Pull Request

This PR makes it so that silicon PDA verbs like toggle ringer are given only to a silicons that actually have one, like AI or pAI. This is also consistent with other similiar silicon items, like silicon camera.
Why It's Good For The Game

Less bugs.
Changelog

cl Arkatos
fix: Only silicons with a valid PDA will now get PDA-related verbs.
/cl
2019-10-13 16:39:00 +13:00
Fikou
632e8e5b52 Fix advanced retractor/hemostat description (#46996) 2019-10-12 09:44:42 -07:00
Rob Bailey
e1683f674f Merge pull request #46978 from willox/duplicate-variable-stuff
removed a bunch of duplicate member variable definitions and entirely duplicated types
2019-10-12 03:44:15 -07:00
Rob Bailey
e41d8a24ff Merge pull request #46950 from YPOQ/bubblegumspawnfix
Fixes bubblegum spawn
2019-10-12 03:30:37 -07:00
Rob Bailey
0310061f5f Makes the health analyzer's damage list into columns (#46793)
* Makes the health analyzer body part damage list into colums, and other small span fixes.

* Typed list magic fix.

* Adds font face.

* Reformat into a html table and also into a list().
2019-10-12 03:29:46 -07:00
nemvar
83b301c1af CRUNCHY CRUNCH (#46942)
Makes it so that you can crush soda can on other peoples heads.
2019-10-12 03:28:25 -07:00
William Wallace
4f8b437069 'frozen' food crafting category now works (#46970)
* ice crafting category now works

* un-murder rainbow snowcone
2019-10-11 15:46:45 -04:00
YoYoBatty
a0b9031ca5 Fixes cold water vapour not freezing turfs properly (#46908)
* Fixes cold water vapour not freezing turfs properly

* Update code/game/turfs/open.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
2019-10-11 15:45:29 -04:00
oranges
1c266bb040 Merge pull request #47008 from AnturK/arenadoorfix
Fixes arena controller door opening.
2019-10-11 13:52:32 +13:00
Toast
4c9b0f9551 Emergency Medical Holodeck is a Workplace Hazard (#46985)
About The Pull Request

I moved the Emergency Medical module for the Holodeck behind the safety / emag lock, while also moving up 1218 AD Thunderdome a few slots, so there are less chances of someone miss clicking the first thing that would have been underneath Emergency Medical, the Atmos burn test.
Why It's Good For The Game

To be quite honest, the Emergency Medical Holodeck module is used by those who want to bypass other departments to cure their ailments. If there was a chem dispenser in the module, the holodeck would be able to pretty much replace the entire medical department.

Need surgery? Have a meta-friend perform surgery with no chances of failure because the holodeck provides all of the tools needed, including an operating computer.
Need to cure your common cold? Magic space holodeck has a Pandemic machine.
Need to keep your friend's rotting corpse defibbable? Holodeck has stasis beds.

I believe this particular holodeck module reduces departmental cooperation and reliance, because you have consequence free alternatives to get your harmies fixed. Ghetto surgery, for example, isn't a viable alternative because you don't need to find and use improvised surgical tools when proper tools exist with no strings attached. The abandoned medbay exists and can be used as a backup medical or hub to get back alley procedures done.

"But Synn, I am not an antagonist with access to an Emag to unlock the safety."
Silicon players are able to toggle the Holodeck's safety features, and enable the medical module from there, if the situation is serious enough to require said action when it comes to preventing human harm if they are still on Asimov's laws. A smart move afterwards would be turning the safety back on once the module is already loaded, thus to prevent harm from someone selecting the more... flavorful choices.

"But Synn, I don't want Doctor Jimbo or Roboticist Karen to perform surgery on me. I would rather have Assistant Dave do it because I know them."
Assistants aren't trained surgeons from Centcom, and the solution for bypassing the proper department that already has a surgical setup should be through ghetto alternatives. Considering how medical lately has been moving more towards surgery as the answer to curing most ailments, this should give Doctors more opportunities for work as there would be less people bypassing the system using holograms.

Honestly, if my tiny brain knew how to properly code, a better alternative to locking the emergency medical module would be having the station to be on a code red alert level, but I am not sure how to do that without breaking a lot of eggs.

cl
balance: CentCom has deemed use of the holodeck's emergency medical module unsafe, as it allows for procedures to be carried out by untrained crew members. If emergency medical procedures are needed, do not tamper with the machines and have your station's AI or cyborgs unlock the safeties.
/cl
2019-10-11 11:43:59 +13:00
imsxz
b5b9fd30d7 turret fix (#46995) 2019-10-10 18:39:32 -04:00
Fhaxaris
c2efff7919 Fixes my horrible mistake (#47001)
speed merge dis
2019-10-10 18:23:00 -04:00
loser
b81b9f9bcd You're shoved onto the table by Talia Robinson! (#46997) 2019-10-10 14:05:50 -04:00
moo
de13e122ed Merge pull request #46972 from willox/botany-bounties
chili and ice-chili botany bounties are no longer overridden by ghost chilis
2019-10-10 13:47:38 -04:00
moo
3e9008c1af a define for surgery changes (#46980)
* a define for surgery changes

* also the comments
2019-10-10 13:46:55 -04:00
Anonmare
3cc86643a5 Makes it so Experiemental burn wounds tending actually unlock (#46976)
* Makes it so Experiemental burn wounds tending actually unlock

* hewwo
2019-10-10 13:46:36 -04:00
nemvar
c38a7a3bb5 Removes a bunch of var/ in procs (#46946)
* Removes a bunch of /var in procs

* reset this

* Why wasn't this already?
2019-10-10 04:20:27 -07:00
AnturK
9d8d1c420b Fixes arena controller door opening. 2019-10-10 08:50:09 +02:00
Qustinnus
b11d0a6c13 fix (#46999) 2019-10-09 20:00:28 -04:00
ArcaneMusic
e7dacc57e4 Adds more functionality to the Medical Kiosk with upgrades. (#46884)
* adds rads upgrades, improves the formatting a bit

* Hey mapmerge want to work this time?

* alright what about now

* sigh

* alright back to standard

* Recompiles tgui

* Box Station map update hopefully?

* Now for the rest of em

* Unintentionally removed an intercom from donut, fixed

* Allows for players to multitool the kiosk board to change the cost to use.

* Alright lets clarify some booleans

* Correctly uses booleans in JS

* Mapp Diff don't be that way

* Update tgstation.dme

dot dme files are cursed and I have proof
2019-10-09 16:09:11 -04:00
Qustinnus
270f73671e fixes mats (#46994) 2019-10-09 20:10:55 +02:00
kingofkosmos
63f6280f44 Reformat into a html table and also into a list(). 2019-10-09 20:55:28 +03:00
spessbro
22d459ff20 Biogen doesn't dispense reagent containers anymore (#46905)
* Would you look at that, I'm already done :)

* shhh you didn't see nothing
2019-10-09 12:38:40 -04:00
Fikou
e450be44dc surgery tool refactor (#46856)
* awooooooooooooooooo

* a

* aw shet

* woops!!

* a

* wow heck you
2019-10-09 12:25:42 -04:00
Urumasi
6e7801550b Moves reagent fill code and adds caps to plastic water bottles (#46878)
* Adds caps to plastic bottles

* Non-crafted water bottles now spawned closed

* Added warning message for closed bottles, fixed minor bug

* meme

* Makes the warning only show up when doing valid actions with the bottle

* Clumsy people now have a chance to lose the cap

* Fix small bottle's cap when fallen over, bottles now turn upright when opened on the floor

* Add a minor positive moodlet on bottle flip

* Adds a relic lavaland water bottle that always lands upright

* Moves container fill overlay to reagent_containers, changes glass/beaker/waterbottle to glass/waterbottle

* Make actions with closed cap early return

* Minor code cleanup
2019-10-09 12:05:52 -04:00
Rob Bailey
f50eb4e3d4 neckslice logging (#46987) 2019-10-09 11:10:22 -04:00
Emmett Gaines
e6be7a1bda Cleans up dejavu component (#46935)
* cleans up dejavu component

* makes dejavu clean up properly
2019-10-09 01:50:16 -07:00
Fhaxaris
acf733db23 Adds throat slicing (#46838)
* Adds throat slicing

* Max cut time for low force objects doubled

* Adds emotes, limits to one slice at a time, fixes messages. Hopefully has no bugs
2019-10-09 01:41:36 -07:00
81Denton
3863d6b4d5 Fixes spraying/painting over dark paint (#46854)
* Fixes spraying/painting over dark paint

* Blacklists infinite spraycans from pyrite slime extracts
2019-10-08 21:50:09 -07:00
Fikou
3e0e1e9fda chap things now cover what they should (#46866) 2019-10-08 21:47:43 -07:00
PKPenguin321
4c9fe66a3f also the comments 2019-10-08 18:22:21 -07:00