Commit Graph

19 Commits

Author SHA1 Message Date
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