Commit Graph

17094 Commits

Author SHA1 Message Date
Zuhayr
c739438c7a Well, now the kitchen can't produce ANYTHING, not just regular
food. No runtimes though. Progress.
2015-02-15 23:06:35 +10:30
Zuhayr
32813af228 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-15 22:04:07 +10:30
Zuhayr
be2b0aa6f4 Merge pull request #8135 from Baystation12/master
Master into dev.
2015-02-15 22:03:43 +10:30
Zuhayr
3fc9c0aec7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-15 22:03:17 +10:30
GinjaNinja32
dafcc2a374 Fixes runtime when walking over shards with no shoes 2015-02-14 23:29:11 +00:00
GinjaNinja32
9c68bd492d Adds current color as default to hair, facial hair, eye and skin color pickers 2015-02-14 21:49:45 +00:00
mwerezak
f54588675f Fixes soporific and chloral hydrate
Soporific now makes people fall asleep, as intended. CH now knocks
people out after 20 seconds, instead of after 3 minutes.
2015-02-14 13:51:10 -05:00
PsiOmega
fde03b2e94 Containers now properly checks types instead of string paths.
Security and medical belts could contain now no longer existing objects. These types have been removed.

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
	code/game/objects/structures/inflatable.dm
	code/modules/clothing/under/ties.dm
2015-02-14 14:16:40 +01:00
Zuhayr
d0b4f9de8a Merge branch 'xenohydro' of https://github.com/Zuhayr/Baystation12 into xenohydro 2015-02-14 23:44:01 +10:30
Zuhayr
3b7555c6e0 WIP 2015-02-14 23:43:52 +10:30
Zuhayr
77177b514f Working on spores. 2015-02-14 10:30:06 +10:30
Zuhayr
5e87b21d44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-14 09:32:17 +10:30
PsiOmega
dc1774e23b Adds missing Event cost stat. 2015-02-13 09:43:18 +01:00
Chinsky
9dd282e43b Merge pull request #8105 from PsiOmegaDelta/SyndicateDedLongLiveSyndicate
New traitor items
2015-02-13 08:22:28 +03:00
Zuhayr
232c2c93e2 Fixes infinite loop issues with plant controller. 2015-02-13 10:56:52 +10:30
PsiOmegaDelta
0d08264e5e Merge pull request #8120 from GinjaNinja32/crewmonitor
Fixes template modification exploit for crew monitoring computer
2015-02-12 21:36:16 +01:00
GinjaNinja32
189330b4b3 Fixes template modification exploit for crew monitoring computer 2015-02-12 20:27:28 +00:00
PsiOmega
d4ae710c0c Tweaks and corrections. 2015-02-12 21:11:38 +01:00
Zuhayr
066482de93 Readds predefined ambrosia items. 2015-02-13 05:53:45 +10:30
Zuhayr
15e666150e Readded pumpkin carving and poultice making. Added a description generator and cache. 2015-02-13 05:02:21 +10:30
Zuhayr
8fb5836e4f Generalized fruit products properly. 2015-02-13 03:52:46 +10:30
PsiOmega
f8c5cf8f83 Adds a kit with cigarette packs and zippo lighter.
Includes 2 packs of flash powder cigarettes, 2 packs of smoke creating cigarettes, 1 pack of mindbreaker cigarettes, and 1 pack of tricordrazine cigarettes.
2015-02-12 16:35:49 +01:00
Zuhayr
a9d55a17b8 Readded mob products. 2015-02-12 23:24:44 +10:30
Zuhayr
c953e279a4 Update from dev. 2015-02-12 23:15:47 +10:30
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
PsiOmega
cb82dd950e Adds a floppy disk which provides access to the station camera network given appropriate hardware. 2015-02-12 12:20:58 +01:00
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
49b1280b13 Tries to add more helpful information when examining a spy bug from real up close. 2015-02-11 21:39:42 +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
PsiOmega
73bc5934d5 Replaces uplink Donk-pockets with Sin-Pockets.
Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.

Makes the concealed cane use non-del methods.
2015-02-11 09:55:50 +01:00
Zuhayr
605c1eea88 Merge pull request #8101 from PsiOmegaDelta/MedCam
Map Fixes and Additions.
2015-02-11 15:13:20 +10:30
Zuhayr
e6eab3fabf Adding more plant genes to play with. 2015-02-11 15:04:59 +10:30
Zuhayr
08b26e8e4c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-11 14:35:58 +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
PsiOmega
3a6c4dacd6 Adds 9mm gun with silencer, 5TC, with the option to acquire additional ammo, 2TC. 2015-02-10 22:39:40 +01:00
PsiOmega
dcb2e22e61 Adds a concealed cane sword for 2 TC. 2015-02-10 22:37:25 +01:00