Commit Graph

9224 Commits

Author SHA1 Message Date
PsiOmegaDelta
1e457f6e34 Merge pull request #9009 from Yoshax/icanintosurgery
Fixes antag surgery kit
2015-04-28 07:35:58 +02:00
Yoshax
aa115f5bb2 Fixes antag surgery kit 2015-04-27 16:41:47 +01:00
RavingManiac
89a72fb326 Candle burn time increased to ~30 minutes
Some fluff added to candle description explaining how they burn in space
2015-04-27 12:10:54 +10:00
Daranz
dd02f9e9f0 Fix cell charger icon not updating when cell taken out by a borg 2015-04-25 19:38:47 -04:00
Chinsky
392cc1b0bb Merge pull request #8938 from GinjaNinja32/floorpainter
Fixes floor painter white-bot and white-delivery states
2015-04-23 09:20:13 +03:00
Chinsky
df21e9fc2e Merge pull request #8921 from PsiOmegaDelta/DirtyEngineers
Shower curtains no longer lose their default color upon being washed.
2015-04-23 07:34:44 +03:00
GinjaNinja32
bc6daf5b5f Fixes floor painter white-bot and white-delivery states
Fixes #8937
2015-04-22 05:21:03 +01:00
Kelenius
446efb3809 Fixed attacking blob breaking logs 2015-04-21 19:57:45 +03:00
PsiOmega
f6d0ab1578 Shower curtains no longer lose their default color upon being washed.
NT has now invested in slightly less budget curtains.
2015-04-20 14:42:43 +02:00
Chinsky
b437c5654a Merge pull request #8902 from PsiOmegaDelta/FiredoorFixTwo
Another emergency shutter fix.
2015-04-19 16:10:07 +03:00
Chinsky
109aed4fcf Merge pull request #8897 from PsiOmegaDelta/LaptopsAreTheWorst
Fixes #8895.
2015-04-19 14:59:25 +03:00
PsiOmega
b295b9e3c6 Another emergency shutter fix.
I goofed, and dropped the distance check.
2015-04-18 20:13:25 +02:00
PsiOmega
804ca5aa0b Fixes #8250.
Uncomplicates the examine pre-check.
Ensures door/examine() returns the proper value.
2015-04-18 19:25:22 +02:00
PsiOmega
725e3335d2 Fixes #8895.
Laptops now use the proper proc for checking camera status.
2015-04-18 17:49:40 +02:00
Chinsky
511d3764e7 Merge pull request #8846 from PsiOmegaDelta/CantClickMeDontClickMe
Makes objects without moues opacity not appear via alt-click.
2015-04-18 16:57:01 +03:00
GinjaNinja32
159dccbfab Fixes floor painter solid-dark icon
Fixes #8873
2015-04-17 03:18:53 +01:00
PsiOmega
3eab61e154 Soap can now clean turfs as well. 2015-04-16 08:20:00 +02:00
GinjaNinja32
54044859bf Fix cryopod moving robots to nullspace instead of deleting 2015-04-15 14:28:36 +01:00
PsiOmegaDelta
f988545ed5 Merge pull request #8827 from comma/dev-freeze
Some fixes
2015-04-13 08:17:53 +02: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
c9fc94e1ff Merge pull request #8803 from Zuhayr/dev-freeze
Readds vox pariah.
2015-04-11 04:21:13 +03:00
Zuhayr
d70ea77c2d Moved stack into heist antag creation for pariah reinclusion. 2015-04-10 02:35:04 -07:00
Chinsky
a8bf62634e Merge pull request #8774 from mwerezak/vending
Fixes #8771
2015-04-10 12:28:12 +03:00
Chinsky
5fc3a2a511 Merge pull request #8792 from GinjaNinja32/runtime
Runtime fixes
2015-04-10 12:24:35 +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
958a1c64b3 Fixes PDA detonation runtime
Fixes #8609
2015-04-09 16:05:53 +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
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
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
PsiOmega
4326b8c5d8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-04-03 09:22:23 +02:00
GinjaNinja32
e82894aadc Fixes runtime when attempting to latejoin into a deleted core 2015-04-02 05:16:20 +01:00
mwerezak
a116723fcd Updates canister process() to use atmos helper procs 2015-04-02 00:04:44 -04:00
Zuhayr
3472513cf9 Merge pull request #8645 from mwerezak/gun-icons
Adds Skowron's inhand icons for various guns
2015-03-31 14:12:03 +10:30
Chinsky
056c00fc9a Merge pull request #8671 from Yoshax/spellfixes
Updates spellbook descriptions and cooldowns
2015-03-30 21:15:08 +03:00
Yosh
c1b7ca3b89 Further description fixes 2015-03-30 01:17:57 +01:00
Yosh
e9125474dd Spellbook spell description update
Updates what obvious problems in the descriptions I could see.
2015-03-30 01:12:23 +01:00
Yosh
57a8822c43 Spellbook cooldown corrections
Displayed cooldowns in the wizard's spellbook were partially incorrect,
fixed now to display the correct cooldowns.
2015-03-30 01:01:12 +01:00
Yosh
42cb430f02 Changes ED-209 Construction to work with new armor vests
Changes ED-209 construction to accept any type of the newer armor vests
rather than the old mostly deprecated armor vests.
2015-03-29 18:05:07 +01:00
mwerezak
c59fac2e16 Adds unloaded item state for the STS-35. 2015-03-29 02:40:57 -04:00
mwerezak
ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04:00