Commit Graph

14343 Commits

Author SHA1 Message Date
ATH1909
b37ab86014 cyborg lollipop launchers can no longer spam timers (#57786)
About The Pull Request

Cyborg treat dispensers now have a maximum treat storage capacity of 5 treats instead of 30 treats, and recharge their treats at a rate of one treat per 10 seconds instead of one treat per second.

To compensate for this, the damage of gumballs and lollipops that have been launched from an emagged cyborg has been increased from 3 to 10.

Launched gumballs and lollipops will no longer delete themselves after 2 minutes (if not equipped).

The 2u of omnizine in each cyborg lollipop has been replaced by 2u of psicodine. The contents of normal lollipops have not been modified.

Cyborg cookie dispensers can now only dispense a cookie once every 10 seconds (instead of once per second). Non-cyborg cookie dispensers no longer self-recharge, but can now accept compressed matter cartirdges for reloading purposes. Support has been added for other types of RSFs to have use cooldowns.
Why It's Good For The Game

The self-deletion mechanism was apparently causing timer spam, so I reduced the amount of treats that cyborgs could spam out (and the rate of that spamming) so that the mechanism would no longer be necessary. I increased the damage of launched treats to compensate to keep the emagged treat launcher from becoming a very sad joke of a weapon.

Floyd threw a fit when he learned that cyborgs could freely dispense lollipops that contained omnizine, so I replaced the omnizine with psicodine, a chem that is perhaps more appropriate for lollipops (it calms people down), doesn't do much of importance, and can't react to form any rare or interesting chems.

The cookie dispenser thing is also an attempt to appease Floyd, since he doesn't like cyborgs being able to spam food everywhere.
Changelog

cl ATHATH
balance: Cyborg treat dispensers now have a maximum treat storage capacity of 5 treats instead of 30 treats, and recharge their treats at a rate of one treat per 10 seconds instead of one treat per second. To compensate for this, the damage of gumballs and lollipops that have been launched from an emagged cyborg has been increased from 3 to 10.
del: Launched gumballs and lollipops will no longer delete themselves after 2 minutes (if not equipped).
balance: The 2u of omnizine in each cyborg lollipop has been replaced by 2u of psicodine. The contents of normal lollipops have not been modified.
balance: Cyborg cookie dispensers can now only dispense a cookie once every 10 seconds (instead of once per second). Non-cyborg cookie dispensers no longer self-recharge, but can now accept compressed matter cartirdges for reloading purposes. Support has been added for other types of RSFs to have use cooldowns.
/cl
2021-03-26 10:12:07 +13:00
NamelessFairy
a8a6625714 Additional CTF maps (#57230)
This pull request adds a map loader as well as new maps to CTF. When a game starts a CTF map will be selected at random and will be playable by ghosts.

As well as this new functionality CTF now fully supports 4 teams. A green and yellow team have been added complete with both standard and instagib gear.

At current five maps are planned:
Classic - the original map we all know and love
Four Side - A four team CTF map where all teams compete over one flag
Downtown - Terrestrial city themed map
Limbo - Wizard themed map featuring portals and uses KOTH rather than CTF
Cruiser - Space themed map utilizing the powerup system

Random maps are selected on game load
Support for four teams added

Why It's Good For The Game

CTF has been more or less the same on the surface since its creation. This PR allows for some much needed map variety which will increase replay value. CTF is far more regularly played then mafia due to its fast rounds and common use during round end delays and I believe that it deserves a boost in content.
Changelog

cl
add: CTF can now selects a random map at game start
add: CTF now supports four teams
add: Gear for yellow and green CTF teams has been added
add: CTF ID cards for all 4 teams have been added - courtesy of maxymax13
add: a new CTF map, Four Side has been added
add: a new CTF map, Downtown has been added
add: a new KOTH map, Limbo has been added
add: a new CTF map, Cruiser has been added
fix: KOTH capture points retain their sprites after being claimed
/cl
2021-03-26 10:01:43 +13:00
Arkatos1
82dba0c2bc Improves status bar coverage (#57916)
This PR makes sure all MouseEntered() procs call their parent, which handles the status bar. This fixes instances where the status bar was missing, for example when you hovered over the ghost buttons, you would not be shown a name of the button, but completely different object, like "space", which was very misleading. This also means that the new status bar should have better parity the with the old status bar, which also showed these things.
2021-03-25 12:46:12 -04:00
Horatio22
15abf8fd14 Resprites ventriloquist dummy (#57863)
## About The Pull Request

Resprites the ventriloquist dummy  #https://github.com/tgstation/tgstation/projects/6#card-2814241

## Why It's Good For The Game

The current sprite is just the assistant doll cut in half. This gives it a unique sprite and also makes it so that the hands line up with the item better than the current sprite. It's also a lot creepier (and animated!)
2021-03-25 11:25:03 -04:00
ArcaneDefence
246b4b79e5 Adds sticking metallic kitchenware into APCs (#57910)
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-03-24 18:48:10 -07:00
ArcaneDefence
2e309d4ead Adds materials to PDAs (#57923)
Puts a small amount of iron, glass, and plastic into a PDA 'cause that sort of material usage makes sense to me
2021-03-24 22:48:30 +00:00
Time-Green
635079aa98 Adds a plumbing layer manifold (#57494)
Adds a multilayer plumbing manifold, I also murdered the multilayer duct

You can now alt-click the plumbing RCD to change the layer it prints. I made a whole thing where right clicking changed the settings and you could use that to change machinery aswell. I even did that with the plunger, it was absolutely beautiful. Anyway that drained the life out of me because apparently there's no attack_obj_secondary and afterattack_secondary ALSO called attack_obj (left click). I just hate whoever made it with intensity

Plumbing now uses three layers. They should be easier to navigate. I tried to make layer connecting the same as cross-color connecting, but that would take more of my soul then there is to take
2021-03-24 13:57:00 -04:00
Ghom
ee59c16637 Ice cream revamp: Ice cream is a component and cones can hold multiple servings of ice cream now. (#57415)
* Ice cream rework WIP

* I'm done!

* i'll deal with my verbose engrish at a later date. I'm dead tired.

* linter aaaaaa

* Take a bite!

* FINALLY, A COMPONENT!

* ghost macro.

* Review, typos, beheading of a lame comsig.

* Typo. Now I'm self-obliged to test it again.

* It works.
2021-03-23 07:53:46 +01:00
Ghilker
6121b13b94 Bluespace gas vendor (#57580)
* vendor

* more

* fex

* reeee

* WIP vendors

* BIGGERING AND FIGURING MORE BIGGERING

* CAPITALYSM!!

* ops

* tank refilling

* not working yet

* sprites and construction

* some stuff

* docs

* maps

* requested changes

* more changes

* change

Co-authored-by: tralezab <spamqetuo2@gmail.com>
2021-03-22 16:10:49 -04:00
Ghilker
5625e51196 Thermomachine rework (#57831)
* heat pump rework

* f

* efficiency

* powe

* powermess

* better math

* math and enviroment equation

* freezers connected to waste pipenet and co2 recircled in waste

* smol

* rotate danger

* upgrades

* minor tweaks

* requested changes
2021-03-22 10:42:01 -04:00
MrMelbert
3be92b1a74 Fixes items in toilet cisterns being deleted / null'd on deconstruction (#57864)
* banished

* drop loc
2021-03-22 02:13:09 -07:00
MrMelbert
ae00b68fdd Autodocs the slippery component + changes the hardcoded slot whitelist to a variable (#57878) 2021-03-22 02:09:13 -07:00
TemporalOroboros
687f91d8bd Desnowflakes tank integrity (#56443)
Makes tanks use obj_integrity instead of their own snowflaked version.
Makes tanks check for exploding when they are destroyed, rather than once every process.
Makes tanks always leak their gases when they are deconstructed.
Removes the ability for tanks to seal themselves back up over time.
Makes the bomb spawner actually produce functional bombs.
Removes the extraneous syndicate bomb spawner subtype.
Miscellaneous code improvements to tanks, bomb spawners, and the blastcannon.
Fixes the explosives compressor doubling the power of any bomb you put in it.

The changes to tank rupturing behavior shouldn't effect most tritium fueled TTVs including the 50K recipe. Toxins players don't need to worry about suddenly being incapable of getting points or refining anomaly cores. They should only really effect singlecaps, but I don't know enough about singlecaps to know what recipes I should test. I have confirmation that at least one mix is not effected by this.

The self-sealing properties of tanks have been removed. I'm not sure what the purpose of it was, I have heard that it was used to enable hand-portable plasmaflooding, but I'm not familiar with the practice.

As it turns out, the basic bomb spawners were broken on master! I have made the bombs they produce maxcap instead of just spring a leak. Since they maxcap by default now I have removed the syndicate subtype used to spawn the TTV produced by the cuban pete arcade game and replaced it with the normal timer subtype. Since none of the bomb spawner subtypes were used for anything else this shouldn't have any effect on the game.

On a similar note, I have discovered that the maxcap recipe on the wiki stopped working at some point since it was written. I will replace it with a functioning set of instructions.

Less snowflake code.
Bomb spawners are actually functional now.
Slightly better code.
The explosives compressor accurately reflects the power of the bomb you put into it.
2021-03-20 18:15:24 -07:00
Mothblocks
f44c20cdf4 Departmental officers are now put together, rather than separate, if possible (#57685)
Security officers will now be paired up together in the same department, across departments. This means that, instead of 4 officers being split across 4 departments, there'll now be 2 groups of 2.

Late-join officers will be put into any department with only 1 officer. If none exist, the least populous department will be chosen, with their preference having priority.

Updates the maps to have more spawns for departmental officers. Delta previously had none, and now has some. Fixed a bug where MetaStation's security departmental officer was a supply one instead.

Removes the "random" departmental preference. All security officers are now given a department. The "none" preference still exists, but just to show that you don't care which department you're put into.

Updates the config to comment out SEC_START_BRIG. This is what the configuration was already on live servers.

This is something that should likely be test merged, but it mucks with savefiles. Luckily, the only damage it does is changing random departments to none, so if a TM is reverted, only that will have to be changed.
2021-03-20 20:11:11 -04:00
Arkatos1
40e1e41fe4 Stack splitting now uses right click (#57837)
Co-authored-by: Arkatos <arkatos1234@email.com>
2021-03-20 16:36:02 -07:00
EOBGames
05edacb324 Rule Botannia: British Bots for the Restaurant (#57542)
* I hate moths

they're all dusty and shit
2021-03-20 16:23:16 -07:00
MMMiracles
75d3c3e601 tram hotfix hopefully maybe (#57646)
The cause of the blender was the fact the UI wouldn't update properly if left open and you walked away, meaning you could tell the tram to go to a destination it was already at and brrrrrrrrrr.

TGUI really isn't my strong suite and forcing it closed guarantees the info on the UI is updated so no blender.
2021-03-20 16:07:50 -07:00
TemporalOroboros
fb488fdfff Some explosions code cleanup (#57493)
Clears out two deprecated explosions systems (explosion ids and explosion levels)
Refactors a bunch of contents_explosions procs to be maybe slightly faster.
Cleans up a bunch of ex_act code.
Slightly cleaner code
A few less unused vars on /atom and /turf
2021-03-20 16:03:59 -07:00
LemonInTheDark
2fad574a4e More harddel fixes + Tram sanity check (#57828)
* Fixes a harddel caused by the FUCKING MACHINE VAR WHAT THE FU-

* Fixes a tram related harddel, the proc that removed things from the riders list worked on stuff passed in by Uncrossed, but failed with the qdeleting signal. I've made a wrapper proc to better support these things, added signal handlers, and removed an if check that hid nulls (If it's breaking I need to know)
2021-03-20 05:46:04 -07:00
Ghom
259d66e77e expands the list of orderable objects for space-italian and space-french customer_data datums. (#57546) 2021-03-19 23:08:54 -07:00
Emmanuel S
ba0f40a0df Makes defib description text slightly more informative (#57778)
seems many people didn't know you can connect defibs directly to medical cyborgs
This PR helps fix that
2021-03-19 21:42:20 -04:00
Sylphet
cd7d064d03 Grilled cheese sandwiches are now actually grilled, and made on the griddle. (#57743)
Removes the toasted sandwich. There is now a cheese sandwich, and a grilled cheese sandwich. The cheese sandwich is made through the crafting menu under sandwiches from two slices of cheese and two slices of bread. The grilled cheese sandwich is made by putting a cheese sandwich on the griddle in the same way that you would make a steak.
2021-03-18 20:48:59 -04:00
LemonInTheDark
e069f96dc6 Removes the bugged wanted poster from metasec. (#57733)
Fixes #56915
Adds a worse case senario to prevent the same sort of bug happening in the future. Fixes poster harddels
DON'T HOLD REFS WHEN THE THING YOU'RE REFFING DIES!!!
2021-03-17 16:38:24 -04:00
LemonInTheDark
7f444f510e Fixes a ton of harddels (#57736)
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2021-03-17 05:51:53 -07:00
Fikou
96c60822a8 fixes the ancient bundle not working at all (#57741) 2021-03-16 21:22:37 -04:00
carshalash
4e61d910cc Add's two japanese breakfast staples to breakfast category (#57684) 2021-03-16 02:13:08 -07:00
tralezab
67e8fafb6b Incredibly Rare Malfunctioning Customer (#57537)
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2021-03-15 17:00:46 -07:00
Fikou
0ddea2933a the rsf now uses base icon state instead of initial(icon_state), doesnt delete stacks instantly (#57689)
the rsf now uses base icon state instead of initial(icon_state)
it uses stacks instead of deleting them
2021-03-15 12:39:11 -04:00
carshalash
535e4f2de0 Milo soup is finally miso soup, fixes weird half decade long naming problem. (#57667)
Co-authored-by: coiax <yellowbounder@gmail.com>
2021-03-14 10:00:42 +00:00
Ghilker
03a92828c1 Crystallizer balance and qol (#57423)
Balance the recipes of the crystallizer to have higher energy release
Some recipes had the recipe cost tweaked for a more balanced experience (TM)
Better cooling and temperature control on the crystallizer
2021-03-14 00:19:55 -08:00
Ghilker
cd93273167 spess (#57321)
Increased base power from 20000 to 40000, is still pretty slow at t1, but not painful anymore, every tier power has been doubled as effect
Refactored the construction of the spess heater to a more sane one (no more create cell and delete it afterwards), now the players will create a subtype of the heater already without the cell, while the main one is the admin and map spawned one with the default cell
Refactored attackby to use default procs and early returns
Variables now uses snake cases
2021-03-14 00:16:55 -08:00
Timberpoes
b2aa011b8b Fix infinite recursive loop in cyborg beaker icon updates (#57681) 2021-03-13 20:22:17 -08:00
Colovorat
ab4a7ec90d Warning cone is now craftable (#57668)
Co-authored-by: Colovorat <lolqwert569@gmail.com>
2021-03-13 05:49:15 -08:00
Mothblocks
4540275956 Fix mouse hover outlines applying to other people (#57659)
About The Pull Request

Instead of just checking if they're inside a bag, it will now be checked that it is your bag.

fix: Mouse hover outlines will now only show if the item is on your person.
2021-03-13 09:25:10 +00:00
spessbro
66ab2d195e Fix typo in /obj/item/card/id/away/hotel/security (#57641) 2021-03-13 00:35:50 -08:00
Mothblocks
4933a576e7 removes rogue e (#57658)
e
2021-03-12 14:39:44 +00:00
Kokonut
3e46c081c9 Item hover outline FX (#57574)
Ported from BeeStation.

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-03-11 16:34:59 -08:00
Kush1Push1
8384a25ad1 Making blood less frustrating (#57085)
Two changes.

1. If a splatter of blood isn't bloody enough, the character will not get bloody shoes.

2. Characters with light steps trait won't get bloody clothes if they step on a bloody tile without shoes.

3. added: Blood dries over time. Usually, 3 or 6 minutes. If a splatter is big enough, it can stay wet up to 15 minutes.

Why It's Good For The Game

The entire crew won't have bloody shoes anymore.
Less time wasted looking for showers or sinks to wash their shoes after stepping on a near invisible blood decal.
Characters without shoes (or who don't want to get their clothes bloody after taking them off) will get more use from a near useless trait.
Changelog

cl
qol: Blood splatters only make your shoes or feet bloody if the tile is bloody enough,
qol: Light steps trait prevents clothing from being covered in blood if you step on a bloody tile with your shoes off.
add: Blood dries over time. Usually, 3 or 6 minutes. If a splatter is big enough, it can stay wet up to 15 minutes.
/cl

(grammaticly impoved by @maxymax13)
2021-03-12 10:11:06 +13:00
MMMiracles
5f3e12178e Tramstation: choo choo MORE MAP COMIN' THROUH (#56509)
* cool map bro!

* security

* perma

* secfull

* secman

* medstart

* engine2

* atmos start

* barrrr

* bar2

* bar3

* civil

* lower

* barrrr

* barrrrrr

* start

* cargo

* sci

* j

* servicedecal

* civildecal2

* service decal2

* service decal 3

* service decal 4

* pip

* decal4

* decal8

* arse!

* arrivals

* arrivals 2

* ai

* aifix

* vault+techstorage

* medbay

* bridge 1

* sec 3

* sectest

* squish squish

* securitywork

* secmore

* config setup

* tram

* cargo work

* escape

* disposalfuck

* i hate pipes

* disposalsfull

* SEC

* grav

* bads

* researchwip

* caw

* hguhwhuh??

* apc+air_alarm

* engie

* sm

* stttt

* aisat

* areas

* camera wip

* camera 2

* secam

* shuttle shit or something idk

* aaaa

* path nodes + waypoint navs

* almost there

* pull

* unnecessary file

* standardize

* tram choo choo!!!

* tgm

* testmerge feedback fixes

* map work

* test

* test2

* i hate

* THERE

* trams without pulling upstream like an idiot (#3)

TRAM

* fast tram fast TRAM

* fuck turfs

* tram collisions, tram cooldowns (#4)

lol

* ass

* tram but real

* forgot the ,

* code improvements, fixes, and tram call buttons (#5)

* unnecessary check gone, nulls now scrubbed (#6)

* fancy tram

* feedback changes

* AT fix

* feedback changes

* incin+engine atmos wooo!

* missing grav gen cable

* more feedback changes + diagonal shuttle wall

* bottom floor explodes into airless asteroid instead of space now

* even more feedback changes

* area change

* update to iron sheets

* ore smelter wrong dirs

* path changes agagagagaga

* no more fabs

* atmos fixes + more general fixes

* Creates SStramprocess and Makes Movement Use That Instead of Timers (#7)

* makes SStramprocess a child of SSprocess and makes tram obj use it

* gets rid of continue_movement() in favor of SStramprocess

* remove fake tram

* tgm baby

* maintenance update + chode tram

* hopefully makes the tram choke the server out less (#9)

tries to put brakes on the tram

* bad id console

* more maint stuff

* Big bundle of fixes and additions for trams (#10)

* BANG TING OW

* fixes docs, makes everyone always take damage, fixes bump text and span

* control prevention... maybe?

* combat mode no longer triggers trams

* tram conflicts + tram console

* medical changes + tram lift console

* bot pathing in tunnels

* tram whiteship + bad area string fix

* -station fixes
-tram monorail
-tram monorail grinding + achievement

* trail these noots

* rail

* yee

* diner bots + xeno changes

* Tram TGUI FINALLY (#11)

* bflehgfwblilbrga

* Update TramControl.js

* --fix, --lint

* more ui

* brokendimmer now doesn't try to load content, static data updates, MORE sanity.

* finishing off tram sprites

* cleaning up dmis

* Portal Improv

* re-removes icons

* relay moved, map fix

* fixed? (#12)

* rd machines

* relay moved, upload moved to sci, service lathe access, typo

* maint stuff

* tgm

* medical overhaul, more maint junk

* comments out achievements for testing

* space hole + spare

* actual tram blender fix according to known blender method

* tgm

* trail these

* removes depreciated tram content + accidental changes during pulling

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-03-11 18:43:57 +01:00
Clyde-Thunderpants
2dcb148fa7 changes the filepath of "nanomachines" to "cyborg_mutation_nanomachines" (#57539) 2021-03-11 05:21:40 -08:00
TiviPlus
f0cf7ea5ac Replace some turf in range() with RANGETURFS and fix(?) bspace trauma (#57566) 2021-03-11 02:26:21 -08:00
Timberpoes
c33a6f2e49 SecHUD icon generation fixes and code improvement. (#57570) 2021-03-11 02:20:43 -08:00
Helianthus00
c122589940 Fixes South directional intercoms (#57533) 2021-03-08 23:49:41 -08:00
Qustinnus
8095930906 new station trait: hangover (#57525) 2021-03-08 16:23:03 -08:00
Qustinnus
93fdfa1ab4 Adds a hotkey that puts you in throw mode aslong as you hold it (#57331)
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-03-08 05:17:19 -08:00
Clyde-Thunderpants
ffc78a37cc changes the filepath of the gondola transformation drug to be more boring (#57492) 2021-03-07 22:25:19 -08:00
LemonInTheDark
9422356c13 Removes the upgraded version of the h2 axe, the one with lifesteal (#57476)
I intended to clear this up before the pr adding this got merged, but I overslept. Don't ask

It's a very hard to get tool, but it's just kinda like, a fire axe but with slightly more damage and lifesteal.
Endgame atmos content should be atmos related, not just a good weapon. Also it's way too time consuming to
acquire, so its overpoweredness is balanced by its rarity. I don't like tools that are setup like this, since
they just end up bloating wiki articles.
2021-03-07 22:11:16 -08:00
Ryll Ryll
3f08ad604d Gives ERT Medical Officers a box of plushies (#57481) 2021-03-07 22:09:21 -08:00
Ghilker
3ca7061123 plastic flap air wall fix (#57455)
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-03-07 15:22:31 -08:00
ArcaneMusic
1f9b1ebae0 Adds Mexican tourists to the restaurant system, plus some QOL tweaks. (#57447)
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-03-06 17:39:25 -08:00