Commit Graph

30173 Commits

Author SHA1 Message Date
skoglol
398bbdbbec Removes dorms toolboxes, tool storage insuls and multitools. (#48856)
* Replaces tool storage insulated gloves with budgets.

* Removes multitools, dorms toolboxes

* Adds multitools to youtool premium
2020-01-28 18:06:58 -05:00
tralezab
6c8b5378d3 Lawyer's department backpack is a briefcase (#48877)
The lawyer may still start with a backpack by making their backpack style not departmental.
Why It's Good For The Game

Lawyers should make more use of their really cool suitcases, including the passcode locked one they get roundstart. Style wise, the grey backpack totally ruins the look. And if they don't wanna be cool, they can easily opt out! I would also like to say this isnt part of some grand conspiracy about inventory so dont start you rats
Changelog

🆑
tweak: lawyer's department backpack... is no backpack!
/🆑
2020-01-29 11:59:32 +13:00
itseasytosee
165602d45a Plastic Ducks (#48885)
Nanotrasen has just come out with a new clown tech design, Plastic Duckys™. Move aside expensive rubber donk.co and waffle.co brand duckies. These quality* made ducks are fabricated at our finest research stations with industrial-grade** protolathes. Made from chemically processed plastics from our expert*** chemists!
Plastic ducky
Why It's Good For The Game

plastic uses are neato. This may be controversial as it ads a potentially unlimited source of honks but if people think this is really an issue then I would consider adding a bananaium cost that would make it on par with other printable honk items.
Changelog

🆑 itseasytosee
add: Nanotracen is beginning to dabble in toy-making technologies. Clown tech now adds a design for a cheap alternative to rubbers ducks made from plastic.
/🆑
2020-01-29 11:57:57 +13:00
TheChosenEvilOne
09f3b5da1c Correct atmos reaction priority. (#48871)
Fixes atmospheric reaction priority by changing the approach of #40367. Instead of using an assoc list it saves the major gas in the reaction datum and uses that. It will of course be slightly slower but it is still better than before with reaction priority being messed.
Why It's Good For The Game

Fixes broken feature.
Changelog

🆑
fix: Atmospheric reaction priority works correctly now, this means hypernob will stop all reactions and reactions should generally be more consistent between rounds.
/🆑
2020-01-29 11:52:54 +13:00
fluffe9911
00043330a0 New King Goat Lavaland Boss! (#48823)
About The Pull Request

This pr adds in a new lavaland boss in a seperate z level arena also included are goat plushies that ram into people and goat skins which you get by butchering goats and can wear on your head, a goat gun that shoots goats and finally multiple tweaks/fixes generally involving possible ways to teleport out of noteleport area and or cheese the king goat.
Why It's Good For The Game

Lavaland has not seen any new bosses for a long bloody time and although the boss may be a bit silly I feel more hardcore players will enjoy the challenge it brings since this is meant to be a very hard boss also new goat related items are always neat.

🆑 Fluffe9911 for porting/making most of it, Monster and Sabiran for the King Goat!
add: A new king goat lavaland boss!
add: Goats now drop skin which you can wear on your head! (coder sprite)
add: Goat themed plushies that ram people! (realistic version sprite by identification code by karma)
/🆑

goat

This is ported over from my work on yogstation with minor changes mostly to make things work there is more goat content I made but didnt wanna do too much at once and dont know if tg would like it
2020-01-29 11:50:27 +13:00
OnlineGirlfriend
7f081640a3 [READY] Adds pineapple juice, creme de coconut, Pina Colada; adds Painkiller drink; adjusts Bahama Mama and pineapple snowcone (#48783)
This adds two drink ingredients: creme de coconut (a coconut liqueur obtainable in the booze dispenser) and pineapple juice (obtainable in the soda dispenser or via juicing pineapples). It further adds the Pina Colada and Painkiller cocktails & corresponding sprites, and it adjusts the recipe for Bahama Mama. The recipe for pineapple snowcones was also adjusted to require pineapple juice rather than pineapple slices.

Finally, pineapple juice can be found in a carton or craftable juice box, and I've added sprites for this.
Why It's Good For The Game

First off, more drink ingredients equal more realistic drink mixes and more variety, which means more fun for bartenders.

Pineapple snowcones are better off using pineapple juice as opposed to pineapple slices. Previously the recipe called for two pineapple slices; you can now juice those two pineapple slices to produce pineapple juice sufficient for the snowcone.

Regarding the changes to the Bahama Mama recipe: With these changes, the recipe now more closely represents the classic Bahama Mama, which involves coconut, coffee, rum, and pineapple juice as its base ingredients. I removed orange juice to prevent conflict with the Painkiller recipe, but also feel justified in doing so because orange juice is not an essential ingredient of a Bahama Mama, nor is lime.
Changelog

🆑
add: pineapple juice, creme de coconut
add: Pina Colada cocktail
add: Painkiller cocktail
add: pineapples and pineapple slices can be juiced
tweak: Bahama Mama recipe, pineapple snowcone recipe
imageadd: pineapple juicebox sprite, pineapple juice carton sprite, Painkiller sprite, Pina Colada sprite
/🆑
2020-01-29 11:45:21 +13:00
vuonojenmustaturska
40657c9ccd removes a bunch of unused/bad helpers (#48969)
* a commit

* Update code/controllers/subsystem/persistence.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/__HELPERS/text.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update advance.dm

* Update security_officer.dm

* Update text.dm

* Update unsorted.dm

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2020-01-28 16:22:20 +01:00
ShizCalev
c001816091 Merge pull request #49039 from Fikou/patch-106
fixes category on easter foods
2020-01-28 04:54:24 -05:00
ShizCalev
b12704c10b Merge pull request #49019 from Fikou/patch-104
security and medical inquisition ert are now holy
2020-01-28 04:43:09 -05:00
ShizCalev
82c91dad3b The BEPIS now shows the chance of success in the UI. (#48999)
* Initial commit

* Fixes some spacing issues.

* Updates
2020-01-28 04:37:50 -05:00
tralezab
7c5ffc5da4 513 health bars for simplemobs! (#48954)
* cleanup required

* removes bad stuff, makes linter happy

* megafauna still get SOME health doll, cleanup again

* whoop

* UNLINT
2020-01-28 04:29:37 -05:00
spookydonut
ac7f2b5166 Fix Crossed/Entered/Exited/Bump/ui_act parameter casting (#49016)
About The Pull Request

Detected as part of my work on SpaceManiac/SpacemanDMM#167
2020-01-28 10:51:15 +13:00
Ryll Ryll
15093aeb95 Clowns are too sweet to understand death (#48863)
About The Pull Request

Dead people just look like they're sleeping to clowns. Antag clowns are NO LONGER immune from this.
Why It's Good For The Game

Someone in OOC said it'd be funny if clowns thought dead people were just sleeping, and I felt inspired to champion this worthy cause. Surely there's no way this could cause administrative issues or confusion.
Changelog

🆑 Ryll/Shaps
tweak: Clowns are now unable to conceptualize death and think corpses of people are simply sleeping.
/🆑
2020-01-28 10:10:37 +13:00
Fikou
a30635fb72 fixes category on easter foods 2020-01-27 19:07:43 +01:00
Tlaltecuhtli
d29d87630c adds constable outfit in cargocrate (#48748)
🆑
add: contraband crate with british police outfit
/🆑
why is it good for gaming:
now they can buy thematic items and sec can do fun rp

description of what is added:
items added in the security vendor:
an hat with same properties of the helmet
a suit with same properties of normal sec suit for
a whistle with 10s cooldown
a pair of white gloves
a conversion kit which can turn a stun baton in a crappier police baton (no free batons and no "upgraded versions*")
for 1100 credits

prices are so sec can buy the whole reskin kit within 20 minutes of the round

tl note: police baton is more garbage than the roundstart free sec baton its for thematic rp
2020-01-27 23:41:40 +13:00
AnturK
3f1e629f59 Makes stuttering ignore some punctuation (#49007)
* Makes stuttering ignore some punctuation

Fixes #48983

* Include ~ and ` too
2020-01-27 11:39:25 +01:00
Time-Green
d7db7c0605 Fixes plumbing ducts appearing disconnected (#48924)
* fixes ducts appearing disconnected

* adds comment to remove connects

* adds newlines for comments and fixes an autodoc typo
2020-01-27 11:25:32 +01:00
ATH1909
328a8db26a Update pill.dm (#48927) 2020-01-26 23:06:16 -05:00
Mickyan
0d8ec7a5ee doctor fish (#48958) 2020-01-26 23:05:06 -05:00
ArcaneMusic
a965af5c1f Merge remote-tracking branch 'upstream/master' into BEPISQOL 2020-01-26 19:56:58 -05:00
Names Are Hard
a77376977a Fix phobia quirk preferences not being saved (#49005)
Phobias are finally saved properly in character prefs, whoops.
2020-01-26 16:29:16 -08:00
spookydonut
01b4d9e811 Fix cast() parameters (#48997)
About The Pull Request

Working on detecting type mismatches of parameters for SpacemanDMM and discovered these.

I also checked by hand that all uses of cast() provide a list as the first argument.
2020-01-27 09:48:42 +13:00
Arkatos1
c59daa3b9e tgui-next: Timer (#48981)
* Timer UI tgui-next

* Finishing touches
2020-01-26 21:36:01 +01:00
Fikou
27834b9f74 sec and med erts are now holy 2020-01-26 13:36:11 +01:00
MrPerson
273464ae65 Include ~ and ` too 2020-01-26 02:18:38 -06:00
AnturK
b2fc68db32 Fix ore silo runtime (#48976)
Unicode change revealed another material nonsense, who'd expect that.
2020-01-25 15:56:15 -08:00
TheVekter
3249082720 Fix the Mauna Mug's research entry (#48979)
Somebody forgot some tags.
2020-01-25 15:55:10 -08:00
MrPerson
e022407b81 Makes stuttering ignore some punctuation
Fixes #48983
2020-01-25 16:00:36 -06:00
ArcaneMusic
396f1ab3e1 Initial commit 2020-01-25 06:57:30 -05:00
ArcaneMusic
42eb63d9dd BEPIS rewards will no longer get thrown into the windows and walls. (#48902)
* BEPIS rewards will no longer get thrown into the windows and walls

* Review changes

* whoops
2020-01-25 11:40:36 +01:00
AnturK
b04934a0d1 Fixes runtimes & some cleanup (#48776)
* Keyless emote sanity.

* Camera bug runtime

* SM runtime

* Removes random <br>'s in atmos logs

* light spark runtime

* uranium splashing on walls runtime

* throwing clown with clown shoes runtime.

* beam rifle runtime

* Don't warn on mesageless keyless emotes.

* Fixup
2020-01-24 13:23:59 -05:00
QualityVan
f711d4f88c Fixes electromagnetism typo (#48948) 2020-01-24 11:26:33 -05:00
Fikou
d66c491484 genetic scanner is now in science lathe (#48957) 2020-01-24 11:23:49 -05:00
Ryll Ryll
6eb6d000ea Lets you shove people into the trash (#48960) 2020-01-24 11:22:22 -05:00
TheVekter
97b5ec2117 Adds a function to grant research points for slime extracts (#48807)
* Adds a function to grant research points for slime cores

* I meant to change it to 1k points before pushing

* changes slimes so they give different points based on what tier they're on

* A few fixes and more efficient code

* Adds sanity checks, used extracts can't be cashed in

* Refactored code
2020-01-24 11:16:29 +01:00
JJRcop
7ad527ff9a Move drunken scientist quotes to strings (#48953)
This moves the drunken scientist quotes into a strings file.

I used the pick_list_replacements proc even though there are no replacements, in case someone who edits the file wants to add some replacements.

I didn't take the opportunity to sneak in any lines, they are copied verbatim.
2020-01-24 17:32:39 +13:00
Rohesie
7bef84f009 Mass-replacement of stat to machine_stat (#48758)
Living and machine stat vars are pretty different, one uses flags and other number-defines.
This should make some other mass-replacements and searches a bit easier.
2020-01-24 12:37:17 +13:00
ArcaneMusic
b62d105228 Adds the Wood Datum Material, giving it to items made from wood. (#48820)
* Initial commit, wood datum mat. Works on my machine.

* Wait this makes baseball bats worthless nevermind

* Review changes, uses the define now, just don't know how bitflags work well enough for that other bit

* Adds the material dependance check

* FINE
2020-01-23 17:36:10 -05:00
ATH1909
b5e06025ec [WEB EDIT] [TESTED] You can no longer use growth serum to enter the quantum realm (#48913)
* Update other_reagents.dm

* Update drink_reagents.dm

* Update drink_reagents.dm

* Update drink_reagents.dm

* Update drink_reagents.dm

* Update other_reagents.dm
2020-01-23 17:26:52 -05:00
ArcaneMusic
d9a0cad8ca SOUTH BRONX PARADISE BABY!!! (New Contraband Candy Bar) (#48855)
* SOUTH BRONX PARADISE BABY!!!

* Rejiggered chemical values.

* Now with 200% more infectious insects.

* With Grammarly, you too can write professional quality letters, for a small fee!

* Clean up, keeps message spam to a minimum.

* Tral had a brilliant idea

* Review comments and review changes
2020-01-22 23:22:28 -08:00
OnlineGirlfriend
bb9c8018d4 Adds four new suits to Autodrobe (changshan, cheongsam) (#48862)
* adds blue and red changshan

adds blue and red changshan
adds changshan to autodrobe

* added cheongsam

added red and blue cheongsam
cheongsam available in autodrobe

* adds changshan, cheongsam

two colors each (red and blue)
adds to autodrobe
2020-01-22 21:49:13 -05:00
skoglol
d61239fa14 Merge pull request #48921 from itseasytosee/Beergoggles
Separates beer googles into science glasses and beer goggles. Sprites for each!
2020-01-23 03:41:31 +01:00
Fikou
d40c7a04f5 job hud/id card icon changes (#48858)
About The Pull Request

i changed all id card/hud icons to adhere to the 1 color + white "rule"
i changed most id card colorations to keep consistent with stuff on the hud and the bottom of the card
i added hud icons and cool id icons for ert
Why It's Good For The Game

cool
Changelog

🆑
imageadd: new hud icons for ert, service hud icons recolored, some hud icons simplified or small recolors, some job id card icons recolored and changed job id cards for ert
/🆑
2020-01-23 13:27:17 +13:00
nightred
5be9559eef Temperature projectiles respect insulation (#48912)
About The Pull Request

Guns, Spells, and mobs that use temperature based projectiles got an update so that the projectile must deal with insulation when applying temperature changes.
The more insulation you have the less body temperature change you will take.

This does not change how much damage you take from a projectile.

The projectiles have been updated from the temperature to be set as, to the amount of change they can do.
The old security temp gun would always set the body temp to 100 kelvin, now each shot tries to reduce your body temp by -50 kelvin before insulation. The reverse is also true for temp projectiles that heat you up.

This does mean that naked you will take more body temp loss, and in a hard suit you have almost no temp change. (hardsuits do protect you from space cold so this follows)

edit: this does not touch cryo sting, that uses frost oil.
Why It's Good For The Game

Better handling of temperature shots.
Insulation matters in combat.
Cold blooded creatures are better off with good insulation.
Changelog

🆑
balance: Temperature based projectiles respect insulation
/🆑
2020-01-23 13:21:25 +13:00
skoglol
4734de3805 Adds a launch random item option to the podlauncher (#48886)
About The Pull Request

Adds the option of picking a random item from the turf and sending it instead of sending the entire turfs contents. Helpful in situations where you dont want to send clones, but also want to spread out the items sent.
Why It's Good For The Game

Happy admins, happy life.
Changelog

🆑 Skoglol
admin: Podlauncher now supports sending a single random item instead of the entire turfs contents.
/🆑
2020-01-23 13:12:03 +13:00
Anonmare
18157b31b6 Updates all Silicon Law related material costs (#48801)
About The Pull Request

The AI/Cyborg uploads, and AI modules, now require bluespace crystals to construct.
Why It's Good For The Game

Before you say anything I want you to consider the following:

You are an antagonist and you want to subvert the AI. Do you,
A) Break-in to the AI Upload, an extremely risky, obvious method but you have everything you need to subvert the AI without any extra steps?
B) Break-in to secure tech storage, a place with signficiantly less security and not as often checked on, but have to find another way to acquire the modules you need?
C) Wait a good 15-25 minutes for mining and science to do the bare minimum of their job, enter in the back way and print off everything you need with very little risk or leaving behind very little evidence?

If you answered anything but C, I like you and you can fuck my sister but let's be realistic here.
It's not going to """fix""" the issue and I won't pretend it will, but with the rarity of bluespace crystals it does mean that they're not going to be as prevalent or as available as early and may force you to take the riskier strategies if the resources you need don't appear quickly enough and encourage conflict.
Changelog

🆑
balance: AI and Cyborg Upload consoles require bluespace crystals and diamond to print now
balance: Law modules now require bluespace crystals to print now
/🆑
2020-01-23 13:05:02 +13:00
Qustinnus
9e90e09597 Adds a new BEPIS design; The Mauna Mug (#48599)
🆑 Kryson & Qustinnus
add: New BEPIS design; a self heating mug
/🆑

A self-heating mug that you can get from BEPIS designs. the better the cell thats in it, the higher the max temp and the faster the temp goes up.
2020-01-23 12:56:22 +13:00
AnturK
873c0a7765 Fixes strippanel stuff. (#48937)
* Fixes strippanel stuff.

* Cleanup
2020-01-23 12:52:35 +13:00
TheChosenEvilOne
b51df1e833 Passive vent temperature sharing. (#48874)
* exchange heat with passive vents.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Passive vent temperature sharing.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Review

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2020-01-22 12:56:47 -05:00
skoglol
b735d25cb6 Swaps boh and ooc confirm dialog button positions (#48905)
* Swaps boh confirm dialog button positions

* and the ooc alert
2020-01-22 12:52:17 -05:00