Commit Graph

28817 Commits

Author SHA1 Message Date
skoglol
216a7ec316 Cargo console UI touchup (#45764)
About The Pull Request

Moves requests and cart below the cargo pack list, so you dont need to find the right button after everything you buy. Resized the cargo window, less airy. Added a toggle for buying privately, less buttons should improve performance somewhat.

Why It's Good For The Game
Less annoying UI.

Changelog

cl Skoglol
tweak: Cargo console UI touched up a bit. Requests and cart moved below the cargo packs for less button shuffling, buying privately is now a toggle, resized window slightly.

/cl
2019-08-09 13:15:02 +12:00
nemvar
02251be5ac Turns Gibberish code into something that's not gibberish (#45753) 2019-08-09 11:32:32 +12:00
oranges
d3a52cbd71 Merge pull request #45763 from kriskog/effects
Removes cameras reliance on icon default state
2019-08-09 11:31:51 +12:00
81Denton
498a9a70fa Adds clown car logging (#45758)
This PR adds clown car logging when clowns enter it (multiple clowns can drive it), it succs people up, when it crashes into walls and when it fires people at things.
Why It's Good For The Game

Good for catching naughy clowns that drive into the arrivals shuttle
Changelog

cl Denton
admin: Added clown car logging to the attack log.
/cl
2019-08-09 11:31:09 +12:00
moo
d75332ffd6 Merge pull request #45773 from nemvar/patch-96
Failing healing surgery only gives one error message now
2019-08-08 19:28:10 -04:00
81Denton
f5b0184d93 Moves death + suicide logging to the attack log (#45779)
This PR moves player death+suicide logging from the game log to the attack log.
@nfreader @bobbahbrown You might have to adjust your log services if this gets merged.
Why It's Good For The Game

Attacks and succumbing are already being logged in the attack log - moving deaths+suicides to the attack log makes it easier for admins to establish death timelines.
Changelog

cl Denton
admin: Player deaths+suicides are now logged in the attack log and no longer in the game log.
/cl
2019-08-09 11:27:04 +12:00
TheChosenEvilOne
a7cde8ce39 [Ready] Ports dynamic gamemode from /vg/ (#44639)
About The Pull Request

Port the dynamic gamemode from /vg/.
(Really bad explanation of the mode incoming.)
The dynamic game mode generates a threat number which is used to "buy" rulesets (rulesets are basically your antagonists). This means you can have rounds with for example traitors and cult (you can have up to three roundstart rulesets depending on the pop and threat level), and then there are latejoin and midround rulesets which basically do what they say (latejoin ruleset assigns late joining player as an antagonists and midround assigns ghosts or a currently alive player as an antagonist)
Why It's Good For The Game

This increases the chances of people getting their important antagonist role and makes rounds more interesting (when cultists gets their hand on wizard's magic) when everything can happen at the same time (cult, wiz and traitor could happen on high threat level).
Changelog

cl
add: Ported dynamic mode from /vg/, originally made by DeityLink, Kurfursten and ShiftyRail
/cl
2019-08-09 11:26:03 +12:00
oranges
8c8e618804 Merge pull request #45694 from AutomaticFrenzy/patch/fix-stupid
Remove atom creation in vending machine icon generation
2019-08-09 11:11:24 +12:00
Trilbyspaceclone
fc284afe49 A new pie and four more cakes! (#45633)
Cakes and Pies!
Cooking cat once again saves starving spess mens
About The Pull Request

Adds a new healthy pie!
Adds a few more cakes.

image
Why It's Good For The Game

I see that last added cake and or pie was ages ago! No can do at all tis what I say!
So I added in more cakes for you as a feline fine addition to cooking!
More options with different flavors for are crew to noms with is always a good add I would say all are balanced around hardness of crafting them!
Changelog

cl
add: pie and cakes
imageadd: added some icons and images
/cl
2019-08-09 11:05:56 +12:00
Twaticus
9dfa78cb47 Underwear color (#45630)
About The Pull Request

    Changes our current underwear selection to greyscale so you can color them any way you like, just like hair.

    Removed duplicate underwear types that only served as a few color options(female_yellow, male_blue, ect.) Underwear with designs are unaffected(female_uk, male_commie, ect.)

    Added a new option in dressers to change underwear color.

    Changed some underwear names to fit the new option(female_red is now female_lace, ect.)

A9hAqkxgin
If all is well i plan on adding this to undershirts and socks too.

also HUGE thank you to nonfictiongames for the help!!!!
Why It's Good For The Game

More character customization in roleplaying game GOOD
Changelog

cl
add: Underwear can now have any color. (Your character will most likely be nude now so check your prefs!!)
add: Underwear color option in dressers
tweak: changed some underwear names
imagedel: deleted duplicate underwear

/cl
2019-08-09 11:04:58 +12:00
pireamaineach
6048d747c2 [READY] Makes plasmaman helmets have visors. (#45606)
About The Pull Request

See title.
Why It's Good For The Game

Plasmamen get the same welding protection as everyone else, that is with welding helmets, with the same trade-off and negatives. Goggles are rather hard to obtain for most roles, (provided #45460 is reverted, which is kind of ought to be) and plasmamen aren't able to use helmets.

Basically nullifies the concept of using this as flash protection unless used by a particularly quick-witted plasmaman, (or someone willing to always be half-blind) while still offering welding protection.

I might consider re-adding transparent helmets but only if humans wear them, as it doesn't look good on plasmamen, which is the whole point of the helmet.
Changelog

cl
balance: Plasmaman helmets now have welding visors, which can't stack with their torches in the helmet and are visible.
fix: Clicking on the helmet with any item no longer tells you that someone's already drawn a face on it, you can't put infinite faces on it.
tweak: Plasmaman helmets hide masks again, the sprites are no longer transparent. Mind, the original bounty just wanted it so you could see faces through it, not for it to be transparent.
tweak:Plasmaman helmets now have special smile sprites rather than pulling from the EVA one, as the visors are different sizes.
balance: You can't eat through plasmaman helmets anymore.
/cl
2019-08-09 11:02:37 +12:00
Time-Green
b5159fbf31 [READY] Plumbing: Chemical Filters (#45473)
Adds chemical filters to the plumbing arsenal

They have one input, and three outputs. The left and right outputs can be given filters. It's basically the exact same as atmos filters but it has TWO filter sides.

It doesn't have an enormous list of chems to select from, you just enter a chem and it's added if it's valid.

cl
add: Adds chemical filters to plumbing
/cl
I was planning to do a bunch at once, but europe is on fire and im delirious

I also moved the existing unique plumbing datums into their own folder, wich was only chemical acclimators
2019-08-09 10:59:36 +12:00
py01
2bfcb644b4 husking visual fix (#45648)
* husking visual fix

* husk simpl
2019-08-08 02:07:44 -07:00
StonebayKyle
5092bf94f4 Adds a species randomizer to character setting screen (#45658)
* WIP (not working) version of species randomizer in character settings

* Adds a WORKING species randomizer to character settings

* Re-orders random species code to be ahead of random name and random body code.

* Fixes species naming conventions by forcing random name onto those who choose to always be a random species

* Fixes dumb html mistake
2019-08-08 01:50:52 -07:00
81Denton
7b8579c17a Minor ghost notify changes (#45759) 2019-08-08 01:47:04 -07:00
Narcissisko
fd070e3ae2 Adds a new luxury bar capsule to the miners vending machines which cost ten thousand mining points (#45547) 2019-08-08 01:07:20 -07:00
Mickyan
ad86530e5c dont worry i was a doctor once (#45765) 2019-08-08 00:06:53 -04:00
nemvar
269c7666fc Nerfs reinforced bolas (#45622) 2019-08-07 16:00:34 -04:00
zxaber
532a891b74 Mediborg Beaker Storage Apparatus (#45494)
* Pull request commit apparatus

* words

* better comments

* small bits

* beaker breaker

* better beaker breaker

* Superior Signals

* new signals for update_icon

* compile_overalys
2019-08-07 15:58:30 -04:00
nemvar
0b5c61c899 Failing healing surgery only gives one error message now 2019-08-07 14:06:18 +02:00
Jordie
9a1e80fa18 fix null brain in death query and typo correction (#45731) 2019-08-06 21:50:15 -07:00
nemvar
78ac5bbdb3 Capitalizes Gaseous Decomposition (#45729) 2019-08-06 21:42:23 -07:00
Arkatos1
6aaca4fa7b Reagent color for lemonade (#45730) 2019-08-06 21:42:08 -07:00
kevinz000
7882ab311a Fixes VV editing name and ckey in header (#45742)
* fix

* Fixes unnecessary whitespace changes/line ending changes.
2019-08-06 20:21:46 -07:00
nemvar
3c747a2e1e Adds the snailcrawl element to living lube. (#45673)
* elementtime

* Absolute state of tg
2019-08-06 20:15:12 -07:00
oranges
82b747b6f5 Merge pull request #45750 from nemvar/fixesormAGAIN
Fixes ORM again.
2019-08-07 09:25:55 +12:00
Michael Ashfield
8e3ace7e6f Plasmamen get plasma in their box (#45538)
* rebase branch

* Revert "rebase branch"

This reverts commit 72e70fe8ccabfa6c750193a57beeec14b30a2533.

* Updated this old code to fork

* gives the clown hugbox

* Clown gets hugbox back

* Removed new boxes, changed box code

* Sorted line spaces

* Removed sauce
2019-08-06 15:13:19 -04:00
nemvar
00eb91eb25 Fixes ORM again.
Same fix as last time. Learn to properly resolve conflicts.
2019-08-06 14:09:34 +02:00
Dennok
0cb84ff57d Toxin lovers don't throw up. (#45668)
* Toxin lowers don't throw up

* Update human.dm

* Update code/modules/mob/living/carbon/carbon.dm

Co-Authored-By: JJRcop <jrubcop@gmail.com>
2019-08-06 02:20:32 -07:00
kingofkosmos
c3ea51908d Adds "you" to local visible_messages (#45631)
* 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.
2019-08-06 02:15:34 -07:00
nemvar
4d5fb1a578 Adds a GPS component. (#45660)
* Adds a GPS component. Megafauna no longer needs gps implants.

* Removes commented out code.

* Removes the last internal radio

* I was already wondering why the diff was so small
2019-08-05 19:13:19 -07:00
Rob Bailey
0c6fabceb0 Merge pull request #45680 from 81Denton/unfuck_c4
Refactors C4/X4
2019-08-05 19:09:57 -07:00
YPOQ
3e6e847155 Fixes general beepsky and beepsky ancap attacks (#45714)
* Fixes general beepsky and beepsky ancap attacks

* Delete weapon in Destroy()
2019-08-05 19:03:28 -07:00
nemvar
fa4361f4f4 Fixes the halloween code. (#45671) 2019-08-05 19:02:41 -07:00
Trilbyspaceclone
cdbd9a7c0b [Ready] Adds Snow Cones (#45632)
* Update construction.dm

* Update snacks_sandwichtoast.dm

* Update snacks_other.dm

* Create frozen

* Create recipes_frozen

* Update tgstation.dme

* Add files via upload

* .dm!

* .dm!

* Recomplie

* i said .dm! but not snacks_...

* spaces are bad >_<

* We dont have kiwi?
2019-08-05 19:02:01 -07:00
Tad Hardesty
009dbfc7cc Fix broken suits in medical outfit lockers (#45695)
* Fix broken suits in medical outfit lockers

* More dumb ass fixes
2019-08-05 18:57:35 -07:00
nemvar
ccbb0a91d7 Cleans up some martial art code. (#45502)
* Removes/Moves some weirdly placed variables in martial arts. Splits NO_GUNS and CHUNCKY_FINGERS traits.

* Maybe this should actually compile

* c begone
2019-08-05 16:58:12 -07:00
carlarctg
5b9eb3bff2 trenchcoat (#45722) 2019-08-05 11:49:27 -07:00
imsxz
391bdc4fda makes stimulum not cancer (#45675)
* stim toxin buildup

* Update other_reagents.dm

* Update other_reagents.dm
2019-08-05 14:01:11 -04:00
YPOQ
4f48850fce Fixes muscled veins surgery (#45642) 2019-08-05 01:58:36 -07:00
ishitbyabullet
71277af9d3 Improved Cabin Away Mission (#45618)
* The map itself

I hope it won't PR on /tg/station immediately.

* ok lavaland monster dmi thank you

"bruh you added two sprites oh shit im about to m-m-m-malfuncti-" *BOOM*

* cabin building stuff

Still need to merge master.

* Ninja's uniform PR got merged.

Good thing I used, like, only one jumpsuit for the entire map. I hope this merges before someone changes winter coats though.

* lmao

* MrDoomBringer forgot a few things

obj/iced_abductor. that's an ayy lmao moment.

Besides that, the block should work. Just don't destroy it before the round begins otherwise you see this: https://i.imgur.com/K3GGnqy.png

Proof that this works: https://i.imgur.com/MxVO0Og.png

* no more claustrophobic medbay

It doesn't look as good as I want it to. It also feels way too fucking cramped.
2019-08-05 01:37:11 -07:00
MMMiracles
a76d7c3077 Bounty PR: See-through plasmaman visors + drawing smiley faces on said visors (#45602)
* see-through visors and funny smiley face meme

* fucking dme

* how did i manage that
2019-08-05 01:33:17 -07:00
skoglol
394066caab Removes cameras reliance on default icon state. 2019-08-05 05:22:28 +02:00
nemvar
fb349b308a Remove debug message from mining vendor (#45706) 2019-08-04 10:05:33 -07:00
oranges
9f1cec7b15 Merge pull request #45677 from 81Denton/logs
Logging improvements
2019-08-04 22:54:17 +12:00
Rob Bailey
2c720c6408 No ID insertion for everything except the hop console (fixes the ORM) (#45693)
About The Pull Request

machines and consoles that previously required an inserted ID now check access on worn and inhand ids. They otherwise function identically.
Affected things:
ORM: click claim to claim cash to connected ID (also fixes it)
Mining vendor: uses ID on person or in hand.
medical console: checks worn ID
security records console: checks worn ID
gulag consoles: claim points to worn ID, checks access and point requirements from worn ID

Also some backend refactoring to prisoner management and gulag teleporter consoles

hop console will be next to strip out the shitcode entirely but this at least gets things functional in the mean time, but fully tested this time. It's very late here and I need to sleep. Due to the nature of it it's more elaborate of a rework.
Changelog

cl
tweak: Medical and Security consoles now check access on worn or inhand ID instead of requiring an inserted ID
tweak: mining vendor now reads from ID in hand or on person instead of requiring an inserted ID
fix: ORM is functional again (for real this time)
tweak: ORM claim points button transfers points to worn/inhand ID instead of to an inserted ID, no longer accepts insertions
tweak: Same for gulag consoles
/cl
2019-08-04 22:53:55 +12:00
nemvar
e587b970da Adds parent calls to almost all tool_acts (#45582)
* Adds parent calls to almost all tool_acts

* actually compiles
2019-08-03 22:25:57 -07:00
nemvar
55191413ba The clown car waddles (#45625)
* The clown car waddles

* movable atom instead of atom
2019-08-03 22:19:03 -07:00
nemvar
42aa3df3ec Clean up imp code (#45670)
Who would have guessed that unmaintained code is unmaintained. Imagine 
my shock.
2019-08-03 19:10:14 -07:00
SpacePrius
46e8ee4b5a Cat 2 Med downside tweak. (#45474)
* First Commit

Signed-off-by: Space Prius <bubba041102@gmail.com>

* Fixing the trait methods.

Signed-off-by: Space Prius <bubba041102@gmail.com>

* made 1% per tick instead of 33% per tick

Signed-off-by: Space Prius <bubba041102@gmail.com>

* specifying trait sources, changed to deafness.

Signed-off-by: Space Prius <bubba041102@gmail.com>

* fixing description

Signed-off-by: Space Prius <bubba041102@gmail.com>

* removing now unused define

Signed-off-by: Space Prius <bubba041102@gmail.com>

* removing random whitespace

Signed-off-by: Space Prius <bubba041102@gmail.com>

* changed to 2%

Signed-off-by: Space Prius <bubba041102@gmail.com>
2019-08-03 20:20:00 -04:00