Commit Graph

99 Commits

Author SHA1 Message Date
Yoshax
bfdd155e89 Fixes #1136 2016-05-19 22:25:40 +01:00
Arokha Sieyes
8e90199052 Generic Station & System Name
Makes the name of the starsystem and station generic such that it can be modified in global.dm and replace the strings where it is used. This won't have an effect on Polaris itself, but makes changing the name much more simple for forks. Using string concat constants on the advice of Psi.
2016-05-16 15:34:03 -04:00
Yoshax
b6848460e3 Gives Diona pay the same as Taj and Unathi 2016-05-12 22:24:40 +01:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Jon
9903cf4361 Changes the feed creator for the Vir Times to a Vir Times Exonet Node for the station, as opposed to "SolGov Minister for Information" which was a little outdated and incongruous. 2016-04-09 18:25:46 +01:00
Neerti
8bfac9c57a Merge pull request #1206 from Hubblenaut/master
Adds wallets to loadout menu
2016-03-28 12:49:57 -04:00
Neerti
96e52f5af0 Merge pull request #1229 from SinTwo/construction_update
Construction update
2016-03-26 15:45:19 -04:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Kelenius
df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Hubblenaut
5c1e5a89e6 Adds wallets to loadout menu 2016-03-18 13:07:38 +01:00
Kelenius
3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +03:00
Hubblenaut
0331ca9242 Extensive Interface Improvement 2016-03-10 01:12:49 +01:00
Hubblenaut
2c815af526 Adjusts price cumulation and logs 2016-03-09 19:06:58 +01:00
Hubblenaut
6ea7295e87 Updates price list 2016-03-09 17:40:11 +01:00
Hubblenaut
0a85f0c0fa Retail Scanner QOL
Adjusts Size to fit in pocket
Fits in belt slot
Adds technology level for deconstructor (MT 1)
Ability to swipe when shown by show_held_item
2016-03-07 19:50:49 +01:00
Hubblenaut
dc092aa348 Changes interface to using /interact and provided procs 2016-03-07 18:34:38 +01:00
Hubblenaut
42c73e1c8b Fixes ethanol drink pathing 2016-03-07 17:05:30 +01:00
Neerti
6224e978a9 Merge pull request #1014 from Zuhayr/voxremove
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00
Hubblenaut
0cdde3493c Fixes cash mashine department linking on spawn 2016-02-28 22:35:50 +01:00
Hubblenaut
a844828f23 Fixes Cash Machines not connecting to account on spawn and having omnidirectional interaction area 2016-02-28 22:16:23 +01:00
Hubblenaut
491a83ca72 Adds prices for snacks and drinks 2016-02-22 17:34:23 +01:00
Hubblenaut
68495d8727 Postmerge fixes 2016-02-21 19:31:04 +01:00
Hubblenaut
60f5358751 All cash now acts like bundles 2016-02-21 17:23:54 +01:00
Hubblenaut
67884b97b5 Adds cash registers and retail scanners 2016-02-21 16:46:56 +01:00
Yoshax
76db1f5e6c Changes predefined space cash stacks to be bundles
Fixes #926
2016-02-21 02:16:14 +00:00
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Zuhayr
2e83dfba51 Added blood volume and hunger variables for species. 2016-02-08 13:13:35 +10:30
Zuhayr
2fc81a3d4d Added an economic modifier for Teshari. 2016-02-08 12:00:26 +10:30
Neerti
451c477e4c Tweaks event text to fit with the lore better.
Adds more informative text for vending machines.
Removes RNG viruses.
2015-12-21 04:01:05 -05:00
Jon
5d3e3cf863 Removes the AI SYSTEMATICALLY KILLING CIVILIANS GRIMDEERRRRP news event. Replaces the message with one saying it simply caused damage. 2015-12-10 21:35:35 +00:00
Neerti
2c81761494 Removes most references to NSS Exodus. 2015-12-03 13:47:37 -05:00
Neerti
78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05:00
PsiOmega
e722da01f6 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
2015-09-12 13:10:29 +02:00
PsiOmega
834d93df00 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-12 12:51:22 +02:00
SomeoneElse
7e4191d212 [minor] Fix ATM transfer code, remove badly placed 'break'.
code/modules/economy/Accounts.dm:
	remove break from charge_to_account()
2015-09-11 16:44:00 +06:00
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
PsiOmegaDelta
c63f4c62b5 Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney
Conflicts:
	code/__defines/mobs.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job_controller.dm
2015-08-13 08:06:11 +02:00
PsiOmegaDelta
4bb6749f24 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-11 08:34:46 +02:00
PsiOmegaDelta
e1aff6a668 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm
2015-08-11 08:21:06 +02:00
PsiOmega
e0525bec35 Fixes #10447.
Corrects Icarus' designation.
2015-08-09 12:21:52 +02:00
PsiOmegaDelta
8b731feb8b Economic strength now depends on race and job.
The amount of money a crew member can start with is now affected by race and species.
Also fixes #8546.
2015-07-02 20:14:35 +02:00
PsiOmegaDelta
405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm
2015-06-20 20:40:06 +02:00
Zuhayr
56b68b9abe Fixes #9847 2015-06-20 22:15:38 +09:30
PsiOmegaDelta
cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
PsiOmegaDelta
6c903907c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-04 08:10:49 +02:00
GinjaNinja32
5a2933bb4f Fixes #9645 2015-06-02 20:39:03 +01:00
PsiOmega
be91976e30 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-09 11:13:05 +02:00
PsiOmega
72dc583ef5 Fixes #9139.
Arranges the order at which starting funds is set and account creation is done.
2015-05-07 19:23:56 +02:00