Commit Graph

43 Commits

Author SHA1 Message Date
SkyratBot
7d1d0e1fad [MIRROR] Refactors most spans into span procs (#6315)
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-16 00:24:49 +01:00
SkyratBot
4d2dd19a58 [MIRROR] Crops the cached ID card icon so it is less obnoxious in tgui chat. (#4429)
* Crops the cached ID card icon so it is less obnoxious in tgui chat. (#57935)

* Crops the cached ID card icon so it is less obnoxious in tgui chat.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-03-26 22:21:37 +00:00
SkyratBot
46e83bcd77 [MIRROR] Pay stands reject transactions from departmental budget cards (#4185)
* Pay stands reject budget cards (#57726)

* Pay stands reject transactions from departmental budget cards

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-03-16 21:49:43 +00:00
SkyratBot
a05f7e863a [MIRROR] Fully implements the ID Card design document (#3729)
* Fully implements the ID Card design document

* Oh fuck that hurt.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-03 01:54:25 +00:00
SkyratBot
e890b1282b [MIRROR] Replaces intents with combat mode (#3063)
* Replaces intents with combat mode

* updates

* a

* Update living_defense.dm

* https://github.com/tgstation/tgstation/pull/56638/files

* gunsafety!

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 16:58:16 +01:00
SkyratBot
6582d77084 [MIRROR] Civilian Bounties now offer a choice of three different bounties to pick from. (#2510)
* Civilian Bounties now offer a choice of three different bounties to pick from.

* Rebuild tgui

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Avunia Takiya <git@takiya.cloud>
2021-01-06 04:03:28 +01:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
SkyratBot
82e743fa55 [MIRROR] Fixes paystands sending signals when attached with a signaler. (#1778)
* Fixes paystands sending signals when attached with a signaler. (#55092)

Corrects how paystand's interact with their signalers by actually using the correct proc, and signaling out of the machine.
Not much else to say here.

* Fixes paystands sending signals when attached with a signaler.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-11-23 00:33:34 +00:00
SkyratBot
c0cdf25886 [MIRROR] Arconomy: Amputating the Invisible Hand of Income. (#1687)
* Arconomy: Amputating the Invisible Hand of Income.

* Update tgui.bundle.js

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-11-14 21:52:07 +01:00
SkyratBot
b3cd29d2d2 [MIRROR] SSeconomy/var/bank_accounts is now an association list of account identifiers and datums for O(1) performance (#1363)
* SSeconomy/var/bank_accounts is now an association list of account identifiers and datums for O(1) performance (#54430)

Title. Also added some precautions to bank_account/new() and the crab17 gear.
The fact the majority of functions pertinent to the bank_accounts list was O(n) disquieted me.

* SSeconomy/var/bank_accounts is now an association list of account identifiers and datums for O(1) performance

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-10-19 01:35:05 +01:00
SkyratBot
d60af80ae0 [MIRROR] Adds visible feedback to paystand payments (#1131)
* Merge pull request #54137 from Mickyan/paystand_imp

Adds visible feedback to paystand payments

* Adds visible feedback to paystand payments

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-10-03 13:58:38 +02:00
SkyratBot
b649a2e931 [MIRROR] Fixes Virology Civilian Bounties. (#347)
* Fixes Virology Civilian Bounties. (#52905)

* Fixes Virology Civilain Bounties.

* Don't you hate when you're like 30 commits deep into another branch but there;s no quick alternative to get back onto your old branch because you've been debugging a single issue for the past 3 days and you WANT to work on something else but if you just commit what you got now it'll be a waste and you'll forget what and why you made those choices? Wow same, relatable

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

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

* Fixes Virology Civilian Bounties.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-08-15 20:25:54 +02:00
SkyratBot
ade641b896 Adds the Account Registration Machine. (#52745) (#326)
This adds the Account Registration Machine to the game, it's obtained at the computerized recordkeeping tech (Rather far in to the tech tree) and only obtained from the security lathe to prevent access from being too widespread, because I don't trust players have access to this until at LEAST half the shift has gone by. What this enables you to do is to create new accounts for blank IDs. The accounts won't have a parent payment account until actually assigned a job by a card console, but for all intents and purposes they'll act and interact like a standard, station bank account.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-08-13 05:23:33 +02: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
ShizCalev
743ab9a488 Fixes bank cards not giving alerts if a mob is around that has them disabled (#51825) 2020-06-25 17:50:49 -04:00
Gamer025
d8a26dd7e5 Adjust payday payout for most species (un-Fairer paydays) (#51212)
* Fairer Paydays

Makes paydays more fair

* Changes fairer payday system to use a multiplier

Paday system now features a multiplier.
By default the multiplier is 1 so accounts created without a multiplier (deparments) are not affected.
Species now have a default multipliert of 1.
Most species expect humans now earn 25% less.
2020-05-25 01:50:50 +08:00
Iamgoofball
e678110bf5 The Bogdanoffs have upgraded CRAB-17. You can't escape the dump. (#50610)
* The Bogdanoffs have upgraded CRAB-17. You can't escape the dump.

* Fixes.
2020-05-02 17:55:57 -04:00
ArcaneMusic
0e2dfb6cc3 I think this is the thing for public logging? 2020-04-21 20:28:38 -04:00
ArcaneMusic
ddee742ad9 Basic econ logging 2020-04-21 17:37:15 -04: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
moo
93cf35b818 Some minor Ecobbomy items (Paystand Functions, Merchant Necklace for Admins) (#48205)
* 💰

* round

* added better feedback

* 150 hours

* 151 hours

* Update code/modules/economy/pay_stand.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Update _neck.dm
2019-12-13 10:30:10 -05:00
oranges
e83462632f Revert "paychecks are now a % of the budget instead of fixed numbers … (#48032)
* Revert "paychecks are now a % of the budget instead of fixed numbers (#47303)"

This reverts commit 10ba7c11ef.

* Add newline lint
2019-12-01 10:58:54 +01:00
spookydonut
2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
Tlaltecuhtli
10ba7c11ef paychecks are now a % of the budget instead of fixed numbers (#47303)
* Update maps.txt

* 1

* fjdsfpsepi

* dasdasd

* hgd

* 2

* 3

* woops
2019-10-30 18:36:01 -04:00
Alek2ander
4e26573f7b Job specific ID cards (#45112)
* Job based IDs attempt one

* This doesn't actually work

* Back to overlays

* The Comment Section

* Cached flat icons
2019-07-13 21:24:35 -07:00
Garen Crownguard
3a37d0322c merge 2019-06-23 20:39:24 -05:00
vuonojenmustaturska
ef414ee4d7 [READY] Replaces mining points with money, adjusts gulag payout (#44507)
* woop

* adjust miner regular payout

* golem, orm upgrade changes

* liberator

* tgui.js
2019-06-18 10:17:34 -04:00
Garen Crownguard
caa683e5b1 merge 2019-06-04 07:04:21 -05:00
Garen Crownguard
4b2fc4cc05 Removes Hygiene 2019-06-04 06:25:51 -05:00
Rob Bailey
106cd26fc0 Small audio fixes (#43883)
* pure file fixes

* beep pitch fix

* duump eet
2019-05-11 18:09:00 +02:00
Qustinnus
fc2966ff01 [READY] Execute Protocol Crab-17: Phase 3 - The one where Floyd actually finishes the PR (#43338)
* protocol crab 17: phase 2

* k

* meme

* fix

* k

* fixes

* more stuff

* makes qust's code not bad

* fixes time

* MFW (my face when) face when floyd doesnt make the fix commit

* makes it leave properly

* fixes more shit

* gets rid of stupid variable

* asdf

* wa la

* wa la ^2

* tadaa

* adds

* i fixed some of them but what do the others mean

* untested and ready to merge
2019-05-05 19:40:46 -04:00
Tad Hardesty
09949fe611 Fix welfare being given to everybody else with the same job (#43490)
* goddamn NEETs ruining my economy, fixes #42387

* Fix remaining broken call to add_neetbux
2019-04-08 10:29:51 +02:00
MacHac
203cac22ff Bank cards can now talk again. (#42849)
* recursive_loc_check now returns the appropriate atom.

* Added a preference to disable bank card chatting.

* Converted spaces to tabs, collapsed conditionals

* Update code/modules/economy/account.dm

Co-Authored-By: MacHac <piheads@gmail.com>

* Added the pref to the game prefs screen.
2019-02-25 15:07:34 -05:00
Qustinnus
0de28b726a [READY]Humans now have hygiene (DOES NOT AFFECT MOOD GO AWAY MOODPOSTERS) (#41986)
cl Floyd / Qustinnus
tweak: You now have to be naked to get the nice shower moodlet, if you shower with clothes you get a bad moodie
add: Hygiene, you slowly become dirty over time, the more covered in blood you are the faster you will lose hygiene. When you are too dirty you will have a stink overlay. (Hygiene doesn't affect mood currently) It also spawns miasma slowly if you smell like shit.
add: adds NEET and neat traits. NEET's get 20 bucks social welfare extra and like being unhygienic, while neat people dislike being unhygienic and like being hygienic
/cl

This doesn't affect mood so plssss dont strawman in this PR about how I'm forcing you to shower or die or whatever

This PR is mostly visual and will allow for people to judge others for literaly being smelly as hell.

also NEET and neat traits which interact with being smelly. (neat likes hygiene, dislikes lack of it. NEETs like lack of hygiene and get some social welfare (20 bucks))
2019-01-02 01:04:51 +13:00
MMMiracles
ab50f2762a fixes runtime with paystand 2018-12-03 02:14:20 -05:00
MMMiracles
0890d196e2 Paystand Modifications (#41588)
cl MMMiracles
add: Signalers can now be attached to active paystands to send a signal when a certain amount of money is deposited.
add: Swiping your card on a paystand you own will let you lock it down, preventing it from being unbolted from the ground.
tweak: Paystands now ask for how much you want to deposit when interacting instead of a static price.
/cl

I thought it was pretty dumb the paystands designed to encourage shops was also forced to a single static price instead of allowing the person to put in how much they actually wanted to pay.

The signaler attaching lets you hook up a signaler to any active paystand and set up a threshold. Any amount of money deposited after this will start counting up to the threshold and reset when said threshold is hit, activating the signaler in the process.
2018-12-02 20:10:42 +13:00
ShizCalev
f13793012a Revert "Clowns and Mimes acts no longer get ruined when you examine their ID cards (#40655)" (#40985)
This reverts commit 81d452d / #40655

This was fixed properly by #40951.

This also introduced a bug where ERT personnel (and anyone who spawns in with a
non-standard ID card in their outfit datum) get bank accounts assigned to
"Emergency Response Team Commander", "Security Response Officer", etc.
2018-10-19 22:18:25 -07:00
ShizCalev
ca57ca7bee Fix being unable to stuff money into IDs (#41006) 2018-10-19 22:17:28 -07:00
Qustinnus
81d452d697 Clowns and Mimes acts no longer get ruined when you examine their ID cards (#40655)
cl Floyd / Qustinnus
fix: Clown and Mimes their ID cards no longer show the name of some random weirdo.
/cl

fixes #40560

also removed some operations that dont need to happen in the first place
2018-10-17 23:18:36 +13:00
ShizCalev
0ebfc529f5 Fixes economy runtime with ID cards not on mobs (#40499)
* Fixes economy runtime with ID cards not on mobs

* replaced card_holder
2018-09-27 12:38:07 +03:00
XDTM
1553afab24 [Ready for review]Adds credit holochips to replace magic cash (#40462)
cl XDTM
add: Added credit holochips, a form of semi-physical currency to use in transactions. They can be generated by id cards by drawing from bank accounts and can be used to make payments.
add: There is no limit to the amount of credits that can be stored on a holochip, but being holograms they are vulnerable to electromagnetic pulses, and may disappear if exposed to one!
add: Holochips can be split with alt-click, and can be merged by clicking on another holochip.
/cl

Inserting physical cash into ids and printing it on the go is really jarring, and since we're on a sci-fi universe i think that hard-light hologram chips with encrypted credits sounds more believable.

As a plus, they don't have to deal with messy stack calculations with different denominations, and simply have a credits var that holds their amount. They change color based on the amount of cash for easy recognizability.
2018-09-26 10:35:02 +12:00
XDTM
339c3fc478 Bank Cards now only display messages to the owner if carried (#40459)
* Bank Cards now only display messages to the owner if carried

* Adds recursive loc check, sounds, better code

* leftover

* .

* review
2018-09-25 09:27:06 -06:00
Iamgoofball
f735a7d34d [READY][PAID CODE] economy PR (#40312)
With the power of CAPITALISM AND ECONOMY, you too could be This Guy.
2018-09-23 02:50:51 -04:00