Commit Graph

73 Commits

Author SHA1 Message Date
ArcaneMusic
92902a798e Adds a new security bounty and tweaks existing security bounties. (#55952)
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2021-01-09 11:23:30 -08:00
spessbro
05fcf6a4d6 Export scanner doesn't need to link + old bounty code is gone (#55504)
Removes the Export scanner's need to link with a console and cleans up the old bounty code
2020-12-16 19:18:29 +00:00
ArcaneMusic
e09a9032da Crates and bountes are now defined by crate's value and paygrades. Civilian bounty payout is higher and uncheesable. (#55413)
Does a value-wise refactor of crates and bounties in order to scale the value of these imports and exports to the value of crate exports (500 credits each). Then, I have adjusted the value of crate exports to 200 credits down from 500 to place the most standard unit of profit within cargo to a scale within that of roundstart paygrades currently on station. (350-1400 credits).

This effectively balances one of the biggest disparities left within the in-game economy, which is that cargo's price scales have really never been re-balanced with the considerations of on station prices, and have been still to the same scale as when they were based on cargo points 3 years ago. While admittedly some prices in vendors were scale to those original cargo values, so many of them weren't that it warranted a massive rebalance PR in order to places the scale of these items within an appropriate range of their intended user's cost values.
2020-12-10 23:43:46 +00:00
Qustinnus
f887155b27 Kills oldfood, Puts newfood on top. (#55160)
Slays the last of old-food, making new-food the new normal.

Co-authored-by: MrMelbert <kmelbert4@gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-12-04 00:11:47 -08:00
ArcaneMusic
bf39caca6a Refactors Pastries into newfood. (#54996)
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Floyd <Floydje123@hotmail.com>
2020-11-24 16:18:10 -08:00
Qustinnus
41157f5d6b Moves grown food to newfood (#55040)
Moves grown food to newfood
Gives trash element support for callbacks for item creation override
2020-11-23 14:00:23 -08:00
Fikou
17d7d2d0df moves dough to newfood (#55039)
* moves dough to newfood
2020-11-22 02:01:58 -08:00
Qustinnus
b713fa1bc3 moves misc food to newfood code (#54788)
misc food is now using newfood code
2020-11-18 12:20:47 -08:00
ArcaneMusic
b343e94113 Pies are now refactored for new foods. (#54751)
Moves over pies to the newfood typepaths, as well as the few select pie slices.

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-11-10 12:34:09 -08:00
Yenwodyah
d5e5f83fb3 Fix some cargo bounties accepting/rejecting the wrong items. (#54580)
Bounties that were supposed to refuse subtypes of the requested items used to accept them anyways. Now they refuse them correctly.
    Bounties that were supposed to accept subtypes of items that were excluded from acceptance used to still refuse those subtypes. Now they correctly accept them.
2020-10-27 03:16:06 -03:00
ArcaneMusic
c28c57c953 Arconomy: Trims out some of the worst bounties, replaces them with tasks that require basic amounts of effort. (#54097)
add: Science has been given a more experimentally themed set of bounties.
del: Much of the old science bounties were discontinued.
del: ...As have the glass shard and cheese honker assistant bounties.
2020-10-07 12:39:09 +01:00
Qustinnus
eca964db35 Ports soup, snacks, icecream, salads and meat to newfood (#54028)
Ports soup, snacks, icecream, salads and meat to newfood
2020-09-29 20:36:27 -07:00
Ghilker
29c0ed1b00 Remove bad reference from atmos (#53781)
Change the name from Cyrion B to Zauker due to the easy connection the bad groups in the past

Not getting a repo ban is good
2020-09-17 13:51:15 -07:00
UnlimitedVanillaWorks
036b1ffa72 Atmos grammar fixes (#53628)
Some grammar/spelling changes in the descriptions of recent atmos additions.
2020-09-12 15:39:31 +01:00
LemonInTheDark
9e25e97370 Merge pull request #53013 from Ghilker/reactions-go-BRRRR
The scope of this PR is to add new and interesting stuff to the atmos crew and to bring more people to it both old and new.
This PR adds 5 new gases, a bunch of reactions (i'm still working on this but suggestions are useful), new recipes and items to the atmosians arsenal. These gases have high utility for everyone, atmosians will find them useful to do their job both as firefighters and air maintenance.
FINAL GAS NAMES (will change only if a maintainer ask about it)

Healium
Proto Nitrate
Cyrion B
Halon
Hexane

reactions avaiable in this PR: https://drive.google.com/file/d/1e6DZlBaKSCNdCADKnrH3F3aDWvl0iZr4/view

What the PR add:
-Healium: a red gas, stronger than n2o if breathed, with healing properties
-Proto Nitrate: a green inert gas if breathed but with different reactions with various gases at high temperatures
-Cyrion B: a black deadly gas if breathed that decompones very fast if exposed to N2 even at minimal amounts
-Halon: a light blue gas that when used in a fire it will suck up the O2 and will help cool the room, helping fighting the fire
-Hexane: a purple gas that has the ability to filter from the air plasma and n2o, useful to clean distro from the harmful gases quickly
-Healium Crystal: a reddish crystal that when broken will explode cooling the room and removing the plasma from the air (act like a grenade)
-Proto Nitrate Crystal: a greenish crystal that when broken will explode refilling a space with O2 and N2
-Cyrion B Crystal: a blackish crystal that when broken will explode dealing damage around it
-Metallic hydrogen recipe addition (atmosian armor and fireaxe)
-Statue of an elder atmosian (for bragging rights)
-Supermatter Interactions
-More gas interactions (Roinnel have multiple and different interactions)
-New RPD device: the pressure valve, a device that allow gas flow in a pipenet if the input pressure is higher than the set pressure it's getting atomized
-Fusion is a bit "easier" to start (minor changes to the math so that the instability is more reasonable)
-pluox can be also made without using rads
-cyrion-b bounty
-all 5 gases can be sold to cargo

More stuff needs to be added (like the SM interactions(added) and probably more reactions and breathe reactions)
Please leave suggestions and feedbacks as it helps improve the PR

Atmos desperately need more content and need to be proactive in the making of its tools, with this PR is a start to more atmos content

🆑
add: hydrogen + rads = trit
add: 5 new gases
add: Healium : made from Bz + Freon + cold, it knocks people down but have healing properties
add: Proto Nitrate : made from pluox and H2 + heat, it has different reaction with a bunch of other gases
add: Cyrion B : made from hypernoblium + stimulum around 0°C, it has heavy damage if breathed but is decomposed rapidly by N2
add: Halon : made from bz + trit + cold, it reacts with O2 at high temperature removing it and cooling the air, helping putting out fires
add: Hexane : made from bz + H2 + cold, it reacts with plasma and n2o and removes them from the air mix, filtering them.
tweak: stimulum no longer require plasma
add: canister sprites, gas sprites
add: crystal from gases formation and reaction
add: new metallic hydrogen recipes
add: elder atmosian statue
add: supermatter interactions
tweak: minor changes to fusion math to make it "easier" to start
add : pluoxium can be also made without using rads (not removing the rad production one) (this also produces a minimal amount of h2)
tweak: lowered hypernoblium min temperature of reaction
tweak: metallic hydrogen production more common
add: cyrion-b bounty
add: all 5 gases are up to selling
/🆑
2020-09-10 03:00:51 -07:00
TiviPlus
d4cdb49133 Mecha followup one (#53470)
fixes #53384
fixes #53327
fixes a bug where mechs could move too fast
fixes cooldown being inconsistent
makes strafe behavior better
fixes lights being very small

fixes #50639
fixes #47373
fixes #43605

Moved some code to the correct spots and did the varedit bitfield thing
2020-09-07 17:44:54 -03:00
Qustinnus
c6be808bf3 Moves over cakes to newfood and transfers reagents when crafting (#53316) 2020-09-07 15:04:14 -03:00
Ghilke
afc12176a9 merge master 2020-08-30 12:10:30 +02:00
TiviPlus
ce3d7e2f0d Mecha refactor 2020 (#52902)
-Mechs are a vehicle subtype
-Mech equipment half-rewritten
-Mech actions completely redone
-Cooldown macros
-New movement macros & replacing all var in GLOB.diagonals with ISDIAGONALDIR(var)
-New lazylist macro
-Support for lavaland only mechs
-Removed the tank because fuck off with that hacky shit
-Documentation
-Fuckton of fixes
2020-08-29 23:33:47 -03:00
Qustinnus
75415d3eb5 Refactors burgers to use components & auto-eating (#53224) 2020-08-29 03:11:37 -07:00
Ghilke
c671340607 atmos grenades works by distance, added bounties and gas selling 2020-08-27 18:21:37 +02:00
Qustinnus
87c4df3880 Food refactor part 1: Bread destruction and processable element (#53047) 2020-08-20 21:07:05 -03:00
ArcaneMusic
1352bbbb88 Arconomy Balance Pass 2: Market Tendency (#52974)
Price inflation is now based upon averages, and is now uncapped from 5.
Civilian budget is no longer the worst budget to pay out from.
Medical Civilian bounties are no longer chees-able in seconds.


* I'll pick this up later because it's going to need a UI with keyed lists

* Updated market crash and average inflation values.

* Alright, I'm confident now.

* Make the market crash end at the beginning of the event end

* And on the 2nd day, the lord spoke, "Compile"

* Division by zero protection.

* That should have been a max, smhing my smhead
2020-08-20 12:47:43 -03:00
CRITAWAKETS
da354ba4e2 Removes singularity, tesla, TEG and Mrs. Pacman. Changes supermatter overcharge delam. (#52873)
About The Pull Request

This PR removes the tesla and Mrs. Pacman from the game. The title is actually misleading, the TEG and singularity are still in the game but inaccessible and the singularity no longer has its generator.

Field generators and tesla coils have been kept because shocking your fellow man is the greatest sensation of power in the world.

The overcharging delamination for the supermatter has been replaced by the release of 2500 mols of tritium at 500,000 kelvin. An engineer who's really hateful of the station can use this for fusion, if they desire. Otherwise, its a tritium fire in engineering alongside the explosion. This will probably be changed in the future to be more potent since the explosion will pretty much just space all the tritium away.

Singularities no longer produce radiation. Now, keeping one is less about making power and more about making a statement, especially since you need to delaminate an SM shard for it.
Why It's Good For The Game

Having power optimized for one generator (SM+Turbine) will allow balancing to be feasible, also oranges wanted this. The other generators may later return but with tweaked values and different roles.
Changelog

🆑
del: Nanotrasen has removed their outdated teslas, singularities, TEGs and Mrs. Pacman generators from their servers and warehouse.
/🆑
2020-08-15 10:42:08 +12:00
spessbro
8acd9d5a1e New exports & bounties (#52428)
* Update organs.dm

tails :)

* durathread, plastic and cloth exports

* slime extracts for cargo

deffo wont get snatched up by an antag on the way

* paperwork bounties

* cat ears and nerf cat tail value

* buff hypercharged core & nerf rainbow core

* added humanlike meats

* soap bounty

* fun artisanal stuff to export

* already soap bounty i'm dumb

* lower bounty rewards

* `lower plastic value

* moving raw meat exports

* adding humanoid food values

* added export values to human meats

* added sheetza and meat blocks to exports

* nerfed the values big time

* no more plastique
2020-08-12 11:41:13 -04:00
Tlaltecuhtli
abb3049d35 fixes a bounty bug (#52591)
🆑
fix: trashbag bounty works
/🆑
2020-08-01 06:47:02 -03:00
Time-Green
f47dc74029 Renames instabitaluri to syntflesh (#52523)
* Renames instabitulari to synthflesh

* Recommits Jared Foggles correction
2020-07-28 00:05:21 +03:00
ArcaneMusic
4b5bae4579 Fixes completing a bounty and not getting paid. (#52363)
* Fixes completing a bounty and not getting paid.

* Oh right that thing that I didn't  commit

* Cleans up the parenthesis in the proc.

* Linter BEGONE

* Apply suggestions from code review

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

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-22 20:16:59 -03:00
ArcaneMusic
72b7c738af Arconomy 1.0: Final Stage Capitalism (#52007)
* Part 1: Arcane is challeneged to rewrite all of economy at 4am on a wednesday, accepts

* Miasma? DUNKED
Bounties? CHUNKED
Hotel? TRIVAGO

* End of day... 2? 3? lockdown has ruined me

* Day 3. I cannot unto bogdanoff. Send help.

* So far so good.

* Day 4, in the ghost house. I've resprited a beloved machine with soul in it. There is a chance, I am losing my mind. Sometimes I hear the words, "When is economy done, arcane", and I look over my shoulder, and oranges isn't there, because he lives in New Zeland. Probably.

* We'll throw the technodes and mapchanges in too.

* Okay lets keep this a friendly debug item then

* yeah on second thought lets not make a precision testing instrument on a 50% success ratio.

* Newscaster updates.

* TGUI Rebuild 1 start counting fokes

* Runtime BEGONE FROM ME, fckn typepaths

* Cleans up autodocs, and other areas

* Updates tgui because I feel nothing anymore

* Recompiling tgui for that green check

* dunks the whole mint out of the code, get that hothead outta here.

* Green checkmark daily update.

* Should be decent from here.

* Resolves machine_design conflict

* Rebuilds TGUI again for the epic pogs

* Sweeping changes 2: See additional changelog

* Haunting insurance plus changes the define comment.

* Rounded vending prices, made bounties appear on examine, polish

* Atmos tanks now specify their mole requirements.

* TGUI 4.0 Updated.

* ACTUALLY updates to TGUI 4.0 standards.

* ThE bUiLd DiFfErS fRoM oUrS

* Ah, I didn't see the testmerge get re-upped.

* TGUI Rebuild.

* Shuffles some security-assistant bounties around
2020-07-19 13:44:25 +02:00
nemvar
b87f65d95e Converts ALL typepaths to lowercase (#51642)
* Case of lower

* More changes

* Ruins the nice 420 diff, brainfart when doing the second batch of conversions

* More changes

* Next batch. I think

* Converts even more paths

* Restarts bots

* Capital Free Zone

* Come on travis, do something

* Renames areas

* Bots, please stop dying

* Updates CONTRIBUTING.md and updates a few paths I missed.

* APC recgarftzfvas
/obj/item/computer_hardware/recharger/apc to /obj/item/computer_hardware/recharger/apc_recharger
2020-06-17 20:47:57 -03:00
TheVekter
5e4e7134e0 A few small Cargo bounty tweaks (#51329)
* Removes the Phazon from the cargo bounty pool.

* Adds a bounty to Cargo requiring a tank of hydrogen
2020-05-29 13:24:45 +08:00
bobubeu
4b28b7fe8c Adds strawberry ice cream sandwiches (#50065)
* Adds a new frozen food

A strawberry ice cream sandwich

* Typo in consumable

* adds space in between ice cream
2020-03-21 17:26:31 +01:00
Ghilker
e7a22853f7 Addition of Freon (no removal, no fire) (#49821)
* Just freon addition, no removal nor fire. Maybe unbalanced

* fixes

* material properties addition, removed from the object itself

* added admin and game logging to hot ice

* Typos

* made the component more generic

* other typos, some fixes

* typos and balancing

* better code readability

* dunno

* merge error and travis build errors fixes

* asked changes, fixes and balancing
2020-03-20 19:08:50 -03:00
Rohesie
9d4eb582ac Merge pull request #49563 from Fikou/clarke
[READY] Adds Clarke, your new mech buddy!
2020-03-19 18:29:49 -03:00
nightred
15452cac44 [READY] Two Handed Component (#49422)
About The Pull Request

For an item to be two handed just add this handy component.

All existing two handed items have been converted to use this component.
Why It's Good For The Game

It has components and signals, and now you can make items two handed so simply.

/obj/item/shockpaddles/ComponentInitialize()
	. = ..()
	AddComponent(/datum/component/two_handed)
2020-03-04 11:26:01 +13:00
Fikou
77afd3d86c atomization + buffs/nerfs 2020-02-25 16:31:30 +01:00
Fikou
4c6b13e264 Adds Clarke Mech 2020-02-24 23:44:12 +01:00
ShizCalev
4316f79d32 Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
typo fixes, inconsistencies with Nanotrasen capitalization, ect
2020-02-22 22:35:53 +13:00
moo
0133414559 Cobbduceus: (Baby) C2 Additions (Rhig,Troph) and Changes (Helbital) (#49356)
It's the year of the rat sisters, and now it's time to cut out those pesky C3s in your life!

Why It's Good For The Game

Rhig and Troph are no brainers considering they're on the same level of ease2make as the C2s and have no downside. They will still be good but they have some C2 component now. Kinda minor compared to the others but I'll see how it plays out.
Changelog

🆑
balance: Helbital now is more simple to use and is based off not crit/softcrit/hardcrit. You want to be in hardcrit for the best brute healing.
tweak: Troph has now been converted into a C2 with tweaks, now named Probital. Same recipe. Downside is stamina damage
tweak: Rhig has now been converted into a C2 with tweaks, now named Hercuri. Same Recipe. Downside is it can cool to dangerous levels.
/🆑
2020-02-22 22:24:36 +13:00
cacogen
6b63bf7093 Changes $1 to 1 cr (#48414)
* $ to cr

* Payday messages use a proper span instead of asterisks
2019-12-28 16:29:36 +02:00
tralezab
82f7330833 ice peppers renamed to chilly peppers (#48289)
* 1

* 2
2019-12-18 20:20:23 -05:00
spookydonut
2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
Tlaltecuhtli
2c81143d69 add chem factory related cargo bounty (#47315)
* Update maps.txt

* 1

* 2

* doc

* d
2019-11-02 19:37:28 -04:00
ATH1909
cbe197b902 Fixes the name conflict between the two different kinds of black powder in a different way (#47288)
* Update pyrotechnic_reagents.dm

* Update pyrotechnics.dm

* Update reagent.dm

* Update misc.dm
2019-10-25 02:39:10 -07:00
py01
aef75f6cda removes skewium (#47056)
* removes skewium and rotatium

* Revert "removes skewium and rotatium"

This reverts commit 878fc4903b3b44dd96e021993368e9ce89918e4c.

* removes only skewium
2019-10-15 10:59:38 +02:00
William Wallace
481760675f chili and ice-chili botany bounties are no longer overriden by ghost chilis 2019-10-08 21:50:30 +01:00
moo
74ed605cd7 Cobbduceus Part 1/X: Category Twos, Base(d) Healers (#45749)
* 150 hours

* it compiles guys

* PERF

* meta conflictor

* oldcabin

* Revert "meta conflictor"

This reverts commit 812343ca615e5b00711786be4413ce3301cfcc90.

* oldmeta

* TAKE 5000

* NAME THIS

Also redoes Multiver/Palletta

* FRICK U FIZ

* NERF PERF

* comment cringe

* Checks for restraints/incapacitated for ichiyuri

* URIKA

Removes Healing-Scaling of Ichiyuri, Nerfs Healing of Aiuri.

* organ

* please upvote this

* maps...

* Gives Instabitaluri a Brand Name

Oh wow it's synthflesh 😆

* Update cat2_medicine_reagents.dm

* what kinda characters is Krys using
2019-08-22 17:30:16 -07:00
vuonojenmustaturska
6a106bc877 Remove reagent ids and use typepaths where applicable (#44166)
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
2019-05-31 21:57:26 +12:00
Yenwodyah
15ae598f8b Fixes pancake bounty (#43983)
* Fixed pancake bounty

* Grammer
2019-05-16 14:59:48 +02:00
zxaber
264a1ae108 [Ready] Cargo Catalog small-order support, new single-pack orders, addition of Ripley (#43402)
* Initial changes

* I need my scratchpad for another PR real quick

* Access and code shuffling

* First pass at small_item markers

* Second pass at small_item markers

I think I did this right...

* Maybe I should save the files I have open

* small pack additions

* Update tgui.js

* Removing some (imo) redunadant packs.

* removing 1911 pack

press F to pay respects

* missed a debug

* reorganization

* bit of cleanup

* removed some leftover disabled code

* That red X is bullshit and you know it
2019-04-25 12:25:12 -04:00