17014 Commits

Author	SHA1	Message	Date
Zuhayr	a8089d4437	Merge master into dev.	2015-02-12 23:01:08 +10:30
Zuhayr	d40eecd163	Merge pull request #8117 from mwerezak/textmacros ... Replaces text expressions with macros	2015-02-12 18:49:16 +10:30
Zuhayr	0955b001dc	Merge pull request #8114 from mwerezak/hydrofix ... Fixes randomized seed nutrient_consumption	2015-02-12 18:48:11 +10:30
PsiOmegaDelta	baf6a6f859	Merge pull request #8112 from DeeUnderscore/vendor-cash ... Vending machines: NanoUI, cash and other stuff	2015-02-12 09:08:29 +01:00
mwerezak	5b5e16916f	Replaces text expressions with macros	2015-02-12 01:55:12 -05:00
PsiOmegaDelta	d8b9b024be	Merge pull request #8115 from mwerezak/powerfix ... Fixes machines being usable after a power failure	2015-02-12 06:41:29 +01:00
Atlantiscze	4c4411259a	PACMAN Generator NanoUI ... - Gives PACMAN type generators NanoUI, instead of the old UI - Example screenshot: http://i.imgur.com/QhQEw1c.png (Red usually means it's bad. In this case, generator is operating at 10 power level, but maximal safe level is 4 (it's varedited to these values, normally it would be only 5/5). Overheats also give warnings (warning shown on screenshot is last warning which occurs approximately 20 seconds before explosion). Fuel is measured in cm3. For simplicity, 1 sheet = 1000cm3	2015-02-12 06:09:42 +01:00
mwerezak	b7e3a14e0d	Fixes machines being usable after a power failure ... Fixes machines not gaining the NOPOWER flag after a power failure because they were turned off and had use_power set to 0. Fixes machines not gaining the NOPOWER flag after being moved into an area with no power. Both bugs allowed power using machines to be used in areas with no power.	2015-02-11 23:28:53 -05:00
mwerezak	28f3bf739d	Fixes randomized seed nutrient_consumption ... Centers the range of possible values evenly between small amount and heavy supply.	2015-02-11 23:06:29 -05:00
D Anzorge	7572ec427a	Add an extra check to vending's Topic() ... Topic() now checks if it really can vend items with current category config, in case the request was malformed/rewritten	2015-02-11 20:02:23 -05:00
Atlantiscze	01b8873b9d	Fixes PACMANs not working	2015-02-12 01:05:16 +01:00
PsiOmega	12e17e666f	Minor casing fix. ... I couldn't unsee the lowercase t in sentences beginning with "\the" instead of "\The". I'm sorry..	2015-02-11 19:53:08 +01:00
D Anzorge	cee2d2502a	Make vending machines stop selling things if vendor account is suspended	2015-02-11 10:42:50 -05:00
D Anzorge	9dffc8f922	Add NanoUI to vending machines ... Error messages are now displayed in the NanoUI interface, instead of going to the text log. Wire UI now consistent with other wire-enabled wire devices that use NanoUI.	2015-02-11 10:42:50 -05:00
D Anzorge	b826e5bb77	Rewrite and refactor vending.dm ... Remove some redundant procs and /obj/machinery/vending members. Rework the way product lists and advert lists are stored within /obj/machinery/vending. /obj/machinery/vending now uses a simpler way of storing the product list. The old variables, `products`, `contraband`, etc., are still used for initialization of the new list, but are not used beyond that. This commit removes colors from vending lists in anticipation of introducing NanoUI.	2015-02-11 10:42:50 -05:00
Zuhayr	605c1eea88	Merge pull request #8101 from PsiOmegaDelta/MedCam ... Map Fixes and Additions.	2015-02-11 15:13:20 +10:30
D Anzorge	119005d515	Refactor and make vendors record transactions ... Payment code is now more modular and less redundant. Vending machines now record all transactions, including cash transactions.	2015-02-10 21:01:05 -05:00
D Anzorge	1acce5dc59	Add cash purchases to vending machines	2015-02-10 21:00:59 -05:00
D Anzorge	6d3e6c2246	Change ewallets to work like ID cards ... Instead of having to insert ewallet before making purchase, ewallets can now be swiped in place of ID card	2015-02-10 21:00:59 -05:00
Chinsky	d1de94c70e	Merge pull request #8082 from Kelenius/ofMachinesAndParts ... Update for machine upgrades and some science	2015-02-10 23:24:19 +03:00
Kelenius	1368707150	Borg charger now uses cell	2015-02-10 14:39:54 +03:00
PsiOmega	93a479099a	Air alarm deconstruction fix. ... Air alarms can again be deconstructed, at the price of lost convenience.	2015-02-10 10:35:45 +01:00
PsiOmega	cd5a2fc52e	Bonus: Makes the tinted windows respect power failures.	2015-02-10 10:16:58 +01:00
Chinsky	712b952985	Merge pull request #8089 from GinjaNinja32/pai ... NanoUI pAI, more modular pAI software	2015-02-10 10:05:20 +03:00
Chinsky	4f1afb3747	Merge pull request #8098 from MrSnapwalk/TheseArmsWereMadeForClamping ... [Ready for Merge] Custom Item Update/Addition	2015-02-10 09:23:47 +03:00
Chinsky	ec6278f028	Merge pull request #8097 from mwerezak/projectile-fix ... Fixes errors introduced by merge	2015-02-10 09:23:09 +03:00
PsiOmegaDelta	79aacd9f30	Merge pull request #8081 from comma/maximumtrinkets ... Accessories update.	2015-02-10 06:51:30 +01:00
PsiOmegaDelta	973bc1c0f3	Merge pull request #8071 from RKF45/newpaint ... Generic Paint II: Fun with Paint	2015-02-10 06:48:32 +01:00
Zuhayr	ffc05aecfa	Merge pull request #8091 from PsiOmegaDelta/Cleanit ... Minor cleanup in setup.dm	2015-02-10 13:41:16 +10:30
MrSnapwalk	05f14ccd84	Updates /obj/item/clothing/under/fluff/parkereliza and adds /obj/item/clothing/suit/fluff/parkereliza to the code.	2015-02-09 19:34:43 -06:00
mwerezak	d8a8384c41	Fixes errors introduced by merge ... Fixes errors introduced by commit fac32d07e9. Grabbed the version of projectile.dm from the parent commit and changed the paths by hand (again).	2015-02-09 17:53:47 -05:00
Chinsky	1c4734c4e3	Merge pull request #8088 from Raptor1628/dev ... Paramedic Job Fixed	2015-02-10 01:00:08 +03:00
Chinsky	4deeebfe3e	Merge pull request #8093 from GinjaNinja32/pai_pulling ... Fixes pAIs being spammed with "You are too small to pull that." when being pulled	2015-02-09 19:52:32 +03:00
Chinsky	ae54b2efc2	Merge pull request #8092 from GinjaNinja32/webbing ... Fixes webbings utilising bluespace storage for infinite storage	2015-02-09 18:26:19 +03:00
D Anzorge	93f3b5b72a	Fix a bug in isNotStationLevel() helper	2015-02-09 09:38:48 -05:00
GinjaNinja32	503eb679cc	Fixes pAIs being spammed with "You are too small to pull that." when being pulled	2015-02-09 13:32:42 +00:00
Zuhayr	ec6bb08a58	Merge pull request #8012 from SkyMarshal/icarus ... Adds two admin weapons and refactors wall damage code.	2015-02-09 22:25:22 +10:30
GinjaNinja32	42bd4e7fba	Storage accessory w_class raised to 3, typo fix	2015-02-09 11:15:19 +00:00
GinjaNinja32	70094884ff	Fixes, code cleanup, adds the messenger I forgot last night	2015-02-09 10:41:08 +00:00
PsiOmegaDelta	ec1fe5edc7	Merge pull request #8090 from comma/master ... Fixes #8009	2015-02-09 08:38:50 +01:00
PsiOmega	e1e5d993dd	Minor cleanup in setup.dm ... Fixes #8074.	2015-02-09 08:27:38 +01:00
Chinsky	2f52020ce4	Fixed backwards check	2015-02-09 08:26:45 +03:00
Chinsky	5496c7bbf0	Fixes #8009 ... Fixed flaslights producing infinite light/	2015-02-09 08:05:24 +03:00
GinjaNinja32	538ee11cb1	pAI rework	2015-02-09 01:58:54 +00:00
Raptor1628	76f4001cc1	Paramedic Job Fixed ... Adds Paramedic job as outlined on the forums. Reduces MD access to EVA, adds some minor EMT clothing stuff, and fixes #8020 and the medgreen armband while I was piddling around in sprites. EMT alt title and indent fixed. Now less broken. 	2015-02-08 17:23:02 -05:00
GinjaNinja32	4495f4c8ed	Fixes possible href exploit with APCs	2015-02-08 19:58:28 +00:00
PsiOmega	91b971b223	Merge remote-tracking branch 'upstream/dev-freeze' into dev	2015-02-08 20:29:03 +01:00
Kelenius	e6dc9d36fd	Update for machine upgrades and some science ... Also adds RPED and makes biogenerator and borg charger constructible .	2015-02-08 15:39:11 +03:00
SkyMarshal	a78ef81712	To make PsiOmegaDelta happy ... I hate this format. Bluh bluh huge bitch	2015-02-08 04:04:06 -07:00
SkyMarshal	c8d6214657	Fix indent thing for pointdefense	2015-02-08 04:03:19 -07:00