Commit Graph

17716 Commits

Author SHA1 Message Date
Chinsky
10699ccfa3 Fixes #8473
..() doesn't really do anything meaningful, so it always returned null. Left it there just in case, but at least now it doesn't stop un-lightening.
2015-04-13 07:35:23 +03:00
Chinsky
271977dd7e Fixes #8537
Apparently drying racks don't actually do anything, but at least now they can do nothing on all the grown fruits! Also added some darkening so people feel like they were slightly less cheated.
2015-04-13 07:19:40 +03:00
Chinsky
d6d005db6a Fixes #8550 2015-04-13 06:41:58 +03:00
Chinsky
d39cc9686d Fixes #8687 2015-04-13 06:25:30 +03:00
Chinsky
b436925a33 Fixes #8735 2015-04-13 03:54:29 +03:00
PsiOmega
6458d91d83 Fixes AIs inside inteliCards being unable to interact with the world around it.
Apparently being inside an object affects view() in unexpected ways.
2015-04-12 14:04:00 +02:00
Chinsky
c9fc94e1ff Merge pull request #8803 from Zuhayr/dev-freeze
Readds vox pariah.
2015-04-11 04:21:13 +03:00
PsiOmega
080b0178ab Fixes issue with the alarm monitor (only sometimes) listing a null missing alarm source. 2015-04-10 15:19:55 +02:00
Zuhayr
d70ea77c2d Moved stack into heist antag creation for pariah reinclusion. 2015-04-10 02:35:04 -07:00
Zuhayr
e4a0edb309 Readds CAN_JOIN to Vox for Ikky. 2015-04-10 02:28:38 -07:00
Chinsky
a8bf62634e Merge pull request #8774 from mwerezak/vending
Fixes #8771
2015-04-10 12:28:12 +03:00
Chinsky
d422ecd5aa Merge pull request #8791 from GinjaNinja32/virusfood
Removes duplicate virus food recipe, adjusts correct recipe
2015-04-10 12:25:08 +03:00
Chinsky
4c4d4b9f2c Merge pull request #8790 from GinjaNinja32/pacman
Fixes PACMAN UI initial data
2015-04-10 12:25:02 +03:00
Chinsky
5fc3a2a511 Merge pull request #8792 from GinjaNinja32/runtime
Runtime fixes
2015-04-10 12:24:35 +03:00
Chinsky
c233e1579e Merge pull request #8793 from GinjaNinja32/recipes
Fixes dough and synthmeat recipes to correctly generate multiple products
2015-04-10 12:24:27 +03:00
Chinsky
7cea6b80c0 Merge pull request #8794 from GinjaNinja32/atmos
Fixes atmos supply control consoles
2015-04-10 12:24:17 +03:00
Kelenius
20d62c87ff Borg module fixes
Fixes #8775
Fixes #8797
2015-04-10 09:50:47 +03:00
GinjaNinja32
de5104685f Fixes atmos supply control consoles
Fixes #8400
2015-04-09 17:05:27 +01:00
GinjaNinja32
4784dd8f95 Fixes dough and synthmeat recipes to correctly generate multiple products
Fixes #8786
2015-04-09 16:28:06 +01:00
GinjaNinja32
b35fe67be8 Fixes robot Life() runtime
Fixes #8610
2015-04-09 16:08:33 +01:00
GinjaNinja32
958a1c64b3 Fixes PDA detonation runtime
Fixes #8609
2015-04-09 16:05:53 +01:00
GinjaNinja32
9bd93dbb29 Removes duplicate virus food recipe, adjusts correct recipe
Fixes #8590
2015-04-09 16:01:19 +01:00
GinjaNinja32
a377806b47 Fixes PACMAN UI initial data
Fixes #8561
2015-04-09 15:58:07 +01:00
GinjaNinja32
7483b9fcb2 Fixes hardsuits completely breaking all the time 2015-04-09 13:58:10 +01:00
Chinsky
3286de0a4f Merge pull request #8766 from PsiOmegaDelta/BetterMath
Emergency shuttle delay feedback correction.
2015-04-09 08:15:22 +03:00
PsiOmega
66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/gamemodes/cult/runes.dm
2015-04-08 10:40:38 +02:00
Chinsky
23c20556b4 Merge pull request #8767 from RavingManiac/dev-freeze
Vending Machine Fixes
2015-04-08 03:23:40 +03:00
mwerezak
193430bff9 Fixes #8771 2015-04-07 15:55:18 -04:00
Chinsky
59e58c53aa Merge pull request #8764 from PsiOmegaDelta/logs
Rune logging.
2015-04-07 21:40:15 +03:00
RavingManiac
6482dfb374 EFTPOS scanners now work with IDs in PDAs and wallets
Vending machine code revised slightly

"\the" added to visible messages where applicable
2015-04-07 22:09:11 +10:00
RavingManiac
adf39aaace Vending machines should now work with any ID-containing object 2015-04-07 13:10:03 +10:00
Chinsky
91d4a3482f Merge pull request #8750 from volas/paper
Additional checks for paper work
2015-04-06 20:13:34 +03:00
RavingManiac
0be6fd113a PLayer can now pay vending machines without removing ID from PDA or wallet. Clicking on the vending machine with ID/PDA/wallet/cash also brings up the menu instead of attacking the vending machine. 2015-04-07 03:00:51 +10:00
PsiOmega
aeb0af8a7f Emergency shuttle delay feedback correction.
The emergency shuttle now states that the max refuel is 10 minutes rather than 100 minutes.
2015-04-06 15:26:46 +02:00
PsiOmega
d8a6576f36 Examination fixes.
Fixes #8491.
Fixes #8579.
2015-04-06 10:46:19 +02:00
PsiOmega
036a948372 Rune logging.
Adds various rune logging.
2015-04-06 09:44:56 +02:00
RavingManiac
e2b9657ca4 Minor fixes to supermatter manual text 2015-04-05 22:40:19 +10:00
Chinsky
14124985cc Offhand gun doesn't decrease probability of accidental shot now. 2015-04-05 05:29:04 +03:00
Chinsky
ae75e3555e Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience
Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
2015-04-05 05:23:14 +03:00
volas
ef105f0659 Additional checks for paper work 2015-04-04 23:47:22 +03:00
volas
f74fc1a2bd Fix checking in paranoid mode for debug verbs 2015-04-04 16:30:28 +03:00
PsiOmega
fd8e6f9f32 Corrects the spelling of MINIMUM_MOLES_TO_PUMP. 2015-04-03 09:23:34 +02:00
PsiOmega
4326b8c5d8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-04-03 09:22:23 +02:00
mwerezak
a560acd3da Makes reflex shooting more obvious
Reflex shooting now has a different colour than regular shooting, to prevent mixups
2015-04-02 21:54:35 -04:00
Yoshax
76bde4de93 Adds jackboots for dirty aliens to custom loadout 2015-04-02 23:21:52 +01:00
Chinsky
8af8383732 Merge pull request #8691 from PsiOmegaDelta/EventFixes
Fixes event weights not being affected by having been fired before.
2015-04-02 23:43:24 +03:00
Chinsky
f15ce58ec4 Merge pull request #8718 from PsiOmegaDelta/DestroyAllSimpleLife
Fixes #8582.
2015-04-02 23:43:17 +03:00
Chinsky
93e6d9dacb Merge pull request #8705 from Zuhayr/dev-freeze
Fixes, adds weedkiller smoke checks to plants.
2015-04-02 23:43:06 +03:00
PsiOmega
ca70ac1efe Fixes #8582.
simple_animal/Life() did not terminate properly on death.
Caused issues with bears that would update their icons if Life() returned true (despite having called death).
2015-04-02 09:47:20 +02:00
PsiOmegaDelta
d464599004 Merge pull request #8706 from hockeygoalie5/recipe-fix
Fixes #8521
2015-04-02 08:50:36 +02:00