Commit Graph

125 Commits

Author SHA1 Message Date
TemporalOroboros
976c1fcb8c [READY] Bespoke Datum Mats (#55296)
* Bespoke Material Backend

- Adds support for bespoke materials:
  - Reimplements [/datum/material/var/id]
  - Ports GetIdFromArguments from SSdcs
  - Adds a wrapper define for GetMaterialRef
  - Adds [MATERIAL_INIT_BESPOKE]
  - Adds [/datum/material/proc/Initialize]
- Does not actually add any bespoke materials

- [ ] TODO: Code docs
- [ ] TODO: Actually adding bespoke materials

* Some has_material procs and cleaning up some spaghetti

- Adds a pair of has_material procs for use in checking whether a given atom has a given material

* Adds meat

- Adds bespoke meat variants
  - Does not make them accessible
- Shuts up the linter

* Implements bespoke meat

- Makes the material container preserve bespoke materials
- Makes the sheetifier accept bespoke materials
- Makes the autolathe accept bespoke materials
- Makes the gibber produce bespoke meats

* Makes butchering produce bespoke meats

This is jank and really needs to be folded into a unified butchering and gibbing system

* Material documentation

- Adds, fixes, and touches up some documentation

* Material container insertion callback

- Changes the proc used to expand the material container's material list ot a proc used to check whether a material fits into a material container
- Instantiating new materials is no longer O(n) relative to the number of autolathes in existence.

* Makes processing meat conserve materials

- Makes bespoke meat carry over into meatballs

* Makes preserving custom materials an option

- Implements the ability to turn preserving custom materials _off_ for processor recipes

* Fixes all bespoke materials of the same type using the same singleton

- We use ids now, not just types.

* Makes the fat sucker produce bespoke meats

- Because consistency is good.

* Fixes autolathes merging bespoke stacks into normal stacks.

* Makes the callback to test materials for holdibility optional

- @Floyd

* GetMaterialRef -> GET_MATERIAL_REF

- We capitalize macros.

* Removes an extraneous callback

- Makes the sheetifier use functionality I didn't notice I implemented a few commits ago.

* Makes mob and species meat null compatible

* Fixes the ore silo

- The ore silo had really snowflake material handling that has been brought in line with the rest.
- The materials should show up in the correct order.

* Fixes minor lathe bugs

- Fixes stack_traces caused when lathes tried to fetch materials using reagent typepaths
- Fixed the selective reagent disposal topic. I have no idea how long this has been broken.

* Various documentation fixes

- Clarified a couple comments
- Removes an extraneous ?. operator
- Fixed mat floor tiles having bugged reagent temperatures

* More fixes

-/datum/material/meat/mob -> /datum/material/meat/mob_meat
- Adds atom typecheck to material containers.

* Fixes old typepaths
2021-01-15 23:39:58 -08:00
interestingusernam3
b0c53ce37c Metalic hydrogen export datum now assigns message instead of unit_name (#55990)
Centcom's cargo division no longer calls metallic hydrogen "developer's tears".
2021-01-07 15:11:27 -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
TemporalOroboros
e9f9ad1e34 Makes Metalgen Unrecycleable (#55417) 2020-12-09 23:34:27 -08: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
Ghilker
19010c9d43 make gas selling use elasticity (#55192)
Fix gas selling never use diminishing returns
2020-11-30 12:19:41 -05: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
Ghilker
f8581a636a Hypertorus Fusion Machinery (#54379)
This PR removes fusion from reactions.dm and add the Hypertorus machine and its new and improved fusion reaction (results may vary).

Fusion is one of the most costly reactions from the atmos system, is one of the most complex and yet most simple ones; this will move fusion inside a buildable machine and it will allow a degree of complexity that can't be done inside react()
2020-11-18 15:44:39 +02:00
LemonInTheDark
a035c1e502 Merge pull request #53835 from Ghilker/hypernob
This PR changes the Hypernoblium gas around a bit.
First the stop-all-reaction property has been limited to a minimum temperature of 20 K, under that it will no longer stop the reactions in the container (canister, pipenet or open air), over that it will behave normally
Second the production of the Hypernoblium has been shifted to very low temperature, under 15 K so you need at least t3 freezers to achieve and at least 1000 moles of BZ as catalyst to lower the vey high energy released by the reaction

Lowered amount of credit received by cargo to 5.

The production of Hypernoblium was always a pain to make it happen, so it was a super rare gas that almost nobody made, now that the endgame for atmos shifted to more advanced gases and tools, Hypernoblium needed a little rework to fit right into those changes.
2020-11-04 21:18:01 -08:00
ArcaneMusic
7eba7c4930 Arconomy: Civilian Bounty Redux and full replacement of cargo bounties. (#54029)
Alright, this is a functional rework for civilian bounties, which should serve a few purposes:

Cargo has a reason to actually keep working and stay within cargo.
Makes cargo bounties far more integrated into the round as opposed to being a static list of soft goals, being personalized to those who would actually do a bounty for the station.
Still make civilian bounties the prime, sirloin steak method for regular crew to make money.
So here's the 4-11:
Static cargo bounties have been removed, in favor of the new system of civilian bounties. That means that both the bounties app and the bounty console have been removed.

Civilian bounties have been buffed. They are no longer affected by inflation, but when your bounty is completed, you will recieve a "bounty cube". To receive the cash you would have received for the bounty (10% of the civilian bounty), that bounty cube must be shipped off the cargo shuttle, and using the magic of the price tag component, you make your cut, and cargo makes their 90%, ensuring that you'll actually see your money (for once!).

Civilian bounties are now independent of department budgets, in preparation for departmental purchases, so now you can more freely benefit from doing civilian bounties to buy things! (See #53881)

Non-mining cargo department crew now have fully randomized bounties, to give them stationwide goals for bounty hunting.

As an added benefit, the icon for bounty cubes basically screams value, so hopefully crewmembers will see it and instantly think to sell it.
2020-10-22 20:03:04 +03:00
Fikou
500608ac6d removes hexane (#54437)
removes hexane gas from video game

(the ability to hear dchat got removed like half a day ago) (Lemons note, it's been more then half a day)

it will speed up atmos a bit with less reactions, the reagent from the gas does the same things as halon + bz and the reaction from it is pretty similar to halon, they are both gases that exist to stop fires, i dont think we need both
2020-10-19 11:41:25 -07:00
Timberpoes
d5402dc459 Yellow slime core nerfs and adjustments. (#54198)
Yellow slime extract can no longer turn into a self-charging yellow slime core. This functionality has been completely removed.

Hypercharged yellow slime cores no longer self-charge.
They now have a capacity of 50,000 (up from their previous 20,000). This is 10,000 more than a bluespace power cell.
Their recharge rate is 2500. This is relatively slow for the power capacity, as hyper and bluespace cells charge at 10% of their capacity respectively and this is 5%.

Motorised wheelchairs have had their power usage reduced to 5% of their previous value since they were basically only usable with rechargable cells before
2020-10-07 15:42:02 -03:00
Ghilke
82573f3bf9 lower export price 2020-09-26 19:14:12 +02: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
Ghilke
c671340607 atmos grenades works by distance, added bounties and gas selling 2020-08-27 18:21:37 +02:00
Timberpoes
d793a4c9c0 Completely remove the blood contract from the game, including the blood contract antag datum. (#53059) 2020-08-20 23:40:38 -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
IndieanaJones
616177f4cb [READY] Swarmer Rework (#51558)
* Move swarmer.dm to the hostile simple mob folder, make changes

* Move swarmer event file to events, make changes

* Update Resource Pricing on Swarmer HUD

* Update traumas.dm

* Update parts.dm to remove deactivated swarmers

* Remove the Swarmer Drone Dispenser

* Remove swarmer.dm from the antagonist file

* Move the swarmer event to the events file

* Add a proper swarmer antagonist file

* Load proper files

* Various Fixes, Implement ATH's Rapid Consumption

* Utilize the Nightmare's Light Level Check on Xeno Spawns For Swarmers, Hopefully Filters Out Bad Spawns

* Update The Pricing In The Descriptions

* Get Rid of That Random Backslash

* Use the Proper Damage Proc for Cyborgs

* Fix the Bug Shiz pointed out

* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>

* Fix the Swarmer Antagonist File

* Fix the traumas issue

* Update traumas.dm

* Update code/modules/events/swarmer.dm

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

* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm

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

* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm

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

* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm

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

* Upload Swarmers Folder

* Remove the swarmer file from the hostile folder

* Update the swarmer megafauna to work with changes

* Load the seperated swarmer files

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Catch-22 Variable

* Update code/modules/events/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Fix all the references in the swarmer megafauna file

* Fix method names in the swarmer mob file

* Fix method names in swarmer_act.dm

* Fix Method Names in swarmer hud file

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Fix the naming issues to let it compile

* Change the Things Rohsie Wanted Changed

* Change CLRF Back To LF

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-24 03:56:58 -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
TheVekter
a098713c77 Drastically reduces the export price of Hydrogen (#51197)
* Drastically reduces the export price of Hydrogen

* On second thought I think 1 times mole is acceptable
2020-05-25 01:27:08 +08:00
moo
a65d550743 Cooked food can now be exported through cargo, Take 2. (#50707)
* Oh jesus that took FOREVER. Why is there so much god damn food?

* First pass balance changes for single click crafts

* Yes, I know Qust is going to kill me. I'm aware.

* merge conflict fixed.

* Fuck

* Updates based on dunking element.

* Accidently bundled changes.

* Fixes Silver_spawned variable to work outside of luminescents.
2020-05-05 20:27:09 -04:00
jdawg1290
9dc2349f08 Fixes canister export runtime (#50727) 2020-05-01 05:26:38 -03:00
ArcaneMusic
a9dd22920b Fixes Silver_spawned variable to work outside of luminescents. 2020-04-27 02:01:59 -04:00
Ghilker
838b2b2ba7 Make the electrolyzer not a wait game (#50598)
* Electrolyzer balances

* better sprites(thanks trollbreeder!)

* reduce h2 export cost a bit

* h2 canister sprite change
2020-04-26 00:06:37 -03:00
ArcaneMusic
5eada7f631 Merge branch 'master' of https://github.com/ArcaneMusic/tgstation-1 into sellmorestuff 2020-04-25 21:34:14 -04:00
William Wallace
8b0dbcc3eb micro battery export no longer overridesnano battery export 2020-04-23 03:59:45 +01:00
Ghilker
9532dbd2a8 Hydrogen Gas (#50510)
* new PR no tgui bundle build yet

* tgui bundle built

* atmos.dmi conflict fix 2

* balancing

* tgui bundle fix
2020-04-20 14:47:22 -03:00
Ghilker
22cf0dc785 Freon fixes, tweaks and balancing (#50153)
* balancing, fixes, tweaks

* freon specific_heat increase

* fix an issue with negative temperature

* changed HyperNob canister color

* done change request and tweaked more the hardcap limit
2020-03-28 21:31:35 +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
ArcaneMusic
97f42eeade Modular computers, in particular tablets, now have export valu… (#49952)
* Modular Computer Part Exports

* Couple value tweaks.
2020-03-20 00:40:46 -07:00
spookydonut
5c2b8fc0d5 Advanced tool exports. (#49498) 2020-03-05 20:03:16 +08:00
Qustinnus
b70e5c360c Adds a license press for in perma brig (#49452)
* temp

* adds cargo stuff

* dots

* woops

* Update code/game/machinery/prisonlabor.dm

Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>

* fixes

* Update code/game/machinery/prisonlabor.dm

Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-03-04 23:19:21 +08: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
ArcaneMusic
1a50fd4162 Brought a dead monkey corpse from 70-> credits value 2020-02-18 02:39:51 -05:00
ArcaneMusic
f6771a3b3c Initial commit, basically all it needs. 2020-02-17 23:56:11 -05:00
ArcaneMusic
8dac6feda8 Merge remote-tracking branch 'upstream/master' into sellmorestuff 2020-02-07 01:35:49 -05:00
ArcaneMusic
297814a040 Yes, I know Qust is going to kill me. I'm aware. 2020-02-07 01:33:51 -05:00
ArcaneMusic
2a25d3a6bf First pass balance changes for single click crafts 2020-02-03 11:42:17 -05:00
Emmett Gaines
ab3a127295 Makes the global materials lookup lazily initialized 2020-02-03 10:17:13 -05:00
ArcaneMusic
e4004c163b Oh jesus that took FOREVER. Why is there so much god damn food? 2020-02-03 00:42:14 -05:00
Aleksej Komarov
e87b6c6701 Tgui error reporting, Keyboard passthrough, RPD, NtOS, Power Monitor (#47749)
* Improve tgui fatal error reporting

* Keyboard passthrough in tgui

* New Rapid Pipe Dispenser interface

* Update README with new components

* Release held keys when browser window loses focus

* Power Monitor Interface, NtOS theme and core components

* Yet another CSS rework

* Fix Table, Chart stubs for IE8

* NtOS Main interface

* Supermatter Monitor interface

* Tweak NT color, color + sort gas bars
2019-11-16 04:02:33 -08:00
Rob Bailey
8ea3632a96 global to static (#47580)
* global to static

* get rid of a dead var
2019-11-06 19:49:20 +01:00
Qustinnus
b11d0a6c13 fix (#46999) 2019-10-09 20:00:28 -04:00
Qustinnus
a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
Fikou
ec4280f597 fixes antag token vendor sprite and kinda fixes cargo exports text (#46616)
* ye

* oop
2019-09-20 02:07:30 -04:00
Fikou
730d96ad06 bunch of datum mats stuff mostly related to coins (#46289)
adamantine and mythril are now datum mats (mythril still admin only), adamantine has 1.5 strength buff to whatever is made out of it, mythril adds rpg loot elements to whatever is made out of it
you can now put plastic, adamantine and mythril in the autolathe and coin mint
you can now put titanium in coin mint
switches a bunch of stuff in cargo exports, including mythril and plastic being worth cash money
coin code has been changed to datum mats, the custom sprites have been lost except for antag token
2019-09-17 10:50:32 -04:00
Krysonism
4514a98633 The gambling anticipation update. D6 resprite and more! (#46471)
About The Pull Request

This PR resprites the D6, adds two money bags and a bag of 5 d6'es to the bardrobe. Be on the look out for the expensive ebony dice.

I have also made code improvement by filling dice bags using PopulateContents() and giving the special dice their own loot spawner.
Why It's Good For The Game

I have recently in anticipation for the roulette update tried playing some simple dice games with my bar patrons to great success. I did however notice that the old d6 sprites were quite bad, so i decided it was time for a resprite,

I have also added money bags to the BarDrobe since those will be needed if more forms of gambling are added to prevent greytiders from stealing all your winnings.

DiceComparasion
EbonyDiceLarge
Changelog

cl
add: Money bags can now be obtained from the BarDrobe.
add: A bag of d6'es is now available in the BarDrone. May contain a rare die.
imageadd: New d6 base sprites and variant.
refactor: Improved the way the normal dice bags is populated.
/cl
2019-09-16 16:43:20 +12:00
Qustinnus
b33d1c49a3 [READY] Floydmats (Datum materials) & custom toolboxes (#45118)
* Initial work

* more

* ass

* wsedfwedff

* asss

* test

* stuff

* fuck

* sss

a

* kms

* asdadwedwdfwefwef

* start

* test

* dwwdew

* ewefwfef

* Redemption machine (#8)

* Redemption machine

* Removes debug messages

* changes

* fuckmyshitup

* coin mint works with new material shenanigans (#10)

* Auto stash before merge of "materials" and "origin/materials"

* woops

* furnace (#11)

* autolathe manufacturing of toolboxes

* eggs in a basket

* some small changes

* matcolors

* documentation

* more documentation and effects

* done

* Color man bad (#12)

* fixes designs

* ass

* more fixes

* fuck me

* firestacks adder

* epic fixes

* fixes designs

* DONE DIDDILY DOO

* removes category macro

* ch-ch-ch-changes

* fixes some stuff

* Fixes display of ore values (#9)

* Redemption machine

* Removes debug messages

* Re-adds value display

* Replaces the fire stacking component with an element instead (#13)

* fixes examine

* fixes ligma bugs

* double ligma boofus

* fix

* misses some defines

* fixes ORM

* Update code/datums/components/material_container.dm

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

* fixes

* Makes glass objects weaker (#14)

* Makes glass objects weaker

* uses correct proc

* fixes shit

* honk honk

* better

* oh shit oh fuck

* fixes

* fuck ORMs

* fixes the biogen

* documentation

* ass (#15)

* component

* changes

* ass

* ass

* doc

* Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent"

* fixes rounding

* fixed
2019-07-24 11:27:01 -04:00